neutron-org · pr0n00gler · Nov 3, 2023 · Oct 19, 2023
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -11,7 +11,7 @@ on:
     inputs:
       toolchain:
         description: 'Default Rust Toolchain'
-        default: "1.68.2"
+        default: "1.71.0"
         required: true
         type: string
       target:
@@ -31,7 +31,7 @@ on:
         type: string
 
 env:
-  TOOLCHAIN: ${{ inputs.toolchain || '1.68.2' }}
+  TOOLCHAIN: ${{ inputs.toolchain || '1.71.0' }}
   TARGET: ${{ inputs.target || 'wasm32-unknown-unknown' }}
   REF: ${{ github.event_name == 'push' && github.ref || inputs.branch || 'main' }}
   ID: ${{ inputs.id || 'scheduled' }}

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -15,7 +15,7 @@ jobs:
           fetch-depth: 1
       - uses: dtolnay/rust-toolchain@master
         with:
-          toolchain: 1.68.2
+          toolchain: 1.71.0
           components: clippy
           profile: minimal
           override: true
@@ -31,7 +31,7 @@ jobs:
           fetch-depth: 1
       - uses: dtolnay/rust-toolchain@master
         with:
-          toolchain: 1.68.2
+          toolchain: 1.71.0
           components: rustfmt
           profile: minimal
           override: true
@@ -49,7 +49,7 @@ jobs:
           fetch-depth: 1
       - uses: dtolnay/rust-toolchain@master
         with:
-          toolchain: 1.68.2
+          toolchain: 1.71.0
           profile: minimal
       - run: cargo fetch --verbose
       - run: cargo build

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -10,7 +10,6 @@ members = [
     "contracts/subdaos/cwd-subdao-timelock-single",
     "contracts/tokenomics/reserve",
     "contracts/tokenomics/distribution",
-
     "packages/*",
 ]
 

