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

SG-645 Update cw-nfts version #539

Merged
merged 31 commits into from
Jun 4, 2023
Merged

SG-645 Update cw-nfts version #539

Show file tree
Hide file tree
Changes from 15 commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
64e1b6f
saving stash
humanalgorithm Mar 29, 2023
5c44dac
working version
humanalgorithm Mar 29, 2023
368194e
setting to minter owner
humanalgorithm Apr 1, 2023
8662d12
Merge branch 'main' of https://github.com/public-awesome/launchpad in…
humanalgorithm Apr 1, 2023
fe47f67
updating rust version
humanalgorithm Apr 1, 2023
3716754
using NftData enum such as to not have too many params
humanalgorithm Apr 1, 2023
8c06f70
remove non needed imports
humanalgorithm Apr 1, 2023
8c1dc28
working version with update ownership test
humanalgorithm Apr 2, 2023
5db5776
updated cargo schema
humanalgorithm Apr 3, 2023
56719ca
migration code now added first attempt
humanalgorithm Apr 3, 2023
d965f63
remove cosmwasm response
humanalgorithm Apr 3, 2023
48ba1bb
remove non-needed import
humanalgorithm Apr 20, 2023
c313927
remove extra line
humanalgorithm Apr 20, 2023
74e2490
Merge branch 'main' of https://github.com/public-awesome/launchpad in…
humanalgorithm Apr 20, 2023
acee28c
updating vending minter wl flex
humanalgorithm Apr 20, 2023
40333f0
updating error message, removing superfluous import
humanalgorithm Apr 21, 2023
aca5e0a
now using inherited migrations from cw721_base
humanalgorithm Apr 24, 2023
d76dfed
removing unnecessary cw16 import
humanalgorithm Apr 24, 2023
35b5b69
merging main
humanalgorithm May 4, 2023
a2c5883
update rust version 1.68.2
humanalgorithm May 4, 2023
da6674a
trying with features=library
humanalgorithm May 4, 2023
b10864f
remove entry point on migrateI
humanalgorithm May 4, 2023
1e80c92
revert git version
humanalgorithm May 4, 2023
1ac4487
migration now updating to version 3.0.0, overwriting migration code f…
humanalgorithm May 8, 2023
5822ee1
using new migration version check
humanalgorithm May 8, 2023
6a05dbf
don't need special cw2 version after custom version check
humanalgorithm May 8, 2023
6d6486a
merge main
humanalgorithm May 9, 2023
81ff5f6
fix merge conflict
humanalgorithm May 9, 2023
dc81936
merge latest main
humanalgorithm May 19, 2023
e2f691b
using cw owner instead of self.minter
humanalgorithm May 19, 2023
7f9f9a5
using assert minter owner
humanalgorithm May 19, 2023
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
78 changes: 39 additions & 39 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ workflows:
jobs:
contract_sg721_base:
docker:
- image: rust:1.64.0
- image: rust:1.67.1
working_directory: ~/project/contracts/collections/sg721-base
steps:
- checkout:
Expand All @@ -39,7 +39,7 @@ jobs:
command: rustc --version; cargo --version; rustup --version
- restore_cache:
keys:
- cargocache-sg721-rust:1.64.0-{{ checksum "~/project/Cargo.lock" }}
- cargocache-sg721-rust:1.67.1-{{ checksum "~/project/Cargo.lock" }}
- run:
name: Unit Tests
environment:
Expand All @@ -61,11 +61,11 @@ jobs:
paths:
- /usr/local/cargo/registry
- target
key: cargocache-sg721-rust:1.64.0-{{ checksum "~/project/Cargo.lock" }}
key: cargocache-sg721-rust:1.67.1-{{ checksum "~/project/Cargo.lock" }}

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

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

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

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

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

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

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

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

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

lint:
docker:
- image: rust:1.64.0
- image: rust:1.67.1
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.64.0-{{ checksum "Cargo.lock" }}
- cargocache-v2-lint-rust:1.67.1-{{ checksum "Cargo.lock" }}
- run:
name: Add rustfmt component
command: rustup component add rustfmt
Expand All @@ -415,15 +415,15 @@ 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.67.1-{{ 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.64.0
- image: rust:1.67.1
steps:
- checkout:
path: ~/project
Expand All @@ -432,7 +432,7 @@ jobs:
command: rustc --version; cargo --version; rustup --version
- restore_cache:
keys:
- cargocache-wasm-rust-no-wasm:1.64.0-{{ checksum "~/project/Cargo.lock" }}
- cargocache-wasm-rust-no-wasm:1.67.1-{{ checksum "~/project/Cargo.lock" }}
- run:
name: Add wasm32 target
command: rustup target add wasm32-unknown-unknown
Expand Down Expand Up @@ -479,7 +479,7 @@ jobs:
- /target/debug
- /target/release
- /target/tarpaulin
key: cargocache-wasm-rust-no-wasm:1.64.0-{{ checksum "~/project/Cargo.lock" }}
key: cargocache-wasm-rust-no-wasm:1.67.1-{{ checksum "~/project/Cargo.lock" }}
- run:
name: Check wasm contracts
command: |
Expand Down
Loading