merge new code0601 #1
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
(cherry picked from commit 6148abb)
(cherry picked from commit 52dc14c)
* Fix bouncer signature tests * Update GSNBouncerSignature.test.js (cherry picked from commit 19a4198)
(cherry picked from commit 54182bf)
* Fix typo * Replace pseudo code contracts with sample code * Update GSN Bouncers text * More text changes * Update with latest code and remove reference to allowance * Capitalize Custom Bouncer * Update docs/modules/ROOT/pages/gsn-bouncers.adoc Co-Authored-By: Francisco Giordano <[email protected]> * Update gsn-bouncers.adoc with Antora cross reference Co-Authored-By: Francisco Giordano <[email protected]> * Revert to handling msg.sender msg.data differently * Change by default to simplest implementation * Change signing to include signature for GSNBouncerSignature * Reword summary of what is in the guide * Remove "The" from before `GSNBouncer...` * Fix code snippet markdown * Change to API references to xref:api * Remove code from How it works sections * Explain 1:1 exchange rate * Change transaction request to relayed call * Minor fixes * Add info to Custom Bouncers * Typo * Minor fixes * reorder sentence based on review gsn-bouncers.adoc Co-Authored-By: Francisco Giordano <[email protected]> * Improve wording of signing of relayed call parameters by trusted signer (cherry picked from commit 18473d0)
* GSNSignatureBoucer does not accept zero address * Linting code. * Update contracts/GSN/bouncers/GSNBouncerSignature.sol Makes sense! Co-Authored-By: Nicolás Venturo <[email protected]> * Update test/GSN/GSNBouncerSignature.test.js ok! Co-Authored-By: Nicolás Venturo <[email protected]> * Add zero address constant from OZ test Helpers * revert prettier formatting (cherry picked from commit f9a9478)
* fix erc20 fee token decimals to 18 * lint * Update contracts/GSN/bouncers/GSNBouncerERC20Fee.sol Co-Authored-By: Nicolás Venturo <[email protected]> * change location of hardcoded decimals for clarity * remove mention of decimals from docs * remove trailing whitespace from guide (cherry picked from commit b8ccf8e)
(cherry picked from commit c866522)
(cherry picked from commit 77ae18f)
(cherry picked from commit e557a54)
* switch index to show arg names * add index separators * add classes to style variable type and name * add class for inherited part of index * use inheritedItems in contracts template * refactor template to use explicit if and each (cherry picked from commit 5d6a040)
(cherry picked from commit eda29e0)
(cherry picked from commit 13b85c6)
(cherry picked from commit 53f1b11)
* Improve PullPayment docs * Reword escrow note * Update contracts/payment/PullPayment.sol Co-Authored-By: Francisco Giordano <[email protected]> (cherry picked from commit 9e19d90)
* Merge GSNBouncerBase into GSNRecipient * Remove emtpy implementations for _pre and _post * Rename bouncers to recipients * Rename bouncers documentation to strategies * Rewrite guides and docstrings to use the strategy naming scheme * Address review comments * Apply suggestions from code review Co-Authored-By: Francisco Giordano <[email protected]> * change wording of docs (cherry picked from commit aae95db)
* Add Address.sendEther * Add documentation to sendEther * Add changelog entry * Rename sendEther to sendValue (cherry picked from commit 8d166f3)
(cherry picked from commit 5702a84)
(cherry picked from commit fcd77a4)
Fixed: -DetailedERC20 in the constructor -minters should be _minters -New example instead of rename function (cherry picked from commit 5c8fa0f)
(cherry picked from commit eaee98f)
* Add withdrawWithGas * Improve docs * Add changelog entry * Update contracts/payment/PullPayment.sol Co-Authored-By: Francisco Giordano <[email protected]> * Remove repeated comment * Update changelog entry * Fix inline docs * Fix changelog formatting (cherry picked from commit d6e10ab)
(cherry picked from commit 76a1d7a)
(cherry picked from commit 9113335)
(cherry picked from commit 2d30415)
(cherry picked from commit bddbbe9)
* Bump ethereumjs-util from 6.2.0 to 7.0.0 Bumps [ethereumjs-util](https://github.com/ethereumjs/ethereumjs-util) from 6.2.0 to 7.0.0. - [Release notes](https://github.com/ethereumjs/ethereumjs-util/releases) - [Changelog](https://github.com/ethereumjs/ethereumjs-util/blob/master/CHANGELOG.md) - [Commits](ethereumjs/ethereumjs-util@v6.2.0...v7.0.0) Signed-off-by: dependabot-preview[bot] <[email protected]> * update use of ethereumjs-util * fix use of keccak hash function Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> Co-authored-by: Francisco Giordano <[email protected]>
Bumps [acorn](https://github.com/acornjs/acorn) from 6.4.0 to 6.4.1. **This update includes security fixes.** - [Release notes](https://github.com/acornjs/acorn/releases) - [Commits](acornjs/acorn@6.4.0...6.4.1) Signed-off-by: dependabot-preview[bot] <[email protected]> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
* Bump solidity-docgen from 0.4.1 to 0.5.3 Bumps solidity-docgen from 0.4.1 to 0.5.3. Signed-off-by: dependabot-preview[bot] <[email protected]> * Update prepare-docs.sh Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> Co-authored-by: Francisco Giordano <[email protected]>
* Making IERC721Receiver an interface * Update IERC721Receiver.sol Co-authored-by: Nicolás Venturo <[email protected]>
* Emit new event RoleAdminChanged * Adding new RoleAdminChanged event in Tests * Update suggested comments on new Event Co-authored-by: Nicolás Venturo <[email protected]> * Adding PreviousAdminRole to event * Update AccessControl.test.js * Update CHANGELOG.md Co-authored-by: Nicolás Venturo <[email protected]>
* Initial ERC1155 implementation with some tests (#1803) * Initial ERC1155 implementation with some tests * Remove mocked isERC1155TokenReceiver * Revert reason edit nit * Remove parameters associated with isERC1155TokenReceiver call * Add tests for approvals and single transfers * Add tests for transferring to contracts * Add tests for batch transfers * Make expectEvent.inTransaction tests async * Renamed "owner" to "account" and "holder" * Document unspecified balanceOfBatch reversion on zero behavior * Ensure accounts can't set their own operator status * Specify descriptive messages for underflow errors * Bring SafeMath.add calls in line with OZ style * Explicitly prevent _burn on the zero account * Implement batch minting/burning * Refactored operator approval check into isApprovedForAll calls * Renamed ERC1155TokenReceiver to ERC1155Receiver * Added ERC1155Holder * Fix lint issues * Migrate tests to @openzeppelin/test-environment * Port ERC 1155 branch to Solidity 0.6 (and current master) (#2130) * port ERC1155 to Solidity 0.6 * make ERC1155 constructor more similar to ERC721 one * also migrate mock contracts to Solidity 0.6 * mark all non-view functions as virtual Co-authored-by: Alan Lu <[email protected]> Co-authored-by: Nicolás Venturo <[email protected]> Co-authored-by: Robert Kaiser <[email protected]>
* Fix ReentrancyGuard for Proxy Pattern * Update ReentrancyGuard.sol * Change constant values * Add changelog entry Co-authored-by: Nicolás Venturo <[email protected]>
* Fixed typo in ERC20PresetMinterPauser * Update ERC721PresetMinterPauserAutoId.sol Co-authored-by: Nicolás Venturo <[email protected]>
Bumps [ethereumjs-util](https://github.com/ethereumjs/ethereumjs-util) from 7.0.0 to 7.0.1. - [Release notes](https://github.com/ethereumjs/ethereumjs-util/releases) - [Changelog](https://github.com/ethereumjs/ethereumjs-util/blob/master/CHANGELOG.md) - [Commits](ethereumjs/ethereumjs-util@v7.0.0...v7.0.1) Signed-off-by: dependabot-preview[bot] <[email protected]> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
tweak intro dev comment to reflect more typical use case, wrapping an `IERC20` reference for a deposit contract using others' ERC-20 tokens. I might be mistaken ~ but typically SafeERC20 won't be used in conjunction with ERC20 for OZ token deployments?
Bumps [mocha](https://github.com/mochajs/mocha) from 7.1.2 to 7.2.0. - [Release notes](https://github.com/mochajs/mocha/releases) - [Changelog](https://github.com/mochajs/mocha/blob/master/CHANGELOG.md) - [Commits](mochajs/mocha@v7.1.2...v7.2.0) Signed-off-by: dependabot-preview[bot] <[email protected]> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
* feat: Adding SafeCast variants for signed integers * Add newline at EOF * Update CHANGELOG.md * Update contracts/utils/SafeCast.sol Co-authored-by: Nicolás Venturo <[email protected]> Co-authored-by: Nicolás Venturo <[email protected]>
bump to 2020 reference for (c)
Co-authored-by: Francisco Giordano <[email protected]>
* Add renovate.json * configure renovatebot Co-authored-by: Renovate Bot <[email protected]> Co-authored-by: Francisco Giordano <[email protected]>
Co-authored-by: Renovate Bot <[email protected]>
v0.1.0🎉 New Features
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #
🚀 Description
npm run lint:all:fix).