From 1e2b22c25b1fbdb6bc3655d9053e81200830e33c Mon Sep 17 00:00:00 2001 From: Iuri Matias Date: Thu, 29 Mar 2018 19:05:30 -0400 Subject: [PATCH] simplify test contracts app --- test_apps/contracts_app/README.md | 6 +- .../{config2 => }/blockchain.json | 6 +- .../build/contracts/AlreadyDeployedToken.json | 30 +- .../build/contracts/AnotherStorage.json | 8 +- .../contracts_app/build/contracts/Assert.json | 5 +- .../build/contracts/ContractArgs.json | 14 +- .../build/contracts/MyToken.json | 32 +- .../build/contracts/MyToken2.json | 32 +- .../build/contracts/SimpleStorage.json | 26 +- .../build/contracts/SomeContract.json | 14 +- .../contracts_app/build/contracts/Test.json | 13 +- .../contracts_app/build/contracts/Test2.json | 13 +- .../contracts_app/build/contracts/Token.json | 30 +- .../build/contracts/ZAMyLib.json | 5 +- .../build/contracts/ZAMyLib2.json | 5 +- test_apps/contracts_app/chains.json | 375 +----------------- .../contracts_app/config2/communication.json | 12 - test_apps/contracts_app/config2/storage.json | 28 -- .../contracts_app/config2/webserver.json | 5 - .../{config2 => }/contracts.json | 0 .../{config2 => }/development/genesis.json | 0 .../{config2 => }/development/password | 0 test_apps/contracts_app/embark.json | 5 +- .../contracts_app/embark.old_config.json | 28 -- .../extensions/embark-service/index.js | 12 - .../embark-service/package-lock.json | 13 - .../extensions/embark-service/package.json | 14 - test_apps/test_app/README.md | 4 +- 28 files changed, 170 insertions(+), 565 deletions(-) rename test_apps/contracts_app/{config2 => }/blockchain.json (85%) delete mode 100644 test_apps/contracts_app/config2/communication.json delete mode 100644 test_apps/contracts_app/config2/storage.json delete mode 100644 test_apps/contracts_app/config2/webserver.json rename test_apps/contracts_app/{config2 => }/contracts.json (100%) rename test_apps/contracts_app/{config2 => }/development/genesis.json (100%) rename test_apps/contracts_app/{config2 => }/development/password (100%) delete mode 100644 test_apps/contracts_app/embark.old_config.json delete mode 100644 test_apps/contracts_app/extensions/embark-service/index.js delete mode 100644 test_apps/contracts_app/extensions/embark-service/package-lock.json delete mode 100644 test_apps/contracts_app/extensions/embark-service/package.json diff --git a/test_apps/contracts_app/README.md b/test_apps/contracts_app/README.md index 47ad5712f..17c7b01d1 100644 --- a/test_apps/contracts_app/README.md +++ b/test_apps/contracts_app/README.md @@ -1,8 +1,6 @@ Test App for integration testing purposes. -```../bin/embark run``` to check if everything is behaving as expected +```../../bin/embark run``` to check if everything is behaving as expected -```../bin/embark test``` to see tests are working as expected - -```dist/index.html``` and ```dist/test.html``` to check different functionality +```../../bin/embark test``` to see tests are working as expected diff --git a/test_apps/contracts_app/config2/blockchain.json b/test_apps/contracts_app/blockchain.json similarity index 85% rename from test_apps/contracts_app/config2/blockchain.json rename to test_apps/contracts_app/blockchain.json index 41400449a..8c3790a6f 100644 --- a/test_apps/contracts_app/config2/blockchain.json +++ b/test_apps/contracts_app/blockchain.json @@ -2,7 +2,7 @@ "development": { "enabled": true, "networkType": "custom", - "genesisBlock": "config/development/genesis.json", + "genesisBlock": "development/genesis.json", "datadir": ".embark/development/datadir", "mineWhenNeeded": true, "nodiscover": true, @@ -11,7 +11,7 @@ "rpcPort": 8545, "rpcCorsDomain": "http://localhost:8000", "account": { - "password": "config/development/password" + "password": "development/password" }, "targetGasLimit": 8000000, "wsOrigins": "http://localhost:8000", @@ -31,7 +31,7 @@ "rpcPort": 8545, "rpcCorsDomain": "http://localhost:8000", "account": { - "password": "config/livenet/password" + "password": "livenet/password" } }, "privatenet": { diff --git a/test_apps/contracts_app/build/contracts/AlreadyDeployedToken.json b/test_apps/contracts_app/build/contracts/AlreadyDeployedToken.json index 90dd0215c..4932f70cb 100644 --- a/test_apps/contracts_app/build/contracts/AlreadyDeployedToken.json +++ b/test_apps/contracts_app/build/contracts/AlreadyDeployedToken.json @@ -53,7 +53,8 @@ ], "payable": false, "stateMutability": "nonpayable", - "type": "function" + "type": "function", + "signature": "0x095ea7b3" }, { "constant": true, @@ -67,7 +68,8 @@ ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0x15945790" }, { "constant": true, @@ -81,7 +83,8 @@ ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0x18160ddd" }, { "constant": false, @@ -108,7 +111,8 @@ ], "payable": false, "stateMutability": "nonpayable", - "type": "function" + "type": "function", + "signature": "0x23b872dd" }, { "constant": true, @@ -127,7 +131,8 @@ ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0x70a08231" }, { "constant": false, @@ -150,7 +155,8 @@ ], "payable": false, "stateMutability": "nonpayable", - "type": "function" + "type": "function", + "signature": "0xa9059cbb" }, { "constant": true, @@ -173,7 +179,8 @@ ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0xdd62ed3e" }, { "inputs": [ @@ -184,7 +191,8 @@ ], "payable": false, "stateMutability": "nonpayable", - "type": "constructor" + "type": "constructor", + "signature": "constructor" }, { "anonymous": false, @@ -206,7 +214,8 @@ } ], "name": "Transfer", - "type": "event" + "type": "event", + "signature": "0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef" }, { "anonymous": false, @@ -228,7 +237,8 @@ } ], "name": "Approval", - "type": "event" + "type": "event", + "signature": "0x8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925" } ] } diff --git a/test_apps/contracts_app/build/contracts/AnotherStorage.json b/test_apps/contracts_app/build/contracts/AnotherStorage.json index a73e6b84c..fb4395e67 100644 --- a/test_apps/contracts_app/build/contracts/AnotherStorage.json +++ b/test_apps/contracts_app/build/contracts/AnotherStorage.json @@ -1,6 +1,6 @@ { "contract_name": "AnotherStorage", - "address": "0xFd0E3F269e6aa239708E020F7fB9c00FfcC7E547", + "address": "0xb61d417D82C1abA973d2061Cd6e017F194A5afc1", "code": "6060604052341561000f57600080fd5b6040516020806101178339810160405280805160008054600160a060020a03909216600160a060020a0319909216919091179055505060c4806100536000396000f300606060405260043610603e5763ffffffff7c01000000000000000000000000000000000000000000000000000000006000350416633610eb0e81146043575b600080fd5b3415604d57600080fd5b6053607c565b60405173ffffffffffffffffffffffffffffffffffffffff909116815260200160405180910390f35b60005473ffffffffffffffffffffffffffffffffffffffff16815600a165627a7a723058204834d4df0eea462e734731877ef420533d7f1a4c586543a18769f9a66fe801660029", "runtime_bytecode": "606060405260043610603e5763ffffffff7c01000000000000000000000000000000000000000000000000000000006000350416633610eb0e81146043575b600080fd5b3415604d57600080fd5b6053607c565b60405173ffffffffffffffffffffffffffffffffffffffff909116815260200160405180910390f35b60005473ffffffffffffffffffffffffffffffffffffffff16815600a165627a7a723058204834d4df0eea462e734731877ef420533d7f1a4c586543a18769f9a66fe801660029", "real_runtime_bytecode": "606060405260043610603e5763ffffffff7c01000000000000000000000000000000000000000000000000000000006000350416633610eb0e81146043575b600080fd5b3415604d57600080fd5b6053607c565b60405173ffffffffffffffffffffffffffffffffffffffff909116815260200160405180910390f35b60005473ffffffffffffffffffffffffffffffffffffffff16815600a165627a7a723058204834d4df0eea462e734731877ef420533d7f1a4c586543a18769f9a66fe801660029", @@ -31,7 +31,8 @@ ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0x3610eb0e" }, { "inputs": [ @@ -42,7 +43,8 @@ ], "payable": false, "stateMutability": "nonpayable", - "type": "constructor" + "type": "constructor", + "signature": "constructor" } ] } diff --git a/test_apps/contracts_app/build/contracts/Assert.json b/test_apps/contracts_app/build/contracts/Assert.json index e3195fd4e..aa59c129a 100644 --- a/test_apps/contracts_app/build/contracts/Assert.json +++ b/test_apps/contracts_app/build/contracts/Assert.json @@ -1,6 +1,6 @@ { "contract_name": "Assert", - "address": "0xCFC27E55Af92f932FA52190613fCe0191c4A1153", + "address": "0x5Eb2130A982D279e597226fD339Eb155f7171B91", "code": "60606040523415600e57600080fd5b603580601b6000396000f3006060604052600080fd00a165627a7a72305820e199c6ed628993d1a790168511d9f0a36d6a180028664d9d9533d968364233550029", "runtime_bytecode": "6060604052600080fd00a165627a7a72305820e199c6ed628993d1a790168511d9f0a36d6a180028664d9d9533d968364233550029", "real_runtime_bytecode": "6060604052600080fd00a165627a7a72305820e199c6ed628993d1a790168511d9f0a36d6a180028664d9d9533d968364233550029", @@ -32,7 +32,8 @@ } ], "name": "TestEvent", - "type": "event" + "type": "event", + "signature": "0xd204e27263771793b3472e4c07118500eb1ab892c2b2f0a4b90b33c33d4df42f" } ] } diff --git a/test_apps/contracts_app/build/contracts/ContractArgs.json b/test_apps/contracts_app/build/contracts/ContractArgs.json index 0366a78d2..1108b0558 100644 --- a/test_apps/contracts_app/build/contracts/ContractArgs.json +++ b/test_apps/contracts_app/build/contracts/ContractArgs.json @@ -1,6 +1,6 @@ { "contract_name": "ContractArgs", - "address": "0x10f10732801D454C97234aC56b00CE46e7669C1d", + "address": "0x3B904C882523b36Edd8c9813db6aCE6cBa416060", "code": "6060604052341561000f57600080fd5b6040516101dc3803806101dc83398101604052808051820191906020018051915082905060008151811061003f57fe5b9060200190602002015160008054600160a060020a031916600160a060020a03929092169190911790558160018151811061007657fe5b9060200190602002015160018054600160a060020a031916600160a060020a039290921691909117905560025550610129806100b36000396000f30060606040526004361060525763ffffffff7c01000000000000000000000000000000000000000000000000000000006000350416633fa4f245811460545780636b79ff5b146076578063fc25626f1460af575b005b3415605e57600080fd5b606460bf565b60405190815260200160405180910390f35b3415608057600080fd5b608660c5565b60405173ffffffffffffffffffffffffffffffffffffffff909116815260200160405180910390f35b341560b957600080fd5b608660e1565b60025481565b60005473ffffffffffffffffffffffffffffffffffffffff1681565b60015473ffffffffffffffffffffffffffffffffffffffff16815600a165627a7a723058202feaf8353834596f501bba96e3c7ba0138a12d5e49079503897392561b6289170029", "runtime_bytecode": "60606040526004361060525763ffffffff7c01000000000000000000000000000000000000000000000000000000006000350416633fa4f245811460545780636b79ff5b146076578063fc25626f1460af575b005b3415605e57600080fd5b606460bf565b60405190815260200160405180910390f35b3415608057600080fd5b608660c5565b60405173ffffffffffffffffffffffffffffffffffffffff909116815260200160405180910390f35b341560b957600080fd5b608660e1565b60025481565b60005473ffffffffffffffffffffffffffffffffffffffff1681565b60015473ffffffffffffffffffffffffffffffffffffffff16815600a165627a7a723058202feaf8353834596f501bba96e3c7ba0138a12d5e49079503897392561b6289170029", "real_runtime_bytecode": "60606040526004361060525763ffffffff7c01000000000000000000000000000000000000000000000000000000006000350416633fa4f245811460545780636b79ff5b146076578063fc25626f1460af575b005b3415605e57600080fd5b606460bf565b60405190815260200160405180910390f35b3415608057600080fd5b608660c5565b60405173ffffffffffffffffffffffffffffffffffffffff909116815260200160405180910390f35b341560b957600080fd5b608660e1565b60025481565b60005473ffffffffffffffffffffffffffffffffffffffff1681565b60015473ffffffffffffffffffffffffffffffffffffffff16815600a165627a7a723058202feaf8353834596f501bba96e3c7ba0138a12d5e49079503897392561b6289170029", @@ -36,7 +36,8 @@ ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0x3fa4f245" }, { "constant": true, @@ -50,7 +51,8 @@ ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0x6b79ff5b" }, { "constant": true, @@ -64,7 +66,8 @@ ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0xfc25626f" }, { "inputs": [ @@ -79,7 +82,8 @@ ], "payable": false, "stateMutability": "nonpayable", - "type": "constructor" + "type": "constructor", + "signature": "constructor" }, { "payable": true, diff --git a/test_apps/contracts_app/build/contracts/MyToken.json b/test_apps/contracts_app/build/contracts/MyToken.json index f01be4383..0951d69fa 100644 --- a/test_apps/contracts_app/build/contracts/MyToken.json +++ b/test_apps/contracts_app/build/contracts/MyToken.json @@ -1,6 +1,6 @@ { "contract_name": "MyToken", - "address": "0x24D589f21fB72903409bcaDe787F627Aa08Dec59", + "address": "0xbbF2721136ce2F2C69FE3809de39cb5f1d54125C", "code": "6060604052341561000f57600080fd5b60405160208061049b83398101604052808051600160a060020a0333166000908152602081905260409020819055600255505061044a806100516000396000f3006060604052600436106100825763ffffffff7c0100000000000000000000000000000000000000000000000000000000600035041663095ea7b3811461008757806315945790146100bd57806318160ddd146100e257806323b872dd146100f557806370a082311461011d578063a9059cbb1461013c578063dd62ed3e1461015e575b600080fd5b341561009257600080fd5b6100a9600160a060020a0360043516602435610183565b604051901515815260200160405180910390f35b34156100c857600080fd5b6100d06101ef565b60405190815260200160405180910390f35b34156100ed57600080fd5b6100d06101f5565b341561010057600080fd5b6100a9600160a060020a03600435811690602435166044356101fb565b341561012857600080fd5b6100d0600160a060020a036004351661030f565b341561014757600080fd5b6100a9600160a060020a036004351660243561032a565b341561016957600080fd5b6100d0600160a060020a03600435811690602435166103ec565b600160a060020a03338116600081815260016020908152604080832094871680845294909152808220859055909291907f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b9259085905190815260200160405180910390a350600192915050565b60025481565b60025490565b600160a060020a0383166000908152602081905260408120548290101561022157600080fd5b600160a060020a03808516600090815260016020908152604080832033909416835292905220548290101561025557600080fd5b600160a060020a0383166000908152602081905260409020546102789083610417565b151561028357600080fd5b600160a060020a0380851660008181526001602090815260408083203386168452825280832080548890039055838352908290528082208054879003905592861680825290839020805486019055917fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9085905190815260200160405180910390a35060019392505050565b600160a060020a031660009081526020819052604090205490565b600160a060020a0333166000908152602081905260408120548290101561035057600080fd5b600160a060020a0383166000908152602081905260409020546103739083610417565b151561037e57600080fd5b600160a060020a033381166000818152602081905260408082208054879003905592861680825290839020805486019055917fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9085905190815260200160405180910390a350600192915050565b600160a060020a03918216600090815260016020908152604080832093909416825291909152205490565b81011015905600a165627a7a72305820e198e0113b80787ea6bed3da46c77abbf889cf88293ea9dfb03ec5db6ca30bcf0029", "runtime_bytecode": "6060604052600436106100825763ffffffff7c0100000000000000000000000000000000000000000000000000000000600035041663095ea7b3811461008757806315945790146100bd57806318160ddd146100e257806323b872dd146100f557806370a082311461011d578063a9059cbb1461013c578063dd62ed3e1461015e575b600080fd5b341561009257600080fd5b6100a9600160a060020a0360043516602435610183565b604051901515815260200160405180910390f35b34156100c857600080fd5b6100d06101ef565b60405190815260200160405180910390f35b34156100ed57600080fd5b6100d06101f5565b341561010057600080fd5b6100a9600160a060020a03600435811690602435166044356101fb565b341561012857600080fd5b6100d0600160a060020a036004351661030f565b341561014757600080fd5b6100a9600160a060020a036004351660243561032a565b341561016957600080fd5b6100d0600160a060020a03600435811690602435166103ec565b600160a060020a03338116600081815260016020908152604080832094871680845294909152808220859055909291907f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b9259085905190815260200160405180910390a350600192915050565b60025481565b60025490565b600160a060020a0383166000908152602081905260408120548290101561022157600080fd5b600160a060020a03808516600090815260016020908152604080832033909416835292905220548290101561025557600080fd5b600160a060020a0383166000908152602081905260409020546102789083610417565b151561028357600080fd5b600160a060020a0380851660008181526001602090815260408083203386168452825280832080548890039055838352908290528082208054879003905592861680825290839020805486019055917fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9085905190815260200160405180910390a35060019392505050565b600160a060020a031660009081526020819052604090205490565b600160a060020a0333166000908152602081905260408120548290101561035057600080fd5b600160a060020a0383166000908152602081905260409020546103739083610417565b151561037e57600080fd5b600160a060020a033381166000818152602081905260408082208054879003905592861680825290839020805486019055917fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9085905190815260200160405180910390a350600192915050565b600160a060020a03918216600090815260016020908152604080832093909416825291909152205490565b81011015905600a165627a7a72305820e198e0113b80787ea6bed3da46c77abbf889cf88293ea9dfb03ec5db6ca30bcf0029", "gas_estimates": { @@ -53,7 +53,8 @@ ], "payable": false, "stateMutability": "nonpayable", - "type": "function" + "type": "function", + "signature": "0x095ea7b3" }, { "constant": true, @@ -67,7 +68,8 @@ ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0x15945790" }, { "constant": true, @@ -81,7 +83,8 @@ ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0x18160ddd" }, { "constant": false, @@ -108,7 +111,8 @@ ], "payable": false, "stateMutability": "nonpayable", - "type": "function" + "type": "function", + "signature": "0x23b872dd" }, { "constant": true, @@ -127,7 +131,8 @@ ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0x70a08231" }, { "constant": false, @@ -150,7 +155,8 @@ ], "payable": false, "stateMutability": "nonpayable", - "type": "function" + "type": "function", + "signature": "0xa9059cbb" }, { "constant": true, @@ -173,7 +179,8 @@ ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0xdd62ed3e" }, { "inputs": [ @@ -184,7 +191,8 @@ ], "payable": false, "stateMutability": "nonpayable", - "type": "constructor" + "type": "constructor", + "signature": "constructor" }, { "anonymous": false, @@ -206,7 +214,8 @@ } ], "name": "Transfer", - "type": "event" + "type": "event", + "signature": "0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef" }, { "anonymous": false, @@ -228,7 +237,8 @@ } ], "name": "Approval", - "type": "event" + "type": "event", + "signature": "0x8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925" } ] } diff --git a/test_apps/contracts_app/build/contracts/MyToken2.json b/test_apps/contracts_app/build/contracts/MyToken2.json index ae9de8c4d..e58fdfd11 100644 --- a/test_apps/contracts_app/build/contracts/MyToken2.json +++ b/test_apps/contracts_app/build/contracts/MyToken2.json @@ -1,6 +1,6 @@ { "contract_name": "MyToken2", - "address": "0x42b9D34Febdfb4A065E8eF3536213871CbCc059B", + "address": "0x95eBb3E309CFa837d34578e24cdd7A72Fed2E94f", "code": "6060604052341561000f57600080fd5b60405160208061049b83398101604052808051600160a060020a0333166000908152602081905260409020819055600255505061044a806100516000396000f3006060604052600436106100825763ffffffff7c0100000000000000000000000000000000000000000000000000000000600035041663095ea7b3811461008757806315945790146100bd57806318160ddd146100e257806323b872dd146100f557806370a082311461011d578063a9059cbb1461013c578063dd62ed3e1461015e575b600080fd5b341561009257600080fd5b6100a9600160a060020a0360043516602435610183565b604051901515815260200160405180910390f35b34156100c857600080fd5b6100d06101ef565b60405190815260200160405180910390f35b34156100ed57600080fd5b6100d06101f5565b341561010057600080fd5b6100a9600160a060020a03600435811690602435166044356101fb565b341561012857600080fd5b6100d0600160a060020a036004351661030f565b341561014757600080fd5b6100a9600160a060020a036004351660243561032a565b341561016957600080fd5b6100d0600160a060020a03600435811690602435166103ec565b600160a060020a03338116600081815260016020908152604080832094871680845294909152808220859055909291907f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b9259085905190815260200160405180910390a350600192915050565b60025481565b60025490565b600160a060020a0383166000908152602081905260408120548290101561022157600080fd5b600160a060020a03808516600090815260016020908152604080832033909416835292905220548290101561025557600080fd5b600160a060020a0383166000908152602081905260409020546102789083610417565b151561028357600080fd5b600160a060020a0380851660008181526001602090815260408083203386168452825280832080548890039055838352908290528082208054879003905592861680825290839020805486019055917fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9085905190815260200160405180910390a35060019392505050565b600160a060020a031660009081526020819052604090205490565b600160a060020a0333166000908152602081905260408120548290101561035057600080fd5b600160a060020a0383166000908152602081905260409020546103739083610417565b151561037e57600080fd5b600160a060020a033381166000818152602081905260408082208054879003905592861680825290839020805486019055917fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9085905190815260200160405180910390a350600192915050565b600160a060020a03918216600090815260016020908152604080832093909416825291909152205490565b81011015905600a165627a7a72305820e198e0113b80787ea6bed3da46c77abbf889cf88293ea9dfb03ec5db6ca30bcf0029", "runtime_bytecode": "6060604052600436106100825763ffffffff7c0100000000000000000000000000000000000000000000000000000000600035041663095ea7b3811461008757806315945790146100bd57806318160ddd146100e257806323b872dd146100f557806370a082311461011d578063a9059cbb1461013c578063dd62ed3e1461015e575b600080fd5b341561009257600080fd5b6100a9600160a060020a0360043516602435610183565b604051901515815260200160405180910390f35b34156100c857600080fd5b6100d06101ef565b60405190815260200160405180910390f35b34156100ed57600080fd5b6100d06101f5565b341561010057600080fd5b6100a9600160a060020a03600435811690602435166044356101fb565b341561012857600080fd5b6100d0600160a060020a036004351661030f565b341561014757600080fd5b6100a9600160a060020a036004351660243561032a565b341561016957600080fd5b6100d0600160a060020a03600435811690602435166103ec565b600160a060020a03338116600081815260016020908152604080832094871680845294909152808220859055909291907f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b9259085905190815260200160405180910390a350600192915050565b60025481565b60025490565b600160a060020a0383166000908152602081905260408120548290101561022157600080fd5b600160a060020a03808516600090815260016020908152604080832033909416835292905220548290101561025557600080fd5b600160a060020a0383166000908152602081905260409020546102789083610417565b151561028357600080fd5b600160a060020a0380851660008181526001602090815260408083203386168452825280832080548890039055838352908290528082208054879003905592861680825290839020805486019055917fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9085905190815260200160405180910390a35060019392505050565b600160a060020a031660009081526020819052604090205490565b600160a060020a0333166000908152602081905260408120548290101561035057600080fd5b600160a060020a0383166000908152602081905260409020546103739083610417565b151561037e57600080fd5b600160a060020a033381166000818152602081905260408082208054879003905592861680825290839020805486019055917fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9085905190815260200160405180910390a350600192915050565b600160a060020a03918216600090815260016020908152604080832093909416825291909152205490565b81011015905600a165627a7a72305820e198e0113b80787ea6bed3da46c77abbf889cf88293ea9dfb03ec5db6ca30bcf0029", "gas_estimates": { @@ -53,7 +53,8 @@ ], "payable": false, "stateMutability": "nonpayable", - "type": "function" + "type": "function", + "signature": "0x095ea7b3" }, { "constant": true, @@ -67,7 +68,8 @@ ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0x15945790" }, { "constant": true, @@ -81,7 +83,8 @@ ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0x18160ddd" }, { "constant": false, @@ -108,7 +111,8 @@ ], "payable": false, "stateMutability": "nonpayable", - "type": "function" + "type": "function", + "signature": "0x23b872dd" }, { "constant": true, @@ -127,7 +131,8 @@ ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0x70a08231" }, { "constant": false, @@ -150,7 +155,8 @@ ], "payable": false, "stateMutability": "nonpayable", - "type": "function" + "type": "function", + "signature": "0xa9059cbb" }, { "constant": true, @@ -173,7 +179,8 @@ ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0xdd62ed3e" }, { "inputs": [ @@ -184,7 +191,8 @@ ], "payable": false, "stateMutability": "nonpayable", - "type": "constructor" + "type": "constructor", + "signature": "constructor" }, { "anonymous": false, @@ -206,7 +214,8 @@ } ], "name": "Transfer", - "type": "event" + "type": "event", + "signature": "0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef" }, { "anonymous": false, @@ -228,7 +237,8 @@ } ], "name": "Approval", - "type": "event" + "type": "event", + "signature": "0x8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925" } ] } diff --git a/test_apps/contracts_app/build/contracts/SimpleStorage.json b/test_apps/contracts_app/build/contracts/SimpleStorage.json index 68f937f90..4d9f61a68 100644 --- a/test_apps/contracts_app/build/contracts/SimpleStorage.json +++ b/test_apps/contracts_app/build/contracts/SimpleStorage.json @@ -1,6 +1,6 @@ { "contract_name": "SimpleStorage", - "address": "0x1f0894FfCC00ed5f326b2dc18d9ACe53CfAFC1AD", + "address": "0xf400925155a8ED845a15b3f1c4C4984f31645A07", "code": "6060604052341561000f57600080fd5b60405160208061042f8339810160405280805160008054600160a060020a033316600160a060020a031990911617905560015550506103dc806100536000396000f3006060604052600436106100825763ffffffff7c01000000000000000000000000000000000000000000000000000000006000350416632a1afcd981146100845780634f829ee8146100a957806360fe47b1146100c25780636d4ce63c146100d85780638da5cb5b146100eb578063e93314ab1461011a578063f2fde38b146101a4575b005b341561008f57600080fd5b6100976101c3565b60405190815260200160405180910390f35b34156100b457600080fd5b6100826004356024356101c9565b34156100cd57600080fd5b6100826004356101ea565b34156100e357600080fd5b61009761024c565b34156100f657600080fd5b6100fe610252565b604051600160a060020a03909116815260200160405180910390f35b341561012557600080fd5b61012d610261565b60405160208082528190810183818151815260200191508051906020019080838360005b83811015610169578082015183820152602001610151565b50505050905090810190601f1680156101965780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b34156101af57600080fd5b610082600160a060020a03600435166102a2565b60015481565b60005433600160a060020a039081169116146101e457600080fd5b50600155565b600181905560005b6103e881101561020a576001805482018155016101f2565b610248600160408051908101604052600281527f686900000000000000000000000000000000000000000000000000000000000060208201526102f8565b5050565b60015490565b600054600160a060020a031681565b61026961039e565b60408051908101604052600581527f68656c6c6f0000000000000000000000000000000000000000000000000000006020820152905090565b60005433600160a060020a039081169116146102bd57600080fd5b600160a060020a038116156102f5576000805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0383161790555b50565b7fd204e27263771793b3472e4c07118500eb1ab892c2b2f0a4b90b33c33d4df42f8282604051821515815260406020820181815290820183818151815260200191508051906020019080838360005b8381101561035f578082015183820152602001610347565b50505050905090810190601f16801561038c5780820380516001836020036101000a031916815260200191505b50935050505060405180910390a15050565b602060405190810160405260008152905600a165627a7a72305820c1392e5be5a697e3c0ef80454e6a446d7538c99f99e839afa0b820ab6bca35d30029", "runtime_bytecode": "6060604052600436106100825763ffffffff7c01000000000000000000000000000000000000000000000000000000006000350416632a1afcd981146100845780634f829ee8146100a957806360fe47b1146100c25780636d4ce63c146100d85780638da5cb5b146100eb578063e93314ab1461011a578063f2fde38b146101a4575b005b341561008f57600080fd5b6100976101c3565b60405190815260200160405180910390f35b34156100b457600080fd5b6100826004356024356101c9565b34156100cd57600080fd5b6100826004356101ea565b34156100e357600080fd5b61009761024c565b34156100f657600080fd5b6100fe610252565b604051600160a060020a03909116815260200160405180910390f35b341561012557600080fd5b61012d610261565b60405160208082528190810183818151815260200191508051906020019080838360005b83811015610169578082015183820152602001610151565b50505050905090810190601f1680156101965780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b34156101af57600080fd5b610082600160a060020a03600435166102a2565b60015481565b60005433600160a060020a039081169116146101e457600080fd5b50600155565b600181905560005b6103e881101561020a576001805482018155016101f2565b610248600160408051908101604052600281527f686900000000000000000000000000000000000000000000000000000000000060208201526102f8565b5050565b60015490565b600054600160a060020a031681565b61026961039e565b60408051908101604052600581527f68656c6c6f0000000000000000000000000000000000000000000000000000006020820152905090565b60005433600160a060020a039081169116146102bd57600080fd5b600160a060020a038116156102f5576000805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0383161790555b50565b7fd204e27263771793b3472e4c07118500eb1ab892c2b2f0a4b90b33c33d4df42f8282604051821515815260406020820181815290820183818151815260200191508051906020019080838360005b8381101561035f578082015183820152602001610347565b50505050905090810190601f16801561038c5780820380516001836020036101000a031916815260200191505b50935050505060405180910390a15050565b602060405190810160405260008152905600a165627a7a72305820c1392e5be5a697e3c0ef80454e6a446d7538c99f99e839afa0b820ab6bca35d30029", "real_runtime_bytecode": "6060604052600436106100825763ffffffff7c01000000000000000000000000000000000000000000000000000000006000350416632a1afcd981146100845780634f829ee8146100a957806360fe47b1146100c25780636d4ce63c146100d85780638da5cb5b146100eb578063e93314ab1461011a578063f2fde38b146101a4575b005b341561008f57600080fd5b6100976101c3565b60405190815260200160405180910390f35b34156100b457600080fd5b6100826004356024356101c9565b34156100cd57600080fd5b6100826004356101ea565b34156100e357600080fd5b61009761024c565b34156100f657600080fd5b6100fe610252565b604051600160a060020a03909116815260200160405180910390f35b341561012557600080fd5b61012d610261565b60405160208082528190810183818151815260200191508051906020019080838360005b83811015610169578082015183820152602001610151565b50505050905090810190601f1680156101965780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b34156101af57600080fd5b610082600160a060020a03600435166102a2565b60015481565b60005433600160a060020a039081169116146101e457600080fd5b50600155565b600181905560005b6103e881101561020a576001805482018155016101f2565b610248600160408051908101604052600281527f686900000000000000000000000000000000000000000000000000000000000060208201526102f8565b5050565b60015490565b600054600160a060020a031681565b61026961039e565b60408051908101604052600581527f68656c6c6f0000000000000000000000000000000000000000000000000000006020820152905090565b60005433600160a060020a039081169116146102bd57600080fd5b600160a060020a038116156102f5576000805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0383161790555b50565b7fd204e27263771793b3472e4c07118500eb1ab892c2b2f0a4b90b33c33d4df42f8282604051821515815260406020820181815290820183818151815260200191508051906020019080838360005b8381101561035f578082015183820152602001610347565b50505050905090810190601f16801561038c5780820380516001836020036101000a031916815260200191505b50935050505060405180910390a15050565b602060405190810160405260008152905600a165627a7a72305820c1392e5be5a697e3c0ef80454e6a446d7538c99f99e839afa0b820ab6bca35d30029", @@ -44,7 +44,8 @@ ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0x2a1afcd9" }, { "constant": false, @@ -62,7 +63,8 @@ "outputs": [], "payable": false, "stateMutability": "nonpayable", - "type": "function" + "type": "function", + "signature": "0x4f829ee8" }, { "constant": false, @@ -76,7 +78,8 @@ "outputs": [], "payable": false, "stateMutability": "nonpayable", - "type": "function" + "type": "function", + "signature": "0x60fe47b1" }, { "constant": true, @@ -90,7 +93,8 @@ ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0x6d4ce63c" }, { "constant": true, @@ -104,7 +108,8 @@ ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0x8da5cb5b" }, { "constant": true, @@ -118,7 +123,8 @@ ], "payable": false, "stateMutability": "pure", - "type": "function" + "type": "function", + "signature": "0xe93314ab" }, { "constant": false, @@ -132,7 +138,8 @@ "outputs": [], "payable": false, "stateMutability": "nonpayable", - "type": "function" + "type": "function", + "signature": "0xf2fde38b" }, { "inputs": [ @@ -143,7 +150,8 @@ ], "payable": false, "stateMutability": "nonpayable", - "type": "constructor" + "type": "constructor", + "signature": "constructor" }, { "payable": true, diff --git a/test_apps/contracts_app/build/contracts/SomeContract.json b/test_apps/contracts_app/build/contracts/SomeContract.json index aa8f52b0c..2f7e7e68a 100644 --- a/test_apps/contracts_app/build/contracts/SomeContract.json +++ b/test_apps/contracts_app/build/contracts/SomeContract.json @@ -1,6 +1,6 @@ { "contract_name": "SomeContract", - "address": "0x0cF81703e069e71306BE83323f2444f8ACCd4b0E", + "address": "0x8BD7C0AeC1E7a32A97A1E310EE79C1A1e8fa7D53", "code": "6060604052341561000f57600080fd5b6040516101dc3803806101dc83398101604052808051820191906020018051915082905060008151811061003f57fe5b9060200190602002015160008054600160a060020a031916600160a060020a03929092169190911790558160018151811061007657fe5b9060200190602002015160018054600160a060020a031916600160a060020a039290921691909117905560025550610129806100b36000396000f30060606040526004361060525763ffffffff7c01000000000000000000000000000000000000000000000000000000006000350416633fa4f245811460545780636b79ff5b146076578063fc25626f1460af575b005b3415605e57600080fd5b606460bf565b60405190815260200160405180910390f35b3415608057600080fd5b608660c5565b60405173ffffffffffffffffffffffffffffffffffffffff909116815260200160405180910390f35b341560b957600080fd5b608660e1565b60025481565b60005473ffffffffffffffffffffffffffffffffffffffff1681565b60015473ffffffffffffffffffffffffffffffffffffffff16815600a165627a7a72305820687fd659f9ca4e7caf8e4d554e4b03614f4433b5e8d449af9909e67e3b0c42ae0029", "runtime_bytecode": "60606040526004361060525763ffffffff7c01000000000000000000000000000000000000000000000000000000006000350416633fa4f245811460545780636b79ff5b146076578063fc25626f1460af575b005b3415605e57600080fd5b606460bf565b60405190815260200160405180910390f35b3415608057600080fd5b608660c5565b60405173ffffffffffffffffffffffffffffffffffffffff909116815260200160405180910390f35b341560b957600080fd5b608660e1565b60025481565b60005473ffffffffffffffffffffffffffffffffffffffff1681565b60015473ffffffffffffffffffffffffffffffffffffffff16815600a165627a7a72305820687fd659f9ca4e7caf8e4d554e4b03614f4433b5e8d449af9909e67e3b0c42ae0029", "real_runtime_bytecode": "60606040526004361060525763ffffffff7c01000000000000000000000000000000000000000000000000000000006000350416633fa4f245811460545780636b79ff5b146076578063fc25626f1460af575b005b3415605e57600080fd5b606460bf565b60405190815260200160405180910390f35b3415608057600080fd5b608660c5565b60405173ffffffffffffffffffffffffffffffffffffffff909116815260200160405180910390f35b341560b957600080fd5b608660e1565b60025481565b60005473ffffffffffffffffffffffffffffffffffffffff1681565b60015473ffffffffffffffffffffffffffffffffffffffff16815600a165627a7a72305820687fd659f9ca4e7caf8e4d554e4b03614f4433b5e8d449af9909e67e3b0c42ae0029", @@ -36,7 +36,8 @@ ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0x3fa4f245" }, { "constant": true, @@ -50,7 +51,8 @@ ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0x6b79ff5b" }, { "constant": true, @@ -64,7 +66,8 @@ ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0xfc25626f" }, { "inputs": [ @@ -79,7 +82,8 @@ ], "payable": false, "stateMutability": "nonpayable", - "type": "constructor" + "type": "constructor", + "signature": "constructor" }, { "payable": true, diff --git a/test_apps/contracts_app/build/contracts/Test.json b/test_apps/contracts_app/build/contracts/Test.json index 5e783e36d..de31e3096 100644 --- a/test_apps/contracts_app/build/contracts/Test.json +++ b/test_apps/contracts_app/build/contracts/Test.json @@ -1,7 +1,7 @@ { "contract_name": "Test", - "address": "0x8318AAa052D4028Ce734163696997445A6b84423", - "code": "6060604052341561000f57600080fd5b6102088061001e6000396000f3006060604052600436106100565763ffffffff7c0100000000000000000000000000000000000000000000000000000000600035041663767800de811461005b578063ae40f72f14610097578063fe64d6ff146100bc575b600080fd5b341561006657600080fd5b61006e6100ea565b60405173ffffffffffffffffffffffffffffffffffffffff909116815260200160405180910390f35b34156100a257600080fd5b6100aa610106565b60405190815260200160405180910390f35b34156100c757600080fd5b6100e873ffffffffffffffffffffffffffffffffffffffff600435166101a0565b005b60005473ffffffffffffffffffffffffffffffffffffffff1681565b600073__test.sol:ZAMyLib______________________63771602f7600160026000604051602001526040517c010000000000000000000000000000000000000000000000000000000063ffffffff85160281526004810192909252602482015260440160206040518083038186803b151561018157600080fd5b6102c65a03f4151561019257600080fd5b505050604051805191505090565b6000805473ffffffffffffffffffffffffffffffffffffffff191673ffffffffffffffffffffffffffffffffffffffff929092169190911790555600a165627a7a72305820739242705457813a7267172ab2e20df90e85a60da5c14ae7b6259b18c444a5130029", + "address": "0x9c0cAb4FA09b09A8b3Ee63a7254332682a45D4B7", + "code": "6060604052341561000f57600080fd5b6102088061001e6000396000f3006060604052600436106100565763ffffffff7c0100000000000000000000000000000000000000000000000000000000600035041663767800de811461005b578063ae40f72f14610097578063fe64d6ff146100bc575b600080fd5b341561006657600080fd5b61006e6100ea565b60405173ffffffffffffffffffffffffffffffffffffffff909116815260200160405180910390f35b34156100a257600080fd5b6100aa610106565b60405190815260200160405180910390f35b34156100c757600080fd5b6100e873ffffffffffffffffffffffffffffffffffffffff600435166101a0565b005b60005473ffffffffffffffffffffffffffffffffffffffff1681565b600073a206287309074D383E74B912aa3b167E2C0BA82B63771602f7600160026000604051602001526040517c010000000000000000000000000000000000000000000000000000000063ffffffff85160281526004810192909252602482015260440160206040518083038186803b151561018157600080fd5b6102c65a03f4151561019257600080fd5b505050604051805191505090565b6000805473ffffffffffffffffffffffffffffffffffffffff191673ffffffffffffffffffffffffffffffffffffffff929092169190911790555600a165627a7a72305820739242705457813a7267172ab2e20df90e85a60da5c14ae7b6259b18c444a5130029", "runtime_bytecode": "6060604052600436106100565763ffffffff7c0100000000000000000000000000000000000000000000000000000000600035041663767800de811461005b578063ae40f72f14610097578063fe64d6ff146100bc575b600080fd5b341561006657600080fd5b61006e6100ea565b60405173ffffffffffffffffffffffffffffffffffffffff909116815260200160405180910390f35b34156100a257600080fd5b6100aa610106565b60405190815260200160405180910390f35b34156100c757600080fd5b6100e873ffffffffffffffffffffffffffffffffffffffff600435166101a0565b005b60005473ffffffffffffffffffffffffffffffffffffffff1681565b600073__test.sol:ZAMyLib______________________63771602f7600160026000604051602001526040517c010000000000000000000000000000000000000000000000000000000063ffffffff85160281526004810192909252602482015260440160206040518083038186803b151561018157600080fd5b6102c65a03f4151561019257600080fd5b505050604051805191505090565b6000805473ffffffffffffffffffffffffffffffffffffffff191673ffffffffffffffffffffffffffffffffffffffff929092169190911790555600a165627a7a72305820739242705457813a7267172ab2e20df90e85a60da5c14ae7b6259b18c444a5130029", "real_runtime_bytecode": "6060604052600436106100565763ffffffff7c0100000000000000000000000000000000000000000000000000000000600035041663767800de811461005b578063ae40f72f14610097578063fe64d6ff146100bc575b600080fd5b341561006657600080fd5b61006e6100ea565b60405173ffffffffffffffffffffffffffffffffffffffff909116815260200160405180910390f35b34156100a257600080fd5b6100aa610106565b60405190815260200160405180910390f35b34156100c757600080fd5b6100e873ffffffffffffffffffffffffffffffffffffffff600435166101a0565b005b60005473ffffffffffffffffffffffffffffffffffffffff1681565b600073__test.sol:ZAMyLib______________________63771602f7600160026000604051602001526040517c010000000000000000000000000000000000000000000000000000000063ffffffff85160281526004810192909252602482015260440160206040518083038186803b151561018157600080fd5b6102c65a03f4151561019257600080fd5b505050604051805191505090565b6000805473ffffffffffffffffffffffffffffffffffffffff191673ffffffffffffffffffffffffffffffffffffffff929092169190911790555600a165627a7a72305820739242705457813a7267172ab2e20df90e85a60da5c14ae7b6259b18c444a5130029", "swarm_hash": "739242705457813a7267172ab2e20df90e85a60da5c14ae7b6259b18c444a513", @@ -35,7 +35,8 @@ ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0x767800de" }, { "constant": true, @@ -49,7 +50,8 @@ ], "payable": false, "stateMutability": "pure", - "type": "function" + "type": "function", + "signature": "0xae40f72f" }, { "constant": false, @@ -63,7 +65,8 @@ "outputs": [], "payable": false, "stateMutability": "nonpayable", - "type": "function" + "type": "function", + "signature": "0xfe64d6ff" } ] } diff --git a/test_apps/contracts_app/build/contracts/Test2.json b/test_apps/contracts_app/build/contracts/Test2.json index e657f22f9..0f173a98f 100644 --- a/test_apps/contracts_app/build/contracts/Test2.json +++ b/test_apps/contracts_app/build/contracts/Test2.json @@ -1,7 +1,7 @@ { "contract_name": "Test2", - "address": "0x3B958391b2a2C1c37439836FC15b103964af6dEF", - "code": "6060604052341561000f57600080fd5b6102088061001e6000396000f3006060604052600436106100565763ffffffff7c0100000000000000000000000000000000000000000000000000000000600035041663767800de811461005b578063ae40f72f14610097578063fe64d6ff146100bc575b600080fd5b341561006657600080fd5b61006e6100ea565b60405173ffffffffffffffffffffffffffffffffffffffff909116815260200160405180910390f35b34156100a257600080fd5b6100aa610106565b60405190815260200160405180910390f35b34156100c757600080fd5b6100e873ffffffffffffffffffffffffffffffffffffffff600435166101a0565b005b60005473ffffffffffffffffffffffffffffffffffffffff1681565b600073__zlib2.sol:ZAMyLib2____________________63771602f7600160026000604051602001526040517c010000000000000000000000000000000000000000000000000000000063ffffffff85160281526004810192909252602482015260440160206040518083038186803b151561018157600080fd5b6102c65a03f4151561019257600080fd5b505050604051805191505090565b6000805473ffffffffffffffffffffffffffffffffffffffff191673ffffffffffffffffffffffffffffffffffffffff929092169190911790555600a165627a7a723058201c8fe226e9dc8f4e26b62f54574b8d9e3007618d528a3aff112993369b07820d0029", + "address": "0x4B3643eB81709cb1b2040ae1E80d8EF419920AB6", + "code": "6060604052341561000f57600080fd5b6102088061001e6000396000f3006060604052600436106100565763ffffffff7c0100000000000000000000000000000000000000000000000000000000600035041663767800de811461005b578063ae40f72f14610097578063fe64d6ff146100bc575b600080fd5b341561006657600080fd5b61006e6100ea565b60405173ffffffffffffffffffffffffffffffffffffffff909116815260200160405180910390f35b34156100a257600080fd5b6100aa610106565b60405190815260200160405180910390f35b34156100c757600080fd5b6100e873ffffffffffffffffffffffffffffffffffffffff600435166101a0565b005b60005473ffffffffffffffffffffffffffffffffffffffff1681565b60007371cd20193D37D0C7272B8d6b8ce1DB924c49c1D463771602f7600160026000604051602001526040517c010000000000000000000000000000000000000000000000000000000063ffffffff85160281526004810192909252602482015260440160206040518083038186803b151561018157600080fd5b6102c65a03f4151561019257600080fd5b505050604051805191505090565b6000805473ffffffffffffffffffffffffffffffffffffffff191673ffffffffffffffffffffffffffffffffffffffff929092169190911790555600a165627a7a723058201c8fe226e9dc8f4e26b62f54574b8d9e3007618d528a3aff112993369b07820d0029", "runtime_bytecode": "6060604052600436106100565763ffffffff7c0100000000000000000000000000000000000000000000000000000000600035041663767800de811461005b578063ae40f72f14610097578063fe64d6ff146100bc575b600080fd5b341561006657600080fd5b61006e6100ea565b60405173ffffffffffffffffffffffffffffffffffffffff909116815260200160405180910390f35b34156100a257600080fd5b6100aa610106565b60405190815260200160405180910390f35b34156100c757600080fd5b6100e873ffffffffffffffffffffffffffffffffffffffff600435166101a0565b005b60005473ffffffffffffffffffffffffffffffffffffffff1681565b600073__zlib2.sol:ZAMyLib2____________________63771602f7600160026000604051602001526040517c010000000000000000000000000000000000000000000000000000000063ffffffff85160281526004810192909252602482015260440160206040518083038186803b151561018157600080fd5b6102c65a03f4151561019257600080fd5b505050604051805191505090565b6000805473ffffffffffffffffffffffffffffffffffffffff191673ffffffffffffffffffffffffffffffffffffffff929092169190911790555600a165627a7a723058201c8fe226e9dc8f4e26b62f54574b8d9e3007618d528a3aff112993369b07820d0029", "real_runtime_bytecode": "6060604052600436106100565763ffffffff7c0100000000000000000000000000000000000000000000000000000000600035041663767800de811461005b578063ae40f72f14610097578063fe64d6ff146100bc575b600080fd5b341561006657600080fd5b61006e6100ea565b60405173ffffffffffffffffffffffffffffffffffffffff909116815260200160405180910390f35b34156100a257600080fd5b6100aa610106565b60405190815260200160405180910390f35b34156100c757600080fd5b6100e873ffffffffffffffffffffffffffffffffffffffff600435166101a0565b005b60005473ffffffffffffffffffffffffffffffffffffffff1681565b600073__zlib2.sol:ZAMyLib2____________________63771602f7600160026000604051602001526040517c010000000000000000000000000000000000000000000000000000000063ffffffff85160281526004810192909252602482015260440160206040518083038186803b151561018157600080fd5b6102c65a03f4151561019257600080fd5b505050604051805191505090565b6000805473ffffffffffffffffffffffffffffffffffffffff191673ffffffffffffffffffffffffffffffffffffffff929092169190911790555600a165627a7a723058201c8fe226e9dc8f4e26b62f54574b8d9e3007618d528a3aff112993369b07820d0029", "swarm_hash": "1c8fe226e9dc8f4e26b62f54574b8d9e3007618d528a3aff112993369b07820d", @@ -35,7 +35,8 @@ ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0x767800de" }, { "constant": true, @@ -49,7 +50,8 @@ ], "payable": false, "stateMutability": "pure", - "type": "function" + "type": "function", + "signature": "0xae40f72f" }, { "constant": false, @@ -63,7 +65,8 @@ "outputs": [], "payable": false, "stateMutability": "nonpayable", - "type": "function" + "type": "function", + "signature": "0xfe64d6ff" } ] } diff --git a/test_apps/contracts_app/build/contracts/Token.json b/test_apps/contracts_app/build/contracts/Token.json index f0cbea30b..20d351680 100644 --- a/test_apps/contracts_app/build/contracts/Token.json +++ b/test_apps/contracts_app/build/contracts/Token.json @@ -54,7 +54,8 @@ ], "payable": false, "stateMutability": "nonpayable", - "type": "function" + "type": "function", + "signature": "0x095ea7b3" }, { "constant": true, @@ -68,7 +69,8 @@ ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0x15945790" }, { "constant": true, @@ -82,7 +84,8 @@ ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0x18160ddd" }, { "constant": false, @@ -109,7 +112,8 @@ ], "payable": false, "stateMutability": "nonpayable", - "type": "function" + "type": "function", + "signature": "0x23b872dd" }, { "constant": true, @@ -128,7 +132,8 @@ ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0x70a08231" }, { "constant": false, @@ -151,7 +156,8 @@ ], "payable": false, "stateMutability": "nonpayable", - "type": "function" + "type": "function", + "signature": "0xa9059cbb" }, { "constant": true, @@ -174,7 +180,8 @@ ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0xdd62ed3e" }, { "inputs": [ @@ -185,7 +192,8 @@ ], "payable": false, "stateMutability": "nonpayable", - "type": "constructor" + "type": "constructor", + "signature": "constructor" }, { "anonymous": false, @@ -207,7 +215,8 @@ } ], "name": "Transfer", - "type": "event" + "type": "event", + "signature": "0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef" }, { "anonymous": false, @@ -229,7 +238,8 @@ } ], "name": "Approval", - "type": "event" + "type": "event", + "signature": "0x8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925" } ] } diff --git a/test_apps/contracts_app/build/contracts/ZAMyLib.json b/test_apps/contracts_app/build/contracts/ZAMyLib.json index 34d145c1d..de318c8ee 100644 --- a/test_apps/contracts_app/build/contracts/ZAMyLib.json +++ b/test_apps/contracts_app/build/contracts/ZAMyLib.json @@ -1,6 +1,6 @@ { "contract_name": "ZAMyLib", - "address": "0x5babe87C3c2E936fe2F2Eef7EbF8865aC7c85e81", + "address": "0xa206287309074D383E74B912aa3b167E2C0BA82B", "code": "60606040523415600e57600080fd5b60918061001c6000396000f300606060405260043610603e5763ffffffff7c0100000000000000000000000000000000000000000000000000000000600035041663771602f781146043575b600080fd5b604f6004356024356061565b60405190815260200160405180910390f35b01905600a165627a7a7230582020bb3fc766d83ffe33eed77ce7dfbd8f1e17cc60b0bba6aa938ddc9fc83931060029", "runtime_bytecode": "606060405260043610603e5763ffffffff7c0100000000000000000000000000000000000000000000000000000000600035041663771602f781146043575b600080fd5b604f6004356024356061565b60405190815260200160405180910390f35b01905600a165627a7a7230582020bb3fc766d83ffe33eed77ce7dfbd8f1e17cc60b0bba6aa938ddc9fc83931060029", "real_runtime_bytecode": "606060405260043610603e5763ffffffff7c0100000000000000000000000000000000000000000000000000000000600035041663771602f781146043575b600080fd5b604f6004356024356061565b60405190815260200160405180910390f35b01905600a165627a7a7230582020bb3fc766d83ffe33eed77ce7dfbd8f1e17cc60b0bba6aa938ddc9fc83931060029", @@ -40,7 +40,8 @@ ], "payable": false, "stateMutability": "pure", - "type": "function" + "type": "function", + "signature": "0x771602f7" } ] } diff --git a/test_apps/contracts_app/build/contracts/ZAMyLib2.json b/test_apps/contracts_app/build/contracts/ZAMyLib2.json index 28e79267e..7063b2b17 100644 --- a/test_apps/contracts_app/build/contracts/ZAMyLib2.json +++ b/test_apps/contracts_app/build/contracts/ZAMyLib2.json @@ -1,6 +1,6 @@ { "contract_name": "ZAMyLib2", - "address": "0x003A70f5B3B7C59F8b0650C9a9C8be851b9bC4ba", + "address": "0x71cd20193D37D0C7272B8d6b8ce1DB924c49c1D4", "code": "60606040523415600e57600080fd5b60918061001c6000396000f300606060405260043610603e5763ffffffff7c0100000000000000000000000000000000000000000000000000000000600035041663771602f781146043575b600080fd5b604f6004356024356061565b60405190815260200160405180910390f35b01905600a165627a7a723058205f47d72010c29916986bc1c29a6607705bac7c77a0872f2fcb27d812fa6b94ed0029", "runtime_bytecode": "606060405260043610603e5763ffffffff7c0100000000000000000000000000000000000000000000000000000000600035041663771602f781146043575b600080fd5b604f6004356024356061565b60405190815260200160405180910390f35b01905600a165627a7a723058205f47d72010c29916986bc1c29a6607705bac7c77a0872f2fcb27d812fa6b94ed0029", "real_runtime_bytecode": "606060405260043610603e5763ffffffff7c0100000000000000000000000000000000000000000000000000000000600035041663771602f781146043575b600080fd5b604f6004356024356061565b60405190815260200160405180910390f35b01905600a165627a7a723058205f47d72010c29916986bc1c29a6607705bac7c77a0872f2fcb27d812fa6b94ed0029", @@ -40,7 +40,8 @@ ], "payable": false, "stateMutability": "pure", - "type": "function" + "type": "function", + "signature": "0x771602f7" } ] } diff --git a/test_apps/contracts_app/chains.json b/test_apps/contracts_app/chains.json index 6da4a452c..c7f5c15a0 100644 --- a/test_apps/contracts_app/chains.json +++ b/test_apps/contracts_app/chains.json @@ -1,253 +1,14 @@ { - "0x72820315e7168f6f4891000ae8d366aa6e64a2e0a7648b05b18d952dd7b475ff": { + "0xdb731f3622ef37b4da8db36903de029220dba74c41185f8429f916058b86559f": { "contracts": { "0x79f903ab722af0e1fec06f910aa64dc71fd3023e232a946b35432f757d951bc0": { "name": "AlreadyDeployedToken", "address": "0xece374063fe5cc7efbaca0a498477cada94e5ad6" - }, - "0x43a7fdb062a49169e579493c0404cac3eb7c7e35144853e801081fc6364398c3": { - "name": "Assert", - "address": "0x4Ecfa18e475b4F217DC42A4a259278b00338a25a" - }, - "0x45b875328c08f3f01de18f3a4f42ae9917cc47b0d284d8eef1ed46b0593540ae": { - "name": "ContractArgs", - "address": "0x87D6CeAb780C32F45f259724650E5b2B98DF29c3" - }, - "0x43e7107e99a2be83020800a2278a01673572a3aa69c48580361b848e989c509b": { - "name": "ZAMyLib2", - "address": "0x607F0f839217d9066962c79Bd22DD2A511CAC37e" - }, - "0x263ad11c8ac793bd948abc51ed63bf456ae958deb8c09413250d312732a479da": { - "name": "Test2", - "address": "0xa86f068F9e7Be2f603e6B6196FA9659FCe8A0b57" - }, - "0x21ec9fef260b27aeb3220343703c4e9754a312c6be64dc09170c322302ae438f": { - "name": "MyToken2", - "address": "0x589779894F444a42FbbfdFda035F9f3967149c08" - }, - "0xc10f570bb3ab32a609d2406d7d81994a6f4fabda7f7cd2c3a4df44934d6502f6": { - "name": "SimpleStorage", - "address": "0x72B19204e0f1D318E41A90a2907C377FE3670D51" - }, - "0xf923326d69c0ac17de37926bc0c36e57f5b2485fe6fadf958ada014610cd01fd": { - "name": "SomeContract", - "address": "0x5b2d8270D0068C1E5A714fea1B50642b305C06bd" - }, - "0x44e732146c5700a2e4cead0a5cd5d94047fbf6b5149ab7d7814fc874d66d4649": { - "name": "MyToken", - "address": "0x9766f9364F0832589AFcaF7387aB43b6f5AA96b9" - }, - "0xa5fec182f96887e8f82e36ad2ebbea945f26e5c96dcdc66977247365f9045899": { - "name": "ZAMyLib", - "address": "0x8dE0ca96f288D91a84B89701465AFD004B69C470" - }, - "0xcbb235f7fb59ae45ac86c7109080d34dcf60d72ce334a1b5f896fd871e216867": { - "name": "Test", - "address": "0x976b67838e893A1AD6e2a7fc68b3df5462A3d7b7" - }, - "0x4f149fd3d62e8d24542c8d508a8b419d03838808b860dbcd5e82680ba91727ee": { - "name": "AnotherStorage", - "address": "0x148001ae8D7a5833Ecdbd0ec490796fdF4235505" } }, "name": "development" }, - "0xbd9229383cb995c9041f12d0ed3a3479f38d05c34cd4d3dd972b31c1fddb978b": { - "contracts": { - "0x79f903ab722af0e1fec06f910aa64dc71fd3023e232a946b35432f757d951bc0": { - "name": "AlreadyDeployedToken", - "address": "0xece374063fe5cc7efbaca0a498477cada94e5ad6" - }, - "0x43a7fdb062a49169e579493c0404cac3eb7c7e35144853e801081fc6364398c3": { - "name": "Assert", - "address": "0xD309079E12C616f1333175D037A078c889760451" - }, - "0x45b875328c08f3f01de18f3a4f42ae9917cc47b0d284d8eef1ed46b0593540ae": { - "name": "ContractArgs", - "address": "0x49e2a14a3E13FA555B47f2eE80e4250A1c5E6D4b" - }, - "0x43e7107e99a2be83020800a2278a01673572a3aa69c48580361b848e989c509b": { - "name": "ZAMyLib2", - "address": "0xF917baE4284443662230e51313a838EDf7b1d477" - }, - "0x263ad11c8ac793bd948abc51ed63bf456ae958deb8c09413250d312732a479da": { - "name": "Test2", - "address": "0x72949D7d7b2c3f7016fF2b48669485f59aA45ea5" - }, - "0x21ec9fef260b27aeb3220343703c4e9754a312c6be64dc09170c322302ae438f": { - "name": "MyToken2", - "address": "0x16a9ea7916FAAAE38d9ef07dE6CE7abCf4C5B39d" - }, - "0xc10f570bb3ab32a609d2406d7d81994a6f4fabda7f7cd2c3a4df44934d6502f6": { - "name": "SimpleStorage", - "address": "0xBAB1e7ab34B6de4BbA91865CaAEBf1282Ea15E77" - }, - "0x30dfcaf8930098e8f1d51c99f1739235011f4cb31cf29c8e7593b2d84a13534f": { - "name": "SomeContract", - "address": "0xc0c748D1096821B60CdB470a4aC54bb57a43a149" - }, - "0x44e732146c5700a2e4cead0a5cd5d94047fbf6b5149ab7d7814fc874d66d4649": { - "name": "MyToken", - "address": "0xd48C299d58fD5171234FeE3ABE00d51b128fD10d" - }, - "0xa5fec182f96887e8f82e36ad2ebbea945f26e5c96dcdc66977247365f9045899": { - "name": "ZAMyLib", - "address": "0x70FF00ddf8e6135C52C492d368Fd50c02b16D759" - }, - "0xcbb235f7fb59ae45ac86c7109080d34dcf60d72ce334a1b5f896fd871e216867": { - "name": "Test", - "address": "0x9473A926a115097368c4E941745361ff2780e626" - }, - "0x6ed12184b4c1a117e5c6040ef7ba270dd19c5303f89e1ba07d40ccc9094d1bef": { - "name": "AnotherStorage", - "address": "0x10C53867C17eDc04a92008B9aDE42Cd51397b68F" - } - }, - "name": "development" - }, - "0xaf15a99b63e24757cebcdcbd1aa386d863e04c902a614a5129f8be82ffc892ce": { - "contracts": { - "0x79f903ab722af0e1fec06f910aa64dc71fd3023e232a946b35432f757d951bc0": { - "name": "AlreadyDeployedToken", - "address": "0xece374063fe5cc7efbaca0a498477cada94e5ad6" - }, - "0x43a7fdb062a49169e579493c0404cac3eb7c7e35144853e801081fc6364398c3": { - "name": "Assert", - "address": "0x372288011682a9ae1F7b7A783B5B89C600fe014B" - }, - "0x45b875328c08f3f01de18f3a4f42ae9917cc47b0d284d8eef1ed46b0593540ae": { - "name": "ContractArgs", - "address": "0xa2D7eDe07C2c9092641d95a9d07d910E6A861857" - }, - "0x43e7107e99a2be83020800a2278a01673572a3aa69c48580361b848e989c509b": { - "name": "ZAMyLib2", - "address": "0xD92A24BD010Df9668DE03e452505C0C1DBc3AaCc" - }, - "0x263ad11c8ac793bd948abc51ed63bf456ae958deb8c09413250d312732a479da": { - "name": "Test2", - "address": "0x1E0F5cA4Bdf406Fa8b72234511b6F789FC5383D9" - }, - "0x21ec9fef260b27aeb3220343703c4e9754a312c6be64dc09170c322302ae438f": { - "name": "MyToken2", - "address": "0xc7Ce790F06952a21bc3E29079929d72404Ff02C1" - }, - "0xc10f570bb3ab32a609d2406d7d81994a6f4fabda7f7cd2c3a4df44934d6502f6": { - "name": "SimpleStorage", - "address": "0x998f4ACDdcE5Ca2CAf9e2A48a35E728f7F2b3c64" - }, - "0x5424fc725f0ba178b606596bfd56f6438ab5182d20c3d39c01c824ce729c5a17": { - "name": "SomeContract", - "address": "0x899f6D2d878303fB715de145a412a3a329c66f72" - }, - "0x44e732146c5700a2e4cead0a5cd5d94047fbf6b5149ab7d7814fc874d66d4649": { - "name": "MyToken", - "address": "0xE567d9CBaf22d27a5C67C1421B7ADE1D7E5B9279" - }, - "0xa5fec182f96887e8f82e36ad2ebbea945f26e5c96dcdc66977247365f9045899": { - "name": "ZAMyLib", - "address": "0x757dFfbEbc92cb6cb457ff0aE52147840e2aDA6A" - }, - "0xcbb235f7fb59ae45ac86c7109080d34dcf60d72ce334a1b5f896fd871e216867": { - "name": "Test", - "address": "0x1741BB896eE47e2Fb757FF2b99811346537A4D6c" - }, - "0x9d16daf36e60ee15055f39a1c15597a9ed4d06f431f4f4fa7baa1a1fb13b62c5": { - "name": "AnotherStorage", - "address": "0xb7cF0E659253bc3bAdD636356790383896222C8C" - } - }, - "name": "development" - }, - "0x895dd3027dedd81d3dfd66da65bc72bdda7c94a6ab3ef7f9844b7f80e88ecdbb": { - "contracts": { - "0x79f903ab722af0e1fec06f910aa64dc71fd3023e232a946b35432f757d951bc0": { - "name": "AlreadyDeployedToken", - "address": "0xece374063fe5cc7efbaca0a498477cada94e5ad6" - }, - "0x43a7fdb062a49169e579493c0404cac3eb7c7e35144853e801081fc6364398c3": { - "name": "Assert", - "address": "0x8db41B9F057Acfa544E0038f4891bde1a26eb218" - }, - "0x45b875328c08f3f01de18f3a4f42ae9917cc47b0d284d8eef1ed46b0593540ae": { - "name": "ContractArgs", - "address": "0xF1b2103E43C307CF327E015380240DDE094DB6D2" - }, - "0x43e7107e99a2be83020800a2278a01673572a3aa69c48580361b848e989c509b": { - "name": "ZAMyLib2", - "address": "0xEF8b4a610079c0bB9cE1b2fD36Df4c94f17Fee68" - }, - "0x263ad11c8ac793bd948abc51ed63bf456ae958deb8c09413250d312732a479da": { - "name": "Test2", - "address": "0x3c093A77D5c5Dc3b793Df350Dc225072261201a9" - }, - "0x21ec9fef260b27aeb3220343703c4e9754a312c6be64dc09170c322302ae438f": { - "name": "MyToken2", - "address": "0xD190B54d5618b6A7D1343CB2f2E1A6689DAFad8C" - }, - "0xc10f570bb3ab32a609d2406d7d81994a6f4fabda7f7cd2c3a4df44934d6502f6": { - "name": "SimpleStorage", - "address": "0xF9816748F8185Aca4F0ccC8F1A2B870DB0279B52" - }, - "0x86e2e623978a4693bfa49767193a2f546c589213ca398e4801e1be93436e9965": { - "name": "SomeContract", - "address": "0x75cE8579Aff2F22801B4Ab67Db6B9496F1AFbB28" - }, - "0x44e732146c5700a2e4cead0a5cd5d94047fbf6b5149ab7d7814fc874d66d4649": { - "name": "MyToken", - "address": "0x4C1290302C36939550DEBDb2116c584FDb84cBfA" - }, - "0xa5fec182f96887e8f82e36ad2ebbea945f26e5c96dcdc66977247365f9045899": { - "name": "ZAMyLib", - "address": "0x759ce044ef0E86dE4780d5023E47860c25C9e493" - }, - "0xcbb235f7fb59ae45ac86c7109080d34dcf60d72ce334a1b5f896fd871e216867": { - "name": "Test", - "address": "0xAD93FEc10691521de0290159E4D0412f24881F98" - }, - "0x2d151cdba2d74d42a8d04da95fd1a8e376a9209793aeec62cb467c62d7c24815": { - "name": "AnotherStorage", - "address": "0x06Af6E548985Ae0406ed9632C40B1158fD4fA9F2" - }, - "0x0e0275c10e511f694564b0c4e3def28e38fe6ba0c1f26ab6c1cb86fdd73a3287": { - "name": "Assert", - "address": "0x16afe4373cF5604E9A68Ab075c96ec4d35b4899a" - }, - "0x53a9493497f8764439f2b6062994f8fe3d3c5a66450099244c0f8f32185a15df": { - "name": "ContractArgs", - "address": "0xF80b4e0562a3bc5Eb1CCc0315F7dC6b771CE4Dec" - }, - "0xd1b69fd42ab462fb8af1009558bf53dbcc873ee43b3f759afcd54aabb4640338": { - "name": "ZAMyLib2", - "address": "0x5d72Da0c801AAEB628Fe4d5E9509f1a47C352230" - }, - "0x0d2c4116b7b36aec94353056c6f2ffd4179b1121b98d89164106df61d617d427": { - "name": "Test2", - "address": "0x2CE5fDed00eC8f4451D02De6E446B35D8BdA0c40" - }, - "0x6cefd24d92c98376fa48a4b79fa31b4411bff757599d56154a46369cca076f5c": { - "name": "SimpleStorage", - "address": "0x4E09b82B9c4bC99903a970FB3c6F2c7Ee09c0f94" - }, - "0x8f2608ad94100e469ed2ed1c0b19e674c6952bbc76b2969c51b7e473f31dc917": { - "name": "SomeContract", - "address": "0xbd2a6708717e36BadB018473c282cf15187C5DC5" - }, - "0x926ab20d492caa04f4c9b91ae0394da1a49689e1984278a8161d1b96332ba8e5": { - "name": "ZAMyLib", - "address": "0xc902922B18E4Ce3311A1585E472169A45d5addA8" - }, - "0xba49165b12f1fbd15c17caf1b3d55d30b9607f1d74102732106ce1575df4bb1d": { - "name": "Test", - "address": "0x0bb6D11BdA472a77947CA54160C478EB656190E8" - }, - "0x01ebbfdb113eb2e485a246c5fd98dbd8b78152c489ca8135eaae0dba7ef57519": { - "name": "AnotherStorage", - "address": "0x3D68bc66F0fC8D13beDd164042371c29527B46EF" - } - }, - "name": "development" - }, - "0x9d41dc2207c7fe6525d412f931ecda49b914da5dce0be4d32f5041c36fccd9db": { + "0xbdcd0ba5d78a96b065bbd5b272d31f2d33960b0f53949f6a8c49c4fe1a52fd6a": { "contracts": { "0x79f903ab722af0e1fec06f910aa64dc71fd3023e232a946b35432f757d951bc0": { "name": "AlreadyDeployedToken", @@ -255,153 +16,47 @@ }, "0x0e0275c10e511f694564b0c4e3def28e38fe6ba0c1f26ab6c1cb86fdd73a3287": { "name": "Assert", - "address": "0xF8e129d5027150371Ce9F2E0456244AdE5344B16" + "address": "0x5Eb2130A982D279e597226fD339Eb155f7171B91" }, "0x53a9493497f8764439f2b6062994f8fe3d3c5a66450099244c0f8f32185a15df": { "name": "ContractArgs", - "address": "0x56c6cb35C27205f3dc4e9F7042514e315fbD4698" + "address": "0x3B904C882523b36Edd8c9813db6aCE6cBa416060" }, "0xd1b69fd42ab462fb8af1009558bf53dbcc873ee43b3f759afcd54aabb4640338": { "name": "ZAMyLib2", - "address": "0x6981C4C907B61B65Dc5320de16fb247f8Ed058f7" + "address": "0x71cd20193D37D0C7272B8d6b8ce1DB924c49c1D4" }, "0x0d2c4116b7b36aec94353056c6f2ffd4179b1121b98d89164106df61d617d427": { "name": "Test2", - "address": "0xFFfeE5AbaDAa853FBF18DF6135fA53D570294547" + "address": "0x4B3643eB81709cb1b2040ae1E80d8EF419920AB6" }, "0x21ec9fef260b27aeb3220343703c4e9754a312c6be64dc09170c322302ae438f": { "name": "MyToken2", - "address": "0xBC6667fb518871FD0efc3C233367941a9C81136C" + "address": "0x95eBb3E309CFa837d34578e24cdd7A72Fed2E94f" }, "0x6cefd24d92c98376fa48a4b79fa31b4411bff757599d56154a46369cca076f5c": { "name": "SimpleStorage", - "address": "0x9DaD2dA0148d5c8e8cc5cCDefE61583C3ca8daBE" + "address": "0xf400925155a8ED845a15b3f1c4C4984f31645A07" }, - "0x04da6bdbbb01369d76fc62a954d9debb10bbb457957c041148e2475cdc3ddffa": { + "0x10aca9d1539d14b113ec96c606e8e3195d81722746f9eda13d2fdb887e2e78aa": { "name": "SomeContract", - "address": "0x1B6782Fcdd369be19A9e1E3270993711fd9cc600" + "address": "0x8BD7C0AeC1E7a32A97A1E310EE79C1A1e8fa7D53" }, "0x44e732146c5700a2e4cead0a5cd5d94047fbf6b5149ab7d7814fc874d66d4649": { "name": "MyToken", - "address": "0xAf3DAD7F3894349eF4FDfAFd8A7d41B049605167" + "address": "0xbbF2721136ce2F2C69FE3809de39cb5f1d54125C" }, "0x926ab20d492caa04f4c9b91ae0394da1a49689e1984278a8161d1b96332ba8e5": { "name": "ZAMyLib", - "address": "0xF22D6EC1d2e09A9b3D33649E0b5fF4A3369cc5B9" + "address": "0xa206287309074D383E74B912aa3b167E2C0BA82B" }, "0xba49165b12f1fbd15c17caf1b3d55d30b9607f1d74102732106ce1575df4bb1d": { "name": "Test", - "address": "0x5658777E87dBdC45E3039Fc6b2fbB98075CBff1B" + "address": "0x9c0cAb4FA09b09A8b3Ee63a7254332682a45D4B7" }, - "0xdc40c276c6ffaccab11ed135ad1b27822456151058ad622e7b81182e2cd7617e": { + "0xf12b466f58dbc8d8ce3a0f0a5549bc3184f4e4522c7c15c185320287cc818f9d": { "name": "AnotherStorage", - "address": "0xF14211c7cEf238286FA1019bfC0B33c1d59bB16d" - } - }, - "name": "development" - }, - "0x2d42bfc8e599949a9c1ba2f2b3b8dd337653f7572bc7cb9d4b8c67cfcdaf85fa": { - "contracts": { - "0x79f903ab722af0e1fec06f910aa64dc71fd3023e232a946b35432f757d951bc0": { - "name": "AlreadyDeployedToken", - "address": "0xece374063fe5cc7efbaca0a498477cada94e5ad6" - }, - "0x0e0275c10e511f694564b0c4e3def28e38fe6ba0c1f26ab6c1cb86fdd73a3287": { - "name": "Assert", - "address": "0x43766Fa2a1612a31d16148364238FD681F56569d" - }, - "0x53a9493497f8764439f2b6062994f8fe3d3c5a66450099244c0f8f32185a15df": { - "name": "ContractArgs", - "address": "0x1dd94D1C0F775239498676772C942B687780599c" - }, - "0xd1b69fd42ab462fb8af1009558bf53dbcc873ee43b3f759afcd54aabb4640338": { - "name": "ZAMyLib2", - "address": "0xdE2856b6c433C7b5C41CE7C2E918788643D2d507" - }, - "0x0d2c4116b7b36aec94353056c6f2ffd4179b1121b98d89164106df61d617d427": { - "name": "Test2", - "address": "0xFf40bB59716e7D84238fFB0bbE766f8D4954455C" - }, - "0x21ec9fef260b27aeb3220343703c4e9754a312c6be64dc09170c322302ae438f": { - "name": "MyToken2", - "address": "0xFd958962FDF763bFc33e2d02D497075F4069D476" - }, - "0x6cefd24d92c98376fa48a4b79fa31b4411bff757599d56154a46369cca076f5c": { - "name": "SimpleStorage", - "address": "0xf06B15d8eF571eF4bE5Fe51c310EAa952089B6AD" - }, - "0xf855ad01705745e324292843c2fcd25d9c199fda7f40a8a104a010bd722d24b4": { - "name": "SomeContract", - "address": "0x84f92D023ee8Bdc04B8dD3353a7Eb4d67381C8da" - }, - "0x44e732146c5700a2e4cead0a5cd5d94047fbf6b5149ab7d7814fc874d66d4649": { - "name": "MyToken", - "address": "0x78060A2fc7F6062948Bc9B1ffF9D44b1e6C2af3C" - }, - "0x926ab20d492caa04f4c9b91ae0394da1a49689e1984278a8161d1b96332ba8e5": { - "name": "ZAMyLib", - "address": "0xd4d4cAeea122EA36e64187C91685572c47390FD1" - }, - "0xba49165b12f1fbd15c17caf1b3d55d30b9607f1d74102732106ce1575df4bb1d": { - "name": "Test", - "address": "0x610Da846012A1Ec4beB082136e63779A3c05279B" - }, - "0xb3e3400994923c528ad8a0a031987bd20f10d13920194950577bd394999438ab": { - "name": "AnotherStorage", - "address": "0xB8B78d98D55A01503E76e9e53c733824c5C4A076" - } - }, - "name": "development" - }, - "0x4a129f405a46d95bc0404be639a2d9cbe8fe7de1067439b8632ace8a8d005745": { - "contracts": { - "0x79f903ab722af0e1fec06f910aa64dc71fd3023e232a946b35432f757d951bc0": { - "name": "AlreadyDeployedToken", - "address": "0xece374063fe5cc7efbaca0a498477cada94e5ad6" - }, - "0x0e0275c10e511f694564b0c4e3def28e38fe6ba0c1f26ab6c1cb86fdd73a3287": { - "name": "Assert", - "address": "0xCFC27E55Af92f932FA52190613fCe0191c4A1153" - }, - "0x53a9493497f8764439f2b6062994f8fe3d3c5a66450099244c0f8f32185a15df": { - "name": "ContractArgs", - "address": "0x10f10732801D454C97234aC56b00CE46e7669C1d" - }, - "0xd1b69fd42ab462fb8af1009558bf53dbcc873ee43b3f759afcd54aabb4640338": { - "name": "ZAMyLib2", - "address": "0x003A70f5B3B7C59F8b0650C9a9C8be851b9bC4ba" - }, - "0x0d2c4116b7b36aec94353056c6f2ffd4179b1121b98d89164106df61d617d427": { - "name": "Test2", - "address": "0x3B958391b2a2C1c37439836FC15b103964af6dEF" - }, - "0x21ec9fef260b27aeb3220343703c4e9754a312c6be64dc09170c322302ae438f": { - "name": "MyToken2", - "address": "0x42b9D34Febdfb4A065E8eF3536213871CbCc059B" - }, - "0x6cefd24d92c98376fa48a4b79fa31b4411bff757599d56154a46369cca076f5c": { - "name": "SimpleStorage", - "address": "0x1f0894FfCC00ed5f326b2dc18d9ACe53CfAFC1AD" - }, - "0x4d7d682103760456c8ac450a37a14850ffc071f4aba2588e4bd3355e3e53ebf1": { - "name": "SomeContract", - "address": "0x0cF81703e069e71306BE83323f2444f8ACCd4b0E" - }, - "0x44e732146c5700a2e4cead0a5cd5d94047fbf6b5149ab7d7814fc874d66d4649": { - "name": "MyToken", - "address": "0x24D589f21fB72903409bcaDe787F627Aa08Dec59" - }, - "0x926ab20d492caa04f4c9b91ae0394da1a49689e1984278a8161d1b96332ba8e5": { - "name": "ZAMyLib", - "address": "0x5babe87C3c2E936fe2F2Eef7EbF8865aC7c85e81" - }, - "0xba49165b12f1fbd15c17caf1b3d55d30b9607f1d74102732106ce1575df4bb1d": { - "name": "Test", - "address": "0x8318AAa052D4028Ce734163696997445A6b84423" - }, - "0x3e2e261ba1687a959694ddf9e25ea0e487cd1f93e0f0e33374be1c9f1bf1bbcd": { - "name": "AnotherStorage", - "address": "0xFd0E3F269e6aa239708E020F7fB9c00FfcC7E547" + "address": "0xb61d417D82C1abA973d2061Cd6e017F194A5afc1" } }, "name": "development" diff --git a/test_apps/contracts_app/config2/communication.json b/test_apps/contracts_app/config2/communication.json deleted file mode 100644 index 80ec2f80e..000000000 --- a/test_apps/contracts_app/config2/communication.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "default": { - "enabled": true, - "provider": "whisper", - "available_providers": ["whisper", "orbit"], - "connection": { - "host": "localhost", - "port": 8546, - "type": "ws" - } - } -} diff --git a/test_apps/contracts_app/config2/storage.json b/test_apps/contracts_app/config2/storage.json deleted file mode 100644 index 5492ed289..000000000 --- a/test_apps/contracts_app/config2/storage.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "default": { - "versions": { - "ipfs-api": "17.2.6" - }, - "enabled": true, - "available_providers": ["ipfs"], - "ipfs_bin": "ipfs", - "provider": "ipfs", - "host": "localhost", - "port": 5001 - }, - "development": { - "enabled": true, - "provider": "ipfs", - "host": "localhost", - "port": 5001, - "getUrl": "http://localhost:8080/ipfs/" - }, - "livenet": { - "enabled": true, - "provider": "ipfs", - "host": "ipfs.infura.io", - "protocol": "https", - "port": false, - "getUrl": "https://ipfs.infura.io/ipfs/" - } -} diff --git a/test_apps/contracts_app/config2/webserver.json b/test_apps/contracts_app/config2/webserver.json deleted file mode 100644 index c28a31138..000000000 --- a/test_apps/contracts_app/config2/webserver.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "enabled": true, - "host": "localhost", - "port": 8000 -} diff --git a/test_apps/contracts_app/config2/contracts.json b/test_apps/contracts_app/contracts.json similarity index 100% rename from test_apps/contracts_app/config2/contracts.json rename to test_apps/contracts_app/contracts.json diff --git a/test_apps/contracts_app/config2/development/genesis.json b/test_apps/contracts_app/development/genesis.json similarity index 100% rename from test_apps/contracts_app/config2/development/genesis.json rename to test_apps/contracts_app/development/genesis.json diff --git a/test_apps/contracts_app/config2/development/password b/test_apps/contracts_app/development/password similarity index 100% rename from test_apps/contracts_app/config2/development/password rename to test_apps/contracts_app/development/password diff --git a/test_apps/contracts_app/embark.json b/test_apps/contracts_app/embark.json index 50392514c..d0a0f8f6f 100644 --- a/test_apps/contracts_app/embark.json +++ b/test_apps/contracts_app/embark.json @@ -2,8 +2,5 @@ "contracts": ["contracts/**"], "app": {}, "buildDir": "build/", - "config": "config2/", - "plugins": { - "embark-service": {} - } + "config": "./" } diff --git a/test_apps/contracts_app/embark.old_config.json b/test_apps/contracts_app/embark.old_config.json deleted file mode 100644 index 57b46ad28..000000000 --- a/test_apps/contracts_app/embark.old_config.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "contracts": ["app/contracts/**"], - "app": { - "js/webpack_test.js": "app/js/index.js", - "css/app.css": ["app/css/**"], - "images/": ["app/images/**"], - "js/app.js": ["embark.js", "app/js/_vendor/jquery.min.js", "app/js/_vendor/bootstrap.min.js", "app/js/**", "!app/js/test.js", "!app/js/foo.js", "!app/js/foo.css", "!app/js/new_index.js"], - "js/new_app.js": ["app/js/new_index.js"], - "js/embark.js": ["embark.js"], - "js/abi.js": "abi.js", - "js/test.js": ["embark.js", "app/js/_vendor/jquery.min.js", "app/js/_vendor/async.min.js", "app/js/test.js"], - "js/mytoken.js": ["$MyToken", "app/js/token_test.js"], - "index.html": "app/index.html", - "new_index.html": "app/new_index.html", - "test.html": "app/test.html", - "test2.html": "app/test2.html", - "js/myweb3.js": "web3-0.18.js", - "js/web3.js": "web3.js", - "js/all_contracts.js": "$ALL_CONTRACTS", - "js/only_embark.js": "$EMBARK_JS" - }, - "buildDir": "dist/", - "config": "config/", - "plugins": { - "embark-babel": {"files": ["**/*.js", "**/*.jsx", "!**/_vendor/*.js"]}, - "embark-service": {} - } -} diff --git a/test_apps/contracts_app/extensions/embark-service/index.js b/test_apps/contracts_app/extensions/embark-service/index.js deleted file mode 100644 index 0ca3ff1d5..000000000 --- a/test_apps/contracts_app/extensions/embark-service/index.js +++ /dev/null @@ -1,12 +0,0 @@ -var Haml = require('haml'); - -module.exports = function(embark) { - embark.registerServiceCheck('PluginService', function(cb) { - cb({name: "ServiceName", status: "on"}); - }); - - embark.registerPipeline((embark.pluginConfig.files || ['**/*.haml']), function(opts) { - var source = opts.source; - return Haml.render(source); - }); -}; diff --git a/test_apps/contracts_app/extensions/embark-service/package-lock.json b/test_apps/contracts_app/extensions/embark-service/package-lock.json deleted file mode 100644 index 85c2d3222..000000000 --- a/test_apps/contracts_app/extensions/embark-service/package-lock.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "name": "embark-service", - "version": "1.0.0", - "lockfileVersion": 1, - "requires": true, - "dependencies": { - "haml": { - "version": "0.4.3", - "resolved": "https://registry.npmjs.org/haml/-/haml-0.4.3.tgz", - "integrity": "sha1-90BTGPPC7dGXpIsbjysvE+C7U3g=" - } - } -} diff --git a/test_apps/contracts_app/extensions/embark-service/package.json b/test_apps/contracts_app/extensions/embark-service/package.json deleted file mode 100644 index 7da9e04aa..000000000 --- a/test_apps/contracts_app/extensions/embark-service/package.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "name": "embark-service", - "version": "1.0.0", - "description": "", - "main": "index.js", - "scripts": { - "test": "echo \"Error: no test specified\" && exit 1" - }, - "author": "", - "license": "ISC", - "dependencies": { - "haml": "^0.4.3" - } -} diff --git a/test_apps/test_app/README.md b/test_apps/test_app/README.md index 47ad5712f..45b4c9373 100644 --- a/test_apps/test_app/README.md +++ b/test_apps/test_app/README.md @@ -1,8 +1,8 @@ Test App for integration testing purposes. -```../bin/embark run``` to check if everything is behaving as expected +```../../bin/embark run``` to check if everything is behaving as expected -```../bin/embark test``` to see tests are working as expected +```../../bin/embark test``` to see tests are working as expected ```dist/index.html``` and ```dist/test.html``` to check different functionality