Merge branch 'feat/migrate-from-xyk-to-cl-pairs' into fix/migrate-fro…

…m-xyk-to-cl-pairs-vaults
neutron-org · Aug 7, 2023 · 6dfe2d3 · 6dfe2d3
2 parents 686f267 + 7e4119d
commit 6dfe2d3
Show file tree

Hide file tree

Showing 61 changed files with 606 additions and 498 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/contracts/dao/cwd-core/Cargo.toml b/contracts/dao/cwd-core/Cargo.toml
@@ -16,26 +16,21 @@ backtraces = ["cosmwasm-std/backtraces"]
 library = []
 
 [dependencies]
-neutron-sdk = "0.5.0"
-cosmwasm-std = { version = "1.0.0", features = ["ibc3"] }
-cosmwasm-storage = { version = "1.0.0" }
-cw-storage-plus = "0.13"
-cw2 = "0.13"
-cw-utils = "0.13"
-cw20 = "0.13"
-cw721 = "0.13"
-schemars = "0.8"
-serde = { version = "1.0.147", default-features = false, features = ["derive"] }
+neutron-sdk = { package = "neutron-sdk", version = "0.6.1" }
+cosmwasm-std = { version = "1.3.0", features = ["ibc3"] }
+cosmwasm-storage = { version = "1.3.0" }
+cw-storage-plus = "1.1.0"
+cw2 = "1.1.0"
+cw-utils = { version = "1.0.1" }
+cw20 = "1.1.0"
+cw721 = "0.18.0"
+schemars = "0.8.8"
+serde = { version = "1.0.175", default-features = false, features = ["derive"] }
 thiserror = { version = "1.0" }
 cwd-interface = { path = "../../../packages/cwd-interface" }
 cwd-macros = { path = "../../../packages/cwd-macros" }
 cw-paginate = { path = "../../../packages/cw-paginate" }
 cw-core-v1 = { package = "cw-core", version = "0.1.0", git = "https://github.com/DA0-DA0/dao-contracts.git", tag = "v1.0.0" }
 
 [dev-dependencies]
-cosmwasm-schema = { version = "1.0.0" }
-#cw-multi-test = { version = "0.14", features = ["stargate"] }
-#cw20-base = "0.13"
-#cw721-base = "0.13"
-#cwd-proposal-sudo = { path = "../../test-contracts/cwd-proposal-sudo"}
-#cwd-voting-cw20-balance = { path = "../../test-contracts/cwd-voting-cw20-balance"}
+cosmwasm-schema = { version = "1.3.0" }
diff --git a/contracts/dao/cwd-core/schema/dump_state_response.json b/contracts/dao/cwd-core/schema/dump_state_response.json
@@ -105,7 +105,8 @@
           "description": "version is any string that this implementation knows. It may be simple counter \"1\", \"2\". or semantic version on release tags \"v0.7.0\", or some custom feature flag list. the only code that needs to understand the version parsing is code that knows how to migrate from the given contract (and is tied to it's implementation somehow)",
           "type": "string"
         }
-      }
+      },
+      "additionalProperties": false
     },
     "Expiration": {
       "description": "Expiration represents a point in time when some event happens. It can compare with a BlockInfo and will return is_expired() == true once the condition is hit (and for every block in the future)",
@@ -146,7 +147,8 @@
           ],
           "properties": {
             "never": {
-              "type": "object"
+              "type": "object",
+              "additionalProperties": false
             }
           },
           "additionalProperties": false

diff --git a/contracts/dao/cwd-core/schema/info_response.json b/contracts/dao/cwd-core/schema/info_response.json
@@ -26,7 +26,8 @@
           "description": "version is any string that this implementation knows. It may be simple counter \"1\", \"2\". or semantic version on release tags \"v0.7.0\", or some custom feature flag list. the only code that needs to understand the version parsing is code that knows how to migrate from the given contract (and is tied to it's implementation somehow)",
           "type": "string"
         }
-      }
+      },
+      "additionalProperties": false
     }
   }
 }
