From 827f736cac7aa65da310b4b7444fd8ab96c20af9 Mon Sep 17 00:00:00 2001
From: Mauro Lacy <mauro@lacy.com.es>
Date: Wed, 18 Oct 2023 17:54:30 +0200
Subject: [PATCH 1/8] Set resolver v2 in workspace

---
 Cargo.toml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Cargo.toml b/Cargo.toml
index ba3eccc8..6a707c49 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,5 +1,6 @@
 [workspace]
 members = ["packages/*", "contracts/*"]
+resolver = "2"
 
 [profile.release.package.injective-cosmwasm]
 codegen-units = 1
@@ -18,4 +19,4 @@ overflow-checks = true
 
 [patch.crates-io]
 #cw-multi-test = { path = "../cw-multi-test" }
-#cw-multi-test = { git = "https://github.com/InjectiveLabs/cw-multi-test.git", branch ="feature/custom_address_generator" }
\ No newline at end of file
+#cw-multi-test = { git = "https://github.com/InjectiveLabs/cw-multi-test.git", branch ="feature/custom_address_generator" }

From 4ce44d22bc6c01248e8d375819bf79d15a7ea556 Mon Sep 17 00:00:00 2001
From: Mauro Lacy <mauro@lacy.com.es>
Date: Wed, 18 Oct 2023 17:55:08 +0200
Subject: [PATCH 2/8] Update cosmwasm to latest stable v1.4.1

---
 packages/injective-cosmwasm/Cargo.toml | 4 ++--
 packages/injective-math/Cargo.toml     | 4 ++--
 packages/injective-protobuf/Cargo.toml | 4 ++--
 packages/injective-testing/Cargo.toml  | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/injective-cosmwasm/Cargo.toml b/packages/injective-cosmwasm/Cargo.toml
index c4ec9777..dd597b19 100644
--- a/packages/injective-cosmwasm/Cargo.toml
+++ b/packages/injective-cosmwasm/Cargo.toml
@@ -15,7 +15,7 @@ version = "0.2.14"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-cosmwasm-std    = { version = "1.1.1" }
+cosmwasm-std    = { version = "1.4.1" }
 cw-storage-plus = { version = "0.15.0" }
 ethereum-types  = "0.5.2"
 hex             = { version = "0.4.3", features = [ "serde" ] }
@@ -27,6 +27,6 @@ subtle-encoding = { version = "0.5.1", features = [ "bech32-preview" ] }
 tiny-keccak     = "1.2.1"
 
 [dev-dependencies]
-cosmwasm-schema = { version = "1.1.1" }
+cosmwasm-schema = { version = "1.4.1" }
 serde-json-wasm = { version = "0.4.1" }
 serde_test      = { version = "1.0.166" }
diff --git a/packages/injective-math/Cargo.toml b/packages/injective-math/Cargo.toml
index 0f2a2e9e..4fc85b17 100644
--- a/packages/injective-math/Cargo.toml
+++ b/packages/injective-math/Cargo.toml
@@ -16,11 +16,11 @@ backtraces = [ "cosmwasm-std/backtraces" ]
 
 [dependencies]
 bigint          = "4"
-cosmwasm-std    = { version = "1.1.1" }
+cosmwasm-std    = { version = "1.4.1" }
 ethereum-types  = "0.5.2"
 schemars        = "0.8.8"
 serde           = { version = "1.0.136", default-features = false, features = [ "derive" ] }
 subtle-encoding = { version = "0.5.1", features = [ "bech32-preview" ] }
 
 [dev-dependencies]
-cosmwasm-schema = { version = "1.1.1" }
+cosmwasm-schema = { version = "1.4.1" }
diff --git a/packages/injective-protobuf/Cargo.toml b/packages/injective-protobuf/Cargo.toml
index 7e555d36..5c8381d0 100644
--- a/packages/injective-protobuf/Cargo.toml
+++ b/packages/injective-protobuf/Cargo.toml
@@ -18,7 +18,7 @@ protobuf-codegen-pure = "2"
 backtraces = ["cosmwasm-std/backtraces"]
 
 [dependencies]
-cosmwasm-std = { version = "1.1.1" }
+cosmwasm-std = { version = "1.4.1" }
 schemars = "0.8.8"
 serde = { version = "1.0.136", default-features = false, features = ["derive"] }
 ethereum-types = "0.5.2"
@@ -27,4 +27,4 @@ num = "0.4.0"
 protobuf = { version = "2", features = ["with-bytes"] }
 
 [dev-dependencies]
