Set usage of shuffled round robin in the genesis block (#1464)

* Add an e2e shuffle test * set usage of shuffled round robin in the genesis block * bummp geth image tags to master * update geth image to celo-org/blockchain master * Revert "Add an e2e shuffle test" This reverts commit 73e1558. * add comments about proposer policy
celo-org · Oct 29, 2019 · 494f140 · 494f140
1 parent 5ecafd5
commit 494f140
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/.env b/.env
@@ -22,12 +22,12 @@ ETHSTATS_DOCKER_IMAGE_TAG="i0ffe524c625ea59e4492dc92c2e638689c36e4b0"
 GETH_NODE_DOCKER_IMAGE_REPOSITORY="us.gcr.io/celo-testnet/geth"
 # When upgrading change this to latest commit hash from the master of the geth repo
 # `geth $ git show | head -n 1`
-GETH_NODE_DOCKER_IMAGE_TAG="7fbd6f3574f1c1c1e657c152fc63fb771adab3af"
+GETH_NODE_DOCKER_IMAGE_TAG="ba213df07070433970d9b2cf75bae1d146cbfeda"
 
 GETH_BOOTNODE_DOCKER_IMAGE_REPOSITORY="gcr.io/celo-testnet/geth-all"
 # When upgrading change this to latest commit hash from the master of the geth repo
 # `geth $ git show | head -n 1`
-GETH_BOOTNODE_DOCKER_IMAGE_TAG="7fbd6f3574f1c1c1e657c152fc63fb771adab3af"
+GETH_BOOTNODE_DOCKER_IMAGE_TAG="ba213df07070433970d9b2cf75bae1d146cbfeda"
 
 CELOTOOL_DOCKER_IMAGE_REPOSITORY="gcr.io/celo-testnet/celo-monorepo"
 CELOTOOL_DOCKER_IMAGE_TAG="celotool-dfdc3e8b26e98aa294b27e2b5621c184488a10db"

diff --git a/packages/celotool/src/lib/generate_utils.ts b/packages/celotool/src/lib/generate_utils.ts
@@ -212,7 +212,9 @@ export const generateGenesis = ({
     genesis.difficulty = '0x1'
     genesis.extraData = generateIstanbulExtraData(validators)
     genesis.config.istanbul = {
-      policy: 0,
+      // see github.com/celo-org/celo-blockchain/blob/master/consensus/istanbul/config.go#L21-L25
+      // 0 = RoundRobin, 1 = Sticky, 2 = ShuffledRoundRobin
+      policy: 2,
       period: blockTime,
       requesttimeout: requestTimeout,
       epoch,