Skip to content

Commit 1917ebb

Browse files
authored
Merge pull request #62 from osmosis-labs/osmosis-v13
Osmosis v13
2 parents b3df851 + 819a8cc commit 1917ebb

File tree

24 files changed

+480
-597
lines changed

24 files changed

+480
-597
lines changed

dependencies/osmosis

Submodule osmosis updated 594 files
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v13.0.0-rc2
1+
v13.1.1

packages/osmosis-std/src/types/cosmos/bank/v1beta1.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ pub struct Output {
8686
CosmwasmExt,
8787
)]
8888
#[proto_message(type_url = "/cosmos.bank.v1beta1.Supply")]
89+
#[deprecated]
8990
pub struct Supply {
9091
#[prost(message, repeated, tag = "1")]
9192
pub total: ::prost::alloc::vec::Vec<super::super::base::v1beta1::Coin>,

packages/osmosis-std/src/types/osmosis/gamm/v1beta1.rs

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -873,6 +873,49 @@ pub struct QueryTotalSharesResponse {
873873
#[prost(message, optional, tag = "1")]
874874
pub total_shares: ::core::option::Option<super::super::super::cosmos::base::v1beta1::Coin>,
875875
}
876+
///=============================== CalcJoinPoolNoSwapShares
877+
#[derive(
878+
Clone,
879+
PartialEq,
880+
Eq,
881+
::prost::Message,
882+
serde::Serialize,
883+
serde::Deserialize,
884+
schemars::JsonSchema,
885+
CosmwasmExt,
886+
)]
887+
#[proto_message(type_url = "/osmosis.gamm.v1beta1.QueryCalcJoinPoolNoSwapSharesRequest")]
888+
#[proto_query(
889+
path = "/osmosis.gamm.v1beta1.Query/CalcJoinPoolNoSwapShares",
890+
response_type = QueryCalcJoinPoolNoSwapSharesResponse
891+
)]
892+
pub struct QueryCalcJoinPoolNoSwapSharesRequest {
893+
#[prost(uint64, tag = "1")]
894+
#[serde(
895+
serialize_with = "crate::serde::as_str::serialize",
896+
deserialize_with = "crate::serde::as_str::deserialize"
897+
)]
898+
pub pool_id: u64,
899+
#[prost(message, repeated, tag = "2")]
900+
pub tokens_in: ::prost::alloc::vec::Vec<super::super::super::cosmos::base::v1beta1::Coin>,
901+
}
902+
#[derive(
903+
Clone,
904+
PartialEq,
905+
Eq,
906+
::prost::Message,
907+
serde::Serialize,
908+
serde::Deserialize,
909+
schemars::JsonSchema,
910+
CosmwasmExt,
911+
)]
912+
#[proto_message(type_url = "/osmosis.gamm.v1beta1.QueryCalcJoinPoolNoSwapSharesResponse")]
913+
pub struct QueryCalcJoinPoolNoSwapSharesResponse {
914+
#[prost(message, repeated, tag = "1")]
915+
pub tokens_out: ::prost::alloc::vec::Vec<super::super::super::cosmos::base::v1beta1::Coin>,
916+
#[prost(string, tag = "2")]
917+
pub shares_out: ::prost::alloc::string::String,
918+
}
876919
/// QuerySpotPriceRequest defines the gRPC request structure for a SpotPrice
877920
/// query.
878921
#[derive(
@@ -890,6 +933,7 @@ pub struct QueryTotalSharesResponse {
890933
path = "/osmosis.gamm.v1beta1.Query/SpotPrice",
891934
response_type = QuerySpotPriceResponse
892935
)]
936+
#[deprecated]
893937
pub struct QuerySpotPriceRequest {
894938
#[prost(uint64, tag = "1")]
895939
#[serde(
@@ -922,6 +966,9 @@ pub struct QueryPoolsWithFilterRequest {
922966
pub min_liquidity: ::prost::alloc::vec::Vec<super::super::super::cosmos::base::v1beta1::Coin>,
923967
#[prost(string, tag = "2")]
924968
pub pool_type: ::prost::alloc::string::String,
969+
#[prost(message, optional, tag = "3")]
970+
pub pagination:
971+
::core::option::Option<super::super::super::cosmos::base::query::v1beta1::PageRequest>,
925972
}
926973
#[derive(
927974
Clone,
@@ -937,6 +984,10 @@ pub struct QueryPoolsWithFilterRequest {
937984
pub struct QueryPoolsWithFilterResponse {
938985
#[prost(message, repeated, tag = "1")]
939986
pub pools: ::prost::alloc::vec::Vec<crate::shim::Any>,
987+
/// pagination defines the pagination in the response.
988+
#[prost(message, optional, tag = "2")]
989+
pub pagination:
990+
::core::option::Option<super::super::super::cosmos::base::query::v1beta1::PageResponse>,
940991
}
941992
/// QuerySpotPriceResponse defines the gRPC response structure for a SpotPrice
942993
/// query.
@@ -951,6 +1002,7 @@ pub struct QueryPoolsWithFilterResponse {
9511002
CosmwasmExt,
9521003
)]
9531004
#[proto_message(type_url = "/osmosis.gamm.v1beta1.QuerySpotPriceResponse")]
1005+
#[deprecated]
9541006
pub struct QuerySpotPriceResponse {
9551007
/// String of the Dec. Ex) 10.203uatom
9561008
#[prost(string, tag = "1")]
@@ -973,6 +1025,7 @@ pub struct QuerySpotPriceResponse {
9731025
response_type = QuerySwapExactAmountInResponse
9741026
)]
9751027
pub struct QuerySwapExactAmountInRequest {
1028+
/// TODO: CHANGE THIS TO RESERVED IN A PATCH RELEASE
9761029
#[prost(string, tag = "1")]
9771030
pub sender: ::prost::alloc::string::String,
9781031
#[prost(uint64, tag = "2")]
@@ -1018,6 +1071,7 @@ pub struct QuerySwapExactAmountInResponse {
10181071
response_type = QuerySwapExactAmountOutResponse
10191072
)]
10201073
pub struct QuerySwapExactAmountOutRequest {
1074+
/// TODO: CHANGE THIS TO RESERVED IN A PATCH RELEASE
10211075
#[prost(string, tag = "1")]
10221076
pub sender: ::prost::alloc::string::String,
10231077
#[prost(uint64, tag = "2")]
@@ -1144,10 +1198,14 @@ impl<'a, Q: cosmwasm_std::CustomQuery> GammQuerier<'a, Q> {
11441198
&self,
11451199
min_liquidity: ::prost::alloc::vec::Vec<super::super::super::cosmos::base::v1beta1::Coin>,
11461200
pool_type: ::prost::alloc::string::String,
1201+
pagination: ::core::option::Option<
1202+
super::super::super::cosmos::base::query::v1beta1::PageRequest,
1203+
>,
11471204
) -> Result<QueryPoolsWithFilterResponse, cosmwasm_std::StdError> {
11481205
QueryPoolsWithFilterRequest {
11491206
min_liquidity,
11501207
pool_type,
1208+
pagination,
11511209
}
11521210
.query(self.querier)
11531211
}
@@ -1157,6 +1215,13 @@ impl<'a, Q: cosmwasm_std::CustomQuery> GammQuerier<'a, Q> {
11571215
pub fn pool_type(&self, pool_id: u64) -> Result<QueryPoolTypeResponse, cosmwasm_std::StdError> {
11581216
QueryPoolTypeRequest { pool_id }.query(self.querier)
11591217
}
1218+
pub fn calc_join_pool_no_swap_shares(
1219+
&self,
1220+
pool_id: u64,
1221+
tokens_in: ::prost::alloc::vec::Vec<super::super::super::cosmos::base::v1beta1::Coin>,
1222+
) -> Result<QueryCalcJoinPoolNoSwapSharesResponse, cosmwasm_std::StdError> {
1223+
QueryCalcJoinPoolNoSwapSharesRequest { pool_id, tokens_in }.query(self.querier)
1224+
}
11601225
pub fn calc_join_pool_shares(
11611226
&self,
11621227
pool_id: u64,
@@ -1193,6 +1258,7 @@ impl<'a, Q: cosmwasm_std::CustomQuery> GammQuerier<'a, Q> {
11931258
) -> Result<QueryTotalSharesResponse, cosmwasm_std::StdError> {
11941259
QueryTotalSharesRequest { pool_id }.query(self.querier)
11951260
}
1261+
#[deprecated]
11961262
pub fn spot_price(
11971263
&self,
11981264
pool_id: u64,

packages/osmosis-std/src/types/osmosis/ibcratelimit/v1beta1.rs

Lines changed: 46 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
use osmosis_std_derive::CosmwasmExt;
2-
/// Params defines the parameters for the ibc-rate-limiting module.
2+
/// Params defines the parameters for the ibc-rate-limit module.
33
#[derive(
44
Clone,
55
PartialEq,
@@ -15,3 +15,48 @@ pub struct Params {
1515
#[prost(string, tag = "1")]
1616
pub contract_address: ::prost::alloc::string::String,
1717
}
18+
/// QueryParamsRequest is the request type for the Query/Params RPC method.
19+
#[derive(
20+
Clone,
21+
PartialEq,
22+
Eq,
23+
::prost::Message,
24+
serde::Serialize,
25+
serde::Deserialize,
26+
schemars::JsonSchema,
27+
CosmwasmExt,
28+
)]
29+
#[proto_message(type_url = "/osmosis.ibcratelimit.v1beta1.QueryParamsRequest")]
30+
#[proto_query(
31+
path = "/osmosis.ibcratelimit.v1beta1.Query/Params",
32+
response_type = QueryParamsResponse
33+
)]
34+
pub struct QueryParamsRequest {}
35+
/// QueryParamsResponse is the response type for the Query/Params RPC method.
36+
#[derive(
37+
Clone,
38+
PartialEq,
39+
Eq,
40+
::prost::Message,
41+
serde::Serialize,
42+
serde::Deserialize,
43+
schemars::JsonSchema,
44+
CosmwasmExt,
45+
)]
46+
#[proto_message(type_url = "/osmosis.ibcratelimit.v1beta1.QueryParamsResponse")]
47+
pub struct QueryParamsResponse {
48+
/// params defines the parameters of the module.
49+
#[prost(message, optional, tag = "1")]
50+
pub params: ::core::option::Option<Params>,
51+
}
52+
pub struct IbcratelimitQuerier<'a, Q: cosmwasm_std::CustomQuery> {
53+
querier: &'a cosmwasm_std::QuerierWrapper<'a, Q>,
54+
}
55+
impl<'a, Q: cosmwasm_std::CustomQuery> IbcratelimitQuerier<'a, Q> {
56+
pub fn new(querier: &'a cosmwasm_std::QuerierWrapper<'a, Q>) -> Self {
57+
Self { querier }
58+
}
59+
pub fn params(&self) -> Result<QueryParamsResponse, cosmwasm_std::StdError> {
60+
QueryParamsRequest {}.query(self.querier)
61+
}
62+
}