-cosmwasm-schema = { version = "1.1.1" }
+cosmwasm-schema = { version = "1.4.1" }
diff --git a/packages/injective-testing/Cargo.toml b/packages/injective-testing/Cargo.toml
index 6003b99c..62f658fb 100644
--- a/packages/injective-testing/Cargo.toml
+++ b/packages/injective-testing/Cargo.toml
@@ -10,7 +10,7 @@ version     = "0.1.3"
 [dependencies]
 anyhow             = "1.0.66"
 base64             = "0.13.1"
-cosmwasm-std       = { version = "1.1.1", features = [ "abort", "iterator" ] }
+cosmwasm-std       = { version = "1.4.1", features = [ "abort", "iterator" ] }
 cw-multi-test      = "0.16.2"
 injective-cosmwasm = { version = "0.2.0", path = "../injective-cosmwasm" }
 injective-math     = { version = "0.1.17", path = "../injective-math" }

From 7b9ed909d2eb404036ca85379262638555dc05f6 Mon Sep 17 00:00:00 2001
From: Mauro Lacy <mauro@lacy.com.es>
Date: Wed, 18 Oct 2023 17:55:31 +0200
Subject: [PATCH 3/8] Update lock file

---
 Cargo.lock | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 83b4fa1e..a509fceb 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -210,9 +210,9 @@ checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa"
 
 [[package]]
 name = "cosmwasm-crypto"
