[NTRN-163] add dex stargate helpers

Cargo.toml

@@ -21,10 +21,12 @@ serde-json-wasm = "1.0.0"
 cw-storage-plus = "1.1.0"
 cosmwasm-schema = { version = "1.4.0", default-features = false }
 base64 = "0.21.4"
-prost = "0.12.1"
+prost = "0.12.3"
 prost-types = "0.12.1"
 cosmos-sdk-proto = { version = "0.20.0", default-features = false }
 bech32 = "0.9.1"
 thiserror = "1.0.49"
 protobuf = { version = "3.3.0" }
 hex = "0.4.3"
+tendermint-proto = "0.34"
+speedate = "0.13.0"

Makefile

@@ -13,14 +13,11 @@ clippy:
 fmt:
 	@cargo fmt -- --check
 
-build_proto:
-	@./build_proto.sh
-
 compile:
 	@./build_release.sh
 
 check_contracts:
 	@cargo install cosmwasm-check
 	@cosmwasm-check --available-capabilities iterator,staking,stargate,neutron artifacts/*.wasm
 
-build: build_proto schema clippy test fmt compile check_contracts
+build: schema clippy test fmt compile check_contracts

README.md

@@ -15,7 +15,7 @@ The Neutron SDK is contained inside `packages` folder and consists of the follow
 | Neutron Bindings                | https://github.com/neutron-org/neutron-sdk/tree/main/packages/neutron-sdk/src/bindings           | Structures and helper methods for interacting with Neutron blockchain                            |
 | Neutron Sudo                    | https://github.com/neutron-org/neutron-sdk/tree/main/packages/neutron-sdk/src/sudo               | Structures for Sudo Contract callbacks from Neutron blockchain                                   |
 | Neutron Errors                  | https://github.com/neutron-org/neutron-sdk/tree/main/packages/neutron-sdk/src/errors             | Structures and helpers for Neutron specific error and result types                               |
-| Neutron Proto Types             | https://github.com/neutron-org/neutron-sdk/tree/main/packages/neutron-sdk/src/proto_types        | Neutron specific protobuf types.                                                                 |
+| Neutron Stargate                | https://github.com/neutron-org/neutron-sdk/tree/main/packages/neutron-sdk/src/stargate           | Structures and helpers for interacting with Neutron via Stargate                                 |
 
 ### Example Contracts
 

packages/neutron-sdk/Cargo.toml

@@ -18,6 +18,10 @@ bech32 = { workspace = true }
 thiserror = { workspace = true }
 protobuf = { workspace = true }
 cosmwasm-schema = { workspace = true }
+prost = { workspace = true }
+prost-types = { workspace = true }
+tendermint-proto = { workspace = true }
+speedate = { workspace = true }
 
 [dev-dependencies]
 base64 = { workspace = true }

packages/neutron-sdk/src/bindings/query.rs

@@ -1,5 +1,5 @@
 use crate::bindings::types::{Failure, InterchainQueryResult, RegisteredQuery};
-use cosmwasm_std::{Binary, CustomQuery};
+use cosmwasm_std::{Binary, CustomQuery, Uint64};
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 
@@ -90,6 +90,18 @@ pub struct PageRequest {
     pub reverse: bool,
 }
 
+#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq, JsonSchema)]
+#[serde(rename_all = "snake_case")]
+pub struct PageResponse {
+    /// **next_key** is the key to be passed to PageRequest.key to
+    /// query the next page most efficiently. It will be empty if
+    /// there are no more results.
+    pub next_key: Option<Binary>,
+    /// **total** is total number of results available if PageRequest.count_total
+    /// was set, its value is undefined otherwise
+    pub total: Option<Uint64>,
+}
+
 #[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq, JsonSchema)]
 #[serde(rename_all = "snake_case")]
 pub struct QueryRegisteredQueriesResponse {

packages/neutron-sdk/src/lib.rs

@@ -2,8 +2,8 @@ pub mod bindings;
 mod errors;
 pub mod interchain_queries;
 pub mod interchain_txs;
-pub mod proto_types;
 pub mod query;
+pub mod stargate;
 pub mod sudo;
 
 pub use errors::error::{NeutronError, NeutronResult};

packages/neutron-sdk/src/stargate/README.md

@@ -0,0 +1,11 @@
+# Neutron Stargate interface
+
+This package contains list of helpers to interact with Neutron blockchain via Stargate.
+
+### Dex module
+
+For the `dex` module, there are helpers for all possible messages and queries in the package. The helpers have manually written adapted types for requests and responses instead of proto generated ones because proto-gen works poorly with rust code as the output.
+
+- helpers to construct CosmosMsgs to the dex module are placed in the [msg_dex.rs](https://github.com/neutron-org/neutron-sdk/tree/main/packages/neutron-sdk/src/stargate/msg_dex.rs) file;
+- helpers to retrieve data from the dex module are placed in the [query_dex.rs](https://github.com/neutron-org/neutron-sdk/tree/main/packages/neutron-sdk/src/stargate/query_dex.rs) file;
+- different types (e.g. request/response types) are placed in the [types_dex.rs](https://github.com/neutron-org/neutron-sdk/tree/main/packages/neutron-sdk/src/stargate/types_dex.rs) file.

packages/neutron-sdk/src/stargate/aux.rs

@@ -0,0 +1,28 @@
+use cosmwasm_std::{Binary, CosmosMsg, Deps, QueryRequest, StdResult};
+use prost_types::Timestamp as TimestampGen;
+use serde::de::DeserializeOwned;
+
+pub(crate) fn make_stargate_query<Req, Res>(deps: Deps, req: Req, path: &str) -> StdResult<Res>
+where
+    Req: prost::Message,
+    Res: DeserializeOwned,
+{
+    deps.querier.query(&QueryRequest::Stargate {
+        path: path.to_string(),
+        data: req.encode_to_vec().into(),
+    })
+}
+
+pub(crate) fn create_stargate_msg<Req: prost::Message>(req: Req, path: &str) -> CosmosMsg {
+    cosmwasm_std::CosmosMsg::Stargate {
+        type_url: path.to_string(),
+        value: Binary::from(req.encode_to_vec()),
+    }
+}
+
+pub(crate) fn convert_timestamp(timestamp: i64) -> TimestampGen {
+    TimestampGen {
+        seconds: timestamp,
+        nanos: 0,
+    }
+}

packages/neutron-sdk/src/stargate/mod.rs

@@ -0,0 +1,22 @@
+pub(crate) mod aux;
+pub(crate) mod msg_dex;
+pub(crate) mod query_dex;
+
+pub mod proto_types;
+pub mod types_dex;
+
+pub mod query {
+    pub mod neutron {
+        pub mod dex {
+            pub use crate::stargate::query_dex::*;
+        }
+    }
+}
+
+pub mod msg {
+    pub mod neutron {
+        pub mod dex {
+            pub use crate::stargate::msg_dex::*;
+        }
+    }
+}