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

Multiple wl types #261

Merged
merged 99 commits into from
Jun 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
99 commits
Select commit Hold shift + click to select a range
149d68e
Add asks by renew time query
tasiov Dec 14, 2023
6838954
Add boiler-plate around end-blocker and contract migration
tasiov Dec 14, 2023
fcfb384
First pass at process renewal logic
tasiov Dec 15, 2023
afb5716
Add renew query and execute
tasiov Dec 15, 2023
716e36f
Add unit-tests to process renew logic
tasiov Dec 18, 2023
0a08210
Lint
tasiov Dec 18, 2023
d9b0b9c
Schema
tasiov Dec 18, 2023
49e765d
Fix CI
tasiov Dec 19, 2023
36a36bc
Work on PR suggestions
tasiov Jan 2, 2024
3ed0b5c
Add bid migration message
tasiov Jan 2, 2024
173d1f4
Schema and lint
tasiov Jan 2, 2024
4759a09
Fix tests
tasiov Jan 2, 2024
f016aab
Fix CI
tasiov Jan 2, 2024
aa730dd
Update version
tasiov Jan 2, 2024
2996295
Add testnet scripts
tasiov Jan 2, 2024
5f9ef40
Touchup contracts after testnet testing
tasiov Jan 2, 2024
eb4ab0f
Bump version
tasiov Jan 2, 2024
83e2ae6
Lint
tasiov Jan 2, 2024
753cb3c
Add small tests
tasiov Jan 2, 2024
bf97257
Lint
tasiov Jan 2, 2024
82e36c8
add a flat-rate discount whitelist; gitignore all instances of node_m…
jason-c-child Jan 13, 2024
2d96ae5
add support for both whitelist types to name-minter state.rs
jason-c-child Jan 14, 2024
6935533
add support for both whitelists to name-minter
jason-c-child Jan 15, 2024
fd39b7e
fix some linting
jason-c-child Jan 15, 2024
2948c91
more lint
jason-c-child Jan 15, 2024
02aee36
even more linting (now that i got cargo +nightly fmt working)
jason-c-child Jan 15, 2024
b30624e
remove unused imports
jason-c-child Jan 15, 2024
9b2fd75
remove unused imports, derive Eq too
jason-c-child Jan 15, 2024
7941199
regenerate schema
jason-c-child Jan 16, 2024
a8cbd61
try updating the rust version in CI
jason-c-child Jan 16, 2024
eed1a4b
remove one of the --lib flags per the CI error
jason-c-child Jan 16, 2024
d6e0efd
Merge branch 'tasiov/sg-1051-names-renewal' into flat-rate-whitelist
jason-c-child Jan 17, 2024
ec35eef
update lock
jason-c-child Jan 17, 2024
fd4d5c0
use to_json_vec per CI feedback
jason-c-child Jan 17, 2024
e34d2f1
moar linterrrr
jason-c-child Jan 17, 2024
48097b8
even.more.linting.
jason-c-child Jan 17, 2024
01185e8
lots more linter
jason-c-child Jan 17, 2024
0d18873
Adjust renewal logic
tasiov Jan 23, 2024
da3877f
Update flat rate WL to support multiple admins
MightOfOaks Jan 26, 2024
2b9b616
Update instantiation logic and admin checks
MightOfOaks Jan 27, 2024
9916e02
Update tests
MightOfOaks Jan 27, 2024
06ef71a
Fix formatting issues
MightOfOaks Jan 27, 2024
70e39a4
Update query admins response
MightOfOaks Jan 27, 2024
d9a0c22
Improve test coverage
MightOfOaks Jan 27, 2024
8ce8326
Improve test coverage - 2
MightOfOaks Jan 27, 2024
7a6ef56
Merge pull request #254 from public-awesome/serkan/whitelist-multiple…
MightOfOaks Jan 27, 2024
9265e16
add test
jason-c-child Feb 8, 2024
9e41bfc
linter issues
jason-c-child Feb 8, 2024
ec57129
try using cargo fmt to fix linter issues
jason-c-child Feb 8, 2024
c7e819b
add make target for coverage
jason-c-child Feb 8, 2024
3b3e590
Merge branch 'tasiov/sg-1051-names-renewal' into flat-rate-whitelist
jason-c-child Feb 8, 2024
b6fc6ab
Add a function to return renewal price for multiple names
jason-c-child Feb 10, 2024
5b6b4fb
linting
jason-c-child Feb 10, 2024
9172e55
add missing query info and fix test
jason-c-child Feb 10, 2024
ce0d358
genreate schemas
jason-c-child Feb 10, 2024
015eafe
check in file
jason-c-child Feb 10, 2024
295acbf
handle bad returns and update test
jason-c-child Feb 10, 2024
136e2a2
linter
jason-c-child Feb 10, 2024
e4acca7
Convert ask renew price response to struct
jason-c-child Feb 20, 2024
05e9014
return vect of struct; remove explicit error return
jason-c-child Feb 20, 2024
2b341ba
fix test
jason-c-child Feb 20, 2024
93c37f7
fix linter error
jason-c-child Feb 20, 2024
6953234
update schemas
jason-c-child Feb 20, 2024
f908a67
update def
jason-c-child Feb 20, 2024
e539c26
restore deprecated function calls
jason-c-child Feb 29, 2024
f133ad7
restore deprecated func call
jason-c-child Feb 29, 2024
86820aa
fix test for dep fun
jason-c-child Feb 29, 2024
9152582
try regenerating the lock
jason-c-child Feb 29, 2024
c12db1c
force restore lock from base branch
jason-c-child Feb 29, 2024
33fec3c
regenerate lock
jason-c-child Feb 29, 2024
70e5d4e
Merge pull request #255 from public-awesome/add-renewal-cost-to-query
jason-c-child Mar 6, 2024
a37523e
support both whitelist discounts
jason-c-child Mar 25, 2024
5f2654a
fix tests; handle no-whitelist cases
jason-c-child Mar 26, 2024
44a5172
Convert minter to accept flat rate discounts only
MightOfOaks Mar 26, 2024
0079ca9
Add TS interface & types for whitelist-updatable-flatrate
MightOfOaks Mar 27, 2024
eeb9b90
Update whitelist-updatable-flatrate TS client
MightOfOaks Mar 27, 2024
c351a23
minor updates (#259)
jhernandezb Mar 27, 2024
92e05c7
linter fix for deprc functions
jason-c-child Apr 8, 2024
8243dc6
Merge branch 'tasiov/sg-1051-names-renewal' into flat-rate-whitelist
jason-c-child Apr 9, 2024
663394a
fix bad merge from base branch
jason-c-child Apr 10, 2024
2701850
Merge remote-tracking branch 'origin/dYdX-airdrop' into flat-rate-whi…
jason-c-child Apr 12, 2024
f781a7e
remove unused import
jason-c-child Apr 12, 2024
61694ce
commit clippy autofix
jason-c-child Apr 12, 2024
78cfb76
remove unused import from test
jason-c-child Apr 12, 2024
8c53bdd
Merge pull request #253 from public-awesome/flat-rate-whitelist
jason-c-child Apr 25, 2024
81a25e7
Merge branch 'main' into tasiov/sg-1051-names-renewal
jason-c-child Apr 26, 2024
eb59c69
fix cargo merge conflict issues
jason-c-child Apr 26, 2024
5e50c1c
address linting issues from clippy
jason-c-child Apr 26, 2024
48ff843
cargo fmt fix
jason-c-child Apr 26, 2024
3c94c42
update workspace optimizer version in script
jason-c-child Apr 29, 2024
ace3b83
add support for multiple whitelist types
jason-c-child May 13, 2024
fa2769b
fix linting errors and tests
jason-c-child May 13, 2024
4d8a6c0
gen schema
jason-c-child May 13, 2024
efcb44d
add tests
jason-c-child May 13, 2024
6c5e4b5
lint fix
jason-c-child May 13, 2024
e9da5ce
more test coverage
jason-c-child May 15, 2024
d13e36f
fix clippy gripe
jason-c-child May 15, 2024
1d00720
wow, clippy is kind of a dick
jason-c-child May 15, 2024
4766bd1
add comment re: multiple WLs
jason-c-child May 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
1 change: 0 additions & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,6 @@ jobs:
- /usr/local/cargo/registry
- target
key: cargocache-sg-name-rust:1.72.1-{{ checksum "~/project/Cargo.lock" }}

lint:
docker:
- image: rust:1.72.1
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,5 @@ tarpaulin-report.*
*.env
*.wasm
*.json

**/node_modules/
Loading
Loading