diff --git a/Makefile b/Makefile
@@ -17,9 +17,10 @@ check_contracts:
 	@cosmwasm-check --available-capabilities iterator,staking,stargate,neutron artifacts/*.wasm
 
 compile:
-	@./build_release.sh
+	@docker run --rm -v "$(CURDIR)":/code \
+	    --mount type=volume,source="$(notdir $(CURDIR))_cache",target=/target \
+	    --mount type=volume,source=registry_cache,target=/usr/local/cargo/registry \
+	    --platform linux/amd64 \
+	    cosmwasm/workspace-optimizer:0.14.0
 
 build: schema clippy fmt test compile check_contracts
-
-
-
diff --git a/build_release.sh b/build_release.sh
diff --git a/contracts/dao/cwd-core/.cargo/config b/contracts/dao/cwd-core/.cargo/config
@@ -1,4 +1,4 @@
 [alias]
 wasm = "build --release --target wasm32-unknown-unknown"
 unit-test = "test --lib"
-schema = "run --example schema"
+schema = "run --example cwd-core_schema"
diff --git a/contracts/dao/cwd-core/examples/schema.rs → .../dao/cwd-core/examples/cwd-core_schema.rs b/contracts/dao/cwd-core/examples/schema.rs → .../dao/cwd-core/examples/cwd-core_schema.rs
diff --git a/contracts/dao/pre-propose/cwd-pre-propose-multiple/.cargo/config b/contracts/dao/pre-propose/cwd-pre-propose-multiple/.cargo/config
@@ -1,4 +1,4 @@
 [alias]
 wasm = "build --release --target wasm32-unknown-unknown"
 unit-test = "test --lib"
-schema = "run --example schema"
+schema = "run --example cwd-pre-propose-multiple_schema"
diff --git a/...d-pre-propose-multiple/examples/schema.rs → ...amples/cwd-pre-propose-multiple_schema.rs b/...d-pre-propose-multiple/examples/schema.rs → ...amples/cwd-pre-propose-multiple_schema.rs
diff --git a/contracts/dao/pre-propose/cwd-pre-propose-single-overrule/.cargo/config b/contracts/dao/pre-propose/cwd-pre-propose-single-overrule/.cargo/config
@@ -1,4 +1,4 @@
 [alias]
 wasm = "build --release --target wasm32-unknown-unknown"
 unit-test = "test --lib"
-schema = "run --example schema"
+schema = "run --example cwd-pre-propose-single-overrule_schema"
diff --git a/...ropose-single-overrule/examples/schema.rs → ...cwd-pre-propose-single-overrule_schema.rs b/...ropose-single-overrule/examples/schema.rs → ...cwd-pre-propose-single-overrule_schema.rs
diff --git a/contracts/dao/pre-propose/cwd-pre-propose-single/.cargo/config b/contracts/dao/pre-propose/cwd-pre-propose-single/.cargo/config
@@ -1,4 +1,4 @@
 [alias]
 wasm = "build --release --target wasm32-unknown-unknown"
 unit-test = "test --lib"
-schema = "run --example schema"
+schema = "run --example cwd-pre-propose-single_schema"
diff --git a/...cwd-pre-propose-single/examples/schema.rs → ...examples/cwd-pre-propose-single_schema.rs b/...cwd-pre-propose-single/examples/schema.rs → ...examples/cwd-pre-propose-single_schema.rs
diff --git a/contracts/dao/proposal/cwd-proposal-multiple/.cargo/config b/contracts/dao/proposal/cwd-proposal-multiple/.cargo/config
@@ -1,4 +1,4 @@
 [alias]
 wasm = "build --release --target wasm32-unknown-unknown"
 unit-test = "test --lib"
-schema = "run --example schema"
+schema = "run --example cwd-proposal-multiple_schema"
diff --git a/.../cwd-proposal-multiple/examples/schema.rs → .../examples/cwd-proposal-multiple_schema.rs b/.../cwd-proposal-multiple/examples/schema.rs → .../examples/cwd-proposal-multiple_schema.rs
diff --git a/contracts/dao/proposal/cwd-proposal-single/.cargo/config b/contracts/dao/proposal/cwd-proposal-single/.cargo/config
@@ -1,4 +1,4 @@
 [alias]
 wasm = "build --release --target wasm32-unknown-unknown"
 unit-test = "test --lib"
-schema = "run --example schema"
+schema = "run --example cwd-proposal-single_schema"
diff --git a/...al/cwd-proposal-single/examples/schema.rs → ...le/examples/cwd-proposal-single_schema.rs b/...al/cwd-proposal-single/examples/schema.rs → ...le/examples/cwd-proposal-single_schema.rs
diff --git a/contracts/dao/proposal/cwd-proposal-single/src/testing/tests.rs b/contracts/dao/proposal/cwd-proposal-single/src/testing/tests.rs
@@ -165,7 +165,7 @@ fn test_proposal_close_after_expiry() {
     assert!(matches!(err, ContractError::WrongCloseStatus {}));
 
     // Expire the proposal. Now it should be closable.
-    app.update_block(|mut b| b.time = b.time.plus_seconds(604800));
+    app.update_block(|b| b.time = b.time.plus_seconds(604800));
     close_proposal(&mut app, &proposal_module, CREATOR_ADDR, proposal_id);
     let proposal = query_proposal(&app, &proposal_module, proposal_id);
     assert_eq!(proposal.proposal.status, Status::Closed);
@@ -208,7 +208,7 @@ fn test_proposal_cant_close_after_expiry_is_passed() {
     assert_eq!(proposal.proposal.status, Status::Open);
 
     // Expire the proposal. This should pass it.
-    app.update_block(|mut b| b.time = b.time.plus_seconds(604800));
+    app.update_block(|b| b.time = b.time.plus_seconds(604800));
     let proposal = query_proposal(&app, &proposal_module, proposal_id);
     assert_eq!(proposal.proposal.status, Status::Passed);
 
@@ -244,7 +244,7 @@ fn test_execute_no_non_passed_execution() {
     assert!(matches!(err, ContractError::NotPassed {}));
 
     // Expire the proposal.
-    app.update_block(|mut b| b.time = b.time.plus_seconds(604800));
+    app.update_block(|b| b.time = b.time.plus_seconds(604800));
     let err = execute_proposal_should_fail(&mut app, &proposal_module, CREATOR_ADDR, proposal_id);
     assert!(matches!(err, ContractError::NotPassed {}));
 
@@ -586,7 +586,7 @@ fn test_min_voting_period_no_early_pass() {
     let proposal_response = query_proposal(&app, &proposal_module, proposal_id);
     assert_eq!(proposal_response.proposal.status, Status::Open);
 
-    app.update_block(|mut block| block.height += 10);
+    app.update_block(|block| block.height += 10);
     let proposal_response = query_proposal(&app, &proposal_module, proposal_id);
     assert_eq!(proposal_response.proposal.status, Status::Passed);
 }
@@ -623,7 +623,7 @@ fn test_min_duration_same_as_proposal_duration() {
     vote_on_proposal(&mut app, &proposal_module, "whale", proposal_id, Vote::Yes);
     vote_on_proposal(&mut app, &proposal_module, "ekez", proposal_id, Vote::No);
 
-    app.update_block(|mut b| b.height += 100);
+    app.update_block(|b| b.height += 100);
     let proposal_response = query_proposal(&app, &proposal_module, proposal_id);
     assert_eq!(proposal_response.proposal.status, Status::Passed);
 }

diff --git a/contracts/dao/voting/credits-vault/.cargo/config b/contracts/dao/voting/credits-vault/.cargo/config
@@ -1,4 +1,4 @@
 [alias]
 wasm = "build --release --target wasm32-unknown-unknown"
 unit-test = "test --lib"
-schema = "run --example schema"
+schema = "run --example credits-vault_schema"
diff --git a/...o/voting/credits-vault/examples/schema.rs → ...ts-vault/examples/credits-vault_schema.rs b/...o/voting/credits-vault/examples/schema.rs → ...ts-vault/examples/credits-vault_schema.rs
diff --git a/contracts/dao/voting/investors-vesting-vault/.cargo/config b/contracts/dao/voting/investors-vesting-vault/.cargo/config
@@ -1,4 +1,4 @@
 [alias]
 wasm = "build --release --target wasm32-unknown-unknown"
 unit-test = "test --lib"
-schema = "run --example schema"
+schema = "run --example investors-vesting-vault_schema"
diff --git a/...nvestors-vesting-vault/examples/schema.rs → ...xamples/investors-vesting-vault_schema.rs b/...nvestors-vesting-vault/examples/schema.rs → ...xamples/investors-vesting-vault_schema.rs
diff --git a/contracts/dao/voting/lockdrop-vault/.cargo/config b/contracts/dao/voting/lockdrop-vault/.cargo/config
@@ -1,4 +1,4 @@
 [alias]
 wasm = "build --release --target wasm32-unknown-unknown"
 unit-test = "test --lib"
-schema = "run --example schema"
+schema = "run --example lockdrop-vault_schema"
diff --git a/.../voting/lockdrop-vault/examples/schema.rs → ...p-vault/examples/lockdrop-vault_schema.rs b/.../voting/lockdrop-vault/examples/schema.rs → ...p-vault/examples/lockdrop-vault_schema.rs
diff --git a/contracts/dao/voting/neutron-vault/.cargo/config b/contracts/dao/voting/neutron-vault/.cargo/config
@@ -1,4 +1,4 @@
 [alias]
 wasm = "build --release --target wasm32-unknown-unknown"
 unit-test = "test --lib"
-schema = "run --example schema"
+schema = "run --example neutron-vault_schema"
diff --git a/...o/voting/neutron-vault/examples/schema.rs → ...on-vault/examples/neutron-vault_schema.rs b/...o/voting/neutron-vault/examples/schema.rs → ...on-vault/examples/neutron-vault_schema.rs
diff --git a/contracts/dao/voting/neutron-voting-registry/.cargo/config b/contracts/dao/voting/neutron-voting-registry/.cargo/config
@@ -1,4 +1,4 @@
 [alias]
 wasm = "build --release --target wasm32-unknown-unknown"
 unit-test = "test --lib"
-schema = "run --example schema"
+schema = "run --example neutron-voting-registry_schema"
diff --git a/...eutron-voting-registry/examples/schema.rs → ...xamples/neutron-voting-registry_schema.rs b/...eutron-voting-registry/examples/schema.rs → ...xamples/neutron-voting-registry_schema.rs
diff --git a/contracts/dao/voting/vesting-lp-vault/.cargo/config b/contracts/dao/voting/vesting-lp-vault/.cargo/config
@@ -1,4 +1,4 @@
 [alias]
 wasm = "build --release --target wasm32-unknown-unknown"
 unit-test = "test --lib"
-schema = "run --example schema"
+schema = "run --example vesting-lp-vault_schema"
diff --git a/...oting/vesting-lp-vault/examples/schema.rs → ...vault/examples/vesting-lp-vault_schema.rs b/...oting/vesting-lp-vault/examples/schema.rs → ...vault/examples/vesting-lp-vault_schema.rs
diff --git a/contracts/subdaos/cwd-subdao-core/.cargo/config b/contracts/subdaos/cwd-subdao-core/.cargo/config
@@ -1,4 +1,4 @@
 [alias]
 wasm = "build --release --target wasm32-unknown-unknown"
 unit-test = "test --lib"
-schema = "run --example schema"
+schema = "run --example cwd-subdao-core_schema"
diff --git a/...ubdaos/cwd-subdao-core/examples/schema.rs → ...o-core/examples/cwd-subdao-core_schema.rs b/...ubdaos/cwd-subdao-core/examples/schema.rs → ...o-core/examples/cwd-subdao-core_schema.rs
diff --git a/contracts/subdaos/cwd-subdao-timelock-single/.cargo/config b/contracts/subdaos/cwd-subdao-timelock-single/.cargo/config
@@ -1,4 +1,4 @@
 [alias]
 wasm = "build --release --target wasm32-unknown-unknown"
 unit-test = "test --lib"
-schema = "run --example schema"
+schema = "run --example cwd-subdao-timelock-single_schema"
diff --git a/...subdao-timelock-single/examples/schema.rs → ...ples/cwd-subdao-timelock-single_schema.rs b/...subdao-timelock-single/examples/schema.rs → ...ples/cwd-subdao-timelock-single_schema.rs
diff --git a/contracts/subdaos/pre-propose/cwd-security-subdao-pre-propose/.cargo/config b/contracts/subdaos/pre-propose/cwd-security-subdao-pre-propose/.cargo/config
@@ -1,4 +1,4 @@
 [alias]
 wasm = "build --release --target wasm32-unknown-unknown"
 unit-test = "test --lib"
-schema = "run --example schema"
+schema = "run --example cwd-security-subdao-pre-propose_schema"
diff --git a/...ity-subdao-pre-propose/examples/schema.rs → ...cwd-security-subdao-pre-propose_schema.rs b/...ity-subdao-pre-propose/examples/schema.rs → ...cwd-security-subdao-pre-propose_schema.rs
diff --git a/contracts/subdaos/pre-propose/cwd-subdao-pre-propose-single/.cargo/config b/contracts/subdaos/pre-propose/cwd-subdao-pre-propose-single/.cargo/config
@@ -1,4 +1,4 @@
 [alias]
 wasm = "build --release --target wasm32-unknown-unknown"
 unit-test = "test --lib"
-schema = "run --example schema"
+schema = "run --example cwd-subdao-pre-propose-single_schema"
diff --git a/...dao-pre-propose-single/examples/schema.rs → ...s/cwd-subdao-pre-propose-single_schema.rs b/...dao-pre-propose-single/examples/schema.rs → ...s/cwd-subdao-pre-propose-single_schema.rs
diff --git a/contracts/subdaos/proposal/cwd-subdao-proposal-single/.cargo/config b/contracts/subdaos/proposal/cwd-subdao-proposal-single/.cargo/config
@@ -1,4 +1,4 @@
 [alias]
 wasm = "build --release --target wasm32-unknown-unknown"
 unit-test = "test --lib"
-schema = "run --example schema"
+schema = "run --example cwd-subdao-proposal-single_schema"
diff --git a/...subdao-proposal-single/examples/schema.rs → ...ples/cwd-subdao-proposal-single_schema.rs b/...subdao-proposal-single/examples/schema.rs → ...ples/cwd-subdao-proposal-single_schema.rs
diff --git a/contracts/tokenomics/distribution/.cargo/config b/contracts/tokenomics/distribution/.cargo/config
@@ -3,4 +3,4 @@ wasm = "build --release --target wasm32-unknown-unknown"
 wasm-debug = "build --target wasm32-unknown-unknown"
 unit-test = "test --lib --features backtraces"
 integration-test = "test --test integration"
-schema = "run --example schema"
+schema = "run --example distribution_schema"
diff --git a/...okenomics/distribution/examples/schema.rs → ...tribution/examples/distribution_schema.rs b/...okenomics/distribution/examples/schema.rs → ...tribution/examples/distribution_schema.rs
diff --git a/contracts/tokenomics/reserve/.cargo/config b/contracts/tokenomics/reserve/.cargo/config
@@ -3,4 +3,4 @@ wasm = "build --release --target wasm32-unknown-unknown"
 wasm-debug = "build --target wasm32-unknown-unknown"
 unit-test = "test --lib --features backtraces"
 integration-test = "test --test integration"
-schema = "run --example schema"
+schema = "run --example reserve_schema"
diff --git a/contracts/tokenomics/reserve/Cargo.toml b/contracts/tokenomics/reserve/Cargo.toml
@@ -23,5 +23,3 @@ schemars = "0.8.8"
 serde = {version = "1.0.103", default-features = false, features = ["derive"]}
 thiserror = {version = "1.0"}
 cw2 = "1.1.0"
-
-[dev-dependencies]
diff --git a/...cts/tokenomics/reserve/examples/schema.rs → ...nomics/reserve/examples/reserve_schema.rs b/...cts/tokenomics/reserve/examples/schema.rs → ...nomics/reserve/examples/reserve_schema.rs
diff --git a/packages/cw-denom/src/lib.rs b/packages/cw-denom/src/lib.rs
@@ -275,8 +275,8 @@ mod tests {
             "1abc".to_string(),                        // Starts with non alphabetic character.
             "abc~d".to_string(),                       // Contains invalid character.
             "".to_string(),                            // Too short, also empty.
-            "🥵abc".to_string(),                     // Weird unicode start.
-            "ab:12🥵a".to_string(),                  // Weird unocide in non-head position.
+            "🥵abc".to_string(),                       // Weird unicode start.
+            "ab:12🥵a".to_string(),                    // Weird unocide in non-head position.
             "ab,cd".to_string(),                       // Comma is not a valid seperator.
         ];
 

diff --git a/rust-toolchain.toml b/rust-toolchain.toml
@@ -1,2 +1,2 @@
 [toolchain]
-channel = "1.68.2"
+channel = "1.71.0"