diff --git a/lib/contracts/code_generator.js b/lib/contracts/code_generator.js index 0a27d06ab..6ab462e5a 100644 --- a/lib/contracts/code_generator.js +++ b/lib/contracts/code_generator.js @@ -281,7 +281,7 @@ class CodeGenerator { function getWeb3Location(next) { self.events.request("version:get:web3", function(web3Version) { if (web3Version === "1.0.0-beta") { - return next(null, utils.joinPath(fs.embarkPath("js/web3-1.0.min.js"))); + return next(null, fs.embarkPath("js/web3-1.0.min.js")); } else { self.events.request("version:getPackageLocation", "web3", web3Version, function(err, location) { return next(null, fs.dappPath(location)); @@ -308,9 +308,8 @@ class CodeGenerator { next(); }, function writeFile(next) { - let filePath = utils.joinPath(fs.dappPath(), ".embark", 'embark.js'); - fs.mkdirpSync(utils.joinPath(fs.dappPath(), ".embark")); - fs.writeFileSync(filePath, code); + fs.mkdirpSync(fs.dappPath(".embark")); + fs.writeFileSync(fs.dappPath(".embark", 'embark.js'), code); next(); } ], function(_err, _result) { diff --git a/lib/core/fs.js b/lib/core/fs.js index 7ce3516ad..7a9212694 100644 --- a/lib/core/fs.js +++ b/lib/core/fs.js @@ -50,8 +50,8 @@ function embarkPath(fileOrDir) { return utils.joinPath(__dirname, '/../../', fileOrDir); } -function dappPath(path) { - return utils.joinPath(utils.pwd(), path || ""); +function dappPath() { + return utils.joinPath(utils.pwd(), ...arguments); } module.exports = { diff --git a/lib/pipeline/pipeline.js b/lib/pipeline/pipeline.js index e644bff8f..aab83f5f1 100644 --- a/lib/pipeline/pipeline.js +++ b/lib/pipeline/pipeline.js @@ -36,11 +36,8 @@ class Pipeline { if (file.filename.indexOf('.js') >= 0) { let importsList = {}; - //importsList["Embark/EmbarkJS"] = fs.embarkPath("js/embark.js"); - - importsList["Embark/EmbarkJS"] = utils.joinPath(fs.dappPath(), ".embark", 'embark.js'); - importsList["Embark/web3"] = utils.joinPath(fs.dappPath(), ".embark", 'web3_instance.js'); - importsList["Embark/contracts/SimpleStorage"] = utils.joinPath(fs.dappPath(), ".embark", 'SimpleStorage.js'); + importsList["Embark/EmbarkJS"] = fs.dappPath(".embark", 'embark.js'); + importsList["Embark/web3"] = fs.dappPath(".embark", 'web3_instance.js'); self.plugins.getPluginsProperty('imports', 'imports').forEach(function (importObject) { let [importName, importLocation] = importObject; @@ -49,7 +46,7 @@ class Pipeline { for (let contractName in contractsJSON) { let contractCode = self.buildContractJS(contractName); - let filePath = utils.joinPath(fs.dappPath(), ".embark", contractName + '.js'); + let filePath = fs.dappPath(".embark", contractName + '.js'); fs.writeFileSync(filePath, contractCode); importsList["Embark/contracts/" + contractName] = filePath; } @@ -186,17 +183,17 @@ class Pipeline { webpackRun(filename, options, includeModules, importsList, detectErrors, callback) { let defaultOptions = { - entry: utils.joinPath(fs.dappPath(), filename), + entry: fs.dappPath(filename), output: { libraryTarget: 'umd', - path: utils.joinPath(fs.dappPath(), '.embark'), + path: fs.dappPath('.embark'), filename: filename }, resolve: { alias: importsList, modules: [ fs.embarkPath('node_modules'), - utils.joinPath(fs.dappPath(), 'node_modules') + fs.dappPath('node_modules') ] }, externals: function(context, request, callback) { @@ -248,16 +245,16 @@ class Pipeline { } buildContracts(contractsJSON) { - fs.mkdirpSync(utils.joinPath(fs.dappPath(), this.buildDir, 'contracts')); + fs.mkdirpSync(fs.dappPath(this.buildDir, 'contracts')); for (let className in contractsJSON) { let contract = contractsJSON[className]; - fs.writeJSONSync(utils.joinPath(fs.dappPath(), this.buildDir, 'contracts', className + ".json"), contract, {spaces: 2}); + fs.writeJSONSync(fs.dappPath(this.buildDir, 'contracts', className + ".json"), contract, {spaces: 2}); } } buildContractJS(contractName) { - let contractJSON = fs.readFileSync(utils.joinPath(fs.dappPath(), this.buildDir, 'contracts', contractName + '.json')).toString(); + let contractJSON = fs.readFileSync(fs.dappPath(this.buildDir, 'contracts', contractName + '.json')).toString(); let contractCode = ""; contractCode += "import web3 from 'Embark/web3';\n"; @@ -307,9 +304,8 @@ class Pipeline { }); }, function writeFile(next) { - let filePath = utils.joinPath(fs.dappPath(), ".embark", 'web3_instance.js'); - fs.mkdirpSync(utils.joinPath(fs.dappPath(), ".embark")); - fs.writeFileSync(filePath, code); + fs.mkdirpSync(fs.dappPath(".embark")); + fs.writeFileSync(fs.dappPath(".embark", 'web3_instance.js'), code); next(); } ], function(_err, _result) { diff --git a/test_apps/contracts_app/build/contracts/AlreadyDeployedToken.json b/test_apps/contracts_app/build/contracts/AlreadyDeployedToken.json index 4932f70cb..7272f1730 100644 --- a/test_apps/contracts_app/build/contracts/AlreadyDeployedToken.json +++ b/test_apps/contracts_app/build/contracts/AlreadyDeployedToken.json @@ -1,22 +1,22 @@ { "contract_name": "AlreadyDeployedToken", "address": "0xece374063fe5cc7efbaca0a498477cada94e5ad6", - "code": "6060604052341561000f57600080fd5b60405160208061049b83398101604052808051600160a060020a0333166000908152602081905260409020819055600255505061044a806100516000396000f3006060604052600436106100825763ffffffff7c0100000000000000000000000000000000000000000000000000000000600035041663095ea7b3811461008757806315945790146100bd57806318160ddd146100e257806323b872dd146100f557806370a082311461011d578063a9059cbb1461013c578063dd62ed3e1461015e575b600080fd5b341561009257600080fd5b6100a9600160a060020a0360043516602435610183565b604051901515815260200160405180910390f35b34156100c857600080fd5b6100d06101ef565b60405190815260200160405180910390f35b34156100ed57600080fd5b6100d06101f5565b341561010057600080fd5b6100a9600160a060020a03600435811690602435166044356101fb565b341561012857600080fd5b6100d0600160a060020a036004351661030f565b341561014757600080fd5b6100a9600160a060020a036004351660243561032a565b341561016957600080fd5b6100d0600160a060020a03600435811690602435166103ec565b600160a060020a03338116600081815260016020908152604080832094871680845294909152808220859055909291907f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b9259085905190815260200160405180910390a350600192915050565b60025481565b60025490565b600160a060020a0383166000908152602081905260408120548290101561022157600080fd5b600160a060020a03808516600090815260016020908152604080832033909416835292905220548290101561025557600080fd5b600160a060020a0383166000908152602081905260409020546102789083610417565b151561028357600080fd5b600160a060020a0380851660008181526001602090815260408083203386168452825280832080548890039055838352908290528082208054879003905592861680825290839020805486019055917fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9085905190815260200160405180910390a35060019392505050565b600160a060020a031660009081526020819052604090205490565b600160a060020a0333166000908152602081905260408120548290101561035057600080fd5b600160a060020a0383166000908152602081905260409020546103739083610417565b151561037e57600080fd5b600160a060020a033381166000818152602081905260408082208054879003905592861680825290839020805486019055917fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9085905190815260200160405180910390a350600192915050565b600160a060020a03918216600090815260016020908152604080832093909416825291909152205490565b81011015905600a165627a7a72305820e198e0113b80787ea6bed3da46c77abbf889cf88293ea9dfb03ec5db6ca30bcf0029", - "runtime_bytecode": "6060604052600436106100825763ffffffff7c0100000000000000000000000000000000000000000000000000000000600035041663095ea7b3811461008757806315945790146100bd57806318160ddd146100e257806323b872dd146100f557806370a082311461011d578063a9059cbb1461013c578063dd62ed3e1461015e575b600080fd5b341561009257600080fd5b6100a9600160a060020a0360043516602435610183565b604051901515815260200160405180910390f35b34156100c857600080fd5b6100d06101ef565b60405190815260200160405180910390f35b34156100ed57600080fd5b6100d06101f5565b341561010057600080fd5b6100a9600160a060020a03600435811690602435166044356101fb565b341561012857600080fd5b6100d0600160a060020a036004351661030f565b341561014757600080fd5b6100a9600160a060020a036004351660243561032a565b341561016957600080fd5b6100d0600160a060020a03600435811690602435166103ec565b600160a060020a03338116600081815260016020908152604080832094871680845294909152808220859055909291907f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b9259085905190815260200160405180910390a350600192915050565b60025481565b60025490565b600160a060020a0383166000908152602081905260408120548290101561022157600080fd5b600160a060020a03808516600090815260016020908152604080832033909416835292905220548290101561025557600080fd5b600160a060020a0383166000908152602081905260409020546102789083610417565b151561028357600080fd5b600160a060020a0380851660008181526001602090815260408083203386168452825280832080548890039055838352908290528082208054879003905592861680825290839020805486019055917fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9085905190815260200160405180910390a35060019392505050565b600160a060020a031660009081526020819052604090205490565b600160a060020a0333166000908152602081905260408120548290101561035057600080fd5b600160a060020a0383166000908152602081905260409020546103739083610417565b151561037e57600080fd5b600160a060020a033381166000818152602081905260408082208054879003905592861680825290839020805486019055917fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9085905190815260200160405180910390a350600192915050565b600160a060020a03918216600090815260016020908152604080832093909416825291909152205490565b81011015905600a165627a7a72305820e198e0113b80787ea6bed3da46c77abbf889cf88293ea9dfb03ec5db6ca30bcf0029", + "code": "6060604052341561000f57600080fd5b60405160208061049983398101604052808051600160a060020a03331660009081526020819052604090208190556002555050610448806100516000396000f300606060405236156100805763ffffffff7c0100000000000000000000000000000000000000000000000000000000600035041663095ea7b3811461008557806315945790146100bb57806318160ddd146100e057806323b872dd146100f357806370a082311461011b578063a9059cbb1461013a578063dd62ed3e1461015c575b600080fd5b341561009057600080fd5b6100a7600160a060020a0360043516602435610181565b604051901515815260200160405180910390f35b34156100c657600080fd5b6100ce6101ed565b60405190815260200160405180910390f35b34156100eb57600080fd5b6100ce6101f3565b34156100fe57600080fd5b6100a7600160a060020a03600435811690602435166044356101f9565b341561012657600080fd5b6100ce600160a060020a036004351661030d565b341561014557600080fd5b6100a7600160a060020a0360043516602435610328565b341561016757600080fd5b6100ce600160a060020a03600435811690602435166103ea565b600160a060020a03338116600081815260016020908152604080832094871680845294909152808220859055909291907f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b9259085905190815260200160405180910390a350600192915050565b60025481565b60025490565b600160a060020a0383166000908152602081905260408120548290101561021f57600080fd5b600160a060020a03808516600090815260016020908152604080832033909416835292905220548290101561025357600080fd5b600160a060020a0383166000908152602081905260409020546102769083610415565b151561028157600080fd5b600160a060020a0380851660008181526001602090815260408083203386168452825280832080548890039055838352908290528082208054879003905592861680825290839020805486019055917fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9085905190815260200160405180910390a35060019392505050565b600160a060020a031660009081526020819052604090205490565b600160a060020a0333166000908152602081905260408120548290101561034e57600080fd5b600160a060020a0383166000908152602081905260409020546103719083610415565b151561037c57600080fd5b600160a060020a033381166000818152602081905260408082208054879003905592861680825290839020805486019055917fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9085905190815260200160405180910390a350600192915050565b600160a060020a03918216600090815260016020908152604080832093909416825291909152205490565b81011015905600a165627a7a72305820296acec21220568a1b9f9dcf20f96accf851205e34513c360b7e90ac6c1e70dd0029", + "runtime_bytecode": "606060405236156100805763ffffffff7c0100000000000000000000000000000000000000000000000000000000600035041663095ea7b3811461008557806315945790146100bb57806318160ddd146100e057806323b872dd146100f357806370a082311461011b578063a9059cbb1461013a578063dd62ed3e1461015c575b600080fd5b341561009057600080fd5b6100a7600160a060020a0360043516602435610181565b604051901515815260200160405180910390f35b34156100c657600080fd5b6100ce6101ed565b60405190815260200160405180910390f35b34156100eb57600080fd5b6100ce6101f3565b34156100fe57600080fd5b6100a7600160a060020a03600435811690602435166044356101f9565b341561012657600080fd5b6100ce600160a060020a036004351661030d565b341561014557600080fd5b6100a7600160a060020a0360043516602435610328565b341561016757600080fd5b6100ce600160a060020a03600435811690602435166103ea565b600160a060020a03338116600081815260016020908152604080832094871680845294909152808220859055909291907f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b9259085905190815260200160405180910390a350600192915050565b60025481565b60025490565b600160a060020a0383166000908152602081905260408120548290101561021f57600080fd5b600160a060020a03808516600090815260016020908152604080832033909416835292905220548290101561025357600080fd5b600160a060020a0383166000908152602081905260409020546102769083610415565b151561028157600080fd5b600160a060020a0380851660008181526001602090815260408083203386168452825280832080548890039055838352908290528082208054879003905592861680825290839020805486019055917fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9085905190815260200160405180910390a35060019392505050565b600160a060020a031660009081526020819052604090205490565b600160a060020a0333166000908152602081905260408120548290101561034e57600080fd5b600160a060020a0383166000908152602081905260409020546103719083610415565b151561037c57600080fd5b600160a060020a033381166000818152602081905260408082208054879003905592861680825290839020805486019055917fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9085905190815260200160405180910390a350600192915050565b600160a060020a03918216600090815260016020908152604080832093909416825291909152205490565b81011015905600a165627a7a72305820296acec21220568a1b9f9dcf20f96accf851205e34513c360b7e90ac6c1e70dd0029", "gas_estimates": { "creation": { - "codeDepositCost": "219600", + "codeDepositCost": "219200", "executionCost": "40465", - "totalCost": "260065" + "totalCost": "259665" }, "external": { - "_supply()": "395", - "allowance(address,address)": "829", - "approve(address,uint256)": "22333", - "balanceOf(address)": "686", - "totalSupply()": "417", - "transfer(address,uint256)": "43633", - "transferFrom(address,address,uint256)": "64416" + "_supply()": "392", + "allowance(address,address)": "826", + "approve(address,uint256)": "22330", + "balanceOf(address)": "683", + "totalSupply()": "414", + "transfer(address,uint256)": "43630", + "transferFrom(address,address,uint256)": "64413" }, "internal": { "safeToAdd(uint256,uint256)": "24" diff --git a/test_apps/contracts_app/build/contracts/AnotherStorage.json b/test_apps/contracts_app/build/contracts/AnotherStorage.json index fb4395e67..ba9a291b2 100644 --- a/test_apps/contracts_app/build/contracts/AnotherStorage.json +++ b/test_apps/contracts_app/build/contracts/AnotherStorage.json @@ -1,18 +1,18 @@ { "contract_name": "AnotherStorage", - "address": "0xb61d417D82C1abA973d2061Cd6e017F194A5afc1", - "code": "6060604052341561000f57600080fd5b6040516020806101178339810160405280805160008054600160a060020a03909216600160a060020a0319909216919091179055505060c4806100536000396000f300606060405260043610603e5763ffffffff7c01000000000000000000000000000000000000000000000000000000006000350416633610eb0e81146043575b600080fd5b3415604d57600080fd5b6053607c565b60405173ffffffffffffffffffffffffffffffffffffffff909116815260200160405180910390f35b60005473ffffffffffffffffffffffffffffffffffffffff16815600a165627a7a723058204834d4df0eea462e734731877ef420533d7f1a4c586543a18769f9a66fe801660029", - "runtime_bytecode": "606060405260043610603e5763ffffffff7c01000000000000000000000000000000000000000000000000000000006000350416633610eb0e81146043575b600080fd5b3415604d57600080fd5b6053607c565b60405173ffffffffffffffffffffffffffffffffffffffff909116815260200160405180910390f35b60005473ffffffffffffffffffffffffffffffffffffffff16815600a165627a7a723058204834d4df0eea462e734731877ef420533d7f1a4c586543a18769f9a66fe801660029", - "real_runtime_bytecode": "606060405260043610603e5763ffffffff7c01000000000000000000000000000000000000000000000000000000006000350416633610eb0e81146043575b600080fd5b3415604d57600080fd5b6053607c565b60405173ffffffffffffffffffffffffffffffffffffffff909116815260200160405180910390f35b60005473ffffffffffffffffffffffffffffffffffffffff16815600a165627a7a723058204834d4df0eea462e734731877ef420533d7f1a4c586543a18769f9a66fe801660029", - "swarm_hash": "4834d4df0eea462e734731877ef420533d7f1a4c586543a18769f9a66fe80166", + "address": "0xbd1470c4E242141Ce45c82A570755bfe9965e99C", + "code": "6060604052341561000f57600080fd5b60405160208061010f8339810160405280805160008054600160a060020a03909216600160a060020a0319909216919091179055505060bc806100536000396000f300606060405263ffffffff7c01000000000000000000000000000000000000000000000000000000006000350416633610eb0e8114603b57600080fd5b3415604557600080fd5b604b6074565b60405173ffffffffffffffffffffffffffffffffffffffff909116815260200160405180910390f35b60005473ffffffffffffffffffffffffffffffffffffffff16815600a165627a7a72305820aa2dd4341eb309d7ab52796cab3bf8c9a7e2da0b6ab9b4d9bdd1411b90d116ca0029", + "runtime_bytecode": "606060405263ffffffff7c01000000000000000000000000000000000000000000000000000000006000350416633610eb0e8114603b57600080fd5b3415604557600080fd5b604b6074565b60405173ffffffffffffffffffffffffffffffffffffffff909116815260200160405180910390f35b60005473ffffffffffffffffffffffffffffffffffffffff16815600a165627a7a72305820aa2dd4341eb309d7ab52796cab3bf8c9a7e2da0b6ab9b4d9bdd1411b90d116ca0029", + "real_runtime_bytecode": "606060405263ffffffff7c01000000000000000000000000000000000000000000000000000000006000350416633610eb0e8114603b57600080fd5b3415604557600080fd5b604b6074565b60405173ffffffffffffffffffffffffffffffffffffffff909116815260200160405180910390f35b60005473ffffffffffffffffffffffffffffffffffffffff16815600a165627a7a72305820aa2dd4341eb309d7ab52796cab3bf8c9a7e2da0b6ab9b4d9bdd1411b90d116ca0029", + "swarm_hash": "aa2dd4341eb309d7ab52796cab3bf8c9a7e2da0b6ab9b4d9bdd1411b90d116ca", "gas_estimates": { "creation": { - "codeDepositCost": "39200", - "executionCost": "20523", - "totalCost": "59723" + "codeDepositCost": "37600", + "executionCost": "20517", + "totalCost": "58117" }, "external": { - "simpleStorageAddress()": "388" + "simpleStorageAddress()": "367" } }, "function_hashes": { diff --git a/test_apps/contracts_app/build/contracts/Assert.json b/test_apps/contracts_app/build/contracts/Assert.json index aa59c129a..70cc325d2 100644 --- a/test_apps/contracts_app/build/contracts/Assert.json +++ b/test_apps/contracts_app/build/contracts/Assert.json @@ -1,10 +1,10 @@ { "contract_name": "Assert", - "address": "0x5Eb2130A982D279e597226fD339Eb155f7171B91", - "code": "60606040523415600e57600080fd5b603580601b6000396000f3006060604052600080fd00a165627a7a72305820e199c6ed628993d1a790168511d9f0a36d6a180028664d9d9533d968364233550029", - "runtime_bytecode": "6060604052600080fd00a165627a7a72305820e199c6ed628993d1a790168511d9f0a36d6a180028664d9d9533d968364233550029", - "real_runtime_bytecode": "6060604052600080fd00a165627a7a72305820e199c6ed628993d1a790168511d9f0a36d6a180028664d9d9533d968364233550029", - "swarm_hash": "e199c6ed628993d1a790168511d9f0a36d6a180028664d9d9533d96836423355", + "address": "0x5c24Fd0BAB4B6EA1C0f057C770815b82EcE9013F", + "code": "60606040523415600e57600080fd5b603580601b6000396000f3006060604052600080fd00a165627a7a723058207e9fb136396db529578f03c3c5e389346c9d5d10cadd8a760ea8be2baa47083c0029", + "runtime_bytecode": "6060604052600080fd00a165627a7a723058207e9fb136396db529578f03c3c5e389346c9d5d10cadd8a760ea8be2baa47083c0029", + "real_runtime_bytecode": "6060604052600080fd00a165627a7a723058207e9fb136396db529578f03c3c5e389346c9d5d10cadd8a760ea8be2baa47083c0029", + "swarm_hash": "7e9fb136396db529578f03c3c5e389346c9d5d10cadd8a760ea8be2baa47083c", "gas_estimates": { "creation": { "codeDepositCost": "10600", diff --git a/test_apps/contracts_app/build/contracts/ContractArgs.json b/test_apps/contracts_app/build/contracts/ContractArgs.json index 1108b0558..350042b15 100644 --- a/test_apps/contracts_app/build/contracts/ContractArgs.json +++ b/test_apps/contracts_app/build/contracts/ContractArgs.json @@ -1,21 +1,21 @@ { "contract_name": "ContractArgs", - "address": "0x3B904C882523b36Edd8c9813db6aCE6cBa416060", - "code": "6060604052341561000f57600080fd5b6040516101dc3803806101dc83398101604052808051820191906020018051915082905060008151811061003f57fe5b9060200190602002015160008054600160a060020a031916600160a060020a03929092169190911790558160018151811061007657fe5b9060200190602002015160018054600160a060020a031916600160a060020a039290921691909117905560025550610129806100b36000396000f30060606040526004361060525763ffffffff7c01000000000000000000000000000000000000000000000000000000006000350416633fa4f245811460545780636b79ff5b146076578063fc25626f1460af575b005b3415605e57600080fd5b606460bf565b60405190815260200160405180910390f35b3415608057600080fd5b608660c5565b60405173ffffffffffffffffffffffffffffffffffffffff909116815260200160405180910390f35b341560b957600080fd5b608660e1565b60025481565b60005473ffffffffffffffffffffffffffffffffffffffff1681565b60015473ffffffffffffffffffffffffffffffffffffffff16815600a165627a7a723058202feaf8353834596f501bba96e3c7ba0138a12d5e49079503897392561b6289170029", - "runtime_bytecode": "60606040526004361060525763ffffffff7c01000000000000000000000000000000000000000000000000000000006000350416633fa4f245811460545780636b79ff5b146076578063fc25626f1460af575b005b3415605e57600080fd5b606460bf565b60405190815260200160405180910390f35b3415608057600080fd5b608660c5565b60405173ffffffffffffffffffffffffffffffffffffffff909116815260200160405180910390f35b341560b957600080fd5b608660e1565b60025481565b60005473ffffffffffffffffffffffffffffffffffffffff1681565b60015473ffffffffffffffffffffffffffffffffffffffff16815600a165627a7a723058202feaf8353834596f501bba96e3c7ba0138a12d5e49079503897392561b6289170029", - "real_runtime_bytecode": "60606040526004361060525763ffffffff7c01000000000000000000000000000000000000000000000000000000006000350416633fa4f245811460545780636b79ff5b146076578063fc25626f1460af575b005b3415605e57600080fd5b606460bf565b60405190815260200160405180910390f35b3415608057600080fd5b608660c5565b60405173ffffffffffffffffffffffffffffffffffffffff909116815260200160405180910390f35b341560b957600080fd5b608660e1565b60025481565b60005473ffffffffffffffffffffffffffffffffffffffff1681565b60015473ffffffffffffffffffffffffffffffffffffffff16815600a165627a7a723058202feaf8353834596f501bba96e3c7ba0138a12d5e49079503897392561b6289170029", - "swarm_hash": "2feaf8353834596f501bba96e3c7ba0138a12d5e49079503897392561b628917", + "address": "0xD38d37b84d83DAfEADd35D98354d47609456aEA4", + "code": "6060604052341561000f57600080fd5b6040516101da3803806101da83398101604052808051820191906020018051915082905060008151811061003f57fe5b9060200190602002015160008054600160a060020a031916600160a060020a03929092169190911790558160018151811061007657fe5b9060200190602002015160018054600160a060020a031916600160a060020a039290921691909117905560025550610127806100b36000396000f3006060604052361560505763ffffffff7c01000000000000000000000000000000000000000000000000000000006000350416633fa4f245811460525780636b79ff5b146074578063fc25626f1460ad575b005b3415605c57600080fd5b606260bd565b60405190815260200160405180910390f35b3415607e57600080fd5b608460c3565b60405173ffffffffffffffffffffffffffffffffffffffff909116815260200160405180910390f35b341560b757600080fd5b608460df565b60025481565b60005473ffffffffffffffffffffffffffffffffffffffff1681565b60015473ffffffffffffffffffffffffffffffffffffffff16815600a165627a7a7230582028b74fdaf5ca55629608c9a3b4a0c3ae50a12d6fd589ce27538782c5cda54c730029", + "runtime_bytecode": "6060604052361560505763ffffffff7c01000000000000000000000000000000000000000000000000000000006000350416633fa4f245811460525780636b79ff5b146074578063fc25626f1460ad575b005b3415605c57600080fd5b606260bd565b60405190815260200160405180910390f35b3415607e57600080fd5b608460c3565b60405173ffffffffffffffffffffffffffffffffffffffff909116815260200160405180910390f35b341560b757600080fd5b608460df565b60025481565b60005473ffffffffffffffffffffffffffffffffffffffff1681565b60015473ffffffffffffffffffffffffffffffffffffffff16815600a165627a7a7230582028b74fdaf5ca55629608c9a3b4a0c3ae50a12d6fd589ce27538782c5cda54c730029", + "real_runtime_bytecode": "6060604052361560505763ffffffff7c01000000000000000000000000000000000000000000000000000000006000350416633fa4f245811460525780636b79ff5b146074578063fc25626f1460ad575b005b3415605c57600080fd5b606260bd565b60405190815260200160405180910390f35b3415607e57600080fd5b608460c3565b60405173ffffffffffffffffffffffffffffffffffffffff909116815260200160405180910390f35b341560b757600080fd5b608460df565b60025481565b60005473ffffffffffffffffffffffffffffffffffffffff1681565b60015473ffffffffffffffffffffffffffffffffffffffff16815600a165627a7a7230582028b74fdaf5ca55629608c9a3b4a0c3ae50a12d6fd589ce27538782c5cda54c730029", + "swarm_hash": "28b74fdaf5ca55629608c9a3b4a0c3ae50a12d6fd589ce27538782c5cda54c73", "gas_estimates": { "creation": { - "codeDepositCost": "59400", + "codeDepositCost": "59000", "executionCost": "infinite", "totalCost": "infinite" }, "external": { - "": "126", - "addr_1()": "410", - "addr_2()": "432", - "value()": "373" + "": "123", + "addr_1()": "407", + "addr_2()": "429", + "value()": "370" } }, "function_hashes": { diff --git a/test_apps/contracts_app/build/contracts/MyToken.json b/test_apps/contracts_app/build/contracts/MyToken.json index 0951d69fa..ff9da699b 100644 --- a/test_apps/contracts_app/build/contracts/MyToken.json +++ b/test_apps/contracts_app/build/contracts/MyToken.json @@ -1,22 +1,22 @@ { "contract_name": "MyToken", - "address": "0xbbF2721136ce2F2C69FE3809de39cb5f1d54125C", - "code": "6060604052341561000f57600080fd5b60405160208061049b83398101604052808051600160a060020a0333166000908152602081905260409020819055600255505061044a806100516000396000f3006060604052600436106100825763ffffffff7c0100000000000000000000000000000000000000000000000000000000600035041663095ea7b3811461008757806315945790146100bd57806318160ddd146100e257806323b872dd146100f557806370a082311461011d578063a9059cbb1461013c578063dd62ed3e1461015e575b600080fd5b341561009257600080fd5b6100a9600160a060020a0360043516602435610183565b604051901515815260200160405180910390f35b34156100c857600080fd5b6100d06101ef565b60405190815260200160405180910390f35b34156100ed57600080fd5b6100d06101f5565b341561010057600080fd5b6100a9600160a060020a03600435811690602435166044356101fb565b341561012857600080fd5b6100d0600160a060020a036004351661030f565b341561014757600080fd5b6100a9600160a060020a036004351660243561032a565b341561016957600080fd5b6100d0600160a060020a03600435811690602435166103ec565b600160a060020a03338116600081815260016020908152604080832094871680845294909152808220859055909291907f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b9259085905190815260200160405180910390a350600192915050565b60025481565b60025490565b600160a060020a0383166000908152602081905260408120548290101561022157600080fd5b600160a060020a03808516600090815260016020908152604080832033909416835292905220548290101561025557600080fd5b600160a060020a0383166000908152602081905260409020546102789083610417565b151561028357600080fd5b600160a060020a0380851660008181526001602090815260408083203386168452825280832080548890039055838352908290528082208054879003905592861680825290839020805486019055917fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9085905190815260200160405180910390a35060019392505050565b600160a060020a031660009081526020819052604090205490565b600160a060020a0333166000908152602081905260408120548290101561035057600080fd5b600160a060020a0383166000908152602081905260409020546103739083610417565b151561037e57600080fd5b600160a060020a033381166000818152602081905260408082208054879003905592861680825290839020805486019055917fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9085905190815260200160405180910390a350600192915050565b600160a060020a03918216600090815260016020908152604080832093909416825291909152205490565b81011015905600a165627a7a72305820e198e0113b80787ea6bed3da46c77abbf889cf88293ea9dfb03ec5db6ca30bcf0029", - "runtime_bytecode": "6060604052600436106100825763ffffffff7c0100000000000000000000000000000000000000000000000000000000600035041663095ea7b3811461008757806315945790146100bd57806318160ddd146100e257806323b872dd146100f557806370a082311461011d578063a9059cbb1461013c578063dd62ed3e1461015e575b600080fd5b341561009257600080fd5b6100a9600160a060020a0360043516602435610183565b604051901515815260200160405180910390f35b34156100c857600080fd5b6100d06101ef565b60405190815260200160405180910390f35b34156100ed57600080fd5b6100d06101f5565b341561010057600080fd5b6100a9600160a060020a03600435811690602435166044356101fb565b341561012857600080fd5b6100d0600160a060020a036004351661030f565b341561014757600080fd5b6100a9600160a060020a036004351660243561032a565b341561016957600080fd5b6100d0600160a060020a03600435811690602435166103ec565b600160a060020a03338116600081815260016020908152604080832094871680845294909152808220859055909291907f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b9259085905190815260200160405180910390a350600192915050565b60025481565b60025490565b600160a060020a0383166000908152602081905260408120548290101561022157600080fd5b600160a060020a03808516600090815260016020908152604080832033909416835292905220548290101561025557600080fd5b600160a060020a0383166000908152602081905260409020546102789083610417565b151561028357600080fd5b600160a060020a0380851660008181526001602090815260408083203386168452825280832080548890039055838352908290528082208054879003905592861680825290839020805486019055917fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9085905190815260200160405180910390a35060019392505050565b600160a060020a031660009081526020819052604090205490565b600160a060020a0333166000908152602081905260408120548290101561035057600080fd5b600160a060020a0383166000908152602081905260409020546103739083610417565b151561037e57600080fd5b600160a060020a033381166000818152602081905260408082208054879003905592861680825290839020805486019055917fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9085905190815260200160405180910390a350600192915050565b600160a060020a03918216600090815260016020908152604080832093909416825291909152205490565b81011015905600a165627a7a72305820e198e0113b80787ea6bed3da46c77abbf889cf88293ea9dfb03ec5db6ca30bcf0029", + "address": "0x11B0cb61776C29125cE3C2Eb86611933E8f9d5F1", + "code": "6060604052341561000f57600080fd5b60405160208061049983398101604052808051600160a060020a03331660009081526020819052604090208190556002555050610448806100516000396000f300606060405236156100805763ffffffff7c0100000000000000000000000000000000000000000000000000000000600035041663095ea7b3811461008557806315945790146100bb57806318160ddd146100e057806323b872dd146100f357806370a082311461011b578063a9059cbb1461013a578063dd62ed3e1461015c575b600080fd5b341561009057600080fd5b6100a7600160a060020a0360043516602435610181565b604051901515815260200160405180910390f35b34156100c657600080fd5b6100ce6101ed565b60405190815260200160405180910390f35b34156100eb57600080fd5b6100ce6101f3565b34156100fe57600080fd5b6100a7600160a060020a03600435811690602435166044356101f9565b341561012657600080fd5b6100ce600160a060020a036004351661030d565b341561014557600080fd5b6100a7600160a060020a0360043516602435610328565b341561016757600080fd5b6100ce600160a060020a03600435811690602435166103ea565b600160a060020a03338116600081815260016020908152604080832094871680845294909152808220859055909291907f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b9259085905190815260200160405180910390a350600192915050565b60025481565b60025490565b600160a060020a0383166000908152602081905260408120548290101561021f57600080fd5b600160a060020a03808516600090815260016020908152604080832033909416835292905220548290101561025357600080fd5b600160a060020a0383166000908152602081905260409020546102769083610415565b151561028157600080fd5b600160a060020a0380851660008181526001602090815260408083203386168452825280832080548890039055838352908290528082208054879003905592861680825290839020805486019055917fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9085905190815260200160405180910390a35060019392505050565b600160a060020a031660009081526020819052604090205490565b600160a060020a0333166000908152602081905260408120548290101561034e57600080fd5b600160a060020a0383166000908152602081905260409020546103719083610415565b151561037c57600080fd5b600160a060020a033381166000818152602081905260408082208054879003905592861680825290839020805486019055917fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9085905190815260200160405180910390a350600192915050565b600160a060020a03918216600090815260016020908152604080832093909416825291909152205490565b81011015905600a165627a7a72305820296acec21220568a1b9f9dcf20f96accf851205e34513c360b7e90ac6c1e70dd0029", + "runtime_bytecode": "606060405236156100805763ffffffff7c0100000000000000000000000000000000000000000000000000000000600035041663095ea7b3811461008557806315945790146100bb57806318160ddd146100e057806323b872dd146100f357806370a082311461011b578063a9059cbb1461013a578063dd62ed3e1461015c575b600080fd5b341561009057600080fd5b6100a7600160a060020a0360043516602435610181565b604051901515815260200160405180910390f35b34156100c657600080fd5b6100ce6101ed565b60405190815260200160405180910390f35b34156100eb57600080fd5b6100ce6101f3565b34156100fe57600080fd5b6100a7600160a060020a03600435811690602435166044356101f9565b341561012657600080fd5b6100ce600160a060020a036004351661030d565b341561014557600080fd5b6100a7600160a060020a0360043516602435610328565b341561016757600080fd5b6100ce600160a060020a03600435811690602435166103ea565b600160a060020a03338116600081815260016020908152604080832094871680845294909152808220859055909291907f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b9259085905190815260200160405180910390a350600192915050565b60025481565b60025490565b600160a060020a0383166000908152602081905260408120548290101561021f57600080fd5b600160a060020a03808516600090815260016020908152604080832033909416835292905220548290101561025357600080fd5b600160a060020a0383166000908152602081905260409020546102769083610415565b151561028157600080fd5b600160a060020a0380851660008181526001602090815260408083203386168452825280832080548890039055838352908290528082208054879003905592861680825290839020805486019055917fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9085905190815260200160405180910390a35060019392505050565b600160a060020a031660009081526020819052604090205490565b600160a060020a0333166000908152602081905260408120548290101561034e57600080fd5b600160a060020a0383166000908152602081905260409020546103719083610415565b151561037c57600080fd5b600160a060020a033381166000818152602081905260408082208054879003905592861680825290839020805486019055917fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9085905190815260200160405180910390a350600192915050565b600160a060020a03918216600090815260016020908152604080832093909416825291909152205490565b81011015905600a165627a7a72305820296acec21220568a1b9f9dcf20f96accf851205e34513c360b7e90ac6c1e70dd0029", "gas_estimates": { "creation": { - "codeDepositCost": "219600", + "codeDepositCost": "219200", "executionCost": "40465", - "totalCost": "260065" + "totalCost": "259665" }, "external": { - "_supply()": "395", - "allowance(address,address)": "829", - "approve(address,uint256)": "22333", - "balanceOf(address)": "686", - "totalSupply()": "417", - "transfer(address,uint256)": "43633", - "transferFrom(address,address,uint256)": "64416" + "_supply()": "392", + "allowance(address,address)": "826", + "approve(address,uint256)": "22330", + "balanceOf(address)": "683", + "totalSupply()": "414", + "transfer(address,uint256)": "43630", + "transferFrom(address,address,uint256)": "64413" }, "internal": { "safeToAdd(uint256,uint256)": "24" diff --git a/test_apps/contracts_app/build/contracts/MyToken2.json b/test_apps/contracts_app/build/contracts/MyToken2.json index e58fdfd11..ca764b0dd 100644 --- a/test_apps/contracts_app/build/contracts/MyToken2.json +++ b/test_apps/contracts_app/build/contracts/MyToken2.json @@ -1,22 +1,22 @@ { "contract_name": "MyToken2", - "address": "0x95eBb3E309CFa837d34578e24cdd7A72Fed2E94f", - "code": "6060604052341561000f57600080fd5b60405160208061049b83398101604052808051600160a060020a0333166000908152602081905260409020819055600255505061044a806100516000396000f3006060604052600436106100825763ffffffff7c0100000000000000000000000000000000000000000000000000000000600035041663095ea7b3811461008757806315945790146100bd57806318160ddd146100e257806323b872dd146100f557806370a082311461011d578063a9059cbb1461013c578063dd62ed3e1461015e575b600080fd5b341561009257600080fd5b6100a9600160a060020a0360043516602435610183565b604051901515815260200160405180910390f35b34156100c857600080fd5b6100d06101ef565b60405190815260200160405180910390f35b34156100ed57600080fd5b6100d06101f5565b341561010057600080fd5b6100a9600160a060020a03600435811690602435166044356101fb565b341561012857600080fd5b6100d0600160a060020a036004351661030f565b341561014757600080fd5b6100a9600160a060020a036004351660243561032a565b341561016957600080fd5b6100d0600160a060020a03600435811690602435166103ec565b600160a060020a03338116600081815260016020908152604080832094871680845294909152808220859055909291907f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b9259085905190815260200160405180910390a350600192915050565b60025481565b60025490565b600160a060020a0383166000908152602081905260408120548290101561022157600080fd5b600160a060020a03808516600090815260016020908152604080832033909416835292905220548290101561025557600080fd5b600160a060020a0383166000908152602081905260409020546102789083610417565b151561028357600080fd5b600160a060020a0380851660008181526001602090815260408083203386168452825280832080548890039055838352908290528082208054879003905592861680825290839020805486019055917fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9085905190815260200160405180910390a35060019392505050565b600160a060020a031660009081526020819052604090205490565b600160a060020a0333166000908152602081905260408120548290101561035057600080fd5b600160a060020a0383166000908152602081905260409020546103739083610417565b151561037e57600080fd5b600160a060020a033381166000818152602081905260408082208054879003905592861680825290839020805486019055917fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9085905190815260200160405180910390a350600192915050565b600160a060020a03918216600090815260016020908152604080832093909416825291909152205490565b81011015905600a165627a7a72305820e198e0113b80787ea6bed3da46c77abbf889cf88293ea9dfb03ec5db6ca30bcf0029", - "runtime_bytecode": "6060604052600436106100825763ffffffff7c0100000000000000000000000000000000000000000000000000000000600035041663095ea7b3811461008757806315945790146100bd57806318160ddd146100e257806323b872dd146100f557806370a082311461011d578063a9059cbb1461013c578063dd62ed3e1461015e575b600080fd5b341561009257600080fd5b6100a9600160a060020a0360043516602435610183565b604051901515815260200160405180910390f35b34156100c857600080fd5b6100d06101ef565b60405190815260200160405180910390f35b34156100ed57600080fd5b6100d06101f5565b341561010057600080fd5b6100a9600160a060020a03600435811690602435166044356101fb565b341561012857600080fd5b6100d0600160a060020a036004351661030f565b341561014757600080fd5b6100a9600160a060020a036004351660243561032a565b341561016957600080fd5b6100d0600160a060020a03600435811690602435166103ec565b600160a060020a03338116600081815260016020908152604080832094871680845294909152808220859055909291907f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b9259085905190815260200160405180910390a350600192915050565b60025481565b60025490565b600160a060020a0383166000908152602081905260408120548290101561022157600080fd5b600160a060020a03808516600090815260016020908152604080832033909416835292905220548290101561025557600080fd5b600160a060020a0383166000908152602081905260409020546102789083610417565b151561028357600080fd5b600160a060020a0380851660008181526001602090815260408083203386168452825280832080548890039055838352908290528082208054879003905592861680825290839020805486019055917fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9085905190815260200160405180910390a35060019392505050565b600160a060020a031660009081526020819052604090205490565b600160a060020a0333166000908152602081905260408120548290101561035057600080fd5b600160a060020a0383166000908152602081905260409020546103739083610417565b151561037e57600080fd5b600160a060020a033381166000818152602081905260408082208054879003905592861680825290839020805486019055917fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9085905190815260200160405180910390a350600192915050565b600160a060020a03918216600090815260016020908152604080832093909416825291909152205490565b81011015905600a165627a7a72305820e198e0113b80787ea6bed3da46c77abbf889cf88293ea9dfb03ec5db6ca30bcf0029", + "address": "0x32858548ab987Bf2161A666824734eca77667fEc", + "code": "6060604052341561000f57600080fd5b60405160208061049983398101604052808051600160a060020a03331660009081526020819052604090208190556002555050610448806100516000396000f300606060405236156100805763ffffffff7c0100000000000000000000000000000000000000000000000000000000600035041663095ea7b3811461008557806315945790146100bb57806318160ddd146100e057806323b872dd146100f357806370a082311461011b578063a9059cbb1461013a578063dd62ed3e1461015c575b600080fd5b341561009057600080fd5b6100a7600160a060020a0360043516602435610181565b604051901515815260200160405180910390f35b34156100c657600080fd5b6100ce6101ed565b60405190815260200160405180910390f35b34156100eb57600080fd5b6100ce6101f3565b34156100fe57600080fd5b6100a7600160a060020a03600435811690602435166044356101f9565b341561012657600080fd5b6100ce600160a060020a036004351661030d565b341561014557600080fd5b6100a7600160a060020a0360043516602435610328565b341561016757600080fd5b6100ce600160a060020a03600435811690602435166103ea565b600160a060020a03338116600081815260016020908152604080832094871680845294909152808220859055909291907f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b9259085905190815260200160405180910390a350600192915050565b60025481565b60025490565b600160a060020a0383166000908152602081905260408120548290101561021f57600080fd5b600160a060020a03808516600090815260016020908152604080832033909416835292905220548290101561025357600080fd5b600160a060020a0383166000908152602081905260409020546102769083610415565b151561028157600080fd5b600160a060020a0380851660008181526001602090815260408083203386168452825280832080548890039055838352908290528082208054879003905592861680825290839020805486019055917fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9085905190815260200160405180910390a35060019392505050565b600160a060020a031660009081526020819052604090205490565b600160a060020a0333166000908152602081905260408120548290101561034e57600080fd5b600160a060020a0383166000908152602081905260409020546103719083610415565b151561037c57600080fd5b600160a060020a033381166000818152602081905260408082208054879003905592861680825290839020805486019055917fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9085905190815260200160405180910390a350600192915050565b600160a060020a03918216600090815260016020908152604080832093909416825291909152205490565b81011015905600a165627a7a72305820296acec21220568a1b9f9dcf20f96accf851205e34513c360b7e90ac6c1e70dd0029", + "runtime_bytecode": "606060405236156100805763ffffffff7c0100000000000000000000000000000000000000000000000000000000600035041663095ea7b3811461008557806315945790146100bb57806318160ddd146100e057806323b872dd146100f357806370a082311461011b578063a9059cbb1461013a578063dd62ed3e1461015c575b600080fd5b341561009057600080fd5b6100a7600160a060020a0360043516602435610181565b604051901515815260200160405180910390f35b34156100c657600080fd5b6100ce6101ed565b60405190815260200160405180910390f35b34156100eb57600080fd5b6100ce6101f3565b34156100fe57600080fd5b6100a7600160a060020a03600435811690602435166044356101f9565b341561012657600080fd5b6100ce600160a060020a036004351661030d565b341561014557600080fd5b6100a7600160a060020a0360043516602435610328565b341561016757600080fd5b6100ce600160a060020a03600435811690602435166103ea565b600160a060020a03338116600081815260016020908152604080832094871680845294909152808220859055909291907f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b9259085905190815260200160405180910390a350600192915050565b60025481565b60025490565b600160a060020a0383166000908152602081905260408120548290101561021f57600080fd5b600160a060020a03808516600090815260016020908152604080832033909416835292905220548290101561025357600080fd5b600160a060020a0383166000908152602081905260409020546102769083610415565b151561028157600080fd5b600160a060020a0380851660008181526001602090815260408083203386168452825280832080548890039055838352908290528082208054879003905592861680825290839020805486019055917fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9085905190815260200160405180910390a35060019392505050565b600160a060020a031660009081526020819052604090205490565b600160a060020a0333166000908152602081905260408120548290101561034e57600080fd5b600160a060020a0383166000908152602081905260409020546103719083610415565b151561037c57600080fd5b600160a060020a033381166000818152602081905260408082208054879003905592861680825290839020805486019055917fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9085905190815260200160405180910390a350600192915050565b600160a060020a03918216600090815260016020908152604080832093909416825291909152205490565b81011015905600a165627a7a72305820296acec21220568a1b9f9dcf20f96accf851205e34513c360b7e90ac6c1e70dd0029", "gas_estimates": { "creation": { - "codeDepositCost": "219600", + "codeDepositCost": "219200", "executionCost": "40465", - "totalCost": "260065" + "totalCost": "259665" }, "external": { - "_supply()": "395", - "allowance(address,address)": "829", - "approve(address,uint256)": "22333", - "balanceOf(address)": "686", - "totalSupply()": "417", - "transfer(address,uint256)": "43633", - "transferFrom(address,address,uint256)": "64416" + "_supply()": "392", + "allowance(address,address)": "826", + "approve(address,uint256)": "22330", + "balanceOf(address)": "683", + "totalSupply()": "414", + "transfer(address,uint256)": "43630", + "transferFrom(address,address,uint256)": "64413" }, "internal": { "safeToAdd(uint256,uint256)": "24" diff --git a/test_apps/contracts_app/build/contracts/Ownable.json b/test_apps/contracts_app/build/contracts/Ownable.json index 528f973f3..62f2968c6 100644 --- a/test_apps/contracts_app/build/contracts/Ownable.json +++ b/test_apps/contracts_app/build/contracts/Ownable.json @@ -1,18 +1,18 @@ { "contract_name": "Ownable", - "code": "6060604052341561000f57600080fd5b60008054600160a060020a033316600160a060020a03199091161790556101268061003b6000396000f30060606040526004361060485763ffffffff7c01000000000000000000000000000000000000000000000000000000006000350416638da5cb5b8114604d578063f2fde38b146079575b600080fd5b3415605757600080fd5b605d6097565b604051600160a060020a03909116815260200160405180910390f35b3415608357600080fd5b6095600160a060020a036004351660a6565b005b600054600160a060020a031681565b60005433600160a060020a0390811691161460c057600080fd5b600160a060020a0381161560f7576000805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0383161790555b505600a165627a7a72305820d1e062bb95e0be6e440ea7d7b24e1f72ce802d96b12613a0b6728402294dd7080029", - "runtime_bytecode": "60606040526004361060485763ffffffff7c01000000000000000000000000000000000000000000000000000000006000350416638da5cb5b8114604d578063f2fde38b146079575b600080fd5b3415605757600080fd5b605d6097565b604051600160a060020a03909116815260200160405180910390f35b3415608357600080fd5b6095600160a060020a036004351660a6565b005b600054600160a060020a031681565b60005433600160a060020a0390811691161460c057600080fd5b600160a060020a0381161560f7576000805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0383161790555b505600a165627a7a72305820d1e062bb95e0be6e440ea7d7b24e1f72ce802d96b12613a0b6728402294dd7080029", - "real_runtime_bytecode": "60606040526004361060485763ffffffff7c01000000000000000000000000000000000000000000000000000000006000350416638da5cb5b8114604d578063f2fde38b146079575b600080fd5b3415605757600080fd5b605d6097565b604051600160a060020a03909116815260200160405180910390f35b3415608357600080fd5b6095600160a060020a036004351660a6565b005b600054600160a060020a031681565b60005433600160a060020a0390811691161460c057600080fd5b600160a060020a0381161560f7576000805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0383161790555b505600a165627a7a72305820d1e062bb95e0be6e440ea7d7b24e1f72ce802d96b12613a0b6728402294dd7080029", - "swarm_hash": "d1e062bb95e0be6e440ea7d7b24e1f72ce802d96b12613a0b6728402294dd708", + "code": "6060604052341561000f57600080fd5b60008054600160a060020a033316600160a060020a031990911617905561011e8061003b6000396000f300606060405263ffffffff7c01000000000000000000000000000000000000000000000000000000006000350416638da5cb5b81146045578063f2fde38b14607157600080fd5b3415604f57600080fd5b6055608f565b604051600160a060020a03909116815260200160405180910390f35b3415607b57600080fd5b608d600160a060020a0360043516609e565b005b600054600160a060020a031681565b60005433600160a060020a0390811691161460b857600080fd5b600160a060020a0381161560ef576000805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0383161790555b505600a165627a7a7230582067ba6a1663c106e8fb91d00a40cba5ec79dd7586990cda210ada6288f949c5dd0029", + "runtime_bytecode": "606060405263ffffffff7c01000000000000000000000000000000000000000000000000000000006000350416638da5cb5b81146045578063f2fde38b14607157600080fd5b3415604f57600080fd5b6055608f565b604051600160a060020a03909116815260200160405180910390f35b3415607b57600080fd5b608d600160a060020a0360043516609e565b005b600054600160a060020a031681565b60005433600160a060020a0390811691161460b857600080fd5b600160a060020a0381161560ef576000805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0383161790555b505600a165627a7a7230582067ba6a1663c106e8fb91d00a40cba5ec79dd7586990cda210ada6288f949c5dd0029", + "real_runtime_bytecode": "606060405263ffffffff7c01000000000000000000000000000000000000000000000000000000006000350416638da5cb5b81146045578063f2fde38b14607157600080fd5b3415604f57600080fd5b6055608f565b604051600160a060020a03909116815260200160405180910390f35b3415607b57600080fd5b608d600160a060020a0360043516609e565b005b600054600160a060020a031681565b60005433600160a060020a0390811691161460b857600080fd5b600160a060020a0381161560ef576000805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0383161790555b505600a165627a7a7230582067ba6a1663c106e8fb91d00a40cba5ec79dd7586990cda210ada6288f949c5dd0029", + "swarm_hash": "67ba6a1663c106e8fb91d00a40cba5ec79dd7586990cda210ada6288f949c5dd", "gas_estimates": { "creation": { - "codeDepositCost": "58800", - "executionCost": "20479", - "totalCost": "79279" + "codeDepositCost": "57200", + "executionCost": "20473", + "totalCost": "77673" }, "external": { - "owner()": "526", - "transferOwnership(address)": "20933" + "owner()": "505", + "transferOwnership(address)": "20912" } }, "function_hashes": { diff --git a/test_apps/contracts_app/build/contracts/SimpleStorage.json b/test_apps/contracts_app/build/contracts/SimpleStorage.json index 4d9f61a68..b9610414f 100644 --- a/test_apps/contracts_app/build/contracts/SimpleStorage.json +++ b/test_apps/contracts_app/build/contracts/SimpleStorage.json @@ -1,25 +1,25 @@ { "contract_name": "SimpleStorage", - "address": "0xf400925155a8ED845a15b3f1c4C4984f31645A07", - "code": "6060604052341561000f57600080fd5b60405160208061042f8339810160405280805160008054600160a060020a033316600160a060020a031990911617905560015550506103dc806100536000396000f3006060604052600436106100825763ffffffff7c01000000000000000000000000000000000000000000000000000000006000350416632a1afcd981146100845780634f829ee8146100a957806360fe47b1146100c25780636d4ce63c146100d85780638da5cb5b146100eb578063e93314ab1461011a578063f2fde38b146101a4575b005b341561008f57600080fd5b6100976101c3565b60405190815260200160405180910390f35b34156100b457600080fd5b6100826004356024356101c9565b34156100cd57600080fd5b6100826004356101ea565b34156100e357600080fd5b61009761024c565b34156100f657600080fd5b6100fe610252565b604051600160a060020a03909116815260200160405180910390f35b341561012557600080fd5b61012d610261565b60405160208082528190810183818151815260200191508051906020019080838360005b83811015610169578082015183820152602001610151565b50505050905090810190601f1680156101965780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b34156101af57600080fd5b610082600160a060020a03600435166102a2565b60015481565b60005433600160a060020a039081169116146101e457600080fd5b50600155565b600181905560005b6103e881101561020a576001805482018155016101f2565b610248600160408051908101604052600281527f686900000000000000000000000000000000000000000000000000000000000060208201526102f8565b5050565b60015490565b600054600160a060020a031681565b61026961039e565b60408051908101604052600581527f68656c6c6f0000000000000000000000000000000000000000000000000000006020820152905090565b60005433600160a060020a039081169116146102bd57600080fd5b600160a060020a038116156102f5576000805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0383161790555b50565b7fd204e27263771793b3472e4c07118500eb1ab892c2b2f0a4b90b33c33d4df42f8282604051821515815260406020820181815290820183818151815260200191508051906020019080838360005b8381101561035f578082015183820152602001610347565b50505050905090810190601f16801561038c5780820380516001836020036101000a031916815260200191505b50935050505060405180910390a15050565b602060405190810160405260008152905600a165627a7a72305820c1392e5be5a697e3c0ef80454e6a446d7538c99f99e839afa0b820ab6bca35d30029", - "runtime_bytecode": "6060604052600436106100825763ffffffff7c01000000000000000000000000000000000000000000000000000000006000350416632a1afcd981146100845780634f829ee8146100a957806360fe47b1146100c25780636d4ce63c146100d85780638da5cb5b146100eb578063e93314ab1461011a578063f2fde38b146101a4575b005b341561008f57600080fd5b6100976101c3565b60405190815260200160405180910390f35b34156100b457600080fd5b6100826004356024356101c9565b34156100cd57600080fd5b6100826004356101ea565b34156100e357600080fd5b61009761024c565b34156100f657600080fd5b6100fe610252565b604051600160a060020a03909116815260200160405180910390f35b341561012557600080fd5b61012d610261565b60405160208082528190810183818151815260200191508051906020019080838360005b83811015610169578082015183820152602001610151565b50505050905090810190601f1680156101965780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b34156101af57600080fd5b610082600160a060020a03600435166102a2565b60015481565b60005433600160a060020a039081169116146101e457600080fd5b50600155565b600181905560005b6103e881101561020a576001805482018155016101f2565b610248600160408051908101604052600281527f686900000000000000000000000000000000000000000000000000000000000060208201526102f8565b5050565b60015490565b600054600160a060020a031681565b61026961039e565b60408051908101604052600581527f68656c6c6f0000000000000000000000000000000000000000000000000000006020820152905090565b60005433600160a060020a039081169116146102bd57600080fd5b600160a060020a038116156102f5576000805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0383161790555b50565b7fd204e27263771793b3472e4c07118500eb1ab892c2b2f0a4b90b33c33d4df42f8282604051821515815260406020820181815290820183818151815260200191508051906020019080838360005b8381101561035f578082015183820152602001610347565b50505050905090810190601f16801561038c5780820380516001836020036101000a031916815260200191505b50935050505060405180910390a15050565b602060405190810160405260008152905600a165627a7a72305820c1392e5be5a697e3c0ef80454e6a446d7538c99f99e839afa0b820ab6bca35d30029", - "real_runtime_bytecode": "6060604052600436106100825763ffffffff7c01000000000000000000000000000000000000000000000000000000006000350416632a1afcd981146100845780634f829ee8146100a957806360fe47b1146100c25780636d4ce63c146100d85780638da5cb5b146100eb578063e93314ab1461011a578063f2fde38b146101a4575b005b341561008f57600080fd5b6100976101c3565b60405190815260200160405180910390f35b34156100b457600080fd5b6100826004356024356101c9565b34156100cd57600080fd5b6100826004356101ea565b34156100e357600080fd5b61009761024c565b34156100f657600080fd5b6100fe610252565b604051600160a060020a03909116815260200160405180910390f35b341561012557600080fd5b61012d610261565b60405160208082528190810183818151815260200191508051906020019080838360005b83811015610169578082015183820152602001610151565b50505050905090810190601f1680156101965780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b34156101af57600080fd5b610082600160a060020a03600435166102a2565b60015481565b60005433600160a060020a039081169116146101e457600080fd5b50600155565b600181905560005b6103e881101561020a576001805482018155016101f2565b610248600160408051908101604052600281527f686900000000000000000000000000000000000000000000000000000000000060208201526102f8565b5050565b60015490565b600054600160a060020a031681565b61026961039e565b60408051908101604052600581527f68656c6c6f0000000000000000000000000000000000000000000000000000006020820152905090565b60005433600160a060020a039081169116146102bd57600080fd5b600160a060020a038116156102f5576000805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0383161790555b50565b7fd204e27263771793b3472e4c07118500eb1ab892c2b2f0a4b90b33c33d4df42f8282604051821515815260406020820181815290820183818151815260200191508051906020019080838360005b8381101561035f578082015183820152602001610347565b50505050905090810190601f16801561038c5780820380516001836020036101000a031916815260200191505b50935050505060405180910390a15050565b602060405190810160405260008152905600a165627a7a72305820c1392e5be5a697e3c0ef80454e6a446d7538c99f99e839afa0b820ab6bca35d30029", - "swarm_hash": "c1392e5be5a697e3c0ef80454e6a446d7538c99f99e839afa0b820ab6bca35d3", + "address": "0xbA43cfc248f026765Ce3076bDa8B932FE7BA9E17", + "code": "6060604052341561000f57600080fd5b60405160208061042d8339810160405280805160008054600160a060020a033316600160a060020a031990911617905560015550506103da806100536000396000f300606060405236156100805763ffffffff7c01000000000000000000000000000000000000000000000000000000006000350416632a1afcd981146100825780634f829ee8146100a757806360fe47b1146100c05780636d4ce63c146100d65780638da5cb5b146100e9578063e93314ab14610118578063f2fde38b146101a2575b005b341561008d57600080fd5b6100956101c1565b60405190815260200160405180910390f35b34156100b257600080fd5b6100806004356024356101c7565b34156100cb57600080fd5b6100806004356101e8565b34156100e157600080fd5b61009561024a565b34156100f457600080fd5b6100fc610250565b604051600160a060020a03909116815260200160405180910390f35b341561012357600080fd5b61012b61025f565b60405160208082528190810183818151815260200191508051906020019080838360005b8381101561016757808201518382015260200161014f565b50505050905090810190601f1680156101945780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b34156101ad57600080fd5b610080600160a060020a03600435166102a0565b60015481565b60005433600160a060020a039081169116146101e257600080fd5b50600155565b600181905560005b6103e8811015610208576001805482018155016101f0565b610246600160408051908101604052600281527f686900000000000000000000000000000000000000000000000000000000000060208201526102f6565b5050565b60015490565b600054600160a060020a031681565b61026761039c565b60408051908101604052600581527f68656c6c6f0000000000000000000000000000000000000000000000000000006020820152905090565b60005433600160a060020a039081169116146102bb57600080fd5b600160a060020a038116156102f3576000805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0383161790555b50565b7fd204e27263771793b3472e4c07118500eb1ab892c2b2f0a4b90b33c33d4df42f8282604051821515815260406020820181815290820183818151815260200191508051906020019080838360005b8381101561035d578082015183820152602001610345565b50505050905090810190601f16801561038a5780820380516001836020036101000a031916815260200191505b50935050505060405180910390a15050565b602060405190810160405260008152905600a165627a7a723058206bcde2c3a4cf689ece10c413be63964fef8fc035e4668441e53765fc2b5f61910029", + "runtime_bytecode": "606060405236156100805763ffffffff7c01000000000000000000000000000000000000000000000000000000006000350416632a1afcd981146100825780634f829ee8146100a757806360fe47b1146100c05780636d4ce63c146100d65780638da5cb5b146100e9578063e93314ab14610118578063f2fde38b146101a2575b005b341561008d57600080fd5b6100956101c1565b60405190815260200160405180910390f35b34156100b257600080fd5b6100806004356024356101c7565b34156100cb57600080fd5b6100806004356101e8565b34156100e157600080fd5b61009561024a565b34156100f457600080fd5b6100fc610250565b604051600160a060020a03909116815260200160405180910390f35b341561012357600080fd5b61012b61025f565b60405160208082528190810183818151815260200191508051906020019080838360005b8381101561016757808201518382015260200161014f565b50505050905090810190601f1680156101945780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b34156101ad57600080fd5b610080600160a060020a03600435166102a0565b60015481565b60005433600160a060020a039081169116146101e257600080fd5b50600155565b600181905560005b6103e8811015610208576001805482018155016101f0565b610246600160408051908101604052600281527f686900000000000000000000000000000000000000000000000000000000000060208201526102f6565b5050565b60015490565b600054600160a060020a031681565b61026761039c565b60408051908101604052600581527f68656c6c6f0000000000000000000000000000000000000000000000000000006020820152905090565b60005433600160a060020a039081169116146102bb57600080fd5b600160a060020a038116156102f3576000805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0383161790555b50565b7fd204e27263771793b3472e4c07118500eb1ab892c2b2f0a4b90b33c33d4df42f8282604051821515815260406020820181815290820183818151815260200191508051906020019080838360005b8381101561035d578082015183820152602001610345565b50505050905090810190601f16801561038a5780820380516001836020036101000a031916815260200191505b50935050505060405180910390a15050565b602060405190810160405260008152905600a165627a7a723058206bcde2c3a4cf689ece10c413be63964fef8fc035e4668441e53765fc2b5f61910029", + "real_runtime_bytecode": "606060405236156100805763ffffffff7c01000000000000000000000000000000000000000000000000000000006000350416632a1afcd981146100825780634f829ee8146100a757806360fe47b1146100c05780636d4ce63c146100d65780638da5cb5b146100e9578063e93314ab14610118578063f2fde38b146101a2575b005b341561008d57600080fd5b6100956101c1565b60405190815260200160405180910390f35b34156100b257600080fd5b6100806004356024356101c7565b34156100cb57600080fd5b6100806004356101e8565b34156100e157600080fd5b61009561024a565b34156100f457600080fd5b6100fc610250565b604051600160a060020a03909116815260200160405180910390f35b341561012357600080fd5b61012b61025f565b60405160208082528190810183818151815260200191508051906020019080838360005b8381101561016757808201518382015260200161014f565b50505050905090810190601f1680156101945780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b34156101ad57600080fd5b610080600160a060020a03600435166102a0565b60015481565b60005433600160a060020a039081169116146101e257600080fd5b50600155565b600181905560005b6103e8811015610208576001805482018155016101f0565b610246600160408051908101604052600281527f686900000000000000000000000000000000000000000000000000000000000060208201526102f6565b5050565b60015490565b600054600160a060020a031681565b61026761039c565b60408051908101604052600581527f68656c6c6f0000000000000000000000000000000000000000000000000000006020820152905090565b60005433600160a060020a039081169116146102bb57600080fd5b600160a060020a038116156102f3576000805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0383161790555b50565b7fd204e27263771793b3472e4c07118500eb1ab892c2b2f0a4b90b33c33d4df42f8282604051821515815260406020820181815290820183818151815260200191508051906020019080838360005b8381101561035d578082015183820152602001610345565b50505050905090810190601f16801561038a5780820380516001836020036101000a031916815260200191505b50935050505060405180910390a15050565b602060405190810160405260008152905600a165627a7a723058206bcde2c3a4cf689ece10c413be63964fef8fc035e4668441e53765fc2b5f61910029", + "swarm_hash": "6bcde2c3a4cf689ece10c413be63964fef8fc035e4668441e53765fc2b5f6191", "gas_estimates": { "creation": { - "codeDepositCost": "197600", + "codeDepositCost": "197200", "executionCost": "40658", - "totalCost": "238258" + "totalCost": "237858" }, "external": { - "": "214", - "get()": "439", + "": "211", + "get()": "436", "getS()": "infinite", - "owner()": "614", + "owner()": "611", "set(uint256)": "infinite", - "set2(uint256,uint256)": "20473", - "storedData()": "373", - "transferOwnership(address)": "21043" + "set2(uint256,uint256)": "20470", + "storedData()": "370", + "transferOwnership(address)": "21040" } }, "function_hashes": { diff --git a/test_apps/contracts_app/build/contracts/SomeContract.json b/test_apps/contracts_app/build/contracts/SomeContract.json index 2f7e7e68a..0ad634ae3 100644 --- a/test_apps/contracts_app/build/contracts/SomeContract.json +++ b/test_apps/contracts_app/build/contracts/SomeContract.json @@ -1,21 +1,21 @@ { "contract_name": "SomeContract", - "address": "0x8BD7C0AeC1E7a32A97A1E310EE79C1A1e8fa7D53", - "code": "6060604052341561000f57600080fd5b6040516101dc3803806101dc83398101604052808051820191906020018051915082905060008151811061003f57fe5b9060200190602002015160008054600160a060020a031916600160a060020a03929092169190911790558160018151811061007657fe5b9060200190602002015160018054600160a060020a031916600160a060020a039290921691909117905560025550610129806100b36000396000f30060606040526004361060525763ffffffff7c01000000000000000000000000000000000000000000000000000000006000350416633fa4f245811460545780636b79ff5b146076578063fc25626f1460af575b005b3415605e57600080fd5b606460bf565b60405190815260200160405180910390f35b3415608057600080fd5b608660c5565b60405173ffffffffffffffffffffffffffffffffffffffff909116815260200160405180910390f35b341560b957600080fd5b608660e1565b60025481565b60005473ffffffffffffffffffffffffffffffffffffffff1681565b60015473ffffffffffffffffffffffffffffffffffffffff16815600a165627a7a72305820687fd659f9ca4e7caf8e4d554e4b03614f4433b5e8d449af9909e67e3b0c42ae0029", - "runtime_bytecode": "60606040526004361060525763ffffffff7c01000000000000000000000000000000000000000000000000000000006000350416633fa4f245811460545780636b79ff5b146076578063fc25626f1460af575b005b3415605e57600080fd5b606460bf565b60405190815260200160405180910390f35b3415608057600080fd5b608660c5565b60405173ffffffffffffffffffffffffffffffffffffffff909116815260200160405180910390f35b341560b957600080fd5b608660e1565b60025481565b60005473ffffffffffffffffffffffffffffffffffffffff1681565b60015473ffffffffffffffffffffffffffffffffffffffff16815600a165627a7a72305820687fd659f9ca4e7caf8e4d554e4b03614f4433b5e8d449af9909e67e3b0c42ae0029", - "real_runtime_bytecode": "60606040526004361060525763ffffffff7c01000000000000000000000000000000000000000000000000000000006000350416633fa4f245811460545780636b79ff5b146076578063fc25626f1460af575b005b3415605e57600080fd5b606460bf565b60405190815260200160405180910390f35b3415608057600080fd5b608660c5565b60405173ffffffffffffffffffffffffffffffffffffffff909116815260200160405180910390f35b341560b957600080fd5b608660e1565b60025481565b60005473ffffffffffffffffffffffffffffffffffffffff1681565b60015473ffffffffffffffffffffffffffffffffffffffff16815600a165627a7a72305820687fd659f9ca4e7caf8e4d554e4b03614f4433b5e8d449af9909e67e3b0c42ae0029", - "swarm_hash": "687fd659f9ca4e7caf8e4d554e4b03614f4433b5e8d449af9909e67e3b0c42ae", + "address": "0x8Ceaf75fff52a769582ca880E0be830B95D1C5FC", + "code": "6060604052341561000f57600080fd5b6040516101da3803806101da83398101604052808051820191906020018051915082905060008151811061003f57fe5b9060200190602002015160008054600160a060020a031916600160a060020a03929092169190911790558160018151811061007657fe5b9060200190602002015160018054600160a060020a031916600160a060020a039290921691909117905560025550610127806100b36000396000f3006060604052361560505763ffffffff7c01000000000000000000000000000000000000000000000000000000006000350416633fa4f245811460525780636b79ff5b146074578063fc25626f1460ad575b005b3415605c57600080fd5b606260bd565b60405190815260200160405180910390f35b3415607e57600080fd5b608460c3565b60405173ffffffffffffffffffffffffffffffffffffffff909116815260200160405180910390f35b341560b757600080fd5b608460df565b60025481565b60005473ffffffffffffffffffffffffffffffffffffffff1681565b60015473ffffffffffffffffffffffffffffffffffffffff16815600a165627a7a7230582009157ecead8ad8ed45f0c217be7423629f8b7e97649637aff999fcc9f10ae07a0029", + "runtime_bytecode": "6060604052361560505763ffffffff7c01000000000000000000000000000000000000000000000000000000006000350416633fa4f245811460525780636b79ff5b146074578063fc25626f1460ad575b005b3415605c57600080fd5b606260bd565b60405190815260200160405180910390f35b3415607e57600080fd5b608460c3565b60405173ffffffffffffffffffffffffffffffffffffffff909116815260200160405180910390f35b341560b757600080fd5b608460df565b60025481565b60005473ffffffffffffffffffffffffffffffffffffffff1681565b60015473ffffffffffffffffffffffffffffffffffffffff16815600a165627a7a7230582009157ecead8ad8ed45f0c217be7423629f8b7e97649637aff999fcc9f10ae07a0029", + "real_runtime_bytecode": "6060604052361560505763ffffffff7c01000000000000000000000000000000000000000000000000000000006000350416633fa4f245811460525780636b79ff5b146074578063fc25626f1460ad575b005b3415605c57600080fd5b606260bd565b60405190815260200160405180910390f35b3415607e57600080fd5b608460c3565b60405173ffffffffffffffffffffffffffffffffffffffff909116815260200160405180910390f35b341560b757600080fd5b608460df565b60025481565b60005473ffffffffffffffffffffffffffffffffffffffff1681565b60015473ffffffffffffffffffffffffffffffffffffffff16815600a165627a7a7230582009157ecead8ad8ed45f0c217be7423629f8b7e97649637aff999fcc9f10ae07a0029", + "swarm_hash": "09157ecead8ad8ed45f0c217be7423629f8b7e97649637aff999fcc9f10ae07a", "gas_estimates": { "creation": { - "codeDepositCost": "59400", + "codeDepositCost": "59000", "executionCost": "infinite", "totalCost": "infinite" }, "external": { - "": "126", - "addr_1()": "410", - "addr_2()": "432", - "value()": "373" + "": "123", + "addr_1()": "407", + "addr_2()": "429", + "value()": "370" } }, "function_hashes": { diff --git a/test_apps/contracts_app/build/contracts/Test.json b/test_apps/contracts_app/build/contracts/Test.json index de31e3096..5b9a8e49d 100644 --- a/test_apps/contracts_app/build/contracts/Test.json +++ b/test_apps/contracts_app/build/contracts/Test.json @@ -1,19 +1,19 @@ { "contract_name": "Test", - "address": "0x9c0cAb4FA09b09A8b3Ee63a7254332682a45D4B7", - "code": "6060604052341561000f57600080fd5b6102088061001e6000396000f3006060604052600436106100565763ffffffff7c0100000000000000000000000000000000000000000000000000000000600035041663767800de811461005b578063ae40f72f14610097578063fe64d6ff146100bc575b600080fd5b341561006657600080fd5b61006e6100ea565b60405173ffffffffffffffffffffffffffffffffffffffff909116815260200160405180910390f35b34156100a257600080fd5b6100aa610106565b60405190815260200160405180910390f35b34156100c757600080fd5b6100e873ffffffffffffffffffffffffffffffffffffffff600435166101a0565b005b60005473ffffffffffffffffffffffffffffffffffffffff1681565b600073a206287309074D383E74B912aa3b167E2C0BA82B63771602f7600160026000604051602001526040517c010000000000000000000000000000000000000000000000000000000063ffffffff85160281526004810192909252602482015260440160206040518083038186803b151561018157600080fd5b6102c65a03f4151561019257600080fd5b505050604051805191505090565b6000805473ffffffffffffffffffffffffffffffffffffffff191673ffffffffffffffffffffffffffffffffffffffff929092169190911790555600a165627a7a72305820739242705457813a7267172ab2e20df90e85a60da5c14ae7b6259b18c444a5130029", - "runtime_bytecode": "6060604052600436106100565763ffffffff7c0100000000000000000000000000000000000000000000000000000000600035041663767800de811461005b578063ae40f72f14610097578063fe64d6ff146100bc575b600080fd5b341561006657600080fd5b61006e6100ea565b60405173ffffffffffffffffffffffffffffffffffffffff909116815260200160405180910390f35b34156100a257600080fd5b6100aa610106565b60405190815260200160405180910390f35b34156100c757600080fd5b6100e873ffffffffffffffffffffffffffffffffffffffff600435166101a0565b005b60005473ffffffffffffffffffffffffffffffffffffffff1681565b600073__test.sol:ZAMyLib______________________63771602f7600160026000604051602001526040517c010000000000000000000000000000000000000000000000000000000063ffffffff85160281526004810192909252602482015260440160206040518083038186803b151561018157600080fd5b6102c65a03f4151561019257600080fd5b505050604051805191505090565b6000805473ffffffffffffffffffffffffffffffffffffffff191673ffffffffffffffffffffffffffffffffffffffff929092169190911790555600a165627a7a72305820739242705457813a7267172ab2e20df90e85a60da5c14ae7b6259b18c444a5130029", - "real_runtime_bytecode": "6060604052600436106100565763ffffffff7c0100000000000000000000000000000000000000000000000000000000600035041663767800de811461005b578063ae40f72f14610097578063fe64d6ff146100bc575b600080fd5b341561006657600080fd5b61006e6100ea565b60405173ffffffffffffffffffffffffffffffffffffffff909116815260200160405180910390f35b34156100a257600080fd5b6100aa610106565b60405190815260200160405180910390f35b34156100c757600080fd5b6100e873ffffffffffffffffffffffffffffffffffffffff600435166101a0565b005b60005473ffffffffffffffffffffffffffffffffffffffff1681565b600073__test.sol:ZAMyLib______________________63771602f7600160026000604051602001526040517c010000000000000000000000000000000000000000000000000000000063ffffffff85160281526004810192909252602482015260440160206040518083038186803b151561018157600080fd5b6102c65a03f4151561019257600080fd5b505050604051805191505090565b6000805473ffffffffffffffffffffffffffffffffffffffff191673ffffffffffffffffffffffffffffffffffffffff929092169190911790555600a165627a7a72305820739242705457813a7267172ab2e20df90e85a60da5c14ae7b6259b18c444a5130029", - "swarm_hash": "739242705457813a7267172ab2e20df90e85a60da5c14ae7b6259b18c444a513", + "address": "0x4CDbA232389410680E90A3450f4b7456febf3312", + "code": "6060604052341561000f57600080fd5b6101ff8061001e6000396000f300606060405263ffffffff7c0100000000000000000000000000000000000000000000000000000000600035041663767800de8114610052578063ae40f72f1461008e578063fe64d6ff146100b357600080fd5b341561005d57600080fd5b6100656100e1565b60405173ffffffffffffffffffffffffffffffffffffffff909116815260200160405180910390f35b341561009957600080fd5b6100a16100fd565b60405190815260200160405180910390f35b34156100be57600080fd5b6100df73ffffffffffffffffffffffffffffffffffffffff60043516610197565b005b60005473ffffffffffffffffffffffffffffffffffffffff1681565b600073d9F35C730c43e9f5E8de5AB11289a8f0f494669263771602f7600160026000604051602001526040517c010000000000000000000000000000000000000000000000000000000063ffffffff85160281526004810192909252602482015260440160206040518083038186803b151561017857600080fd5b6102c65a03f4151561018957600080fd5b505050604051805191505090565b6000805473ffffffffffffffffffffffffffffffffffffffff191673ffffffffffffffffffffffffffffffffffffffff929092169190911790555600a165627a7a723058205dafb55d35d578bd855a7b1cda88129ff1b062f3524edfa58cd7cd0f4441dabe0029", + "runtime_bytecode": "606060405263ffffffff7c0100000000000000000000000000000000000000000000000000000000600035041663767800de8114610052578063ae40f72f1461008e578063fe64d6ff146100b357600080fd5b341561005d57600080fd5b6100656100e1565b60405173ffffffffffffffffffffffffffffffffffffffff909116815260200160405180910390f35b341561009957600080fd5b6100a16100fd565b60405190815260200160405180910390f35b34156100be57600080fd5b6100df73ffffffffffffffffffffffffffffffffffffffff60043516610197565b005b60005473ffffffffffffffffffffffffffffffffffffffff1681565b600073__test.sol:ZAMyLib______________________63771602f7600160026000604051602001526040517c010000000000000000000000000000000000000000000000000000000063ffffffff85160281526004810192909252602482015260440160206040518083038186803b151561017857600080fd5b6102c65a03f4151561018957600080fd5b505050604051805191505090565b6000805473ffffffffffffffffffffffffffffffffffffffff191673ffffffffffffffffffffffffffffffffffffffff929092169190911790555600a165627a7a723058205dafb55d35d578bd855a7b1cda88129ff1b062f3524edfa58cd7cd0f4441dabe0029", + "real_runtime_bytecode": "606060405263ffffffff7c0100000000000000000000000000000000000000000000000000000000600035041663767800de8114610052578063ae40f72f1461008e578063fe64d6ff146100b357600080fd5b341561005d57600080fd5b6100656100e1565b60405173ffffffffffffffffffffffffffffffffffffffff909116815260200160405180910390f35b341561009957600080fd5b6100a16100fd565b60405190815260200160405180910390f35b34156100be57600080fd5b6100df73ffffffffffffffffffffffffffffffffffffffff60043516610197565b005b60005473ffffffffffffffffffffffffffffffffffffffff1681565b600073__test.sol:ZAMyLib______________________63771602f7600160026000604051602001526040517c010000000000000000000000000000000000000000000000000000000063ffffffff85160281526004810192909252602482015260440160206040518083038186803b151561017857600080fd5b6102c65a03f4151561018957600080fd5b505050604051805191505090565b6000805473ffffffffffffffffffffffffffffffffffffffff191673ffffffffffffffffffffffffffffffffffffffff929092169190911790555600a165627a7a723058205dafb55d35d578bd855a7b1cda88129ff1b062f3524edfa58cd7cd0f4441dabe0029", + "swarm_hash": "5dafb55d35d578bd855a7b1cda88129ff1b062f3524edfa58cd7cd0f4441dabe", "gas_estimates": { "creation": { - "codeDepositCost": "104000", - "executionCost": "148", - "totalCost": "104148" + "codeDepositCost": "102200", + "executionCost": "142", + "totalCost": "102342" }, "external": { - "addr()": "388", - "changeAddress(address)": "20426", + "addr()": "367", + "changeAddress(address)": "20405", "testAdd()": "infinite" } }, diff --git a/test_apps/contracts_app/build/contracts/Test2.json b/test_apps/contracts_app/build/contracts/Test2.json index 0f173a98f..031ed2ae0 100644 --- a/test_apps/contracts_app/build/contracts/Test2.json +++ b/test_apps/contracts_app/build/contracts/Test2.json @@ -1,19 +1,19 @@ { "contract_name": "Test2", - "address": "0x4B3643eB81709cb1b2040ae1E80d8EF419920AB6", - "code": "6060604052341561000f57600080fd5b6102088061001e6000396000f3006060604052600436106100565763ffffffff7c0100000000000000000000000000000000000000000000000000000000600035041663767800de811461005b578063ae40f72f14610097578063fe64d6ff146100bc575b600080fd5b341561006657600080fd5b61006e6100ea565b60405173ffffffffffffffffffffffffffffffffffffffff909116815260200160405180910390f35b34156100a257600080fd5b6100aa610106565b60405190815260200160405180910390f35b34156100c757600080fd5b6100e873ffffffffffffffffffffffffffffffffffffffff600435166101a0565b005b60005473ffffffffffffffffffffffffffffffffffffffff1681565b60007371cd20193D37D0C7272B8d6b8ce1DB924c49c1D463771602f7600160026000604051602001526040517c010000000000000000000000000000000000000000000000000000000063ffffffff85160281526004810192909252602482015260440160206040518083038186803b151561018157600080fd5b6102c65a03f4151561019257600080fd5b505050604051805191505090565b6000805473ffffffffffffffffffffffffffffffffffffffff191673ffffffffffffffffffffffffffffffffffffffff929092169190911790555600a165627a7a723058201c8fe226e9dc8f4e26b62f54574b8d9e3007618d528a3aff112993369b07820d0029", - "runtime_bytecode": "6060604052600436106100565763ffffffff7c0100000000000000000000000000000000000000000000000000000000600035041663767800de811461005b578063ae40f72f14610097578063fe64d6ff146100bc575b600080fd5b341561006657600080fd5b61006e6100ea565b60405173ffffffffffffffffffffffffffffffffffffffff909116815260200160405180910390f35b34156100a257600080fd5b6100aa610106565b60405190815260200160405180910390f35b34156100c757600080fd5b6100e873ffffffffffffffffffffffffffffffffffffffff600435166101a0565b005b60005473ffffffffffffffffffffffffffffffffffffffff1681565b600073__zlib2.sol:ZAMyLib2____________________63771602f7600160026000604051602001526040517c010000000000000000000000000000000000000000000000000000000063ffffffff85160281526004810192909252602482015260440160206040518083038186803b151561018157600080fd5b6102c65a03f4151561019257600080fd5b505050604051805191505090565b6000805473ffffffffffffffffffffffffffffffffffffffff191673ffffffffffffffffffffffffffffffffffffffff929092169190911790555600a165627a7a723058201c8fe226e9dc8f4e26b62f54574b8d9e3007618d528a3aff112993369b07820d0029", - "real_runtime_bytecode": "6060604052600436106100565763ffffffff7c0100000000000000000000000000000000000000000000000000000000600035041663767800de811461005b578063ae40f72f14610097578063fe64d6ff146100bc575b600080fd5b341561006657600080fd5b61006e6100ea565b60405173ffffffffffffffffffffffffffffffffffffffff909116815260200160405180910390f35b34156100a257600080fd5b6100aa610106565b60405190815260200160405180910390f35b34156100c757600080fd5b6100e873ffffffffffffffffffffffffffffffffffffffff600435166101a0565b005b60005473ffffffffffffffffffffffffffffffffffffffff1681565b600073__zlib2.sol:ZAMyLib2____________________63771602f7600160026000604051602001526040517c010000000000000000000000000000000000000000000000000000000063ffffffff85160281526004810192909252602482015260440160206040518083038186803b151561018157600080fd5b6102c65a03f4151561019257600080fd5b505050604051805191505090565b6000805473ffffffffffffffffffffffffffffffffffffffff191673ffffffffffffffffffffffffffffffffffffffff929092169190911790555600a165627a7a723058201c8fe226e9dc8f4e26b62f54574b8d9e3007618d528a3aff112993369b07820d0029", - "swarm_hash": "1c8fe226e9dc8f4e26b62f54574b8d9e3007618d528a3aff112993369b07820d", + "address": "0x3Cd5eb0A7da804BE54AAEaA7fd4594F65CCDA089", + "code": "6060604052341561000f57600080fd5b6101ff8061001e6000396000f300606060405263ffffffff7c0100000000000000000000000000000000000000000000000000000000600035041663767800de8114610052578063ae40f72f1461008e578063fe64d6ff146100b357600080fd5b341561005d57600080fd5b6100656100e1565b60405173ffffffffffffffffffffffffffffffffffffffff909116815260200160405180910390f35b341561009957600080fd5b6100a16100fd565b60405190815260200160405180910390f35b34156100be57600080fd5b6100df73ffffffffffffffffffffffffffffffffffffffff60043516610197565b005b60005473ffffffffffffffffffffffffffffffffffffffff1681565b60007368A4e859B23056B6D2967409002861158E1CBF1563771602f7600160026000604051602001526040517c010000000000000000000000000000000000000000000000000000000063ffffffff85160281526004810192909252602482015260440160206040518083038186803b151561017857600080fd5b6102c65a03f4151561018957600080fd5b505050604051805191505090565b6000805473ffffffffffffffffffffffffffffffffffffffff191673ffffffffffffffffffffffffffffffffffffffff929092169190911790555600a165627a7a72305820244a0919426b3941e7ee07bde5a6f76cbf7fea7960467f09a6afe5c6effef8b70029", + "runtime_bytecode": "606060405263ffffffff7c0100000000000000000000000000000000000000000000000000000000600035041663767800de8114610052578063ae40f72f1461008e578063fe64d6ff146100b357600080fd5b341561005d57600080fd5b6100656100e1565b60405173ffffffffffffffffffffffffffffffffffffffff909116815260200160405180910390f35b341561009957600080fd5b6100a16100fd565b60405190815260200160405180910390f35b34156100be57600080fd5b6100df73ffffffffffffffffffffffffffffffffffffffff60043516610197565b005b60005473ffffffffffffffffffffffffffffffffffffffff1681565b600073__zlib2.sol:ZAMyLib2____________________63771602f7600160026000604051602001526040517c010000000000000000000000000000000000000000000000000000000063ffffffff85160281526004810192909252602482015260440160206040518083038186803b151561017857600080fd5b6102c65a03f4151561018957600080fd5b505050604051805191505090565b6000805473ffffffffffffffffffffffffffffffffffffffff191673ffffffffffffffffffffffffffffffffffffffff929092169190911790555600a165627a7a72305820244a0919426b3941e7ee07bde5a6f76cbf7fea7960467f09a6afe5c6effef8b70029", + "real_runtime_bytecode": "606060405263ffffffff7c0100000000000000000000000000000000000000000000000000000000600035041663767800de8114610052578063ae40f72f1461008e578063fe64d6ff146100b357600080fd5b341561005d57600080fd5b6100656100e1565b60405173ffffffffffffffffffffffffffffffffffffffff909116815260200160405180910390f35b341561009957600080fd5b6100a16100fd565b60405190815260200160405180910390f35b34156100be57600080fd5b6100df73ffffffffffffffffffffffffffffffffffffffff60043516610197565b005b60005473ffffffffffffffffffffffffffffffffffffffff1681565b600073__zlib2.sol:ZAMyLib2____________________63771602f7600160026000604051602001526040517c010000000000000000000000000000000000000000000000000000000063ffffffff85160281526004810192909252602482015260440160206040518083038186803b151561017857600080fd5b6102c65a03f4151561018957600080fd5b505050604051805191505090565b6000805473ffffffffffffffffffffffffffffffffffffffff191673ffffffffffffffffffffffffffffffffffffffff929092169190911790555600a165627a7a72305820244a0919426b3941e7ee07bde5a6f76cbf7fea7960467f09a6afe5c6effef8b70029", + "swarm_hash": "244a0919426b3941e7ee07bde5a6f76cbf7fea7960467f09a6afe5c6effef8b7", "gas_estimates": { "creation": { - "codeDepositCost": "104000", - "executionCost": "148", - "totalCost": "104148" + "codeDepositCost": "102200", + "executionCost": "142", + "totalCost": "102342" }, "external": { - "addr()": "388", - "changeAddress(address)": "20426", + "addr()": "367", + "changeAddress(address)": "20405", "testAdd()": "infinite" } }, diff --git a/test_apps/contracts_app/build/contracts/Token.json b/test_apps/contracts_app/build/contracts/Token.json index 20d351680..5b846360c 100644 --- a/test_apps/contracts_app/build/contracts/Token.json +++ b/test_apps/contracts_app/build/contracts/Token.json @@ -1,23 +1,23 @@ { "contract_name": "Token", - "code": "6060604052341561000f57600080fd5b60405160208061049b83398101604052808051600160a060020a0333166000908152602081905260409020819055600255505061044a806100516000396000f3006060604052600436106100825763ffffffff7c0100000000000000000000000000000000000000000000000000000000600035041663095ea7b3811461008757806315945790146100bd57806318160ddd146100e257806323b872dd146100f557806370a082311461011d578063a9059cbb1461013c578063dd62ed3e1461015e575b600080fd5b341561009257600080fd5b6100a9600160a060020a0360043516602435610183565b604051901515815260200160405180910390f35b34156100c857600080fd5b6100d06101ef565b60405190815260200160405180910390f35b34156100ed57600080fd5b6100d06101f5565b341561010057600080fd5b6100a9600160a060020a03600435811690602435166044356101fb565b341561012857600080fd5b6100d0600160a060020a036004351661030f565b341561014757600080fd5b6100a9600160a060020a036004351660243561032a565b341561016957600080fd5b6100d0600160a060020a03600435811690602435166103ec565b600160a060020a03338116600081815260016020908152604080832094871680845294909152808220859055909291907f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b9259085905190815260200160405180910390a350600192915050565b60025481565b60025490565b600160a060020a0383166000908152602081905260408120548290101561022157600080fd5b600160a060020a03808516600090815260016020908152604080832033909416835292905220548290101561025557600080fd5b600160a060020a0383166000908152602081905260409020546102789083610417565b151561028357600080fd5b600160a060020a0380851660008181526001602090815260408083203386168452825280832080548890039055838352908290528082208054879003905592861680825290839020805486019055917fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9085905190815260200160405180910390a35060019392505050565b600160a060020a031660009081526020819052604090205490565b600160a060020a0333166000908152602081905260408120548290101561035057600080fd5b600160a060020a0383166000908152602081905260409020546103739083610417565b151561037e57600080fd5b600160a060020a033381166000818152602081905260408082208054879003905592861680825290839020805486019055917fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9085905190815260200160405180910390a350600192915050565b600160a060020a03918216600090815260016020908152604080832093909416825291909152205490565b81011015905600a165627a7a72305820e198e0113b80787ea6bed3da46c77abbf889cf88293ea9dfb03ec5db6ca30bcf0029", - "runtime_bytecode": "6060604052600436106100825763ffffffff7c0100000000000000000000000000000000000000000000000000000000600035041663095ea7b3811461008757806315945790146100bd57806318160ddd146100e257806323b872dd146100f557806370a082311461011d578063a9059cbb1461013c578063dd62ed3e1461015e575b600080fd5b341561009257600080fd5b6100a9600160a060020a0360043516602435610183565b604051901515815260200160405180910390f35b34156100c857600080fd5b6100d06101ef565b60405190815260200160405180910390f35b34156100ed57600080fd5b6100d06101f5565b341561010057600080fd5b6100a9600160a060020a03600435811690602435166044356101fb565b341561012857600080fd5b6100d0600160a060020a036004351661030f565b341561014757600080fd5b6100a9600160a060020a036004351660243561032a565b341561016957600080fd5b6100d0600160a060020a03600435811690602435166103ec565b600160a060020a03338116600081815260016020908152604080832094871680845294909152808220859055909291907f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b9259085905190815260200160405180910390a350600192915050565b60025481565b60025490565b600160a060020a0383166000908152602081905260408120548290101561022157600080fd5b600160a060020a03808516600090815260016020908152604080832033909416835292905220548290101561025557600080fd5b600160a060020a0383166000908152602081905260409020546102789083610417565b151561028357600080fd5b600160a060020a0380851660008181526001602090815260408083203386168452825280832080548890039055838352908290528082208054879003905592861680825290839020805486019055917fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9085905190815260200160405180910390a35060019392505050565b600160a060020a031660009081526020819052604090205490565b600160a060020a0333166000908152602081905260408120548290101561035057600080fd5b600160a060020a0383166000908152602081905260409020546103739083610417565b151561037e57600080fd5b600160a060020a033381166000818152602081905260408082208054879003905592861680825290839020805486019055917fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9085905190815260200160405180910390a350600192915050565b600160a060020a03918216600090815260016020908152604080832093909416825291909152205490565b81011015905600a165627a7a72305820e198e0113b80787ea6bed3da46c77abbf889cf88293ea9dfb03ec5db6ca30bcf0029", - "real_runtime_bytecode": "6060604052600436106100825763ffffffff7c0100000000000000000000000000000000000000000000000000000000600035041663095ea7b3811461008757806315945790146100bd57806318160ddd146100e257806323b872dd146100f557806370a082311461011d578063a9059cbb1461013c578063dd62ed3e1461015e575b600080fd5b341561009257600080fd5b6100a9600160a060020a0360043516602435610183565b604051901515815260200160405180910390f35b34156100c857600080fd5b6100d06101ef565b60405190815260200160405180910390f35b34156100ed57600080fd5b6100d06101f5565b341561010057600080fd5b6100a9600160a060020a03600435811690602435166044356101fb565b341561012857600080fd5b6100d0600160a060020a036004351661030f565b341561014757600080fd5b6100a9600160a060020a036004351660243561032a565b341561016957600080fd5b6100d0600160a060020a03600435811690602435166103ec565b600160a060020a03338116600081815260016020908152604080832094871680845294909152808220859055909291907f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b9259085905190815260200160405180910390a350600192915050565b60025481565b60025490565b600160a060020a0383166000908152602081905260408120548290101561022157600080fd5b600160a060020a03808516600090815260016020908152604080832033909416835292905220548290101561025557600080fd5b600160a060020a0383166000908152602081905260409020546102789083610417565b151561028357600080fd5b600160a060020a0380851660008181526001602090815260408083203386168452825280832080548890039055838352908290528082208054879003905592861680825290839020805486019055917fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9085905190815260200160405180910390a35060019392505050565b600160a060020a031660009081526020819052604090205490565b600160a060020a0333166000908152602081905260408120548290101561035057600080fd5b600160a060020a0383166000908152602081905260409020546103739083610417565b151561037e57600080fd5b600160a060020a033381166000818152602081905260408082208054879003905592861680825290839020805486019055917fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9085905190815260200160405180910390a350600192915050565b600160a060020a03918216600090815260016020908152604080832093909416825291909152205490565b81011015905600a165627a7a72305820e198e0113b80787ea6bed3da46c77abbf889cf88293ea9dfb03ec5db6ca30bcf0029", - "swarm_hash": "e198e0113b80787ea6bed3da46c77abbf889cf88293ea9dfb03ec5db6ca30bcf", + "code": "6060604052341561000f57600080fd5b60405160208061049983398101604052808051600160a060020a03331660009081526020819052604090208190556002555050610448806100516000396000f300606060405236156100805763ffffffff7c0100000000000000000000000000000000000000000000000000000000600035041663095ea7b3811461008557806315945790146100bb57806318160ddd146100e057806323b872dd146100f357806370a082311461011b578063a9059cbb1461013a578063dd62ed3e1461015c575b600080fd5b341561009057600080fd5b6100a7600160a060020a0360043516602435610181565b604051901515815260200160405180910390f35b34156100c657600080fd5b6100ce6101ed565b60405190815260200160405180910390f35b34156100eb57600080fd5b6100ce6101f3565b34156100fe57600080fd5b6100a7600160a060020a03600435811690602435166044356101f9565b341561012657600080fd5b6100ce600160a060020a036004351661030d565b341561014557600080fd5b6100a7600160a060020a0360043516602435610328565b341561016757600080fd5b6100ce600160a060020a03600435811690602435166103ea565b600160a060020a03338116600081815260016020908152604080832094871680845294909152808220859055909291907f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b9259085905190815260200160405180910390a350600192915050565b60025481565b60025490565b600160a060020a0383166000908152602081905260408120548290101561021f57600080fd5b600160a060020a03808516600090815260016020908152604080832033909416835292905220548290101561025357600080fd5b600160a060020a0383166000908152602081905260409020546102769083610415565b151561028157600080fd5b600160a060020a0380851660008181526001602090815260408083203386168452825280832080548890039055838352908290528082208054879003905592861680825290839020805486019055917fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9085905190815260200160405180910390a35060019392505050565b600160a060020a031660009081526020819052604090205490565b600160a060020a0333166000908152602081905260408120548290101561034e57600080fd5b600160a060020a0383166000908152602081905260409020546103719083610415565b151561037c57600080fd5b600160a060020a033381166000818152602081905260408082208054879003905592861680825290839020805486019055917fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9085905190815260200160405180910390a350600192915050565b600160a060020a03918216600090815260016020908152604080832093909416825291909152205490565b81011015905600a165627a7a72305820296acec21220568a1b9f9dcf20f96accf851205e34513c360b7e90ac6c1e70dd0029", + "runtime_bytecode": "606060405236156100805763ffffffff7c0100000000000000000000000000000000000000000000000000000000600035041663095ea7b3811461008557806315945790146100bb57806318160ddd146100e057806323b872dd146100f357806370a082311461011b578063a9059cbb1461013a578063dd62ed3e1461015c575b600080fd5b341561009057600080fd5b6100a7600160a060020a0360043516602435610181565b604051901515815260200160405180910390f35b34156100c657600080fd5b6100ce6101ed565b60405190815260200160405180910390f35b34156100eb57600080fd5b6100ce6101f3565b34156100fe57600080fd5b6100a7600160a060020a03600435811690602435166044356101f9565b341561012657600080fd5b6100ce600160a060020a036004351661030d565b341561014557600080fd5b6100a7600160a060020a0360043516602435610328565b341561016757600080fd5b6100ce600160a060020a03600435811690602435166103ea565b600160a060020a03338116600081815260016020908152604080832094871680845294909152808220859055909291907f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b9259085905190815260200160405180910390a350600192915050565b60025481565b60025490565b600160a060020a0383166000908152602081905260408120548290101561021f57600080fd5b600160a060020a03808516600090815260016020908152604080832033909416835292905220548290101561025357600080fd5b600160a060020a0383166000908152602081905260409020546102769083610415565b151561028157600080fd5b600160a060020a0380851660008181526001602090815260408083203386168452825280832080548890039055838352908290528082208054879003905592861680825290839020805486019055917fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9085905190815260200160405180910390a35060019392505050565b600160a060020a031660009081526020819052604090205490565b600160a060020a0333166000908152602081905260408120548290101561034e57600080fd5b600160a060020a0383166000908152602081905260409020546103719083610415565b151561037c57600080fd5b600160a060020a033381166000818152602081905260408082208054879003905592861680825290839020805486019055917fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9085905190815260200160405180910390a350600192915050565b600160a060020a03918216600090815260016020908152604080832093909416825291909152205490565b81011015905600a165627a7a72305820296acec21220568a1b9f9dcf20f96accf851205e34513c360b7e90ac6c1e70dd0029", + "real_runtime_bytecode": "606060405236156100805763ffffffff7c0100000000000000000000000000000000000000000000000000000000600035041663095ea7b3811461008557806315945790146100bb57806318160ddd146100e057806323b872dd146100f357806370a082311461011b578063a9059cbb1461013a578063dd62ed3e1461015c575b600080fd5b341561009057600080fd5b6100a7600160a060020a0360043516602435610181565b604051901515815260200160405180910390f35b34156100c657600080fd5b6100ce6101ed565b60405190815260200160405180910390f35b34156100eb57600080fd5b6100ce6101f3565b34156100fe57600080fd5b6100a7600160a060020a03600435811690602435166044356101f9565b341561012657600080fd5b6100ce600160a060020a036004351661030d565b341561014557600080fd5b6100a7600160a060020a0360043516602435610328565b341561016757600080fd5b6100ce600160a060020a03600435811690602435166103ea565b600160a060020a03338116600081815260016020908152604080832094871680845294909152808220859055909291907f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b9259085905190815260200160405180910390a350600192915050565b60025481565b60025490565b600160a060020a0383166000908152602081905260408120548290101561021f57600080fd5b600160a060020a03808516600090815260016020908152604080832033909416835292905220548290101561025357600080fd5b600160a060020a0383166000908152602081905260409020546102769083610415565b151561028157600080fd5b600160a060020a0380851660008181526001602090815260408083203386168452825280832080548890039055838352908290528082208054879003905592861680825290839020805486019055917fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9085905190815260200160405180910390a35060019392505050565b600160a060020a031660009081526020819052604090205490565b600160a060020a0333166000908152602081905260408120548290101561034e57600080fd5b600160a060020a0383166000908152602081905260409020546103719083610415565b151561037c57600080fd5b600160a060020a033381166000818152602081905260408082208054879003905592861680825290839020805486019055917fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9085905190815260200160405180910390a350600192915050565b600160a060020a03918216600090815260016020908152604080832093909416825291909152205490565b81011015905600a165627a7a72305820296acec21220568a1b9f9dcf20f96accf851205e34513c360b7e90ac6c1e70dd0029", + "swarm_hash": "296acec21220568a1b9f9dcf20f96accf851205e34513c360b7e90ac6c1e70dd", "gas_estimates": { "creation": { - "codeDepositCost": "219600", + "codeDepositCost": "219200", "executionCost": "40465", - "totalCost": "260065" + "totalCost": "259665" }, "external": { - "_supply()": "395", - "allowance(address,address)": "829", - "approve(address,uint256)": "22333", - "balanceOf(address)": "686", - "totalSupply()": "417", - "transfer(address,uint256)": "43633", - "transferFrom(address,address,uint256)": "64416" + "_supply()": "392", + "allowance(address,address)": "826", + "approve(address,uint256)": "22330", + "balanceOf(address)": "683", + "totalSupply()": "414", + "transfer(address,uint256)": "43630", + "transferFrom(address,address,uint256)": "64413" }, "internal": { "safeToAdd(uint256,uint256)": "24" diff --git a/test_apps/contracts_app/build/contracts/ZAMyLib.json b/test_apps/contracts_app/build/contracts/ZAMyLib.json index de318c8ee..a39e9c8dc 100644 --- a/test_apps/contracts_app/build/contracts/ZAMyLib.json +++ b/test_apps/contracts_app/build/contracts/ZAMyLib.json @@ -1,18 +1,18 @@ { "contract_name": "ZAMyLib", - "address": "0xa206287309074D383E74B912aa3b167E2C0BA82B", - "code": "60606040523415600e57600080fd5b60918061001c6000396000f300606060405260043610603e5763ffffffff7c0100000000000000000000000000000000000000000000000000000000600035041663771602f781146043575b600080fd5b604f6004356024356061565b60405190815260200160405180910390f35b01905600a165627a7a7230582020bb3fc766d83ffe33eed77ce7dfbd8f1e17cc60b0bba6aa938ddc9fc83931060029", - "runtime_bytecode": "606060405260043610603e5763ffffffff7c0100000000000000000000000000000000000000000000000000000000600035041663771602f781146043575b600080fd5b604f6004356024356061565b60405190815260200160405180910390f35b01905600a165627a7a7230582020bb3fc766d83ffe33eed77ce7dfbd8f1e17cc60b0bba6aa938ddc9fc83931060029", - "real_runtime_bytecode": "606060405260043610603e5763ffffffff7c0100000000000000000000000000000000000000000000000000000000600035041663771602f781146043575b600080fd5b604f6004356024356061565b60405190815260200160405180910390f35b01905600a165627a7a7230582020bb3fc766d83ffe33eed77ce7dfbd8f1e17cc60b0bba6aa938ddc9fc83931060029", - "swarm_hash": "20bb3fc766d83ffe33eed77ce7dfbd8f1e17cc60b0bba6aa938ddc9fc8393106", + "address": "0xd9F35C730c43e9f5E8de5AB11289a8f0f4946692", + "code": "60606040523415600e57600080fd5b60898061001c6000396000f300606060405263ffffffff7c0100000000000000000000000000000000000000000000000000000000600035041663771602f78114603b57600080fd5b60476004356024356059565b60405190815260200160405180910390f35b01905600a165627a7a72305820ede2cb131e1daa954b133652da10a32a7854ec4efe9627ca423678710326ea090029", + "runtime_bytecode": "606060405263ffffffff7c0100000000000000000000000000000000000000000000000000000000600035041663771602f78114603b57600080fd5b60476004356024356059565b60405190815260200160405180910390f35b01905600a165627a7a72305820ede2cb131e1daa954b133652da10a32a7854ec4efe9627ca423678710326ea090029", + "real_runtime_bytecode": "606060405263ffffffff7c0100000000000000000000000000000000000000000000000000000000600035041663771602f78114603b57600080fd5b60476004356024356059565b60405190815260200160405180910390f35b01905600a165627a7a72305820ede2cb131e1daa954b133652da10a32a7854ec4efe9627ca423678710326ea090029", + "swarm_hash": "ede2cb131e1daa954b133652da10a32a7854ec4efe9627ca423678710326ea09", "gas_estimates": { "creation": { - "codeDepositCost": "29000", + "codeDepositCost": "27400", "executionCost": "76", - "totalCost": "29076" + "totalCost": "27476" }, "external": { - "add(uint256,uint256)": "166" + "add(uint256,uint256)": "145" } }, "function_hashes": { diff --git a/test_apps/contracts_app/build/contracts/ZAMyLib2.json b/test_apps/contracts_app/build/contracts/ZAMyLib2.json index 7063b2b17..2154d87cf 100644 --- a/test_apps/contracts_app/build/contracts/ZAMyLib2.json +++ b/test_apps/contracts_app/build/contracts/ZAMyLib2.json @@ -1,18 +1,18 @@ { "contract_name": "ZAMyLib2", - "address": "0x71cd20193D37D0C7272B8d6b8ce1DB924c49c1D4", - "code": "60606040523415600e57600080fd5b60918061001c6000396000f300606060405260043610603e5763ffffffff7c0100000000000000000000000000000000000000000000000000000000600035041663771602f781146043575b600080fd5b604f6004356024356061565b60405190815260200160405180910390f35b01905600a165627a7a723058205f47d72010c29916986bc1c29a6607705bac7c77a0872f2fcb27d812fa6b94ed0029", - "runtime_bytecode": "606060405260043610603e5763ffffffff7c0100000000000000000000000000000000000000000000000000000000600035041663771602f781146043575b600080fd5b604f6004356024356061565b60405190815260200160405180910390f35b01905600a165627a7a723058205f47d72010c29916986bc1c29a6607705bac7c77a0872f2fcb27d812fa6b94ed0029", - "real_runtime_bytecode": "606060405260043610603e5763ffffffff7c0100000000000000000000000000000000000000000000000000000000600035041663771602f781146043575b600080fd5b604f6004356024356061565b60405190815260200160405180910390f35b01905600a165627a7a723058205f47d72010c29916986bc1c29a6607705bac7c77a0872f2fcb27d812fa6b94ed0029", - "swarm_hash": "5f47d72010c29916986bc1c29a6607705bac7c77a0872f2fcb27d812fa6b94ed", + "address": "0x68A4e859B23056B6D2967409002861158E1CBF15", + "code": "60606040523415600e57600080fd5b60898061001c6000396000f300606060405263ffffffff7c0100000000000000000000000000000000000000000000000000000000600035041663771602f78114603b57600080fd5b60476004356024356059565b60405190815260200160405180910390f35b01905600a165627a7a72305820d084d179422d3aec0f3377343cb85adf4bf4558a605e7cc86551c24d8af313420029", + "runtime_bytecode": "606060405263ffffffff7c0100000000000000000000000000000000000000000000000000000000600035041663771602f78114603b57600080fd5b60476004356024356059565b60405190815260200160405180910390f35b01905600a165627a7a72305820d084d179422d3aec0f3377343cb85adf4bf4558a605e7cc86551c24d8af313420029", + "real_runtime_bytecode": "606060405263ffffffff7c0100000000000000000000000000000000000000000000000000000000600035041663771602f78114603b57600080fd5b60476004356024356059565b60405190815260200160405180910390f35b01905600a165627a7a72305820d084d179422d3aec0f3377343cb85adf4bf4558a605e7cc86551c24d8af313420029", + "swarm_hash": "d084d179422d3aec0f3377343cb85adf4bf4558a605e7cc86551c24d8af31342", "gas_estimates": { "creation": { - "codeDepositCost": "29000", + "codeDepositCost": "27400", "executionCost": "76", - "totalCost": "29076" + "totalCost": "27476" }, "external": { - "add(uint256,uint256)": "166" + "add(uint256,uint256)": "145" } }, "function_hashes": { diff --git a/test_apps/contracts_app/chains.json b/test_apps/contracts_app/chains.json index 0967ef424..9cb24fd75 100644 --- a/test_apps/contracts_app/chains.json +++ b/test_apps/contracts_app/chains.json @@ -1 +1,55 @@ -{} +{ + "0x44470396e7e576b12f96d929c1555b2404c47e48bf0232a026b43cebe97dec41": { + "contracts": { + "0x79f903ab722af0e1fec06f910aa64dc71fd3023e232a946b35432f757d951bc0": { + "name": "AlreadyDeployedToken", + "address": "0xece374063fe5cc7efbaca0a498477cada94e5ad6" + }, + "0x43a7fdb062a49169e579493c0404cac3eb7c7e35144853e801081fc6364398c3": { + "name": "Assert", + "address": "0x5c24Fd0BAB4B6EA1C0f057C770815b82EcE9013F" + }, + "0x45b875328c08f3f01de18f3a4f42ae9917cc47b0d284d8eef1ed46b0593540ae": { + "name": "ContractArgs", + "address": "0xD38d37b84d83DAfEADd35D98354d47609456aEA4" + }, + "0x43e7107e99a2be83020800a2278a01673572a3aa69c48580361b848e989c509b": { + "name": "ZAMyLib2", + "address": "0x68A4e859B23056B6D2967409002861158E1CBF15" + }, + "0x263ad11c8ac793bd948abc51ed63bf456ae958deb8c09413250d312732a479da": { + "name": "Test2", + "address": "0x3Cd5eb0A7da804BE54AAEaA7fd4594F65CCDA089" + }, + "0x21ec9fef260b27aeb3220343703c4e9754a312c6be64dc09170c322302ae438f": { + "name": "MyToken2", + "address": "0x32858548ab987Bf2161A666824734eca77667fEc" + }, + "0xc10f570bb3ab32a609d2406d7d81994a6f4fabda7f7cd2c3a4df44934d6502f6": { + "name": "SimpleStorage", + "address": "0xbA43cfc248f026765Ce3076bDa8B932FE7BA9E17" + }, + "0x7eec94c1dde933c874a6bbf8f128f91bf976a6d955a0aaabb8dc7981701e8725": { + "name": "SomeContract", + "address": "0x8Ceaf75fff52a769582ca880E0be830B95D1C5FC" + }, + "0x44e732146c5700a2e4cead0a5cd5d94047fbf6b5149ab7d7814fc874d66d4649": { + "name": "MyToken", + "address": "0x11B0cb61776C29125cE3C2Eb86611933E8f9d5F1" + }, + "0xa5fec182f96887e8f82e36ad2ebbea945f26e5c96dcdc66977247365f9045899": { + "name": "ZAMyLib", + "address": "0xd9F35C730c43e9f5E8de5AB11289a8f0f4946692" + }, + "0xcbb235f7fb59ae45ac86c7109080d34dcf60d72ce334a1b5f896fd871e216867": { + "name": "Test", + "address": "0x4CDbA232389410680E90A3450f4b7456febf3312" + }, + "0x688f68c245dca1dfec941533a78f0079a7214710272e494e112f38e97e685f63": { + "name": "AnotherStorage", + "address": "0xbd1470c4E242141Ce45c82A570755bfe9965e99C" + } + }, + "name": "development" + } +} diff --git a/test_apps/test_app/chains.json b/test_apps/test_app/chains.json index ba755c94c..5bafd0e56 100644 --- a/test_apps/test_app/chains.json +++ b/test_apps/test_app/chains.json @@ -1,106 +1,53 @@ { - "0x5ec8005c986de4ba660d10622d3ae6359a58bee370e9cdc156f35155b0b27d8a": { + "0x44470396e7e576b12f96d929c1555b2404c47e48bf0232a026b43cebe97dec41": { "contracts": { "0x79f903ab722af0e1fec06f910aa64dc71fd3023e232a946b35432f757d951bc0": { "name": "AlreadyDeployedToken", "address": "0xece374063fe5cc7efbaca0a498477cada94e5ad6" }, - "0x0e0275c10e511f694564b0c4e3def28e38fe6ba0c1f26ab6c1cb86fdd73a3287": { + "0x43a7fdb062a49169e579493c0404cac3eb7c7e35144853e801081fc6364398c3": { "name": "Assert", - "address": "0xa719Ac005705737dCE9d299d966F64477D0C3C88" + "address": "0x603742BbA290F2C151F6c22E14655B8BAd0e8D59" }, - "0x53a9493497f8764439f2b6062994f8fe3d3c5a66450099244c0f8f32185a15df": { + "0x45b875328c08f3f01de18f3a4f42ae9917cc47b0d284d8eef1ed46b0593540ae": { "name": "ContractArgs", - "address": "0xF8F96446Ba5C0aC2101Ac08D82DaCaAeb463Ef1B" + "address": "0x86c0B5eBb9759c1445B9d094447DBfd60115f0AA" }, - "0xd1b69fd42ab462fb8af1009558bf53dbcc873ee43b3f759afcd54aabb4640338": { + "0x43e7107e99a2be83020800a2278a01673572a3aa69c48580361b848e989c509b": { "name": "ZAMyLib2", - "address": "0x78CBeDA23704CAB75c3da784f156EA5Bec2Bc768" + "address": "0x1d5cE6aC12614536B87A5A1c9a3292062Ea06e81" }, - "0x0d2c4116b7b36aec94353056c6f2ffd4179b1121b98d89164106df61d617d427": { + "0x263ad11c8ac793bd948abc51ed63bf456ae958deb8c09413250d312732a479da": { "name": "Test2", - "address": "0x1ac2C275Dcb1943e086437966B19F53A335ff429" + "address": "0xF327C0B8df4e94b8600B2d7636bf89011d9d60ca" }, "0x21ec9fef260b27aeb3220343703c4e9754a312c6be64dc09170c322302ae438f": { "name": "MyToken2", - "address": "0xf48e19Bace443b22fb81Db6553acf724F47c8e71" + "address": "0x71e61bAaA285Aa2e739E0d6583D83587316443d8" }, - "0x6cefd24d92c98376fa48a4b79fa31b4411bff757599d56154a46369cca076f5c": { + "0xc10f570bb3ab32a609d2406d7d81994a6f4fabda7f7cd2c3a4df44934d6502f6": { "name": "SimpleStorage", - "address": "0xCd75843660D99945a748937fF016cAE03B898257" + "address": "0xb23aADcD5d9514D668808043b1Fe0c64342D14f1" }, - "0x1ce8c617bcef50e16128c8fa4f9808e72ca07a059420ac45b86c6dcc84dedcb6": { + "0x8c51f8f40151d760ae5ae94ea9bb8bd16ad9120c12d2d844cb6047fea6c70485": { "name": "SomeContract", - "address": "0x97aeC601D4382CE93C9f17eA4c1E5D0E33ECCa25" + "address": "0xA0aC6E4Eea8534228c512F2e82e47e2A66Af5aFa" }, "0x44e732146c5700a2e4cead0a5cd5d94047fbf6b5149ab7d7814fc874d66d4649": { "name": "MyToken", - "address": "0x90d374DE503084961A5BBCBB047BF13bbb8Acf37" + "address": "0x6eDB84344Ff5D7Dd19F0139D7B49a1A45786fa16" }, - "0x926ab20d492caa04f4c9b91ae0394da1a49689e1984278a8161d1b96332ba8e5": { + "0xa5fec182f96887e8f82e36ad2ebbea945f26e5c96dcdc66977247365f9045899": { "name": "ZAMyLib", - "address": "0x3d6dCA8F2a9A8219Bb4eE0ab0B921A96Ec93e59a" + "address": "0xEA88201867c9091B6b39704398b68A9a16081F9A" }, - "0xba49165b12f1fbd15c17caf1b3d55d30b9607f1d74102732106ce1575df4bb1d": { + "0xcbb235f7fb59ae45ac86c7109080d34dcf60d72ce334a1b5f896fd871e216867": { "name": "Test", - "address": "0x578C955FAc1A0968aF683F571Cc534e86208c0e9" + "address": "0x1756d6F67E56EA46371caCb70174a761187B377f" }, - "0xd47154f6e16227fb915369f4be55eb74781481ee0f39b1689af3a0ef645b66f4": { + "0xa658afee70f526922ded48e6c4e972b4eadbe096fd7d848ee33c71545e767b28": { "name": "AnotherStorage", - "address": "0x9E4F5268682d7F63D8753eeC1F52082d60b8227a" - } - }, - "name": "development" - }, - "0xd5242650ebc8bf7188c00bad41ebe251972c10fc9760684d0c8f6fa3583a079a": { - "contracts": { - "0x79f903ab722af0e1fec06f910aa64dc71fd3023e232a946b35432f757d951bc0": { - "name": "AlreadyDeployedToken", - "address": "0xece374063fe5cc7efbaca0a498477cada94e5ad6" - }, - "0x0e0275c10e511f694564b0c4e3def28e38fe6ba0c1f26ab6c1cb86fdd73a3287": { - "name": "Assert", - "address": "0x9D86AE3b00C0E1954C1AAecB63A721138aF3C61f" - }, - "0x53a9493497f8764439f2b6062994f8fe3d3c5a66450099244c0f8f32185a15df": { - "name": "ContractArgs", - "address": "0x7d080FE2e2E81cfA933aa5a0C07660CCbc0F67E8" - }, - "0xd1b69fd42ab462fb8af1009558bf53dbcc873ee43b3f759afcd54aabb4640338": { - "name": "ZAMyLib2", - "address": "0x4a3e77391B3B6F44107AA3eF7321D2b7beA644ce" - }, - "0x0d2c4116b7b36aec94353056c6f2ffd4179b1121b98d89164106df61d617d427": { - "name": "Test2", - "address": "0x869409Df3631476E4F3aaB023B09eb8924B39AA0" - }, - "0x21ec9fef260b27aeb3220343703c4e9754a312c6be64dc09170c322302ae438f": { - "name": "MyToken2", - "address": "0x7E0F1F6d1BaA18b2BF88196f3a89e8CED5946CeB" - }, - "0x6cefd24d92c98376fa48a4b79fa31b4411bff757599d56154a46369cca076f5c": { - "name": "SimpleStorage", - "address": "0xE21d9850D73F4e4A76560ca78f9C12b96C62a9c9" - }, - "0x004c7b854f903d72feb021309d31899e044ecc54c477034acd8a3a5fb57d5d2d": { - "name": "SomeContract", - "address": "0x174209EC7826C02B3EE20E9ACd92b1C5682Decd9" - }, - "0x44e732146c5700a2e4cead0a5cd5d94047fbf6b5149ab7d7814fc874d66d4649": { - "name": "MyToken", - "address": "0xEac6Cd2E828DC034A747D9Bd9E9664685Ab911EF" - }, - "0x926ab20d492caa04f4c9b91ae0394da1a49689e1984278a8161d1b96332ba8e5": { - "name": "ZAMyLib", - "address": "0x83642bc74117d0861615f00A638325BcF8641D65" - }, - "0xba49165b12f1fbd15c17caf1b3d55d30b9607f1d74102732106ce1575df4bb1d": { - "name": "Test", - "address": "0x8ed732EC9F618426957985EC9cE98c19A7F46867" - }, - "0x54d523d07cc78237a285484d048f51483938b25ff98c86051e4b55114a42d1c2": { - "name": "AnotherStorage", - "address": "0xc639aFbf0E594AD57aeB8e9D7B8be0311d9254B4" + "address": "0xF53D45B4A90518561A3604B888186ea4BAaf30FE" } }, "name": "development"