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.

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

DYDX Airdrop Main Branch #650

Open
wants to merge 55 commits into
base: release/v3.x
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
55 commits
Select commit Hold shift + click to select a range
ea7f2bf
copy file structure
humanalgorithm Jan 29, 2024
15b318a
fix lint
humanalgorithm Jan 29, 2024
a654c78
fix lint
humanalgorithm Jan 29, 2024
65cd735
copy files in parallel for dydx airdrop
humanalgorithm Jan 29, 2024
d5ba86e
creating duplicate file structure in two top level folders
humanalgorithm Jan 29, 2024
b139dc6
fix typo in wasm build
humanalgorithm Jan 29, 2024
9b045dd
Merge pull request #651 from public-awesome/humanalgorithm/copy-files…
humanalgorithm Jan 29, 2024
aec674d
Add name mint discount whitelist address
MightOfOaks Jan 30, 2024
dce9d17
Update tests to include name discount wl address
MightOfOaks Jan 30, 2024
7170699
fix latest merge
humanalgorithm Feb 19, 2024
e3a57c7
Add whitelist-immutable-flex & tests
MightOfOaks Feb 22, 2024
6c5efe8
Address lint issues
MightOfOaks Feb 22, 2024
f0616a4
using to_json_binary
humanalgorithm Mar 3, 2024
2bc0f46
Merge pull request #662 from public-awesome/humanalgorithm/use-to-jso…
humanalgorithm Mar 3, 2024
033e9b5
fix lowercase conversion, add test, add assert
humanalgorithm Mar 3, 2024
553d7b0
Merge branch 'humanalgorithm/dydx-main-branch-v3.x' into serkan/white…
MightOfOaks Mar 3, 2024
1f70709
Merge pull request #660 from public-awesome/serkan/whitelist-immutabl…
MightOfOaks Mar 3, 2024
33d0943
Merge branch 'humanalgorithm/dydx-main-branch-v3.x' into serkan/dydx-…
MightOfOaks Mar 7, 2024
85a3e51
Update instantiation to accommodate a whitelist-immutable-flex
MightOfOaks Mar 10, 2024
9152288
Use build_messages and validation as common crates for registration &…
MightOfOaks Mar 10, 2024
83b1147
Add mint_count query impl for whitelist-immutable-flex
MightOfOaks Mar 10, 2024
df428aa
Implement registration logic
MightOfOaks Mar 11, 2024
4362ad7
Set flag for the registered address
MightOfOaks Mar 12, 2024
88ad59a
Include name collection address among instantiation parameters
MightOfOaks Mar 12, 2024
aa6f9ca
Add collection token mint validation
MightOfOaks Mar 13, 2024
868ae49
Add validation for name mint & association
MightOfOaks Mar 13, 2024
7ffa284
Check for previous claims
MightOfOaks Mar 13, 2024
48aacbd
Add claim_airdrop()
MightOfOaks Mar 13, 2024
fff2a30
Check for total airdrop count for reward distribution
MightOfOaks Mar 13, 2024
f048121
Address clippy issues
MightOfOaks Mar 13, 2024
d1df392
Update test-suite/common_setup to include whitelist-flex
MightOfOaks Mar 14, 2024
868355b
Add TS interface & types
MightOfOaks Mar 15, 2024
ceb1aa8
Update airdrop & whitelist immutable flex contract instantiation para…
MightOfOaks Mar 18, 2024
b57450c
Address issues in test code (tests failing pre-update)
MightOfOaks Mar 18, 2024
3b43da4
Merge branch 'release/v3.x' into humanalgorithm/dydx-main-branch-v3.x
humanalgorithm Mar 19, 2024
37f5b01
Merge branch 'release/v3.x' into humanalgorithm/fix-lowercase-conversion
humanalgorithm Mar 19, 2024
290761e
Merge pull request #663 from public-awesome/humanalgorithm/fix-lowerc…
humanalgorithm Mar 19, 2024
576e8b7
Merge branch 'humanalgorithm/dydx-main-branch-v3.x' into serkan/dydx-…
MightOfOaks Mar 19, 2024
5ee3aff
Address issues induced by the merge
MightOfOaks Mar 19, 2024
32a527a
Update error for invalid eth signature
MightOfOaks Mar 20, 2024
ee608b9
Update Member query response for whitelist-immutable-flex
MightOfOaks Mar 20, 2024
c733a78
Add queries for registration, claim and airdrop count
MightOfOaks Mar 20, 2024
db8aa26
Update schema
MightOfOaks Mar 20, 2024
28179ab
Update TS interface & types
MightOfOaks Mar 20, 2024
2b8102d
Add names/flat-rate-whitelist branch as a dependency
MightOfOaks Mar 22, 2024
e8a020d
Update dependency for whitelist-updatable-flatrate
MightOfOaks Mar 27, 2024
613978f
eth-verify recovery param
jhernandezb Mar 26, 2024
06bfc80
whitelist updates
jhernandezb Mar 27, 2024
5f1ed3e
Merge pull request #673 from public-awesome/jhernadnezb/dydx-airdrop-…
jhernandezb Mar 27, 2024
4744ccb
Merge pull request #652 from public-awesome/serkan/dydx-airdrop-updates
jhernandezb Apr 3, 2024
fcce9e3
Add withdraw_remaining() for dYdX-airdrop contract
MightOfOaks Apr 24, 2024
5e7d9be
Address clippy issues
MightOfOaks Apr 24, 2024
3a5ba09
Add migration code
MightOfOaks Apr 24, 2024
19e29cb
Avoid redefining ContractError when feature = library
MightOfOaks Apr 24, 2024
45e498d
Merge pull request #685 from public-awesome/serkan/withdraw-remaining…
jhernandezb Apr 25, 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
54 changes: 48 additions & 6 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ workflows:
- contract_open_edition_factory
- contract_open_edition_minter
- contract_whitelist
- sg-eth-airdrop
- rekt-airdrop
- dydx-airdrop
- test-suite
- package_sg_std
- package_sg_utils
Expand Down Expand Up @@ -424,10 +425,10 @@ jobs:
- target
key: cargocache-sg-utils-rust:1.74.0-{{ checksum "~/project/Cargo.lock" }}

