Merge pull request #237 from InjectiveLabs/f/workspace-cargo-toml

feat: created workspace cargo
InjectiveLabs · Aug 12, 2024 · 4e9b448 · 4e9b448
2 parents 5da1c72 + 88ac9ec
commit 4e9b448
Show file tree

Hide file tree

Showing 11 changed files with 173 additions and 434 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -6,6 +6,46 @@ resolver = "2"
 codegen-units = 1
 incremental   = false
 
+[workspace.dependencies]
+anyhow               = { version = "1.0.66" }
+base64               = { version = "0.13.1" }
+chrono               = { version = "0.4.27", default-features = false }
+cosmos-sdk-proto     = { version = "0.20.0", default-features = false }
+cosmwasm-schema      = { version = "1.5.0" }
+cosmwasm-std         = { version = "2.1.0", features = [ "abort", "cosmwasm_1_2", "cosmwasm_1_3", "cosmwasm_1_4", "cosmwasm_2_0", "iterator", "stargate" ] }
+cosmwasm-storage     = { version = "1.5.2", features = [ "iterator" ] }
+cw-multi-test        = { version = "2.1.0" }
+cw-storage-plus      = { version = "2.0.0" }
+cw-utils             = { version = "2.0.0" }
+cw2                  = { version = "2.0.0" }
+ethereum-types       = { version = "0.5.2" }
+hex                  = { version = "0.4.3", features = [ "serde" ] }
+injective-cosmwasm   = { version = "0.3.0" }
+injective-math       = { version = "0.3.0" }
+injective-std        = { version = "1.13.0" }
+injective-std-derive = { version = "1.13.0" }
+injective-test-tube  = { version = "=1.13.0-1" }
+injective-testing    = { version = "0.2.1" }
+itertools            = "0.10.3"
+primitive-types      = { version = "0.12.2", default-features = false }
+proc-macro2          = "1.0.40"
+prost                = { version = "0.12.6" }
+prost-types          = { version = "0.12.6", default-features = false }
+quote                = "1.0.20"
+rand                 = { version = "0.4.6" }
+schemars             = { version = "0.8.16" }
+secp256k1            = { version = "0.6.2" }
+serde                = { version = "1.0.196", default-features = false, features = [ "derive" ] }
+serde-cw-value       = { version = "0.7.0" }
+serde-json-wasm      = { version = "1.0.0" }
+serde_repr           = "0.1.17"
+serde_test           = { version = "1.0.176" }
+subtle-encoding      = { version = "0.5.1", features = [ "bech32-preview" ] }
+syn                  = "1.0.98"
+thiserror            = { version = "1.0.56" }
+tiny-keccak          = { version = "1.2.1" }
+trybuild             = { version = "1.0.63", features = [ "diff" ] }
+
 [profile.release]
 codegen-units    = 1
 debug            = false

diff --git a/contracts/atomic-order-example/Cargo.toml b/contracts/atomic-order-example/Cargo.toml
@@ -27,19 +27,19 @@ optimize = """docker run --rm -v "$(pwd)":/code \
 """
 
 [dependencies]
-cosmwasm-std       = { version = "2.1.0", features = [ "abort", "cosmwasm_1_2", "cosmwasm_1_3", "cosmwasm_1_4", "cosmwasm_2_0", "iterator", "stargate" ] }
-cosmwasm-storage   = { version = "1.5.2", features = [ "iterator" ] }
-cw-storage-plus    = { version = "2.0.0" }
-cw-utils           = { version = "2.0.0" }
-cw2                = { version = "2.0.0" }
-injective-cosmwasm = { version = "0.3.0" }
-injective-math     = { version = "0.3.0" }
-injective-std      = { version = "1.13.0" }
-prost              = { version = "0.12.6" }
-schemars           = { version = "0.8.8", features = [ "enumset" ] }
-serde              = { version = "1.0.137", default-features = false, features = [ "derive" ] }
-thiserror          = { version = "1.0.31" }
+cosmwasm-std       = { workspace = true }
+cosmwasm-storage   = { workspace = true }
+cw-storage-plus    = { workspace = true }
+cw-utils           = { workspace = true }
+cw2                = { workspace = true }
+injective-cosmwasm = { workspace = true }
+injective-math     = { workspace = true }
+injective-std      = { workspace = true }
+prost              = { workspace = true }
+schemars           = { workspace = true }
+serde              = { workspace = true }
+thiserror          = { workspace = true }
 
 [dev-dependencies]
-cosmwasm-schema = { version = "1.5.0" }
-cw-multi-test   = { version = "0.16.2" }
+cosmwasm-schema = { workspace = true }
+cw-multi-test   = { workspace = true }
diff --git a/contracts/dummy/Cargo.toml b/contracts/dummy/Cargo.toml
@@ -27,10 +27,10 @@ optimize = """docker run --rm -v "$(pwd)":/code \
 """
 
 [dependencies]
