NoBey/openzeppelin-contracts
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GSN compatibility (#1880)

Browse Source 
* switch to using Context internally

* add context import

* Add smoke test to make sure enabling GSN support works

* Update test/GSN/ERC721GSNRecipientMock.test.js

Co-Authored-By: Francisco Giordano <frangio.1@gmail.com>

* Upgrade truffle

* add missing awaits

* Revert "Upgrade truffle"

This reverts commit f9b0ba9019.
This commit is contained in:
Nicolás Venturo
2019-08-14 09:21:38 -03:00
committed by Francisco Giordano
parent f095b62856
commit d1158ea68c
30 changed files with 645 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
contracts/lifecycle/Pausable.sol
View File

@ -1,5 +1,6 @@
pragma solidity ^0.5.0;
import "../GSN/Context.sol";
import "../access/roles/PauserRole.sol";
/**
@ -11,7 +12,7 @@ import "../access/roles/PauserRole.sol";
* the functions of your contract. Note that they will not be pausable by
* simply including this module, only once the modifiers are put in place.
*/
contract Pausable is PauserRole {
contract Pausable is Context, PauserRole {
/**
* @dev Emitted when the pause is triggered by a pauser (`account`).
*/
@ -60,7 +61,7 @@ contract Pausable is PauserRole {
*/
function pause() public onlyPauser whenNotPaused {
_paused = true;
emit Paused(msg.sender);
emit Paused(_msgSender());
}
/**
@ -68,6 +69,6 @@ contract Pausable is PauserRole {
*/
function unpause() public onlyPauser whenPaused {
_paused = false;
emit Unpaused(msg.sender);
emit Unpaused(_msgSender());
}
}