diff --git a/contracts/dao/cwd-core/schema/pause_info_response.json b/contracts/dao/cwd-core/schema/pause_info_response.json
@@ -76,7 +76,8 @@
           ],
           "properties": {
             "never": {
-              "type": "object"
+              "type": "object",
+              "additionalProperties": false
             }
           },
           "additionalProperties": false

diff --git a/contracts/dao/pre-propose/cwd-pre-propose-multiple/Cargo.toml b/contracts/dao/pre-propose/cwd-pre-propose-multiple/Cargo.toml
@@ -16,21 +16,21 @@ backtraces = ["cosmwasm-std/backtraces"]
 library = []
 
 [dependencies]
-cosmwasm-std = "1.0.0"
-cw2 = "0.13.2"
-serde = { version = "1.0.147", default-features = false, features = ["derive"] }
+cosmwasm-std = { version = "1.3.0" }
+cw2 = "1.1.0"
+serde = { version = "1.0.175", default-features = false, features = ["derive"] }
 cwd-pre-propose-base = { version = "*", path = "../../../../packages/cwd-pre-propose-base" }
 cwd-voting = { path = "../../../../packages/cwd-voting" }
-neutron-sdk = "0.5.0"
+neutron-sdk = { package = "neutron-sdk", version = "0.6.1" }
 schemars = "0.8.8"
-cosmwasm-schema = "1.0.0"
+cosmwasm-schema = "1.3.0"
 
 [dev-dependencies]
-cw-multi-test = "0.13.2"
-cw-utils = "0.13.2"
-cw4-group = "0.13.2"
-cw20 = "0.13.2"
-cw20-base = "0.13.2"
+cw-multi-test = "0.16.5"
+cw-utils = { version = "1.0.1" }
+cw4-group = "1.1.0"
+cw20 = "1.1.0"
+cw20-base = "1.1.0"
 cwd-proposal-single = { path = "../../proposal/cwd-proposal-single" }
 cwd-core = { path = "../../../dao/cwd-core" }
 cwd-voting = { path = "../../../../packages/cwd-voting" }

diff --git a/contracts/dao/pre-propose/cwd-pre-propose-single-overrule/Cargo.toml b/contracts/dao/pre-propose/cwd-pre-propose-single-overrule/Cargo.toml
@@ -16,13 +16,13 @@ backtraces = ["cosmwasm-std/backtraces"]
 library = []
 
 [dependencies]
-cosmwasm-std = "1.0.0"
-cw2 = "0.13.2"
-cw-storage-plus = "0.13"
-serde = { version = "1.0.147", default-features = false, features = ["derive"] }
+cosmwasm-std = { version = "1.3.0" }
+cw2 = "1.1.0"
+cw-storage-plus = "1.1.0"
+serde = { version = "1.0.175", default-features = false, features = ["derive"] }
 cwd-pre-propose-base = { version = "*", path = "../../../../packages/cwd-pre-propose-base" }
 cwd-voting = { path = "../../../../packages/cwd-voting" }
-neutron-sdk = "0.5.0"
+neutron-sdk = { package = "neutron-sdk", version = "0.6.1" }
 schemars = "0.8.8"
 thiserror = { version = "1.0.31" }
 neutron-subdao-core = { version = "*", path = "../../../../packages/neutron-subdao-core" }
