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

Feature/erc777 #1159 #1684

Merged
merged 68 commits into from
Apr 16, 2019
Merged

Feature/erc777 #1159 #1684

merged 68 commits into from
Apr 16, 2019

Commits on Oct 7, 2018

  1. IERC777 from specs, constants returned, up to defaultOperators. (Open… 

    …Zeppelin#1159)
    @utgarda
    utgarda committed Oct 7, 2018
    Configuration menu
    Copy the full SHA
    fe15d14 View commit details
    Browse the repository at this point in the history

  2. IERC777 oprarator approvals (OpenZeppelin#1159)

    @utgarda
    utgarda committed Oct 7, 2018
    Configuration menu
    Copy the full SHA
    1d26da3 View commit details
    Browse the repository at this point in the history

Commits on Oct 9, 2018

  1. ERC777 oprarator approvals fixes and tests

    @utgarda
    utgarda committed Oct 9, 2018
    Configuration menu
    Copy the full SHA
    ebb4fad View commit details
    Browse the repository at this point in the history

Commits on Oct 24, 2018

  1. IERC777 send and receive with ERC820 (OpenZeppelin#1159)

    Bertrand Masius committed Oct 24, 2018
    Configuration menu
    Copy the full SHA
    73ac6af View commit details
    Browse the repository at this point in the history

Commits on Oct 27, 2018

  1. ERC777 Add burn functions and fix send functions (OpenZeppelin#1159)

    Bertrand Masius committed Oct 27, 2018
    Configuration menu
    Copy the full SHA
    9a6ed29 View commit details
    Browse the repository at this point in the history

Commits on Nov 3, 2018

  1. ERC777 Make expectEvent compatible with web3.js 1.0 (OpenZeppelin#1159)

    Bertrand Masius committed Nov 3, 2018
    Configuration menu
    Copy the full SHA
    2fc7b4d View commit details
    Browse the repository at this point in the history

  2. ERC777 Add ERC820 deploy script (OpenZeppelin#1159)

    Bertrand Masius committed Nov 3, 2018
    Configuration menu
    Copy the full SHA
    5920482 View commit details
    Browse the repository at this point in the history

  3. ERC777 Complete implementation of ERC777 (OpenZeppelin#1159) 

    This implementation conforms to the current EIP
    Bertrand Masius committed Nov 3, 2018
    Configuration menu
    Copy the full SHA
    fc63684 View commit details
    Browse the repository at this point in the history

Commits on Jan 31, 2019

  1. ERC777 Update ERC820 Registry contract to final version (OpenZeppelin… 

    …#1159)
    Bertrand Masius committed Jan 31, 2019
    Configuration menu
    Copy the full SHA
    be6fcd1 View commit details
    Browse the repository at this point in the history

  2. ERC777 Move contracts to 'drafts' folder (OpenZeppelin#1159)

    Bertrand Masius committed Jan 31, 2019
    Configuration menu
    Copy the full SHA
    2db4656 View commit details
    Browse the repository at this point in the history

Commits on Mar 15, 2019

  1. ERC777: Update to ERC1820 registry and linter error fix (OpenZeppelin… 

    …#1159)
    Bertrand Masius committed Mar 15, 2019
    Configuration menu
    Copy the full SHA
    d9e53d9 View commit details
    Browse the repository at this point in the history

  2. ERC777: implement recent changes of EIP777 (OpenZeppelin#1159)

    Bertrand Masius committed Mar 15, 2019
    Configuration menu
    Copy the full SHA
    e54490a View commit details
    Browse the repository at this point in the history

Commits on Mar 17, 2019

  1. ERC777 Fix formatting (OpenZeppelin#1159)

    Bertrand Masius committed Mar 17, 2019
    Configuration menu
    Copy the full SHA
    5695639 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into feature/ERC777-#1159

    Bertrand Masius committed Mar 17, 2019
    Configuration menu
    Copy the full SHA
    9965393 View commit details
    Browse the repository at this point in the history

  3. ERC777 Update to solc 0.5.2 (OpenZeppelin#1159)

    Bertrand Masius committed Mar 17, 2019
    Configuration menu
    Copy the full SHA
    2582a2a View commit details
    Browse the repository at this point in the history

Commits on Mar 21, 2019

  1. ERC777 Fix travis CI errors (OpenZeppelin#1159)

    Bertrand Masius committed Mar 21, 2019
    Configuration menu
    Copy the full SHA
    7f7d296 View commit details
    Browse the repository at this point in the history

  2. ERC777 Fix linter errors again... (OpenZeppelin#1159)

    Bertrand Masius committed Mar 21, 2019
    Configuration menu
    Copy the full SHA
    990073f View commit details
    Browse the repository at this point in the history

  3. ERC777 Fix unit test (OpenZeppelin#1159)

    Bertrand Masius committed Mar 21, 2019
    Configuration menu
    Copy the full SHA
    17930e5 View commit details
    Browse the repository at this point in the history

  4. ERC777 Fix unit test again (OpenZeppelin#1159)

    Bertrand Masius committed Mar 21, 2019
    Configuration menu
    Copy the full SHA
    65257d5 View commit details
    Browse the repository at this point in the history

Commits on Mar 26, 2019

  1. Remove extra newlines.

    @nventuro
    nventuro committed Mar 26, 2019
    Configuration menu
    Copy the full SHA
    d98ef86 View commit details
    Browse the repository at this point in the history

  2. Rename ERC777Base to ERC777.

    @nventuro
    nventuro committed Mar 26, 2019
    Configuration menu
    Copy the full SHA
    831b367 View commit details
    Browse the repository at this point in the history

  3. Remove 'Token' from contract names.

    @nventuro
    nventuro committed Mar 26, 2019
    Configuration menu
    Copy the full SHA
    f1df62d View commit details
    Browse the repository at this point in the history

  4. Replace ops for operators.

    @nventuro
    nventuro committed Mar 26, 2019
    Configuration menu
    Copy the full SHA
    00df2b6 View commit details
    Browse the repository at this point in the history

  5. Move operator check out of _send.

    @nventuro
    nventuro committed Mar 26, 2019
    Configuration menu
    Copy the full SHA
    5a0195a View commit details
    Browse the repository at this point in the history

  6. Remove ERC777Burnable.

    @nventuro
    nventuro committed Mar 26, 2019
    Configuration menu
    Copy the full SHA
    06fd3a9 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'master' into feature/ERC777-#1159

    @nventuro
    nventuro committed Mar 26, 2019
    Configuration menu
    Copy the full SHA
    b354c5e View commit details
    Browse the repository at this point in the history

  8. Remove ERC1820Client, now using the interface directly.

    @nventuro
    nventuro committed Mar 26, 2019
    Configuration menu
    Copy the full SHA
    4528200 View commit details
    Browse the repository at this point in the history

  9. Minor internal refactors in contracts.

    @nventuro
    nventuro committed Mar 26, 2019
    Configuration menu
    Copy the full SHA
    9d44f7c View commit details
    Browse the repository at this point in the history

  10. Delete extra test helpers.

    @nventuro
    nventuro committed Mar 26, 2019
    Configuration menu
    Copy the full SHA
    4d383d4 View commit details
    Browse the repository at this point in the history

Commits on Mar 27, 2019

  1. Simplified tests.

    @nventuro
    nventuro committed Mar 27, 2019
    Configuration menu
    Copy the full SHA
    dc91c59 View commit details
    Browse the repository at this point in the history

  2. Add basic 777 tests.

    @nventuro
    nventuro committed Mar 27, 2019
    Configuration menu
    Copy the full SHA
    5538764 View commit details
    Browse the repository at this point in the history

  3. Add granularity send test.

    @nventuro
    nventuro committed Mar 27, 2019
    Configuration menu
    Copy the full SHA
    e9936f7 View commit details
    Browse the repository at this point in the history

  4. Add first operator send tests.

    @nventuro
    nventuro committed Mar 27, 2019
    Configuration menu
    Copy the full SHA
    5c0ee8a View commit details
    Browse the repository at this point in the history

  5. Add burn tests.

    @nventuro
    nventuro committed Mar 27, 2019
    Configuration menu
    Copy the full SHA
    824cb94 View commit details
    Browse the repository at this point in the history

  6. Refactor send and burn tests.

    @nventuro
    nventuro committed Mar 27, 2019
    Configuration menu
    Copy the full SHA
    de529bb View commit details
    Browse the repository at this point in the history

  7. Improve send burn refactor.

    @nventuro
    nventuro committed Mar 27, 2019
    Configuration menu
    Copy the full SHA
    ee159b4 View commit details
    Browse the repository at this point in the history

Commits on Mar 28, 2019

  1. Greatly improve test module.

    @nventuro
    nventuro committed Mar 28, 2019
    Configuration menu
    Copy the full SHA
    f9ada94 View commit details
    Browse the repository at this point in the history

  2. Burn instead of send removed tokens.

    @nventuro
    nventuro committed Mar 28, 2019
    Configuration menu
    Copy the full SHA
    37ad5d5 View commit details
    Browse the repository at this point in the history

  3. Add operator tests.

    @nventuro
    nventuro committed Mar 28, 2019
    Configuration menu
    Copy the full SHA
    a76a1cc View commit details
    Browse the repository at this point in the history

  4. Improve send tests under changing operators.

    @nventuro
    nventuro committed Mar 28, 2019
    Configuration menu
    Copy the full SHA
    1823108 View commit details
    Browse the repository at this point in the history

  5. Refactor and merge send and burn tests.

    @nventuro
    nventuro committed Mar 28, 2019
    Configuration menu
    Copy the full SHA
    0e78a62 View commit details
    Browse the repository at this point in the history

Commits on Apr 4, 2019

  1. Add missing and not-implemented tests.

    @nventuro
    nventuro committed Apr 4, 2019
    Configuration menu
    Copy the full SHA
    6cdaa1f View commit details
    Browse the repository at this point in the history

  2. Make _burn private.

    @nventuro
    nventuro committed Apr 4, 2019
    Configuration menu
    Copy the full SHA
    29134fe View commit details
    Browse the repository at this point in the history

  3. Fix typo.

    @nventuro
    nventuro committed Apr 4, 2019
    Configuration menu
    Copy the full SHA
    d272f5b View commit details
    Browse the repository at this point in the history

Commits on Apr 6, 2019

  1. Greatly improve tokensToSend tests.

    @nventuro
    nventuro committed Apr 6, 2019
    Configuration menu
    Copy the full SHA
    b39d65e View commit details
    Browse the repository at this point in the history

  2. Refactor hook tests.

    @nventuro
    nventuro committed Apr 6, 2019
    Configuration menu
    Copy the full SHA
    a6d39ce View commit details
    Browse the repository at this point in the history

Commits on Apr 9, 2019

  1. Fix hook tests.

    @nventuro
    nventuro committed Apr 9, 2019
    Configuration menu
    Copy the full SHA
    71c8698 View commit details
    Browse the repository at this point in the history

Commits on Apr 11, 2019

  1. Update openzeppelin-test-helpers and ERC1820 address.

    @nventuro
    nventuro committed Apr 11, 2019
    Configuration menu
    Copy the full SHA
    060119f View commit details
    Browse the repository at this point in the history

  2. Fix natspec indentation.

    @nventuro
    nventuro committed Apr 11, 2019
    Configuration menu
    Copy the full SHA
    01c74fb View commit details
    Browse the repository at this point in the history

  3. Make interface functions external.

    @nventuro
    nventuro committed Apr 11, 2019
    Configuration menu
    Copy the full SHA
    100a1cb View commit details
    Browse the repository at this point in the history

  4. Remove redundant private revoke and authorize functions.

    @nventuro
    nventuro committed Apr 11, 2019
    Configuration menu
    Copy the full SHA
    b17f6c5 View commit details
    Browse the repository at this point in the history

  5. Improved readability of if statement.

    @nventuro
    nventuro committed Apr 11, 2019
    Configuration menu
    Copy the full SHA
    2945463 View commit details
    Browse the repository at this point in the history

  6. Remove unnecessary asserts.

    @nventuro
    nventuro committed Apr 11, 2019
    Configuration menu
    Copy the full SHA
    029a021 View commit details
    Browse the repository at this point in the history

  7. Add non-one granularity test.

    @nventuro
    nventuro committed Apr 11, 2019
    Configuration menu
    Copy the full SHA
    db2b2f5 View commit details
    Browse the repository at this point in the history

  8. Fix hook call order in _mint.

    @nventuro
    nventuro committed Apr 11, 2019
    Configuration menu
    Copy the full SHA
    3518525 View commit details
    Browse the repository at this point in the history

  9. Fix _mint not reverting on failure to implement tokensReceived.

    @nventuro
    nventuro committed Apr 11, 2019
    Configuration menu
    Copy the full SHA
    7e91c3f View commit details
    Browse the repository at this point in the history

  10. Remove special case in operatorFn when from is 0.

    @nventuro
    nventuro committed Apr 11, 2019
    Configuration menu
    Copy the full SHA
    2cff2ce View commit details
    Browse the repository at this point in the history

  11. Refactor ERC777SenderMock.

    @nventuro
    nventuro committed Apr 11, 2019
    Configuration menu
    Copy the full SHA
    cec8ebe View commit details
    Browse the repository at this point in the history

  12. Add tokensReceived tests.

    @nventuro
    nventuro committed Apr 11, 2019
    Configuration menu
    Copy the full SHA
    8e2af46 View commit details
    Browse the repository at this point in the history

  13. switch to updated ganache-cli-coverage fork

    @frangio @nventuro
    frangio authored and nventuro committed Apr 11, 2019
    Configuration menu
    Copy the full SHA
    ad40a92 View commit details
    Browse the repository at this point in the history

  14. Merge branch 'master' into feature/ERC777-#1159

    @nventuro
    nventuro authored Apr 11, 2019
    Configuration menu
    Copy the full SHA
    480407b View commit details
    Browse the repository at this point in the history

  15. Fix linter errors.

    @nventuro
    nventuro committed Apr 11, 2019
    Configuration menu
    Copy the full SHA
    1f8b3d6 View commit details
    Browse the repository at this point in the history

  16. Merge branch 'feature/ERC777-#1159' of github.com:catageek/openzeppel… 

    …in-solidity into feature/ERC777-#1159
    @nventuro
    nventuro committed Apr 11, 2019
    Configuration menu
    Copy the full SHA
    343cc51 View commit details
    Browse the repository at this point in the history

Commits on Apr 12, 2019

  1. Add mint tests.

    @nventuro
    nventuro committed Apr 12, 2019
    Configuration menu
    Copy the full SHA
    1feeac3 View commit details
    Browse the repository at this point in the history

  2. Fix linter errors.

    @nventuro
    nventuro committed Apr 12, 2019
    Configuration menu
    Copy the full SHA
    1b04f88 View commit details
    Browse the repository at this point in the history

Commits on Apr 15, 2019

  1. Fix tests.

    @nventuro
    nventuro committed Apr 15, 2019
    Configuration menu
    Copy the full SHA
    455e84a View commit details
    Browse the repository at this point in the history

  2. Update test/drafts/ERC777/ERC777.test.js 

    Co-Authored-By: nventuro <[email protected]>
    @frangio @nventuro
    frangio and nventuro authored Apr 15, 2019
    Configuration menu
    Copy the full SHA
    3dd46a0 View commit details
    Browse the repository at this point in the history

Commits on Apr 16, 2019

  1. Add changelog entry.

    @nventuro
    nventuro committed Apr 16, 2019
    Configuration menu
    Copy the full SHA
    d7be2a6 View commit details
    Browse the repository at this point in the history