Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Align all crates to the 2.0.0 framework #902

Merged
merged 15 commits into from
Mar 21, 2024
Merged

Align all crates to the 2.0.0 framework #902

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
ae2e069
add a way to statically insert mock addresses
uint Feb 29, 2024
901f1ea
update cw1 package/contracts to 2.0.0 tooling
uint Mar 11, 2024
7eadbcc
lints
uint Mar 4, 2024
01c915d
align cw20-base
uint Mar 5, 2024
4935744
align cw20-ics20
uint Mar 5, 2024
5e74fe6
align cw3 contracts
uint Mar 5, 2024
b3833a0
align cw4 contracts
uint Mar 5, 2024
3854e26
fix wasm build of cw20-ics20
uint Mar 5, 2024
3e71000
CI: update cosmwasm-check
uint Mar 5, 2024
0f3f89f
CI: bump compiler version
uint Mar 5, 2024
b765e62
Bumped cw-multi-test version.
DariuszDepta Mar 11, 2024
1cc648d
Upgraded dependencies to 2.0.0 except cw-multi-test.
DariuszDepta Mar 20, 2024
bac1a98
bump cw-plus to 2.0.0-rc.0
uint Mar 20, 2024
7651543
remove obsolete script
uint Mar 20, 2024
0866d9a
generate changelog for 2.0.0-rc.0
uint Mar 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
94 changes: 47 additions & 47 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ workflows:
jobs:
contract_cw1_subkeys:
docker:
- image: rust:1.67.0
- image: rust:1.76.0
working_directory: ~/project/contracts/cw1-subkeys
steps:
- checkout:
Expand All @@ -50,7 +50,7 @@ jobs:
command: rustc --version; cargo --version; rustup --version
- restore_cache:
keys:
- cargocache-cw1-subkeys-rust:1.67.0-{{ checksum "~/project/Cargo.lock" }}
- cargocache-cw1-subkeys-rust:1.76.0-{{ checksum "~/project/Cargo.lock" }}
- run:
name: Unit Tests
environment:
Expand All @@ -63,11 +63,11 @@ jobs:
paths:
- /usr/local/cargo/registry
- target
key: cargocache-cw1-subkeys-rust:1.67.0-{{ checksum "~/project/Cargo.lock" }}
key: cargocache-cw1-subkeys-rust:1.76.0-{{ checksum "~/project/Cargo.lock" }}

contract_cw1_whitelist:
docker:
- image: rust:1.67.0
- image: rust:1.76.0
working_directory: ~/project/contracts/cw1-whitelist
steps:
- checkout:
Expand All @@ -77,7 +77,7 @@ jobs:
command: rustc --version; cargo --version; rustup --version
- restore_cache:
keys:
- cargocache-cw1-whitelist-rust:1.67.0-{{ checksum "~/project/Cargo.lock" }}
- cargocache-cw1-whitelist-rust:1.76.0-{{ checksum "~/project/Cargo.lock" }}
- run:
name: Unit Tests
environment:
Expand All @@ -90,11 +90,11 @@ jobs:
paths:
- /usr/local/cargo/registry
- target
key: cargocache-cw1-whitelist-rust:1.67.0-{{ checksum "~/project/Cargo.lock" }}
key: cargocache-cw1-whitelist-rust:1.76.0-{{ checksum "~/project/Cargo.lock" }}

contract_cw3_fixed_multisig:
docker:
- image: rust:1.67.0
- image: rust:1.76.0
working_directory: ~/project/contracts/cw3-fixed-multisig
steps:
- checkout:
Expand All @@ -104,7 +104,7 @@ jobs:
command: rustc --version; cargo --version; rustup --version
- restore_cache:
keys:
- cargocache-cw3-fixed-multisig-rust:1.67.0-{{ checksum "~/project/Cargo.lock" }}
- cargocache-cw3-fixed-multisig-rust:1.76.0-{{ checksum "~/project/Cargo.lock" }}
- run:
name: Unit Tests
environment:
Expand All @@ -117,11 +117,11 @@ jobs:
paths:
- /usr/local/cargo/registry
- target
key: cargocache-cw3-fixed-multisig-rust:1.67.0-{{ checksum "~/project/Cargo.lock" }}
key: cargocache-cw3-fixed-multisig-rust:1.76.0-{{ checksum "~/project/Cargo.lock" }}

