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

MintableToken using Roles #1236

Merged
merged 38 commits into from
Sep 4, 2018
Merged

Commits on Aug 22, 2018

  1. Minor test style improvements (OpenZeppelin#1219)

    * Changed .eq to .equal
    
    * Changed equal(bool) to .to.be.bool
    
    * Changed be.bool to equal(bool), disallowed unused expressions.
    nventuro authored Aug 22, 2018
    Configuration menu
    Copy the full SHA
    4fb9bb7 View commit details
    Browse the repository at this point in the history
  2. Add ERC165Query library (OpenZeppelin#1086)

    * Add ERC165Query library
    
    * Address PR Comments
    
    * Add tests and mocks from OpenZeppelin#1024 and refactor code slightly
    
    * Fix javascript and solidity linting errors
    
    * Split supportsInterface into three methods as discussed in OpenZeppelin#1086
    
    * Change InterfaceId_ERC165 comment to match style in the rest of the repo
    
    * Fix max-len lint issue on ERC165Checker.sol
    
    * Conditionally ignore the asserts during solidity-coverage test
    
    * Switch to abi.encodeWithSelector and add test for account addresses
    
    * Switch to supportsInterfaces API as suggested by @frangio
    
    * Adding ERC165InterfacesSupported.sol
    
    * Fix style issues
    
    * Add test for supportsInterfaces returning false
    
    * Add ERC165Checker.sol newline
    
    * feat: fix coverage implementation
    
    * fix: solidity linting error
    
    * fix: revert to using boolean tests instead of require statements
    
    * fix: make supportsERC165Interface private again
    
    * rename SupportsInterfaceWithLookupMock to avoid name clashing
    ldub authored and shrugs committed Aug 22, 2018
    Configuration menu
    Copy the full SHA
    2adb491 View commit details
    Browse the repository at this point in the history

Commits on Aug 23, 2018

  1. Configuration menu
    Copy the full SHA
    d58fac8 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    48fe7b8 View commit details
    Browse the repository at this point in the history

Commits on Aug 24, 2018

  1. ERC721 pausable token (OpenZeppelin#1154)

    * ERC721 pausable token
    
    * Reuse of ERC721 Basic behavior for Pausable, split view checks in paused state & style fixes
    
    * [~] paused token behavior
    urvalla authored and nventuro committed Aug 24, 2018
    Configuration menu
    Copy the full SHA
    9e6307f View commit details
    Browse the repository at this point in the history
  2. Add some detail to releasing steps (OpenZeppelin#1190)

    * add note about pulling upstream changes to release branch
    
    * add comment about upstream changes in merging section
    frangio authored and nventuro committed Aug 24, 2018
    Configuration menu
    Copy the full SHA
    a466e76 View commit details
    Browse the repository at this point in the history
  3. Increase test coverage (OpenZeppelin#1237)

    * Fixed a SplitPayment test
    
    * Deleted unnecessary function.
    
    * Improved PostDeliveryCrowdsale tests.
    
    * Improved RefundableCrowdsale tests.
    
    * Improved MintedCrowdsale tests.
    
    * Improved IncreasingPriceCrowdsale tests.
    
    * Fixed a CappedCrowdsale test.
    
    * Improved TimedCrowdsale tests.
    
    * Improved descriptions of added tests.
    nventuro authored and frangio committed Aug 24, 2018
    Configuration menu
    Copy the full SHA
    a9f910d View commit details
    Browse the repository at this point in the history

Commits on Aug 28, 2018

  1. ci: trigger docs update on tag (OpenZeppelin#1186)

    Leo Arias authored Aug 28, 2018
    Configuration menu
    Copy the full SHA
    524a276 View commit details
    Browse the repository at this point in the history
  2. Roles can now be transfered.

    nventuro committed Aug 28, 2018
    Configuration menu
    Copy the full SHA
    4b3b6b6 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    6ea040f View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    9bc946c View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    32b84b9 View commit details
    Browse the repository at this point in the history
  6. Removed Roles.check.

    nventuro committed Aug 28, 2018
    Configuration menu
    Copy the full SHA
    be6b78e View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    7a3dace View commit details
    Browse the repository at this point in the history
  8. Moved MinterRole

    nventuro committed Aug 28, 2018
    Configuration menu
    Copy the full SHA
    5c71cf5 View commit details
    Browse the repository at this point in the history
  9. Fixed RBAC.

    nventuro committed Aug 28, 2018
    Configuration menu
    Copy the full SHA
    cf57fbd View commit details
    Browse the repository at this point in the history
  10. Adressed review comments.

    nventuro committed Aug 28, 2018
    Configuration menu
    Copy the full SHA
    72aa867 View commit details
    Browse the repository at this point in the history
  11. Addressed review comments

    nventuro committed Aug 28, 2018
    Configuration menu
    Copy the full SHA
    d080b3a View commit details
    Browse the repository at this point in the history
  12. Fixed linter errors.

    nventuro committed Aug 28, 2018
    Configuration menu
    Copy the full SHA
    10b10a4 View commit details
    Browse the repository at this point in the history
  13. Configuration menu
    Copy the full SHA
    132994d View commit details
    Browse the repository at this point in the history
  14. Fixed roles tests.

    nventuro committed Aug 28, 2018
    Configuration menu
    Copy the full SHA
    4e7d150 View commit details
    Browse the repository at this point in the history

Commits on Aug 29, 2018

  1. Rename events to past-tense (OpenZeppelin#1181)

    Leo Arias authored Aug 29, 2018
    Configuration menu
    Copy the full SHA
    1c05324 View commit details
    Browse the repository at this point in the history
  2. fix: refactor sign.js and related tests (OpenZeppelin#1243)

    * fix: refactor sign.js and related tests
    
    * fix: remove unused dep
    
    * fix: update package.json correctly
    shrugs authored and nventuro committed Aug 29, 2018
    Configuration menu
    Copy the full SHA
    1c57637 View commit details
    Browse the repository at this point in the history
  3. Added "_" sufix to internal variables (OpenZeppelin#1171)

    viquezclaudio authored and Leo Arias committed Aug 29, 2018
    Configuration menu
    Copy the full SHA
    b694326 View commit details
    Browse the repository at this point in the history

Commits on Aug 30, 2018

  1. Added PublicRole test.

    nventuro committed Aug 30, 2018
    Configuration menu
    Copy the full SHA
    c54681a View commit details
    Browse the repository at this point in the history

Commits on Aug 31, 2018

  1. Fixed crowdsale tests.

    nventuro committed Aug 31, 2018
    Configuration menu
    Copy the full SHA
    894fbed View commit details
    Browse the repository at this point in the history
  2. Rename ERC interfaces to I prefix (OpenZeppelin#1252)

    * rename ERC20 to IERC20
    
    * move ERC20.sol to IERC20.sol
    
    * rename StandardToken to ERC20
    
    * rename StandardTokenMock to ERC20Mock
    
    * move StandardToken.sol to ERC20.sol, likewise test and mock files
    
    * rename MintableToken to ERC20Mintable
    
    * move MintableToken.sol to ERC20Mintable.sol, likewise test and mock files
    
    * rename BurnableToken to ERC20Burnable
    
    * move BurnableToken.sol to ERC20Burnable.sol, likewise for related files
    
    * rename CappedToken to ERC20Capped
    
    * move CappedToken.sol to ERC20Capped.sol, likewise for related files
    
    * rename PausableToken to ERC20Pausable
    
    * move PausableToken.sol to ERC20Pausable.sol, likewise for related files
    
    * rename DetailedERC20 to ERC20Detailed
    
    * move DetailedERC20.sol to ERC20Detailed.sol, likewise for related files
    
    * rename ERC721 to IERC721, and likewise for other related interfaces
    
    * move ERC721.sol to IERC721.sol, likewise for other 721 interfaces
    
    * rename ERC721Token to ERC721
    
    * move ERC721Token.sol to ERC721.sol, likewise for related files
    
    * rename ERC721BasicToken to ERC721Basic
    
    * move ERC721BasicToken.sol to ERC721Basic.sol, likewise for related files
    
    * rename ERC721PausableToken to ERC721Pausable
    
    * move ERC721PausableToken.sol to ERC721Pausable.sol
    
    * rename ERC165 to IERC165
    
    * move ERC165.sol to IERC165.sol
    
    * amend comment that ERC20 is based on FirstBlood
    
    * fix comments mentioning IERC721Receiver
    frangio authored Aug 31, 2018
    Configuration menu
    Copy the full SHA
    2e0713b View commit details
    Browse the repository at this point in the history

Commits on Sep 1, 2018

  1. added explicit visibility (OpenZeppelin#1261)

    vyomshm authored and Leo Arias committed Sep 1, 2018
    Configuration menu
    Copy the full SHA
    4385fd5 View commit details
    Browse the repository at this point in the history

Commits on Sep 3, 2018

  1. Remove underscores from event parameters. (OpenZeppelin#1258)

    * Remove underscores from event parameters.
    
    Fixes OpenZeppelin#1175
    
    * Add comment about ERC
    Leo Arias authored and frangio committed Sep 3, 2018
    Configuration menu
    Copy the full SHA
    964bc40 View commit details
    Browse the repository at this point in the history
  2. Move contracts to subdirectories (OpenZeppelin#1253)

    * Move contracts to subdirectories
    
    Fixes OpenZeppelin#1177.
    
    This Change also removes the LimitBalance contract.
    
    * fix import
    
    * move MerkleProof to cryptography
    
    * Fix import
    Leo Arias authored and frangio committed Sep 3, 2018
    Configuration menu
    Copy the full SHA
    2441fd7 View commit details
    Browse the repository at this point in the history
  3. Remove HasNoEther, HasNoTokens, HasNoContracts, and NoOwner (OpenZepp…

    …elin#1254)
    
    * remove HasNoEther, HasNoTokens, HasNoContracts, and NoOwner
    
    * remove unused ERC223TokenMock
    
    * remove Contactable
    
    * remove TokenDestructible
    
    * remove DeprecatedERC721
    
    * inline Destructible#destroy in Bounty
    
    * remove Destructible
    frangio authored Sep 3, 2018
    Configuration menu
    Copy the full SHA
    bd994a8 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    fbfd1fe View commit details
    Browse the repository at this point in the history
  5. Add a leading underscore to internal and private functions. (OpenZepp…

    …elin#1257)
    
    * Add a leading underscore to internal and private functions.
    
    Fixes OpenZeppelin#1176
    
    * Remove super
    
    * update the ERC721 changes
    
    * add missing underscore after merge
    
    * Fix mock
    Leo Arias authored and frangio committed Sep 3, 2018
    Configuration menu
    Copy the full SHA
    b0f20d4 View commit details
    Browse the repository at this point in the history
  6. Improve encapsulation on SignatureBouncer, Whitelist and RBAC example (

    …OpenZeppelin#1265)
    
    * Improve encapsulation on Whitelist
    
    * remove only
    
    * update whitelisted crowdsale test
    
    * Improve encapsulation on SignatureBouncer
    
    * fix missing test
    
    * Improve encapsulation on RBAC example
    
    * Improve encapsulation on RBAC example
    
    * Remove extra visibility
    
    * Improve encapsulation on ERC20 Mintable
    
    * Improve encapsulation on Superuser
    
    * fix lint
    
    * add missing constant
    Leo Arias authored and frangio committed Sep 3, 2018
    Configuration menu
    Copy the full SHA
    f4eb51a View commit details
    Browse the repository at this point in the history

Commits on Sep 4, 2018

  1. Configuration menu
    Copy the full SHA
    69f7f49 View commit details
    Browse the repository at this point in the history
  2. Addressed review comments.

    nventuro committed Sep 4, 2018
    Configuration menu
    Copy the full SHA
    41d0c08 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    2136be9 View commit details
    Browse the repository at this point in the history
  4. Fixed build error.

    nventuro committed Sep 4, 2018
    Configuration menu
    Copy the full SHA
    b2c48b6 View commit details
    Browse the repository at this point in the history