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

Updates to the 0x contract #33

Open
wants to merge 33 commits into
base: master
Choose a base branch
from
Open

Updates to the 0x contract #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
9f60370
initial commit
tomwade May 10, 2022
ca2a3e2
wip
tomwade May 20, 2022
744d79f
Updates to 0x
tomwade Jun 20, 2022
561a4fb
Add zap content
tomwade Jun 20, 2022
dd79330
Start test suite
tomwade Jun 23, 2022
bf828ec
First tests
tomwade Jun 24, 2022
e7c222c
Add buyAndSwap tests
tomwade Jun 27, 2022
8e324bc
Update 0x integration
tomwade Jun 28, 2022
fd649d2
Skip failing tests
tomwade Jun 28, 2022
42ae8d9
Add 1155 support
tomwade Jun 30, 2022
40b3dc4
Start adding 1155 tests
tomwade Jul 3, 2022
8a8bd97
Fix WETH payout issue in tests by supplying ETH
tomwade Jul 9, 2022
e4550ba
Remove logging
tomwade Jul 9, 2022
512c73c
Marketplace0xZap deployment script
Capsicle1 Jul 14, 2022
f38eb5e
Refactor BuyAndRedeem
tomwade Jul 21, 2022
6e267cd
completed todo documentation
Capsicle1 Aug 12, 2022
a15f749
Add vault dust return
tomwade Sep 7, 2022
bd2b30a
Remove spender and check dust balance
tomwade Sep 7, 2022
d47c0c1
Always transfer dust in ETH
tomwade Sep 7, 2022
81f65d8
Remove unused imports
tomwade Sep 9, 2022
0eee1f4
Merge branch 'master' into 0x
tomwade Sep 9, 2022
18c63c3
Add DustReturned event
tomwade Sep 13, 2022
8352ba3
Update to fix contract issues
tomwade Sep 13, 2022
71f1027
Add MANY fixes
tomwade Sep 13, 2022
83e8e90
Merge branch 'master' into 0x
tomwade Sep 13, 2022
d2c68b1
Add payable
tomwade Sep 13, 2022
f3c3398
Fix typos (onlyOnwer)
tomwade Sep 14, 2022
adda004
Move paused check to modifier
tomwade Sep 14, 2022
63e85f0
Move modifier to external functions
tomwade Sep 14, 2022
8a914d1
Make swap target immutable
tomwade Sep 23, 2022
deaa385
Ensure address is payable
tomwade Sep 23, 2022
fdf7a6b
Add tests for pausing logic
tomwade Sep 23, 2022
2e3b85c
Remove unused BASE variable
tomwade Sep 23, 2022
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
Loading