diff --git a/proto/adaptors/frax/collateral_f_token.proto b/proto/adaptors/frax/collateral_f_token.proto index a31f135c..e3df873e 100644 --- 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 index aa690137..95e54385 100644 --- 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 index b98d13ec..cbc8d78f 100644 --- 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,11 +23,7 @@ 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 { @@ -35,7 +31,7 @@ pub(crate) fn cellar_adaptor_v1_calls( 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 index 55437cec..033f17b7 100644 --- a/steward_proto_go/steward_proto/collateral_f_token.pb.go +++ b/steward_proto_go/steward_proto/collateral_f_token.pb.go @@ -178,9 +178,9 @@ type CollateralFTokenAdaptorV1_AddCollateral struct { unknownFields protoimpl.UnknownFields // The FraxLend pair to add collateral to. - FraxlendPair string `protobuf:"bytes,2,opt,name=fraxlend_pair,json=fraxlendPair,proto3" json:"fraxlend_pair,omitempty"` + FraxlendPair string `protobuf:"bytes,1,opt,name=fraxlend_pair,json=fraxlendPair,proto3" json:"fraxlend_pair,omitempty"` // The amount of collateral to add to the cellar position. - CollateralToDeposit string `protobuf:"bytes,1,opt,name=collateral_to_deposit,json=collateralToDeposit,proto3" json:"collateral_to_deposit,omitempty"` + CollateralToDeposit string `protobuf:"bytes,2,opt,name=collateral_to_deposit,json=collateralToDeposit,proto3" json:"collateral_to_deposit,omitempty"` } func (x *CollateralFTokenAdaptorV1_AddCollateral) Reset() { @@ -318,10 +318,10 @@ var file_adaptors_frax_collateral_f_token_proto_rawDesc = []byte{ 0x00, 0x52, 0x10, 0x72, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x43, 0x6f, 0x6c, 0x6c, 0x61, 0x74, 0x65, 0x72, 0x61, 0x6c, 0x1a, 0x68, 0x0a, 0x0d, 0x41, 0x64, 0x64, 0x43, 0x6f, 0x6c, 0x6c, 0x61, 0x74, 0x65, 0x72, 0x61, 0x6c, 0x12, 0x23, 0x0a, 0x0d, 0x66, 0x72, 0x61, 0x78, 0x6c, 0x65, 0x6e, 0x64, - 0x5f, 0x70, 0x61, 0x69, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x66, 0x72, 0x61, + 0x5f, 0x70, 0x61, 0x69, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x66, 0x72, 0x61, 0x78, 0x6c, 0x65, 0x6e, 0x64, 0x50, 0x61, 0x69, 0x72, 0x12, 0x32, 0x0a, 0x15, 0x63, 0x6f, 0x6c, 0x6c, 0x61, 0x74, 0x65, 0x72, 0x61, 0x6c, 0x5f, 0x74, 0x6f, 0x5f, 0x64, 0x65, 0x70, 0x6f, 0x73, - 0x69, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x13, 0x63, 0x6f, 0x6c, 0x6c, 0x61, 0x74, + 0x69, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x13, 0x63, 0x6f, 0x6c, 0x6c, 0x61, 0x74, 0x65, 0x72, 0x61, 0x6c, 0x54, 0x6f, 0x44, 0x65, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x1a, 0x64, 0x0a, 0x10, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x43, 0x6f, 0x6c, 0x6c, 0x61, 0x74, 0x65, 0x72, 0x61, 0x6c, 0x12, 0x2b, 0x0a, 0x11, 0x63, 0x6f, 0x6c, 0x6c, 0x61, 0x74, 0x65, 0x72, 0x61, 0x6c, 0x5f, diff --git a/steward_proto_go/steward_proto/debt_f_token.pb.go b/steward_proto_go/steward_proto/debt_f_token.pb.go index efee5e66..9fd73301 100644 --- a/steward_proto_go/steward_proto/debt_f_token.pb.go +++ b/steward_proto_go/steward_proto/debt_f_token.pb.go @@ -309,7 +309,7 @@ func (x *DebtFTokenAdaptorV1_RepayFraxlendDebt) GetDebtTokenRepayAmount() string // // Allows a strategist to call `addInterest` on a Frax Pair they are using // -// Represents `function callAddInterest(IFToken fToken)` +// Represents `function callAddInterest(IFToken _fraxlendPair)` type DebtFTokenAdaptorV1_CallAddInterest struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache diff --git a/steward_proto_rust/src/prost/descriptor.bin b/steward_proto_rust/src/prost/descriptor.bin index ad3c0da1..b4b84cd8 100644 Binary files a/steward_proto_rust/src/prost/descriptor.bin and b/steward_proto_rust/src/prost/descriptor.bin differ diff --git a/steward_proto_rust/src/prost/steward.v3.rs b/steward_proto_rust/src/prost/steward.v3.rs index 3797de73..b2893fe3 100644 --- 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.