feat(test-tooling): quorum AIO upgrade to Quorum v21.4.1 hyperledger-…

…cacti#900 The image will now have the currently latest & greatest from both Quorum and Tessera. This commit is also tagged in DockerHub as hyperledger/cactus-quorum-all-in-one:2021-05-03-quorum-v21.4.1 Two minor updates that were necessary for the upgrade: 1. The allowing of unlocking while HTTP is enabled is now prohibited by default unless you pass in a specific flag when starting Quorum (so we do). 2. The max code size schema has changed in the genesis file to include block size as well so the genesis.json used is updated too. Fixes hyperledger-cacti#900 Signed-off-by: Peter Somogyvari <[email protected]>
petermetz · May 21, 2021 · 407febb · 407febb
1 parent 74523f2
commit 407febb
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 4 deletions.
diff --git a/tools/docker/quorum-all-in-one/Dockerfile b/tools/docker/quorum-all-in-one/Dockerfile
@@ -1,5 +1,5 @@
-ARG QUORUM_VERSION=2.3.0
-ARG TESSERA_VERSION=0.10.0
+ARG QUORUM_VERSION=21.4.1
+ARG TESSERA_VERSION=21.1.1
 
 FROM quorumengineering/quorum:$QUORUM_VERSION AS quorum
 FROM quorumengineering/tessera:$TESSERA_VERSION AS tessera

diff --git a/tools/docker/quorum-all-in-one/README.md b/tools/docker/quorum-all-in-one/README.md
@@ -5,6 +5,18 @@
 
 An all in one quorum docker image with Tessera included for private transaction support.
 
+## Usage
+
+### Build and Run Image Locally
+
+```sh
+DOCKER_BUILDKIT=1 docker build ./tools/docker/quorum-all-in-one/ -t qaio
+docker run --rm qaio
+```
+
+
+### Visual Studio Code Tasks
+
 Example `.vscode/tasks.json` file for building/running the image:
 
 ```json
@@ -28,4 +40,4 @@ Example `.vscode/tasks.json` file for building/running the image:
     }
   ]
 }
-```
+```
diff --git a/tools/docker/quorum-all-in-one/genesis.json b/tools/docker/quorum-all-in-one/genesis.json
@@ -26,7 +26,12 @@
     "eip155Block": 0,
     "eip150Hash": "0x0000000000000000000000000000000000000000000000000000000000000000",
     "eip158Block": 0,
-    "maxCodeSize": 35,
+    "maxCodeSizeConfig" : [
+      {
+        "block" : 0,
+        "size" : 64
+      }
+    ],
     "isQuorum": true
   },
   "difficulty": "0x0",

diff --git a/tools/docker/quorum-all-in-one/start-quorum.sh b/tools/docker/quorum-all-in-one/start-quorum.sh
@@ -39,6 +39,7 @@ geth \
   --rpcport 8545 \
   --rpcapi admin,db,eth,debug,miner,net,shh,txpool,personal,web3,quorum,${QUORUM_CONSENSUS:-raft} \
   --port 21000 \
+  --allow-insecure-unlock \
   --unlock 0 \
   --password /passwords.txt \
   ${QUORUM_GETH_ARGS:-} ${GETH_ARGS_raft}