-version = "1.4.0"
+version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ca101fbf2f76723711a30ea3771ef312ec3ec254ad021b237871ed802f9f175"
+checksum = "a6fb22494cf7d23d0c348740e06e5c742070b2991fd41db77bba0bcfbae1a723"
 dependencies = [
  "digest 0.10.7",
  "ed25519-zebra",
@@ -223,18 +223,18 @@ dependencies = [
 
 [[package]]
 name = "cosmwasm-derive"
-version = "1.4.0"
+version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c73d2dd292f60e42849d2b07c03d809cf31e128a4299a805abd6d24553bcaaf5"
+checksum = "6e199424486ea97d6b211db6387fd72e26b4a439d40cc23140b2d8305728055b"
 dependencies = [
  "syn 1.0.109",
 ]
 
 [[package]]
 name = "cosmwasm-schema"
-version = "1.4.0"
+version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ce34a08020433989af5cc470104f6bd22134320fe0221bd8aeb919fd5ec92d5"
+checksum = "fef683a9c1c4eabd6d31515719d0d2cc66952c4c87f7eb192bfc90384517dc34"
 dependencies = [
  "cosmwasm-schema-derive",
  "schemars",
@@ -245,9 +245,9 @@ dependencies = [
 
 [[package]]
 name = "cosmwasm-schema-derive"
-version = "1.4.0"
+version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96694ec781a7dd6dea1f968a2529ade009c21ad999c88b5f53d6cc495b3b96f7"
+checksum = "9567025acbb4c0c008178393eb53b3ac3c2e492c25949d3bf415b9cbe80772d8"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -256,9 +256,9 @@ dependencies = [
 
 [[package]]
 name = "cosmwasm-std"
-version = "1.4.0"
+version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a44d3f9c25b2f864737c6605a98f2e4675d53fd8bbc7cf4d7c02475661a793d"
+checksum = "7d89d680fb60439b7c5947b15f9c84b961b88d1f8a3b20c4bd178a3f87db8bae"
 dependencies = [
  "base64 0.21.4",
  "bnum",

From f59012c888146d277a52f307e74086c15e3f4318 Mon Sep 17 00:00:00 2001
From: Mauro Lacy <mauro@lacy.com.es>
Date: Wed, 18 Oct 2023 17:56:12 +0200
Subject: [PATCH 4/8] cargo clippy (v1.72.0)

---
 packages/injective-cosmwasm/src/exchange_mock_querier.rs | 2 +-
 packages/injective-cosmwasm/src/test_helpers.rs          | 2 +-
 packages/injective-math/src/fp_decimal/arithmetic.rs     | 4 ++--
 packages/injective-math/src/fp_decimal/exp.rs            | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/injective-cosmwasm/src/exchange_mock_querier.rs b/packages/injective-cosmwasm/src/exchange_mock_querier.rs
index 54511d8c..6335af66 100644
--- a/packages/injective-cosmwasm/src/exchange_mock_querier.rs
+++ b/packages/injective-cosmwasm/src/exchange_mock_querier.rs
@@ -37,7 +37,7 @@ pub fn mock_dependencies() -> OwnedDeps<MockStorage, MockApi, WasmMockQuerier, I
         api: MockApi::default(),
         storage: MockStorage::default(),
         querier: custom_querier,
-        custom_query_type: PhantomData::default(),
+        custom_query_type: PhantomData,
     }
 }
 
diff --git a/packages/injective-cosmwasm/src/test_helpers.rs b/packages/injective-cosmwasm/src/test_helpers.rs
index 447a4290..8345e699 100644
--- a/packages/injective-cosmwasm/src/test_helpers.rs
+++ b/packages/injective-cosmwasm/src/test_helpers.rs
@@ -93,7 +93,7 @@ pub(crate) mod testing_helpers {
             api: MockApi::default(),
             storage: MockStorage::default(),
             querier: custom_querier,
-            custom_query_type: PhantomData::default(),
+            custom_query_type: PhantomData,
         }
     }
 
diff --git a/packages/injective-math/src/fp_decimal/arithmetic.rs b/packages/injective-math/src/fp_decimal/arithmetic.rs
index 03f8923d..7cdbcd4b 100644
--- a/packages/injective-math/src/fp_decimal/arithmetic.rs
+++ b/packages/injective-math/src/fp_decimal/arithmetic.rs
@@ -703,12 +703,12 @@ mod tests {
 
     #[test]
     fn test_chain_sum() {
-        let vector = vec![FPDecimal::ZERO, FPDecimal::ONE, FPDecimal::TWO, FPDecimal::THREE];
+        let vector = [FPDecimal::ZERO, FPDecimal::ONE, FPDecimal::TWO, FPDecimal::THREE];
         assert_eq!(FPDecimal::SIX, vector.iter().sum());
     }
     #[test]
     fn test_chain_sum_equal_zero() {
-        let vector = vec![FPDecimal::ZERO, FPDecimal::ONE, FPDecimal::TWO, -FPDecimal::THREE];
+        let vector = [FPDecimal::ZERO, FPDecimal::ONE, FPDecimal::TWO, -FPDecimal::THREE];
         assert_eq!(FPDecimal::ZERO, vector.iter().sum());
     }
 }
diff --git a/packages/injective-math/src/fp_decimal/exp.rs b/packages/injective-math/src/fp_decimal/exp.rs
index 8cce9719..dac9aaf8 100644
--- a/packages/injective-math/src/fp_decimal/exp.rs
+++ b/packages/injective-math/src/fp_decimal/exp.rs
@@ -1520,14 +1520,14 @@ mod tests {
     }
     #[test]
     fn test_25_pow_0_11111() {
-        let power = FPDecimal::ONE / FPDecimal::from(9 as u128);
+        let power = FPDecimal::ONE / FPDecimal::from(9_u128);
         let result: FPDecimal = FPDecimal::must_from_str("25.0").ln() * power;
         let dampen: FPDecimal = FPDecimal::E.pow(result);
         assert_eq!(dampen, FPDecimal::must_from_str("1.429969148308728731"));
     }
     #[test]
     fn test_25_pow_0_11111_decimal_lib() {
-        let x = FPDecimal::ONE / FPDecimal::from(9 as u128);
+        let x = FPDecimal::ONE / FPDecimal::from(9_u128);
         let a: FPDecimal = FPDecimal::must_from_str("25.0");
         let result: FPDecimal = a.pow(x);
         assert_eq!(result, FPDecimal::must_from_str("1.429969148308728731"));

From 20d68e24db37a6b17837bc7b38c2fc58f473ebd7 Mon Sep 17 00:00:00 2001
From: Mauro Lacy <mauro@lacy.com.es>
Date: Wed, 18 Oct 2023 18:01:02 +0200
Subject: [PATCH 5/8] Update cosmwasm in contracts to latest stable v1.4.1

---
 contracts/atomic-order-example/Cargo.toml | 6 +++---
 contracts/dummy/Cargo.toml                | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/contracts/atomic-order-example/Cargo.toml b/contracts/atomic-order-example/Cargo.toml
index f82f180f..062b3b1e 100644
--- a/contracts/atomic-order-example/Cargo.toml
+++ b/contracts/atomic-order-example/Cargo.toml
@@ -29,8 +29,8 @@ optimize = """docker run --rm -v "$(pwd)":/code \
 """
 
 [dependencies]
-cosmwasm-std = "1.0.0"
-cosmwasm-storage = "1.0.0"
+cosmwasm-std = "1.4.1"
+cosmwasm-storage = "1.4.1"
 cw-storage-plus = "0.14.0"
 cw2 = "0.14.0"
 cw-utils = "0.14.0"
@@ -43,5 +43,5 @@ protobuf = { version = "2", features = ["with-bytes"] }
 injective-protobuf = { path = "../../packages/injective-protobuf", version = "0.2" }
 
 [dev-dependencies]
-cosmwasm-schema = "1.0.0"
+cosmwasm-schema = "1.4.1"
 cw-multi-test = "0.16.2"
diff --git a/contracts/dummy/Cargo.toml b/contracts/dummy/Cargo.toml
index 96397afc..bfd324f7 100644
--- a/contracts/dummy/Cargo.toml
+++ b/contracts/dummy/Cargo.toml
@@ -29,7 +29,7 @@ optimize = """docker run --rm -v "$(pwd)":/code \
 """
 
 [dependencies]
-cosmwasm-std = { version = "1.1.1" }
+cosmwasm-std = { version = "1.4.1" }
 cw-storage-plus = "0.16.0"
 cw2 = "0.14.0"
 serde = { version = "1.0.136", default-features = false, features = ["derive"] }

From 59671b7e4f8a06cb52ac6659a49d7e5304e634e0 Mon Sep 17 00:00:00 2001
From: Mauro Lacy <mauro@lacy.com.es>
Date: Wed, 18 Oct 2023 18:01:15 +0200
Subject: [PATCH 6/8] Update lock file

---
 Cargo.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index a509fceb..2a152cab 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -276,9 +276,9 @@ dependencies = [
 
 [[package]]
 name = "cosmwasm-storage"
-version = "1.4.0"
+version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab544dfcad7c9e971933d522d99ec75cc8ddfa338854bb992b092e11bcd7e818"
+checksum = "54a1c574d30feffe4b8121e61e839c231a5ce21901221d2fb4d5c945968a4f00"
 dependencies = [
  "cosmwasm-std",
  "serde 1.0.188",

From 080cfbf6f7e0f1cb113b43ed2900e33fa0bbe635 Mon Sep 17 00:00:00 2001
From: Mauro Lacy <mauro@lacy.com.es>
Date: Wed, 18 Oct 2023 18:01:27 +0200
Subject: [PATCH 7/8] cargo clippy

---
 contracts/dummy/src/mock_pyth_attestation.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contracts/dummy/src/mock_pyth_attestation.rs b/contracts/dummy/src/mock_pyth_attestation.rs
index 619d1181..1359b7d6 100644
--- a/contracts/dummy/src/mock_pyth_attestation.rs
+++ b/contracts/dummy/src/mock_pyth_attestation.rs
@@ -71,7 +71,7 @@ mod tests {
             api: MockApi::default(),
             storage: MockStorage::default(),
             querier: custom_querier,
-            custom_query_type: PhantomData::default(),
+            custom_query_type: PhantomData,
         }
     }
 

From 78cfcfcc4167ade2fbca072a8a9a62ea1105c970 Mon Sep 17 00:00:00 2001
From: Mauro Lacy <mauro@lacy.com.es>
Date: Wed, 18 Oct 2023 18:02:32 +0200
Subject: [PATCH 8/8] Update rust version in CI to 1.72.0

---
 .github/workflows/Basic.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/Basic.yml b/.github/workflows/Basic.yml
index 2a37ab3c..ea7a9648 100644
--- a/.github/workflows/Basic.yml
+++ b/.github/workflows/Basic.yml
@@ -24,7 +24,7 @@ jobs:
         uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: 1.69.0
+          toolchain: 1.72.0
           target: wasm32-unknown-unknown
           override: true
 
@@ -32,7 +32,7 @@ jobs:
         uses: actions-rs/cargo@v1
         with:
           command: unit-test
-          toolchain: 1.69.0
+          toolchain: 1.72.0
           args: --locked
         env:
           RUST_BACKTRACE: 1
@@ -56,7 +56,7 @@ jobs:
         uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: 1.69.0
+          toolchain: 1.72.0
           override: true
           components: rustfmt, clippy
 
@@ -64,12 +64,12 @@ jobs:
         uses: actions-rs/cargo@v1
         with:
           command: fmt
-          toolchain: 1.69.0
+          toolchain: 1.72.0
           args: --all -- --check
 
       - name: Run cargo clippy
         uses: actions-rs/cargo@v1
         with:
           command: clippy
-          toolchain: 1.69.0
+          toolchain: 1.72.0
           args: -- -D warnings