From 733bba612367e2f17d050428c1e9db5288fc0716 Mon Sep 17 00:00:00 2001 From: Attila Klenik Date: Wed, 7 Oct 2020 10:38:06 +0200 Subject: [PATCH] Update Ethereum and HL Besu network examples - Use CI networks from the Caliper repository - Bump TX load for simple benchmark - Fix incorrect method name bug in the smallbank benchmark Signed-off-by: Attila Klenik --- .gitignore | 1 + benchmarks/scenario/simple/config.yaml | 2 +- benchmarks/scenario/smallbank/create.js | 2 +- .../caliper-besu-clique.Dockerfile | 2 +- networks/besu/1node-clique/data/genesis.json | 10 ++- networks/besu/1node-clique/docker-compose.yml | 3 +- networks/besu/1node-clique/networkconfig.json | 14 ++-- ...ile => caliper-ethereum-clique.Dockerfile} | 4 +- .../ethereum/1node-clique/data/genesis.json | 17 ++-- .../ethereum/1node-clique/docker-compose.yml | 8 +- .../{ethereum.json => networkconfig.json} | 15 ++-- networks/ethereum/1node/Dockerfile | 17 ---- networks/ethereum/1node/data/bc.dat | Bin 14241 -> 0 bytes networks/ethereum/1node/data/genesis.json | 29 ------- networks/ethereum/1node/docker-compose.yml | 25 ------ networks/ethereum/1node/ethereum.json | 22 ------ ...--c0a8e4d217eb85b812aeb1226fab6f588943c2c2 | 1 - networks/ethereum/1node/keys/password | 1 - src/besu/simple/simple.json | 73 ------------------ src/besu/simple/simple.sol | 18 ----- 20 files changed, 47 insertions(+), 217 deletions(-) rename networks/ethereum/1node-clique/{Dockerfile => caliper-ethereum-clique.Dockerfile} (96%) rename networks/ethereum/1node-clique/{ethereum.json => networkconfig.json} (50%) delete mode 100644 networks/ethereum/1node/Dockerfile delete mode 100755 networks/ethereum/1node/data/bc.dat delete mode 100644 networks/ethereum/1node/data/genesis.json delete mode 100644 networks/ethereum/1node/docker-compose.yml delete mode 100644 networks/ethereum/1node/ethereum.json delete mode 100644 networks/ethereum/1node/keys/UTC--2019-05-05T20-07-38.958128475Z--c0a8e4d217eb85b812aeb1226fab6f588943c2c2 delete mode 100644 networks/ethereum/1node/keys/password delete mode 100644 src/besu/simple/simple.json delete mode 100644 src/besu/simple/simple.sol diff --git a/.gitignore b/.gitignore index b1281e6c5..cc6d78a38 100644 --- a/.gitignore +++ b/.gitignore @@ -14,6 +14,7 @@ launch.json # Limited npm runtime artifacts node_modules/* +package.json package-lock.json src/fabric/samples/fabcar/java diff --git a/benchmarks/scenario/simple/config.yaml b/benchmarks/scenario/simple/config.yaml index 391db545d..8792445c6 100755 --- a/benchmarks/scenario/simple/config.yaml +++ b/benchmarks/scenario/simple/config.yaml @@ -1,7 +1,7 @@ simpleArgs: &simple-args initialMoney: 10000 moneyToTransfer: 100 - numberOfAccounts: &number-of-accounts 100 + numberOfAccounts: &number-of-accounts 1000 test: name: simple diff --git a/benchmarks/scenario/smallbank/create.js b/benchmarks/scenario/smallbank/create.js index 236b805bd..d46ff9a80 100755 --- a/benchmarks/scenario/smallbank/create.js +++ b/benchmarks/scenario/smallbank/create.js @@ -42,7 +42,7 @@ class Create extends OperationBase { * @return {Promise} */ async submitTransaction() { - const createArgs = this.smallbank.getOpenAccountArguments(); + const createArgs = this.smallbank.getCreateAccountArguments(); const request = this.createConnectorRequest('create_account', createArgs); await this.sutAdapter.sendRequests(request); } diff --git a/networks/besu/1node-clique/caliper-besu-clique.Dockerfile b/networks/besu/1node-clique/caliper-besu-clique.Dockerfile index 3deb7c376..12abee6e4 100644 --- a/networks/besu/1node-clique/caliper-besu-clique.Dockerfile +++ b/networks/besu/1node-clique/caliper-besu-clique.Dockerfile @@ -12,7 +12,7 @@ # limitations under the License. # -FROM hyperledger/besu:1.4 +FROM hyperledger/besu:latest COPY ./data/ /root/ VOLUME [ "/root/.ethereum/keystore/" ] ENTRYPOINT [ "/opt/besu/bin/besu", "--genesis-file=/root/genesis.json", "--node-private-key-file=/root/.ethereum/keystore/key" ] diff --git a/networks/besu/1node-clique/data/genesis.json b/networks/besu/1node-clique/data/genesis.json index 54cb0a05d..687c51258 100644 --- a/networks/besu/1node-clique/data/genesis.json +++ b/networks/besu/1node-clique/data/genesis.json @@ -1,7 +1,13 @@ { "config": { "chainId": 48122, - "istanbulBlock": 0, + "homesteadBlock": 1, + "eip150Block": 2, + "eip150Hash": "0x0000000000000000000000000000000000000000000000000000000000000000", + "eip155Block": 3, + "eip158Block": 3, + "byzantiumBlock": 4, + "constantinopleBlock": 5, "clique": { "blockperiodseconds": 5, "epoch": 30000 @@ -10,7 +16,7 @@ "nonce": "0x0", "timestamp": "0x5ca916c6", "extraData": "0x0000000000000000000000000000000000000000000000000000000000000000c0A8e4D217eB85b812aeb1226fAb6F588943C2C20000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", - "gasLimit": "0x2faf080", + "gasLimit": "0x47b760", "difficulty": "0x1", "mixHash": "0x0000000000000000000000000000000000000000000000000000000000000000", "coinbase": "0xc0A8e4D217eB85b812aeb1226fAb6F588943C2C2", diff --git a/networks/besu/1node-clique/docker-compose.yml b/networks/besu/1node-clique/docker-compose.yml index 0a29285fa..dbc98c1b5 100644 --- a/networks/besu/1node-clique/docker-compose.yml +++ b/networks/besu/1node-clique/docker-compose.yml @@ -22,6 +22,7 @@ services: container_name: besu_clique volumes: - ./keys:/root/.ethereum/keystore + - ./data:/root ports: - 8545-8547:8545-8547 - command: --revert-reason-enabled --rpc-http-enabled --rpc-http-host 0.0.0.0 --host-whitelist=* --rpc-http-apis admin,eth,miner,web3,net --graphql-http-enabled --discovery-enabled=false + command: --revert-reason-enabled --rpc-ws-enabled --rpc-ws-host 0.0.0.0 --host-whitelist=* --rpc-ws-apis admin,eth,miner,web3,net --graphql-http-enabled --discovery-enabled=false diff --git a/networks/besu/1node-clique/networkconfig.json b/networks/besu/1node-clique/networkconfig.json index cec203d54..76228b87a 100644 --- a/networks/besu/1node-clique/networkconfig.json +++ b/networks/besu/1node-clique/networkconfig.json @@ -1,22 +1,22 @@ { "caliper": { "blockchain": "ethereum", - "command": { - "start": "docker-compose -f networks/besu/1node-clique/docker-compose.yml up -d && sleep 30", - "end": "docker-compose -f networks/besu/1node-clique/docker-compose.yml down" - } + "command" : { + "start": "docker-compose -f ./networks/besu/1node-clique/docker-compose.yml up -d && sleep 60", + "end" : "docker-compose -f ./networks/besu/1node-clique/docker-compose.yml down" + } }, "ethereum": { - "url": "http://localhost:8545", + "url": "ws://localhost:8546", "contractDeployerAddress": "0xD1cf9D73a91DE6630c2bb068Ba5fDdF9F0DEac09", "contractDeployerAddressPrivateKey": "0x797c13f7235c627f6bd013dc17fff4c12213ab49abcf091f77c83f16db10e90b", "fromAddressSeed": "0x3f841bf589fdf83a521e55d51afddc34fa65351161eead24f064855fc29c9580", "transactionConfirmationBlocks": 2, "contracts": { "simple": { - "path": "src/besu/simple/simple.json", + "path": "./src/ethereum/simple/simple.json", + "estimateGas": true, "gas": { - "open": 45000, "query": 100000, "transfer": 70000 } diff --git a/networks/ethereum/1node-clique/Dockerfile b/networks/ethereum/1node-clique/caliper-ethereum-clique.Dockerfile similarity index 96% rename from networks/ethereum/1node-clique/Dockerfile rename to networks/ethereum/1node-clique/caliper-ethereum-clique.Dockerfile index b7bfb99ed..8de21e6c4 100644 --- a/networks/ethereum/1node-clique/Dockerfile +++ b/networks/ethereum/1node-clique/caliper-ethereum-clique.Dockerfile @@ -1,3 +1,4 @@ +# # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -9,9 +10,10 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. +# FROM ethereum/client-go:stable COPY ./data/ /root/ VOLUME [ "/root/.ethereum/keystore/" ] RUN geth --nousb init /root/genesis.json && geth --nousb import /root/bc.dat -ENTRYPOINT [ "geth" ] \ No newline at end of file +ENTRYPOINT [ "geth" ] diff --git a/networks/ethereum/1node-clique/data/genesis.json b/networks/ethereum/1node-clique/data/genesis.json index 1f50e6270..02445215d 100644 --- a/networks/ethereum/1node-clique/data/genesis.json +++ b/networks/ethereum/1node-clique/data/genesis.json @@ -1,14 +1,13 @@ { "config": { "chainId": 48122, - "istanbulBlock": 0, - "petersburgBlock": 0, - "constantinopleBlock": 0, - "byzantiumBlock": 0, - "eip158Block": 0, - "eip155Block": 0, - "eip150Block": 0, - "homesteadBlock": 0, + "homesteadBlock": 1, + "eip150Block": 2, + "eip150Hash": "0x0000000000000000000000000000000000000000000000000000000000000000", + "eip155Block": 3, + "eip158Block": 3, + "byzantiumBlock": 4, + "constantinopleBlock": 5, "clique": { "period": 5, "epoch": 30000 @@ -17,7 +16,7 @@ "nonce": "0x0", "timestamp": "0x5ca916c6", "extraData": "0x0000000000000000000000000000000000000000000000000000000000000000c0A8e4D217eB85b812aeb1226fAb6F588943C2C20000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", - "gasLimit": "0x2faf080", + "gasLimit": "0x47b760", "difficulty": "0x1", "mixHash": "0x0000000000000000000000000000000000000000000000000000000000000000", "coinbase": "0xc0A8e4D217eB85b812aeb1226fAb6F588943C2C2", diff --git a/networks/ethereum/1node-clique/docker-compose.yml b/networks/ethereum/1node-clique/docker-compose.yml index f17cdaab5..bf8d548d5 100644 --- a/networks/ethereum/1node-clique/docker-compose.yml +++ b/networks/ethereum/1node-clique/docker-compose.yml @@ -15,11 +15,13 @@ version: "3" services: node: - build: . + build: + context: . + dockerfile: caliper-ethereum-clique.Dockerfile image: caliper-ethereum-clique container_name: ethereum_clique volumes: - ./keys:/root/.ethereum/keystore ports: - - 8545:8545 - command: --unlock 0xc0A8e4D217eB85b812aeb1226fAb6F588943C2C2 --password /root/.ethereum/keystore/password --mine --minerthreads 2 --etherbase 0xc0A8e4D217eB85b812aeb1226fAb6F588943C2C2 --rpc --rpcaddr 0.0.0.0 --rpcvhosts=* --rpcapi admin,eth,miner,personal,web3 --allow-insecure-unlock --nodiscover --gasprice 1 \ No newline at end of file + - 8546:8546 + command: --unlock 0xc0A8e4D217eB85b812aeb1226fAb6F588943C2C2 --password /root/.ethereum/keystore/password --mine --minerthreads 2 --etherbase 0xc0A8e4D217eB85b812aeb1226fAb6F588943C2C2 --ws --wsaddr 0.0.0.0 --wsorigins='*' --wsapi admin,eth,miner,personal,web3 --allow-insecure-unlock --nodiscover --gasprice 1 diff --git a/networks/ethereum/1node-clique/ethereum.json b/networks/ethereum/1node-clique/networkconfig.json similarity index 50% rename from networks/ethereum/1node-clique/ethereum.json rename to networks/ethereum/1node-clique/networkconfig.json index 945f63078..62292c5d2 100644 --- a/networks/ethereum/1node-clique/ethereum.json +++ b/networks/ethereum/1node-clique/networkconfig.json @@ -2,12 +2,12 @@ "caliper": { "blockchain": "ethereum", "command" : { - "start": "docker-compose -f networks/ethereum/1node-clique/docker-compose.yml up -d && sleep 3", - "end" : "docker-compose -f networks/ethereum/1node-clique/docker-compose.yml down" + "start": "docker-compose -f ./networks/ethereum/1node-clique/docker-compose.yml up -d && sleep 60s", + "end" : "docker-compose -f ./networks/ethereum/1node-clique/docker-compose.yml down" } }, "ethereum": { - "url": "http://localhost:8545", + "url": "ws://localhost:8546", "contractDeployerAddress": "0xc0A8e4D217eB85b812aeb1226fAb6F588943C2C2", "contractDeployerAddressPassword": "password", "fromAddress": "0xc0A8e4D217eB85b812aeb1226fAb6F588943C2C2", @@ -15,8 +15,13 @@ "transactionConfirmationBlocks": 2, "contracts": { "simple": { - "path": "src/ethereum/simple/simple.json" + "path": "./src/ethereum/simple/simple.json", + "estimateGas": true, + "gas": { + "query": 100000, + "transfer": 70000 + } } } } -} \ No newline at end of file +} diff --git a/networks/ethereum/1node/Dockerfile b/networks/ethereum/1node/Dockerfile deleted file mode 100644 index a48ac8acc..000000000 --- a/networks/ethereum/1node/Dockerfile +++ /dev/null @@ -1,17 +0,0 @@ -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -FROM ethereum/client-go:stable -COPY ./data/ /root/ -VOLUME [ "/root/.ethereum/keystore/" ] -RUN geth --nousb init /root/genesis.json && geth --nousb import /root/bc.dat && geth --nousb makedag 0 /root/.ethash && geth --nousb makedag 30000 /root/.ethash -ENTRYPOINT [ "geth" ] \ No newline at end of file diff --git a/networks/ethereum/1node/data/bc.dat b/networks/ethereum/1node/data/bc.dat deleted file mode 100755 index 54a7fd88900705f8a47c2d4ae4aecc57db9b7a47..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 14241 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 diff --git a/networks/ethereum/1node/data/genesis.json b/networks/ethereum/1node/data/genesis.json deleted file mode 100644 index 40d4ce9cf..000000000 --- a/networks/ethereum/1node/data/genesis.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "config": { - "chainId": 21194, - "istanbulBlock": 0, - "petersburgBlock": 0, - "constantinopleBlock": 0, - "byzantiumBlock": 0, - "eip158Block": 0, - "eip155Block": 0, - "eip150Block": 0, - "homesteadBlock": 0, - "ethash": {} - }, - "nonce": "0x0", - "timestamp": "0x5cd09c57", - "extraData": "0x0000000000000000000000000000000000000000000000000000000000000000", - "gasLimit": "0x2faf080", - "difficulty": "0x80000", - "mixHash": "0x0000000000000000000000000000000000000000000000000000000000000000", - "coinbase": "0x0000000000000000000000000000000000000000", - "alloc": { - "c0a8e4d217eb85b812aeb1226fab6f588943c2c2": { - "balance": "0x200000000000000000000000000000000000000000000000000000000000000" - } - }, - "number": "0x0", - "gasUsed": "0x0", - "parentHash": "0x0000000000000000000000000000000000000000000000000000000000000000" -} \ No newline at end of file diff --git a/networks/ethereum/1node/docker-compose.yml b/networks/ethereum/1node/docker-compose.yml deleted file mode 100644 index 501f9a82b..000000000 --- a/networks/ethereum/1node/docker-compose.yml +++ /dev/null @@ -1,25 +0,0 @@ -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -version: "3" -services: - node: - build: . - image: caliper-ethereum - container_name: ethereum - volumes: - - ./keys:/root/.ethereum/keystore - ports: - - 8545:8545 - command: --unlock 0xc0A8e4D217eB85b812aeb1226fAb6F588943C2C2 --password /root/.ethereum/keystore/password --mine --minerthreads 2 --etherbase 0xc0A8e4D217eB85b812aeb1226fAb6F588943C2C2 --rpc --rpcaddr 0.0.0.0 --rpcvhosts=* --rpcapi admin,eth,miner,personal,web3 --allow-insecure-unlock --nodiscover --gasprice 1 \ No newline at end of file diff --git a/networks/ethereum/1node/ethereum.json b/networks/ethereum/1node/ethereum.json deleted file mode 100644 index 4ab671996..000000000 --- a/networks/ethereum/1node/ethereum.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "caliper": { - "blockchain": "ethereum", - "command" : { - "start": "docker-compose -f networks/ethereum/1node/docker-compose.yml up -d && sleep 3", - "end" : "docker-compose -f networks/ethereum/1node/docker-compose.yml down" - } - }, - "ethereum": { - "url": "http://localhost:8545", - "contractDeployerAddress": "0xc0A8e4D217eB85b812aeb1226fAb6F588943C2C2", - "contractDeployerAddressPassword": "password", - "fromAddress": "0xc0A8e4D217eB85b812aeb1226fAb6F588943C2C2", - "fromAddressPassword": "password", - "transactionConfirmationBlocks": 2, - "contracts": { - "simple": { - "path": "src/ethereum/simple/simple.json" - } - } - } -} \ No newline at end of file diff --git a/networks/ethereum/1node/keys/UTC--2019-05-05T20-07-38.958128475Z--c0a8e4d217eb85b812aeb1226fab6f588943c2c2 b/networks/ethereum/1node/keys/UTC--2019-05-05T20-07-38.958128475Z--c0a8e4d217eb85b812aeb1226fab6f588943c2c2 deleted file mode 100644 index 237ff7e2b..000000000 --- a/networks/ethereum/1node/keys/UTC--2019-05-05T20-07-38.958128475Z--c0a8e4d217eb85b812aeb1226fab6f588943c2c2 +++ /dev/null @@ -1 +0,0 @@ -{"address":"c0a8e4d217eb85b812aeb1226fab6f588943c2c2","crypto":{"cipher":"aes-128-ctr","ciphertext":"521588833e66d0e052120c30080e37e847ae7877eb09dc6760eb10382c2e6d4f","cipherparams":{"iv":"cee02dbf21538798041c99f49bef9afa"},"kdf":"scrypt","kdfparams":{"dklen":32,"n":262144,"p":1,"r":8,"salt":"916a08841725aba0bf2a2d39f489f0d5d3f2b5032067e44655b8ff542c492f03"},"mac":"f90667ea4de3e977b1cdd23ed722ddffc3f6888b21ea68cc7d5ef77463022e94"},"id":"7543fa05-dac5-4ae9-856d-e96ddea28c41","version":3} \ No newline at end of file diff --git a/networks/ethereum/1node/keys/password b/networks/ethereum/1node/keys/password deleted file mode 100644 index 7aa311adf..000000000 --- a/networks/ethereum/1node/keys/password +++ /dev/null @@ -1 +0,0 @@ -password \ No newline at end of file diff --git a/src/besu/simple/simple.json b/src/besu/simple/simple.json deleted file mode 100644 index 8353266de..000000000 --- a/src/besu/simple/simple.json +++ /dev/null @@ -1,73 +0,0 @@ -{ - "name": "simple", - "abi": [ - { - "constant": false, - "inputs": [ - { - "internalType": "string", - "name": "acc_from", - "type": "string" - }, - { - "internalType": "string", - "name": "acc_to", - "type": "string" - }, - { - "internalType": "int256", - "name": "amount", - "type": "int256" - } - ], - "name": "transfer", - "outputs": [], - "payable": false, - "stateMutability": "nonpayable", - "type": "function" - }, - { - "constant": true, - "inputs": [ - { - "internalType": "string", - "name": "acc_id", - "type": "string" - } - ], - "name": "query", - "outputs": [ - { - "internalType": "int256", - "name": "amount", - "type": "int256" - } - ], - "payable": false, - "stateMutability": "view", - "type": "function" - }, - { - "constant": false, - "inputs": [ - { - "internalType": "string", - "name": "acc_id", - "type": "string" - }, - { - "internalType": "int256", - "name": "amount", - "type": "int256" - } - ], - "name": "open", - "outputs": [], - "payable": false, - "stateMutability": "nonpayable", - "type": "function" - } - ], - "bytecode": "0x608060405234801561001057600080fd5b50610542806100206000396000f3fe608060405234801561001057600080fd5b50600436106100415760003560e01c80631de45b10146100465780637c261929146101a25780639064129314610271575b600080fd5b6101a06004803603606081101561005c57600080fd5b810190808035906020019064010000000081111561007957600080fd5b82018360208201111561008b57600080fd5b803590602001918460018302840111640100000000831117156100ad57600080fd5b91908080601f016020809104026020016040519081016040528093929190818152602001838380828437600081840152601f19601f8201169050808301925050505050505091929192908035906020019064010000000081111561011057600080fd5b82018360208201111561012257600080fd5b8035906020019184600183028401116401000000008311171561014457600080fd5b91908080601f016020809104026020016040519081016040528093929190818152602001838380828437600081840152601f19601f82011690508083019250505050505050919291929080359060200190929190505050610336565b005b61025b600480360360208110156101b857600080fd5b81019080803590602001906401000000008111156101d557600080fd5b8201836020820111156101e757600080fd5b8035906020019184600183028401116401000000008311171561020957600080fd5b91908080601f016020809104026020016040519081016040528093929190818152602001838380828437600081840152601f19601f820116905080830192505050505050509192919290505050610429565b6040518082815260200191505060405180910390f35b6103346004803603604081101561028757600080fd5b81019080803590602001906401000000008111156102a457600080fd5b8201836020820111156102b657600080fd5b803590602001918460018302840111640100000000831117156102d857600080fd5b91908080601f016020809104026020016040519081016040528093929190818152602001838380828437600081840152601f19601f8201169050808301925050505050505091929192908035906020019092919050505061049b565b005b806000846040518082805190602001908083835b6020831061036d578051825260208201915060208101905060208303925061034a565b6001836020036101000a038019825116818451168082178552505050505050905001915050908152602001604051809103902060008282540392505081905550806000836040518082805190602001908083835b602083106103e457805182526020820191506020810190506020830392506103c1565b6001836020036101000a038019825116818451168082178552505050505050905001915050908152602001604051809103902060008282540192505081905550505050565b600080826040518082805190602001908083835b60208310610460578051825260208201915060208101905060208303925061043d565b6001836020036101000a0380198251168184511680821785525050505050509050019150509081526020016040518091039020549050919050565b806000836040518082805190602001908083835b602083106104d257805182526020820191506020810190506020830392506104af565b6001836020036101000a038019825116818451168082178552505050505050905001915050908152602001604051809103902081905550505056fea265627a7a72315820f89fa48c6c4d5d7df165b5e3dba04cbe258ce57a3a4ef3bab1377546b84b699f64736f6c634300050b0032", - "gas": 4700000 -} \ No newline at end of file diff --git a/src/besu/simple/simple.sol b/src/besu/simple/simple.sol deleted file mode 100644 index 59397b601..000000000 --- a/src/besu/simple/simple.sol +++ /dev/null @@ -1,18 +0,0 @@ -pragma solidity >=0.4.22 <0.6.0; - -contract simple { - mapping(string => int) private accounts; - - function open(string memory acc_id, int amount) public { - accounts[acc_id] = amount; - } - - function query(string memory acc_id) public view returns (int amount) { - amount = accounts[acc_id]; - } - - function transfer(string memory acc_from, string memory acc_to, int amount) public { - accounts[acc_from] -= amount; - accounts[acc_to] += amount; - } -} \ No newline at end of file