chore: resolve conflicts

Cargo.toml

@@ -1,22 +1,25 @@
 [workspace]
-members = ["packages/*", "contracts/*"]
+members  = [ "contracts/*", "packages/*" ]
 resolver = "2"
 
 [profile.release.package.injective-cosmwasm]
 codegen-units = 1
-incremental = false
+incremental   = false
 
 [profile.release]
-opt-level = 3
-debug = false
-rpath = false
-lto = true
+codegen-units    = 1
+debug            = false
 debug-assertions = false
-codegen-units = 1
-panic = 'abort'
-incremental = false
-overflow-checks = true
+incremental      = false
+lto              = true
+opt-level        = 3
+overflow-checks  = true
+panic            = 'abort'
+rpath            = false
 
 [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" }
+# injective-cosmwasm = { path = "./packages/injective-cosmwasm" }
+# injective-math     = { path = "./packages/injective-math" }
+# injective-protobuf = { path = "./packages/injective-protobuf" }
+# injective-std      = { path = "./packages/injective-std" }
+# injective-testing  = { path = "./packages/injective-testing" }

NOTICE

@@ -1,4 +1,4 @@
-Copyright 2022 Albert Chon <[email protected]>
+Copyright 2024 Injective Labs Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

contracts/atomic-order-example/Cargo.toml

@@ -1,25 +1,25 @@
 [package]
-name = "atomic-order-example"
-version = "0.1.0"
-authors = ["Antoni Mysliborski <[email protected]>"]
+authors = [ "Markus Waas <[email protected]>" ]
 edition = "2021"
+name    = "atomic-order-example"
+version = "0.2.0"
 
 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",
 ]
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [lib]
-crate-type = ["cdylib", "rlib"]
+crate-type = [ "cdylib", "rlib" ]
 
 [features]
 # for more explicit tests, cargo test --features=backtraces
-backtraces = ["cosmwasm-std/backtraces"]
+backtraces = [ "cosmwasm-std/backtraces" ]
 # use library feature to disable all instantiate/execute/query exports
-library = []
+library = [  ]
 
 [package.metadata.scripts]
 optimize = """docker run --rm -v "$(pwd)":/code \
@@ -29,19 +29,19 @@ optimize = """docker run --rm -v "$(pwd)":/code \
 """
 
 [dependencies]
-cosmwasm-std        = { version = "1.2.7", features = [ "abort", "iterator", "stargate" ] }
-cosmwasm-storage    = { version = "1.2.7", features = [ "iterator" ] }
-cw-storage-plus     = { version = "0.16.0" }
-cw2                 = { version = "0.16.0" }
-cw-utils            = { version = "0.16.0" }
-schemars            = { version = "0.8.8", features = [ "enumset" ] }
-serde               = { version = "1.0.137", default-features = false, features = ["derive"] }
-thiserror           = { version = "1.0.31" }
-injective-cosmwasm = { version = "0.2.16", path= "../../packages/injective-cosmwasm" }
-injective-math = { version = "0.2.2", path = "../../packages/injective-math" }
-protobuf            = { version = "2.28.0", features = ["with-bytes"] }
-injective-protobuf = { path = "../../packages/injective-protobuf", version = "0.2.1" }
+cosmwasm-std       = { version = "1.5.0", features = [ "abort", "cosmwasm_1_2", "cosmwasm_1_3", "cosmwasm_1_4", "iterator", "stargate" ] }
+cosmwasm-storage   = { version = "1.5.0", features = [ "iterator" ] }
+cw-storage-plus    = { version = "1.2.0" }
+cw-utils           = { version = "0.16.0" }
+cw2                = { version = "0.16.0" }
+injective-cosmwasm = { version = "0.2.18", path = "../../packages/injective-cosmwasm" }
+injective-math     = { version = "0.2.4", path = "../../packages/injective-math" }
+injective-protobuf = { version = "0.2.2", path = "../../packages/injective-protobuf" }
+protobuf           = { version = "2.28.0", features = [ "with-bytes" ] }
+schemars           = { version = "0.8.8", features = [ "enumset" ] }
+serde              = { version = "1.0.137", default-features = false, features = [ "derive" ] }
+thiserror          = { version = "1.0.31" }
 
 [dev-dependencies]
-cosmwasm-schema     = { version = "1.2.7" }
-cw-multi-test       = { version = "0.16.2" }
+cosmwasm-schema = { version = "1.5.0" }
+cw-multi-test   = { version = "0.16.2" }

contracts/atomic-order-example/NOTICE

@@ -1,4 +1,4 @@
-Copyright 2022 Antoni Mysliborski <[email protected]>
+Copyright 2024 Injective Labs Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

contracts/dummy/Cargo.toml

@@ -1,25 +1,25 @@
 [package]
-name = "dummy"
-version = "1.0.0"
-authors = ["Bartek Tofel <[email protected]>"]
-edition = "2018"
+authors = [ "Markus Waas <[email protected]>" ]
+edition = "2021"
+name    = "dummy"
+version = "1.1.0"
 
 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",
 ]
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [lib]
-crate-type = ["cdylib", "rlib"]
+crate-type = [ "cdylib", "rlib" ]
 
 [features]
 # for more explicit tests, cargo test --features=backtraces
-backtraces = ["cosmwasm-std/backtraces"]
+backtraces = [ "cosmwasm-std/backtraces" ]
 # use library feature to disable all instantiate/execute/query exports
-library = []
+library = [  ]
 
 [package.metadata.scripts]
 optimize = """docker run --rm -v "$(pwd)":/code \
@@ -29,10 +29,10 @@ optimize = """docker run --rm -v "$(pwd)":/code \
 """
 
 [dependencies]
-cosmwasm-std        = { version = "1.2.7", features = [ "abort", "iterator", "stargate" ] }
-cw-storage-plus     = { version = "0.16.0" }
-cw2                 = { version = "0.16.0" }
-serde = { version = "1.0.136", default-features = false, features = ["derive"] }
-schemars = "0.8.8"
-thiserror = { version = "1.0.30" }
-injective-cosmwasm = { version = "0.2.16", path = "../../packages/injective-cosmwasm" }
+cosmwasm-std       = { version = "1.5.0", features = [ "abort", "cosmwasm_1_2", "cosmwasm_1_3", "cosmwasm_1_4", "iterator", "stargate" ] }
+cw-storage-plus    = { version = "1.2.0" }
+cw2                = { version = "0.16.0" }
+injective-cosmwasm = { version = "0.2.18", path = "../../packages/injective-cosmwasm" }
+schemars           = "0.8.8"
+serde              = { version = "1.0.136", default-features = false, features = [ "derive" ] }
+thiserror          = { version = "1.0.30" }