diff --git a/.circleci/config.yml b/.circleci/config.yml index 61f1f60b1..58d04827c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -42,7 +42,7 @@ workflows: jobs: contract_cw1_subkeys: docker: - - image: rust:1.64.0 + - image: rust:1.65.0 working_directory: ~/project/contracts/cw1-subkeys steps: - checkout: @@ -52,7 +52,7 @@ jobs: command: rustc --version; cargo --version; rustup --version - restore_cache: keys: - - cargocache-cw1-subkeys-rust:1.64.0-{{ checksum "~/project/Cargo.lock" }} + - cargocache-cw1-subkeys-rust:1.65.0-{{ checksum "~/project/Cargo.lock" }} - run: name: Unit Tests environment: @@ -65,11 +65,11 @@ jobs: paths: - /usr/local/cargo/registry - target - key: cargocache-cw1-subkeys-rust:1.64.0-{{ checksum "~/project/Cargo.lock" }} + key: cargocache-cw1-subkeys-rust:1.65.0-{{ checksum "~/project/Cargo.lock" }} contract_cw1_whitelist: docker: - - image: rust:1.64.0 + - image: rust:1.65.0 working_directory: ~/project/contracts/cw1-whitelist steps: - checkout: @@ -79,7 +79,7 @@ jobs: command: rustc --version; cargo --version; rustup --version - restore_cache: keys: - - cargocache-cw1-whitelist-rust:1.64.0-{{ checksum "~/project/Cargo.lock" }} + - cargocache-cw1-whitelist-rust:1.65.0-{{ checksum "~/project/Cargo.lock" }} - run: name: Unit Tests environment: @@ -92,11 +92,11 @@ jobs: paths: - /usr/local/cargo/registry - target - key: cargocache-cw1-whitelist-rust:1.64.0-{{ checksum "~/project/Cargo.lock" }} + key: cargocache-cw1-whitelist-rust:1.65.0-{{ checksum "~/project/Cargo.lock" }} contract_cw3_fixed_multisig: docker: - - image: rust:1.64.0 + - image: rust:1.65.0 working_directory: ~/project/contracts/cw3-fixed-multisig steps: - checkout: @@ -106,7 +106,7 @@ jobs: command: rustc --version; cargo --version; rustup --version - restore_cache: keys: - - cargocache-cw3-fixed-multisig-rust:1.64.0-{{ checksum "~/project/Cargo.lock" }} + - cargocache-cw3-fixed-multisig-rust:1.65.0-{{ checksum "~/project/Cargo.lock" }} - run: name: Unit Tests environment: @@ -119,11 +119,11 @@ jobs: paths: - /usr/local/cargo/registry - target - key: cargocache-cw3-fixed-multisig-rust:1.64.0-{{ checksum "~/project/Cargo.lock" }} + key: cargocache-cw3-fixed-multisig-rust:1.65.0-{{ checksum "~/project/Cargo.lock" }} contract_cw3_flex_multisig: docker: - - image: rust:1.64.0 + - image: rust:1.65.0 working_directory: ~/project/contracts/cw3-flex-multisig steps: - checkout: @@ -133,7 +133,7 @@ jobs: command: rustc --version; cargo --version; rustup --version - restore_cache: keys: - - cargocache-cw3-flex-multisig-rust:1.64.0-{{ checksum "~/project/Cargo.lock" }} + - cargocache-cw3-flex-multisig-rust:1.65.0-{{ checksum "~/project/Cargo.lock" }} - run: name: Unit Tests environment: @@ -146,11 +146,11 @@ jobs: paths: - /usr/local/cargo/registry - target - key: cargocache-cw3-flex-multisig-rust:1.64.0-{{ checksum "~/project/Cargo.lock" }} + key: cargocache-cw3-flex-multisig-rust:1.65.0-{{ checksum "~/project/Cargo.lock" }} contract_cw4_group: docker: - - image: rust:1.64.0 + - image: rust:1.65.0 working_directory: ~/project/contracts/cw4-group steps: - checkout: @@ -160,7 +160,7 @@ jobs: command: rustc --version; cargo --version; rustup --version - restore_cache: keys: - - cargocache-cw4-group-rust:1.64.0-{{ checksum "~/project/Cargo.lock" }} + - cargocache-cw4-group-rust:1.65.0-{{ checksum "~/project/Cargo.lock" }} - run: name: Unit Tests environment: @@ -173,11 +173,11 @@ jobs: paths: - /usr/local/cargo/registry - target - key: cargocache-cw4-group-rust:1.64.0-{{ checksum "~/project/Cargo.lock" }} + key: cargocache-cw4-group-rust:1.65.0-{{ checksum "~/project/Cargo.lock" }} contract_cw4_stake: docker: - - image: rust:1.64.0 + - image: rust:1.65.0 working_directory: ~/project/contracts/cw4-stake steps: - checkout: @@ -187,7 +187,7 @@ jobs: command: rustc --version; cargo --version; rustup --version - restore_cache: keys: - - cargocache-cw4-stake-rust:1.64.0-{{ checksum "~/project/Cargo.lock" }} + - cargocache-cw4-stake-rust:1.65.0-{{ checksum "~/project/Cargo.lock" }} - run: name: Unit Tests environment: @@ -200,11 +200,11 @@ jobs: paths: - /usr/local/cargo/registry - target - key: cargocache-cw4-stake-rust:1.64.0-{{ checksum "~/project/Cargo.lock" }} + key: cargocache-cw4-stake-rust:1.65.0-{{ checksum "~/project/Cargo.lock" }} contract_cw20_base: docker: - - image: rust:1.64.0 + - image: rust:1.65.0 working_directory: ~/project/contracts/cw20-base steps: - checkout: @@ -214,7 +214,7 @@ jobs: command: rustc --version; cargo --version; rustup --version - restore_cache: keys: - - cargocache-cw20-base-rust:1.64.0-{{ checksum "~/project/Cargo.lock" }} + - cargocache-cw20-base-rust:1.65.0-{{ checksum "~/project/Cargo.lock" }} - run: name: Unit Tests environment: @@ -227,11 +227,11 @@ jobs: paths: - /usr/local/cargo/registry - target - key: cargocache-cw20-base-rust:1.64.0-{{ checksum "~/project/Cargo.lock" }} + key: cargocache-cw20-base-rust:1.65.0-{{ checksum "~/project/Cargo.lock" }} contract_cw20_ics20: docker: - - image: rust:1.64.0 + - image: rust:1.65.0 working_directory: ~/project/contracts/cw20-ics20 steps: - checkout: @@ -241,7 +241,7 @@ jobs: command: rustc --version; cargo --version; rustup --version - restore_cache: keys: - - cargocache-cw20-ics20-rust:1.64.0-{{ checksum "~/project/Cargo.lock" }} + - cargocache-cw20-ics20-rust:1.65.0-{{ checksum "~/project/Cargo.lock" }} - run: name: Unit Tests environment: @@ -254,11 +254,11 @@ jobs: paths: - /usr/local/cargo/registry - target - key: cargocache-cw20-ics20-rust:1.64.0-{{ checksum "~/project/Cargo.lock" }} + key: cargocache-cw20-ics20-rust:1.65.0-{{ checksum "~/project/Cargo.lock" }} package_controllers: docker: - - image: rust:1.64.0 + - image: rust:1.65.0 working_directory: ~/project/packages/controllers steps: - checkout: @@ -268,7 +268,7 @@ jobs: command: rustc --version; cargo --version; rustup --version; rustup target list --installed - restore_cache: keys: - - cargocache-v2-controllers:1.64.0-{{ checksum "~/project/Cargo.lock" }} + - cargocache-v2-controllers:1.65.0-{{ checksum "~/project/Cargo.lock" }} - run: name: Build library for native target command: cargo build --locked @@ -279,11 +279,11 @@ jobs: paths: - /usr/local/cargo/registry - target - key: cargocache-v2-controllers:1.64.0-{{ checksum "~/project/Cargo.lock" }} + key: cargocache-v2-controllers:1.65.0-{{ checksum "~/project/Cargo.lock" }} package_cw1: docker: - - image: rust:1.64.0 + - image: rust:1.65.0 working_directory: ~/project/packages/cw1 steps: - checkout: @@ -293,7 +293,7 @@ jobs: command: rustc --version; cargo --version; rustup --version; rustup target list --installed - restore_cache: keys: - - cargocache-v2-cw1:1.64.0-{{ checksum "~/project/Cargo.lock" }} + - cargocache-v2-cw1:1.65.0-{{ checksum "~/project/Cargo.lock" }} - run: name: Build library for native target command: cargo build --locked @@ -307,11 +307,11 @@ jobs: paths: - /usr/local/cargo/registry - target - key: cargocache-v2-cw1:1.64.0-{{ checksum "~/project/Cargo.lock" }} + key: cargocache-v2-cw1:1.65.0-{{ checksum "~/project/Cargo.lock" }} package_cw2: docker: - - image: rust:1.64.0 + - image: rust:1.65.0 working_directory: ~/project/packages/cw2 steps: - checkout: @@ -321,7 +321,7 @@ jobs: command: rustc --version; cargo --version; rustup --version; rustup target list --installed - restore_cache: keys: - - cargocache-v2-cw2:1.64.0-{{ checksum "~/project/Cargo.lock" }} + - cargocache-v2-cw2:1.65.0-{{ checksum "~/project/Cargo.lock" }} - run: name: Build library for native target command: cargo build --locked @@ -333,11 +333,11 @@ jobs: paths: - /usr/local/cargo/registry - target - key: cargocache-v2-cw2:1.64.0-{{ checksum "~/project/Cargo.lock" }} + key: cargocache-v2-cw2:1.65.0-{{ checksum "~/project/Cargo.lock" }} package_cw3: docker: - - image: rust:1.64.0 + - image: rust:1.65.0 working_directory: ~/project/packages/cw3 steps: - checkout: @@ -347,7 +347,7 @@ jobs: command: rustc --version; cargo --version; rustup --version; rustup target list --installed - restore_cache: keys: - - cargocache-v2-cw3:1.64.0-{{ checksum "~/project/Cargo.lock" }} + - cargocache-v2-cw3:1.65.0-{{ checksum "~/project/Cargo.lock" }} - run: name: Build library for native target command: cargo build --locked @@ -361,11 +361,11 @@ jobs: paths: - /usr/local/cargo/registry - target - key: cargocache-v2-cw3:1.64.0-{{ checksum "~/project/Cargo.lock" }} + key: cargocache-v2-cw3:1.65.0-{{ checksum "~/project/Cargo.lock" }} package_cw4: docker: - - image: rust:1.64.0 + - image: rust:1.65.0 working_directory: ~/project/packages/cw4 steps: - checkout: @@ -375,7 +375,7 @@ jobs: command: rustc --version; cargo --version; rustup --version; rustup target list --installed - restore_cache: keys: - - cargocache-v2-cw4:1.64.0-{{ checksum "~/project/Cargo.lock" }} + - cargocache-v2-cw4:1.65.0-{{ checksum "~/project/Cargo.lock" }} - run: name: Build library for native target command: cargo build --locked @@ -389,11 +389,11 @@ jobs: paths: - /usr/local/cargo/registry - target - key: cargocache-v2-cw4:1.64.0-{{ checksum "~/project/Cargo.lock" }} + key: cargocache-v2-cw4:1.65.0-{{ checksum "~/project/Cargo.lock" }} package_cw20: docker: - - image: rust:1.64.0 + - image: rust:1.65.0 working_directory: ~/project/packages/cw20 steps: - checkout: @@ -403,7 +403,7 @@ jobs: command: rustc --version; cargo --version; rustup --version; rustup target list --installed - restore_cache: keys: - - cargocache-v2-cw20:1.64.0-{{ checksum "~/project/Cargo.lock" }} + - cargocache-v2-cw20:1.65.0-{{ checksum "~/project/Cargo.lock" }} - run: name: Build library for native target command: cargo build --locked @@ -417,11 +417,11 @@ jobs: paths: - /usr/local/cargo/registry - target - key: cargocache-v2-cw20:1.64.0-{{ checksum "~/project/Cargo.lock" }} + key: cargocache-v2-cw20:1.65.0-{{ checksum "~/project/Cargo.lock" }} package_cw1155: docker: - - image: rust:1.64.0 + - image: rust:1.65.0 working_directory: ~/project/packages/cw1155 steps: - checkout: @@ -431,7 +431,7 @@ jobs: command: rustc --version; cargo --version; rustup --version; rustup target list --installed - restore_cache: keys: - - cargocache-v2-cw1155:1.64.0-{{ checksum "~/project/Cargo.lock" }} + - cargocache-v2-cw1155:1.65.0-{{ checksum "~/project/Cargo.lock" }} - run: name: Build library for native target command: cargo build --locked @@ -445,11 +445,11 @@ jobs: paths: - /usr/local/cargo/registry - target - key: cargocache-v2-cw1155:1.64.0-{{ checksum "~/project/Cargo.lock" }} + key: cargocache-v2-cw1155:1.65.0-{{ checksum "~/project/Cargo.lock" }} lint: docker: - - image: rust:1.64.0 + - image: rust:1.65.0 steps: - checkout - run: @@ -457,7 +457,7 @@ jobs: command: rustc --version; cargo --version; rustup --version; rustup target list --installed - restore_cache: keys: - - cargocache-v2-lint-rust:1.64.0-{{ checksum "Cargo.lock" }} + - cargocache-v2-lint-rust:1.65.0-{{ checksum "Cargo.lock" }} - run: name: Add rustfmt component command: rustup component add rustfmt @@ -476,7 +476,7 @@ jobs: - target/debug/.fingerprint - target/debug/build - target/debug/deps - key: cargocache-v2-lint-rust:1.64.0-{{ checksum "Cargo.lock" }} + key: cargocache-v2-lint-rust:1.65.0-{{ checksum "Cargo.lock" }} # This runs one time on the top level to ensure all contracts compile properly into wasm. # We don't run the wasm build per contract build, and then reuse a lot of the same dependencies, so this speeds up CI time @@ -484,7 +484,7 @@ jobs: # We also sanity-check the resultant wasm files. wasm-build: docker: - - image: rust:1.64.0 + - image: rust:1.65.0 steps: - checkout: path: ~/project @@ -493,7 +493,7 @@ jobs: command: rustc --version; cargo --version; rustup --version - restore_cache: keys: - - cargocache-wasm-rust:1.64.0-{{ checksum "~/project/Cargo.lock" }} + - cargocache-wasm-rust:1.65.0-{{ checksum "~/project/Cargo.lock" }} - run: name: Add wasm32 target command: rustup target add wasm32-unknown-unknown @@ -513,7 +513,7 @@ jobs: paths: - /usr/local/cargo/registry - target - key: cargocache-wasm-rust:1.64.0-{{ checksum "~/project/Cargo.lock" }} + key: cargocache-wasm-rust:1.65.0-{{ checksum "~/project/Cargo.lock" }} - run: name: Check wasm contracts command: cosmwasm-check ./target/wasm32-unknown-unknown/release/*.wasm @@ -581,7 +581,7 @@ jobs: build_and_upload_schemas: docker: - - image: rust:1.64.0 + - image: rust:1.65.0 working_directory: ~/project steps: - checkout: diff --git a/Cargo.toml b/Cargo.toml index c384f634c..df1b7252f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,9 @@ [workspace] members = ["packages/*", "contracts/*"] +# Resolver has to be set explicitely in workspaces, see https://github.com/rust-lang/cargo/issues/9956 +resolver = "2" + [profile.release.package.cw1-subkeys] codegen-units = 1 incremental = false diff --git a/contracts/cw1-whitelist/src/contract.rs b/contracts/cw1-whitelist/src/contract.rs index 77f2b7ef7..b13fea207 100644 --- a/contracts/cw1-whitelist/src/contract.rs +++ b/contracts/cw1-whitelist/src/contract.rs @@ -111,7 +111,7 @@ pub fn execute_update_admins( fn can_execute(deps: Deps, sender: &str) -> StdResult { let cfg = ADMIN_LIST.load(deps.storage)?; - let can = cfg.is_admin(&sender); + let can = cfg.is_admin(sender); Ok(can) } diff --git a/contracts/cw20-ics20/src/contract.rs b/contracts/cw20-ics20/src/contract.rs index 7c0578cd7..9586bb04a 100644 --- a/contracts/cw20-ics20/src/contract.rs +++ b/contracts/cw20-ics20/src/contract.rs @@ -158,7 +158,7 @@ pub fn execute_transfer( .add_attribute("sender", &packet.sender) .add_attribute("receiver", &packet.receiver) .add_attribute("denom", &packet.denom) - .add_attribute("amount", &packet.amount.to_string()); + .add_attribute("amount", packet.amount.to_string()); Ok(res) } diff --git a/contracts/cw4-group/src/tests.rs b/contracts/cw4-group/src/tests.rs index 9ed220523..39bd87978 100644 --- a/contracts/cw4-group/src/tests.rs +++ b/contracts/cw4-group/src/tests.rs @@ -150,7 +150,7 @@ fn assert_users( // this is only valid if we are not doing a historical query if height.is_none() { // compute expected metrics - let weights = vec![user1_weight, user2_weight, user3_weight]; + let weights = [user1_weight, user2_weight, user3_weight]; let sum: u64 = weights.iter().map(|x| x.unwrap_or_default()).sum(); let count = weights.iter().filter(|x| x.is_some()).count(); @@ -357,7 +357,7 @@ fn hooks_fire() { let add_msg2 = ExecuteMsg::AddHook { addr: contract2.clone(), }; - for msg in vec![add_msg, add_msg2] { + for msg in [add_msg, add_msg2] { let _ = execute(deps.as_mut(), mock_env(), admin_info.clone(), msg).unwrap(); } diff --git a/contracts/cw4-stake/src/contract.rs b/contracts/cw4-stake/src/contract.rs index 408f3265c..20ee9fdad 100644 --- a/contracts/cw4-stake/src/contract.rs +++ b/contracts/cw4-stake/src/contract.rs @@ -502,7 +502,7 @@ mod tests { // this is only valid if we are not doing a historical query if height.is_none() { // compute expected metrics - let weights = vec![user1_weight, user2_weight, user3_weight]; + let weights = [user1_weight, user2_weight, user3_weight]; let sum: u64 = weights.iter().map(|x| x.unwrap_or_default()).sum(); let count = weights.iter().filter(|x| x.is_some()).count(); @@ -931,7 +931,7 @@ mod tests { let add_msg2 = ExecuteMsg::AddHook { addr: contract2.clone(), }; - for msg in vec![add_msg, add_msg2] { + for msg in [add_msg, add_msg2] { let _ = execute(deps.as_mut(), mock_env(), admin_info.clone(), msg).unwrap(); }