packages/osmosis-std/src/types/osmosis/mod.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,3 @@ pub mod superfluid;
1010
pub mod tokenfactory;
1111
pub mod twap;
1212
pub mod txfees;
13-
pub mod validatorpreference;

packages/osmosis-std/src/types/osmosis/superfluid/mod.rs

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -915,6 +915,37 @@ pub struct QueryTotalDelegationByDelegatorResponse {
915915
pub total_equivalent_staked_amount:
916916
::core::option::Option<super::super::cosmos::base::v1beta1::Coin>,
917917
}
918+
#[derive(
919+
Clone,
920+
PartialEq,
921+
Eq,
922+
::prost::Message,
923+
serde::Serialize,
924+
serde::Deserialize,
925+
schemars::JsonSchema,
926+
CosmwasmExt,
927+
)]
928+
#[proto_message(type_url = "/osmosis.superfluid.QueryUnpoolWhitelistRequest")]
929+
#[proto_query(
930+
path = "/osmosis.superfluid.Query/UnpoolWhitelist",
931+
response_type = QueryUnpoolWhitelistResponse
932+
)]
933+
pub struct QueryUnpoolWhitelistRequest {}
934+
#[derive(
935+
Clone,
936+
PartialEq,
937+
Eq,
938+
::prost::Message,
939+
serde::Serialize,
940+
serde::Deserialize,
941+
schemars::JsonSchema,
942+
CosmwasmExt,
943+
)]
944+
#[proto_message(type_url = "/osmosis.superfluid.QueryUnpoolWhitelistResponse")]
945+
pub struct QueryUnpoolWhitelistResponse {
946+
#[prost(uint64, repeated, tag = "1")]
947+
pub pool_ids: ::prost::alloc::vec::Vec<u64>,
948+
}
918949
/// GenesisState defines the module's genesis state.
919950
#[derive(
920951
Clone,
@@ -1053,4 +1084,7 @@ impl<'a, Q: cosmwasm_std::CustomQuery> SuperfluidQuerier<'a, Q> {
10531084
) -> Result<QueryTotalDelegationByDelegatorResponse, cosmwasm_std::StdError> {
10541085
QueryTotalDelegationByDelegatorRequest { delegator_address }.query(self.querier)
10551086
}
1087+
pub fn unpool_whitelist(&self) -> Result<QueryUnpoolWhitelistResponse, cosmwasm_std::StdError> {
1088+
QueryUnpoolWhitelistRequest {}.query(self.querier)
1089+
}
10561090
}