-cosmwasm-std       = { version = "2.1.0", features = [ "abort", "cosmwasm_1_2", "cosmwasm_1_3", "cosmwasm_1_4", "cosmwasm_2_0", "iterator", "stargate" ] }
-cw-storage-plus    = { version = "2.0.0" }
-cw2                = { version = "2.0.0" }
-injective-cosmwasm = { version = "0.3.0" }
-schemars           = "0.8.8"
-serde              = { version = "1.0.136", default-features = false, features = [ "derive" ] }
-thiserror          = { version = "1.0.30" }
+cosmwasm-std       = { workspace = true }
+cw-storage-plus    = { workspace = true }
+cw2                = { workspace = true }
+injective-cosmwasm = { workspace = true }
+schemars           = { workspace = true }
+serde              = { workspace = true }
+thiserror          = { workspace = true }
diff --git a/contracts/injective-cosmwasm-mock/Cargo.toml b/contracts/injective-cosmwasm-mock/Cargo.toml
@@ -21,19 +21,19 @@ integration = [  ]
 library     = [  ]
 
 [dependencies]
-cosmos-sdk-proto   = { version = "0.20.0", default-features = false }
-cosmwasm-schema    = { version = "1.5.0" }
-cosmwasm-std       = { version = "2.1.0", features = [ "abort", "cosmwasm_1_2", "cosmwasm_1_3", "cosmwasm_1_4", "cosmwasm_2_0", "iterator", "stargate" ] }
-cw-storage-plus    = { version = "2.0.0" }
-cw2                = { version = "2.0.0" }
-injective-cosmwasm = { version = "0.3.0" }
-injective-math     = { version = "0.3.0" }
-injective-std      = { version = "1.13.0" }
-prost              = { version = "0.12.6" }
-schemars           = { version = "0.8.16" }
-serde              = { version = "1.0.196", default-features = false, features = [ "derive" ] }
-thiserror          = { version = "1.0.56" }
+cosmos-sdk-proto   = { workspace = true }
+cosmwasm-schema    = { workspace = true }
+cosmwasm-std       = { workspace = true }
+cw-storage-plus    = { workspace = true }
+cw2                = { workspace = true }
+injective-cosmwasm = { workspace = true }
+injective-math     = { workspace = true }
+injective-std      = { workspace = true }
+prost              = { workspace = true }
+schemars           = { workspace = true }
+serde              = { workspace = true }
+thiserror          = { workspace = true }
 
 [dev-dependencies]
-injective-test-tube = { version = "=1.13.0-1" }
-injective-testing   = { version = "0.2.1" }
+injective-test-tube = { workspace = true }
+injective-testing   = { workspace = true }
diff --git a/packages/injective-cosmwasm/Cargo.toml b/packages/injective-cosmwasm/Cargo.toml
@@ -10,18 +10,18 @@ version     = "0.3.0"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-cosmwasm-std    = { version = "2.1.0", features = [ "abort", "cosmwasm_1_2", "cosmwasm_1_3", "cosmwasm_1_4", "cosmwasm_2_0", "iterator", "stargate" ] }
-cw-storage-plus = { version = "2.0.0" }
-ethereum-types  = { version = "0.5.2" }
-hex             = { version = "0.4.3", features = [ "serde" ] }
-injective-math  = { version = "0.3.0" }
-schemars        = "0.8.16"
-serde           = { version = "1.0.193", default-features = false, features = [ "derive" ] }
-serde_repr      = "0.1.17"
-subtle-encoding = { version = "0.5.1", features = [ "bech32-preview" ] }
-tiny-keccak     = "1.2.1"
+cosmwasm-std    = { workspace = true }
+cw-storage-plus = { workspace = true }
+ethereum-types  = { workspace = true }
+hex             = { workspace = true }
+injective-math  = { workspace = true }
+schemars        = { workspace = true }
+serde           = { workspace = true }
+serde_repr      = { workspace = true }
+subtle-encoding = { workspace = true }
+tiny-keccak     = { workspace = true }
 
 [dev-dependencies]
-cosmwasm-schema = { version = "1.5.0" }
-serde-json-wasm = { version = "1.0.0" }
-serde_test      = { version = "1.0.176" }
+cosmwasm-schema = { workspace = true }
+serde-json-wasm = { workspace = true }
+serde_test      = { workspace = true }
diff --git a/packages/injective-cosmwasm/src/exchange/subaccount.rs b/packages/injective-cosmwasm/src/exchange/subaccount.rs
@@ -53,14 +53,6 @@ pub fn subaccount_id_to_ethereum_address(subaccount_id: &SubaccountId) -> String
 pub fn subaccount_id_to_injective_address(subaccount_id: &SubaccountId, deps: &Deps<InjectiveQueryWrapper>) -> StdResult<Addr> {
     let ethereum_address = subaccount_id_to_ethereum_address(subaccount_id);
 
-    println!("ethereum_address: {:?}", ethereum_address);
-    println!("ethereum_address: {:?}", addr_to_bech32(ethereum_address.clone()).as_str());
-
-    println!("ethereum_address: {:?}", deps.api.addr_validate(""));
-    println!(
-        "ethereum_address: {:?}",
-        deps.api.addr_validate("inj1khsfhyavadcvzug67pufytaz2cq36ljkrsr0nv")
-    );
     deps.api.addr_validate(addr_to_bech32(ethereum_address).as_str())
 }
 

