mirror of openzeppelin-contracts
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
openzeppelin-contracts/contracts/GSN/GSNRecipient.sol

41 lines
1.4 KiB

Initial GSN support (beta) (#1844) * Add base Context contract * Add GSNContext and tests * Add RelayHub deployment to tests * Add RelayProvider integration, complete GSNContext tests * Switch dependency to openzeppelin-gsn-provider * Add default txfee to provider * Add basic signing recipient * Sign more values * Add comment clarifying RelayHub's msg.data * Make context constructors internal * Rename SigningRecipient to GSNRecipientSignedData * Add ERC20Charge recipients * Harcode RelayHub address into GSNContext * Fix Solidity linter errors * Run server from binary, use gsn-helpers to fund it * Migrate to published @openzeppelin/gsn-helpers * Silence false-positive compiler warning * Use GSN helper assertions * Rename meta-tx to gsn, take out of drafts * Merge ERC20 charge recipients into a single one * Rename GSNRecipients to Bouncers * Add GSNBouncerUtils to decouple the bouncers from GSNRecipient * Add _upgradeRelayHub * Store RelayHub address using unstructored storage * Add IRelayHub * Add _withdrawDeposits to GSNRecipient * Add relayHub version to recipient * Make _acceptRelayedCall and _declineRelayedCall easier to use * Rename GSNBouncerUtils to GSNBouncerBase, make it IRelayRecipient * Improve GSNBouncerBase, make pre and post sender-protected and optional * Fix GSNBouncerERC20Fee, add tests * Add missing GSNBouncerSignature test * Override transferFrom in __unstable__ERC20PrimaryAdmin * Fix gsn dependencies in package.json * Rhub address slot reduced by 1 * Rename relay hub changed event * Use released gsn-provider * Run relayer with short sleep of 1s instead of 100ms * update package-lock.json * clear circle cache * use optimized gsn-provider * update to latest @openzeppelin/gsn-provider * replace with gsn dev provider * remove relay server * rename arguments in approveFunction * fix GSNBouncerSignature test * change gsn txfee * initialize development provider only once * update RelayHub interface * adapt to new IRelayHub.withdraw * update @openzeppelin/gsn-helpers * update relayhub singleton address * fix helper name * set up gsn provider for coverage too * lint * Revert "set up gsn provider for coverage too" This reverts commit 8a7b5be5f942002710cba148f249cb888ee8e373. * remove unused code * add gsn provider to coverage * move truffle contract options back out * increase gas limit for coverage * remove unreachable code * add more gas for GSNContext test * fix test suite name * rename GSNBouncerBase internal API * remove onlyRelayHub modifier * add explicit inheritance * remove redundant event * update name of bouncers error codes enums * add basic docs page for gsn contracts * make gsn directory all caps * add changelog entry * lint * enable test run to fail in coverage
6 years ago
pragma solidity ^0.5.0;
import "./IRelayRecipient.sol";
import "./GSNContext.sol";
import "./bouncers/GSNBouncerBase.sol";
import "./IRelayHub.sol";
/**
* @dev Base GSN recipient contract: includes the {IRelayRecipient} interface and enables GSN support on all contracts
* in the inheritance tree.
*
* Not all interface methods are implemented (e.g. {acceptRelayedCall}, derived contracts must provide one themselves.
Initial GSN support (beta) (#1844) * Add base Context contract * Add GSNContext and tests * Add RelayHub deployment to tests * Add RelayProvider integration, complete GSNContext tests * Switch dependency to openzeppelin-gsn-provider * Add default txfee to provider * Add basic signing recipient * Sign more values * Add comment clarifying RelayHub's msg.data * Make context constructors internal * Rename SigningRecipient to GSNRecipientSignedData * Add ERC20Charge recipients * Harcode RelayHub address into GSNContext * Fix Solidity linter errors * Run server from binary, use gsn-helpers to fund it * Migrate to published @openzeppelin/gsn-helpers * Silence false-positive compiler warning * Use GSN helper assertions * Rename meta-tx to gsn, take out of drafts * Merge ERC20 charge recipients into a single one * Rename GSNRecipients to Bouncers * Add GSNBouncerUtils to decouple the bouncers from GSNRecipient * Add _upgradeRelayHub * Store RelayHub address using unstructored storage * Add IRelayHub * Add _withdrawDeposits to GSNRecipient * Add relayHub version to recipient * Make _acceptRelayedCall and _declineRelayedCall easier to use * Rename GSNBouncerUtils to GSNBouncerBase, make it IRelayRecipient * Improve GSNBouncerBase, make pre and post sender-protected and optional * Fix GSNBouncerERC20Fee, add tests * Add missing GSNBouncerSignature test * Override transferFrom in __unstable__ERC20PrimaryAdmin * Fix gsn dependencies in package.json * Rhub address slot reduced by 1 * Rename relay hub changed event * Use released gsn-provider * Run relayer with short sleep of 1s instead of 100ms * update package-lock.json * clear circle cache * use optimized gsn-provider * update to latest @openzeppelin/gsn-provider * replace with gsn dev provider * remove relay server * rename arguments in approveFunction * fix GSNBouncerSignature test * change gsn txfee * initialize development provider only once * update RelayHub interface * adapt to new IRelayHub.withdraw * update @openzeppelin/gsn-helpers * update relayhub singleton address * fix helper name * set up gsn provider for coverage too * lint * Revert "set up gsn provider for coverage too" This reverts commit 8a7b5be5f942002710cba148f249cb888ee8e373. * remove unused code * add gsn provider to coverage * move truffle contract options back out * increase gas limit for coverage * remove unreachable code * add more gas for GSNContext test * fix test suite name * rename GSNBouncerBase internal API * remove onlyRelayHub modifier * add explicit inheritance * remove redundant event * update name of bouncers error codes enums * add basic docs page for gsn contracts * make gsn directory all caps * add changelog entry * lint * enable test run to fail in coverage
6 years ago
*/
contract GSNRecipient is IRelayRecipient, GSNContext, GSNBouncerBase {
/**
* @dev Returns the `RelayHub` address for this recipient contract.
*/
Initial GSN support (beta) (#1844) * Add base Context contract * Add GSNContext and tests * Add RelayHub deployment to tests * Add RelayProvider integration, complete GSNContext tests * Switch dependency to openzeppelin-gsn-provider * Add default txfee to provider * Add basic signing recipient * Sign more values * Add comment clarifying RelayHub's msg.data * Make context constructors internal * Rename SigningRecipient to GSNRecipientSignedData * Add ERC20Charge recipients * Harcode RelayHub address into GSNContext * Fix Solidity linter errors * Run server from binary, use gsn-helpers to fund it * Migrate to published @openzeppelin/gsn-helpers * Silence false-positive compiler warning * Use GSN helper assertions * Rename meta-tx to gsn, take out of drafts * Merge ERC20 charge recipients into a single one * Rename GSNRecipients to Bouncers * Add GSNBouncerUtils to decouple the bouncers from GSNRecipient * Add _upgradeRelayHub * Store RelayHub address using unstructored storage * Add IRelayHub * Add _withdrawDeposits to GSNRecipient * Add relayHub version to recipient * Make _acceptRelayedCall and _declineRelayedCall easier to use * Rename GSNBouncerUtils to GSNBouncerBase, make it IRelayRecipient * Improve GSNBouncerBase, make pre and post sender-protected and optional * Fix GSNBouncerERC20Fee, add tests * Add missing GSNBouncerSignature test * Override transferFrom in __unstable__ERC20PrimaryAdmin * Fix gsn dependencies in package.json * Rhub address slot reduced by 1 * Rename relay hub changed event * Use released gsn-provider * Run relayer with short sleep of 1s instead of 100ms * update package-lock.json * clear circle cache * use optimized gsn-provider * update to latest @openzeppelin/gsn-provider * replace with gsn dev provider * remove relay server * rename arguments in approveFunction * fix GSNBouncerSignature test * change gsn txfee * initialize development provider only once * update RelayHub interface * adapt to new IRelayHub.withdraw * update @openzeppelin/gsn-helpers * update relayhub singleton address * fix helper name * set up gsn provider for coverage too * lint * Revert "set up gsn provider for coverage too" This reverts commit 8a7b5be5f942002710cba148f249cb888ee8e373. * remove unused code * add gsn provider to coverage * move truffle contract options back out * increase gas limit for coverage * remove unreachable code * add more gas for GSNContext test * fix test suite name * rename GSNBouncerBase internal API * remove onlyRelayHub modifier * add explicit inheritance * remove redundant event * update name of bouncers error codes enums * add basic docs page for gsn contracts * make gsn directory all caps * add changelog entry * lint * enable test run to fail in coverage
6 years ago
function getHubAddr() public view returns (address) {
return _relayHub;
Initial GSN support (beta) (#1844) * Add base Context contract * Add GSNContext and tests * Add RelayHub deployment to tests * Add RelayProvider integration, complete GSNContext tests * Switch dependency to openzeppelin-gsn-provider * Add default txfee to provider * Add basic signing recipient * Sign more values * Add comment clarifying RelayHub's msg.data * Make context constructors internal * Rename SigningRecipient to GSNRecipientSignedData * Add ERC20Charge recipients * Harcode RelayHub address into GSNContext * Fix Solidity linter errors * Run server from binary, use gsn-helpers to fund it * Migrate to published @openzeppelin/gsn-helpers * Silence false-positive compiler warning * Use GSN helper assertions * Rename meta-tx to gsn, take out of drafts * Merge ERC20 charge recipients into a single one * Rename GSNRecipients to Bouncers * Add GSNBouncerUtils to decouple the bouncers from GSNRecipient * Add _upgradeRelayHub * Store RelayHub address using unstructored storage * Add IRelayHub * Add _withdrawDeposits to GSNRecipient * Add relayHub version to recipient * Make _acceptRelayedCall and _declineRelayedCall easier to use * Rename GSNBouncerUtils to GSNBouncerBase, make it IRelayRecipient * Improve GSNBouncerBase, make pre and post sender-protected and optional * Fix GSNBouncerERC20Fee, add tests * Add missing GSNBouncerSignature test * Override transferFrom in __unstable__ERC20PrimaryAdmin * Fix gsn dependencies in package.json * Rhub address slot reduced by 1 * Rename relay hub changed event * Use released gsn-provider * Run relayer with short sleep of 1s instead of 100ms * update package-lock.json * clear circle cache * use optimized gsn-provider * update to latest @openzeppelin/gsn-provider * replace with gsn dev provider * remove relay server * rename arguments in approveFunction * fix GSNBouncerSignature test * change gsn txfee * initialize development provider only once * update RelayHub interface * adapt to new IRelayHub.withdraw * update @openzeppelin/gsn-helpers * update relayhub singleton address * fix helper name * set up gsn provider for coverage too * lint * Revert "set up gsn provider for coverage too" This reverts commit 8a7b5be5f942002710cba148f249cb888ee8e373. * remove unused code * add gsn provider to coverage * move truffle contract options back out * increase gas limit for coverage * remove unreachable code * add more gas for GSNContext test * fix test suite name * rename GSNBouncerBase internal API * remove onlyRelayHub modifier * add explicit inheritance * remove redundant event * update name of bouncers error codes enums * add basic docs page for gsn contracts * make gsn directory all caps * add changelog entry * lint * enable test run to fail in coverage
6 years ago
}
/**
* @dev Returns the version string of the `RelayHub` for which this recipient implementation was built.
*/
Initial GSN support (beta) (#1844) * Add base Context contract * Add GSNContext and tests * Add RelayHub deployment to tests * Add RelayProvider integration, complete GSNContext tests * Switch dependency to openzeppelin-gsn-provider * Add default txfee to provider * Add basic signing recipient * Sign more values * Add comment clarifying RelayHub's msg.data * Make context constructors internal * Rename SigningRecipient to GSNRecipientSignedData * Add ERC20Charge recipients * Harcode RelayHub address into GSNContext * Fix Solidity linter errors * Run server from binary, use gsn-helpers to fund it * Migrate to published @openzeppelin/gsn-helpers * Silence false-positive compiler warning * Use GSN helper assertions * Rename meta-tx to gsn, take out of drafts * Merge ERC20 charge recipients into a single one * Rename GSNRecipients to Bouncers * Add GSNBouncerUtils to decouple the bouncers from GSNRecipient * Add _upgradeRelayHub * Store RelayHub address using unstructored storage * Add IRelayHub * Add _withdrawDeposits to GSNRecipient * Add relayHub version to recipient * Make _acceptRelayedCall and _declineRelayedCall easier to use * Rename GSNBouncerUtils to GSNBouncerBase, make it IRelayRecipient * Improve GSNBouncerBase, make pre and post sender-protected and optional * Fix GSNBouncerERC20Fee, add tests * Add missing GSNBouncerSignature test * Override transferFrom in __unstable__ERC20PrimaryAdmin * Fix gsn dependencies in package.json * Rhub address slot reduced by 1 * Rename relay hub changed event * Use released gsn-provider * Run relayer with short sleep of 1s instead of 100ms * update package-lock.json * clear circle cache * use optimized gsn-provider * update to latest @openzeppelin/gsn-provider * replace with gsn dev provider * remove relay server * rename arguments in approveFunction * fix GSNBouncerSignature test * change gsn txfee * initialize development provider only once * update RelayHub interface * adapt to new IRelayHub.withdraw * update @openzeppelin/gsn-helpers * update relayhub singleton address * fix helper name * set up gsn provider for coverage too * lint * Revert "set up gsn provider for coverage too" This reverts commit 8a7b5be5f942002710cba148f249cb888ee8e373. * remove unused code * add gsn provider to coverage * move truffle contract options back out * increase gas limit for coverage * remove unreachable code * add more gas for GSNContext test * fix test suite name * rename GSNBouncerBase internal API * remove onlyRelayHub modifier * add explicit inheritance * remove redundant event * update name of bouncers error codes enums * add basic docs page for gsn contracts * make gsn directory all caps * add changelog entry * lint * enable test run to fail in coverage
6 years ago
// This function is view for future-proofing, it may require reading from
// storage in the future.
function relayHubVersion() public view returns (string memory) {
this; // silence state mutability warning without generating bytecode - see https://github.com/ethereum/solidity/issues/2691
return "1.0.0";
}
/**
* @dev Withdraws the recipient's deposits in `RelayHub`.
*
* Derived contracts should expose this in an external interface with proper access control.
*/
Initial GSN support (beta) (#1844) * Add base Context contract * Add GSNContext and tests * Add RelayHub deployment to tests * Add RelayProvider integration, complete GSNContext tests * Switch dependency to openzeppelin-gsn-provider * Add default txfee to provider * Add basic signing recipient * Sign more values * Add comment clarifying RelayHub's msg.data * Make context constructors internal * Rename SigningRecipient to GSNRecipientSignedData * Add ERC20Charge recipients * Harcode RelayHub address into GSNContext * Fix Solidity linter errors * Run server from binary, use gsn-helpers to fund it * Migrate to published @openzeppelin/gsn-helpers * Silence false-positive compiler warning * Use GSN helper assertions * Rename meta-tx to gsn, take out of drafts * Merge ERC20 charge recipients into a single one * Rename GSNRecipients to Bouncers * Add GSNBouncerUtils to decouple the bouncers from GSNRecipient * Add _upgradeRelayHub * Store RelayHub address using unstructored storage * Add IRelayHub * Add _withdrawDeposits to GSNRecipient * Add relayHub version to recipient * Make _acceptRelayedCall and _declineRelayedCall easier to use * Rename GSNBouncerUtils to GSNBouncerBase, make it IRelayRecipient * Improve GSNBouncerBase, make pre and post sender-protected and optional * Fix GSNBouncerERC20Fee, add tests * Add missing GSNBouncerSignature test * Override transferFrom in __unstable__ERC20PrimaryAdmin * Fix gsn dependencies in package.json * Rhub address slot reduced by 1 * Rename relay hub changed event * Use released gsn-provider * Run relayer with short sleep of 1s instead of 100ms * update package-lock.json * clear circle cache * use optimized gsn-provider * update to latest @openzeppelin/gsn-provider * replace with gsn dev provider * remove relay server * rename arguments in approveFunction * fix GSNBouncerSignature test * change gsn txfee * initialize development provider only once * update RelayHub interface * adapt to new IRelayHub.withdraw * update @openzeppelin/gsn-helpers * update relayhub singleton address * fix helper name * set up gsn provider for coverage too * lint * Revert "set up gsn provider for coverage too" This reverts commit 8a7b5be5f942002710cba148f249cb888ee8e373. * remove unused code * add gsn provider to coverage * move truffle contract options back out * increase gas limit for coverage * remove unreachable code * add more gas for GSNContext test * fix test suite name * rename GSNBouncerBase internal API * remove onlyRelayHub modifier * add explicit inheritance * remove redundant event * update name of bouncers error codes enums * add basic docs page for gsn contracts * make gsn directory all caps * add changelog entry * lint * enable test run to fail in coverage
6 years ago
function _withdrawDeposits(uint256 amount, address payable payee) internal {
IRelayHub(_relayHub).withdraw(amount, payee);
Initial GSN support (beta) (#1844) * Add base Context contract * Add GSNContext and tests * Add RelayHub deployment to tests * Add RelayProvider integration, complete GSNContext tests * Switch dependency to openzeppelin-gsn-provider * Add default txfee to provider * Add basic signing recipient * Sign more values * Add comment clarifying RelayHub's msg.data * Make context constructors internal * Rename SigningRecipient to GSNRecipientSignedData * Add ERC20Charge recipients * Harcode RelayHub address into GSNContext * Fix Solidity linter errors * Run server from binary, use gsn-helpers to fund it * Migrate to published @openzeppelin/gsn-helpers * Silence false-positive compiler warning * Use GSN helper assertions * Rename meta-tx to gsn, take out of drafts * Merge ERC20 charge recipients into a single one * Rename GSNRecipients to Bouncers * Add GSNBouncerUtils to decouple the bouncers from GSNRecipient * Add _upgradeRelayHub * Store RelayHub address using unstructored storage * Add IRelayHub * Add _withdrawDeposits to GSNRecipient * Add relayHub version to recipient * Make _acceptRelayedCall and _declineRelayedCall easier to use * Rename GSNBouncerUtils to GSNBouncerBase, make it IRelayRecipient * Improve GSNBouncerBase, make pre and post sender-protected and optional * Fix GSNBouncerERC20Fee, add tests * Add missing GSNBouncerSignature test * Override transferFrom in __unstable__ERC20PrimaryAdmin * Fix gsn dependencies in package.json * Rhub address slot reduced by 1 * Rename relay hub changed event * Use released gsn-provider * Run relayer with short sleep of 1s instead of 100ms * update package-lock.json * clear circle cache * use optimized gsn-provider * update to latest @openzeppelin/gsn-provider * replace with gsn dev provider * remove relay server * rename arguments in approveFunction * fix GSNBouncerSignature test * change gsn txfee * initialize development provider only once * update RelayHub interface * adapt to new IRelayHub.withdraw * update @openzeppelin/gsn-helpers * update relayhub singleton address * fix helper name * set up gsn provider for coverage too * lint * Revert "set up gsn provider for coverage too" This reverts commit 8a7b5be5f942002710cba148f249cb888ee8e373. * remove unused code * add gsn provider to coverage * move truffle contract options back out * increase gas limit for coverage * remove unreachable code * add more gas for GSNContext test * fix test suite name * rename GSNBouncerBase internal API * remove onlyRelayHub modifier * add explicit inheritance * remove redundant event * update name of bouncers error codes enums * add basic docs page for gsn contracts * make gsn directory all caps * add changelog entry * lint * enable test run to fail in coverage
6 years ago
}
}