neutron-std

Cargo.toml

@@ -1,6 +1,6 @@
 [workspace]
 resolver = "2"
-members = ["contracts/*", "packages/*", "proto-build"]
+members = ["contracts/*", "packages/*"]
 
 [profile.release]
 opt-level = 3
@@ -31,4 +31,5 @@ protobuf = "~3.3.0"
 hex = "0.4.3"
 serde_json = { version = "1.0.87" }
 tendermint-proto = "0.34.1"
-speedate = "0.13.0"
+speedate = "0.13.0"
+neutron-std = { package = "neutron-std", git = "https://github.com/neutron-org/neutron-std", branch = "main" }

contracts/ibc_transfer/Cargo.toml

@@ -5,9 +5,9 @@ edition = "2021"
 
 
 exclude = [
-  # Those files are rust-optimizer artifacts. You might want to commit them for convenience but they should not be part of the source code publication.
-  "contract.wasm",
-  "hash.txt",
+    # Those files are rust-optimizer artifacts. You might want to commit them for convenience but they should not be part of the source code publication.
+    "contract.wasm",
+    "hash.txt",
 ]
 
 [lib]
@@ -23,9 +23,10 @@ cw2 = { workspace = true }
 schemars = { workspace = true }
 serde = { workspace = true }
 serde-json-wasm = { workspace = true }
-cw-storage-plus = { workspace = true, features = ["iterator"]}
+cw-storage-plus = { workspace = true, features = ["iterator"] }
 cosmwasm-schema = { workspace = true }
 neutron-sdk = { path = "../../packages/neutron-sdk", default-features = false }
+neutron-std = { workspace = true }
 
 [dev-dependencies]
 cosmwasm-schema = { workspace = true }

contracts/ibc_transfer/src/contract.rs

@@ -4,7 +4,7 @@ use cosmwasm_std::{
 };
 use cw2::set_contract_version;
 use neutron_sdk::interchain_txs::helpers::decode_message_response;
-use neutron_sdk::proto_types::neutron::transfer::MsgTransferResponse;
+use neutron_std::types::neutron::transfer::MsgTransferResponse;
 use neutron_sdk::{
     bindings::{
         msg::{IbcFee, NeutronMsg},

contracts/neutron_interchain_queries/Cargo.toml

@@ -5,9 +5,9 @@ authors = ["pr0n00gler <misha.m@p2p.org>"]
 edition = "2021"
 
 exclude = [
-  # Those files are rust-optimizer artifacts. You might want to commit them for convenience but they should not be part of the source code publication.
-  "contract.wasm",
-  "hash.txt",
+    # Those files are rust-optimizer artifacts. You might want to commit them for convenience but they should not be part of the source code publication.
+    "contract.wasm",
+    "hash.txt",
 ]
 
 [lib]
@@ -22,6 +22,7 @@ cw2 = { workspace = true }
 schemars = { workspace = true }
 serde = { workspace = true }
 neutron-sdk = { path = "../../packages/neutron-sdk", default-features = false }
+neutron-std = { workspace = true }
 cosmos-sdk-proto = { workspace = true }
 cw-storage-plus = { workspace = true }
 serde-json-wasm = { workspace = true }

contracts/neutron_interchain_txs/Cargo.toml

@@ -5,9 +5,9 @@ authors = ["ratik <sergey.r@p2p.org>"]
 edition = "2021"
 
 exclude = [
-  # Those files are rust-optimizer artifacts. You might want to commit them for convenience but they should not be part of the source code publication.
-  "contract.wasm",
-  "hash.txt",
+    # Those files are rust-optimizer artifacts. You might want to commit them for convenience but they should not be part of the source code publication.
+    "contract.wasm",
+    "hash.txt",
 ]
 
 [lib]
@@ -25,5 +25,6 @@ serde-json-wasm = { workspace = true }
 cw-storage-plus = { workspace = true }
 cosmos-sdk-proto = { workspace = true }
 neutron-sdk = { path = "../../packages/neutron-sdk", default-features = false }
+neutron-std = { workspace = true }
 prost-types = { workspace = true }
 cosmwasm-schema = { workspace = true }

contracts/neutron_interchain_txs/src/contract.rs

@@ -13,7 +13,7 @@ use serde::{Deserialize, Serialize};
 
 use crate::msg::{ExecuteMsg, InstantiateMsg, MigrateMsg, QueryMsg};
 use neutron_sdk::bindings::msg::IbcFee;
-use neutron_sdk::proto_types::neutron::interchaintxs::v1::MsgSubmitTxResponse;
+use neutron_std::types::neutron::interchaintxs::v1::MsgSubmitTxResponse;
 use neutron_sdk::{
     bindings::{
         msg::NeutronMsg,

packages/neutron-sdk/Cargo.toml

@@ -25,7 +25,6 @@ prost-types = { workspace = true }
 tendermint-proto = { workspace = true }
 speedate = { workspace = true }
 chrono = { version = "0.4.22", default-features = false }
-neutron-std-derive = { version = "0.20.1", path = "../neutron-std-derive" }
 
 [dev-dependencies]
 base64 = { workspace = true }

packages/neutron-sdk/src/lib.rs

@@ -3,22 +3,14 @@
 // #![forbid(unsafe_code)]
 #![warn(trivial_casts, trivial_numeric_casts, unused_import_braces)]
 
-/// The version (commit hash) of the Cosmos SDK used when generating this library.
-pub const NEUTROND_VERSION: &str = include_str!("proto_types/NEUTRON_COMMIT");
-
 pub mod bindings;
 mod errors;
 pub mod interchain_queries;
 pub mod interchain_txs;
-#[allow(deprecated, clippy::module_inception)]
-pub mod proto_types;
 pub mod query;
-mod serde;
-pub mod shim;
 pub mod sudo;
 
 pub use errors::error::{NeutronError, NeutronResult};
-pub use shim::{cosmwasm_to_proto_coins, try_proto_to_cosmwasm_coins};
 
 // This is a signal, such that any contract that imports these helpers will only run on the
 // neutron blockchain