sg-eth-airdrop:
rekt-airdrop:
docker:
- image: rust:1.74.0
working_directory: ~/project/contracts/sg-eth-airdrop
working_directory: ~/project/contracts/rekt-airdrop
steps:
- checkout:
path: ~/project
Expand All @@ -436,7 +437,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-rekt-airdrop-rust:1.74.0-{{ checksum "~/project/Cargo.lock" }}
- run:
name: Unit Tests
environment:
Expand All @@ -458,7 +459,43 @@ jobs:
paths:
- /usr/local/cargo/registry
- target
key: cargocache-sg-eth-airdrop-rust:1.74.0-{{ checksum "~/project/Cargo.lock" }}
key: cargocache-rekt-airdrop-rust:1.74.0-{{ checksum "~/project/Cargo.lock" }}

dydx-airdrop:
docker:
- image: rust:1.74.0
working_directory: ~/project/contracts/dydx-airdrop
steps:
- checkout:
path: ~/project
- run:
name: Version information
command: rustc --version; cargo --version; rustup --version
- restore_cache:
keys:
- cargocache-dydx-airdrop-rust:1.74.0-{{ checksum "~/project/Cargo.lock" }}
- run:
name: Unit Tests
environment:
RUST_BACKTRACE: 1
command: cargo unit-test --locked
- run:
name: Build and run schema generator
command: cargo schema --locked
# - run:
# name: Ensure checked-in schemas are up-to-date
# command: |
# CHANGES_IN_REPO=$(git status --porcelain)
# if [[ -n "$CHANGES_IN_REPO" ]]; then
# echo "Repository is dirty. Showing 'git status' and 'git --no-pager diff' for debugging now:"
# git status && git --no-pager diff
# exit 1
# fi
- save_cache:
paths:
- /usr/local/cargo/registry
- target
key: cargocache-dydx-airdrop-rust:1.74.0-{{ checksum "~/project/Cargo.lock" }}

lint:
docker:
Expand Down Expand Up @@ -528,7 +565,12 @@ jobs:
echo "Compiling `basename $C`..."
(cd $C && cargo build --release --lib --target wasm32-unknown-unknown --locked)
done
for C in ./contracts/sg-eth-airdrop/
for C in ./contracts/rekt-airdrop/
do
echo "Compiling `basename $C`..."
(cd $C && cargo build --release --lib --target wasm32-unknown-unknown --locked)
done
for C in ./contracts/dydx-airdrop/
do
echo "Compiling `basename $C`..."
(cd $C && cargo build --release --lib --target wasm32-unknown-unknown --locked)
Expand Down
Loading
Loading