Skip to content

Commit

Permalink
Merge branch 'feat/sdk-50' into chore/replace-keeper-methods
Browse files Browse the repository at this point in the history
  • Loading branch information
joldie777 committed May 3, 2024
2 parents a0e5cd6 + 7712cf1 commit 6fec812
Show file tree
Hide file tree
Showing 7 changed files with 83 additions and 7 deletions.
2 changes: 1 addition & 1 deletion packages/neutron-sdk/src/proto_types/NEUTRON_COMMIT
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v3.0.3
2bf5ac94f7dbb8c31985c8f789bc8e49094adce0
63 changes: 63 additions & 0 deletions packages/neutron-sdk/src/proto_types/gaia.globalfee.v1beta1.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
// @generated
/// Params defines the set of module parameters.
#[derive(Clone, PartialEq, ::prost::Message)]
pub struct Params {
/// minimum_gas_prices stores the minimum gas price(s) for all TX on the chain.
/// When multiple coins are defined then they are accepted alternatively.
/// The list must be sorted by denoms asc. No duplicate denoms or zero amount
/// values allowed. For more information see
/// <https://docs.cosmos.network/main/modules/auth#concepts>
#[prost(message, repeated, tag = "1")]
pub minimum_gas_prices:
::prost::alloc::vec::Vec<cosmos_sdk_proto::cosmos::base::v1beta1::DecCoin>,
/// bypass_min_fee_msg_types defines a list of message type urls
/// that are free of fee charge.
#[prost(string, repeated, tag = "2")]
pub bypass_min_fee_msg_types: ::prost::alloc::vec::Vec<::prost::alloc::string::String>,
/// max_total_bypass_min_fee_msg_gas_usage defines the total maximum gas usage
/// allowed for a transaction containing only messages of types in bypass_min_fee_msg_types
/// to bypass fee charge.
#[prost(uint64, tag = "3")]
pub max_total_bypass_min_fee_msg_gas_usage: u64,
}
/// GenesisState - initial state of module
#[derive(Clone, PartialEq, ::prost::Message)]
pub struct GenesisState {
/// Params of this module
#[prost(message, optional, tag = "1")]
pub params: ::core::option::Option<Params>,
}
/// QueryMinimumGasPricesRequest is the request type for the
/// Query/MinimumGasPrices RPC method.
#[derive(Clone, PartialEq, ::prost::Message)]
pub struct QueryParamsRequest {}
/// QueryMinimumGasPricesResponse is the response type for the
/// Query/MinimumGasPrices RPC method.
#[derive(Clone, PartialEq, ::prost::Message)]
pub struct QueryParamsResponse {
#[prost(message, optional, tag = "1")]
pub params: ::core::option::Option<Params>,
}
// this line is used by starport scaffolding # proto/tx/message

