diff --git a/README.md b/README.md index 41e90aa41..8bfaefb48 100644 --- a/README.md +++ b/README.md @@ -23,12 +23,15 @@ To write your custom contracts, import ours and extend them through inheritance. pragma solidity ^0.5.0; import 'zos-lib/contracts/Initializable.sol'; -import 'openzeppelin-solidity/contracts/token/ERC721/ERC721Full.sol'; -import 'openzeppelin-solidity/contracts/token/ERC721/ERC721Mintable.sol'; +import 'openzeppelin-eth/contracts/token/ERC721/ERC721Full.sol'; +import 'openzeppelin-eth/contracts/token/ERC721/ERC721Mintable.sol'; contract MyNFT is Initializable, ERC721Full, ERC721Mintable { function initialize() public initializer { - ERC721Full.initialize("MyNFT", "MNFT"); + ERC721.initialize(); + ERC721Enumerable.initialize(); + ERC721Metadata.initialize("MyNFT", "MNFT"); + ERC721Mintable.initialize(msg.sender); } } ``` diff --git a/contracts/examples/StandardToken.sol b/contracts/examples/StandardToken.sol deleted file mode 100644 index c0414c1ca..000000000 --- a/contracts/examples/StandardToken.sol +++ /dev/null @@ -1,42 +0,0 @@ -pragma solidity ^0.5.0; - -import "zos-lib/contracts/Initializable.sol"; -import "../token/ERC20/ERC20Detailed.sol"; -import "../token/ERC20/ERC20Mintable.sol"; -import "../token/ERC20/ERC20Pausable.sol"; - - -/** - * @title Standard ERC20 token, with minting and pause functionality. - * - */ -contract StandardToken is Initializable, ERC20Detailed, ERC20Mintable, ERC20Pausable { - function initialize( - string memory name, string memory symbol, uint8 decimals, uint256 initialSupply, address initialHolder, - address[] memory minters, address[] memory pausers, address sender - ) public initializer { - ERC20Detailed.initialize(name, symbol, decimals); - - // Mint the initial supply - if (initialSupply > 0) { // To allow passing a null address when not doing any initial supply - _mint(initialHolder, initialSupply); - } - - // Initialize the minter and pauser roles, and renounce them - ERC20Mintable.initialize(sender); - _removeMinter(sender); - - ERC20Pausable.initialize(sender); - _removePauser(sender); - - // Add the requested minters and pausers (this can be done after renouncing since - // these are the internal calls) - for (uint256 i = 0; i < minters.length; ++i) { - _addMinter(minters[i]); - } - - for (uint256 i = 0; i < pausers.length; ++i) { - _addPauser(pausers[i]); - } - } -} diff --git a/contracts/token/ERC20/StandaloneERC20.sol b/contracts/token/ERC20/StandaloneERC20.sol index 9d5e6cedc..35f5f8f76 100644 --- a/contracts/token/ERC20/StandaloneERC20.sol +++ b/contracts/token/ERC20/StandaloneERC20.sol @@ -13,7 +13,7 @@ import "./ERC20Pausable.sol"; contract StandaloneERC20 is Initializable, ERC20Detailed, ERC20Mintable, ERC20Pausable { function initialize( string memory name, string memory symbol, uint8 decimals, uint256 initialSupply, address initialHolder, - address[] memory minters, address[] memory pausers, address sender + address[] memory minters, address[] memory pausers ) public initializer { ERC20Detailed.initialize(name, symbol, decimals); @@ -21,11 +21,11 @@ contract StandaloneERC20 is Initializable, ERC20Detailed, ERC20Mintable, ERC20Pa _mint(initialHolder, initialSupply); // Initialize the minter and pauser roles, and renounce them - ERC20Mintable.initialize(sender); - _removeMinter(sender); + ERC20Mintable.initialize(address(this)); + _removeMinter(address(this)); - ERC20Pausable.initialize(sender); - _removePauser(sender); + ERC20Pausable.initialize(address(this)); + _removePauser(address(this)); // Add the requested minters and pausers (this can be done after renouncing since // these are the internal calls) @@ -39,16 +39,16 @@ contract StandaloneERC20 is Initializable, ERC20Detailed, ERC20Mintable, ERC20Pa } function initialize( - string memory name, string memory symbol, uint8 decimals, address[] memory minters, address[] memory pausers, address sender + string memory name, string memory symbol, uint8 decimals, address[] memory minters, address[] memory pausers ) public initializer { ERC20Detailed.initialize(name, symbol, decimals); // Initialize the minter and pauser roles, and renounce them - ERC20Mintable.initialize(sender); - _removeMinter(sender); + ERC20Mintable.initialize(address(this)); + _removeMinter(address(this)); - ERC20Pausable.initialize(sender); - _removePauser(sender); + ERC20Pausable.initialize(address(this)); + _removePauser(address(this)); // Add the requested minters and pausers (this can be done after renouncing since // these are the internal calls) diff --git a/contracts/token/ERC721/ERC721Full.sol b/contracts/token/ERC721/ERC721Full.sol index fc9332f84..05aece1e2 100644 --- a/contracts/token/ERC721/ERC721Full.sol +++ b/contracts/token/ERC721/ERC721Full.sol @@ -12,9 +12,5 @@ import "./ERC721Metadata.sol"; * @dev see https://github.com/ethereum/EIPs/blob/master/EIPS/eip-721.md */ contract ERC721Full is Initializable, ERC721, ERC721Enumerable, ERC721Metadata { - function initialize(string memory name, string memory symbol) public initializer { - ERC721Metadata.initialize(name, symbol); - } - uint256[50] private ______gap; } diff --git a/contracts/token/ERC721/StandaloneERC721.sol b/contracts/token/ERC721/StandaloneERC721.sol index 52c32276e..6dfb7ecf7 100644 --- a/contracts/token/ERC721/StandaloneERC721.sol +++ b/contracts/token/ERC721/StandaloneERC721.sol @@ -15,17 +15,17 @@ import "./ERC721Pausable.sol"; contract StandaloneERC721 is Initializable, ERC721, ERC721Enumerable, ERC721Metadata, ERC721MetadataMintable, ERC721Pausable { - function initialize(string memory name, string memory symbol, address[] memory minters, address[] memory pausers, address sender) public initializer { + function initialize(string memory name, string memory symbol, address[] memory minters, address[] memory pausers) public initializer { ERC721.initialize(); ERC721Enumerable.initialize(); ERC721Metadata.initialize(name, symbol); // Initialize the minter and pauser roles, and renounce them - ERC721MetadataMintable.initialize(sender); - _removeMinter(sender); + ERC721MetadataMintable.initialize(address(this)); + _removeMinter(address(this)); - ERC721Pausable.initialize(sender); - _removePauser(sender); + ERC721Pausable.initialize(address(this)); + _removePauser(address(this)); // Add the requested minters and pausers (this can be done after renouncing since // these are the internal calls) diff --git a/ethpm.json b/ethpm.json deleted file mode 100644 index d1234541f..000000000 --- a/ethpm.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "package_name": "zeppelin", - "version": "2.1.2", - "description": "Secure Smart Contract library for Solidity", - "authors": [ - "OpenZeppelin Community " - ], - "keywords": [ - "solidity", - "ethereum", - "smart", - "contracts", - "security", - "zeppelin" - ], - "license": "MIT" -} diff --git a/package-lock.json b/package-lock.json index eb1e27518..0f4fba0c3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "openzeppelin-eth", - "version": "2.1.2", + "version": "2.1.3", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -19722,6 +19722,31 @@ "ms": "^2.1.1" } }, + "ethereumjs-abi": { + "version": "0.6.6", + "resolved": "https://registry.npmjs.org/ethereumjs-abi/-/ethereumjs-abi-0.6.6.tgz", + "integrity": "sha512-w8KubDsA/+OAuqtIR9RGsMcoZ5nhM8vxwjJAJvEIY+clhxA3BHoLG3+ClYQaQhD0n3mlDt3U5rBrmSVJvI3c8A==", + "dev": true, + "requires": { + "bn.js": "^4.10.0", + "ethereumjs-util": "^5.0.0" + } + }, + "ethereumjs-util": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-5.2.0.tgz", + "integrity": "sha512-CJAKdI0wgMbQFLlLRtZKGcy/L6pzVRgelIZqRqNbuVFM3K9VEnyfbcvz0ncWMRNCe4kaHWjwRYQcYMucmwsnWA==", + "dev": true, + "requires": { + "bn.js": "^4.11.0", + "create-hash": "^1.1.2", + "ethjs-util": "^0.1.3", + "keccak": "^1.0.2", + "rlp": "^2.0.0", + "safe-buffer": "^5.1.1", + "secp256k1": "^3.0.1" + } + }, "ethjs-abi": { "version": "0.1.8", "resolved": "https://registry.npmjs.org/ethjs-abi/-/ethjs-abi-0.1.8.tgz", diff --git a/package.json b/package.json index 2caf727cd..364330783 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "openzeppelin-eth", - "version": "2.1.2", + "version": "2.1.3", "description": "Secure Smart Contract library for Solidity", "files": [ "build", diff --git a/test/examples/StandardToken.test.js b/test/examples/StandardToken.test.js deleted file mode 100644 index 59926c81b..000000000 --- a/test/examples/StandardToken.test.js +++ /dev/null @@ -1,93 +0,0 @@ -const { shouldBehaveLikeERC20Mintable } = require('../token/ERC20/behaviors/ERC20Mintable.behavior'); - -const { BN } = require('openzeppelin-test-helpers'); - -const StandardToken = artifacts.require('StandardToken'); - -contract('StandardToken', function ([ - _, deployer, initialHolder, minterA, minterB, pauserA, pauserB, anyone, ...otherAccounts -]) { - const name = 'StdToken'; - const symbol = 'STDT'; - const decimals = new BN('18'); - - const initialSupply = new BN('300'); - - const minters = [minterA, minterB]; - const pausers = [pauserA, pauserB]; - - const ZERO_ADDRESS = '0x0000000000000000000000000000000000000000'; - - beforeEach(async function () { - this.token = await StandardToken.new({ from: deployer }); - }); - - async function initialize (token, name, symbol, decimals, initialSupply, initialHolder, minters, pausers, from) { - const signature = 'initialize(string,string,uint8,uint256,address,address[],address[],address)'; - const args = [name, symbol, decimals, initialSupply, initialHolder, minters, pausers, from]; - await token.methods[signature](...args, { from }); - } - - context('with all arguments', function () { - beforeEach(async function () { - await initialize(this.token, name, symbol, decimals, initialSupply, initialHolder, minters, pausers, deployer); - }); - - it('initializes metadata', async function () { - (await this.token.name()).should.equal(name); - (await this.token.symbol()).should.equal(symbol); - (await this.token.decimals()).should.be.bignumber.equal(decimals); - }); - - it('assigns the initial supply to the initial holder', async function () { - (await this.token.balanceOf(initialHolder)).should.be.bignumber.equal(initialSupply); - }); - - describe('mintability', function () { - beforeEach(function () { - this.contract = this.token; - }); - - it('all minters have the minter role', async function () { - for (const minter of minters) { - (await this.token.isMinter(minter)).should.equal(true); - } - }); - - shouldBehaveLikeERC20Mintable(minterA, otherAccounts); - }); - - describe('pausability', function () { - beforeEach(function () { - this.contract = this.token; - }); - - it('all pausers have the minter role', async function () { - for (const pauser of pausers) { - (await this.token.isPauser(pauser)).should.equal(true); - } - }); - }); - }); - - it('can be created with zero initial balance', async function () { - await initialize(this.token, name, symbol, decimals, new BN(0), ZERO_ADDRESS, minters, pausers, deployer); - (await this.token.balanceOf(initialHolder)).should.be.bignumber.equal('0'); - }); - - it('can be created with no minters', async function () { - await initialize(this.token, name, symbol, decimals, initialSupply, initialHolder, [], pausers, deployer); - - for (const minter of minters) { - (await this.token.isMinter(minter)).should.equal(false); - } - }); - - it('can be created with no pausers', async function () { - await initialize(this.token, name, symbol, decimals, initialSupply, initialHolder, minters, [], deployer); - - for (const pauser of pausers) { - (await this.token.isPauser(pauser)).should.equal(false); - } - }); -}); diff --git a/test/token/ERC20/StandaloneERC20.test.js b/test/token/ERC20/StandaloneERC20.test.js index 506073ffe..4b568c9a8 100644 --- a/test/token/ERC20/StandaloneERC20.test.js +++ b/test/token/ERC20/StandaloneERC20.test.js @@ -23,14 +23,14 @@ contract('StandaloneERC20', function ([ }); async function initializeFull (token, name, symbol, decimals, initialSupply, initialHolder, minters, pausers, from) { - const signature = 'initialize(string,string,uint8,uint256,address,address[],address[],address)'; - const args = [name, symbol, decimals, initialSupply, initialHolder, minters, pausers, from]; + const signature = 'initialize(string,string,uint8,uint256,address,address[],address[])'; + const args = [name, symbol, decimals, initialSupply, initialHolder, minters, pausers]; await token.methods[signature](...args, { from }); } async function initializePartial (token, name, symbol, decimals, minters, pausers, from) { - const signature = 'initialize(string,string,uint8,address[],address[],address)'; - const args = [name, symbol, decimals, minters, pausers, from]; + const signature = 'initialize(string,string,uint8,address[],address[])'; + const args = [name, symbol, decimals, minters, pausers]; await token.methods[signature](...args, { from }); } diff --git a/test/token/ERC721/StandaloneERC721.test.js b/test/token/ERC721/StandaloneERC721.test.js index 8e6b2ebc3..175534208 100644 --- a/test/token/ERC721/StandaloneERC721.test.js +++ b/test/token/ERC721/StandaloneERC721.test.js @@ -14,8 +14,8 @@ contract('StandaloneERC721', function ([_, deployer, minterA, minterB, pauserA, }); async function initialize (token, name, symbol, minters, pausers, from) { - const signature = 'initialize(string,string,address[],address[],address)'; - const args = [name, symbol, minters, pausers, from]; + const signature = 'initialize(string,string,address[],address[])'; + const args = [name, symbol, minters, pausers]; await token.methods[signature](...args, { from }); } diff --git a/zos.json b/zos.json index 1e7f0edeb..19263cf04 100644 --- a/zos.json +++ b/zos.json @@ -2,7 +2,7 @@ "zosversion": "2", "name": "openzeppelin-eth", "publish": true, - "version": "2.1.2", + "version": "2.1.3", "contracts": { "StandaloneERC20": "StandaloneERC20", "StandaloneERC721": "StandaloneERC721", diff --git a/zos.kovan.json b/zos.kovan.json index 0e6da5366..ae47746b6 100644 --- a/zos.kovan.json +++ b/zos.kovan.json @@ -1,7 +1,134 @@ { "contracts": { + "PaymentSplitter": { + "address": "0x05dd67f0aa04832b97c9b5d3c310f3c39223f810", + "constructorCode": "608060405234801561001057600080fd5b50610c22806100206000396000f3fe", + "bodyBytecodeHash": "e207c0c86e8e619a29af7b55615bb483a5459eb42dcce825db3b050133381561", + "localBytecodeHash": "104fd29be6e97bf49f2dd3654bff1bd57279f3da56ba3e8207704c481851642d", + "deployedBytecodeHash": "104fd29be6e97bf49f2dd3654bff1bd57279f3da56ba3e8207704c481851642d", + "types": { + "t_bool": { + "id": "t_bool", + "kind": "elementary", + "label": "bool" + }, + "t_uint256": { + "id": "t_uint256", + "kind": "elementary", + "label": "uint256" + }, + "t_array:50": { + "id": "t_array:50", + "valueType": "t_uint256", + "length": "50", + "kind": "array", + "label": "uint256[50]" + }, + "t_mapping": { + "id": "t_mapping", + "valueType": "t_uint256", + "label": "mapping(key => uint256)", + "kind": "mapping" + }, + "t_address": { + "id": "t_address", + "kind": "elementary", + "label": "address" + }, + "t_array:dyn": { + "id": "t_array:dyn", + "valueType": "t_address", + "length": "dyn", + "kind": "array", + "label": "address[]" + } + }, + "storage": [ + { + "contract": "Initializable", + "path": "zos-lib/contracts/Initializable.sol", + "label": "initialized", + "astId": 11320, + "type": "t_bool", + "src": "757:24:138" + }, + { + "contract": "Initializable", + "path": "zos-lib/contracts/Initializable.sol", + "label": "initializing", + "astId": 11322, + "type": "t_bool", + "src": "876:25:138" + }, + { + "contract": "Initializable", + "path": "zos-lib/contracts/Initializable.sol", + "label": "______gap", + "astId": 11371, + "type": "t_array:50", + "src": "1891:29:138" + }, + { + "contract": "PaymentSplitter", + "path": "contracts/payment/PaymentSplitter.sol", + "label": "_totalShares", + "astId": 7469, + "type": "t_uint256", + "src": "540:28:105" + }, + { + "contract": "PaymentSplitter", + "path": "contracts/payment/PaymentSplitter.sol", + "label": "_totalReleased", + "astId": 7471, + "type": "t_uint256", + "src": "574:30:105" + }, + { + "contract": "PaymentSplitter", + "path": "contracts/payment/PaymentSplitter.sol", + "label": "_shares", + "astId": 7475, + "type": "t_mapping", + "src": "611:43:105" + }, + { + "contract": "PaymentSplitter", + "path": "contracts/payment/PaymentSplitter.sol", + "label": "_released", + "astId": 7479, + "type": "t_mapping", + "src": "660:45:105" + }, + { + "contract": "PaymentSplitter", + "path": "contracts/payment/PaymentSplitter.sol", + "label": "_payees", + "astId": 7482, + "type": "t_array:dyn", + "src": "711:25:105" + }, + { + "contract": "PaymentSplitter", + "path": "contracts/payment/PaymentSplitter.sol", + "label": "______gap", + "astId": 7728, + "type": "t_array:50", + "src": "3236:29:105" + } + ], + "warnings": { + "hasConstructor": false, + "hasSelfDestruct": false, + "hasDelegateCall": false, + "hasInitialValuesInDeclarations": false, + "uninitializedBaseContracts": [], + "storageUncheckedVars": [], + "storageDiff": [] + } + }, "TokenVesting": { - "address": "0xe67f9c1370f768636083dfdb82540ac3468284bb", + "address": "0xf514cb344ba106b80d947245129380e80d81ee4a", "constructorCode": "608060405234801561001057600080fd5b506114f6806100206000396000f3fe", "bodyBytecodeHash": "c073eddd6c79d523b1928939c82f8095399ad0171bb069ad387f26b7367f18fc", "localBytecodeHash": "ec2e949079798b2b0314d7f09a2022185da072ee9dc5c6c660655b70d69e5acd", @@ -47,41 +174,41 @@ "contract": "Initializable", "path": "zos-lib/contracts/Initializable.sol", "label": "initialized", - "astId": 11434, + "astId": 11320, "type": "t_bool", - "src": "757:24:139" + "src": "757:24:138" }, { "contract": "Initializable", "path": "zos-lib/contracts/Initializable.sol", "label": "initializing", - "astId": 11436, + "astId": 11322, "type": "t_bool", - "src": "876:25:139" + "src": "876:25:138" }, { "contract": "Initializable", "path": "zos-lib/contracts/Initializable.sol", "label": "______gap", - "astId": 11485, + "astId": 11371, "type": "t_array:50", - "src": "1891:29:139" + "src": "1891:29:138" }, { "contract": "Ownable", "path": "contracts/ownership/Ownable.sol", "label": "_owner", - "astId": 7368, + "astId": 7253, "type": "t_address", - "src": "302:22:104" + "src": "302:22:103" }, { "contract": "Ownable", "path": "contracts/ownership/Ownable.sol", "label": "______gap", - "astId": 7479, + "astId": 7364, "type": "t_array:50", - "src": "2186:29:104" + "src": "2186:29:103" }, { "contract": "TokenVesting", @@ -158,139 +285,12 @@ "storageDiff": [] } }, - "PaymentSplitter": { - "address": "0xcb309c88115fec40ba3cd8c3114f806a86204238", - "constructorCode": "608060405234801561001057600080fd5b50610c22806100206000396000f3fe", - "bodyBytecodeHash": "e207c0c86e8e619a29af7b55615bb483a5459eb42dcce825db3b050133381561", - "localBytecodeHash": "104fd29be6e97bf49f2dd3654bff1bd57279f3da56ba3e8207704c481851642d", - "deployedBytecodeHash": "104fd29be6e97bf49f2dd3654bff1bd57279f3da56ba3e8207704c481851642d", - "types": { - "t_bool": { - "id": "t_bool", - "kind": "elementary", - "label": "bool" - }, - "t_uint256": { - "id": "t_uint256", - "kind": "elementary", - "label": "uint256" - }, - "t_array:50": { - "id": "t_array:50", - "valueType": "t_uint256", - "length": "50", - "kind": "array", - "label": "uint256[50]" - }, - "t_mapping": { - "id": "t_mapping", - "valueType": "t_uint256", - "label": "mapping(key => uint256)", - "kind": "mapping" - }, - "t_address": { - "id": "t_address", - "kind": "elementary", - "label": "address" - }, - "t_array:dyn": { - "id": "t_array:dyn", - "valueType": "t_address", - "length": "dyn", - "kind": "array", - "label": "address[]" - } - }, - "storage": [ - { - "contract": "Initializable", - "path": "zos-lib/contracts/Initializable.sol", - "label": "initialized", - "astId": 11434, - "type": "t_bool", - "src": "757:24:139" - }, - { - "contract": "Initializable", - "path": "zos-lib/contracts/Initializable.sol", - "label": "initializing", - "astId": 11436, - "type": "t_bool", - "src": "876:25:139" - }, - { - "contract": "Initializable", - "path": "zos-lib/contracts/Initializable.sol", - "label": "______gap", - "astId": 11485, - "type": "t_array:50", - "src": "1891:29:139" - }, - { - "contract": "PaymentSplitter", - "path": "contracts/payment/PaymentSplitter.sol", - "label": "_totalShares", - "astId": 7584, - "type": "t_uint256", - "src": "540:28:106" - }, - { - "contract": "PaymentSplitter", - "path": "contracts/payment/PaymentSplitter.sol", - "label": "_totalReleased", - "astId": 7586, - "type": "t_uint256", - "src": "574:30:106" - }, - { - "contract": "PaymentSplitter", - "path": "contracts/payment/PaymentSplitter.sol", - "label": "_shares", - "astId": 7590, - "type": "t_mapping", - "src": "611:43:106" - }, - { - "contract": "PaymentSplitter", - "path": "contracts/payment/PaymentSplitter.sol", - "label": "_released", - "astId": 7594, - "type": "t_mapping", - "src": "660:45:106" - }, - { - "contract": "PaymentSplitter", - "path": "contracts/payment/PaymentSplitter.sol", - "label": "_payees", - "astId": 7597, - "type": "t_array:dyn", - "src": "711:25:106" - }, - { - "contract": "PaymentSplitter", - "path": "contracts/payment/PaymentSplitter.sol", - "label": "______gap", - "astId": 7843, - "type": "t_array:50", - "src": "3236:29:106" - } - ], - "warnings": { - "hasConstructor": false, - "hasSelfDestruct": false, - "hasDelegateCall": false, - "hasInitialValuesInDeclarations": false, - "uninitializedBaseContracts": [], - "storageUncheckedVars": [], - "storageDiff": [] - } - }, "StandaloneERC20": { - "address": "0xb6a08fc99ac682bea45a0c6558ddf6bb0ef3a17c", - "constructorCode": "608060405234801561001057600080fd5b5061305d806100206000396000f3fe", - "bodyBytecodeHash": "5eb490a2f0b8c96a6499d418a6f8ec91f83880601e10bfa3c4290ae1263e292c", - "localBytecodeHash": "8e02bcbf0d25ebd2f9919db40add667731526e5abdf6d90fd6c79c68f1364034", - "deployedBytecodeHash": "8e02bcbf0d25ebd2f9919db40add667731526e5abdf6d90fd6c79c68f1364034", + "address": "0x25dac8fea65c0a0d308aff90850d3399b7413db8", + "constructorCode": "608060405234801561001057600080fd5b5061301a806100206000396000f3fe", + "bodyBytecodeHash": "be7d18748f6de2b2751faf66eafd9b205187fcf1378b9f8ae43df7b4454eed5c", + "localBytecodeHash": "ec88664e7121199b99dd457b1e8d02161fc2a7bc6d35453590ce8b9361bf30cd", + "deployedBytecodeHash": "ec88664e7121199b99dd457b1e8d02161fc2a7bc6d35453590ce8b9361bf30cd", "types": { "t_bool": { "id": "t_bool", @@ -350,89 +350,89 @@ "contract": "Initializable", "path": "zos-lib/contracts/Initializable.sol", "label": "initialized", - "astId": 11434, + "astId": 11320, "type": "t_bool", - "src": "757:24:139" + "src": "757:24:138" }, { "contract": "Initializable", "path": "zos-lib/contracts/Initializable.sol", "label": "initializing", - "astId": 11436, + "astId": 11322, "type": "t_bool", - "src": "876:25:139" + "src": "876:25:138" }, { "contract": "Initializable", "path": "zos-lib/contracts/Initializable.sol", "label": "______gap", - "astId": 11485, + "astId": 11371, "type": "t_array:50", - "src": "1891:29:139" + "src": "1891:29:138" }, { "contract": "ERC20Detailed", "path": "contracts/token/ERC20/ERC20Detailed.sol", "label": "_name", - "astId": 8827, + "astId": 8712, "type": "t_string", - "src": "382:20:114" + "src": "382:20:113" }, { "contract": "ERC20Detailed", "path": "contracts/token/ERC20/ERC20Detailed.sol", "label": "_symbol", - "astId": 8829, + "astId": 8714, "type": "t_string", - "src": "408:22:114" + "src": "408:22:113" }, { "contract": "ERC20Detailed", "path": "contracts/token/ERC20/ERC20Detailed.sol", "label": "_decimals", - "astId": 8831, + "astId": 8716, "type": "t_uint8", - "src": "436:23:114" + "src": "436:23:113" }, { "contract": "ERC20Detailed", "path": "contracts/token/ERC20/ERC20Detailed.sol", "label": "______gap", - "astId": 8883, + "astId": 8768, "type": "t_array:50", - "src": "1097:29:114" + "src": "1097:29:113" }, { "contract": "ERC20", "path": "contracts/token/ERC20/ERC20.sol", "label": "_balances", - "astId": 8282, + "astId": 8167, "type": "t_mapping", - "src": "774:46:111" + "src": "774:46:110" }, { "contract": "ERC20", "path": "contracts/token/ERC20/ERC20.sol", "label": "_allowed", - "astId": 8288, + "astId": 8173, "type": "t_mapping", - "src": "827:66:111" + "src": "827:66:110" }, { "contract": "ERC20", "path": "contracts/token/ERC20/ERC20.sol", "label": "_totalSupply", - "astId": 8290, + "astId": 8175, "type": "t_uint256", - "src": "900:28:111" + "src": "900:28:110" }, { "contract": "ERC20", "path": "contracts/token/ERC20/ERC20.sol", "label": "______gap", - "astId": 8704, + "astId": 8589, "type": "t_array:50", - "src": "7661:29:111" + "src": "7661:29:110" }, { "contract": "MinterRole", @@ -454,9 +454,9 @@ "contract": "ERC20Mintable", "path": "contracts/token/ERC20/ERC20Mintable.sol", "label": "______gap", - "astId": 8932, + "astId": 8817, "type": "t_array:50", - "src": "745:29:115" + "src": "745:29:114" }, { "contract": "PauserRole", @@ -478,25 +478,25 @@ "contract": "Pausable", "path": "contracts/lifecycle/Pausable.sol", "label": "_paused", - "astId": 3907, + "astId": 3792, "type": "t_bool", - "src": "352:20:34" + "src": "352:20:33" }, { "contract": "Pausable", "path": "contracts/lifecycle/Pausable.sol", "label": "______gap", - "astId": 3988, + "astId": 3873, "type": "t_array:50", - "src": "1429:29:34" + "src": "1429:29:33" }, { "contract": "ERC20Pausable", "path": "contracts/token/ERC20/ERC20Pausable.sol", "label": "______gap", - "astId": 9055, + "astId": 8940, "type": "t_array:50", - "src": "1195:29:116" + "src": "1195:29:115" } ], "warnings": { @@ -523,58 +523,15 @@ "src": "271:27:3" } ], - "storageDiff": [ - { - "action": "rename", - "updated": { - "index": 11, - "contract": "MinterRole", - "path": "contracts/access/roles/MinterRole.sol", - "label": "_minters", - "astId": 231, - "type": "t_struct", - "src": "271:27:2" - }, - "original": { - "index": 11, - "contract": "MinterRole", - "path": "contracts/access/roles/MinterRole.sol", - "label": "minters", - "astId": 216, - "type": "t_struct", - "src": "264:26:2" - } - }, - { - "action": "rename", - "updated": { - "index": 14, - "contract": "PauserRole", - "path": "contracts/access/roles/PauserRole.sol", - "label": "_pausers", - "astId": 350, - "type": "t_struct", - "src": "271:27:3" - }, - "original": { - "index": 14, - "contract": "PauserRole", - "path": "contracts/access/roles/PauserRole.sol", - "label": "pausers", - "astId": 335, - "type": "t_struct", - "src": "264:26:3" - } - } - ] + "storageDiff": [] } }, "StandaloneERC721": { - "address": "0x6077a7d852c1f06383c3602a7971fe0ddb6f632c", - "constructorCode": "608060405234801561001057600080fd5b50613b26806100206000396000f3fe", - "bodyBytecodeHash": "557fd20eddf815a94869bc83b1e74d2357c2ef4bdceaa5c831d6fc1e47433153", - "localBytecodeHash": "14ff23330545ddecfbe6c4d948cb6b1138857db21b815cbf381757e2beb101bb", - "deployedBytecodeHash": "14ff23330545ddecfbe6c4d948cb6b1138857db21b815cbf381757e2beb101bb", + "address": "0xe4a807c0e036f27f0e2f5afc5a9d068d2a8e839a", + "constructorCode": "608060405234801561001057600080fd5b50613b05806100206000396000f3fe", + "bodyBytecodeHash": "3a40a1411748ef0f5dcec43eda779132b622099159a45fc63fa0e172234ff536", + "localBytecodeHash": "894223010b5e61c2baed12dcf3816a46257fe851ecf71e38952b1cfebd0560b3", + "deployedBytecodeHash": "894223010b5e61c2baed12dcf3816a46257fe851ecf71e38952b1cfebd0560b3", "types": { "t_bool": { "id": "t_bool", @@ -659,153 +616,153 @@ "contract": "Initializable", "path": "zos-lib/contracts/Initializable.sol", "label": "initialized", - "astId": 11434, + "astId": 11320, "type": "t_bool", - "src": "757:24:139" + "src": "757:24:138" }, { "contract": "Initializable", "path": "zos-lib/contracts/Initializable.sol", "label": "initializing", - "astId": 11436, + "astId": 11322, "type": "t_bool", - "src": "876:25:139" + "src": "876:25:138" }, { "contract": "Initializable", "path": "zos-lib/contracts/Initializable.sol", "label": "______gap", - "astId": 11485, + "astId": 11371, "type": "t_array:50", - "src": "1891:29:139" + "src": "1891:29:138" }, { "contract": "ERC165", "path": "contracts/introspection/ERC165.sol", "label": "_supportedInterfaces", - "astId": 3697, + "astId": 3582, "type": "t_mapping", - "src": "497:52:31" + "src": "497:52:30" }, { "contract": "ERC165", "path": "contracts/introspection/ERC165.sol", "label": "______gap", - "astId": 3741, + "astId": 3626, "type": "t_array:50", - "src": "1230:29:31" + "src": "1230:29:30" }, { "contract": "ERC721", "path": "contracts/token/ERC721/ERC721.sol", "label": "_tokenOwner", - "astId": 9600, + "astId": 9497, "type": "t_mapping", - "src": "774:48:121" + "src": "774:48:120" }, { "contract": "ERC721", "path": "contracts/token/ERC721/ERC721.sol", "label": "_tokenApprovals", - "astId": 9604, + "astId": 9501, "type": "t_mapping", - "src": "878:52:121" + "src": "878:52:120" }, { "contract": "ERC721", "path": "contracts/token/ERC721/ERC721.sol", "label": "_ownedTokensCount", - "astId": 9608, + "astId": 9505, "type": "t_mapping", - "src": "988:54:121" + "src": "988:54:120" }, { "contract": "ERC721", "path": "contracts/token/ERC721/ERC721.sol", "label": "_operatorApprovals", - "astId": 9614, + "astId": 9511, "type": "t_mapping", - "src": "1097:73:121" + "src": "1097:73:120" }, { "contract": "ERC721", "path": "contracts/token/ERC721/ERC721.sol", "label": "______gap", - "astId": 10155, + "astId": 10052, "type": "t_array:50", - "src": "11668:29:121" + "src": "11668:29:120" }, { "contract": "ERC721Enumerable", "path": "contracts/token/ERC721/ERC721Enumerable.sol", "label": "_ownedTokens", - "astId": 10206, + "astId": 10103, "type": "t_mapping>", - "src": "467:50:123" + "src": "467:50:122" }, { "contract": "ERC721Enumerable", "path": "contracts/token/ERC721/ERC721Enumerable.sol", "label": "_ownedTokensIndex", - "astId": 10210, + "astId": 10107, "type": "t_mapping", - "src": "587:53:123" + "src": "587:53:122" }, { "contract": "ERC721Enumerable", "path": "contracts/token/ERC721/ERC721Enumerable.sol", "label": "_allTokens", - "astId": 10213, + "astId": 10110, "type": "t_array:dyn", - "src": "701:28:123" + "src": "701:28:122" }, { "contract": "ERC721Enumerable", "path": "contracts/token/ERC721/ERC721Enumerable.sol", "label": "_allTokensIndex", - "astId": 10217, + "astId": 10114, "type": "t_mapping", - "src": "800:51:123" + "src": "800:51:122" }, { "contract": "ERC721Enumerable", "path": "contracts/token/ERC721/ERC721Enumerable.sol", "label": "______gap", - "astId": 10546, + "astId": 10443, "type": "t_array:50", - "src": "8814:29:123" + "src": "8814:29:122" }, { "contract": "ERC721Metadata", "path": "contracts/token/ERC721/ERC721Metadata.sol", "label": "_name", - "astId": 10630, + "astId": 10510, "type": "t_string", - "src": "266:20:126" + "src": "266:20:125" }, { "contract": "ERC721Metadata", "path": "contracts/token/ERC721/ERC721Metadata.sol", "label": "_symbol", - "astId": 10632, + "astId": 10512, "type": "t_string", - "src": "313:22:126" + "src": "313:22:125" }, { "contract": "ERC721Metadata", "path": "contracts/token/ERC721/ERC721Metadata.sol", "label": "_tokenURIs", - "astId": 10636, + "astId": 10516, "type": "t_mapping", - "src": "381:45:126" + "src": "381:45:125" }, { "contract": "ERC721Metadata", "path": "contracts/token/ERC721/ERC721Metadata.sol", "label": "______gap", - "astId": 10765, + "astId": 10645, "type": "t_array:50", - "src": "2824:29:126" + "src": "2824:29:125" }, { "contract": "MinterRole", @@ -827,9 +784,9 @@ "contract": "ERC721MetadataMintable", "path": "contracts/token/ERC721/ERC721MetadataMintable.sol", "label": "______gap", - "astId": 10835, + "astId": 10715, "type": "t_array:50", - "src": "1040:29:127" + "src": "1040:29:126" }, { "contract": "PauserRole", @@ -851,25 +808,25 @@ "contract": "Pausable", "path": "contracts/lifecycle/Pausable.sol", "label": "_paused", - "astId": 3907, + "astId": 3792, "type": "t_bool", - "src": "352:20:34" + "src": "352:20:33" }, { "contract": "Pausable", "path": "contracts/lifecycle/Pausable.sol", "label": "______gap", - "astId": 3988, + "astId": 3873, "type": "t_array:50", - "src": "1429:29:34" + "src": "1429:29:33" }, { "contract": "ERC721Pausable", "path": "contracts/token/ERC721/ERC721Pausable.sol", "label": "______gap", - "astId": 10980, + "astId": 10860, "type": "t_array:50", - "src": "851:29:129" + "src": "851:29:128" } ], "warnings": { @@ -896,50 +853,7 @@ "src": "271:27:3" } ], - "storageDiff": [ - { - "action": "rename", - "updated": { - "index": 19, - "contract": "MinterRole", - "path": "contracts/access/roles/MinterRole.sol", - "label": "_minters", - "astId": 231, - "type": "t_struct", - "src": "271:27:2" - }, - "original": { - "index": 19, - "contract": "MinterRole", - "path": "contracts/access/roles/MinterRole.sol", - "label": "minters", - "astId": 216, - "type": "t_struct", - "src": "264:26:2" - } - }, - { - "action": "rename", - "updated": { - "index": 22, - "contract": "PauserRole", - "path": "contracts/access/roles/PauserRole.sol", - "label": "_pausers", - "astId": 350, - "type": "t_struct", - "src": "271:27:3" - }, - "original": { - "index": 22, - "contract": "PauserRole", - "path": "contracts/access/roles/PauserRole.sol", - "label": "pausers", - "astId": 335, - "type": "t_struct", - "src": "264:26:3" - } - } - ] + "storageDiff": [] } } }, @@ -954,7 +868,7 @@ "address": "0xb6f8f11b166d526932ee04ffe4d25b810f619e34" }, "provider": { - "address": "0x4176147c4441da46afe5483fe66034f8f8b0b812" + "address": "0x7b9b770bd7580f176c636610fd0ef9c7f1c69d73" }, - "version": "2.1.2" + "version": "2.1.3" } \ No newline at end of file diff --git a/zos.mainnet.json b/zos.mainnet.json index 1d32de01d..fd7b55c4d 100644 --- a/zos.mainnet.json +++ b/zos.mainnet.json @@ -1,7 +1,248 @@ { "contracts": { + "StandaloneERC20": { + "address": "0x87c55d3e4b41f8fe48bcc32a50b86434323460c1", + "constructorCode": "608060405234801561001057600080fd5b5061301a806100206000396000f3fe", + "bodyBytecodeHash": "be7d18748f6de2b2751faf66eafd9b205187fcf1378b9f8ae43df7b4454eed5c", + "localBytecodeHash": "ec88664e7121199b99dd457b1e8d02161fc2a7bc6d35453590ce8b9361bf30cd", + "deployedBytecodeHash": "ec88664e7121199b99dd457b1e8d02161fc2a7bc6d35453590ce8b9361bf30cd", + "types": { + "t_bool": { + "id": "t_bool", + "kind": "elementary", + "label": "bool" + }, + "t_uint256": { + "id": "t_uint256", + "kind": "elementary", + "label": "uint256" + }, + "t_array:50": { + "id": "t_array:50", + "valueType": "t_uint256", + "length": "50", + "kind": "array", + "label": "uint256[50]" + }, + "t_string": { + "id": "t_string", + "kind": "elementary", + "label": "string" + }, + "t_uint8": { + "id": "t_uint8", + "kind": "elementary", + "label": "uint8" + }, + "t_mapping": { + "id": "t_mapping", + "valueType": "t_uint256", + "label": "mapping(key => uint256)", + "kind": "mapping" + }, + "t_struct": { + "id": "t_struct", + "kind": "struct", + "label": "Roles.Role", + "members": [ + { + "label": "bearer", + "astId": 5, + "type": "t_mapping", + "src": "150:32:0" + } + ] + }, + "t_mapping": { + "id": "t_mapping", + "valueType": "t_bool", + "label": "mapping(key => bool)", + "kind": "mapping" + } + }, + "storage": [ + { + "contract": "Initializable", + "path": "zos-lib/contracts/Initializable.sol", + "label": "initialized", + "astId": 11320, + "type": "t_bool", + "src": "757:24:138" + }, + { + "contract": "Initializable", + "path": "zos-lib/contracts/Initializable.sol", + "label": "initializing", + "astId": 11322, + "type": "t_bool", + "src": "876:25:138" + }, + { + "contract": "Initializable", + "path": "zos-lib/contracts/Initializable.sol", + "label": "______gap", + "astId": 11371, + "type": "t_array:50", + "src": "1891:29:138" + }, + { + "contract": "ERC20Detailed", + "path": "contracts/token/ERC20/ERC20Detailed.sol", + "label": "_name", + "astId": 8712, + "type": "t_string", + "src": "382:20:113" + }, + { + "contract": "ERC20Detailed", + "path": "contracts/token/ERC20/ERC20Detailed.sol", + "label": "_symbol", + "astId": 8714, + "type": "t_string", + "src": "408:22:113" + }, + { + "contract": "ERC20Detailed", + "path": "contracts/token/ERC20/ERC20Detailed.sol", + "label": "_decimals", + "astId": 8716, + "type": "t_uint8", + "src": "436:23:113" + }, + { + "contract": "ERC20Detailed", + "path": "contracts/token/ERC20/ERC20Detailed.sol", + "label": "______gap", + "astId": 8768, + "type": "t_array:50", + "src": "1097:29:113" + }, + { + "contract": "ERC20", + "path": "contracts/token/ERC20/ERC20.sol", + "label": "_balances", + "astId": 8167, + "type": "t_mapping", + "src": "774:46:110" + }, + { + "contract": "ERC20", + "path": "contracts/token/ERC20/ERC20.sol", + "label": "_allowed", + "astId": 8173, + "type": "t_mapping", + "src": "827:66:110" + }, + { + "contract": "ERC20", + "path": "contracts/token/ERC20/ERC20.sol", + "label": "_totalSupply", + "astId": 8175, + "type": "t_uint256", + "src": "900:28:110" + }, + { + "contract": "ERC20", + "path": "contracts/token/ERC20/ERC20.sol", + "label": "______gap", + "astId": 8589, + "type": "t_array:50", + "src": "7661:29:110" + }, + { + "contract": "MinterRole", + "path": "contracts/access/roles/MinterRole.sol", + "label": "_minters", + "astId": 231, + "type": "t_struct", + "src": "271:27:2" + }, + { + "contract": "MinterRole", + "path": "contracts/access/roles/MinterRole.sol", + "label": "______gap", + "astId": 330, + "type": "t_array:50", + "src": "1081:29:2" + }, + { + "contract": "ERC20Mintable", + "path": "contracts/token/ERC20/ERC20Mintable.sol", + "label": "______gap", + "astId": 8817, + "type": "t_array:50", + "src": "745:29:114" + }, + { + "contract": "PauserRole", + "path": "contracts/access/roles/PauserRole.sol", + "label": "_pausers", + "astId": 350, + "type": "t_struct", + "src": "271:27:3" + }, + { + "contract": "PauserRole", + "path": "contracts/access/roles/PauserRole.sol", + "label": "______gap", + "astId": 449, + "type": "t_array:50", + "src": "1081:29:3" + }, + { + "contract": "Pausable", + "path": "contracts/lifecycle/Pausable.sol", + "label": "_paused", + "astId": 3792, + "type": "t_bool", + "src": "352:20:33" + }, + { + "contract": "Pausable", + "path": "contracts/lifecycle/Pausable.sol", + "label": "______gap", + "astId": 3873, + "type": "t_array:50", + "src": "1429:29:33" + }, + { + "contract": "ERC20Pausable", + "path": "contracts/token/ERC20/ERC20Pausable.sol", + "label": "______gap", + "astId": 8940, + "type": "t_array:50", + "src": "1195:29:115" + } + ], + "warnings": { + "hasConstructor": false, + "hasSelfDestruct": false, + "hasDelegateCall": false, + "hasInitialValuesInDeclarations": false, + "uninitializedBaseContracts": [], + "storageUncheckedVars": [ + { + "contract": "MinterRole", + "path": "contracts/access/roles/MinterRole.sol", + "label": "_minters", + "astId": 231, + "type": "t_struct", + "src": "271:27:2" + }, + { + "contract": "PauserRole", + "path": "contracts/access/roles/PauserRole.sol", + "label": "_pausers", + "astId": 350, + "type": "t_struct", + "src": "271:27:3" + } + ], + "storageDiff": [] + } + }, "TokenVesting": { - "address": "0x92651879df4e0177be57e5303364c5557d011e85", + "address": "0x739a0c3db75ca248e2ec562eba6ef17def04021a", "constructorCode": "608060405234801561001057600080fd5b506114f6806100206000396000f3fe", "bodyBytecodeHash": "c073eddd6c79d523b1928939c82f8095399ad0171bb069ad387f26b7367f18fc", "localBytecodeHash": "ec2e949079798b2b0314d7f09a2022185da072ee9dc5c6c660655b70d69e5acd", @@ -47,41 +288,41 @@ "contract": "Initializable", "path": "zos-lib/contracts/Initializable.sol", "label": "initialized", - "astId": 11434, + "astId": 11320, "type": "t_bool", - "src": "757:24:139" + "src": "757:24:138" }, { "contract": "Initializable", "path": "zos-lib/contracts/Initializable.sol", "label": "initializing", - "astId": 11436, + "astId": 11322, "type": "t_bool", - "src": "876:25:139" + "src": "876:25:138" }, { "contract": "Initializable", "path": "zos-lib/contracts/Initializable.sol", "label": "______gap", - "astId": 11485, + "astId": 11371, "type": "t_array:50", - "src": "1891:29:139" + "src": "1891:29:138" }, { "contract": "Ownable", "path": "contracts/ownership/Ownable.sol", "label": "_owner", - "astId": 7368, + "astId": 7253, "type": "t_address", - "src": "302:22:104" + "src": "302:22:103" }, { "contract": "Ownable", "path": "contracts/ownership/Ownable.sol", "label": "______gap", - "astId": 7479, + "astId": 7364, "type": "t_array:50", - "src": "2186:29:104" + "src": "2186:29:103" }, { "contract": "TokenVesting", @@ -153,11 +394,13 @@ "hasSelfDestruct": false, "hasDelegateCall": false, "hasInitialValuesInDeclarations": false, - "uninitializedBaseContracts": [] + "uninitializedBaseContracts": [], + "storageUncheckedVars": [], + "storageDiff": [] } }, "PaymentSplitter": { - "address": "0x2ecb0c464cb92dcf2c0c1df9b9dda0d32b5b7729", + "address": "0x7b6e87aa1cea8a10ab8e7acb9870ee45baea198a", "constructorCode": "608060405234801561001057600080fd5b50610c22806100206000396000f3fe", "bodyBytecodeHash": "e207c0c86e8e619a29af7b55615bb483a5459eb42dcce825db3b050133381561", "localBytecodeHash": "104fd29be6e97bf49f2dd3654bff1bd57279f3da56ba3e8207704c481851642d", @@ -204,73 +447,73 @@ "contract": "Initializable", "path": "zos-lib/contracts/Initializable.sol", "label": "initialized", - "astId": 11434, + "astId": 11320, "type": "t_bool", - "src": "757:24:139" + "src": "757:24:138" }, { "contract": "Initializable", "path": "zos-lib/contracts/Initializable.sol", "label": "initializing", - "astId": 11436, + "astId": 11322, "type": "t_bool", - "src": "876:25:139" + "src": "876:25:138" }, { "contract": "Initializable", "path": "zos-lib/contracts/Initializable.sol", "label": "______gap", - "astId": 11485, + "astId": 11371, "type": "t_array:50", - "src": "1891:29:139" + "src": "1891:29:138" }, { "contract": "PaymentSplitter", "path": "contracts/payment/PaymentSplitter.sol", "label": "_totalShares", - "astId": 7584, + "astId": 7469, "type": "t_uint256", - "src": "540:28:106" + "src": "540:28:105" }, { "contract": "PaymentSplitter", "path": "contracts/payment/PaymentSplitter.sol", "label": "_totalReleased", - "astId": 7586, + "astId": 7471, "type": "t_uint256", - "src": "574:30:106" + "src": "574:30:105" }, { "contract": "PaymentSplitter", "path": "contracts/payment/PaymentSplitter.sol", "label": "_shares", - "astId": 7590, + "astId": 7475, "type": "t_mapping", - "src": "611:43:106" + "src": "611:43:105" }, { "contract": "PaymentSplitter", "path": "contracts/payment/PaymentSplitter.sol", "label": "_released", - "astId": 7594, + "astId": 7479, "type": "t_mapping", - "src": "660:45:106" + "src": "660:45:105" }, { "contract": "PaymentSplitter", "path": "contracts/payment/PaymentSplitter.sol", "label": "_payees", - "astId": 7597, + "astId": 7482, "type": "t_array:dyn", - "src": "711:25:106" + "src": "711:25:105" }, { "contract": "PaymentSplitter", "path": "contracts/payment/PaymentSplitter.sol", "label": "______gap", - "astId": 7843, + "astId": 7728, "type": "t_array:50", - "src": "3236:29:106" + "src": "3236:29:105" } ], "warnings": { @@ -278,15 +521,17 @@ "hasSelfDestruct": false, "hasDelegateCall": false, "hasInitialValuesInDeclarations": false, - "uninitializedBaseContracts": [] + "uninitializedBaseContracts": [], + "storageUncheckedVars": [], + "storageDiff": [] } }, "StandaloneERC721": { - "address": "0x1bf944284f78cdcf72945469484614140c7d0ce4", - "constructorCode": "608060405234801561001057600080fd5b50613b26806100206000396000f3fe", - "bodyBytecodeHash": "557fd20eddf815a94869bc83b1e74d2357c2ef4bdceaa5c831d6fc1e47433153", - "localBytecodeHash": "14ff23330545ddecfbe6c4d948cb6b1138857db21b815cbf381757e2beb101bb", - "deployedBytecodeHash": "14ff23330545ddecfbe6c4d948cb6b1138857db21b815cbf381757e2beb101bb", + "address": "0xa7b99ae52724624fad63625d6d5d7bc217f36ca5", + "constructorCode": "608060405234801561001057600080fd5b50613b05806100206000396000f3fe", + "bodyBytecodeHash": "3a40a1411748ef0f5dcec43eda779132b622099159a45fc63fa0e172234ff536", + "localBytecodeHash": "894223010b5e61c2baed12dcf3816a46257fe851ecf71e38952b1cfebd0560b3", + "deployedBytecodeHash": "894223010b5e61c2baed12dcf3816a46257fe851ecf71e38952b1cfebd0560b3", "types": { "t_bool": { "id": "t_bool", @@ -371,153 +616,153 @@ "contract": "Initializable", "path": "zos-lib/contracts/Initializable.sol", "label": "initialized", - "astId": 11434, + "astId": 11320, "type": "t_bool", - "src": "757:24:139" + "src": "757:24:138" }, { "contract": "Initializable", "path": "zos-lib/contracts/Initializable.sol", "label": "initializing", - "astId": 11436, + "astId": 11322, "type": "t_bool", - "src": "876:25:139" + "src": "876:25:138" }, { "contract": "Initializable", "path": "zos-lib/contracts/Initializable.sol", "label": "______gap", - "astId": 11485, + "astId": 11371, "type": "t_array:50", - "src": "1891:29:139" + "src": "1891:29:138" }, { "contract": "ERC165", "path": "contracts/introspection/ERC165.sol", "label": "_supportedInterfaces", - "astId": 3697, + "astId": 3582, "type": "t_mapping", - "src": "497:52:31" + "src": "497:52:30" }, { "contract": "ERC165", "path": "contracts/introspection/ERC165.sol", "label": "______gap", - "astId": 3741, + "astId": 3626, "type": "t_array:50", - "src": "1230:29:31" + "src": "1230:29:30" }, { "contract": "ERC721", "path": "contracts/token/ERC721/ERC721.sol", "label": "_tokenOwner", - "astId": 9600, + "astId": 9497, "type": "t_mapping", - "src": "774:48:121" + "src": "774:48:120" }, { "contract": "ERC721", "path": "contracts/token/ERC721/ERC721.sol", "label": "_tokenApprovals", - "astId": 9604, + "astId": 9501, "type": "t_mapping", - "src": "878:52:121" + "src": "878:52:120" }, { "contract": "ERC721", "path": "contracts/token/ERC721/ERC721.sol", "label": "_ownedTokensCount", - "astId": 9608, + "astId": 9505, "type": "t_mapping", - "src": "988:54:121" + "src": "988:54:120" }, { "contract": "ERC721", "path": "contracts/token/ERC721/ERC721.sol", "label": "_operatorApprovals", - "astId": 9614, + "astId": 9511, "type": "t_mapping", - "src": "1097:73:121" + "src": "1097:73:120" }, { "contract": "ERC721", "path": "contracts/token/ERC721/ERC721.sol", "label": "______gap", - "astId": 10155, + "astId": 10052, "type": "t_array:50", - "src": "11668:29:121" + "src": "11668:29:120" }, { "contract": "ERC721Enumerable", "path": "contracts/token/ERC721/ERC721Enumerable.sol", "label": "_ownedTokens", - "astId": 10206, + "astId": 10103, "type": "t_mapping>", - "src": "467:50:123" + "src": "467:50:122" }, { "contract": "ERC721Enumerable", "path": "contracts/token/ERC721/ERC721Enumerable.sol", "label": "_ownedTokensIndex", - "astId": 10210, + "astId": 10107, "type": "t_mapping", - "src": "587:53:123" + "src": "587:53:122" }, { "contract": "ERC721Enumerable", "path": "contracts/token/ERC721/ERC721Enumerable.sol", "label": "_allTokens", - "astId": 10213, + "astId": 10110, "type": "t_array:dyn", - "src": "701:28:123" + "src": "701:28:122" }, { "contract": "ERC721Enumerable", "path": "contracts/token/ERC721/ERC721Enumerable.sol", "label": "_allTokensIndex", - "astId": 10217, + "astId": 10114, "type": "t_mapping", - "src": "800:51:123" + "src": "800:51:122" }, { "contract": "ERC721Enumerable", "path": "contracts/token/ERC721/ERC721Enumerable.sol", "label": "______gap", - "astId": 10546, + "astId": 10443, "type": "t_array:50", - "src": "8814:29:123" + "src": "8814:29:122" }, { "contract": "ERC721Metadata", "path": "contracts/token/ERC721/ERC721Metadata.sol", "label": "_name", - "astId": 10630, + "astId": 10510, "type": "t_string", - "src": "266:20:126" + "src": "266:20:125" }, { "contract": "ERC721Metadata", "path": "contracts/token/ERC721/ERC721Metadata.sol", "label": "_symbol", - "astId": 10632, + "astId": 10512, "type": "t_string", - "src": "313:22:126" + "src": "313:22:125" }, { "contract": "ERC721Metadata", "path": "contracts/token/ERC721/ERC721Metadata.sol", "label": "_tokenURIs", - "astId": 10636, + "astId": 10516, "type": "t_mapping", - "src": "381:45:126" + "src": "381:45:125" }, { "contract": "ERC721Metadata", "path": "contracts/token/ERC721/ERC721Metadata.sol", "label": "______gap", - "astId": 10765, + "astId": 10645, "type": "t_array:50", - "src": "2824:29:126" + "src": "2824:29:125" }, { "contract": "MinterRole", @@ -539,9 +784,9 @@ "contract": "ERC721MetadataMintable", "path": "contracts/token/ERC721/ERC721MetadataMintable.sol", "label": "______gap", - "astId": 10835, + "astId": 10715, "type": "t_array:50", - "src": "1040:29:127" + "src": "1040:29:126" }, { "contract": "PauserRole", @@ -563,25 +808,25 @@ "contract": "Pausable", "path": "contracts/lifecycle/Pausable.sol", "label": "_paused", - "astId": 3907, + "astId": 3792, "type": "t_bool", - "src": "352:20:34" + "src": "352:20:33" }, { "contract": "Pausable", "path": "contracts/lifecycle/Pausable.sol", "label": "______gap", - "astId": 3988, + "astId": 3873, "type": "t_array:50", - "src": "1429:29:34" + "src": "1429:29:33" }, { "contract": "ERC721Pausable", "path": "contracts/token/ERC721/ERC721Pausable.sol", "label": "______gap", - "astId": 10980, + "astId": 10860, "type": "t_array:50", - "src": "851:29:129" + "src": "851:29:128" } ], "warnings": { @@ -589,229 +834,26 @@ "hasSelfDestruct": false, "hasDelegateCall": false, "hasInitialValuesInDeclarations": false, - "uninitializedBaseContracts": [] - } - }, - "StandaloneERC20": { - "address": "0xd24d2b921f7a8f9a2a8f4f3c341af0697f949d4b", - "constructorCode": "608060405234801561001057600080fd5b5061305d806100206000396000f3fe", - "bodyBytecodeHash": "5eb490a2f0b8c96a6499d418a6f8ec91f83880601e10bfa3c4290ae1263e292c", - "localBytecodeHash": "8e02bcbf0d25ebd2f9919db40add667731526e5abdf6d90fd6c79c68f1364034", - "deployedBytecodeHash": "8e02bcbf0d25ebd2f9919db40add667731526e5abdf6d90fd6c79c68f1364034", - "types": { - "t_bool": { - "id": "t_bool", - "kind": "elementary", - "label": "bool" - }, - "t_uint256": { - "id": "t_uint256", - "kind": "elementary", - "label": "uint256" - }, - "t_array:50": { - "id": "t_array:50", - "valueType": "t_uint256", - "length": "50", - "kind": "array", - "label": "uint256[50]" - }, - "t_string": { - "id": "t_string", - "kind": "elementary", - "label": "string" - }, - "t_uint8": { - "id": "t_uint8", - "kind": "elementary", - "label": "uint8" - }, - "t_mapping": { - "id": "t_mapping", - "valueType": "t_uint256", - "label": "mapping(key => uint256)", - "kind": "mapping" - }, - "t_struct": { - "id": "t_struct", - "kind": "struct", - "label": "Roles.Role", - "members": [ - { - "label": "bearer", - "astId": 5, - "type": "t_mapping", - "src": "150:32:0" - } - ] - }, - "t_mapping": { - "id": "t_mapping", - "valueType": "t_bool", - "label": "mapping(key => bool)", - "kind": "mapping" - } - }, - "storage": [ - { - "contract": "Initializable", - "path": "zos-lib/contracts/Initializable.sol", - "label": "initialized", - "astId": 11434, - "type": "t_bool", - "src": "757:24:139" - }, - { - "contract": "Initializable", - "path": "zos-lib/contracts/Initializable.sol", - "label": "initializing", - "astId": 11436, - "type": "t_bool", - "src": "876:25:139" - }, - { - "contract": "Initializable", - "path": "zos-lib/contracts/Initializable.sol", - "label": "______gap", - "astId": 11485, - "type": "t_array:50", - "src": "1891:29:139" - }, - { - "contract": "ERC20Detailed", - "path": "contracts/token/ERC20/ERC20Detailed.sol", - "label": "_name", - "astId": 8827, - "type": "t_string", - "src": "382:20:114" - }, - { - "contract": "ERC20Detailed", - "path": "contracts/token/ERC20/ERC20Detailed.sol", - "label": "_symbol", - "astId": 8829, - "type": "t_string", - "src": "408:22:114" - }, - { - "contract": "ERC20Detailed", - "path": "contracts/token/ERC20/ERC20Detailed.sol", - "label": "_decimals", - "astId": 8831, - "type": "t_uint8", - "src": "436:23:114" - }, - { - "contract": "ERC20Detailed", - "path": "contracts/token/ERC20/ERC20Detailed.sol", - "label": "______gap", - "astId": 8883, - "type": "t_array:50", - "src": "1097:29:114" - }, - { - "contract": "ERC20", - "path": "contracts/token/ERC20/ERC20.sol", - "label": "_balances", - "astId": 8282, - "type": "t_mapping", - "src": "774:46:111" - }, - { - "contract": "ERC20", - "path": "contracts/token/ERC20/ERC20.sol", - "label": "_allowed", - "astId": 8288, - "type": "t_mapping", - "src": "827:66:111" - }, - { - "contract": "ERC20", - "path": "contracts/token/ERC20/ERC20.sol", - "label": "_totalSupply", - "astId": 8290, - "type": "t_uint256", - "src": "900:28:111" - }, - { - "contract": "ERC20", - "path": "contracts/token/ERC20/ERC20.sol", - "label": "______gap", - "astId": 8704, - "type": "t_array:50", - "src": "7661:29:111" - }, - { - "contract": "MinterRole", - "path": "contracts/access/roles/MinterRole.sol", - "label": "_minters", - "astId": 231, - "type": "t_struct", - "src": "271:27:2" - }, - { - "contract": "MinterRole", - "path": "contracts/access/roles/MinterRole.sol", - "label": "______gap", - "astId": 330, - "type": "t_array:50", - "src": "1081:29:2" - }, - { - "contract": "ERC20Mintable", - "path": "contracts/token/ERC20/ERC20Mintable.sol", - "label": "______gap", - "astId": 8932, - "type": "t_array:50", - "src": "745:29:115" - }, - { - "contract": "PauserRole", - "path": "contracts/access/roles/PauserRole.sol", - "label": "_pausers", - "astId": 350, - "type": "t_struct", - "src": "271:27:3" - }, - { - "contract": "PauserRole", - "path": "contracts/access/roles/PauserRole.sol", - "label": "______gap", - "astId": 449, - "type": "t_array:50", - "src": "1081:29:3" - }, - { - "contract": "Pausable", - "path": "contracts/lifecycle/Pausable.sol", - "label": "_paused", - "astId": 3907, - "type": "t_bool", - "src": "352:20:34" - }, - { - "contract": "Pausable", - "path": "contracts/lifecycle/Pausable.sol", - "label": "______gap", - "astId": 3988, - "type": "t_array:50", - "src": "1429:29:34" - }, - { - "contract": "ERC20Pausable", - "path": "contracts/token/ERC20/ERC20Pausable.sol", - "label": "______gap", - "astId": 9055, - "type": "t_array:50", - "src": "1195:29:116" - } - ], - "warnings": { - "hasConstructor": false, - "hasSelfDestruct": false, - "hasDelegateCall": false, - "hasInitialValuesInDeclarations": false, - "uninitializedBaseContracts": [] + "uninitializedBaseContracts": [], + "storageUncheckedVars": [ + { + "contract": "MinterRole", + "path": "contracts/access/roles/MinterRole.sol", + "label": "_minters", + "astId": 231, + "type": "t_struct", + "src": "271:27:2" + }, + { + "contract": "PauserRole", + "path": "contracts/access/roles/PauserRole.sol", + "label": "_pausers", + "astId": 350, + "type": "t_struct", + "src": "271:27:3" + } + ], + "storageDiff": [] } } }, @@ -826,7 +868,7 @@ "address": "0x778dddf23ec1b5cb18394c6c110480caadb3b0f6" }, "provider": { - "address": "0xa4e5573eaac8699ed4139572ab0d75b97abc0101" + "address": "0x06cebabebbe51b87e9d5d9bac398092bd12cd5b2" }, - "version": "2.1.2" + "version": "2.1.3" } \ No newline at end of file diff --git a/zos.rinkeby.json b/zos.rinkeby.json index 8fc05a6c7..8e29eab8d 100644 --- a/zos.rinkeby.json +++ b/zos.rinkeby.json @@ -1,7 +1,7 @@ { "contracts": { "TokenVesting": { - "address": "0x46de4dd86cda61a577f1ec068cda5f860b93647d", + "address": "0x62f5d4249f6595961c631d5a85101fc658d4816d", "constructorCode": "608060405234801561001057600080fd5b506114f6806100206000396000f3fe", "bodyBytecodeHash": "c073eddd6c79d523b1928939c82f8095399ad0171bb069ad387f26b7367f18fc", "localBytecodeHash": "ec2e949079798b2b0314d7f09a2022185da072ee9dc5c6c660655b70d69e5acd", @@ -47,41 +47,41 @@ "contract": "Initializable", "path": "zos-lib/contracts/Initializable.sol", "label": "initialized", - "astId": 11434, + "astId": 11337, "type": "t_bool", - "src": "757:24:139" + "src": "757:24:138" }, { "contract": "Initializable", "path": "zos-lib/contracts/Initializable.sol", "label": "initializing", - "astId": 11436, + "astId": 11339, "type": "t_bool", - "src": "876:25:139" + "src": "876:25:138" }, { "contract": "Initializable", "path": "zos-lib/contracts/Initializable.sol", "label": "______gap", - "astId": 11485, + "astId": 11388, "type": "t_array:50", - "src": "1891:29:139" + "src": "1891:29:138" }, { "contract": "Ownable", "path": "contracts/ownership/Ownable.sol", "label": "_owner", - "astId": 7368, + "astId": 7253, "type": "t_address", - "src": "302:22:104" + "src": "302:22:103" }, { "contract": "Ownable", "path": "contracts/ownership/Ownable.sol", "label": "______gap", - "astId": 7479, + "astId": 7364, "type": "t_array:50", - "src": "2186:29:104" + "src": "2186:29:103" }, { "contract": "TokenVesting", @@ -153,11 +153,13 @@ "hasSelfDestruct": false, "hasDelegateCall": false, "hasInitialValuesInDeclarations": false, - "uninitializedBaseContracts": [] + "uninitializedBaseContracts": [], + "storageUncheckedVars": [], + "storageDiff": [] } }, "PaymentSplitter": { - "address": "0xca98af4495ef1fd432cc8d61d7a16a0dd540f533", + "address": "0xb46aec172e8dcb2018722d0dcb6217909c5caab9", "constructorCode": "608060405234801561001057600080fd5b50610c22806100206000396000f3fe", "bodyBytecodeHash": "e207c0c86e8e619a29af7b55615bb483a5459eb42dcce825db3b050133381561", "localBytecodeHash": "104fd29be6e97bf49f2dd3654bff1bd57279f3da56ba3e8207704c481851642d", @@ -204,73 +206,73 @@ "contract": "Initializable", "path": "zos-lib/contracts/Initializable.sol", "label": "initialized", - "astId": 11434, + "astId": 11337, "type": "t_bool", - "src": "757:24:139" + "src": "757:24:138" }, { "contract": "Initializable", "path": "zos-lib/contracts/Initializable.sol", "label": "initializing", - "astId": 11436, + "astId": 11339, "type": "t_bool", - "src": "876:25:139" + "src": "876:25:138" }, { "contract": "Initializable", "path": "zos-lib/contracts/Initializable.sol", "label": "______gap", - "astId": 11485, + "astId": 11388, "type": "t_array:50", - "src": "1891:29:139" + "src": "1891:29:138" }, { "contract": "PaymentSplitter", "path": "contracts/payment/PaymentSplitter.sol", "label": "_totalShares", - "astId": 7584, + "astId": 7469, "type": "t_uint256", - "src": "540:28:106" + "src": "540:28:105" }, { "contract": "PaymentSplitter", "path": "contracts/payment/PaymentSplitter.sol", "label": "_totalReleased", - "astId": 7586, + "astId": 7471, "type": "t_uint256", - "src": "574:30:106" + "src": "574:30:105" }, { "contract": "PaymentSplitter", "path": "contracts/payment/PaymentSplitter.sol", "label": "_shares", - "astId": 7590, + "astId": 7475, "type": "t_mapping", - "src": "611:43:106" + "src": "611:43:105" }, { "contract": "PaymentSplitter", "path": "contracts/payment/PaymentSplitter.sol", "label": "_released", - "astId": 7594, + "astId": 7479, "type": "t_mapping", - "src": "660:45:106" + "src": "660:45:105" }, { "contract": "PaymentSplitter", "path": "contracts/payment/PaymentSplitter.sol", "label": "_payees", - "astId": 7597, + "astId": 7482, "type": "t_array:dyn", - "src": "711:25:106" + "src": "711:25:105" }, { "contract": "PaymentSplitter", "path": "contracts/payment/PaymentSplitter.sol", "label": "______gap", - "astId": 7843, + "astId": 7728, "type": "t_array:50", - "src": "3236:29:106" + "src": "3236:29:105" } ], "warnings": { @@ -278,15 +280,17 @@ "hasSelfDestruct": false, "hasDelegateCall": false, "hasInitialValuesInDeclarations": false, - "uninitializedBaseContracts": [] + "uninitializedBaseContracts": [], + "storageUncheckedVars": [], + "storageDiff": [] } }, "StandaloneERC20": { - "address": "0xa2fea790755520c180075a93f23db7784319939c", - "constructorCode": "608060405234801561001057600080fd5b5061305d806100206000396000f3fe", - "bodyBytecodeHash": "5eb490a2f0b8c96a6499d418a6f8ec91f83880601e10bfa3c4290ae1263e292c", - "localBytecodeHash": "8e02bcbf0d25ebd2f9919db40add667731526e5abdf6d90fd6c79c68f1364034", - "deployedBytecodeHash": "8e02bcbf0d25ebd2f9919db40add667731526e5abdf6d90fd6c79c68f1364034", + "address": "0x9ab10f1464e04cc5ad6c2f83ecab9d4ffd192181", + "constructorCode": "608060405234801561001057600080fd5b5061301a806100206000396000f3fe", + "bodyBytecodeHash": "be7d18748f6de2b2751faf66eafd9b205187fcf1378b9f8ae43df7b4454eed5c", + "localBytecodeHash": "ec88664e7121199b99dd457b1e8d02161fc2a7bc6d35453590ce8b9361bf30cd", + "deployedBytecodeHash": "ec88664e7121199b99dd457b1e8d02161fc2a7bc6d35453590ce8b9361bf30cd", "types": { "t_bool": { "id": "t_bool", @@ -346,89 +350,89 @@ "contract": "Initializable", "path": "zos-lib/contracts/Initializable.sol", "label": "initialized", - "astId": 11434, + "astId": 11337, "type": "t_bool", - "src": "757:24:139" + "src": "757:24:138" }, { "contract": "Initializable", "path": "zos-lib/contracts/Initializable.sol", "label": "initializing", - "astId": 11436, + "astId": 11339, "type": "t_bool", - "src": "876:25:139" + "src": "876:25:138" }, { "contract": "Initializable", "path": "zos-lib/contracts/Initializable.sol", "label": "______gap", - "astId": 11485, + "astId": 11388, "type": "t_array:50", - "src": "1891:29:139" + "src": "1891:29:138" }, { "contract": "ERC20Detailed", "path": "contracts/token/ERC20/ERC20Detailed.sol", "label": "_name", - "astId": 8827, + "astId": 8712, "type": "t_string", - "src": "382:20:114" + "src": "382:20:113" }, { "contract": "ERC20Detailed", "path": "contracts/token/ERC20/ERC20Detailed.sol", "label": "_symbol", - "astId": 8829, + "astId": 8714, "type": "t_string", - "src": "408:22:114" + "src": "408:22:113" }, { "contract": "ERC20Detailed", "path": "contracts/token/ERC20/ERC20Detailed.sol", "label": "_decimals", - "astId": 8831, + "astId": 8716, "type": "t_uint8", - "src": "436:23:114" + "src": "436:23:113" }, { "contract": "ERC20Detailed", "path": "contracts/token/ERC20/ERC20Detailed.sol", "label": "______gap", - "astId": 8883, + "astId": 8768, "type": "t_array:50", - "src": "1097:29:114" + "src": "1097:29:113" }, { "contract": "ERC20", "path": "contracts/token/ERC20/ERC20.sol", "label": "_balances", - "astId": 8282, + "astId": 8167, "type": "t_mapping", - "src": "774:46:111" + "src": "774:46:110" }, { "contract": "ERC20", "path": "contracts/token/ERC20/ERC20.sol", "label": "_allowed", - "astId": 8288, + "astId": 8173, "type": "t_mapping", - "src": "827:66:111" + "src": "827:66:110" }, { "contract": "ERC20", "path": "contracts/token/ERC20/ERC20.sol", "label": "_totalSupply", - "astId": 8290, + "astId": 8175, "type": "t_uint256", - "src": "900:28:111" + "src": "900:28:110" }, { "contract": "ERC20", "path": "contracts/token/ERC20/ERC20.sol", "label": "______gap", - "astId": 8704, + "astId": 8589, "type": "t_array:50", - "src": "7661:29:111" + "src": "7661:29:110" }, { "contract": "MinterRole", @@ -450,9 +454,9 @@ "contract": "ERC20Mintable", "path": "contracts/token/ERC20/ERC20Mintable.sol", "label": "______gap", - "astId": 8932, + "astId": 8817, "type": "t_array:50", - "src": "745:29:115" + "src": "745:29:114" }, { "contract": "PauserRole", @@ -474,25 +478,25 @@ "contract": "Pausable", "path": "contracts/lifecycle/Pausable.sol", "label": "_paused", - "astId": 3907, + "astId": 3792, "type": "t_bool", - "src": "352:20:34" + "src": "352:20:33" }, { "contract": "Pausable", "path": "contracts/lifecycle/Pausable.sol", "label": "______gap", - "astId": 3988, + "astId": 3873, "type": "t_array:50", - "src": "1429:29:34" + "src": "1429:29:33" }, { "contract": "ERC20Pausable", "path": "contracts/token/ERC20/ERC20Pausable.sol", "label": "______gap", - "astId": 9055, + "astId": 8940, "type": "t_array:50", - "src": "1195:29:116" + "src": "1195:29:115" } ], "warnings": { @@ -500,15 +504,34 @@ "hasSelfDestruct": false, "hasDelegateCall": false, "hasInitialValuesInDeclarations": false, - "uninitializedBaseContracts": [] + "uninitializedBaseContracts": [], + "storageUncheckedVars": [ + { + "contract": "MinterRole", + "path": "contracts/access/roles/MinterRole.sol", + "label": "_minters", + "astId": 231, + "type": "t_struct", + "src": "271:27:2" + }, + { + "contract": "PauserRole", + "path": "contracts/access/roles/PauserRole.sol", + "label": "_pausers", + "astId": 350, + "type": "t_struct", + "src": "271:27:3" + } + ], + "storageDiff": [] } }, "StandaloneERC721": { - "address": "0xf3f17c40bb1b0faad3a5e910d31665bba7c2cfdc", - "constructorCode": "608060405234801561001057600080fd5b50613b26806100206000396000f3fe", - "bodyBytecodeHash": "557fd20eddf815a94869bc83b1e74d2357c2ef4bdceaa5c831d6fc1e47433153", - "localBytecodeHash": "14ff23330545ddecfbe6c4d948cb6b1138857db21b815cbf381757e2beb101bb", - "deployedBytecodeHash": "14ff23330545ddecfbe6c4d948cb6b1138857db21b815cbf381757e2beb101bb", + "address": "0x841cef29b1f6279a0108679033f76806de57ab0b", + "constructorCode": "608060405234801561001057600080fd5b50613b05806100206000396000f3fe", + "bodyBytecodeHash": "3a40a1411748ef0f5dcec43eda779132b622099159a45fc63fa0e172234ff536", + "localBytecodeHash": "894223010b5e61c2baed12dcf3816a46257fe851ecf71e38952b1cfebd0560b3", + "deployedBytecodeHash": "894223010b5e61c2baed12dcf3816a46257fe851ecf71e38952b1cfebd0560b3", "types": { "t_bool": { "id": "t_bool", @@ -593,153 +616,153 @@ "contract": "Initializable", "path": "zos-lib/contracts/Initializable.sol", "label": "initialized", - "astId": 11434, + "astId": 11337, "type": "t_bool", - "src": "757:24:139" + "src": "757:24:138" }, { "contract": "Initializable", "path": "zos-lib/contracts/Initializable.sol", "label": "initializing", - "astId": 11436, + "astId": 11339, "type": "t_bool", - "src": "876:25:139" + "src": "876:25:138" }, { "contract": "Initializable", "path": "zos-lib/contracts/Initializable.sol", "label": "______gap", - "astId": 11485, + "astId": 11388, "type": "t_array:50", - "src": "1891:29:139" + "src": "1891:29:138" }, { "contract": "ERC165", "path": "contracts/introspection/ERC165.sol", "label": "_supportedInterfaces", - "astId": 3697, + "astId": 3582, "type": "t_mapping", - "src": "497:52:31" + "src": "497:52:30" }, { "contract": "ERC165", "path": "contracts/introspection/ERC165.sol", "label": "______gap", - "astId": 3741, + "astId": 3626, "type": "t_array:50", - "src": "1230:29:31" + "src": "1230:29:30" }, { "contract": "ERC721", "path": "contracts/token/ERC721/ERC721.sol", "label": "_tokenOwner", - "astId": 9600, + "astId": 9497, "type": "t_mapping", - "src": "774:48:121" + "src": "774:48:120" }, { "contract": "ERC721", "path": "contracts/token/ERC721/ERC721.sol", "label": "_tokenApprovals", - "astId": 9604, + "astId": 9501, "type": "t_mapping", - "src": "878:52:121" + "src": "878:52:120" }, { "contract": "ERC721", "path": "contracts/token/ERC721/ERC721.sol", "label": "_ownedTokensCount", - "astId": 9608, + "astId": 9505, "type": "t_mapping", - "src": "988:54:121" + "src": "988:54:120" }, { "contract": "ERC721", "path": "contracts/token/ERC721/ERC721.sol", "label": "_operatorApprovals", - "astId": 9614, + "astId": 9511, "type": "t_mapping", - "src": "1097:73:121" + "src": "1097:73:120" }, { "contract": "ERC721", "path": "contracts/token/ERC721/ERC721.sol", "label": "______gap", - "astId": 10155, + "astId": 10052, "type": "t_array:50", - "src": "11668:29:121" + "src": "11668:29:120" }, { "contract": "ERC721Enumerable", "path": "contracts/token/ERC721/ERC721Enumerable.sol", "label": "_ownedTokens", - "astId": 10206, + "astId": 10103, "type": "t_mapping>", - "src": "467:50:123" + "src": "467:50:122" }, { "contract": "ERC721Enumerable", "path": "contracts/token/ERC721/ERC721Enumerable.sol", "label": "_ownedTokensIndex", - "astId": 10210, + "astId": 10107, "type": "t_mapping", - "src": "587:53:123" + "src": "587:53:122" }, { "contract": "ERC721Enumerable", "path": "contracts/token/ERC721/ERC721Enumerable.sol", "label": "_allTokens", - "astId": 10213, + "astId": 10110, "type": "t_array:dyn", - "src": "701:28:123" + "src": "701:28:122" }, { "contract": "ERC721Enumerable", "path": "contracts/token/ERC721/ERC721Enumerable.sol", "label": "_allTokensIndex", - "astId": 10217, + "astId": 10114, "type": "t_mapping", - "src": "800:51:123" + "src": "800:51:122" }, { "contract": "ERC721Enumerable", "path": "contracts/token/ERC721/ERC721Enumerable.sol", "label": "______gap", - "astId": 10546, + "astId": 10443, "type": "t_array:50", - "src": "8814:29:123" + "src": "8814:29:122" }, { "contract": "ERC721Metadata", "path": "contracts/token/ERC721/ERC721Metadata.sol", "label": "_name", - "astId": 10630, + "astId": 10527, "type": "t_string", - "src": "266:20:126" + "src": "266:20:125" }, { "contract": "ERC721Metadata", "path": "contracts/token/ERC721/ERC721Metadata.sol", "label": "_symbol", - "astId": 10632, + "astId": 10529, "type": "t_string", - "src": "313:22:126" + "src": "313:22:125" }, { "contract": "ERC721Metadata", "path": "contracts/token/ERC721/ERC721Metadata.sol", "label": "_tokenURIs", - "astId": 10636, + "astId": 10533, "type": "t_mapping", - "src": "381:45:126" + "src": "381:45:125" }, { "contract": "ERC721Metadata", "path": "contracts/token/ERC721/ERC721Metadata.sol", "label": "______gap", - "astId": 10765, + "astId": 10662, "type": "t_array:50", - "src": "2824:29:126" + "src": "2824:29:125" }, { "contract": "MinterRole", @@ -761,9 +784,9 @@ "contract": "ERC721MetadataMintable", "path": "contracts/token/ERC721/ERC721MetadataMintable.sol", "label": "______gap", - "astId": 10835, + "astId": 10732, "type": "t_array:50", - "src": "1040:29:127" + "src": "1040:29:126" }, { "contract": "PauserRole", @@ -785,25 +808,25 @@ "contract": "Pausable", "path": "contracts/lifecycle/Pausable.sol", "label": "_paused", - "astId": 3907, + "astId": 3792, "type": "t_bool", - "src": "352:20:34" + "src": "352:20:33" }, { "contract": "Pausable", "path": "contracts/lifecycle/Pausable.sol", "label": "______gap", - "astId": 3988, + "astId": 3873, "type": "t_array:50", - "src": "1429:29:34" + "src": "1429:29:33" }, { "contract": "ERC721Pausable", "path": "contracts/token/ERC721/ERC721Pausable.sol", "label": "______gap", - "astId": 10980, + "astId": 10877, "type": "t_array:50", - "src": "851:29:129" + "src": "851:29:128" } ], "warnings": { @@ -811,7 +834,26 @@ "hasSelfDestruct": false, "hasDelegateCall": false, "hasInitialValuesInDeclarations": false, - "uninitializedBaseContracts": [] + "uninitializedBaseContracts": [], + "storageUncheckedVars": [ + { + "contract": "MinterRole", + "path": "contracts/access/roles/MinterRole.sol", + "label": "_minters", + "astId": 231, + "type": "t_struct", + "src": "271:27:2" + }, + { + "contract": "PauserRole", + "path": "contracts/access/roles/PauserRole.sol", + "label": "_pausers", + "astId": 350, + "type": "t_struct", + "src": "271:27:3" + } + ], + "storageDiff": [] } } }, @@ -826,7 +868,7 @@ "address": "0xa44bb80b290de8a465d17b14269df53cf0b9bf4f" }, "provider": { - "address": "0x1c641456a5bb5e1492a3812a14e107df9785b5d7" + "address": "0x0cfd95d540eb7534de49f391a0aaf51e1448b692" }, - "version": "2.1.2" + "version": "2.1.3" } \ No newline at end of file diff --git a/zos.ropsten.json b/zos.ropsten.json index 927a62f41..a5695b096 100644 --- a/zos.ropsten.json +++ b/zos.ropsten.json @@ -1,389 +1,11 @@ { "contracts": { - "StandaloneERC20": { - "address": "0x7f9eba91b306a8a7c5ef4148972b8f01f491954f", - "constructorCode": "608060405234801561001057600080fd5b5061305d806100206000396000f3fe", - "bodyBytecodeHash": "5eb490a2f0b8c96a6499d418a6f8ec91f83880601e10bfa3c4290ae1263e292c", - "localBytecodeHash": "8e02bcbf0d25ebd2f9919db40add667731526e5abdf6d90fd6c79c68f1364034", - "deployedBytecodeHash": "8e02bcbf0d25ebd2f9919db40add667731526e5abdf6d90fd6c79c68f1364034", - "types": { - "t_bool": { - "id": "t_bool", - "kind": "elementary", - "label": "bool" - }, - "t_uint256": { - "id": "t_uint256", - "kind": "elementary", - "label": "uint256" - }, - "t_array:50": { - "id": "t_array:50", - "valueType": "t_uint256", - "length": "50", - "kind": "array", - "label": "uint256[50]" - }, - "t_string": { - "id": "t_string", - "kind": "elementary", - "label": "string" - }, - "t_uint8": { - "id": "t_uint8", - "kind": "elementary", - "label": "uint8" - }, - "t_mapping": { - "id": "t_mapping", - "valueType": "t_uint256", - "label": "mapping(key => uint256)", - "kind": "mapping" - }, - "t_struct": { - "id": "t_struct", - "kind": "struct", - "label": "Roles.Role", - "members": [ - { - "label": "bearer", - "astId": 5, - "type": "t_mapping", - "src": "150:32:0" - } - ] - }, - "t_mapping": { - "id": "t_mapping", - "valueType": "t_bool", - "label": "mapping(key => bool)", - "kind": "mapping" - } - }, - "storage": [ - { - "contract": "Initializable", - "path": "zos-lib/contracts/Initializable.sol", - "label": "initialized", - "astId": 11434, - "type": "t_bool", - "src": "757:24:139" - }, - { - "contract": "Initializable", - "path": "zos-lib/contracts/Initializable.sol", - "label": "initializing", - "astId": 11436, - "type": "t_bool", - "src": "876:25:139" - }, - { - "contract": "Initializable", - "path": "zos-lib/contracts/Initializable.sol", - "label": "______gap", - "astId": 11485, - "type": "t_array:50", - "src": "1891:29:139" - }, - { - "contract": "ERC20Detailed", - "path": "contracts/token/ERC20/ERC20Detailed.sol", - "label": "_name", - "astId": 8827, - "type": "t_string", - "src": "382:20:114" - }, - { - "contract": "ERC20Detailed", - "path": "contracts/token/ERC20/ERC20Detailed.sol", - "label": "_symbol", - "astId": 8829, - "type": "t_string", - "src": "408:22:114" - }, - { - "contract": "ERC20Detailed", - "path": "contracts/token/ERC20/ERC20Detailed.sol", - "label": "_decimals", - "astId": 8831, - "type": "t_uint8", - "src": "436:23:114" - }, - { - "contract": "ERC20Detailed", - "path": "contracts/token/ERC20/ERC20Detailed.sol", - "label": "______gap", - "astId": 8883, - "type": "t_array:50", - "src": "1097:29:114" - }, - { - "contract": "ERC20", - "path": "contracts/token/ERC20/ERC20.sol", - "label": "_balances", - "astId": 8282, - "type": "t_mapping", - "src": "774:46:111" - }, - { - "contract": "ERC20", - "path": "contracts/token/ERC20/ERC20.sol", - "label": "_allowed", - "astId": 8288, - "type": "t_mapping", - "src": "827:66:111" - }, - { - "contract": "ERC20", - "path": "contracts/token/ERC20/ERC20.sol", - "label": "_totalSupply", - "astId": 8290, - "type": "t_uint256", - "src": "900:28:111" - }, - { - "contract": "ERC20", - "path": "contracts/token/ERC20/ERC20.sol", - "label": "______gap", - "astId": 8704, - "type": "t_array:50", - "src": "7661:29:111" - }, - { - "contract": "MinterRole", - "path": "contracts/access/roles/MinterRole.sol", - "label": "_minters", - "astId": 231, - "type": "t_struct", - "src": "271:27:2" - }, - { - "contract": "MinterRole", - "path": "contracts/access/roles/MinterRole.sol", - "label": "______gap", - "astId": 330, - "type": "t_array:50", - "src": "1081:29:2" - }, - { - "contract": "ERC20Mintable", - "path": "contracts/token/ERC20/ERC20Mintable.sol", - "label": "______gap", - "astId": 8932, - "type": "t_array:50", - "src": "745:29:115" - }, - { - "contract": "PauserRole", - "path": "contracts/access/roles/PauserRole.sol", - "label": "_pausers", - "astId": 350, - "type": "t_struct", - "src": "271:27:3" - }, - { - "contract": "PauserRole", - "path": "contracts/access/roles/PauserRole.sol", - "label": "______gap", - "astId": 449, - "type": "t_array:50", - "src": "1081:29:3" - }, - { - "contract": "Pausable", - "path": "contracts/lifecycle/Pausable.sol", - "label": "_paused", - "astId": 3907, - "type": "t_bool", - "src": "352:20:34" - }, - { - "contract": "Pausable", - "path": "contracts/lifecycle/Pausable.sol", - "label": "______gap", - "astId": 3988, - "type": "t_array:50", - "src": "1429:29:34" - }, - { - "contract": "ERC20Pausable", - "path": "contracts/token/ERC20/ERC20Pausable.sol", - "label": "______gap", - "astId": 9055, - "type": "t_array:50", - "src": "1195:29:116" - } - ], - "warnings": { - "hasConstructor": false, - "hasSelfDestruct": false, - "hasDelegateCall": false, - "hasInitialValuesInDeclarations": false, - "uninitializedBaseContracts": [] - } - }, - "TokenVesting": { - "address": "0xa6a0b46b79a16fb9cb9981a530468ed8fa48d8dd", - "constructorCode": "608060405234801561001057600080fd5b506114f6806100206000396000f3fe", - "bodyBytecodeHash": "c073eddd6c79d523b1928939c82f8095399ad0171bb069ad387f26b7367f18fc", - "localBytecodeHash": "ec2e949079798b2b0314d7f09a2022185da072ee9dc5c6c660655b70d69e5acd", - "deployedBytecodeHash": "ec2e949079798b2b0314d7f09a2022185da072ee9dc5c6c660655b70d69e5acd", - "types": { - "t_bool": { - "id": "t_bool", - "kind": "elementary", - "label": "bool" - }, - "t_uint256": { - "id": "t_uint256", - "kind": "elementary", - "label": "uint256" - }, - "t_array:50": { - "id": "t_array:50", - "valueType": "t_uint256", - "length": "50", - "kind": "array", - "label": "uint256[50]" - }, - "t_address": { - "id": "t_address", - "kind": "elementary", - "label": "address" - }, - "t_mapping": { - "id": "t_mapping", - "valueType": "t_uint256", - "label": "mapping(key => uint256)", - "kind": "mapping" - }, - "t_mapping": { - "id": "t_mapping", - "valueType": "t_bool", - "label": "mapping(key => bool)", - "kind": "mapping" - } - }, - "storage": [ - { - "contract": "Initializable", - "path": "zos-lib/contracts/Initializable.sol", - "label": "initialized", - "astId": 11434, - "type": "t_bool", - "src": "757:24:139" - }, - { - "contract": "Initializable", - "path": "zos-lib/contracts/Initializable.sol", - "label": "initializing", - "astId": 11436, - "type": "t_bool", - "src": "876:25:139" - }, - { - "contract": "Initializable", - "path": "zos-lib/contracts/Initializable.sol", - "label": "______gap", - "astId": 11485, - "type": "t_array:50", - "src": "1891:29:139" - }, - { - "contract": "Ownable", - "path": "contracts/ownership/Ownable.sol", - "label": "_owner", - "astId": 7368, - "type": "t_address", - "src": "302:22:104" - }, - { - "contract": "Ownable", - "path": "contracts/ownership/Ownable.sol", - "label": "______gap", - "astId": 7479, - "type": "t_array:50", - "src": "2186:29:104" - }, - { - "contract": "TokenVesting", - "path": "contracts/drafts/TokenVesting.sol", - "label": "_beneficiary", - "astId": 3048, - "type": "t_address", - "src": "1133:28:27" - }, - { - "contract": "TokenVesting", - "path": "contracts/drafts/TokenVesting.sol", - "label": "_cliff", - "astId": 3050, - "type": "t_uint256", - "src": "1263:22:27" - }, - { - "contract": "TokenVesting", - "path": "contracts/drafts/TokenVesting.sol", - "label": "_start", - "astId": 3052, - "type": "t_uint256", - "src": "1291:22:27" - }, - { - "contract": "TokenVesting", - "path": "contracts/drafts/TokenVesting.sol", - "label": "_duration", - "astId": 3054, - "type": "t_uint256", - "src": "1319:25:27" - }, - { - "contract": "TokenVesting", - "path": "contracts/drafts/TokenVesting.sol", - "label": "_revocable", - "astId": 3056, - "type": "t_bool", - "src": "1351:23:27" - }, - { - "contract": "TokenVesting", - "path": "contracts/drafts/TokenVesting.sol", - "label": "_released", - "astId": 3060, - "type": "t_mapping", - "src": "1381:46:27" - }, - { - "contract": "TokenVesting", - "path": "contracts/drafts/TokenVesting.sol", - "label": "_revoked", - "astId": 3064, - "type": "t_mapping", - "src": "1433:42:27" - }, - { - "contract": "TokenVesting", - "path": "contracts/drafts/TokenVesting.sol", - "label": "______gap", - "astId": 3406, - "type": "t_array:50", - "src": "5837:29:27" - } - ], - "warnings": { - "hasConstructor": false, - "hasSelfDestruct": false, - "hasDelegateCall": false, - "hasInitialValuesInDeclarations": false, - "uninitializedBaseContracts": [] - } - }, "StandaloneERC721": { - "address": "0x5eb264d295c7158c631b281a4d517fd2202ed048", - "constructorCode": "608060405234801561001057600080fd5b50613b26806100206000396000f3fe", - "bodyBytecodeHash": "557fd20eddf815a94869bc83b1e74d2357c2ef4bdceaa5c831d6fc1e47433153", - "localBytecodeHash": "14ff23330545ddecfbe6c4d948cb6b1138857db21b815cbf381757e2beb101bb", - "deployedBytecodeHash": "14ff23330545ddecfbe6c4d948cb6b1138857db21b815cbf381757e2beb101bb", + "address": "0xfa34faca4398d04a7b3d9488700cf699c60c8976", + "constructorCode": "608060405234801561001057600080fd5b50613b05806100206000396000f3fe", + "bodyBytecodeHash": "3a40a1411748ef0f5dcec43eda779132b622099159a45fc63fa0e172234ff536", + "localBytecodeHash": "894223010b5e61c2baed12dcf3816a46257fe851ecf71e38952b1cfebd0560b3", + "deployedBytecodeHash": "894223010b5e61c2baed12dcf3816a46257fe851ecf71e38952b1cfebd0560b3", "types": { "t_bool": { "id": "t_bool", @@ -468,153 +90,153 @@ "contract": "Initializable", "path": "zos-lib/contracts/Initializable.sol", "label": "initialized", - "astId": 11434, + "astId": 11320, "type": "t_bool", - "src": "757:24:139" + "src": "757:24:138" }, { "contract": "Initializable", "path": "zos-lib/contracts/Initializable.sol", "label": "initializing", - "astId": 11436, + "astId": 11322, "type": "t_bool", - "src": "876:25:139" + "src": "876:25:138" }, { "contract": "Initializable", "path": "zos-lib/contracts/Initializable.sol", "label": "______gap", - "astId": 11485, + "astId": 11371, "type": "t_array:50", - "src": "1891:29:139" + "src": "1891:29:138" }, { "contract": "ERC165", "path": "contracts/introspection/ERC165.sol", "label": "_supportedInterfaces", - "astId": 3697, + "astId": 3582, "type": "t_mapping", - "src": "497:52:31" + "src": "497:52:30" }, { "contract": "ERC165", "path": "contracts/introspection/ERC165.sol", "label": "______gap", - "astId": 3741, + "astId": 3626, "type": "t_array:50", - "src": "1230:29:31" + "src": "1230:29:30" }, { "contract": "ERC721", "path": "contracts/token/ERC721/ERC721.sol", "label": "_tokenOwner", - "astId": 9600, + "astId": 9497, "type": "t_mapping", - "src": "774:48:121" + "src": "774:48:120" }, { "contract": "ERC721", "path": "contracts/token/ERC721/ERC721.sol", "label": "_tokenApprovals", - "astId": 9604, + "astId": 9501, "type": "t_mapping", - "src": "878:52:121" + "src": "878:52:120" }, { "contract": "ERC721", "path": "contracts/token/ERC721/ERC721.sol", "label": "_ownedTokensCount", - "astId": 9608, + "astId": 9505, "type": "t_mapping", - "src": "988:54:121" + "src": "988:54:120" }, { "contract": "ERC721", "path": "contracts/token/ERC721/ERC721.sol", "label": "_operatorApprovals", - "astId": 9614, + "astId": 9511, "type": "t_mapping", - "src": "1097:73:121" + "src": "1097:73:120" }, { "contract": "ERC721", "path": "contracts/token/ERC721/ERC721.sol", "label": "______gap", - "astId": 10155, + "astId": 10052, "type": "t_array:50", - "src": "11668:29:121" + "src": "11668:29:120" }, { "contract": "ERC721Enumerable", "path": "contracts/token/ERC721/ERC721Enumerable.sol", "label": "_ownedTokens", - "astId": 10206, + "astId": 10103, "type": "t_mapping>", - "src": "467:50:123" + "src": "467:50:122" }, { "contract": "ERC721Enumerable", "path": "contracts/token/ERC721/ERC721Enumerable.sol", "label": "_ownedTokensIndex", - "astId": 10210, + "astId": 10107, "type": "t_mapping", - "src": "587:53:123" + "src": "587:53:122" }, { "contract": "ERC721Enumerable", "path": "contracts/token/ERC721/ERC721Enumerable.sol", "label": "_allTokens", - "astId": 10213, + "astId": 10110, "type": "t_array:dyn", - "src": "701:28:123" + "src": "701:28:122" }, { "contract": "ERC721Enumerable", "path": "contracts/token/ERC721/ERC721Enumerable.sol", "label": "_allTokensIndex", - "astId": 10217, + "astId": 10114, "type": "t_mapping", - "src": "800:51:123" + "src": "800:51:122" }, { "contract": "ERC721Enumerable", "path": "contracts/token/ERC721/ERC721Enumerable.sol", "label": "______gap", - "astId": 10546, + "astId": 10443, "type": "t_array:50", - "src": "8814:29:123" + "src": "8814:29:122" }, { "contract": "ERC721Metadata", "path": "contracts/token/ERC721/ERC721Metadata.sol", "label": "_name", - "astId": 10630, + "astId": 10510, "type": "t_string", - "src": "266:20:126" + "src": "266:20:125" }, { "contract": "ERC721Metadata", "path": "contracts/token/ERC721/ERC721Metadata.sol", "label": "_symbol", - "astId": 10632, + "astId": 10512, "type": "t_string", - "src": "313:22:126" + "src": "313:22:125" }, { "contract": "ERC721Metadata", "path": "contracts/token/ERC721/ERC721Metadata.sol", "label": "_tokenURIs", - "astId": 10636, + "astId": 10516, "type": "t_mapping", - "src": "381:45:126" + "src": "381:45:125" }, { "contract": "ERC721Metadata", "path": "contracts/token/ERC721/ERC721Metadata.sol", "label": "______gap", - "astId": 10765, + "astId": 10645, "type": "t_array:50", - "src": "2824:29:126" + "src": "2824:29:125" }, { "contract": "MinterRole", @@ -636,9 +258,9 @@ "contract": "ERC721MetadataMintable", "path": "contracts/token/ERC721/ERC721MetadataMintable.sol", "label": "______gap", - "astId": 10835, + "astId": 10715, "type": "t_array:50", - "src": "1040:29:127" + "src": "1040:29:126" }, { "contract": "PauserRole", @@ -660,25 +282,25 @@ "contract": "Pausable", "path": "contracts/lifecycle/Pausable.sol", "label": "_paused", - "astId": 3907, + "astId": 3792, "type": "t_bool", - "src": "352:20:34" + "src": "352:20:33" }, { "contract": "Pausable", "path": "contracts/lifecycle/Pausable.sol", "label": "______gap", - "astId": 3988, + "astId": 3873, "type": "t_array:50", - "src": "1429:29:34" + "src": "1429:29:33" }, { "contract": "ERC721Pausable", "path": "contracts/token/ERC721/ERC721Pausable.sol", "label": "______gap", - "astId": 10980, + "astId": 10860, "type": "t_array:50", - "src": "851:29:129" + "src": "851:29:128" } ], "warnings": { @@ -686,11 +308,188 @@ "hasSelfDestruct": false, "hasDelegateCall": false, "hasInitialValuesInDeclarations": false, - "uninitializedBaseContracts": [] + "uninitializedBaseContracts": [], + "storageUncheckedVars": [ + { + "contract": "MinterRole", + "path": "contracts/access/roles/MinterRole.sol", + "label": "_minters", + "astId": 231, + "type": "t_struct", + "src": "271:27:2" + }, + { + "contract": "PauserRole", + "path": "contracts/access/roles/PauserRole.sol", + "label": "_pausers", + "astId": 350, + "type": "t_struct", + "src": "271:27:3" + } + ], + "storageDiff": [] + } + }, + "TokenVesting": { + "address": "0xbd829646470cd55771e8e279910e6c7f74d5dc4e", + "constructorCode": "608060405234801561001057600080fd5b506114f6806100206000396000f3fe", + "bodyBytecodeHash": "c073eddd6c79d523b1928939c82f8095399ad0171bb069ad387f26b7367f18fc", + "localBytecodeHash": "ec2e949079798b2b0314d7f09a2022185da072ee9dc5c6c660655b70d69e5acd", + "deployedBytecodeHash": "ec2e949079798b2b0314d7f09a2022185da072ee9dc5c6c660655b70d69e5acd", + "types": { + "t_bool": { + "id": "t_bool", + "kind": "elementary", + "label": "bool" + }, + "t_uint256": { + "id": "t_uint256", + "kind": "elementary", + "label": "uint256" + }, + "t_array:50": { + "id": "t_array:50", + "valueType": "t_uint256", + "length": "50", + "kind": "array", + "label": "uint256[50]" + }, + "t_address": { + "id": "t_address", + "kind": "elementary", + "label": "address" + }, + "t_mapping": { + "id": "t_mapping", + "valueType": "t_uint256", + "label": "mapping(key => uint256)", + "kind": "mapping" + }, + "t_mapping": { + "id": "t_mapping", + "valueType": "t_bool", + "label": "mapping(key => bool)", + "kind": "mapping" + } + }, + "storage": [ + { + "contract": "Initializable", + "path": "zos-lib/contracts/Initializable.sol", + "label": "initialized", + "astId": 11320, + "type": "t_bool", + "src": "757:24:138" + }, + { + "contract": "Initializable", + "path": "zos-lib/contracts/Initializable.sol", + "label": "initializing", + "astId": 11322, + "type": "t_bool", + "src": "876:25:138" + }, + { + "contract": "Initializable", + "path": "zos-lib/contracts/Initializable.sol", + "label": "______gap", + "astId": 11371, + "type": "t_array:50", + "src": "1891:29:138" + }, + { + "contract": "Ownable", + "path": "contracts/ownership/Ownable.sol", + "label": "_owner", + "astId": 7253, + "type": "t_address", + "src": "302:22:103" + }, + { + "contract": "Ownable", + "path": "contracts/ownership/Ownable.sol", + "label": "______gap", + "astId": 7364, + "type": "t_array:50", + "src": "2186:29:103" + }, + { + "contract": "TokenVesting", + "path": "contracts/drafts/TokenVesting.sol", + "label": "_beneficiary", + "astId": 3048, + "type": "t_address", + "src": "1133:28:27" + }, + { + "contract": "TokenVesting", + "path": "contracts/drafts/TokenVesting.sol", + "label": "_cliff", + "astId": 3050, + "type": "t_uint256", + "src": "1263:22:27" + }, + { + "contract": "TokenVesting", + "path": "contracts/drafts/TokenVesting.sol", + "label": "_start", + "astId": 3052, + "type": "t_uint256", + "src": "1291:22:27" + }, + { + "contract": "TokenVesting", + "path": "contracts/drafts/TokenVesting.sol", + "label": "_duration", + "astId": 3054, + "type": "t_uint256", + "src": "1319:25:27" + }, + { + "contract": "TokenVesting", + "path": "contracts/drafts/TokenVesting.sol", + "label": "_revocable", + "astId": 3056, + "type": "t_bool", + "src": "1351:23:27" + }, + { + "contract": "TokenVesting", + "path": "contracts/drafts/TokenVesting.sol", + "label": "_released", + "astId": 3060, + "type": "t_mapping", + "src": "1381:46:27" + }, + { + "contract": "TokenVesting", + "path": "contracts/drafts/TokenVesting.sol", + "label": "_revoked", + "astId": 3064, + "type": "t_mapping", + "src": "1433:42:27" + }, + { + "contract": "TokenVesting", + "path": "contracts/drafts/TokenVesting.sol", + "label": "______gap", + "astId": 3406, + "type": "t_array:50", + "src": "5837:29:27" + } + ], + "warnings": { + "hasConstructor": false, + "hasSelfDestruct": false, + "hasDelegateCall": false, + "hasInitialValuesInDeclarations": false, + "uninitializedBaseContracts": [], + "storageUncheckedVars": [], + "storageDiff": [] } }, "PaymentSplitter": { - "address": "0x7eab3ec3ad50a34552f93fca05259f50dcbf56ae", + "address": "0x86c6c2ca04023f2f55cb0024d4bf91acd222e119", "constructorCode": "608060405234801561001057600080fd5b50610c22806100206000396000f3fe", "bodyBytecodeHash": "e207c0c86e8e619a29af7b55615bb483a5459eb42dcce825db3b050133381561", "localBytecodeHash": "104fd29be6e97bf49f2dd3654bff1bd57279f3da56ba3e8207704c481851642d", @@ -737,73 +536,73 @@ "contract": "Initializable", "path": "zos-lib/contracts/Initializable.sol", "label": "initialized", - "astId": 11434, + "astId": 11320, "type": "t_bool", - "src": "757:24:139" + "src": "757:24:138" }, { "contract": "Initializable", "path": "zos-lib/contracts/Initializable.sol", "label": "initializing", - "astId": 11436, + "astId": 11322, "type": "t_bool", - "src": "876:25:139" + "src": "876:25:138" }, { "contract": "Initializable", "path": "zos-lib/contracts/Initializable.sol", "label": "______gap", - "astId": 11485, + "astId": 11371, "type": "t_array:50", - "src": "1891:29:139" + "src": "1891:29:138" }, { "contract": "PaymentSplitter", "path": "contracts/payment/PaymentSplitter.sol", "label": "_totalShares", - "astId": 7584, + "astId": 7469, "type": "t_uint256", - "src": "540:28:106" + "src": "540:28:105" }, { "contract": "PaymentSplitter", "path": "contracts/payment/PaymentSplitter.sol", "label": "_totalReleased", - "astId": 7586, + "astId": 7471, "type": "t_uint256", - "src": "574:30:106" + "src": "574:30:105" }, { "contract": "PaymentSplitter", "path": "contracts/payment/PaymentSplitter.sol", "label": "_shares", - "astId": 7590, + "astId": 7475, "type": "t_mapping", - "src": "611:43:106" + "src": "611:43:105" }, { "contract": "PaymentSplitter", "path": "contracts/payment/PaymentSplitter.sol", "label": "_released", - "astId": 7594, + "astId": 7479, "type": "t_mapping", - "src": "660:45:106" + "src": "660:45:105" }, { "contract": "PaymentSplitter", "path": "contracts/payment/PaymentSplitter.sol", "label": "_payees", - "astId": 7597, + "astId": 7482, "type": "t_array:dyn", - "src": "711:25:106" + "src": "711:25:105" }, { "contract": "PaymentSplitter", "path": "contracts/payment/PaymentSplitter.sol", "label": "______gap", - "astId": 7843, + "astId": 7728, "type": "t_array:50", - "src": "3236:29:106" + "src": "3236:29:105" } ], "warnings": { @@ -811,7 +610,250 @@ "hasSelfDestruct": false, "hasDelegateCall": false, "hasInitialValuesInDeclarations": false, - "uninitializedBaseContracts": [] + "uninitializedBaseContracts": [], + "storageUncheckedVars": [], + "storageDiff": [] + } + }, + "StandaloneERC20": { + "address": "0x4831f06a71bc782e890fdae4d79913f97bb7ee6f", + "constructorCode": "608060405234801561001057600080fd5b5061301a806100206000396000f3fe", + "bodyBytecodeHash": "be7d18748f6de2b2751faf66eafd9b205187fcf1378b9f8ae43df7b4454eed5c", + "localBytecodeHash": "ec88664e7121199b99dd457b1e8d02161fc2a7bc6d35453590ce8b9361bf30cd", + "deployedBytecodeHash": "ec88664e7121199b99dd457b1e8d02161fc2a7bc6d35453590ce8b9361bf30cd", + "types": { + "t_bool": { + "id": "t_bool", + "kind": "elementary", + "label": "bool" + }, + "t_uint256": { + "id": "t_uint256", + "kind": "elementary", + "label": "uint256" + }, + "t_array:50": { + "id": "t_array:50", + "valueType": "t_uint256", + "length": "50", + "kind": "array", + "label": "uint256[50]" + }, + "t_string": { + "id": "t_string", + "kind": "elementary", + "label": "string" + }, + "t_uint8": { + "id": "t_uint8", + "kind": "elementary", + "label": "uint8" + }, + "t_mapping": { + "id": "t_mapping", + "valueType": "t_uint256", + "label": "mapping(key => uint256)", + "kind": "mapping" + }, + "t_struct": { + "id": "t_struct", + "kind": "struct", + "label": "Roles.Role", + "members": [ + { + "label": "bearer", + "astId": 5, + "type": "t_mapping", + "src": "150:32:0" + } + ] + }, + "t_mapping": { + "id": "t_mapping", + "valueType": "t_bool", + "label": "mapping(key => bool)", + "kind": "mapping" + } + }, + "storage": [ + { + "contract": "Initializable", + "path": "zos-lib/contracts/Initializable.sol", + "label": "initialized", + "astId": 11320, + "type": "t_bool", + "src": "757:24:138" + }, + { + "contract": "Initializable", + "path": "zos-lib/contracts/Initializable.sol", + "label": "initializing", + "astId": 11322, + "type": "t_bool", + "src": "876:25:138" + }, + { + "contract": "Initializable", + "path": "zos-lib/contracts/Initializable.sol", + "label": "______gap", + "astId": 11371, + "type": "t_array:50", + "src": "1891:29:138" + }, + { + "contract": "ERC20Detailed", + "path": "contracts/token/ERC20/ERC20Detailed.sol", + "label": "_name", + "astId": 8712, + "type": "t_string", + "src": "382:20:113" + }, + { + "contract": "ERC20Detailed", + "path": "contracts/token/ERC20/ERC20Detailed.sol", + "label": "_symbol", + "astId": 8714, + "type": "t_string", + "src": "408:22:113" + }, + { + "contract": "ERC20Detailed", + "path": "contracts/token/ERC20/ERC20Detailed.sol", + "label": "_decimals", + "astId": 8716, + "type": "t_uint8", + "src": "436:23:113" + }, + { + "contract": "ERC20Detailed", + "path": "contracts/token/ERC20/ERC20Detailed.sol", + "label": "______gap", + "astId": 8768, + "type": "t_array:50", + "src": "1097:29:113" + }, + { + "contract": "ERC20", + "path": "contracts/token/ERC20/ERC20.sol", + "label": "_balances", + "astId": 8167, + "type": "t_mapping", + "src": "774:46:110" + }, + { + "contract": "ERC20", + "path": "contracts/token/ERC20/ERC20.sol", + "label": "_allowed", + "astId": 8173, + "type": "t_mapping", + "src": "827:66:110" + }, + { + "contract": "ERC20", + "path": "contracts/token/ERC20/ERC20.sol", + "label": "_totalSupply", + "astId": 8175, + "type": "t_uint256", + "src": "900:28:110" + }, + { + "contract": "ERC20", + "path": "contracts/token/ERC20/ERC20.sol", + "label": "______gap", + "astId": 8589, + "type": "t_array:50", + "src": "7661:29:110" + }, + { + "contract": "MinterRole", + "path": "contracts/access/roles/MinterRole.sol", + "label": "_minters", + "astId": 231, + "type": "t_struct", + "src": "271:27:2" + }, + { + "contract": "MinterRole", + "path": "contracts/access/roles/MinterRole.sol", + "label": "______gap", + "astId": 330, + "type": "t_array:50", + "src": "1081:29:2" + }, + { + "contract": "ERC20Mintable", + "path": "contracts/token/ERC20/ERC20Mintable.sol", + "label": "______gap", + "astId": 8817, + "type": "t_array:50", + "src": "745:29:114" + }, + { + "contract": "PauserRole", + "path": "contracts/access/roles/PauserRole.sol", + "label": "_pausers", + "astId": 350, + "type": "t_struct", + "src": "271:27:3" + }, + { + "contract": "PauserRole", + "path": "contracts/access/roles/PauserRole.sol", + "label": "______gap", + "astId": 449, + "type": "t_array:50", + "src": "1081:29:3" + }, + { + "contract": "Pausable", + "path": "contracts/lifecycle/Pausable.sol", + "label": "_paused", + "astId": 3792, + "type": "t_bool", + "src": "352:20:33" + }, + { + "contract": "Pausable", + "path": "contracts/lifecycle/Pausable.sol", + "label": "______gap", + "astId": 3873, + "type": "t_array:50", + "src": "1429:29:33" + }, + { + "contract": "ERC20Pausable", + "path": "contracts/token/ERC20/ERC20Pausable.sol", + "label": "______gap", + "astId": 8940, + "type": "t_array:50", + "src": "1195:29:115" + } + ], + "warnings": { + "hasConstructor": false, + "hasSelfDestruct": false, + "hasDelegateCall": false, + "hasInitialValuesInDeclarations": false, + "uninitializedBaseContracts": [], + "storageUncheckedVars": [ + { + "contract": "MinterRole", + "path": "contracts/access/roles/MinterRole.sol", + "label": "_minters", + "astId": 231, + "type": "t_struct", + "src": "271:27:2" + }, + { + "contract": "PauserRole", + "path": "contracts/access/roles/PauserRole.sol", + "label": "_pausers", + "astId": 350, + "type": "t_struct", + "src": "271:27:3" + } + ], + "storageDiff": [] } } }, @@ -826,7 +868,7 @@ "address": "0x2a9e7b63514438906a83a1e320dbbd814d417002" }, "provider": { - "address": "0x19f38a6d939f7fd01008d8d398e43a3cc7610a71" + "address": "0xeca44e6485ba34c5d055bc88370062bd6dfa893e" }, - "version": "2.1.2" + "version": "2.1.3" } \ No newline at end of file