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

Flexible merkle tree whitelist update #694

Merged
merged 13 commits into from
Sep 17, 2024
Merged

Flexible merkle tree whitelist update #694

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
17c5096
Update vending-minter-merkle-wl
MightOfOaks Jul 27, 2024
1a5fc80
Add open-edition-minter-merkle-wl
MightOfOaks Jul 27, 2024
7bf732b
Linter happy
MightOfOaks Jul 28, 2024
1b2f4a5
Update schema for open-edition-minter-merkle-wl
MightOfOaks Jul 28, 2024
02b8b81
Update gas limit for e2e tests
MightOfOaks Jul 28, 2024
67dea2e
Update expected query response types
MightOfOaks Aug 7, 2024
60e5d4f
Remove address validation for the whitelist-merkletree/hasMember query
MightOfOaks Aug 7, 2024
ef75997
Linter happy
MightOfOaks Aug 9, 2024
c4c36c7
Update rustc version for CI
MightOfOaks Aug 9, 2024
32891b6
Set a limit to the max number of mintable tokens for OEs
MightOfOaks Aug 9, 2024
529f40b
Optional proof_hashes for ExecuteMsg::Mint
MightOfOaks Aug 23, 2024
06dd47a
Bump package version
MightOfOaks Aug 23, 2024
1bc3171
Update crate versions
MightOfOaks Sep 16, 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
90 changes: 45 additions & 45 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ workflows:
jobs:
contract_sg721_base:
docker:
- image: rust:1.74.0
- image: rust:1.75.0
working_directory: ~/project/contracts/collections/sg721-base
steps:
- checkout:
Expand All @@ -41,7 +41,7 @@ jobs:
command: rustc --version; cargo --version; rustup --version
- restore_cache:
keys:
- cargocache-sg721-rust:1.74.0-{{ checksum "~/project/Cargo.lock" }}
- cargocache-sg721-rust:1.75.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-sg721-rust:1.74.0-{{ checksum "~/project/Cargo.lock" }}
key: cargocache-sg721-rust:1.75.0-{{ checksum "~/project/Cargo.lock" }}

contract_sg721_nt:
docker:
- image: rust:1.74.0
- image: rust:1.75.0
working_directory: ~/project/contracts/collections/sg721-nt
steps:
- checkout:
Expand All @@ -77,7 +77,7 @@ jobs:
command: rustc --version; cargo --version; rustup --version
- restore_cache:
keys:
- cargocache-sg721-nt-rust:1.74.0-{{ checksum "~/project/Cargo.lock" }}
- cargocache-sg721-nt-rust:1.75.0-{{ checksum "~/project/Cargo.lock" }}
- run:
name: Unit Tests
environment:
Expand All @@ -99,11 +99,11 @@ jobs:
paths:
- /usr/local/cargo/registry
- target
key: cargocache-sg721-nt-rust:1.74.0-{{ checksum "~/project/Cargo.lock" }}
key: cargocache-sg721-nt-rust:1.75.0-{{ checksum "~/project/Cargo.lock" }}

contract_base_factory:
docker:
- image: rust:1.74.0
- image: rust:1.75.0
working_directory: ~/project/contracts/factories/base-factory
steps:
- checkout:
Expand All @@ -113,7 +113,7 @@ jobs:
command: rustc --version; cargo --version; rustup --version
- restore_cache:
keys:
- cargocache-base-factory-rust:1.74.0-{{ checksum "~/project/Cargo.lock" }}
- cargocache-base-factory-rust:1.75.0-{{ checksum "~/project/Cargo.lock" }}
- run:
name: Unit Tests
environment:
Expand All @@ -135,11 +135,11 @@ jobs:
paths:
- /usr/local/cargo/registry
- target
key: cargocache-base-factory-rust:1.74.0-{{ checksum "~/project/Cargo.lock" }}
key: cargocache-base-factory-rust:1.75.0-{{ checksum "~/project/Cargo.lock" }}

contract_base_minter:
docker:
- image: rust:1.74.0
- image: rust:1.75.0
working_directory: ~/project/contracts/minters/base-minter
steps:
- checkout:
Expand All @@ -149,7 +149,7 @@ jobs:
command: rustc --version; cargo --version; rustup --version
- restore_cache:
keys:
- cargocache-base-minter-rust:1.74.0-{{ checksum "~/project/Cargo.lock" }}
- cargocache-base-minter-rust:1.75.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-base-minter-rust:1.74.0-{{ checksum "~/project/Cargo.lock" }}
key: cargocache-base-minter-rust:1.75.0-{{ checksum "~/project/Cargo.lock" }}