contract_cw3_flex_multisig:
docker:
- image: rust:1.67.0
- image: rust:1.76.0
working_directory: ~/project/contracts/cw3-flex-multisig
steps:
- checkout:
Expand All @@ -131,7 +131,7 @@ jobs:
command: rustc --version; cargo --version; rustup --version
- restore_cache:
keys:
- cargocache-cw3-flex-multisig-rust:1.67.0-{{ checksum "~/project/Cargo.lock" }}
- cargocache-cw3-flex-multisig-rust:1.76.0-{{ checksum "~/project/Cargo.lock" }}
- run:
name: Unit Tests
environment:
Expand All @@ -144,11 +144,11 @@ jobs:
paths:
- /usr/local/cargo/registry
- target
key: cargocache-cw3-flex-multisig-rust:1.67.0-{{ checksum "~/project/Cargo.lock" }}
key: cargocache-cw3-flex-multisig-rust:1.76.0-{{ checksum "~/project/Cargo.lock" }}

contract_cw4_group:
docker:
- image: rust:1.67.0
- image: rust:1.76.0
working_directory: ~/project/contracts/cw4-group
steps:
- checkout:
Expand All @@ -158,7 +158,7 @@ jobs:
command: rustc --version; cargo --version; rustup --version
- restore_cache:
keys:
- cargocache-cw4-group-rust:1.67.0-{{ checksum "~/project/Cargo.lock" }}
- cargocache-cw4-group-rust:1.76.0-{{ checksum "~/project/Cargo.lock" }}
- run:
name: Unit Tests
environment:
Expand All @@ -171,11 +171,11 @@ jobs:
paths:
- /usr/local/cargo/registry
- target
key: cargocache-cw4-group-rust:1.67.0-{{ checksum "~/project/Cargo.lock" }}
key: cargocache-cw4-group-rust:1.76.0-{{ checksum "~/project/Cargo.lock" }}

contract_cw4_stake:
docker:
- image: rust:1.67.0
- image: rust:1.76.0
working_directory: ~/project/contracts/cw4-stake
steps:
- checkout:
Expand All @@ -185,7 +185,7 @@ jobs:
command: rustc --version; cargo --version; rustup --version
- restore_cache:
keys:
- cargocache-cw4-stake-rust:1.67.0-{{ checksum "~/project/Cargo.lock" }}
- cargocache-cw4-stake-rust:1.76.0-{{ checksum "~/project/Cargo.lock" }}
- run:
name: Unit Tests
environment:
Expand All @@ -198,11 +198,11 @@ jobs:
paths:
- /usr/local/cargo/registry
- target
key: cargocache-cw4-stake-rust:1.67.0-{{ checksum "~/project/Cargo.lock" }}
key: cargocache-cw4-stake-rust:1.76.0-{{ checksum "~/project/Cargo.lock" }}

contract_cw20_base:
docker:
- image: rust:1.67.0
- image: rust:1.76.0
working_directory: ~/project/contracts/cw20-base
steps:
- checkout:
Expand All @@ -212,7 +212,7 @@ jobs:
command: rustc --version; cargo --version; rustup --version
- restore_cache:
keys:
- cargocache-cw20-base-rust:1.67.0-{{ checksum "~/project/Cargo.lock" }}
- cargocache-cw20-base-rust:1.76.0-{{ checksum "~/project/Cargo.lock" }}
- run:
name: Unit Tests
environment:
Expand All @@ -225,11 +225,11 @@ jobs:
paths:
- /usr/local/cargo/registry
- target
key: cargocache-cw20-base-rust:1.67.0-{{ checksum "~/project/Cargo.lock" }}
key: cargocache-cw20-base-rust:1.76.0-{{ checksum "~/project/Cargo.lock" }}

