Merge pull request #218 from InjectiveLabs/f/bump-injective-std

updated to use injective-core v1.12.1 and the matching cosmos-sdk

packages/injective-std/Cargo.toml

@@ -5,7 +5,7 @@ license     = "MIT OR Apache-2.0"
 name        = "injective-std"
 readme      = "README.md"
 repository  = "https://github.com/InjectiveLabs/cw-injective/tree/dev/packages/injective-std"
-version     = "0.1.6"
+version     = "0.1.7"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

packages/injective-std/README.md

@@ -1,14 +1,14 @@
 # injective-std
 
- **BETA VERSION:**
+**BETA VERSION:**
 
 The bindings are currently tracking an unofficial release of Injective.
 
 Injective's proto-generated types and helpers built using [Buf](https://github.com/bufbuild/buf). Enables interaction with both custom and standard modules.
 
 ## Supported Version
 
-* Injective-Core@e38d508c746a9b90d6e8a261ec2b03f99cc49351
+- Injective-Core@e38d508c746a9b90d6e8a261ec2b03f99cc49351
 
 ## Build Instructions
 
@@ -22,6 +22,12 @@ In order to generate an individual proto file run:
 buf generate [/path/to/injective-core] --template [/path/to/buf.gen.yaml] --output [output-path] --path [/path/to/module/proto]
 ```
 
+Follow by:
+
+```shell
+buf build [/path/to/injective-core] --as-file-descriptor-set -o [/tmp/path/injective/descriptor_injective.bin] --path [/path/to/module/proto]
+```
+
 Example `buf.gen.yaml` file:
 
 ```yaml
@@ -32,4 +38,28 @@ plugins:
       - extern_path=.google.protobuf.Timestamp=crate::shim::Timestamp
       - extern_path=.google.protobuf.Duration=crate::shim::Duration
       - extern_path=.google.protobuf.Any=crate::shim::Any
-```
+```
+
+### Examples
+
+Lets try to create the bindings for
+
+First create a directory with the dependencies as below:
+
+```
+├── README.md
+└── dependencies
+    ├── cosmos-sdk
+    ├── injective-core
+    └── wasmd
+```
+
+Next generate the proto:
+
+```
+buf generate /Users/wandlitz/go/src/github.com/osmosis-labs/osmosis-rust/packages/proto-build-injective/../../dependencies/injective-core/proto --template /Users/wandlitz/go/src/github.com/osmosis-labs/osmosis-rust/packages/proto-build-injective/buf.gen.yaml --output ./tmp/tmp-protobuf/injective --path /Users/wandlitz/go/src/github.com/osmosis-labs/osmosis-rust/packages/proto-build-injective/../../dependencies/injective-core/proto/injective/auction
+```
+
+```
+buf build /Users/wandlitz/go/src/github.com/osmosis-labs/osmosis-rust/packages/proto-build-injective/../../dependencies/injective-core/proto  --path /Users/wandlitz/go/src/github.com/osmosis-labs/osmosis-rust/packages/proto-build-injective/../../dependencies/injective-core/proto/injective/auction
+```

packages/injective-std/src/lib.rs

@@ -2,6 +2,7 @@
 #![cfg_attr(docsrs, feature(doc_cfg))]
 #![forbid(unsafe_code)]
 #![warn(trivial_casts, trivial_numeric_casts, unused_import_braces)]
+#![allow(unused_imports, deprecated)]
 
 mod serde;
 pub mod shim;

packages/injective-std/src/types/cosmos/auth/v1beta1.rs