contract_vending_factory:
docker:
- image: rust:1.74.0
- image: rust:1.75.0
working_directory: ~/project/contracts/factories/vending-factory
steps:
- checkout:
Expand All @@ -185,7 +185,7 @@ jobs:
command: rustc --version; cargo --version; rustup --version
- restore_cache:
keys:
- cargocache-vending-factory-rust:1.74.0-{{ checksum "~/project/Cargo.lock" }}
- cargocache-vending-factory-rust:1.75.0-{{ checksum "~/project/Cargo.lock" }}
- run:
name: Unit Tests
environment:
Expand All @@ -207,11 +207,11 @@ jobs:
paths:
- /usr/local/cargo/registry
- target
key: cargocache-vending-factory-rust:1.74.0-{{ checksum "~/project/Cargo.lock" }}
key: cargocache-vending-factory-rust:1.75.0-{{ checksum "~/project/Cargo.lock" }}

contract_vending_minter:
docker:
- image: rust:1.74.0
- image: rust:1.75.0
working_directory: ~/project/contracts/minters/vending-minter
steps:
- checkout:
Expand All @@ -221,7 +221,7 @@ jobs:
command: rustc --version; cargo --version; rustup --version
- restore_cache:
keys:
- cargocache-vending-minter-rust:1.74.0-{{ checksum "~/project/Cargo.lock" }}
- cargocache-vending-minter-rust:1.75.0-{{ checksum "~/project/Cargo.lock" }}
- run:
name: Unit Tests
environment:
Expand All @@ -243,11 +243,11 @@ jobs:
paths:
- /usr/local/cargo/registry
- target
key: cargocache-vending-minter-rust:1.74.0-{{ checksum "~/project/Cargo.lock" }}
key: cargocache-vending-minter-rust:1.75.0-{{ checksum "~/project/Cargo.lock" }}

contract_open_edition_factory:
docker:
- image: rust:1.74.0
- image: rust:1.75.0
working_directory: ~/project/contracts/factories/open-edition-factory
steps:
- checkout:
Expand All @@ -257,7 +257,7 @@ jobs:
command: rustc --version; cargo --version; rustup --version
- restore_cache:
keys:
- cargocache-open-edition-factory-rust:1.74.0-{{ checksum "~/project/Cargo.lock" }}
- cargocache-open-edition-factory-rust:1.75.0-{{ checksum "~/project/Cargo.lock" }}
- run:
name: Unit Tests
environment:
Expand All @@ -279,11 +279,11 @@ jobs:
paths:
- /usr/local/cargo/registry
- target
key: cargocache-open-edition-factory-rust:1.74.0-{{ checksum "~/project/Cargo.lock" }}
key: cargocache-open-edition-factory-rust:1.75.0-{{ checksum "~/project/Cargo.lock" }}

contract_open_edition_minter:
docker:
- image: rust:1.74.0
- image: rust:1.75.0
working_directory: ~/project/contracts/minters/open-edition-minter
steps:
- checkout:
Expand All @@ -293,7 +293,7 @@ jobs:
command: rustc --version; cargo --version; rustup --version
- restore_cache:
keys:
- cargocache-open-edition-minter-rust:1.74.0-{{ checksum "~/project/Cargo.lock" }}
- cargocache-open-edition-minter-rust:1.75.0-{{ checksum "~/project/Cargo.lock" }}
- run:
name: Unit Tests
environment:
Expand All @@ -315,11 +315,11 @@ jobs:
paths:
- /usr/local/cargo/registry
- target
key: cargocache-open-edition-minter-rust:1.74.0-{{ checksum "~/project/Cargo.lock" }}
key: cargocache-open-edition-minter-rust:1.75.0-{{ checksum "~/project/Cargo.lock" }}

contract_whitelist:
docker:
- image: rust:1.74.0
- image: rust:1.75.0
working_directory: ~/project/contracts/whitelists/whitelist
steps:
- checkout:
Expand All @@ -329,7 +329,7 @@ jobs:
command: rustc --version; cargo --version; rustup --version
- restore_cache:
keys:
- cargocache-whitelist-rust:1.74.0-{{ checksum "~/project/Cargo.lock" }}
- cargocache-whitelist-rust:1.75.0-{{ checksum "~/project/Cargo.lock" }}
- run:
name: Unit Tests
environment:
Expand All @@ -351,10 +351,10 @@ jobs:
paths:
- /usr/local/cargo/registry
- target
key: cargocache-whitelist-rust:1.74.0-{{ checksum "~/project/Cargo.lock" }}
key: cargocache-whitelist-rust:1.75.0-{{ checksum "~/project/Cargo.lock" }}
test-suite:
docker:
- image: rust:1.74.0
- image: rust:1.75.0
working_directory: ~/project/test-suite
steps:
- checkout:
Expand All @@ -364,7 +364,7 @@ jobs:
command: rustc --version; cargo --version; rustup --version
- restore_cache:
keys:
- cargocache-test-suite-rust:1.74.0-{{ checksum "~/project/Cargo.lock" }}
- cargocache-test-suite-rust:1.75.0-{{ checksum "~/project/Cargo.lock" }}
- run:
name: Unit Tests
environment:
Expand All @@ -374,11 +374,11 @@ jobs:
paths:
- /usr/local/cargo/registry
- target
key: cargocache-test-suite-rust:1.74.0-{{ checksum "~/project/Cargo.lock" }}
key: cargocache-test-suite-rust:1.75.0-{{ checksum "~/project/Cargo.lock" }}

