Add more transactions to Geth on init. Skip tests that are failing.

3 files changed, 14 insertions, 9 deletions

diff --git a/packages/devnet/Dockerfile b/packages/devnet/Dockerfile
index 1115112bd..200357881 100644
--- a/packages/devnet/Dockerfile
+++ b/packages/devnet/Dockerfile
@@ -4,7 +4,7 @@ RUN \
   apk add --update go git make gcc musl-dev linux-headers ca-certificates && \
   # TODO(albrow): Change the Git URL and branch once we have all relvant PRs
   # merged to upstream.
-  git clone --depth 1 --branch sethead-txpool-fix https://github.com/0xProject/go-ethereum && \
+  git clone --depth 1 --branch '0x-testing' https://github.com/0xProject/go-ethereum && \
   (cd go-ethereum && make geth) && \
   cp go-ethereum/build/bin/geth /geth && \
   apk del go git make gcc musl-dev linux-headers && \
diff --git a/packages/devnet/genesis.json b/packages/devnet/genesis.json
index a2c3dd00e..90431c31c 100644
--- a/packages/devnet/genesis.json
+++ b/packages/devnet/genesis.json
@@ -16,7 +16,7 @@
     "timestamp": "0x5af1ffac",
     "extraData":
         "0x0000000000000000000000000000000000000000000000000000000000000000e8816898d851d5b61b7f950627d04d794c07ca370000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-    "gasLimit": "0x4c4b40",
+    "gasLimit": "0x4c4b400000",
     "difficulty": "0x1",
     "mixHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
     "coinbase": "0x0000000000000000000000000000000000000000",
diff --git a/packages/devnet/run.sh b/packages/devnet/run.sh
index da26d9caa..2c6d5fad1 100755
--- a/packages/devnet/run.sh
+++ b/packages/devnet/run.sh
@@ -4,20 +4,25 @@ set -e
 mkdir -p /var/log
 
 # Start Geth in background and redirect output to log file
-/geth --datadir node0/ --syncmode 'full' --nat none --nodiscover --port 30310 --txpool.journal '' \
+/geth --verbosity 5 --datadir node0/ --syncmode 'full' --nat none --nodiscover --port 30310 --txpool.journal '' \
     --rpc --rpcaddr '0.0.0.0' --rpcport 8501 --rpcapi 'personal,db,eth,net,web3,txpool,miner,debug' \
-    --networkid 50 --gasprice '2000000000' --targetgaslimit '0x4c4b40' --mine --etherbase '0xe8816898d851d5b61b7f950627d04d794c07ca37' \
+    --networkid 50 --gasprice '2000000000' --targetgaslimit '0x4c4b400000' --mine --etherbase '0xe8816898d851d5b61b7f950627d04d794c07ca37' \
     --unlock '0xe8816898d851d5b61b7f950627d04d794c07ca37,0x5409ed021d9299bf6814279a6a1411a7e866a631,0x6ecbe1db9ef729cbe972c83fb886247691fb6beb,0xe36ea790bc9d7ab70c55260c66d52b1eca985f84,0xe834ec434daba538cd1b9fe1582052b880bd7e63,0x78dc5d2d739606d31509c31d654056a45185ecb6,0xa8dda8d7f5310e4a9e24f8eba77e091ac264f872,0x06cef8e666768cc40cc78cf93d9611019ddcb628,0x4404ac8bd8f9618d27ad2f1485aa1b2cfd82482d,0x7457d5e02197480db681d3fdf256c7aca21bdc12,0x91c987bf62d25945db517bdaa840a6c661374402' \
     --password=node0/password.txt \
     > /var/log/geth &
 
 # Wait for Geth to unlock the first account
-sleep 2
+sleep 10
 
-# Send a single transaction. We have to do this so that debug.setHead works
-# correctly. (Geth does not seem to like debug.setHead(0), so by sending this
-# transaction we increase the current block number to 1).
-/geth --datadir node0/ attach --exec 'eth.sendTransaction({"from": "0xe8816898d851d5b61b7f950627d04d794c07ca37", "to": "0x84bd1cfa409cb0bb9b23b8b1a33515b4ac00a0af", "value": "0x1"})'
+# Send some transactions.
+# Note(albrow): 🐉 We have to do this so that debug.setHead works correctly.
+# (Geth does not seem to like debug.setHead(0), so by sending some transactions
+# we increase the current block number beyond 0). Additionally, some tests seem
+# to break when there are fewuer than 3 blocks in the chain. (We have no idea
+# why, but it was consistently reproducible).
+/geth --datadir node0/ attach --exec 'eth.sendTransaction({"from": "0x5409ED021D9299bf6814279A6A1411A7e866A631", "to": "0x84bd1cfa409cb0bb9b23b8b1a33515b4ac00a0af", "value": "0x1"})'
+/geth --datadir node0/ attach --exec 'eth.sendTransaction({"from": "0x5409ED021D9299bf6814279A6A1411A7e866A631", "to": "0x84bd1cfa409cb0bb9b23b8b1a33515b4ac00a0af", "value": "0x1"})'
+/geth --datadir node0/ attach --exec 'eth.sendTransaction({"from": "0x5409ED021D9299bf6814279A6A1411A7e866A631", "to": "0x84bd1cfa409cb0bb9b23b8b1a33515b4ac00a0af", "value": "0x1"})'
 
 # Use tail to re-attach to the log file and actually see the output.
 tail -f /var/log/geth