packages/osmosis-std/src/types/osmosis/superfluid/v1beta1.rs

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,3 +41,26 @@ pub struct RemoveSuperfluidAssetsProposal {
4141
#[prost(string, repeated, tag = "3")]
4242
pub superfluid_asset_denoms: ::prost::alloc::vec::Vec<::prost::alloc::string::String>,
4343
}
44+
/// UpdateUnpoolWhiteListProposal is a gov Content type to update the
45+
/// allowed list of pool ids.
46+
#[derive(
47+
Clone,
48+
PartialEq,
49+
Eq,
50+
::prost::Message,
51+
serde::Serialize,
52+
serde::Deserialize,
53+
schemars::JsonSchema,
54+
CosmwasmExt,
55+
)]
56+
#[proto_message(type_url = "/osmosis.superfluid.v1beta1.UpdateUnpoolWhiteListProposal")]
57+
pub struct UpdateUnpoolWhiteListProposal {
58+
#[prost(string, tag = "1")]
59+
pub title: ::prost::alloc::string::String,
60+
#[prost(string, tag = "2")]
61+
pub description: ::prost::alloc::string::String,
62+
#[prost(uint64, repeated, tag = "3")]
63+
pub ids: ::prost::alloc::vec::Vec<u64>,
64+
#[prost(bool, tag = "4")]
65+
pub is_overwrite: bool,
66+
}
Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
11
pub mod v1beta1;
2-
pub mod v2;

packages/osmosis-std/src/types/osmosis/twap/v1beta1.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -246,6 +246,7 @@ impl<'a, Q: cosmwasm_std::CustomQuery> TwapQuerier<'a, Q> {
246246
}
247247
.query(self.querier)
248248
}
249+
#[deprecated]
249250
pub fn arithmetic_twap_to_now(
250251
&self,
251252
pool_id: u64,

0 commit comments

Comments
 (0)