Adds tessera and genesis flags for the enhanced privacy feature. (#109)

* Adds tessera and genesis flags for the enhanced privacy feature, updates tessera version check logic * Update bash tessera version check
Consensys · Oct 30, 2020 · b23c909 · b23c909
1 parent 88eb468
commit b23c909
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 6 deletions.
diff --git a/7nodes/istanbul-genesis.json b/7nodes/istanbul-genesis.json
@@ -33,6 +33,7 @@
     "constantinopleBlock": 0,
     "petersburgBlock": 0,
     "istanbulBlock": 0,
+    "privacyEnhancementsBlock": 0,
     "eip150Block": 0,
     "eip150Hash": "0x0000000000000000000000000000000000000000000000000000000000000000",
     "eip155Block": 0,

diff --git a/7nodes/raft-genesis.json b/7nodes/raft-genesis.json
@@ -32,6 +32,7 @@
     "constantinopleBlock": 0,
     "petersburgBlock": 0,
     "istanbulBlock": 0,
+    "privacyEnhancementsBlock": 0,
     "eip150block": 0,
     "eip150hash": "0x0000000000000000000000000000000000000000000000000000000000000000",
     "eip155block": 0,

diff --git a/7nodes/tessera-config-9.0.json b/7nodes/tessera-config-9.0.json
@@ -101,5 +101,6 @@
             }
           ]
      },
-    "alwaysSendTo": []
+    "alwaysSendTo": [],
+    "enablePrivacyEnhancements": true
 }
diff --git a/templates/k8s/quorum-deployment.yaml.erb b/templates/k8s/quorum-deployment.yaml.erb
@@ -127,8 +127,8 @@ spec:
            echo \"Tessera version - suffix ${TESSERA_VERSION}\";
            TESSERA_CONFIG_TYPE=;
 
-           if [ \"${Tess_Ver_Second}\" -ge \"8\" ]; then TESSERA_CONFIG_TYPE=\"-enhanced\"; fi;
-           if [[ \"${Tess_Ver_Second}\" -ge \"9\" ]]; then TESSERA_CONFIG_TYPE=\"-9.0\"; fi;
+           if [ \"${Tess_Ver_First}\" -lt \"1\" ] && [ \"${Tess_Ver_Second}\" -eq \"8\" ]; then TESSERA_CONFIG_TYPE=\"-enhanced\";  fi;
+           if [ \"${Tess_Ver_First}\" -ge \"1\" ] || [ \"${Tess_Ver_Second}\" -ge \"9\" ]; then TESSERA_CONFIG_TYPE=\"-9.0\"; fi;
 
            echo Config type [${TESSERA_CONFIG_TYPE}];
 
@@ -140,7 +140,7 @@ spec:
            CONFIG_FINAL=$(echo $CONFIG_WITH_THIS_HOST | sed \"s-%THIS_PRIV_KEY%-${PRIV_KEY}-g\" |  sed \"s-%THIS_PUB_KEY%-${PUB_KEY}-g\");
            CONFIG_FINAL_9_0=$(echo $CONFIG_WITH_THIS_HOST | sed \"s-%THIS_PRIV_KEY%-${DDIR}/tm.key-g\" |  sed \"s-%THIS_PUB_KEY%-${DDIR}/tm.pub-g\");
 
-           if [[ \"${Tess_Ver_Second}\" -ge \"9\" ]]; then CONFIG_FINAL=${CONFIG_FINAL_9_0}; fi;
+           if [ \"${Tess_Ver_First}\" -ge \"1\" ] || [ \"${Tess_Ver_Second}\" -ge \"9\" ]; then CONFIG_FINAL=${CONFIG_FINAL_9_0}; fi;
            echo $CONFIG_FINAL >  ${DDIR}/tessera-config-with-hosts.json;
            cat  ${DDIR}/tessera-config-with-hosts.json;
            java -Xms128M -Xmx128M -jar /tessera/tessera-app.jar -configfile ${DDIR}/tessera-config-with-hosts.json | tee -a ${QHOME}/logs/tessera.log;

diff --git a/templates/quorum/genesis.json.erb b/templates/quorum/genesis.json.erb
@@ -60,6 +60,7 @@ end
     "constantinopleBlock": 0,
     "petersburgBlock": 0,
     "istanbulBlock": 0,
+    "privacyEnhancementsBlock": 0,
     "eip150block": 0,
     "eip150hash": "0x0000000000000000000000000000000000000000000000000000000000000000",
     "eip155block": 0,
@@ -123,6 +124,7 @@ end
     "constantinopleBlock": 0,
     "petersburgBlock": 0,
     "istanbulBlock": 0,
+    "privacyEnhancementsBlock": 0,
     "eip150Block": 0,
     "eip150Hash": "0x0000000000000000000000000000000000000000000000000000000000000000",
     "eip155Block": 0,

diff --git a/templates/quorum/tessera-config-9.0.json.erb b/templates/quorum/tessera-config-9.0.json.erb
@@ -6,7 +6,7 @@ def set_node_template_vars(values)
 end
 -%>
 
-<% 
+<%
 # for more information about the tessera-config file see https://github.com/jpmorganchase/tessera/wiki/Configuration-overview.
 %>
 <%
@@ -91,5 +91,6 @@ end
             }
           ]
      },
-    "alwaysSendTo": []
+    "alwaysSendTo": [],
+    "enablePrivacyEnhancements": true
 }