@@ -32,8 +32,8 @@ neutron-dao-pre-propose-overrule = { version = "*", path = "../../../../packages
 cwd-proposal-single = { version = "*", path = "../../../../contracts/dao/proposal/cwd-proposal-single", features = ["library"]  }
 
 [dev-dependencies]
-cosmwasm-schema = "1.0.0"
-cw-utils = "0.13.2"
+cosmwasm-schema = "1.3.0"
+cw-utils = { version = "1.0.1" }
 cwd-proposal-single = { path = "../../proposal/cwd-proposal-single" }
 cwd-core = { path = "../../cwd-core" }
 cwd-voting = { path = "../../../../packages/cwd-voting" }

diff --git a/contracts/dao/pre-propose/cwd-pre-propose-single/Cargo.toml b/contracts/dao/pre-propose/cwd-pre-propose-single/Cargo.toml
@@ -16,26 +16,23 @@ backtraces = ["cosmwasm-std/backtraces"]
 library = []
 
 [dependencies]
-cosmwasm-std = "1.0.0"
-cw2 = "0.13.2"
-serde = { version = "1.0.147", default-features = false, features = ["derive"] }
+cosmwasm-std = { version = "1.3.0" }
+cw2 = "1.1.0"
+serde = { version = "1.0.175", default-features = false, features = ["derive"] }
 cwd-pre-propose-base = { version = "*", path = "../../../../packages/cwd-pre-propose-base" }
-neutron-sdk = "0.5.0"
+neutron-sdk = { package = "neutron-sdk", version = "0.6.1" }
 schemars = "0.8.8"
 
 [dev-dependencies]
-cosmwasm-schema = "1.0.0"
-cw-multi-test = "0.13.2"
-cw-utils = "0.13.2"
-cw4-group = "0.13.2"
-cw20 = "0.13.2"
-cw20-base = "0.13.2"
-#cwd-voting-cw20-staked = { path = "../../voting/cwd-voting-cw20-staked" }
+cosmwasm-schema = "1.3.0"
+cw-multi-test = "0.16.5"
+cw-utils = { version = "1.0.1" }
+cw4-group = "1.1.0"
+cw20 = "1.1.0"
+cw20-base = "1.1.0"
 cwd-proposal-single = { path = "../../proposal/cwd-proposal-single" }
 cwd-core = { path = "../../../dao/cwd-core" }
-#cwd-voting-cw4 = { path = "../../voting/cwd-voting-cw4" }
 cwd-voting = { path = "../../../../packages/cwd-voting" }
 cw-denom = { path = "../../../../packages/cw-denom" }
 cwd-interface = { path = "../../../../packages/cwd-interface" }
-#cwd-testing = { path = "../../../../packages/cwd-testing" }
 cwd-proposal-hooks = { path = "../../../../packages/cwd-proposal-hooks" }
diff --git a/contracts/dao/proposal/cwd-proposal-multiple/Cargo.toml b/contracts/dao/proposal/cwd-proposal-multiple/Cargo.toml
@@ -17,16 +17,16 @@ backtraces = ["cosmwasm-std/backtraces"]
 library = []
 
 [dependencies]
-neutron-sdk = "0.5.0"
-cosmwasm-std = { version = "1.0.0", features = ["ibc3"] }
-cosmwasm-storage = { version = "1.0.0" }
-cw-storage-plus = "0.13"
-cw-utils = "0.13"
-cw2 = "0.13"
-cw20 = "0.13"
-cw3 = "0.13"
-schemars = "0.8"
-serde = { version = "1.0.147", default-features = false, features = ["derive"] }
+neutron-sdk = { package = "neutron-sdk", version = "0.6.1" }
+cosmwasm-std = { version = "1.3.0", features = ["ibc3"] }
+cosmwasm-storage = { version = "1.3.0" }
+cw-storage-plus = "1.1.0"
+cw-utils = { version = "1.0.1" }
+cw2 = "1.1.0"
+cw20 = "1.1.0"
+cw3 = "1.1.0"
+schemars = "0.8.8"
+serde = { version = "1.0.175", default-features = false, features = ["derive"] }
 thiserror = { version = "1.0" }
 
 cwd-core = { path = "../../cwd-core", features = ["library"] }
@@ -42,15 +42,15 @@ cwd-vote-hooks = { path = "../../../../packages/cwd-vote-hooks" }
 
 voting-v1 = { package = "voting", version = "0.1.0", git = "https://github.com/DA0-DA0/dao-contracts.git", tag = "v1.0.0" }
 
-cosmwasm-schema = { version = "1.0.0" }
+cosmwasm-schema = { version = "1.3.0" }
 
 [dev-dependencies]
-cw-multi-test = "0.13"
+cw-multi-test = "0.16.5"
 cw-denom = { path = "../../../../packages/cw-denom" }
-cw20-base = "0.13"
-cw721-base = "0.13"
-cw4 = "0.13"
-cw4-group = "0.13"
+cw20-base = "1.1.0"
+cw721-base = "0.18.0"
+cw4 = "1.1.0"
+cw4-group = "1.1.0"
 cwd-testing = { path = "../../../../packages/cwd-testing" }
 neutron-voting-registry = { path = "../../voting/neutron-voting-registry" }
 neutron-vault = { path = "../../voting/neutron-vault" }

diff --git a/contracts/dao/proposal/cwd-proposal-multiple/schema/info_response.json b/contracts/dao/proposal/cwd-proposal-multiple/schema/info_response.json
@@ -26,7 +26,8 @@
           "description": "version is any string that this implementation knows. It may be simple counter \"1\", \"2\". or semantic version on release tags \"v0.7.0\", or some custom feature flag list. the only code that needs to understand the version parsing is code that knows how to migrate from the given contract (and is tied to it's implementation somehow)",
           "type": "string"
         }
