From b4cebe636dc4d94de05d2cf26a98c42058a0605f Mon Sep 17 00:00:00 2001
From: Peter Somogyvari <peter.somogyvari@accenture.com>
Date: Thu, 20 May 2021 22:45:41 -0700
Subject: [PATCH] feat(test-tooling): quorum AIO upgrade to Quorum v21.4.1 #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 https://github.com/hyperledger/cactus/issues/900

Signed-off-by: Peter Somogyvari <peter.somogyvari@accenture.com>
---
 tools/docker/quorum-all-in-one/Dockerfile      |  4 ++--
 tools/docker/quorum-all-in-one/README.md       | 14 +++++++++++++-
 tools/docker/quorum-all-in-one/genesis.json    |  7 ++++++-
 tools/docker/quorum-all-in-one/start-quorum.sh |  1 +
 4 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/tools/docker/quorum-all-in-one/Dockerfile b/tools/docker/quorum-all-in-one/Dockerfile
index 765063cfbde..5c05b1e7256 100644
--- 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
index 6b073373a49..c5576fff9d2 100644
--- 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:
     }
   ]
 }
-```
\ No newline at end of file
+```
diff --git a/tools/docker/quorum-all-in-one/genesis.json b/tools/docker/quorum-all-in-one/genesis.json
index 656eb600e43..b52202341d0 100644
--- 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
index ab5c08bc935..22985a4d4c0 100755
--- 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}
\ No newline at end of file