package_sg_std:
docker:
- image: rust:1.74.0
- image: rust:1.75.0
working_directory: ~/project/package/sg-std
steps:
- checkout:
Expand All @@ -388,7 +388,7 @@ jobs:
command: rustc --version; cargo --version; rustup --version
- restore_cache:
keys:
- cargocache-sg-std-rust:1.74.0-{{ checksum "~/project/Cargo.lock" }}
- cargocache-sg-std-rust:1.75.0-{{ checksum "~/project/Cargo.lock" }}
- run:
name: Unit Tests
environment:
Expand All @@ -398,11 +398,11 @@ jobs:
paths:
- /usr/local/cargo/registry
- target
key: cargocache-sg-std-rust:1.74.0-{{ checksum "~/project/Cargo.lock" }}
key: cargocache-sg-std-rust:1.75.0-{{ checksum "~/project/Cargo.lock" }}

package_sg_utils:
docker:
- image: rust:1.74.0
- image: rust:1.75.0
working_directory: ~/project/package/sg-utils
steps:
- checkout:
Expand All @@ -412,7 +412,7 @@ jobs:
command: rustc --version; cargo --version; rustup --version
- restore_cache:
keys:
- cargocache-sg-utils-rust:1.74.0-{{ checksum "~/project/Cargo.lock" }}
- cargocache-sg-utils-rust:1.75.0-{{ checksum "~/project/Cargo.lock" }}
- run:
name: Unit Tests
environment:
Expand All @@ -422,11 +422,11 @@ jobs:
paths:
- /usr/local/cargo/registry
- target
key: cargocache-sg-utils-rust:1.74.0-{{ checksum "~/project/Cargo.lock" }}
key: cargocache-sg-utils-rust:1.75.0-{{ checksum "~/project/Cargo.lock" }}

sg-eth-airdrop:
docker:
- image: rust:1.74.0
- image: rust:1.75.0
working_directory: ~/project/contracts/sg-eth-airdrop
steps:
- checkout:
Expand All @@ -436,7 +436,7 @@ jobs:
command: rustc --version; cargo --version; rustup --version
- restore_cache:
keys:
- cargocache-sg-eth-airdrop-rust:1.74.0-{{ checksum "~/project/Cargo.lock" }}
- cargocache-sg-eth-airdrop-rust:1.75.0-{{ checksum "~/project/Cargo.lock" }}
- run:
name: Unit Tests
environment:
Expand All @@ -458,19 +458,19 @@ jobs:
paths:
- /usr/local/cargo/registry
- target
key: cargocache-sg-eth-airdrop-rust:1.74.0-{{ checksum "~/project/Cargo.lock" }}
key: cargocache-sg-eth-airdrop-rust:1.75.0-{{ checksum "~/project/Cargo.lock" }}

lint:
docker:
- image: rust:1.74.0
- image: rust:1.75.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.74.0-{{ checksum "Cargo.lock" }}
- cargocache-v2-lint-rust:1.75.0-{{ checksum "Cargo.lock" }}
- run:
name: Add rustfmt component
command: rustup component add rustfmt
Expand All @@ -489,15 +489,15 @@ jobs:
- target/debug/.fingerprint
- target/debug/build
- target/debug/deps
key: cargocache-v2-lint-rust:1.74.0-{{ checksum "Cargo.lock" }}
key: cargocache-v2-lint-rust:1.75.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.74.0
- image: rust:1.75.0
steps:
- checkout:
path: ~/project
Expand All @@ -506,7 +506,7 @@ jobs:
command: rustc --version; cargo --version; rustup --version
- restore_cache:
keys:
- cargocache-wasm-rust-no-wasm:1.74.0-{{ checksum "~/project/Cargo.lock" }}
- cargocache-wasm-rust-no-wasm:1.75.0-{{ checksum "~/project/Cargo.lock" }}
- run:
name: Add wasm32 target
command: rustup target add wasm32-unknown-unknown
Expand Down Expand Up @@ -553,7 +553,7 @@ jobs:
- /target/debug
- /target/release
- /target/tarpaulin
key: cargocache-wasm-rust-no-wasm:1.74.0-{{ checksum "~/project/Cargo.lock" }}
key: cargocache-wasm-rust-no-wasm:1.75.0-{{ checksum "~/project/Cargo.lock" }}
- run:
name: Check wasm contracts
command: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/e2e.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
env:
GAS_OUT_DIR: gas_reports
ENABLE_MAX_COLLECTION: true
GAS_LIMIT: 75000000
GAS_LIMIT: 150000000
steps:
- name: Checkout sources
uses: actions/checkout@v3
Expand Down
Loading
Loading