-      }
+      },
+      "additionalProperties": false
     }
   }
 }
diff --git a/contracts/dao/proposal/cwd-proposal-multiple/schema/list_proposals_response.json b/contracts/dao/proposal/cwd-proposal-multiple/schema/list_proposals_response.json
@@ -529,7 +529,8 @@
           ],
           "properties": {
             "never": {
-              "type": "object"
+              "type": "object",
+              "additionalProperties": false
             }
           },
           "additionalProperties": false

diff --git a/contracts/dao/proposal/cwd-proposal-multiple/schema/proposal_response.json b/contracts/dao/proposal/cwd-proposal-multiple/schema/proposal_response.json
@@ -533,7 +533,8 @@
           ],
           "properties": {
             "never": {
-              "type": "object"
+              "type": "object",
+              "additionalProperties": false
             }
           },
           "additionalProperties": false

diff --git a/contracts/dao/proposal/cwd-proposal-multiple/schema/reverse_proposals_response.json b/contracts/dao/proposal/cwd-proposal-multiple/schema/reverse_proposals_response.json
@@ -529,7 +529,8 @@
           ],
           "properties": {
             "never": {
-              "type": "object"
+              "type": "object",
+              "additionalProperties": false
             }
           },
           "additionalProperties": false

diff --git a/contracts/dao/proposal/cwd-proposal-multiple/src/testing/tests.rs b/contracts/dao/proposal/cwd-proposal-multiple/src/testing/tests.rs
@@ -60,8 +60,8 @@ pub struct TestMultipleChoiceVote {
     pub should_execute: ShouldExecute,
 }
 
