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

Fix/improve revert reason #1727 #2018

Merged
merged 24 commits into from
Jan 23, 2020
Merged

Fix/improve revert reason #1727 #2018

merged 24 commits into from
Jan 23, 2020

Commits on Dec 8, 2019

  1. adding mock contacts, test code

    @alant
    alant committed Dec 8, 2019
    Configuration menu
    Copy the full SHA
    839b6bf View commit details
    Browse the repository at this point in the history

  2. adding changes to ERC721.sol per @frangio's comments on original PR O… 

    …penZeppelin#1943
    @alant
    alant committed Dec 8, 2019
    Configuration menu
    Copy the full SHA
    bcb3125 View commit details
    Browse the repository at this point in the history

  3. fix solhint warnings

    @alant
    alant committed Dec 8, 2019
    Configuration menu
    Copy the full SHA
    2ee16ec View commit details
    Browse the repository at this point in the history

Commits on Dec 10, 2019

  1. Update contracts/token/ERC721/ERC721.sol 

    Co-Authored-By: Francisco Giordano <frangio.1@gmail.com>
    @alant @frangio
    alant and frangio authored Dec 10, 2019
    Configuration menu
    Copy the full SHA
    027822d View commit details
    Browse the repository at this point in the history

  2. same revert wording per @frangio's review suggestion

    @alant
    alant committed Dec 10, 2019
    Configuration menu
    Copy the full SHA
    07dcbd3 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'fix/improve-revert-reason-#1727' of https://github.com/… 

    …alant/openzeppelin-solidity into fix/improve-revert-reason-#1727
    @alant
    alant committed Dec 10, 2019
    Configuration menu
    Copy the full SHA
    1755395 View commit details
    Browse the repository at this point in the history

  4. per @frangio's feedback, changing the inline assembly to accomplish: … 

    …we want to ignore the first 4 bytes of content, so we should read the length and decrease it by 4, then take the memory location and add 4 to it, then store the new length at the new memory location, then that is the new byte array that we want.
    @alant
    alant committed Dec 10, 2019
    Configuration menu
    Copy the full SHA
    be4d51d View commit details
    Browse the repository at this point in the history

Commits on Dec 11, 2019

  1. change revert msg assembly per PR comment by @frangio

    @alant
    alant committed Dec 11, 2019
    Configuration menu
    Copy the full SHA
    f0a90f6 View commit details
    Browse the repository at this point in the history

  2. unify revert msg in test code

    @alant
    alant committed Dec 11, 2019
    Configuration menu
    Copy the full SHA
    ab1fb60 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into fix/improve-revert-reason-#1727

    @alant
    alant authored Dec 11, 2019
    Configuration menu
    Copy the full SHA
    59cba42 View commit details
    Browse the repository at this point in the history

Commits on Dec 12, 2019

  1. fix some failed tests, wording change

    @alant
    alant committed Dec 12, 2019
    Configuration menu
    Copy the full SHA
    cd436a6 View commit details
    Browse the repository at this point in the history

Commits on Dec 13, 2019

  1. Update contracts/token/ERC721/ERC721.sol 

    Co-Authored-By: Francisco Giordano <frangio.1@gmail.com>
    @alant @frangio
    alant and frangio authored Dec 13, 2019
    Configuration menu
    Copy the full SHA
    ee84cda View commit details
    Browse the repository at this point in the history

  2. Update contracts/token/ERC721/ERC721.sol 

    Co-Authored-By: Francisco Giordano <frangio.1@gmail.com>
    @alant @frangio
    alant and frangio authored Dec 13, 2019
    Configuration menu
    Copy the full SHA
    829032d View commit details
    Browse the repository at this point in the history

  3. Merge branch 'fix/improve-revert-reason-#1727' of https://github.com/… 

    …alant/openzeppelin-solidity into fix/improve-revert-reason-#1727
    @alant
    alant committed Dec 13, 2019
    Configuration menu
    Copy the full SHA
    f5a6a95 View commit details
    Browse the repository at this point in the history

Commits on Dec 24, 2019

  1. fix test case, revert without reason

    @alant
    alant committed Dec 24, 2019
    Configuration menu
    Copy the full SHA
    1162b59 View commit details
    Browse the repository at this point in the history

Commits on Jan 7, 2020

  1. fix 'ERC721ReceiverRevertsMock: Transaction rejected by receiver'

    @alant
    alant committed Jan 7, 2020
    Configuration menu
    Copy the full SHA
    6aec945 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into fix/improve-revert-reason-#1727

    @alant
    alant authored Jan 7, 2020
    Configuration menu
    Copy the full SHA
    604f88b View commit details
    Browse the repository at this point in the history

Commits on Jan 14, 2020

  1. style change per review by @frangio

    @alant
    alant committed Jan 14, 2020
    Configuration menu
    Copy the full SHA
    9668a49 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'fix/improve-revert-reason-#1727' of https://github.com/… 

    …alant/openzeppelin-solidity into fix/improve-revert-reason-#1727
    @alant
    alant committed Jan 14, 2020
    Configuration menu
    Copy the full SHA
    cf5c2b8 View commit details
    Browse the repository at this point in the history

  3. fix revert reason forwarding

    @frangio
    frangio authored Jan 14, 2020
    Configuration menu
    Copy the full SHA
    f279bec View commit details
    Browse the repository at this point in the history

Commits on Jan 15, 2020

  1. remove duplicate contracts/mocks/ERC721ReceiverRevertsMock.sol per re… 

    …view https://github.com/OpenZeppelin/openzeppelin-contracts/pull/2018\#issuecomment-574381034
    @alant
    alant committed Jan 15, 2020
    Configuration menu
    Copy the full SHA
    6f33362 View commit details
    Browse the repository at this point in the history

Commits on Jan 23, 2020

  1. Add changelog entry

    @nventuro
    nventuro committed Jan 23, 2020
    Configuration menu
    Copy the full SHA
    4c2930d View commit details
    Browse the repository at this point in the history

  2. Fix tests

    @nventuro
    nventuro committed Jan 23, 2020
    Configuration menu
    Copy the full SHA
    2538e97 View commit details
    Browse the repository at this point in the history

  3. Make tests more clear

    @nventuro
    nventuro committed Jan 23, 2020
    Configuration menu
    Copy the full SHA
    f3e382a View commit details
    Browse the repository at this point in the history