From d7d7197d99fb1a25e21f4c1f5c8c387f3663d126 Mon Sep 17 00:00:00 2001 From: Kirill Fedoseev Date: Fri, 12 Jun 2020 22:03:04 +0300 Subject: [PATCH] Add second validator to example --- configs/genesis.json | 7 ++++-- configs/geth-config.toml | 1 - configs/static-nodes.json | 5 ++-- docker-compose.yml | 48 +++++++++++++++++++++++++++++++++++---- validators/0/info | 5 ---- validators/0/nodekey | 2 +- validators/1/nodekey | 1 + 7 files changed, 53 insertions(+), 16 deletions(-) delete mode 100644 validators/0/info create mode 100644 validators/1/nodekey diff --git a/configs/genesis.json b/configs/genesis.json index 965f1bd..90189dd 100644 --- a/configs/genesis.json +++ b/configs/genesis.json @@ -26,13 +26,16 @@ }, "nonce": "0x0", "timestamp": "0x5eda1803", - "extraData": "0x0000000000000000000000000000000000000000000000000000000000000000f85ad5947de1cd14693fbe1240011afe8c68d61012e51babb8410000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c0", + "extraData": "0x0000000000000000000000000000000000000000000000000000000000000000f86fea944c65d2803af6a8b9b82cf018121cd190c65fba3594257e1f0a85e26bb7e071bd035bf84a790fb5406ab8410000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c0", "gasLimit": "0x989680", "difficulty": "0x1", "mixHash": "0x63746963616c2062797a616e74696e65206661756c7420746f6c6572616e6365", "coinbase": "0x0000000000000000000000000000000000000000", "alloc": { - "7de1cd14693fbe1240011afe8c68d61012e51bab": { + "257e1f0a85e26bb7e071bd035bf84a790fb5406a": { + "balance": "0x446c3b15f9926687d2c40534fdb564000000000000" + }, + "4c65d2803af6a8b9b82cf018121cd190c65fba35": { "balance": "0x446c3b15f9926687d2c40534fdb564000000000000" } }, diff --git a/configs/geth-config.toml b/configs/geth-config.toml index e16220b..735791f 100644 --- a/configs/geth-config.toml +++ b/configs/geth-config.toml @@ -77,7 +77,6 @@ MaxPeers = 50 NoDiscovery = true BootstrapNodes = [] BootstrapNodesV5 = [] -StaticNodes = [] TrustedNodes = [] ListenAddr = ":21000" EnableMsgEvents = false diff --git a/configs/static-nodes.json b/configs/static-nodes.json index bb9dae1..45d2ada 100644 --- a/configs/static-nodes.json +++ b/configs/static-nodes.json @@ -1,5 +1,4 @@ [ - "enode://ce6865299217787002fdcbd0f71f1aad006fa2f15131e6aaf3fcc001ba6fdb5b555899af70d3dbbab09847692f9a6e9f58cb3a3573e7048de951503b64d7c128@0.0.0.0:30303?discport=0", - "enode://8510cbf9fbfa8e7b41e052f9ac656f04f80456439087030ffee6e5d1fa96751c79da7e1e6f95d0846dc43d1c7428cf38977794d7cd2dfa7cacae8b4beeaa64ff@0.0.0.0:30303?discport=0", - "enode://b01be7ebd34b0326557b7144bf7f96b4902ef08d894b4748eb98625d84291e0cf9472b53c820d55e6d7a27628c7f4df55fbdbc279f6ed5e2350c6ec6e5d70030@0.0.0.0:30303?discport=0" + "enode://ec20416f62acd17f0c94ada8690784eb294273c163fc633e24596de733a231cc8606ce8afc405afbb3fb4f57509f2d05e7a1a6697e76ef4af66fc33449c4197e@node1:21000?discport=0", + "enode://ce6d1c648aee0d8ba8204075086504365d438d06c86415770c90e6d371602fc4a7ca2f0093bde3681f5f04432ac09eae9e6865d003033cbfb6be5e5064d0bf81@node2:21000?discport=0" ] \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index b359455..fa38f80 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,6 +1,6 @@ version: "3.8" services: - node: + node1: restart: "on-failure" image: quorumengineering/quorum:latest healthcheck: @@ -18,9 +18,7 @@ services: mkdir -p $${DDIR} if [ -z "$$(ls -A $${DDIR})" ]; then cp -RT /configs $${DDIR} - mkdir $${DDIR}/keystore mkdir $${DDIR}/geth - cp /validator_config/info $${DDIR}/keystore cp /validator_config/nodekey $${DDIR}/geth fi geth --datadir $${DDIR} init $${GENESIS_FILE} @@ -35,5 +33,47 @@ services: - node_vol:/qdata - ./configs:/configs:ro - ./validators/0:/validator_config:ro + networks: + net: + node2: + restart: "on-failure" + image: quorumengineering/quorum:latest + healthcheck: + test: ["CMD", "wget", "--spider", "--proxy", "off", "http://localhost:8545"] + interval: 3s + timeout: 3s + retries: 10 + start_period: 5s + entrypoint: + - /bin/sh + - -c + - | + DDIR=/qdata/dd + GENESIS_FILE="$${DDIR}/genesis.json" + mkdir -p $${DDIR} + if [ -z "$$(ls -A $${DDIR})" ]; then + cp -RT /configs $${DDIR} + mkdir $${DDIR}/geth + cp /validator_config/nodekey $${DDIR}/geth + fi + geth --datadir $${DDIR} init $${GENESIS_FILE} + geth --config /configs/geth-config.toml --verbosity 5 --gcmode archive --nodekey $${DDIR}/geth/nodekey --mine --minerthreads 1 + hostname: node + ports: + - "8546:8545" + - "8646:8645" + environment: + PRIVATE_CONFIG: ignore + volumes: + - node_vol2:/qdata + - ./configs:/configs:ro + - ./validators/1:/validator_config:ro + networks: + net: volumes: - node_vol: \ No newline at end of file + node_vol: + node_vol2: +networks: + net: + name: net + driver: bridge diff --git a/validators/0/info b/validators/0/info deleted file mode 100644 index 61b11c0..0000000 --- a/validators/0/info +++ /dev/null @@ -1,5 +0,0 @@ -{ - "Address": "0x7de1cd14693fbe1240011afe8c68d61012e51bab", - "Nodekey": "5c7a7055c4bd1be37256455d014406e8d5c696a93edc2aa70889108ba59fd9ea", - "NodeInfo": "enode://3ef78ad4f64863ee51a6cb88073e899c5c732ca58570df12c2337cb8bced6ad3d775beccdd3f5378449785b6fd5fce085edfdfd6943b28b1ce336b62d37205f4@0.0.0.0:30303?discport=0" -} \ No newline at end of file diff --git a/validators/0/nodekey b/validators/0/nodekey index 84b720d..b9c3dd7 100644 --- a/validators/0/nodekey +++ b/validators/0/nodekey @@ -1 +1 @@ -5c7a7055c4bd1be37256455d014406e8d5c696a93edc2aa70889108ba59fd9ea \ No newline at end of file +4ed8e9c7ca796e55c7a3ae89ca5b4f667d57f2fc875e3687356646649da1f393 \ No newline at end of file diff --git a/validators/1/nodekey b/validators/1/nodekey new file mode 100644 index 0000000..52b369f --- /dev/null +++ b/validators/1/nodekey @@ -0,0 +1 @@ +f321720ad46a659f3712fde1df92bf0249b91b90908877c37d5b73811a64813b \ No newline at end of file