-pub(crate) fn no_init<BankT, CustomT, WasmT, StakingT, DistrT>(
-    _: &mut Router<BankT, CustomT, WasmT, StakingT, DistrT>,
+pub(crate) fn no_init<BankT, CustomT, WasmT, StakingT, DistrT, IbcT, GovT>(
+    _: &mut Router<BankT, CustomT, WasmT, StakingT, DistrT, IbcT, GovT>,
     _: &dyn Api,
     _: &mut dyn Storage,
 ) {

diff --git a/contracts/dao/proposal/cwd-proposal-single/Cargo.toml b/contracts/dao/proposal/cwd-proposal-single/Cargo.toml
@@ -16,16 +16,16 @@ backtraces = ["cosmwasm-std/backtraces"]
 library = []
 
 [dependencies]
-neutron-sdk = "0.5.0"
-cosmwasm-std = { version = "1.0.0", features = ["ibc3"] }
-cosmwasm-storage = { version = "1.0.0" }
-cw-storage-plus = "0.13"
-cw-utils = "0.13"
-cw2 = "0.13"
-cw20 = "0.13"
-cw3 = "0.13"
-schemars = "0.8"
-serde = { version = "1.0.147", default-features = false, features = ["derive"] }
+neutron-sdk = { package = "neutron-sdk", version = "0.6.1" }
+cosmwasm-std = { version = "1.3.0", features = ["ibc3"] }
+cosmwasm-storage = { version = "1.3.0" }
+cw-storage-plus = "1.1.0"
+cw-utils = { version = "1.0.1" }
+cw2 = "1.1.0"
+cw20 = "1.1.0"
+cw3 = "1.1.0"
+schemars = "0.8.8"
+serde = { version = "1.0.175", default-features = false, features = ["derive"] }
 thiserror = { version = "1.0" }
 
 cwd-core = { path = "../../cwd-core", features = ["library"] }
@@ -42,13 +42,13 @@ voting-v1 = { package = "voting", version = "0.1.0", git = "https://github.com/D
 cw-proposal-single-v1 = { package = "cw-proposal-single", version = "0.1.0", git = "https://github.com/DA0-DA0/dao-contracts.git", tag = "v1.0.0" }
 
 [dev-dependencies]
-cosmwasm-schema = { version = "1.0.0" }
-cw-multi-test = "0.13"
+cosmwasm-schema = { version = "1.3.0" }
+cw-multi-test = "0.16.5"
 cw-denom = { path = "../../../../packages/cw-denom" }
-cw20-base = "0.13"
+cw20-base = "1.1.0"
 cwd-testing = { path = "../../../../packages/cwd-testing" }
-cw721-base = "0.13"
+cw721-base = "0.18.0"
 neutron-voting-registry = { path = "../../voting/neutron-voting-registry" }
 neutron-vault = { path = "../../voting/neutron-vault" }
-cw4 = "0.13"
-cw4-group = "0.13"
+cw4 = "1.1.0"
+cw4-group = "1.1.0"
diff --git a/contracts/dao/proposal/cwd-proposal-single/schema/info_response.json b/contracts/dao/proposal/cwd-proposal-single/schema/info_response.json
@@ -26,7 +26,8 @@
           "description": "version is any string that this implementation knows. It may be simple counter \"1\", \"2\". or semantic version on release tags \"v0.7.0\", or some custom feature flag list. the only code that needs to understand the version parsing is code that knows how to migrate from the given contract (and is tied to it's implementation somehow)",
           "type": "string"
         }
-      }
+      },
+      "additionalProperties": false
     }
   }
 }
diff --git a/contracts/dao/proposal/cwd-proposal-single/schema/list_proposals_response.json b/contracts/dao/proposal/cwd-proposal-single/schema/list_proposals_response.json
@@ -494,7 +494,8 @@
           ],
           "properties": {
             "never": {
-              "type": "object"
+              "type": "object",
+              "additionalProperties": false
             }
           },
           "additionalProperties": false

diff --git a/contracts/dao/proposal/cwd-proposal-single/schema/proposal_response.json b/contracts/dao/proposal/cwd-proposal-single/schema/proposal_response.json
@@ -498,7 +498,8 @@
           ],
           "properties": {
             "never": {
-              "type": "object"
+              "type": "object",
+              "additionalProperties": false
             }
           },
           "additionalProperties": false

diff --git a/contracts/dao/proposal/cwd-proposal-single/schema/reverse_proposals_response.json b/contracts/dao/proposal/cwd-proposal-single/schema/reverse_proposals_response.json
@@ -494,7 +494,8 @@
           ],
           "properties": {
             "never": {
-              "type": "object"
+              "type": "object",
+              "additionalProperties": false
             }
           },
           "additionalProperties": false

diff --git a/contracts/dao/proposal/cwd-proposal-single/src/testing/tests.rs b/contracts/dao/proposal/cwd-proposal-single/src/testing/tests.rs
@@ -61,8 +61,8 @@ struct CommonTest {
     proposal_id: u64,
 }
 
-pub(crate) fn no_init<BankT, CustomT, WasmT, StakingT, DistrT>(
-    _: &mut Router<BankT, CustomT, WasmT, StakingT, DistrT>,
+pub(crate) fn no_init<BankT, CustomT, WasmT, StakingT, DistrT, IbcT, GovT>(
+    _: &mut Router<BankT, CustomT, WasmT, StakingT, DistrT, IbcT, GovT>,
     _: &dyn Api,
     _: &mut dyn Storage,
 ) {