diff --git a/contracts/lifecycle/Pausable.sol b/contracts/lifecycle/Pausable.sol index 5a36a6074..311930bb8 100644 --- a/contracts/lifecycle/Pausable.sol +++ b/contracts/lifecycle/Pausable.sol @@ -14,6 +14,8 @@ contract Pausable is Initializable, PauserRole { bool private _paused; function initialize(address sender) public initializer { + PauserRole._initialize(sender); + _paused = false; } diff --git a/contracts/token/ERC20/StandaloneERC20.sol b/contracts/token/ERC20/StandaloneERC20.sol index 65f4f65bb..abf0b768f 100644 --- a/contracts/token/ERC20/StandaloneERC20.sol +++ b/contracts/token/ERC20/StandaloneERC20.sol @@ -44,10 +44,10 @@ contract StandaloneERC20 is Initializable, ERC20Detailed, ERC20Mintable, ERC20Pa ERC20Detailed.initialize(name, symbol, decimals); // Initialize the minter and pauser roles, and renounce them - ERC20Mintable.initialize(address(this)); + ERC20Mintable.initialize(msg.sender); renounceMinter(); - ERC20Pausable.initialize(address(this)); + ERC20Pausable.initialize(msg.sender); renouncePauser(); // Add the requested minters and pausers (this can be done after renouncing since diff --git a/test/token/ERC20/StandaloneERC20.test.js b/test/token/ERC20/StandaloneERC20.test.js index dd75c4e98..aedd61c25 100644 --- a/test/token/ERC20/StandaloneERC20.test.js +++ b/test/token/ERC20/StandaloneERC20.test.js @@ -1,6 +1,6 @@ const encodeCall = require('zos-lib/lib/helpers/encodeCall').default; const { shouldBehaveLikeERC20Mintable } = require('./behaviors/ERC20Mintable.behavior'); -const { shouldFail } = require('../../helpers/shouldFail'); +const shouldFail = require('../../helpers/shouldFail'); const BigNumber = web3.BigNumber;