Skip to content

O
openzeppelin-contracts-upgradeable
Commit e808a646 by Francisco Giordano
Options

rename internal initializers

parent a221c17f
Showing with 81 additions and 48 deletions
contracts/access/roles/CapperRole.sol
...@@ -12,7 +12,7 @@ contract CapperRole is Initializable { ...@@ -12,7 +12,7 @@ contract CapperRole is Initializable {
Roles.Role private _cappers; Roles.Role private _cappers;
function initialize(address sender) public initializer { function _initialize(address sender) internal initializer {
if (!isCapper(sender)) { if (!isCapper(sender)) {
_addCapper(sender); _addCapper(sender);
} }
......
contracts/access/roles/MinterRole.sol
...@@ -12,7 +12,7 @@ contract MinterRole is Initializable { ...@@ -12,7 +12,7 @@ contract MinterRole is Initializable {
Roles.Role private _minters; Roles.Role private _minters;
function initialize(address sender) public initializer { function _initialize(address sender) internal initializer {
if (!isMinter(sender)) { if (!isMinter(sender)) {
_addMinter(sender); _addMinter(sender);
} }
......
contracts/access/roles/PauserRole.sol
...@@ -12,7 +12,7 @@ contract PauserRole is Initializable { ...@@ -12,7 +12,7 @@ contract PauserRole is Initializable {
Roles.Role private _pausers; Roles.Role private _pausers;
function initialize(address sender) public initializer { function _initialize(address sender) internal initializer {
if (!isPauser(sender)) { if (!isPauser(sender)) {
_addPauser(sender); _addPauser(sender);
} }
......
contracts/access/roles/SignerRole.sol
...@@ -12,7 +12,7 @@ contract SignerRole is Initializable { ...@@ -12,7 +12,7 @@ contract SignerRole is Initializable {
Roles.Role private _signers; Roles.Role private _signers;
function initialize(address sender) public initializer { function _initialize(address sender) internal initializer {
if (!isSigner(sender)) { if (!isSigner(sender)) {
_addSigner(sender); _addSigner(sender);
} }
......
contracts/crowdsale/validation/IndividuallyCappedCrowdsale.sol
...@@ -18,7 +18,7 @@ contract IndividuallyCappedCrowdsale is Initializable, Crowdsale, CapperRole { ...@@ -18,7 +18,7 @@ contract IndividuallyCappedCrowdsale is Initializable, Crowdsale, CapperRole {
function initialize(address sender) public initializer { function initialize(address sender) public initializer {
assert(Crowdsale._hasBeenInitialized()); assert(Crowdsale._hasBeenInitialized());
CapperRole.initialize(sender); CapperRole._initialize(sender);
} }
/** /**
......
contracts/drafts/SignatureBouncer.sol
...@@ -44,8 +44,8 @@ contract SignatureBouncer is Initializable, SignerRole { ...@@ -44,8 +44,8 @@ contract SignatureBouncer is Initializable, SignerRole {
// Signature size is 65 bytes (tightly packed v + r + s), but gets padded to 96 bytes // Signature size is 65 bytes (tightly packed v + r + s), but gets padded to 96 bytes
uint256 private constant _SIGNATURE_SIZE = 96; uint256 private constant _SIGNATURE_SIZE = 96;
function initialize(address sender) internal initializer { function _initialize(address sender) internal initializer {
SignerRole.initialize(sender); SignerRole._initialize(sender);
} }
/** /**
......
contracts/mocks/CapperRoleMock.sol
...@@ -4,7 +4,7 @@ import "../access/roles/CapperRole.sol"; ...@@ -4,7 +4,7 @@ import "../access/roles/CapperRole.sol";
contract CapperRoleMock is CapperRole { contract CapperRoleMock is CapperRole {
constructor() public { constructor() public {
CapperRole.initialize(msg.sender); CapperRole._initialize(msg.sender);
} }
function removeCapper(address account) public { function removeCapper(address account) public {
......
contracts/mocks/MinterRoleMock.sol
...@@ -4,7 +4,7 @@ import "../access/roles/MinterRole.sol"; ...@@ -4,7 +4,7 @@ import "../access/roles/MinterRole.sol";
contract MinterRoleMock is MinterRole { contract MinterRoleMock is MinterRole {
constructor() public { constructor() public {
MinterRole.initialize(msg.sender); MinterRole._initialize(msg.sender);
} }
function removeMinter(address account) public { function removeMinter(address account) public {
......
contracts/mocks/PauserRoleMock.sol
...@@ -4,7 +4,7 @@ import "../access/roles/PauserRole.sol"; ...@@ -4,7 +4,7 @@ import "../access/roles/PauserRole.sol";
contract PauserRoleMock is PauserRole { contract PauserRoleMock is PauserRole {
constructor () public { constructor () public {
PauserRole.initialize(msg.sender); PauserRole._initialize(msg.sender);
} }
function removePauser(address account) public { function removePauser(address account) public {
......
contracts/mocks/SignerRoleMock.sol
...@@ -4,7 +4,7 @@ import "../access/roles/SignerRole.sol"; ...@@ -4,7 +4,7 @@ import "../access/roles/SignerRole.sol";
contract SignerRoleMock is SignerRole { contract SignerRoleMock is SignerRole {
constructor() public { constructor() public {
SignerRole.initialize(msg.sender); SignerRole._initialize(msg.sender);
} }
function removeSigner(address account) public { function removeSigner(address account) public {
......
contracts/payment/PullPayment.sol
...@@ -12,7 +12,7 @@ import "./escrow/Escrow.sol"; ...@@ -12,7 +12,7 @@ import "./escrow/Escrow.sol";
contract PullPayment is Initializable { contract PullPayment is Initializable {
Escrow private _escrow; Escrow private _escrow;
function initialize() internal initializer { function _initialize() internal initializer {
// conditional added to make initializer idempotent in case of diamond inheritance // conditional added to make initializer idempotent in case of diamond inheritance
if (address(_escrow) == address(0)) { if (address(_escrow) == address(0)) {
_escrow = new Escrow(); _escrow = new Escrow();
......
contracts/token/ERC20/ERC20Mintable.sol
...@@ -10,7 +10,7 @@ import "../../access/roles/MinterRole.sol"; ...@@ -10,7 +10,7 @@ import "../../access/roles/MinterRole.sol";
*/ */
contract ERC20Mintable is Initializable, ERC20, MinterRole { contract ERC20Mintable is Initializable, ERC20, MinterRole {
function initialize(address sender) public initializer { function initialize(address sender) public initializer {
MinterRole.initialize(sender); MinterRole._initialize(sender);
} }
/** /**
......
contracts/token/ERC721/ERC721MetadataMintable.sol
...@@ -13,7 +13,7 @@ contract ERC721MetadataMintable is Initializable, ERC721, ERC721Metadata, Minter ...@@ -13,7 +13,7 @@ contract ERC721MetadataMintable is Initializable, ERC721, ERC721Metadata, Minter
function initialize(address sender) public initializer { function initialize(address sender) public initializer {
require(ERC721._hasBeenInitialized()); require(ERC721._hasBeenInitialized());
require(ERC721Metadata._hasBeenInitialized()); require(ERC721Metadata._hasBeenInitialized());
MinterRole.initialize(sender); MinterRole._initialize(sender);
} }
/** /**
......
contracts/token/ERC721/ERC721Mintable.sol
...@@ -11,7 +11,7 @@ import "../../access/roles/MinterRole.sol"; ...@@ -11,7 +11,7 @@ import "../../access/roles/MinterRole.sol";
contract ERC721Mintable is Initializable, ERC721, MinterRole { contract ERC721Mintable is Initializable, ERC721, MinterRole {
function initialize(address sender) public initializer { function initialize(address sender) public initializer {
require(ERC721._hasBeenInitialized()); require(ERC721._hasBeenInitialized());
MinterRole.initialize(sender); MinterRole._initialize(sender);
} }
/** /**
......
package-lock.json
...@@ -4955,6 +4955,7 @@ ...@@ -4955,6 +4955,7 @@
"integrity": "sha1-pFVBdc1GKUMDWx8dOUMvdBxrYBk=", "integrity": "sha1-pFVBdc1GKUMDWx8dOUMvdBxrYBk=",
"dev": true, "dev": true,
"requires": { "requires": {
"bignumber.js": "git+https://github.com/debris/bignumber.js.git#c7a38de919ed75e6fb6ba38051986e294b328df9",
"crypto-js": "^3.1.4", "crypto-js": "^3.1.4",
"utf8": "^2.1.1", "utf8": "^2.1.1",
"xmlhttprequest": "*" "xmlhttprequest": "*"
...@@ -4962,7 +4963,8 @@ ...@@ -4962,7 +4963,8 @@
"dependencies": { "dependencies": {
"bignumber.js": { "bignumber.js": {
"version": "git+https://github.com/debris/bignumber.js.git#c7a38de919ed75e6fb6ba38051986e294b328df9", "version": "git+https://github.com/debris/bignumber.js.git#c7a38de919ed75e6fb6ba38051986e294b328df9",
"from": "git+https://github.com/debris/bignumber.js.git#c7a38de919ed75e6fb6ba38051986e294b328df9" "from": "git+https://github.com/debris/bignumber.js.git#master",
"dev": true
} }
} }
} }
...@@ -15446,6 +15448,7 @@ ...@@ -15446,6 +15448,7 @@
"integrity": "sha1-PpcwauAk+yThCj11yIQwJWIhUSA=", "integrity": "sha1-PpcwauAk+yThCj11yIQwJWIhUSA=",
"dev": true, "dev": true,
"requires": { "requires": {
"bignumber.js": "git+https://github.com/frozeman/bignumber.js-nolookahead.git#57692b3ecfc98bbdd6b3a516cb2353652ea49934",
"crypto-js": "^3.1.4", "crypto-js": "^3.1.4",
"utf8": "^2.1.1", "utf8": "^2.1.1",
"xhr2": "*", "xhr2": "*",
...@@ -15454,7 +15457,8 @@ ...@@ -15454,7 +15457,8 @@
"dependencies": { "dependencies": {
"bignumber.js": { "bignumber.js": {
"version": "git+https://github.com/frozeman/bignumber.js-nolookahead.git#57692b3ecfc98bbdd6b3a516cb2353652ea49934", "version": "git+https://github.com/frozeman/bignumber.js-nolookahead.git#57692b3ecfc98bbdd6b3a516cb2353652ea49934",
"from": "git+https://github.com/frozeman/bignumber.js-nolookahead.git#57692b3ecfc98bbdd6b3a516cb2353652ea49934" "from": "git+https://github.com/frozeman/bignumber.js-nolookahead.git",
"dev": true
}, },
"crypto-js": { "crypto-js": {
"version": "3.1.8", "version": "3.1.8",
...@@ -15485,6 +15489,7 @@ ...@@ -15485,6 +15489,7 @@
"integrity": "sha512-VU6/DSUX93d1fCzBz7WP/SGCQizO1rKZi4Px9j/3yRyfssHyFcZamMw2/sj4E8TlfMXONvZLoforR8B4bRoyTQ==", "integrity": "sha512-VU6/DSUX93d1fCzBz7WP/SGCQizO1rKZi4Px9j/3yRyfssHyFcZamMw2/sj4E8TlfMXONvZLoforR8B4bRoyTQ==",
"dev": true, "dev": true,
"requires": { "requires": {
"bignumber.js": "git+https://github.com/frozeman/bignumber.js-nolookahead.git#57692b3ecfc98bbdd6b3a516cb2353652ea49934",
"crypto-js": "^3.1.4", "crypto-js": "^3.1.4",
"utf8": "^2.1.1", "utf8": "^2.1.1",
"xhr2-cookies": "^1.1.0", "xhr2-cookies": "^1.1.0",
...@@ -15493,7 +15498,8 @@ ...@@ -15493,7 +15498,8 @@
"dependencies": { "dependencies": {
"bignumber.js": { "bignumber.js": {
"version": "git+https://github.com/frozeman/bignumber.js-nolookahead.git#57692b3ecfc98bbdd6b3a516cb2353652ea49934", "version": "git+https://github.com/frozeman/bignumber.js-nolookahead.git#57692b3ecfc98bbdd6b3a516cb2353652ea49934",
"from": "git+https://github.com/frozeman/bignumber.js-nolookahead.git#57692b3ecfc98bbdd6b3a516cb2353652ea49934" "from": "git+https://github.com/frozeman/bignumber.js-nolookahead.git",
"dev": true
} }
} }
} }
...@@ -16089,9 +16095,9 @@ ...@@ -16089,9 +16095,9 @@
"dev": true "dev": true
}, },
"truffle-flattener": { "truffle-flattener": {
"version": "1.2.9", "version": "1.2.10",
"resolved": "https://registry.npmjs.org/truffle-flattener/-/truffle-flattener-1.2.9.tgz", "resolved": "https://registry.npmjs.org/truffle-flattener/-/truffle-flattener-1.2.10.tgz",
"integrity": "sha512-BsxNpXzWAYUKdWCaVvSh5+F806LWBpNyRRATdExh3Qm4IkAH9KaKtKBZjQYjBDZ4RuFfdn1hmBH7Yg29WVUR4g==", "integrity": "sha512-YZTez8gghcI/87tALjR4tLEX5wztZ6ycazIOJlMerGrcep1I5vOCqwgSYI4HZOyRbBUGLMOnuGckX+oIVhaTaw==",
"dev": true, "dev": true,
"requires": { "requires": {
"chalk": "^2.4.1", "chalk": "^2.4.1",
...@@ -16114,9 +16120,9 @@ ...@@ -16114,9 +16120,9 @@
} }
}, },
"chalk": { "chalk": {
"version": "2.4.1", "version": "2.4.2",
"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz", "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
"integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==", "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
"dev": true, "dev": true,
"requires": { "requires": {
"ansi-styles": "^3.2.1", "ansi-styles": "^3.2.1",
...@@ -16483,10 +16489,18 @@ ...@@ -16483,10 +16489,18 @@
"integrity": "sha1-PpcwauAk+yThCj11yIQwJWIhUSA=", "integrity": "sha1-PpcwauAk+yThCj11yIQwJWIhUSA=",
"dev": true, "dev": true,
"requires": { "requires": {
"bignumber.js": "git+https://github.com/frozeman/bignumber.js-nolookahead.git#57692b3ecfc98bbdd6b3a516cb2353652ea49934",
"crypto-js": "^3.1.4", "crypto-js": "^3.1.4",
"utf8": "^2.1.1", "utf8": "^2.1.1",
"xhr2": "*", "xhr2": "*",
"xmlhttprequest": "*" "xmlhttprequest": "*"
},
"dependencies": {
"bignumber.js": {
"version": "git+https://github.com/frozeman/bignumber.js-nolookahead.git#57692b3ecfc98bbdd6b3a516cb2353652ea49934",
"from": "git+https://github.com/frozeman/bignumber.js-nolookahead.git",
"dev": true
}
} }
} }
} }
...@@ -16716,6 +16730,15 @@ ...@@ -16716,6 +16730,15 @@
"integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=", "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=",
"dev": true "dev": true
}, },
"typedarray-to-buffer": {
"version": "3.1.5",
"resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz",
"integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==",
"dev": true,
"requires": {
"is-typedarray": "^1.0.0"
}
},
"uglify-js": { "uglify-js": {
"version": "2.8.29", "version": "2.8.29",
"resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz", "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz",
...@@ -17801,7 +17824,8 @@ ...@@ -17801,7 +17824,8 @@
"dev": true, "dev": true,
"requires": { "requires": {
"underscore": "1.8.3", "underscore": "1.8.3",
"web3-core-helpers": "1.0.0-beta.37" "web3-core-helpers": "1.0.0-beta.37",
"websocket": "git://github.com/frozeman/WebSocket-Node.git#6c72925e3f8aaaea8dc8450f97627e85263999f2"
}, },
"dependencies": { "dependencies": {
"underscore": { "underscore": {
...@@ -17809,16 +17833,6 @@ ...@@ -17809,16 +17833,6 @@
"resolved": "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz", "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz",
"integrity": "sha1-Tz+1OxBuYJf8+ctBCfKl6b36UCI=", "integrity": "sha1-Tz+1OxBuYJf8+ctBCfKl6b36UCI=",
"dev": true "dev": true
},
"websocket": {
"version": "git://github.com/frozeman/WebSocket-Node.git#6c72925e3f8aaaea8dc8450f97627e85263999f2",
"from": "git://github.com/frozeman/WebSocket-Node.git#6c72925e3f8aaaea8dc8450f97627e85263999f2",
"requires": {
"debug": "^2.2.0",
"nan": "^2.3.3",
"typedarray-to-buffer": "^3.1.2",
"yaeti": "^0.0.6"
}
} }
} }
}, },
...@@ -18389,6 +18403,17 @@ ...@@ -18389,6 +18403,17 @@
} }
} }
}, },
"websocket": {
"version": "git://github.com/frozeman/WebSocket-Node.git#6c72925e3f8aaaea8dc8450f97627e85263999f2",
"from": "git://github.com/frozeman/WebSocket-Node.git#browserifyCompatible",
"dev": true,
"requires": {
"debug": "^2.2.0",
"nan": "^2.3.3",
"typedarray-to-buffer": "^3.1.2",
"yaeti": "^0.0.6"
}
},
"wget-improved": { "wget-improved": {
"version": "1.5.0", "version": "1.5.0",
"resolved": "https://registry.npmjs.org/wget-improved/-/wget-improved-1.5.0.tgz", "resolved": "https://registry.npmjs.org/wget-improved/-/wget-improved-1.5.0.tgz",
...@@ -18621,6 +18646,12 @@ ...@@ -18621,6 +18646,12 @@
"resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz", "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz",
"integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=" "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE="
}, },
"yaeti": {
"version": "0.0.6",
"resolved": "https://registry.npmjs.org/yaeti/-/yaeti-0.0.6.tgz",
"integrity": "sha1-8m9ITXJoTPQr7ft2lwqhYI+/lXc=",
"dev": true
},
"yallist": { "yallist": {
"version": "2.1.2", "version": "2.1.2",
"resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz", "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
...@@ -19609,21 +19640,23 @@ ...@@ -19609,21 +19640,23 @@
} }
}, },
"zos-lib": { "zos-lib": {
"version": "2.0.0", "version": "2.1.0",
"resolved": "https://registry.npmjs.org/zos-lib/-/zos-lib-2.0.0.tgz", "resolved": "https://registry.npmjs.org/zos-lib/-/zos-lib-2.1.0.tgz",
"integrity": "sha512-uFRFeKUTUHBwnYH81NIMw4/69YX5tSMbhxeIJ+xRYdfKIk8IcvLqE6BHYma2auMiM4inOK8WPLBovIF9QzQDEg==", "integrity": "sha512-HLjo31UKwjj1hbdyXuG7JM/UKVx/cmUh5BG9usguIrpueVDUWS60x/+k8JtVPv6214TLQTfZ/UJRReuDmMrnGQ==",
"dev": true, "dev": true,
"requires": { "requires": {
"axios": "^0.18.0",
"bignumber.js": "^7.2.0", "bignumber.js": "^7.2.0",
"chalk": "^2.4.1", "chalk": "^2.4.1",
"ethereumjs-abi": "^0.6.5", "ethereumjs-abi": "^0.6.5",
"glob": "^7.1.3", "glob": "^7.1.3",
"openzeppelin-solidity": "~1.10.0", "openzeppelin-solidity": "~1.10.0",
"semver": "^5.5.1", "semver": "^5.5.1",
"truffle-config": "^1.0.6", "truffle-config": "1.0.6",
"truffle-contract": "^3.0.6", "truffle-contract": "3.0.6",
"truffle-flattener": "^1.2.8", "truffle-flattener": "^1.2.8",
"truffle-provisioner": "^0.1.1", "truffle-provider": "0.0.6",
"truffle-provisioner": "0.1.1",
"web3": "^0.18.4" "web3": "^0.18.4"
}, },
"dependencies": { "dependencies": {
...@@ -19643,9 +19676,9 @@ ...@@ -19643,9 +19676,9 @@
"dev": true "dev": true
}, },
"chalk": { "chalk": {
"version": "2.4.1", "version": "2.4.2",
"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz", "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
"integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==", "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
"dev": true, "dev": true,
"requires": { "requires": {
"ansi-styles": "^3.2.1", "ansi-styles": "^3.2.1",
......
package.json
...@@ -61,10 +61,10 @@ ...@@ -61,10 +61,10 @@
"solidity-coverage": "^0.5.4", "solidity-coverage": "^0.5.4",
"truffle": "^4.1.13", "truffle": "^4.1.13",
"web3-utils": "^1.0.0-beta.34", "web3-utils": "^1.0.0-beta.34",
"zos": "^2.0.0" "zos": "^2.0.0",
"zos-lib": "^2.1.0"
}, },
"peerDependencies": { "peerDependencies": {
"zos-lib": "^2.0.0" "zos-lib": "^2.1.0"
}, }
"dependencies": {}
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment