From 9795f24fd25e12fc058138b75a2d7b668d638390 Mon Sep 17 00:00:00 2001 From: Pierre Martin Date: Sat, 8 Jun 2019 19:54:44 +0100 Subject: [PATCH] Updates repository with dev settings and keys for current projects. --- docker-compose.yml | 88 +++++++++---------- genesis.json | 40 +++------ ...bb79B02449ea575F6185dd3C541E9ab8d8182.json | 1 + ...d4e623d10f9fba5db95830f7d3839406c6af2.json | 21 ----- ...f2ac550a1b4e2280d04c21cea7ebd822934b5.json | 21 ----- ...1ef87e392377ec08e7c08eb105ef5448eced5.json | 21 ----- ...2b7a2355d6fecc4b5c0b6bd44cc31df247a2e.json | 21 ----- ...Cf535FC1f1C4dD1a4C4f4c261684bcd3e1bcb.json | 1 + ...4772Cc9e233B4fe1F04A65a994aF40A6834ac.json | 1 + ...A5fC36b990D68bBCaAA206C281BfEc31134AB.json | 1 + ...f5B8b24cE3e00Ad0345cD2d47f96947c3e2c3.json | 1 + ...da56215b167893e80b4fe645ba6d5bab767de.json | 21 ----- ...306090abab3a6e1400e9345bc60c78a8bef57.json | 21 ----- ...0a553fc93768f612722bb8c2ec78ac90b3bbc.json | 21 ----- ...19A49787d10a6e0c72a25DB06cc555370c4DD.json | 1 + ...3D7405080197fC03cA82bCDd1764F1e14ABf2.json | 1 + ...aea9a577a9b44299b9c15c88cf3087f3b5544.json | 21 ----- ...581516679F57Aa7eb81D278841DF6aB93902B.json | 1 + ...4496508E92A9FCB0Ffc8Cb6363f910C7E8AE3.json | 1 + ...5800E52318834E8689c37dCCCD2230427a905.json | 1 + ...df4076b8f3a5357c5e395ab970b5b54098fef.json | 21 ----- ...f52151ebef6c7334fad080c5704d77216b732.json | 21 ----- scripts/functions.sh | 14 +-- scripts/node.sh | 6 +- scripts/sealer.sh | 6 +- 25 files changed, 78 insertions(+), 296 deletions(-) create mode 100644 keystore/0x0Cbbb79B02449ea575F6185dd3C541E9ab8d8182.json delete mode 100644 keystore/0x0d1d4e623d10f9fba5db95830f7d3839406c6af2.json delete mode 100644 keystore/0x0f4f2ac550a1b4e2280d04c21cea7ebd822934b5.json delete mode 100644 keystore/0x2191ef87e392377ec08e7c08eb105ef5448eced5.json delete mode 100644 keystore/0x2932b7a2355d6fecc4b5c0b6bd44cc31df247a2e.json create mode 100644 keystore/0x356Cf535FC1f1C4dD1a4C4f4c261684bcd3e1bcb.json create mode 100644 keystore/0x4B54772Cc9e233B4fe1F04A65a994aF40A6834ac.json create mode 100644 keystore/0x563A5fC36b990D68bBCaAA206C281BfEc31134AB.json create mode 100644 keystore/0x59Ef5B8b24cE3e00Ad0345cD2d47f96947c3e2c3.json delete mode 100644 keystore/0x5aeda56215b167893e80b4fe645ba6d5bab767de.json delete mode 100644 keystore/0x627306090abab3a6e1400e9345bc60c78a8bef57.json delete mode 100644 keystore/0x6330a553fc93768f612722bb8c2ec78ac90b3bbc.json create mode 100644 keystore/0x6c319A49787d10a6e0c72a25DB06cc555370c4DD.json create mode 100644 keystore/0x71b3D7405080197fC03cA82bCDd1764F1e14ABf2.json delete mode 100644 keystore/0x821aea9a577a9b44299b9c15c88cf3087f3b5544.json create mode 100644 keystore/0x9E9581516679F57Aa7eb81D278841DF6aB93902B.json create mode 100644 keystore/0xC9c4496508E92A9FCB0Ffc8Cb6363f910C7E8AE3.json create mode 100644 keystore/0xF7e5800E52318834E8689c37dCCCD2230427a905.json delete mode 100644 keystore/0xc5fdf4076b8f3a5357c5e395ab970b5b54098fef.json delete mode 100644 keystore/0xf17f52151ebef6c7334fad080c5704d77216b732.json diff --git a/docker-compose.yml b/docker-compose.yml index a23d348..9a36575 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -4,8 +4,6 @@ services: # The bootnode is the rendez-vous point for all other nodes. bootnode: image: ethereum/client-go:alltools-release-1.8 - restart: on-failure - hostname: bootstrap ports: - 30303:30303 volumes: @@ -17,7 +15,6 @@ services: # but it's not sealing. node: image: ethereum/client-go:alltools-release-1.8 - restart: on-failure links: [bootnode] ports: - 8544-8546:8544-8546 @@ -26,55 +23,54 @@ services: - ./keystore:/keystore:ro - ./genesis.json:/genesis.json:ro - /etc/localtime:/etc/localtime:ro - command: /scripts/node.sh 0x627306090abab3a6e1400e9345bc60c78a8bef57 + command: /scripts/node.sh 0x71b3D7405080197fC03cA82bCDd1764F1e14ABf2 # Sealer nodes are workers that commit blocks constantly. sealer-one: image: ethereum/client-go:alltools-release-1.8 - restart: on-failure links: [bootnode] volumes: - ./scripts:/scripts:ro - ./keystore:/keystore:ro - ./genesis.json:/genesis.json:ro - /etc/localtime:/etc/localtime:ro - command: /scripts/sealer.sh 0xf17f52151ebef6c7334fad080c5704d77216b732 - sealer-two: - image: ethereum/client-go:alltools-release-1.8 - restart: on-failure - links: [bootnode] - volumes: - - ./scripts:/scripts:ro - - ./keystore:/keystore:ro - - ./genesis.json:/genesis.json:ro - - /etc/localtime:/etc/localtime:ro - command: /scripts/sealer.sh 0xc5fdf4076b8f3a5357c5e395ab970b5b54098fef - sealer-three: - image: ethereum/client-go:alltools-release-1.8 - restart: on-failure - links: [bootnode] - volumes: - - ./scripts:/scripts:ro - - ./keystore:/keystore:ro - - ./genesis.json:/genesis.json:ro - - /etc/localtime:/etc/localtime:ro - command: /scripts/sealer.sh 0x821aea9a577a9b44299b9c15c88cf3087f3b5544 - sealer-four: - image: ethereum/client-go:alltools-release-1.8 - restart: on-failure - links: [bootnode] - volumes: - - ./scripts:/scripts:ro - - ./keystore:/keystore:ro - - ./genesis.json:/genesis.json:ro - - /etc/localtime:/etc/localtime:ro - command: /scripts/sealer.sh 0x0d1d4e623d10f9fba5db95830f7d3839406c6af2 - sealer-five: - image: ethereum/client-go:alltools-release-1.8 - restart: on-failure - links: [bootnode] - volumes: - - ./scripts:/scripts:ro - - ./keystore:/keystore:ro - - ./genesis.json:/genesis.json:ro - - /etc/localtime:/etc/localtime:ro - command: /scripts/sealer.sh 0x2932b7a2355d6fecc4b5c0b6bd44cc31df247a2e + command: /scripts/sealer.sh 0x6c319A49787d10a6e0c72a25DB06cc555370c4DD + # sealer-two: + # image: ethereum/client-go:alltools-release-1.8 + # restart: on-failure + # links: [bootnode] + # volumes: + # - ./scripts:/scripts:ro + # - ./keystore:/keystore:ro + # - ./genesis.json:/genesis.json:ro + # - /etc/localtime:/etc/localtime:ro + # command: /scripts/sealer.sh 0x9E9581516679F57Aa7eb81D278841DF6aB93902B + # sealer-three: + # image: ethereum/client-go:alltools-release-1.8 + # restart: on-failure + # links: [bootnode] + # volumes: + # - ./scripts:/scripts:ro + # - ./keystore:/keystore:ro + # - ./genesis.json:/genesis.json:ro + # - /etc/localtime:/etc/localtime:ro + # command: /scripts/sealer.sh 0x71b3D7405080197fC03cA82bCDd1764F1e14ABf2 + # sealer-four: + # image: ethereum/client-go:alltools-release-1.8 + # restart: on-failure + # links: [bootnode] + # volumes: + # - ./scripts:/scripts:ro + # - ./keystore:/keystore:ro + # - ./genesis.json:/genesis.json:ro + # - /etc/localtime:/etc/localtime:ro + # command: /scripts/sealer.sh 0x0Cbbb79B02449ea575F6185dd3C541E9ab8d8182 + # sealer-five: + # image: ethereum/client-go:alltools-release-1.8 + # restart: on-failure + # links: [bootnode] + # volumes: + # - ./scripts:/scripts:ro + # - ./keystore:/keystore:ro + # - ./genesis.json:/genesis.json:ro + # - /etc/localtime:/etc/localtime:ro + # command: /scripts/sealer.sh 0x563A5fC36b990D68bBCaAA206C281BfEc31134AB diff --git a/genesis.json b/genesis.json index 34d0c0b..8618a38 100644 --- a/genesis.json +++ b/genesis.json @@ -7,14 +7,15 @@ "eip155Block": 3, "eip158Block": 3, "byzantiumBlock": 4, + "constantinopleBlock": 5, "clique": { "period": 1, "epoch": 30000 } }, "nonce": "0x0", - "timestamp": "0x5bacab7b", - "extraData": "0x0000000000000000000000000000000000000000000000000000000000000000821aea9a577a9b44299b9c15c88cf3087f3b5544c5fdf4076b8f3a5357c5e395ab970b5b54098feff17f52151ebef6c7334fad080c5704d77216b7320000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "timestamp": "0x5cfbfcab", + "extraData": "0x00000000000000000000000000000000000000000000000000000000000000006c319a49787d10a6e0c72a25db06cc555370c4dd0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "gasLimit": "0x59a5380", "difficulty": "0x1", "mixHash": "0x0000000000000000000000000000000000000000000000000000000000000000", @@ -788,35 +789,20 @@ "00000000000000000000000000000000000000ff": { "balance": "0x1" }, - "0d1d4e623d10f9fba5db95830f7d3839406c6af2": { - "balance": "0x1000000000000000000000000" + "356cf535fc1f1c4dd1a4c4f4c261684bcd3e1bcb": { + "balance": "0x33b2e3c9fd0803ce8000000" }, - "0f4f2ac550a1b4e2280d04c21cea7ebd822934b5": { - "balance": "0x1000000000000000000000000" + "4b54772cc9e233b4fe1f04a65a994af40a6834ac": { + "balance": "0x33b2e3c9fd0803ce8000000" }, - "2191ef87e392377ec08e7c08eb105ef5448eced5": { - "balance": "0x1000000000000000000000000" + "59ef5b8b24ce3e00ad0345cd2d47f96947c3e2c3": { + "balance": "0x33b2e3c9fd0803ce8000000" }, - "2932b7a2355d6fecc4b5c0b6bd44cc31df247a2e": { - "balance": "0x1000000000000000000000000" + "c9c4496508e92a9fcb0ffc8cb6363f910c7e8ae3": { + "balance": "0x33b2e3c9fd0803ce8000000" }, - "5aeda56215b167893e80b4fe645ba6d5bab767de": { - "balance": "0x1000000000000000000000000" - }, - "627306090abab3a6e1400e9345bc60c78a8bef57": { - "balance": "0x1000000000000000000000000" - }, - "6330a553fc93768f612722bb8c2ec78ac90b3bbc": { - "balance": "0x1000000000000000000000000" - }, - "821aea9a577a9b44299b9c15c88cf3087f3b5544": { - "balance": "0x1000000000000000000000000" - }, - "c5fdf4076b8f3a5357c5e395ab970b5b54098fef": { - "balance": "0x1000000000000000000000000" - }, - "f17f52151ebef6c7334fad080c5704d77216b732": { - "balance": "0x1000000000000000000000000" + "f7e5800e52318834e8689c37dcccd2230427a905": { + "balance": "0x33b2e3c9fd0803ce8000000" } }, "number": "0x0", diff --git a/keystore/0x0Cbbb79B02449ea575F6185dd3C541E9ab8d8182.json b/keystore/0x0Cbbb79B02449ea575F6185dd3C541E9ab8d8182.json new file mode 100644 index 0000000..916162e --- /dev/null +++ b/keystore/0x0Cbbb79B02449ea575F6185dd3C541E9ab8d8182.json @@ -0,0 +1 @@ +{"address":"0cbbb79b02449ea575f6185dd3c541e9ab8d8182","crypto":{"cipher":"aes-128-ctr","ciphertext":"30510c9d0d584ea424fcc0ad30ad8ab874e2b761ea2404747cfb19641097ba5f","cipherparams":{"iv":"435324b5f5b5359f1983715a6294dcc4"},"kdf":"scrypt","kdfparams":{"dklen":32,"n":262144,"p":1,"r":8,"salt":"f6649168f8361140c8762c0cda8407b08af0896a697bd0287265870355ec0616"},"mac":"4826d9caa59025d78028303185bb96fa451c52298f9760fba919ea30a4efe341"},"id":"aeb798ca-5cb6-400e-baca-1804b18a66f4","version":3} \ No newline at end of file diff --git a/keystore/0x0d1d4e623d10f9fba5db95830f7d3839406c6af2.json b/keystore/0x0d1d4e623d10f9fba5db95830f7d3839406c6af2.json deleted file mode 100644 index 7ae3335..0000000 --- a/keystore/0x0d1d4e623d10f9fba5db95830f7d3839406c6af2.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "address": "0d1d4e623d10f9fba5db95830f7d3839406c6af2", - "crypto": { - "cipher": "aes-128-ctr", - "ciphertext": "d7025ed09cb5d283b2b8d0eee7a1775587eb9533ff6b0aebbf91d1d3fba547c6", - "cipherparams": { - "iv": "da538512f8f2034b14c42a985fe17985" - }, - "kdf": "scrypt", - "kdfparams": { - "dklen": 32, - "n": 262144, - "p": 1, - "r": 8, - "salt": "2744d911c44965fccda9fbc542f3528d71f21358b322028c534b581338fb7d16" - }, - "mac": "6d73c223911698d41553afdc3da145386f4d2130f47ad33b2b9a2bc264243bd3" - }, - "id": "f3917213-7f3f-454f-967f-1c8367b72b91", - "version": 3 -} diff --git a/keystore/0x0f4f2ac550a1b4e2280d04c21cea7ebd822934b5.json b/keystore/0x0f4f2ac550a1b4e2280d04c21cea7ebd822934b5.json deleted file mode 100644 index 4363e62..0000000 --- a/keystore/0x0f4f2ac550a1b4e2280d04c21cea7ebd822934b5.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "address": "0f4f2ac550a1b4e2280d04c21cea7ebd822934b5", - "crypto": { - "cipher": "aes-128-ctr", - "ciphertext": "88172a2463e006a1b5e5309a82ea4c4a4326d363c7d318d500b1b760013f73e9", - "cipherparams": { - "iv": "ce9a25c4ae5131e56fab67b810fbb425" - }, - "kdf": "scrypt", - "kdfparams": { - "dklen": 32, - "n": 262144, - "p": 1, - "r": 8, - "salt": "e27292d6937c81a1d944aa6ac6339eb0ac83c132b66574d686243e9acebc223f" - }, - "mac": "c98d3968ab2489f835eee1d5a468635cff1f2dc32d03552f004f9d2460dfffed" - }, - "id": "dd5ef219-a527-4eab-9c09-c2b530663fe6", - "version": 3 -} diff --git a/keystore/0x2191ef87e392377ec08e7c08eb105ef5448eced5.json b/keystore/0x2191ef87e392377ec08e7c08eb105ef5448eced5.json deleted file mode 100644 index 28a0bbd..0000000 --- a/keystore/0x2191ef87e392377ec08e7c08eb105ef5448eced5.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "address": "2191ef87e392377ec08e7c08eb105ef5448eced5", - "crypto": { - "cipher": "aes-128-ctr", - "ciphertext": "ae6e05db11404707a090eb43f5f1e24059950da8eceadbf7b9e0043c54cc823b", - "cipherparams": { - "iv": "61cd011e45e9c3b2e637f1592c54eac3" - }, - "kdf": "scrypt", - "kdfparams": { - "dklen": 32, - "n": 262144, - "p": 1, - "r": 8, - "salt": "a6c1131e8a00eeaa22e7ed191348e00348fcaa72ddc65f29b84bd2604efdde3f" - }, - "mac": "870c39b0894f625532dab4911f77bae30fefa9b78e002fbffeb33959e3b6b4f6" - }, - "id": "29b6140d-19a1-4397-b40d-4984201900c6", - "version": 3 -} diff --git a/keystore/0x2932b7a2355d6fecc4b5c0b6bd44cc31df247a2e.json b/keystore/0x2932b7a2355d6fecc4b5c0b6bd44cc31df247a2e.json deleted file mode 100644 index 597dd3f..0000000 --- a/keystore/0x2932b7a2355d6fecc4b5c0b6bd44cc31df247a2e.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "address": "2932b7a2355d6fecc4b5c0b6bd44cc31df247a2e", - "crypto": { - "cipher": "aes-128-ctr", - "ciphertext": "9a204016249b2107da9add5596d892593a750b6896da3e5aec01c1d2e0ccc5b6", - "cipherparams": { - "iv": "fdde572aa676f629ead8a93188533790" - }, - "kdf": "scrypt", - "kdfparams": { - "dklen": 32, - "n": 262144, - "p": 1, - "r": 8, - "salt": "4ffe55eab0f0e92b0ab965727a7575080b3fbb656851a136f5775579708e8209" - }, - "mac": "273ddbe46e7f4ce5cdfd53348ee5004ac4c1652de67f93a802a08c991c134b2f" - }, - "id": "b993738d-0bbb-407e-a675-10c5937419f1", - "version": 3 -} diff --git a/keystore/0x356Cf535FC1f1C4dD1a4C4f4c261684bcd3e1bcb.json b/keystore/0x356Cf535FC1f1C4dD1a4C4f4c261684bcd3e1bcb.json new file mode 100644 index 0000000..350c4fd --- /dev/null +++ b/keystore/0x356Cf535FC1f1C4dD1a4C4f4c261684bcd3e1bcb.json @@ -0,0 +1 @@ +{"address":"356cf535fc1f1c4dd1a4c4f4c261684bcd3e1bcb","crypto":{"cipher":"aes-128-ctr","ciphertext":"97a9c8672b58e4b34da7dfa2ecad8daef26c307ff94efb560d1b3065fd914b81","cipherparams":{"iv":"db83becce78d4e324670a616e79943be"},"kdf":"scrypt","kdfparams":{"dklen":32,"n":262144,"p":1,"r":8,"salt":"62bb64d28e25ab7d8cfd5539450c552056ef87efd2243eeab3085be95ea4ac6e"},"mac":"9b00dd05e83b8c91893fe9ebbd99023756b7e36e5ef41478450a706ff23a100e"},"id":"19af8bd5-cd3b-47e9-8cd2-e561025927d3","version":3} \ No newline at end of file diff --git a/keystore/0x4B54772Cc9e233B4fe1F04A65a994aF40A6834ac.json b/keystore/0x4B54772Cc9e233B4fe1F04A65a994aF40A6834ac.json new file mode 100644 index 0000000..56e239a --- /dev/null +++ b/keystore/0x4B54772Cc9e233B4fe1F04A65a994aF40A6834ac.json @@ -0,0 +1 @@ +{"address":"4b54772cc9e233b4fe1f04a65a994af40a6834ac","crypto":{"cipher":"aes-128-ctr","ciphertext":"57c1866ccfea46284e8705dea648d14f9209edb2dd6130d92fe4a2c5fbd280ce","cipherparams":{"iv":"827f0ad2548e50245163f642fb681765"},"kdf":"scrypt","kdfparams":{"dklen":32,"n":262144,"p":1,"r":8,"salt":"fcf74eb63038b7e30697bb565fe11c71605240be7a4ddc254789bd1636153cce"},"mac":"9f86be7b73eaa9446dd7209521a4c6651f7c54dbf1d7f440d83f22d7aa5ac2fd"},"id":"78af6f94-f941-4eeb-a8e5-7b489dd686e9","version":3} \ No newline at end of file diff --git a/keystore/0x563A5fC36b990D68bBCaAA206C281BfEc31134AB.json b/keystore/0x563A5fC36b990D68bBCaAA206C281BfEc31134AB.json new file mode 100644 index 0000000..211e1a3 --- /dev/null +++ b/keystore/0x563A5fC36b990D68bBCaAA206C281BfEc31134AB.json @@ -0,0 +1 @@ +{"address":"563a5fc36b990d68bbcaaa206c281bfec31134ab","crypto":{"cipher":"aes-128-ctr","ciphertext":"16afe7e3f660debf58c56b67a5e95ae0c910647881fdfe1a43874b35633680a5","cipherparams":{"iv":"6346ed1c766eed07a2f1d30e2abeac80"},"kdf":"scrypt","kdfparams":{"dklen":32,"n":262144,"p":1,"r":8,"salt":"b5b4522bfebc0578bf7f2d8d9605b939f83006e4e517ead7493575d64a76b04a"},"mac":"b86414825e0774447e8845d349042d871939ac16562e1f4ae0bb73935558b0c5"},"id":"42d49c85-6744-4967-9e86-def8ff833a77","version":3} \ No newline at end of file diff --git a/keystore/0x59Ef5B8b24cE3e00Ad0345cD2d47f96947c3e2c3.json b/keystore/0x59Ef5B8b24cE3e00Ad0345cD2d47f96947c3e2c3.json new file mode 100644 index 0000000..9674d29 --- /dev/null +++ b/keystore/0x59Ef5B8b24cE3e00Ad0345cD2d47f96947c3e2c3.json @@ -0,0 +1 @@ +{"address":"59ef5b8b24ce3e00ad0345cd2d47f96947c3e2c3","crypto":{"cipher":"aes-128-ctr","ciphertext":"7077713fad14e8eb77f41a3630338afe2358c4236c8f2067fd346109e1c8aa8d","cipherparams":{"iv":"b2528cdfa48ee773ab99ee04f914cd02"},"kdf":"scrypt","kdfparams":{"dklen":32,"n":262144,"p":1,"r":8,"salt":"dbbc7bdaf21a10863a9aaaaa9592393a345ba8e606f2349f6771bdafbbe64d7b"},"mac":"b3931391ea874bdac0fba9df70c51cb6289004377eebe101dd721999977a9eb4"},"id":"0a64a213-906a-415f-9a41-592c4713d84d","version":3} \ No newline at end of file diff --git a/keystore/0x5aeda56215b167893e80b4fe645ba6d5bab767de.json b/keystore/0x5aeda56215b167893e80b4fe645ba6d5bab767de.json deleted file mode 100644 index 24e3578..0000000 --- a/keystore/0x5aeda56215b167893e80b4fe645ba6d5bab767de.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "address": "5aeda56215b167893e80b4fe645ba6d5bab767de", - "crypto": { - "cipher": "aes-128-ctr", - "ciphertext": "b8b50d8357f1716b8a6f62bd8d4de0fbc818a95b91ef93ec95f6ddd2ac8d8525", - "cipherparams": { - "iv": "015c86a1b3dc883b9cf2cf9dba6df3a6" - }, - "kdf": "scrypt", - "kdfparams": { - "dklen": 32, - "n": 262144, - "p": 1, - "r": 8, - "salt": "6903c3f32de230130fa44c56299c7a29e0ddf52ded00cdaa0f1a46e90b2caae2" - }, - "mac": "c5438d4b8e3bdaccb34c5416c034a7675a5bdf17b4c687c07d2504a56836e2df" - }, - "id": "0c7d8e40-018d-4cc8-9e26-921c1a255ab4", - "version": 3 -} diff --git a/keystore/0x627306090abab3a6e1400e9345bc60c78a8bef57.json b/keystore/0x627306090abab3a6e1400e9345bc60c78a8bef57.json deleted file mode 100644 index 6bb8dff..0000000 --- a/keystore/0x627306090abab3a6e1400e9345bc60c78a8bef57.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "address": "627306090abab3a6e1400e9345bc60c78a8bef57", - "crypto": { - "cipher": "aes-128-ctr", - "ciphertext": "3e6a43b96f65278d8f619c213489fcc0ca384b41aa7304ce22edea7809c186d6", - "cipherparams": { - "iv": "afcde9fc4a9457d272a90e63aa2c1c56" - }, - "kdf": "scrypt", - "kdfparams": { - "dklen": 32, - "n": 262144, - "p": 1, - "r": 8, - "salt": "f9b9e6c5ef44ce79260d08936569363044109142dffdadca459049f4306eeb41" - }, - "mac": "180a2629e469e03bfd90554416791bebea9bbdbb8d5f77d565ce960a88103f2e" - }, - "id": "6f0f17b9-739d-42cc-8b8c-8717cbba0b71", - "version": 3 -} diff --git a/keystore/0x6330a553fc93768f612722bb8c2ec78ac90b3bbc.json b/keystore/0x6330a553fc93768f612722bb8c2ec78ac90b3bbc.json deleted file mode 100644 index d5dd9bd..0000000 --- a/keystore/0x6330a553fc93768f612722bb8c2ec78ac90b3bbc.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "address": "6330a553fc93768f612722bb8c2ec78ac90b3bbc", - "crypto": { - "cipher": "aes-128-ctr", - "ciphertext": "6fdc76963ddd150a3449622c9ed9290b2be97f5710493865cd1069b82f74bf99", - "cipherparams": { - "iv": "d0801c2631e2b9a7ff0c4141419a253b" - }, - "kdf": "scrypt", - "kdfparams": { - "dklen": 32, - "n": 262144, - "p": 1, - "r": 8, - "salt": "cfb71d36efcc3022cd1663df84cc4f298aa4d73f9261252106bbd08b31b3ca73" - }, - "mac": "789cacf3c52c957bd4aa874d3e1ae5fbc20a5b43e02ac00779a04b36cc9b418f" - }, - "id": "17163ff5-698b-41f1-a69e-faa12d7265d5", - "version": 3 -} diff --git a/keystore/0x6c319A49787d10a6e0c72a25DB06cc555370c4DD.json b/keystore/0x6c319A49787d10a6e0c72a25DB06cc555370c4DD.json new file mode 100644 index 0000000..aa1c0af --- /dev/null +++ b/keystore/0x6c319A49787d10a6e0c72a25DB06cc555370c4DD.json @@ -0,0 +1 @@ +{"address":"6c319a49787d10a6e0c72a25db06cc555370c4dd","crypto":{"cipher":"aes-128-ctr","ciphertext":"27211720eacc2e7e065e8f31f2426a2678428eccfe843d886c6c93854916b9d1","cipherparams":{"iv":"96e6ffc4136cc634c67568f52859d753"},"kdf":"scrypt","kdfparams":{"dklen":32,"n":262144,"p":1,"r":8,"salt":"b5aca607c0a6e0b2d975a52f398c06fb4528881dba7ec60c4ef580df635cb05a"},"mac":"cde216b1b618fb8edbbaf06188fb4d1497e3412028f8ee62cf507010a4931d45"},"id":"e396b1e4-f4d6-49e0-bafb-c46e46307a8e","version":3} \ No newline at end of file diff --git a/keystore/0x71b3D7405080197fC03cA82bCDd1764F1e14ABf2.json b/keystore/0x71b3D7405080197fC03cA82bCDd1764F1e14ABf2.json new file mode 100644 index 0000000..75afb20 --- /dev/null +++ b/keystore/0x71b3D7405080197fC03cA82bCDd1764F1e14ABf2.json @@ -0,0 +1 @@ +{"address":"71b3d7405080197fc03ca82bcdd1764f1e14abf2","crypto":{"cipher":"aes-128-ctr","ciphertext":"c113dc85401e88611c7f0b78d8400bc19efde931d39ab94ed4a90ff96f9f5d17","cipherparams":{"iv":"bd479f2f5ed159b296b43e05585d0439"},"kdf":"scrypt","kdfparams":{"dklen":32,"n":262144,"p":1,"r":8,"salt":"4abbb4519853f7c45967653fc8fc258b135e63787bc76316ccdc9b078b6c556d"},"mac":"0af064ab86dab56f712ad9eafd76b36b642613b19221f81e6301d99e2df4d809"},"id":"ee792307-6d5d-421e-baa6-5f30d5b948a5","version":3} diff --git a/keystore/0x821aea9a577a9b44299b9c15c88cf3087f3b5544.json b/keystore/0x821aea9a577a9b44299b9c15c88cf3087f3b5544.json deleted file mode 100644 index a907709..0000000 --- a/keystore/0x821aea9a577a9b44299b9c15c88cf3087f3b5544.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "address": "821aea9a577a9b44299b9c15c88cf3087f3b5544", - "crypto": { - "cipher": "aes-128-ctr", - "ciphertext": "9bcf129b708e1fa124a196653a6b86b83c4df35c712dee951be01e2f9455d536", - "cipherparams": { - "iv": "328854b272ce74051851a80d44ba5a34" - }, - "kdf": "scrypt", - "kdfparams": { - "dklen": 32, - "n": 262144, - "p": 1, - "r": 8, - "salt": "5729330f761c281c8488a19a1b6870117a8acd66447767ad31c0159244ac9fc1" - }, - "mac": "180be3907a0d75e3004f26395065547b5878d11397abd22423c7b94609544025" - }, - "id": "1498304d-a755-4ed4-a875-d8b95a0a401f", - "version": 3 -} diff --git a/keystore/0x9E9581516679F57Aa7eb81D278841DF6aB93902B.json b/keystore/0x9E9581516679F57Aa7eb81D278841DF6aB93902B.json new file mode 100644 index 0000000..1fa7347 --- /dev/null +++ b/keystore/0x9E9581516679F57Aa7eb81D278841DF6aB93902B.json @@ -0,0 +1 @@ +{"address":"9e9581516679f57aa7eb81d278841df6ab93902b","crypto":{"cipher":"aes-128-ctr","ciphertext":"1d5df0bc5a4d4e965c9bd78996fb240a657e09d5dd7b4f9eddb51d874c555b68","cipherparams":{"iv":"43332341a57d64a372b3e6c35d5c6c2f"},"kdf":"scrypt","kdfparams":{"dklen":32,"n":262144,"p":1,"r":8,"salt":"800545b395313bd64924efe8246d0309933b0cb7c0e8e13f8aa42d9613cdbdfe"},"mac":"cebe27c3813a9c845c1cb45a6c73b13639a2cf899c7b0c4a4a6ceeeafb86ad17"},"id":"d2794393-83fa-4260-8a7f-4bd5a2411428","version":3} \ No newline at end of file diff --git a/keystore/0xC9c4496508E92A9FCB0Ffc8Cb6363f910C7E8AE3.json b/keystore/0xC9c4496508E92A9FCB0Ffc8Cb6363f910C7E8AE3.json new file mode 100644 index 0000000..83a9299 --- /dev/null +++ b/keystore/0xC9c4496508E92A9FCB0Ffc8Cb6363f910C7E8AE3.json @@ -0,0 +1 @@ +{"address":"c9c4496508e92a9fcb0ffc8cb6363f910c7e8ae3","crypto":{"cipher":"aes-128-ctr","ciphertext":"eb017bfb7a5dff3250c72bc137ad299bcb39ff16eff6f5b045e205fe0f168297","cipherparams":{"iv":"b9ccfc6dfc844e97cf4ea20431a56040"},"kdf":"scrypt","kdfparams":{"dklen":32,"n":262144,"p":1,"r":8,"salt":"b92f7e92403cb0f55309231bc05bd350a589ace05847f09cdc7e999810b261ef"},"mac":"5355103e7d1f45250a8e9d34958893d87813c4f0e9e975033e1535b408fbdf3b"},"id":"a3ae32ef-b80d-4cdc-ab6f-ca6db1f50226","version":3} \ No newline at end of file diff --git a/keystore/0xF7e5800E52318834E8689c37dCCCD2230427a905.json b/keystore/0xF7e5800E52318834E8689c37dCCCD2230427a905.json new file mode 100644 index 0000000..41e36c8 --- /dev/null +++ b/keystore/0xF7e5800E52318834E8689c37dCCCD2230427a905.json @@ -0,0 +1 @@ +{"address":"f7e5800e52318834e8689c37dcccd2230427a905","crypto":{"cipher":"aes-128-ctr","ciphertext":"4d4c1ce5c6b2264d0c2e6b0104e8340d924bcc770bb99f5a2c79dca95064612c","cipherparams":{"iv":"40d1bc145b901ce0316819259169ec23"},"kdf":"scrypt","kdfparams":{"dklen":32,"n":262144,"p":1,"r":8,"salt":"3d1e1560becce97494cdcd00d49645fb6dfbca2b67f1678e520cc39dda895ee3"},"mac":"4677079fb4e16651daad577543593724af9ad458738c6e9170f8efc0ebda009e"},"id":"12d38e0b-5948-484b-b224-5a48f53ef3da","version":3} \ No newline at end of file diff --git a/keystore/0xc5fdf4076b8f3a5357c5e395ab970b5b54098fef.json b/keystore/0xc5fdf4076b8f3a5357c5e395ab970b5b54098fef.json deleted file mode 100644 index 15c1554..0000000 --- a/keystore/0xc5fdf4076b8f3a5357c5e395ab970b5b54098fef.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "address": "c5fdf4076b8f3a5357c5e395ab970b5b54098fef", - "crypto": { - "cipher": "aes-128-ctr", - "ciphertext": "62d09b2444e405d9478a68f287de82810004290578d5b8a97ae6468472743869", - "cipherparams": { - "iv": "167a6d0901155c457ab8f40e65347936" - }, - "kdf": "scrypt", - "kdfparams": { - "dklen": 32, - "n": 262144, - "p": 1, - "r": 8, - "salt": "40e9574d8c431748ca4a02fd5baa8394f070136b4110c18e7ac808061308249d" - }, - "mac": "9b0915ad078c9e49c936281805e2e6df9c5e47d601578a8ed32da04c67e3bea5" - }, - "id": "61938aff-6198-4853-a9d0-ccbe7724c372", - "version": 3 -} diff --git a/keystore/0xf17f52151ebef6c7334fad080c5704d77216b732.json b/keystore/0xf17f52151ebef6c7334fad080c5704d77216b732.json deleted file mode 100644 index 4486599..0000000 --- a/keystore/0xf17f52151ebef6c7334fad080c5704d77216b732.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "address": "f17f52151ebef6c7334fad080c5704d77216b732", - "crypto": { - "cipher": "aes-128-ctr", - "ciphertext": "71456f2e666518451bbcba03e402bed8d072e2d363a1c4d704e7dc061d328847", - "cipherparams": { - "iv": "69a4ae14c1e737ff881956ef76b7cd12" - }, - "kdf": "scrypt", - "kdfparams": { - "dklen": 32, - "n": 262144, - "p": 1, - "r": 8, - "salt": "f9845fe8f6107b6c0c21c27f5e495bfc93fbd885902612ea10fd2d4e7eeb8d56" - }, - "mac": "e4c017299809cb989f8180cf35b194e52d27e34ffaa90bb2dc1c2d8d978a4eb9" - }, - "id": "abcd766d-7684-4da3-92e0-d83c26837c3c", - "version": 3 -} diff --git a/scripts/functions.sh b/scripts/functions.sh index 9d5ff9e..89b7795 100755 --- a/scripts/functions.sh +++ b/scripts/functions.sh @@ -3,13 +3,13 @@ function prepareDatadir { datadir=$1 etherbase=$2 - if [ ! -d $datadir/geth ] - then + if [ ! -d $datadir/geth ]; then + echo "----------> A new data directory will be created!" geth --datadir $datadir \ - --etherbase $etherbase \ - --networkid "18021982" \ - --gasprice "0" \ - --targetgaslimit "0x59A5380" \ - init genesis.json + --etherbase $etherbase \ + --networkid "18021982" \ + --gasprice "1" \ + --targetgaslimit "0x59a5380" \ + init genesis.json fi } diff --git a/scripts/node.sh b/scripts/node.sh index aa42ae8..f812912 100755 --- a/scripts/node.sh +++ b/scripts/node.sh @@ -4,7 +4,7 @@ bootnode=$(getent hosts bootnode | awk '{print $1}') datadir=/root/.ethereum etherbase=$1 -addresses="0x627306090abab3a6e1400e9345bc60c78a8bef57,0xf17f52151ebef6c7334fad080c5704d77216b732,0xc5fdf4076b8f3a5357c5e395ab970b5b54098fef,0x821aea9a577a9b44299b9c15c88cf3087f3b5544,0x0d1d4e623d10f9fba5db95830f7d3839406c6af2,0x2932b7a2355d6fecc4b5c0b6bd44cc31df247a2e,0x2191ef87e392377ec08e7c08eb105ef5448eced5,0x0f4f2ac550a1b4e2280d04c21cea7ebd822934b5,0x6330a553fc93768f612722bb8c2ec78ac90b3bbc,0x5aeda56215b167893e80b4fe645ba6d5bab767de" +addresses="0x356Cf535FC1f1C4dD1a4C4f4c261684bcd3e1bcb,0x59Ef5B8b24cE3e00Ad0345cD2d47f96947c3e2c3,0x4B54772Cc9e233B4fe1F04A65a994aF40A6834ac,0xF7e5800E52318834E8689c37dCCCD2230427a905,0xC9c4496508E92A9FCB0Ffc8Cb6363f910C7E8AE3,0x6c319A49787d10a6e0c72a25DB06cc555370c4DD,0x9E9581516679F57Aa7eb81D278841DF6aB93902B,0x71b3D7405080197fC03cA82bCDd1764F1e14ABf2,0x0Cbbb79B02449ea575F6185dd3C541E9ab8d8182,0x563A5fC36b990D68bBCaAA206C281BfEc31134AB" mkdir -p $datadir/keystore cp -R /keystore $datadir @@ -13,8 +13,8 @@ prepareDatadir $datadir $etherbase geth --datadir $datadir \ --etherbase $etherbase \ --networkid "18021982" \ - --gasprice "0" \ - --targetgaslimit "0x59A5380" \ + --gasprice "1" \ + --targetgaslimit "0x59a5380" \ --rpc --rpcaddr '0.0.0.0' --rpcport 8545 --rpccorsdomain '*' --rpcapi 'admin,db,eth,miner,net,web3,personal,txpool' \ --ws --wsaddr '0.0.0.0' --wsport 8546 --wsorigins '*' \ --bootnodes "enode://f94118749beb981da38b82ab6be7b00dc0082783d698080fd0ae45a2c3d42f1ce74cbb153ffcfb1379b64235605bfff43f85b112032ddd9685ad2ab88735e1b1@${bootnode}:30301" \ diff --git a/scripts/sealer.sh b/scripts/sealer.sh index a040909..2b60b4a 100755 --- a/scripts/sealer.sh +++ b/scripts/sealer.sh @@ -12,10 +12,10 @@ prepareDatadir $datadir $etherbase geth --datadir $datadir \ --etherbase $etherbase \ --networkid "18021982" \ - --gasprice "0" \ - --targetgaslimit "0x59A5380" \ + --gasprice "1" \ + --targetgaslimit "0x59a5380" \ --bootnodes "enode://f94118749beb981da38b82ab6be7b00dc0082783d698080fd0ae45a2c3d42f1ce74cbb153ffcfb1379b64235605bfff43f85b112032ddd9685ad2ab88735e1b1@${bootnode}:30301" \ --unlock $etherbase \ --password "/dev/null" \ - --verbosity 1 \ + --verbosity 2 \ --mine