/// MsgUpdateParams is the MsgUpdateParams request type.
///
/// Since: 0.47
#[derive(Clone, PartialEq, ::prost::Message)]
pub struct MsgUpdateParams {
/// Authority is the address of the governance account.
#[prost(string, tag = "1")]
pub authority: ::prost::alloc::string::String,
/// params defines the x/globalfee parameters to update.
///
/// NOTE: All parameters must be supplied.
#[prost(message, optional, tag = "2")]
pub params: ::core::option::Option<Params>,
}
/// MsgUpdateParamsResponse defines the response structure for executing a
/// MsgUpdateParams message.
///
/// Since: 0.47
#[derive(Clone, PartialEq, ::prost::Message)]
pub struct MsgUpdateParamsResponse {}
// @@protoc_insertion_point(module)
7 changes: 7 additions & 0 deletions packages/neutron-sdk/src/proto_types/mod.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
pub mod gaia {
pub mod globalfee {
pub mod v1beta1 {
include!("gaia.globalfee.v1beta1.rs");
}
}
}
pub mod neutron {
pub mod contractmanager {
include!("neutron.contractmanager.rs");
Expand Down
4 changes: 4 additions & 0 deletions packages/neutron-sdk/src/proto_types/neutron.dex.rs
Original file line number Diff line number Diff line change
Expand Up @@ -360,11 +360,15 @@ pub struct QueryGetLimitOrderTrancheUserRequest {
pub address: ::prost::alloc::string::String,
#[prost(string, tag = "2")]
pub tranche_key: ::prost::alloc::string::String,
#[prost(bool, tag = "3")]
pub calc_withdrawable_shares: bool,
}
#[derive(Clone, PartialEq, ::prost::Message)]
pub struct QueryGetLimitOrderTrancheUserResponse {
#[prost(message, optional, tag = "1")]
pub limit_order_tranche_user: ::core::option::Option<LimitOrderTrancheUser>,
#[prost(string, tag = "2")]
pub withdrawable_shares: ::prost::alloc::string::String,
}
#[derive(Clone, PartialEq, ::prost::Message)]
pub struct QueryAllLimitOrderTrancheUserRequest {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ pub struct StorageValue {
/// is the Merkle Proof which proves existence of key-value pair in IAVL
/// storage
#[prost(message, optional, tag = "4")]
pub proof: ::core::option::Option<tendermint_proto::v0_37::crypto::ProofOps>,
pub proof: ::core::option::Option<tendermint_proto::v0_38::crypto::ProofOps>,
}
#[derive(Clone, PartialEq, ::prost::Message)]
pub struct Block {
Expand All @@ -158,15 +158,15 @@ pub struct Block {
#[derive(Clone, PartialEq, ::prost::Message)]
pub struct TxValue {
#[prost(message, optional, tag = "1")]
pub response: ::core::option::Option<tendermint_proto::v0_37::abci::ResponseDeliverTx>,
pub response: ::core::option::Option<tendermint_proto::v0_38::abci::ExecTxResult>,
/// is the Merkle Proof which proves existence of response in block with height
/// next_block_header.Height
#[prost(message, optional, tag = "2")]
pub delivery_proof: ::core::option::Option<tendermint_proto::v0_37::crypto::Proof>,
pub delivery_proof: ::core::option::Option<tendermint_proto::v0_38::crypto::Proof>,
/// is the Merkle Proof which proves existence of data in block with height
/// header.Height
#[prost(message, optional, tag = "3")]
pub inclusion_proof: ::core::option::Option<tendermint_proto::v0_37::crypto::Proof>,
pub inclusion_proof: ::core::option::Option<tendermint_proto::v0_38::crypto::Proof>,
/// is body of the transaction
#[prost(bytes = "vec", tag = "4")]
pub data: ::prost::alloc::vec::Vec<u8>,
Expand Down
4 changes: 3 additions & 1 deletion packages/neutron-sdk/src/stargate/dex/types.rs
Original file line number Diff line number Diff line change
Expand Up @@ -237,18 +237,21 @@ impl From<ParamsRequest> for QueryParamsRequest {
pub struct LimitOrderTrancheUserRequest {
pub address: String,
pub tranche_key: String,
pub calc_withdrawable_shares: bool,
}

#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq, JsonSchema)]
pub struct LimitOrderTrancheUserResponse {
pub limit_order_tranche_user: Option<LimitOrderTrancheUser>,
pub withdrawable_shares: Option<String>,
}

impl From<LimitOrderTrancheUserRequest> for QueryGetLimitOrderTrancheUserRequest {
fn from(v: LimitOrderTrancheUserRequest) -> QueryGetLimitOrderTrancheUserRequest {
QueryGetLimitOrderTrancheUserRequest {
address: v.address,
tranche_key: v.tranche_key,
calc_withdrawable_shares: v.calc_withdrawable_shares,
}
}
}
Expand Down Expand Up @@ -619,7 +622,6 @@ pub struct GetPoolMetadataRequest {

#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq, JsonSchema)]
pub struct GetPoolMetadataResponse {
#[serde(rename(deserialize = "Pool_metadata"))]
pub pool_metadata: PoolMetadata,
}

Expand Down
2 changes: 1 addition & 1 deletion proto-build/buf.neutron.gen.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ plugins:
opt:
- extern_path=.cosmos=.cosmos_sdk_proto::cosmos
- extern_path=.ibc=.cosmos_sdk_proto::ibc
- extern_path=.tendermint=tendermint_proto::v0_37
- extern_path=.tendermint=tendermint_proto::v0_38

0 comments on commit 6fec812

Please sign in to comment.