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

Jump to bottom

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

wants to merge 33 commits into from

Commits on May 10, 2022

  1. initial commit

    @tomwade
    tomwade committed May 10, 2022
    Configuration menu
    Copy the full SHA
    9f60370 View commit details
    Browse the repository at this point in the history

Commits on May 20, 2022

  1. wip

    @tomwade
    tomwade committed May 20, 2022
    Configuration menu
    Copy the full SHA
    ca2a3e2 View commit details
    Browse the repository at this point in the history

Commits on Jun 20, 2022

  1. Updates to 0x

    @tomwade
    tomwade committed Jun 20, 2022
    Configuration menu
    Copy the full SHA
    744d79f View commit details
    Browse the repository at this point in the history

  2. Add zap content

    @tomwade
    tomwade committed Jun 20, 2022
    Configuration menu
    Copy the full SHA
    561a4fb View commit details
    Browse the repository at this point in the history

Commits on Jun 23, 2022

  1. Start test suite

    @tomwade
    tomwade committed Jun 23, 2022
    Configuration menu
    Copy the full SHA
    dd79330 View commit details
    Browse the repository at this point in the history

Commits on Jun 24, 2022

  1. First tests

    @tomwade
    tomwade committed Jun 24, 2022
    Configuration menu
    Copy the full SHA
    bf828ec View commit details
    Browse the repository at this point in the history

Commits on Jun 27, 2022

  1. Add buyAndSwap tests

    @tomwade
    tomwade committed Jun 27, 2022
    Configuration menu
    Copy the full SHA
    e7c222c View commit details
    Browse the repository at this point in the history

Commits on Jun 28, 2022

  1. Update 0x integration

    @tomwade
    tomwade committed Jun 28, 2022
    Configuration menu
    Copy the full SHA
    8e324bc View commit details
    Browse the repository at this point in the history

  2. Skip failing tests

    @tomwade
    tomwade committed Jun 28, 2022
    Configuration menu
    Copy the full SHA
    fd649d2 View commit details
    Browse the repository at this point in the history

Commits on Jun 30, 2022

  1. Add 1155 support

    @tomwade
    tomwade committed Jun 30, 2022
    Configuration menu
    Copy the full SHA
    42ae8d9 View commit details
    Browse the repository at this point in the history

Commits on Jul 3, 2022

  1. Start adding 1155 tests

    @tomwade
    tomwade committed Jul 3, 2022
    Configuration menu
    Copy the full SHA
    40b3dc4 View commit details
    Browse the repository at this point in the history

Commits on Jul 9, 2022

  1. Fix WETH payout issue in tests by supplying ETH

    @tomwade
    tomwade committed Jul 9, 2022
    Configuration menu
    Copy the full SHA
    8a8bd97 View commit details
    Browse the repository at this point in the history

  2. Remove logging

    @tomwade
    tomwade committed Jul 9, 2022
    Configuration menu
    Copy the full SHA
    e4550ba View commit details
    Browse the repository at this point in the history

Commits on Jul 14, 2022

  1. Marketplace0xZap deployment script

    @Capsicle1
    Capsicle1 committed Jul 14, 2022
    Configuration menu
    Copy the full SHA
    512c73c View commit details
    Browse the repository at this point in the history

Commits on Jul 21, 2022

  1. Refactor BuyAndRedeem

    @tomwade
    tomwade committed Jul 21, 2022
    Configuration menu
    Copy the full SHA
    f38eb5e View commit details
    Browse the repository at this point in the history

Commits on Aug 12, 2022

  1. completed todo documentation

    @Capsicle1
    Capsicle1 committed Aug 12, 2022
    Configuration menu
    Copy the full SHA
    6e267cd View commit details
    Browse the repository at this point in the history

Commits on Sep 7, 2022

  1. Add vault dust return

    @tomwade
    tomwade committed Sep 7, 2022
    Configuration menu
    Copy the full SHA
    a15f749 View commit details
    Browse the repository at this point in the history

  2. Remove spender and check dust balance

    @tomwade
    tomwade committed Sep 7, 2022
    Configuration menu
    Copy the full SHA
    bd2b30a View commit details
    Browse the repository at this point in the history

  3. Always transfer dust in ETH

    @tomwade
    tomwade committed Sep 7, 2022
    Configuration menu
    Copy the full SHA
    d47c0c1 View commit details
    Browse the repository at this point in the history

Commits on Sep 9, 2022

  1. Remove unused imports

    @tomwade
    tomwade committed Sep 9, 2022
    Configuration menu
    Copy the full SHA
    81f65d8 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into 0x 

    # Conflicts:
#	hardhat.config.js
    @tomwade
    tomwade committed Sep 9, 2022
    Configuration menu
    Copy the full SHA
    0eee1f4 View commit details
    Browse the repository at this point in the history

Commits on Sep 13, 2022

  1. Add DustReturned event

    @tomwade
    tomwade committed Sep 13, 2022
    Configuration menu
    Copy the full SHA
    18c63c3 View commit details
    Browse the repository at this point in the history

  2. Update to fix contract issues

    @tomwade
    tomwade committed Sep 13, 2022
    Configuration menu
    Copy the full SHA
    8352ba3 View commit details
    Browse the repository at this point in the history

  3. Add MANY fixes 

    - Set swap target
- Allow zap pausing
- Set oanable
- Set reentrancy guard
- Remove passable swap target
- Cry
    @tomwade
    tomwade committed Sep 13, 2022
    Configuration menu
    Copy the full SHA
    71f1027 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' into 0x 

    # Conflicts:
#	contracts/solidity/NFTXMarketplace0xZap.sol
#	scripts/deploy-marketplace0x-zap.js
    @tomwade
    tomwade committed Sep 13, 2022
    Configuration menu
    Copy the full SHA
    83e8e90 View commit details
    Browse the repository at this point in the history

  5. Add payable

    @tomwade
    tomwade committed Sep 13, 2022
    Configuration menu
    Copy the full SHA
    d2c68b1 View commit details
    Browse the repository at this point in the history

Commits on Sep 14, 2022

  1. Fix typos (onlyOnwer)

    @tomwade
    tomwade committed Sep 14, 2022
    Configuration menu
    Copy the full SHA
    f3c3398 View commit details
    Browse the repository at this point in the history

  2. Move paused check to modifier

    @tomwade
    tomwade committed Sep 14, 2022
    Configuration menu
    Copy the full SHA
    adda004 View commit details
    Browse the repository at this point in the history

  3. Move modifier to external functions

    @tomwade
    tomwade committed Sep 14, 2022
    Configuration menu
    Copy the full SHA
    63e85f0 View commit details
    Browse the repository at this point in the history

Commits on Sep 23, 2022

  1. Make swap target immutable

    @tomwade
    tomwade committed Sep 23, 2022
    Configuration menu
    Copy the full SHA
    8a914d1 View commit details
    Browse the repository at this point in the history

  2. Ensure address is payable

    @tomwade
    tomwade committed Sep 23, 2022
    Configuration menu
    Copy the full SHA
    deaa385 View commit details
    Browse the repository at this point in the history

  3. Add tests for pausing logic

    @tomwade
    tomwade committed Sep 23, 2022
    Configuration menu
    Copy the full SHA
    fdf7a6b View commit details
    Browse the repository at this point in the history

  4. Remove unused BASE variable

    @tomwade
    tomwade committed Sep 23, 2022
    Configuration menu
    Copy the full SHA
    2e3b85c View commit details
    Browse the repository at this point in the history