@@ -388,9 +388,9 @@ impl<'a, Q: cosmwasm_std::CustomQuery> AuthQuerier<'a, Q> {
     pub fn account(&self, address: ::prost::alloc::string::String) -> Result<QueryAccountResponse, cosmwasm_std::StdError> {
         QueryAccountRequest { address }.query(self.querier)
     }
-    // pub fn account_address_by_id(&self, id: i64, account_id: u64) -> Result<QueryAccountAddressByIdResponse, cosmwasm_std::StdError> {
-    //     QueryAccountAddressByIdRequest { id, account_id }.query(self.querier)
-    // }
+    pub fn account_address_by_id(&self, id: i64, account_id: u64) -> Result<QueryAccountAddressByIdResponse, cosmwasm_std::StdError> {
+        QueryAccountAddressByIdRequest { id, account_id }.query(self.querier)
+    }
     pub fn params(&self) -> Result<QueryParamsResponse, cosmwasm_std::StdError> {
         QueryParamsRequest {}.query(self.querier)
     }

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

@@ -66,14 +66,14 @@ pub struct Output {
 /// Supply represents a struct that passively keeps track of the total supply
 /// amounts in the network.
 /// This message is deprecated now that supply is indexed by denom.
-// #[allow(clippy::derive_partial_eq_without_eq)]
-// #[derive(Clone, PartialEq, Eq, ::prost::Message, ::serde::Serialize, ::serde::Deserialize, ::schemars::JsonSchema, CosmwasmExt)]
-// #[proto_message(type_url = "/cosmos.bank.v1beta1.SupplySupply")]
-// #[deprecated]
-// pub struct Supply {
-//     #[prost(message, repeated, tag = "1")]
-//     pub total: ::prost::alloc::vec::Vec<super::super::base::v1beta1::Coin>,
-// }
+#[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(Clone, PartialEq, Eq, ::prost::Message, ::serde::Serialize, ::serde::Deserialize, ::schemars::JsonSchema, CosmwasmExt)]
+#[proto_message(type_url = "/cosmos.bank.v1beta1.SupplySupply")]
+#[deprecated]
+pub struct Supply {
+    #[prost(message, repeated, tag = "1")]
+    pub total: ::prost::alloc::vec::Vec<super::super::base::v1beta1::Coin>,
+}
 /// DenomUnit represents a struct that describes a given
 /// denomination unit of the basic token.
 #[allow(clippy::derive_partial_eq_without_eq)]

packages/injective-std/src/types/cosmos/distribution/v1beta1.rs

@@ -119,20 +119,20 @@ pub struct FeePool {
 /// longer a need for an explicit CommunityPoolSpendProposal. To spend community
 /// pool funds, a simple MsgCommunityPoolSpend can be invoked from the x/gov
 /// module via a v1 governance proposal.
-// #[allow(clippy::derive_partial_eq_without_eq)]
-// #[derive(Clone, PartialEq, Eq, ::prost::Message, ::serde::Serialize, ::serde::Deserialize, ::schemars::JsonSchema, CosmwasmExt)]
-// #[proto_message(type_url = "/cosmos.distribution.v1beta1.CommunityPoolSpendProposalCommunityPoolSpendProposal")]
-// #[deprecated]
-// pub struct CommunityPoolSpendProposal {
-//     #[prost(string, tag = "1")]
-//     pub title: ::prost::alloc::string::String,
-//     #[prost(string, tag = "2")]
-//     pub description: ::prost::alloc::string::String,
-//     #[prost(string, tag = "3")]
-//     pub recipient: ::prost::alloc::string::String,
-//     #[prost(message, repeated, tag = "4")]
-//     pub amount: ::prost::alloc::vec::Vec<super::super::base::v1beta1::Coin>,
-// }
+#[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(Clone, PartialEq, Eq, ::prost::Message, ::serde::Serialize, ::serde::Deserialize, ::schemars::JsonSchema, CosmwasmExt)]
+#[proto_message(type_url = "/cosmos.distribution.v1beta1.CommunityPoolSpendProposalCommunityPoolSpendProposal")]
+#[deprecated]
+pub struct CommunityPoolSpendProposal {
+    #[prost(string, tag = "1")]
+    pub title: ::prost::alloc::string::String,
+    #[prost(string, tag = "2")]
+    pub description: ::prost::alloc::string::String,
+    #[prost(string, tag = "3")]
+    pub recipient: ::prost::alloc::string::String,
+    #[prost(message, repeated, tag = "4")]
+    pub amount: ::prost::alloc::vec::Vec<super::super::base::v1beta1::Coin>,
+}
 /// DelegatorStartingInfo represents the starting info for a delegator reward
 /// period. It tracks the previous validator period, the delegation's amount of
 /// staking token, and the creation height (to check later on if any slashes have

packages/injective-std/src/types/cosmwasm/mod.rs

@@ -0,0 +1 @@
+pub mod wasm;

packages/injective-std/src/types/cosmwasm/wasm/mod.rs

@@ -0,0 +1 @@
+pub mod v1;