diff --git a/packages/injective-math/Cargo.toml b/packages/injective-math/Cargo.toml
@@ -13,12 +13,12 @@ version     = "0.3.0"
 [features]
 
 [dependencies]
-cosmwasm-std    = { version = "2.1.0", features = [ "abort", "cosmwasm_1_2", "cosmwasm_1_3", "cosmwasm_1_4", "cosmwasm_2_0", "iterator", "stargate" ] }
-ethereum-types  = { version = "0.5.2" }
-primitive-types = { version = "0.12.2", default-features = false }
-schemars        = "0.8.8"
-serde           = { version = "1.0.193", default-features = false, features = [ "derive" ] }
-subtle-encoding = { version = "0.5.1", features = [ "bech32-preview" ] }
+cosmwasm-std    = { workspace = true }
+ethereum-types  = { workspace = true }
+primitive-types = { workspace = true }
+schemars        = { workspace = true }
+serde           = { workspace = true }
+subtle-encoding = { workspace = true }
 
 [dev-dependencies]
-cosmwasm-schema = { version = "1.5.0" }
+cosmwasm-schema = { workspace = true }
diff --git a/packages/injective-std-derive/Cargo.toml b/packages/injective-std-derive/Cargo.toml
@@ -11,14 +11,14 @@ version     = "1.13.0"
 proc-macro = true
 
 [dependencies]
-cosmwasm-std = { version = "2.1.0", features = [ "stargate" ] }
-itertools    = "0.10.3"
-proc-macro2  = "1.0.40"
-quote        = "1.0.20"
-syn          = "1.0.98"
+cosmwasm-std = { workspace = true }
+itertools    = { workspace = true }
+proc-macro2  = { workspace = true }
+quote        = { workspace = true }
+syn          = { workspace = true }
 
 [dev-dependencies]
-cosmwasm-std = { version = "2.1.0", features = [ "stargate" ] }
-prost        = "0.12.4"
-serde        = "1.0.142"
-trybuild     = { version = "1.0.63", features = [ "diff" ] }
+cosmwasm-std = { workspace = true }
+prost        = { workspace = true }
+serde        = { workspace = true }
+trybuild     = { workspace = true }
diff --git a/packages/injective-std/Cargo.toml b/packages/injective-std/Cargo.toml
@@ -10,11 +10,11 @@ version     = "1.13.0"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-chrono               = { version = "0.4.27", default-features = false }
-cosmwasm-std         = { version = "2.1.0", features = [ "abort", "cosmwasm_1_2", "cosmwasm_1_3", "cosmwasm_1_4", "cosmwasm_2_0", "iterator", "stargate" ] }
-injective-std-derive = { version = "1.13.0" }
-prost                = { version = "0.12.4", features = [ "prost-derive" ] }
-prost-types          = { version = "0.12.4", default-features = false }
-schemars             = "0.8.8"
-serde                = { version = "1.0", default-features = false, features = [ "derive" ] }
-serde-cw-value       = { version = "0.7.0" }
+chrono               = { workspace = true }
+cosmwasm-std         = { workspace = true }
+injective-std-derive = { workspace = true }
+prost                = { workspace = true }
+prost-types          = { workspace = true }
+schemars             = { workspace = true }
+serde                = { workspace = true }
+serde-cw-value       = { workspace = true }
diff --git a/packages/injective-testing/Cargo.toml b/packages/injective-testing/Cargo.toml
@@ -8,13 +8,13 @@ repository  = "https://github.com/InjectiveLabs/cw-injective/tree/dev/packages/i
 version     = "0.2.1"
 
 [dependencies]
-anyhow             = { version = "1.0.66" }
-base64             = { version = "0.13.1" }
-cosmwasm-std       = { version = "2.1.0", features = [ "abort", "cosmwasm_1_1", "cosmwasm_1_2", "cosmwasm_1_3", "cosmwasm_1_4", "cosmwasm_2_0", "iterator", "stargate" ] }
-cw-multi-test      = { version = "2.1.0" }
-injective-cosmwasm = { version = "0.3.0" }
-injective-math     = { version = "0.3.0" }
-rand               = { version = "0.4.6" }
-secp256k1          = { version = "0.6.2" }
-serde              = { version = "1.0.137", default-features = false, features = [ "derive" ] }
-tiny-keccak        = { version = "1.2.1" }
+anyhow             = { workspace = true }
+base64             = { workspace = true }
+cosmwasm-std       = { workspace = true }
+cw-multi-test      = { workspace = true }
+injective-cosmwasm = { workspace = true }
+injective-math     = { workspace = true }
+rand               = { workspace = true }
+secp256k1          = { workspace = true }
+serde              = { workspace = true }
+tiny-keccak        = { workspace = true }