Review items

PeggyJV · Sep 19, 2023 · 3137d37 · 3137d37
1 parent 7681904
commit 3137d37
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 27 deletions.
diff --git a/proto/adaptors/frax/collateral_f_token.proto b/proto/adaptors/frax/collateral_f_token.proto
@@ -32,9 +32,9 @@ message CollateralFTokenAdaptorV1 {
     */
     message AddCollateral {
         // The FraxLend pair to add collateral to.
-        string fraxlend_pair = 2;
+        string fraxlend_pair = 1;
         // The amount of collateral to add to the cellar position.
-        string collateral_to_deposit = 1;
+        string collateral_to_deposit = 2;
     }
 
     /*

diff --git a/proto/adaptors/frax/debt_f_token.proto b/proto/adaptors/frax/debt_f_token.proto
@@ -55,7 +55,7 @@ message DebtFTokenAdaptorV1 {
     /*
     * Allows a strategist to call `addInterest` on a Frax Pair they are using
     *
-    * Represents `function callAddInterest(IFToken fToken)`
+    * Represents `function callAddInterest(IFToken _fraxlendPair)`
     */
     message CallAddInterest {
         // The address of the pair to call addInterest on.

diff --git a/steward/src/cellars/adaptors/sommelier.rs b/steward/src/cellars/adaptors/sommelier.rs
@@ -1,6 +1,6 @@
 use ethers::{abi::AbiEncode, types::Bytes};
-use steward_abi::cellar_adaptor_v1::CellarAdaptorV1Calls as AbiCellarAdaptorV1Calls;
-use steward_abi::legacy_cellar_adaptor_v1::LegacyCellarAdaptorV1Calls as AbiLegacyCellarAdaptorV1Calls;
+use steward_abi::cellar_adaptor_v1::CellarAdaptorV1Calls;
+use steward_abi::legacy_cellar_adaptor_v1::LegacyCellarAdaptorV1Calls;
 use steward_proto::steward::{cellar_adaptor_v1, legacy_cellar_adaptor_v1};
 
 use crate::{
@@ -23,19 +23,15 @@ pub(crate) fn cellar_adaptor_v1_calls(
                     cellar: sp_call_parse_address(p.cellar)?,
                     assets: string_to_u256(p.assets)?,
                 };
-                calls.push(
-                    AbiCellarAdaptorV1Calls::DepositToCellar(call)
-                        .encode()
-                        .into(),
-                )
+                calls.push(CellarAdaptorV1Calls::DepositToCellar(call).encode().into())
             }
             cellar_adaptor_v1::Function::WithdrawFromCellar(p) => {
                 let call = steward_abi::cellar_adaptor_v1::WithdrawFromCellarCall {
                     cellar: sp_call_parse_address(p.cellar)?,
                     assets: string_to_u256(p.assets)?,
                 };
                 calls.push(
-                    AbiCellarAdaptorV1Calls::WithdrawFromCellar(call)
+                    CellarAdaptorV1Calls::WithdrawFromCellar(call)
                         .encode()
                         .into(),
                 )
@@ -45,11 +41,7 @@ pub(crate) fn cellar_adaptor_v1_calls(
                     asset: sp_call_parse_address(p.asset)?,
                     spender: sp_call_parse_address(p.spender)?,
                 };
-                calls.push(
-                    AbiCellarAdaptorV1Calls::RevokeApproval(call)
-                        .encode()
-                        .into(),
-                )
+                calls.push(CellarAdaptorV1Calls::RevokeApproval(call).encode().into())
             }
         }
     }
@@ -74,7 +66,7 @@ pub(crate) fn legacy_cellar_adaptor_v1_calls(
                     oracle: sp_call_parse_address(p.oracle)?,
                 };
                 calls.push(
-                    AbiLegacyCellarAdaptorV1Calls::DepositToCellar(call)
+                    LegacyCellarAdaptorV1Calls::DepositToCellar(call)
                         .encode()
                         .into(),
                 )
@@ -86,7 +78,7 @@ pub(crate) fn legacy_cellar_adaptor_v1_calls(
                     oracle: sp_call_parse_address(p.oracle)?,
                 };
                 calls.push(
-                    AbiLegacyCellarAdaptorV1Calls::WithdrawFromCellar(call)
+                    LegacyCellarAdaptorV1Calls::WithdrawFromCellar(call)
                         .encode()
                         .into(),
                 )
@@ -97,7 +89,7 @@ pub(crate) fn legacy_cellar_adaptor_v1_calls(
                     spender: sp_call_parse_address(p.spender)?,
                 };
                 calls.push(
-                    AbiLegacyCellarAdaptorV1Calls::RevokeApproval(call)
+                    LegacyCellarAdaptorV1Calls::RevokeApproval(call)
                         .encode()
                         .into(),
                 )

diff --git a/steward_proto_go/steward_proto/collateral_f_token.pb.go b/steward_proto_go/steward_proto/collateral_f_token.pb.go
diff --git a/steward_proto_go/steward_proto/debt_f_token.pb.go b/steward_proto_go/steward_proto/debt_f_token.pb.go
diff --git a/steward_proto_rust/src/prost/descriptor.bin b/steward_proto_rust/src/prost/descriptor.bin
diff --git a/steward_proto_rust/src/prost/steward.v3.rs b/steward_proto_rust/src/prost/steward.v3.rs
@@ -1087,10 +1087,10 @@ pub mod collateral_f_token_adaptor_v1 {
     #[derive(serde::Deserialize, serde::Serialize, Clone, PartialEq, ::prost::Message)]
     pub struct AddCollateral {
         /// The FraxLend pair to add collateral to.
-        #[prost(string, tag = "2")]
+        #[prost(string, tag = "1")]
         pub fraxlend_pair: ::prost::alloc::string::String,
         /// The amount of collateral to add to the cellar position.
-        #[prost(string, tag = "1")]
+        #[prost(string, tag = "2")]
         pub collateral_to_deposit: ::prost::alloc::string::String,
     }
     ///
@@ -1165,7 +1165,7 @@ pub mod debt_f_token_adaptor_v1 {
     ///
     /// Allows a strategist to call `addInterest` on a Frax Pair they are using
     ///
-    /// Represents `function callAddInterest(IFToken fToken)`
+    /// Represents `function callAddInterest(IFToken _fraxlendPair)`
     #[derive(serde::Deserialize, serde::Serialize, Clone, PartialEq, ::prost::Message)]
     pub struct CallAddInterest {
         /// The address of the pair to call addInterest on.