Skip to content

Commit

Permalink
regenerate proto against reformat proto neutron branch
Browse files Browse the repository at this point in the history
  • Loading branch information
Neutron Node User committed Dec 20, 2023
1 parent 98f51ec commit 9d91a00
Show file tree
Hide file tree
Showing 7 changed files with 115 additions and 111 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 @@
5845ebddc3f85802fd35661f78efd2c7b61e4724
60b7d38358efb2f8e45e25ee4db8e19a6462dd9e
1 change: 0 additions & 1 deletion packages/neutron-sdk/src/proto_types/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ pub mod neutron {
}

pub mod interchaintxs {
include!("neutron.interchaintxs.rs");
pub mod v1 {
include!("neutron.interchaintxs.v1.rs");
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
// @generated
/// Failure message contains information about ACK failures and can be used to
/// replay ACK in case of requirement.
/// Note that Failure means that sudo handler to cosmwasm contract failed for some reason
/// Note that Failure means that sudo handler to cosmwasm contract failed for
/// some reason
#[derive(Clone, PartialEq, ::prost::Message)]
pub struct Failure {
/// Address of the failed contract
Expand Down
117 changes: 61 additions & 56 deletions packages/neutron-sdk/src/proto_types/neutron.dex.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,45 @@ pub struct DepositRecord {
#[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,
}
#[derive(Clone, PartialEq, ::prost::Message)]
pub struct LimitOrderTrancheKey {
#[prost(message, optional, tag = "1")]
pub trade_pair_id: ::core::option::Option<TradePairId>,
#[prost(int64, tag = "2")]
pub tick_index_taker_to_maker: i64,
#[prost(string, tag = "3")]
pub tranche_key: ::prost::alloc::string::String,
}
#[derive(Clone, PartialEq, ::prost::Message)]
pub struct LimitOrderTranche {
#[prost(message, optional, tag = "1")]
pub key: ::core::option::Option<LimitOrderTrancheKey>,
#[prost(string, tag = "2")]
pub reserves_maker_denom: ::prost::alloc::string::String,
#[prost(string, tag = "3")]
pub reserves_taker_denom: ::prost::alloc::string::String,
#[prost(string, tag = "4")]
pub total_maker_denom: ::prost::alloc::string::String,
#[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.
#[prost(message, optional, tag = "6")]
pub expiration_time: ::core::option::Option<::prost_types::Timestamp>,
#[prost(string, tag = "7")]
pub price_taker_to_maker: ::prost::alloc::string::String,
}
/// Params defines the parameters for the module.
#[derive(Clone, PartialEq, ::prost::Message)]
pub struct Params {
Expand All @@ -30,13 +69,6 @@ pub struct Params {
pub max_true_taker_spread: ::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 DepositOptions {
#[prost(bool, tag = "1")]
pub disable_autoswap: bool,
Expand Down Expand Up @@ -118,8 +150,9 @@ pub struct MsgPlaceLimitOrderResponse {
#[prost(message, optional, tag = "2")]
pub coin_in: ::core::option::Option<cosmos_sdk_proto::cosmos::base::v1beta1::Coin>,
/// Total amount of coin received from the taker portion of the limit order
/// This is the amount of coin immediately available in the users account after executing the
/// limit order. It does not include any future proceeds from the maker portion which will have withdrawn in the future
/// This is the amount of coin immediately available in the users account after
/// executing the limit order. It does not include any future proceeds from the
/// maker portion which will have withdrawn in the future
#[prost(message, optional, tag = "3")]
pub taker_coin_out: ::core::option::Option<cosmos_sdk_proto::cosmos::base::v1beta1::Coin>,
}
Expand Down Expand Up @@ -158,8 +191,8 @@ pub struct MsgMultiHopSwap {
pub amount_in: ::prost::alloc::string::String,
#[prost(string, tag = "5")]
pub exit_limit_price: ::prost::alloc::string::String,
/// If pickBestRoute == true then all routes are run and the route with the best price is chosen
/// otherwise, the first succesful route is used.
/// If pickBestRoute == true then all routes are run and the route with the
/// best price is chosen otherwise, the first succesful route is used.
#[prost(bool, tag = "6")]
pub pick_best_route: bool,
}
Expand Down Expand Up @@ -227,35 +260,15 @@ pub struct LimitOrderTrancheUser {
pub order_type: i32,
}
#[derive(Clone, PartialEq, ::prost::Message)]
pub struct LimitOrderTrancheKey {
#[prost(message, optional, tag = "1")]
pub trade_pair_id: ::core::option::Option<TradePairId>,
pub struct PoolMetadata {
#[prost(uint64, tag = "1")]
pub id: u64,
#[prost(int64, tag = "2")]
pub tick_index_taker_to_maker: i64,
#[prost(string, tag = "3")]
pub tranche_key: ::prost::alloc::string::String,
}
#[derive(Clone, PartialEq, ::prost::Message)]
pub struct LimitOrderTranche {
#[prost(message, optional, tag = "1")]
pub key: ::core::option::Option<LimitOrderTrancheKey>,
#[prost(string, tag = "2")]
pub reserves_maker_denom: ::prost::alloc::string::String,
#[prost(string, tag = "3")]
pub reserves_taker_denom: ::prost::alloc::string::String,
#[prost(string, tag = "4")]
pub total_maker_denom: ::prost::alloc::string::String,
/// GoodTilDate is represented as seconds since January 1, year 1, 00:00:00.00 UTC
/// LimitOrders with goodTilDate set are valid as long as blockTime <= goodTilDate
#[prost(string, tag = "5")]
pub total_taker_denom: ::prost::alloc::string::String,
/// JIT orders also use goodTilDate to handle deletion but represent a special case
/// All JIT orders have a goodTilDate of 0 and an exception is made to still 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")]
pub price_taker_to_maker: ::prost::alloc::string::String,
pub tick: i64,
#[prost(uint64, tag = "3")]
pub fee: u64,
#[prost(message, optional, tag = "4")]
pub pair_id: ::core::option::Option<PairId>,
}
#[derive(Clone, PartialEq, ::prost::Message)]
pub struct PoolReservesKey {
Expand Down Expand Up @@ -292,17 +305,6 @@ pub mod tick_liquidity {
LimitOrderTranche(super::LimitOrderTranche),
}
}
#[derive(Clone, PartialEq, ::prost::Message)]
pub struct PoolMetadata {
#[prost(uint64, tag = "1")]
pub id: u64,
#[prost(int64, tag = "2")]
pub tick: i64,
#[prost(uint64, tag = "3")]
pub fee: u64,
#[prost(message, optional, tag = "4")]
pub pair_id: ::core::option::Option<PairId>,
}
/// GenesisState defines the dex module's genesis state.
#[derive(Clone, PartialEq, ::prost::Message)]
pub struct GenesisState {
Expand All @@ -328,7 +330,8 @@ pub struct LimitOrderExpiration {
#[prost(bytes = "vec", tag = "2")]
pub tranche_ref: ::prost::alloc::vec::Vec<u8>,
}
// NOTE: This struct is never actually stored in the KV store. It is merely a convenience wrapper for holding both sides of a pool.
// 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 {
Expand Down Expand Up @@ -535,8 +538,8 @@ pub struct QueryEstimateMultiHopSwapRequest {
pub amount_in: ::prost::alloc::string::String,
#[prost(string, tag = "5")]
pub exit_limit_price: ::prost::alloc::string::String,
/// If pickBestRoute == true then all routes are run and the route with the best price is chosen
/// otherwise, the first succesful route is used.
/// If pickBestRoute == true then all routes are run and the route with the
/// best price is chosen otherwise, the first succesful route is used.
#[prost(bool, tag = "6")]
pub pick_best_route: bool,
}
Expand Down Expand Up @@ -570,15 +573,17 @@ pub struct QueryEstimatePlaceLimitOrderRequest {
#[derive(Clone, PartialEq, ::prost::Message)]
pub struct QueryEstimatePlaceLimitOrderResponse {
/// Total amount of coin used for the limit order
/// You can derive makerLimitInCoin using the equation: totalInCoin = swapInCoin + makerLimitInCoin
/// You can derive makerLimitInCoin using the equation: totalInCoin =
/// swapInCoin + makerLimitInCoin
#[prost(message, optional, tag = "1")]
pub total_in_coin: ::core::option::Option<cosmos_sdk_proto::cosmos::base::v1beta1::Coin>,
/// Total amount of the token in that was immediately swapped for swapOutCoin
#[prost(message, optional, tag = "2")]
pub swap_in_coin: ::core::option::Option<cosmos_sdk_proto::cosmos::base::v1beta1::Coin>,
/// Total amount of coin received from the taker portion of the limit order
/// This is the amount of coin immediately available in the users account after executing the
/// limit order. It does not include any future proceeds from the maker portion which will have withdrawn in the future
/// This is the amount of coin immediately available in the users account after
/// executing the limit order. It does not include any future proceeds from the
/// maker portion which will have withdrawn in the future
#[prost(message, optional, tag = "3")]
pub swap_out_coin: ::core::option::Option<cosmos_sdk_proto::cosmos::base::v1beta1::Coin>,
}
Expand Down
50 changes: 0 additions & 50 deletions packages/neutron-sdk/src/proto_types/neutron.interchaintxs.rs

This file was deleted.

50 changes: 49 additions & 1 deletion packages/neutron-sdk/src/proto_types/neutron.interchaintxs.v1.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,52 @@
// @generated
/// Params defines the parameters for the module.
#[derive(Clone, PartialEq, ::prost::Message)]
pub struct Params {
/// Defines maximum amount of messages to be passed in MsgSubmitTx
#[prost(uint64, tag = "1")]
pub msg_submit_tx_max_messages: u64,
/// Defines a minimum fee required to register interchain account
#[prost(message, repeated, tag = "2")]
pub register_fee: ::prost::alloc::vec::Vec<cosmos_sdk_proto::cosmos::base::v1beta1::Coin>,
}
/// GenesisState defines the interchaintxs module's genesis state.
#[derive(Clone, PartialEq, ::prost::Message)]
pub struct GenesisState {
#[prost(message, optional, tag = "1")]
pub params: ::core::option::Option<Params>,
}
/// QueryParamsRequest is request type for the Query/Params RPC method.
#[derive(Clone, PartialEq, ::prost::Message)]
pub struct QueryParamsRequest {}
/// QueryParamsResponse is response type for the Query/Params RPC method.
#[derive(Clone, PartialEq, ::prost::Message)]
pub struct QueryParamsResponse {
/// params holds all the parameters of this module.
#[prost(message, optional, tag = "1")]
pub params: ::core::option::Option<Params>,
}
#[derive(Clone, PartialEq, ::prost::Message)]
pub struct QueryInterchainAccountAddressRequest {
/// owner_address is the owner of the interchain account on the controller
/// chain
#[prost(string, tag = "1")]
pub owner_address: ::prost::alloc::string::String,
/// interchain_account_id is an identifier of your interchain account from
/// which you want to execute msgs
#[prost(string, tag = "2")]
pub interchain_account_id: ::prost::alloc::string::String,
/// connection_id is an IBC connection identifier between Neutron and remote
/// chain
#[prost(string, tag = "3")]
pub connection_id: ::prost::alloc::string::String,
}
/// Query response for an interchain account address
#[derive(Clone, PartialEq, ::prost::Message)]
pub struct QueryInterchainAccountAddressResponse {
/// The corresponding interchain account address on the host chain
#[prost(string, tag = "1")]
pub interchain_account_address: ::prost::alloc::string::String,
}
/// MsgRegisterInterchainAccount is used to register an account on a remote zone.
#[derive(Clone, PartialEq, ::prost::Message)]
pub struct MsgRegisterInterchainAccount {
Expand Down Expand Up @@ -60,7 +108,7 @@ pub struct MsgUpdateParams {
///
/// NOTE: All parameters must be supplied.
#[prost(message, optional, tag = "2")]
pub params: ::core::option::Option<super::Params>,
pub params: ::core::option::Option<Params>,
}
/// MsgUpdateParamsResponse defines the response structure for executing a
/// MsgUpdateParams message.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@ pub struct Params {
/// See: <https://github.com/CosmWasm/token-factory/issues/11>
#[prost(uint64, tag = "2")]
pub denom_creation_gas_consume: u64,
/// FeeCollectorAddress is the address where fees collected from denom creation are sent to
/// FeeCollectorAddress is the address where fees collected from denom creation
/// are sent to
#[prost(string, tag = "3")]
pub fee_collector_address: ::prost::alloc::string::String,
}
Expand Down

0 comments on commit 9d91a00

Please sign in to comment.