Merge pull request #95 from wonkr/ethereum-pos

Ethereum pos

examples/C04-ethereum-pos/beacon-setup-node.py

@@ -100,21 +100,13 @@ def do_GET(self):
 '''
 
 DEPLOY_CONTRACT = '''\
-let count=0
-ok=true
-until curl -sHf http://{geth_node_ip}:8545 > /dev/null; do {{
-echo "eth: geth not ready, waiting..."
-sleep 3
-let count++
-[ $count -gt 60 ] && {{
-    echo "eth: geth connection failed too many times, skipping."
-    ok=false
-    break
-}}
-}}; done
-($ok) && {{
-lcli deploy-deposit-contract --eth1-http http://{geth_node_ip}:8545 --confirmations 1 --validator-count {validator_count} > contract_address.txt
-}}
+while true; do {{
+    lcli deploy-deposit-contract --eth1-http http://{geth_node_ip}:8545 --confirmations 1 --validator-count {validator_count} > contract_address.txt
+    CONTRACT_ADDRESS=`head -1 contract_address.txt | cut -d '"' -f 2`
+    if [[ $CONTRACT_ADDRESS = 0x* ]]; then
+        break
+    fi
+}} done;
 '''
 
 beacon_setup_node.addBuildCommand('apt-get update && apt-get install -y --no-install-recommends software-properties-common')

examples/C04-ethereum-pos/blockchain-pos.py

@@ -30,7 +30,7 @@ def makeStubAs(emu: Emulator, base: Base, asn: int, exchange: int, hosts_total:
 #    exit(0)
 #hosts_total = int(sys.argv[1])
 
-hosts_total = int(1)
+hosts_total = int(4)
 
 ###############################################################################
 emu     = Emulator()
@@ -129,6 +129,7 @@ def makeStubAs(emu: Emulator, base: Base, asn: int, exchange: int, hosts_total:
 
 TERMINAL_TOTAL_DIFFICULTY=50
 LIGHTHOUSE_BIN_PATH="/home/won/.cargo/bin/lighthouse"
+
 i = 1
 for asn in asns:
     for id in range(hosts_total):
@@ -178,6 +179,9 @@ def makeStubAs(emu: Emulator, base: Base, asn: int, exchange: int, hosts_total:
 
 BEACON_SETUP_NODE_COMMAND_SH = """\
 #!/bin/bash
+
+rm -rf beacon-node/
+rm -rf hnode_150_beacon-setup-node/
 ./beacon-setup-node.py {} '{}' {}
 """
 f = open("beacon-setup-node.sh", "w")