contract_cw20_ics20:
docker:
- image: rust:1.67.0
- image: rust:1.76.0
working_directory: ~/project/contracts/cw20-ics20
steps:
- checkout:
Expand All @@ -239,7 +239,7 @@ jobs:
command: rustc --version; cargo --version; rustup --version
- restore_cache:
keys:
- cargocache-cw20-ics20-rust:1.67.0-{{ checksum "~/project/Cargo.lock" }}
- cargocache-cw20-ics20-rust:1.76.0-{{ checksum "~/project/Cargo.lock" }}
- run:
name: Unit Tests
environment:
Expand All @@ -252,11 +252,11 @@ jobs:
paths:
- /usr/local/cargo/registry
- target
key: cargocache-cw20-ics20-rust:1.67.0-{{ checksum "~/project/Cargo.lock" }}
key: cargocache-cw20-ics20-rust:1.76.0-{{ checksum "~/project/Cargo.lock" }}

package_cw1:
docker:
- image: rust:1.67.0
- image: rust:1.76.0
working_directory: ~/project/packages/cw1
steps:
- checkout:
Expand All @@ -266,7 +266,7 @@ jobs:
command: rustc --version; cargo --version; rustup --version; rustup target list --installed
- restore_cache:
keys:
- cargocache-v2-cw1:1.67.0-{{ checksum "~/project/Cargo.lock" }}
- cargocache-v2-cw1:1.76.0-{{ checksum "~/project/Cargo.lock" }}
- run:
name: Build library for native target
command: cargo build --locked
Expand All @@ -280,11 +280,11 @@ jobs:
paths:
- /usr/local/cargo/registry
- target
key: cargocache-v2-cw1:1.67.0-{{ checksum "~/project/Cargo.lock" }}
key: cargocache-v2-cw1:1.76.0-{{ checksum "~/project/Cargo.lock" }}

package_cw3:
docker:
- image: rust:1.67.0
- image: rust:1.76.0
working_directory: ~/project/packages/cw3
steps:
- checkout:
Expand All @@ -294,7 +294,7 @@ jobs:
command: rustc --version; cargo --version; rustup --version; rustup target list --installed
- restore_cache:
keys:
- cargocache-v2-cw3:1.67.0-{{ checksum "~/project/Cargo.lock" }}
- cargocache-v2-cw3:1.76.0-{{ checksum "~/project/Cargo.lock" }}
- run:
name: Build library for native target
command: cargo build --locked
Expand All @@ -308,11 +308,11 @@ jobs:
paths:
- /usr/local/cargo/registry
- target
key: cargocache-v2-cw3:1.67.0-{{ checksum "~/project/Cargo.lock" }}
key: cargocache-v2-cw3:1.76.0-{{ checksum "~/project/Cargo.lock" }}

package_cw4:
docker:
- image: rust:1.67.0
- image: rust:1.76.0
working_directory: ~/project/packages/cw4
steps:
- checkout:
Expand All @@ -322,7 +322,7 @@ jobs:
command: rustc --version; cargo --version; rustup --version; rustup target list --installed
- restore_cache:
keys:
- cargocache-v2-cw4:1.67.0-{{ checksum "~/project/Cargo.lock" }}
- cargocache-v2-cw4:1.76.0-{{ checksum "~/project/Cargo.lock" }}
- run:
name: Build library for native target
command: cargo build --locked
Expand All @@ -336,11 +336,11 @@ jobs:
paths:
- /usr/local/cargo/registry
- target
key: cargocache-v2-cw4:1.67.0-{{ checksum "~/project/Cargo.lock" }}
key: cargocache-v2-cw4:1.76.0-{{ checksum "~/project/Cargo.lock" }}

