diff --git a/packages/neutron-sdk/src/proto_types/NEUTRON_COMMIT b/packages/neutron-sdk/src/proto_types/NEUTRON_COMMIT index 9c2c8938..7590ae97 100644 --- a/packages/neutron-sdk/src/proto_types/NEUTRON_COMMIT +++ b/packages/neutron-sdk/src/proto_types/NEUTRON_COMMIT @@ -1 +1 @@ -60b7d38358efb2f8e45e25ee4db8e19a6462dd9e \ No newline at end of file +f6a079d67ec5c887447a8e2e2e35f2fdb58c3823 \ No newline at end of file diff --git a/packages/neutron-sdk/src/proto_types/neutron.dex.rs b/packages/neutron-sdk/src/proto_types/neutron.dex.rs index 09ddf6db..9522221f 100644 --- a/packages/neutron-sdk/src/proto_types/neutron.dex.rs +++ b/packages/neutron-sdk/src/proto_types/neutron.dex.rs @@ -7,6 +7,45 @@ pub struct PairId { pub token1: ::prost::alloc::string::String, } #[derive(Clone, PartialEq, ::prost::Message)] +pub struct TradePairId { + #[prost(string, tag = "2")] + pub maker_denom: ::prost::alloc::string::String, + #[prost(string, tag = "3")] + pub taker_denom: ::prost::alloc::string::String, +} +#[derive(Clone, PartialEq, ::prost::Message)] +pub struct PoolReservesKey { + #[prost(message, optional, tag = "1")] + pub trade_pair_id: ::core::option::Option, + #[prost(int64, tag = "2")] + pub tick_index_taker_to_maker: i64, + #[prost(uint64, tag = "3")] + pub fee: u64, +} +#[derive(Clone, PartialEq, ::prost::Message)] +pub struct PoolReserves { + #[prost(message, optional, tag = "1")] + pub key: ::core::option::Option, + #[prost(string, tag = "2")] + pub reserves_maker_denom: ::prost::alloc::string::String, + #[prost(string, tag = "3")] + pub price_taker_to_maker: ::prost::alloc::string::String, + #[prost(string, tag = "4")] + pub price_opposite_taker_to_maker: ::prost::alloc::string::String, +} +// NOTE: This struct is never actually stored in the KV store. It is merely a +// convenience wrapper for holding both sides of a pool. + +#[derive(Clone, PartialEq, ::prost::Message)] +pub struct Pool { + #[prost(uint64, tag = "1")] + pub id: u64, + #[prost(message, optional, tag = "2")] + pub lower_tick0: ::core::option::Option, + #[prost(message, optional, tag = "3")] + pub upper_tick1: ::core::option::Option, +} +#[derive(Clone, PartialEq, ::prost::Message)] pub struct DepositRecord { #[prost(message, optional, tag = "1")] pub pair_id: ::core::option::Option, @@ -20,13 +59,10 @@ pub struct DepositRecord { pub upper_tick_index: i64, #[prost(uint64, tag = "6")] pub fee: u64, -} -#[derive(Clone, PartialEq, ::prost::Message)] -pub struct TradePairId { - #[prost(string, tag = "2")] - pub maker_denom: ::prost::alloc::string::String, - #[prost(string, tag = "3")] - pub taker_denom: ::prost::alloc::string::String, + #[prost(string, tag = "7")] + pub total_shares: ::prost::alloc::string::String, + #[prost(message, optional, tag = "8")] + pub pool: ::core::option::Option, } #[derive(Clone, PartialEq, ::prost::Message)] pub struct LimitOrderTrancheKey { @@ -47,14 +83,12 @@ pub struct LimitOrderTranche { pub reserves_taker_denom: ::prost::alloc::string::String, #[prost(string, tag = "4")] pub total_maker_denom: ::prost::alloc::string::String, + /// LimitOrders with expiration_time set are valid as long as blockTime <= expiration_time #[prost(string, tag = "5")] pub total_taker_denom: ::prost::alloc::string::String, - /// expiration_time is represented as an RFC 3339 formatted date. - /// LimitOrders with expiration_time set are valid as long as blockTime <= expiration_time. - /// JIT orders also use expiration_time to handle deletion, but represent a special case. - /// All JIT orders have an expiration_time of 0001-01-01T00:00:00Z, and an exception is made to - /// still treat these orders as live. Order deletion still functions the - /// same, and the orders will be deleted at the end of the block. + /// JIT orders also use expiration_time to handle deletion but represent a special case + /// All JIT orders have a expiration_time of 0 and an exception is made to still treat these orders as live + /// Order deletion still functions the same and the orders will be deleted at the end of the block #[prost(message, optional, tag = "6")] pub expiration_time: ::core::option::Option<::prost_types::Timestamp>, #[prost(string, tag = "7")] @@ -271,26 +305,6 @@ pub struct PoolMetadata { pub pair_id: ::core::option::Option, } #[derive(Clone, PartialEq, ::prost::Message)] -pub struct PoolReservesKey { - #[prost(message, optional, tag = "1")] - pub trade_pair_id: ::core::option::Option, - #[prost(int64, tag = "2")] - pub tick_index_taker_to_maker: i64, - #[prost(uint64, tag = "3")] - pub fee: u64, -} -#[derive(Clone, PartialEq, ::prost::Message)] -pub struct PoolReserves { - #[prost(message, optional, tag = "1")] - pub key: ::core::option::Option, - #[prost(string, tag = "2")] - pub reserves_maker_denom: ::prost::alloc::string::String, - #[prost(string, tag = "3")] - pub price_taker_to_maker: ::prost::alloc::string::String, - #[prost(string, tag = "4")] - pub price_opposite_taker_to_maker: ::prost::alloc::string::String, -} -#[derive(Clone, PartialEq, ::prost::Message)] pub struct TickLiquidity { #[prost(oneof = "tick_liquidity::Liquidity", tags = "1, 2")] pub liquidity: ::core::option::Option, @@ -324,24 +338,12 @@ pub struct GenesisState { } #[derive(Clone, PartialEq, ::prost::Message)] pub struct LimitOrderExpiration { - /// see limitOrderTranche.proto for details on goodTilDate + /// see limitOrderTranche.proto for details on expiration_time #[prost(message, optional, tag = "1")] pub expiration_time: ::core::option::Option<::prost_types::Timestamp>, #[prost(bytes = "vec", tag = "2")] pub tranche_ref: ::prost::alloc::vec::Vec, } -// NOTE: This struct is never actually stored in the KV store. It is merely a -// convenience wrapper for holding both sides of a pool. - -#[derive(Clone, PartialEq, ::prost::Message)] -pub struct Pool { - #[prost(uint64, tag = "1")] - pub id: u64, - #[prost(message, optional, tag = "2")] - pub lower_tick0: ::core::option::Option, - #[prost(message, optional, tag = "3")] - pub upper_tick1: ::core::option::Option, -} /// QueryParamsRequest is request type for the Query/Params RPC method. #[derive(Clone, PartialEq, ::prost::Message)] pub struct QueryParamsRequest {} @@ -419,6 +421,8 @@ pub struct QueryAllUserDepositsRequest { #[prost(message, optional, tag = "2")] pub pagination: ::core::option::Option, + #[prost(bool, tag = "3")] + pub include_pool_data: bool, } #[derive(Clone, PartialEq, ::prost::Message)] pub struct QueryAllUserDepositsResponse { diff --git a/packages/neutron-sdk/src/stargate/dex/types.rs b/packages/neutron-sdk/src/stargate/dex/types.rs index 51b3077b..35209f7e 100644 --- a/packages/neutron-sdk/src/stargate/dex/types.rs +++ b/packages/neutron-sdk/src/stargate/dex/types.rs @@ -354,6 +354,7 @@ impl From for QueryAllLimitOrderTrancheRequest { pub struct AllUserDepositsRequest { pub address: String, pub pagination: Option, + pub include_pool_data: bool, } #[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq, JsonSchema)] @@ -367,6 +368,7 @@ impl From for QueryAllUserDepositsRequest { QueryAllUserDepositsRequest { address: v.address, pagination: convert_page_request(v.pagination), + include_pool_data: v.include_pool_data, } } }