[WIP] Add Istanbul 7-nodes example

examples/7nodes/README.md

@@ -11,6 +11,11 @@ There are corresponding commands for running in Raft mode (`stop.sh` stays the s
   - `raft-init.sh`
   - `raft-start.sh`
 
+There are corresponding commands for running in Istanbul mode (`stop.sh` stays the same).
+
+  - `istanbul-init.sh`
+  - `istanbul-start.sh`
+
 All logs and temporary data will be written to the `qdata` folder.
 
 ## Testing Privacy

examples/7nodes/istanbul-genesis.json

@@ -0,0 +1,56 @@
+{
+    "alloc": {
+      "0x0000000000000000000000000000000000000020": {
+        "code": "0x606060405236156100c45760e060020a60003504631290948581146100c9578063284d163c146100f957806342169e4814610130578063488099a6146101395780634fe437d514610154578063559c390c1461015d57806368bb8bb61461025d57806372a571fc146102c857806386c1ff681461036957806398ba676d146103a0578063a7771ee31461040b578063adfaa72e14610433578063cf5289851461044e578063de8fa43114610457578063e814d1c71461046d578063f4ab9adf14610494575b610002565b610548600435600160a060020a03331660009081526003602052604090205460ff16156100c45760018190555b50565b610548600435600160a060020a03331660009081526005602052604090205460ff16156100c4576004546001141561055e57610002565b61045b60025481565b61054a60043560056020526000908152604090205460ff1681565b61045b60015481565b61045b60043560006000600060006000600050600186038154811015610002579080526002027f290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e5630192505b60018301548110156105d75760018301805484916000918490811015610002576000918252602080832090910154835282810193909352604091820181205485825292869052205410801561023257506001805490840180548591600091859081101561000257906000526020600020900160005054815260208101919091526040016000205410155b156102555760018301805482908110156100025760009182526020909120015491505b6001016101a8565b610548600435602435600160a060020a03331660009081526003602052604081205460ff16156100c4578054839010156105e45780548084038101808355908290829080158290116105df576002028160020283600052602060002091820191016105df919061066b565b610548600435600160a060020a03331660009081526005602052604090205460ff16156100c457600160a060020a0381166000908152604090205460ff1615156100f65760406000819020805460ff191660019081179091556004805490910190558051600160a060020a038316815290517f1a4ce6942f7aa91856332e618fc90159f13a340611a308f5d7327ba0707e56859181900360200190a16100f6565b610548600435600160a060020a03331660009081526003602052604090205460ff16156100c4576002546001141561071457610002565b61045b600435602435600060006000600050600185038154811015610002579080526002027f290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e5630181509050806001016000508381548110156100025750825250602090200154919050565b61054a600435600160a060020a03811660009081526003602052604090205460ff165b919050565b61054a60043560036020526000908152604090205460ff1681565b61045b60045481565b6000545b60408051918252519081900360200190f35b61054a600435600160a060020a03811660009081526005602052604090205460ff1661042e565b610548600435600160a060020a03331660009081526003602052604090205460ff16156100c457600160a060020a03811660009081526003602052604090205460ff1615156100f65760406000818120600160a060020a0384169182905260036020908152815460ff1916600190811790925560028054909201909155825191825291517f0ad2eca75347acd5160276fe4b5dad46987e4ff4af9e574195e3e9bc15d7e0ff929181900390910190a16100f6565b005b604080519115158252519081900360200190f35b600160a060020a03811660009081526005602052604090205460ff16156100f65760406000819020805460ff19169055600480546000190190558051600160a060020a038316815290517f8cee3054364d6799f1c8962580ad61273d9d38ca1ff26516bd1ad23c099a60229181900360200190a16100f6565b509392505050565b505050505b60008054600019850190811015610002578382526002027f290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563016020819052604082205490925014156106b8578060010160005080548060010182818154818355818115116106a5578183600052602060002091820191016106a5919061068d565b50506002015b808211156106a157600181018054600080835591825260208220610665918101905b808211156106a1576000815560010161068d565b5090565b5050506000928352506020909120018290555b600082815260208281526040918290208054600101905581514381529081018490528151600160a060020a033316927f3d03ba7f4b5227cdb385f2610906e5bcee147171603ec40005b30915ad20e258928290030190a2505050565b600160a060020a03811660009081526003602052604090205460ff16156100f65760406000819020805460ff19169055600280546000190190558051600160a060020a038316815290517f183393fc5cffbfc7d03d623966b85f76b9430f42d3aada2ac3f3deabc78899e89181900360200190a16100f656",
+        "storage": {
+          "0x0000000000000000000000000000000000000000000000000000000000000001": "0x02",
+
+          "0x0000000000000000000000000000000000000000000000000000000000000002": "0x04",
+          "0x29ecdbdf95c7f6ceec92d6150c697aa14abeb0f8595dd58d808842ea237d8494": "0x01",
+          "0x6aa118c6537572d8b515a9f9154be55a3377a8de7991cd23bf6e5ceb368688e3": "0x01",
+          "0x50793743212c6f01d326957d7069005b912f8215f10c7536be6b10782c6c44cd": "0x01",
+          "0x38f6c908c5cc7ca668cec2f476abe61b4dbb1df20f0ad8e07ef5dbf6a2f1ffd4": "0x01",
+
+          "0x0000000000000000000000000000000000000000000000000000000000000004": "0x02",
+          "0xaca3b76ed4968740c3180dd7fa37f4aa229a2c758a848f53920e9ccb4c4bb74e": "0x01",
+          "0xd188ba2dc293670542c1befaf7678b0859e5354a0727d1188b2afb6f47fe24d1": "0x01"
+        },
+        "balance": "1000000000000000000000000000"
+      },
+      "0xed9d02e382b34818e88b88a309c7fe71e65f419d": {
+        "balance": "1000000000000000000000000000"
+      },
+      "0xca843569e3427144cead5e4d5999a3d0ccf92b8e": {
+        "balance": "1000000000000000000000000000"
+      },
+      "0x0fbdc686b912d7722dc86510934589e0aaf3b55a": {
+        "balance": "1000000000000000000000000000"
+      },
+      "0x9186eb3d20cbd1f5f992a950d808c4495153abd5": {
+        "balance": "1000000000000000000000000000"
+      },
+      "0x0638e1574728b6d862dd5d3a3e0942c3be47d996": {
+        "balance": "1000000000000000000000000000"
+      }
+    },
+    "coinbase": "0x0000000000000000000000000000000000000000",
+    "config": {
+      "homesteadBlock": 1,
+        "eip150Block": 2,
+        "eip150Hash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+        "eip155Block": 3,
+        "eip158Block": 3,
+      "istanbul": {
+        "epoch": 30000,
+        "policy": 0
+      },
+      "isQuorum": true
+    },
+    "extraData": "0x0000000000000000000000000000000000000000000000000000000000000000f897f893946571d97f340c8495b661a823f2c2145ca47d63c2948157d4437104e3b8df4451a85f7b2438ef6699ff94b131288f355bc27090e542ae0be213c20350b76794b912de287f9b047b4228436e94b5b78e3ee1617194d8dba507e85f116b1f7e231ca8525fc9008a696694e36cbeb565b061217930767886474e3cde903ac594f512a992f3fb749857d758ffda1330e590fa915e80c0",
+    "gasLimit": "0x47b760",
+    "difficulty": "0x1",
+    "mixHash": "0x63746963616c2062797a616e74696e65206661756c7420746f6c6572616e6365",
+    "nonce": "0x0",
+    "parentHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+    "timestamp": "0x00"
+  }

examples/7nodes/istanbul-init.sh

@@ -0,0 +1,54 @@
+#!/bin/bash
+set -u
+set -e
+
+echo "[*] Cleaning up temporary data directories"
+rm -rf qdata
+mkdir -p qdata/logs
+
+echo "[*] Configuring node 1"
+mkdir -p qdata/dd1/{keystore,geth}
+cp raft/static-nodes.json qdata/dd1
+cp keys/key1 qdata/dd1/keystore
+cp raft/nodekey1 qdata/dd1/geth/nodekey
+geth --datadir qdata/dd1 init istanbul-genesis.json
+
+echo "[*] Configuring node 2"
+mkdir -p qdata/dd2/{keystore,geth}
+cp raft/static-nodes.json qdata/dd2
+cp keys/key2 qdata/dd2/keystore
+cp keys/key3 qdata/dd2/keystore
+cp raft/nodekey2 qdata/dd2/geth/nodekey
+geth --datadir qdata/dd2 init istanbul-genesis.json
+
+echo "[*] Configuring node 3"
+mkdir -p qdata/dd3/{keystore,geth}
+cp raft/static-nodes.json qdata/dd3
+cp raft/nodekey3 qdata/dd3/geth/nodekey
+geth --datadir qdata/dd3 init istanbul-genesis.json
+
+echo "[*] Configuring node 4 as voter"
+mkdir -p qdata/dd4/{keystore,geth}
+cp raft/static-nodes.json qdata/dd4
+cp keys/key4 qdata/dd4/keystore
+cp raft/nodekey4 qdata/dd4/geth/nodekey
+geth --datadir qdata/dd4 init istanbul-genesis.json
+
+echo "[*] Configuring node 5 as voter"
+mkdir -p qdata/dd5/{keystore,geth}
+cp raft/static-nodes.json qdata/dd5
+cp keys/key5 qdata/dd5/keystore
+cp raft/nodekey5 qdata/dd5/geth/nodekey
+geth --datadir qdata/dd5 init istanbul-genesis.json
+
+echo "[*] Configuring node 6"
+mkdir -p qdata/dd6/{keystore,geth}
+cp raft/static-nodes.json qdata/dd6
+cp raft/nodekey6 qdata/dd6/geth/nodekey
+geth --datadir qdata/dd6 init istanbul-genesis.json
+
+echo "[*] Configuring node 7"
+mkdir -p qdata/dd7/{keystore,geth}
+cp raft/static-nodes.json qdata/dd7
+cp raft/nodekey7 qdata/dd7/geth/nodekey
+geth --datadir qdata/dd7 init istanbul-genesis.json

examples/7nodes/istanbul-start.sh

@@ -0,0 +1,45 @@
+#!/bin/bash
+set -u
+set -e
+
+GLOBAL_ARGS="--mine --rpc --rpcaddr 0.0.0.0 --rpcapi admin,db,eth,debug,miner,net,shh,txpool,personal,web3,quorum,istanbul"
+
+echo "[*] Starting Constellation nodes"
+nohup constellation-node tm1.conf 2>> qdata/logs/constellation1.log &
+sleep 1
+nohup constellation-node tm2.conf 2>> qdata/logs/constellation2.log &
+nohup constellation-node tm3.conf 2>> qdata/logs/constellation3.log &
+nohup constellation-node tm4.conf 2>> qdata/logs/constellation4.log &
+nohup constellation-node tm5.conf 2>> qdata/logs/constellation5.log &
+nohup constellation-node tm6.conf 2>> qdata/logs/constellation6.log &
+nohup constellation-node tm7.conf 2>> qdata/logs/constellation7.log &
+
+sleep 1
+
+echo "[*] Starting node 1"
+PRIVATE_CONFIG=tm1.conf nohup geth --nousb --datadir qdata/dd1 $GLOBAL_ARGS --rpcport 22000 --port 21000 --unlock 0 --password passwords.txt 2>>qdata/logs/1.log &
+
+echo "[*] Starting node 2"
+PRIVATE_CONFIG=tm2.conf nohup geth --nousb --datadir qdata/dd2 $GLOBAL_ARGS --rpcport 22001 --port 21001 2>>qdata/logs/2.log &
+
+echo "[*] Starting node 3"
+PRIVATE_CONFIG=tm3.conf nohup geth --nousb --datadir qdata/dd3 $GLOBAL_ARGS --rpcport 22002 --port 21002 2>>qdata/logs/3.log &
+
+echo "[*] Starting node 4"
+PRIVATE_CONFIG=tm4.conf nohup geth --nousb --datadir qdata/dd4 $GLOBAL_ARGS --rpcport 22003 --port 21003 2>>qdata/logs/4.log &
+
+echo "[*] Starting node 5"
+PRIVATE_CONFIG=tm5.conf nohup geth --nousb --datadir qdata/dd5 $GLOBAL_ARGS --rpcport 22004 --port 21004 2>>qdata/logs/5.log &
+
+echo "[*] Starting node 6"
+PRIVATE_CONFIG=tm6.conf nohup geth --nousb --datadir qdata/dd6 $GLOBAL_ARGS --rpcport 22005 --port 21005 2>>qdata/logs/6.log &
+
+echo "[*] Starting node 7"
+PRIVATE_CONFIG=tm7.conf nohup geth --nousb --datadir qdata/dd7 $GLOBAL_ARGS --rpcport 22006 --port 21006 2>>qdata/logs/7.log &
+
+echo "[*] Waiting for nodes to start"
+sleep 10
+echo "[*] Sending first transaction"
+PRIVATE_CONFIG=tm1.conf geth --exec 'loadScript("script1.js")' attach ipc:qdata/dd1/geth.ipc
+
+echo "All nodes configured. See 'qdata/logs' for logs, and run e.g. 'geth attach qdata/dd1/geth.ipc' to attach to the first Geth node"

vagrant/bootstrap.sh

@@ -24,9 +24,9 @@ PATH=$PATH:/usr/local/go/bin
 echo 'PATH=$PATH:/usr/local/go/bin' >> /home/ubuntu/.bashrc
 
 # make/install quorum
-git clone https://github.com/jpmorganchase/quorum.git
+git clone https://github.com/getamis/quorum.git
 pushd quorum >/dev/null
-git checkout tags/v1.2.0
+git checkout feature/istanbul
 make all
 cp build/bin/geth /usr/local/bin
 cp build/bin/bootnode /usr/local/bin