package_cw20:
docker:
- image: rust:1.67.0
- image: rust:1.76.0
working_directory: ~/project/packages/cw20
steps:
- checkout:
Expand All @@ -350,7 +350,7 @@ jobs:
command: rustc --version; cargo --version; rustup --version; rustup target list --installed
- restore_cache:
keys:
- cargocache-v2-cw20:1.67.0-{{ checksum "~/project/Cargo.lock" }}
- cargocache-v2-cw20:1.76.0-{{ checksum "~/project/Cargo.lock" }}
- run:
name: Build library for native target
command: cargo build --locked
Expand All @@ -364,11 +364,11 @@ jobs:
paths:
- /usr/local/cargo/registry
- target
key: cargocache-v2-cw20:1.67.0-{{ checksum "~/project/Cargo.lock" }}
key: cargocache-v2-cw20:1.76.0-{{ checksum "~/project/Cargo.lock" }}

package_cw1155:
docker:
- image: rust:1.67.0
- image: rust:1.76.0
working_directory: ~/project/packages/cw1155
steps:
- checkout:
Expand All @@ -378,7 +378,7 @@ jobs:
command: rustc --version; cargo --version; rustup --version; rustup target list --installed
- restore_cache:
keys:
- cargocache-v2-cw1155:1.67.0-{{ checksum "~/project/Cargo.lock" }}
- cargocache-v2-cw1155:1.76.0-{{ checksum "~/project/Cargo.lock" }}
- run:
name: Build library for native target
command: cargo build --locked
Expand All @@ -392,19 +392,19 @@ jobs:
paths:
- /usr/local/cargo/registry
- target
key: cargocache-v2-cw1155:1.67.0-{{ checksum "~/project/Cargo.lock" }}
key: cargocache-v2-cw1155:1.76.0-{{ checksum "~/project/Cargo.lock" }}

lint:
docker:
- image: rust:1.67.0
- image: rust:1.76.0
steps:
- checkout
- run:
name: Version information
command: rustc --version; cargo --version; rustup --version; rustup target list --installed
- restore_cache:
keys:
- cargocache-v2-lint-rust:1.67.0-{{ checksum "Cargo.lock" }}
- cargocache-v2-lint-rust:1.76.0-{{ checksum "Cargo.lock" }}
- run:
name: Add rustfmt component
command: rustup component add rustfmt
Expand All @@ -423,15 +423,15 @@ jobs:
- target/debug/.fingerprint
- target/debug/build
- target/debug/deps
key: cargocache-v2-lint-rust:1.67.0-{{ checksum "Cargo.lock" }}
key: cargocache-v2-lint-rust:1.76.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
# for all the other tests.
# We also sanity-check the resultant wasm files.
wasm-build:
docker:
- image: rust:1.67.0
- image: rust:1.76.0
steps:
- checkout:
path: ~/project
Expand All @@ -440,7 +440,7 @@ jobs:
command: rustc --version; cargo --version; rustup --version
- restore_cache:
keys:
- cargocache-wasm-rust:1.67.0-{{ checksum "~/project/Cargo.lock" }}
- cargocache-wasm-rust:1.76.0-{{ checksum "~/project/Cargo.lock" }}
- run:
name: Add wasm32 target
command: rustup target add wasm32-unknown-unknown
Expand All @@ -455,12 +455,12 @@ jobs:
- run:
name: Install cosmwasm-check
# Uses --debug for compilation speed
command: cargo install --locked --debug --version 1.4.0 cosmwasm-check
command: cargo install --locked --debug --version 2.0.0-rc.1 cosmwasm-check
- save_cache:
paths:
- /usr/local/cargo/registry
- target
key: cargocache-wasm-rust:1.67.0-{{ checksum "~/project/Cargo.lock" }}
key: cargocache-wasm-rust:1.76.0-{{ checksum "~/project/Cargo.lock" }}
- run:
name: Check wasm contracts
command: cosmwasm-check ./target/wasm32-unknown-unknown/release/*.wasm
Expand Down Expand Up @@ -528,7 +528,7 @@ jobs:

build_and_upload_schemas:
docker:
- image: rust:1.67.0
- image: rust:1.76.0
working_directory: ~/project
steps:
- checkout:
Expand Down
Loading