Skip to content
This repository has been archived by the owner on Jan 19, 2022. It is now read-only.

Support quorum 2.6.0. #30

Merged
merged 2 commits into from
May 6, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions templates/k8s/quorum-deployment.yaml.erb
Original file line number Diff line number Diff line change
Expand Up @@ -238,6 +238,9 @@ spec:
<%- elsif @config["quorum"]["consensus"] == "istanbul" -%>
args=\" --gcmode archive --istanbul.blockperiod 3 --syncmode full --mine --minerthreads 1 \";
RPC_APIS=\"$RPC_APIS,istanbul\";
<%- end -%>
<%- if @config["quorum"]["quorum"]["Quorum_Version"] >= "2.6.0" -%>
args=\"$args --allow-insecure-unlock \";
<%- end -%>
/usr/local/bin/geth \
--datadir $QUORUM_DATA_DIR \
Expand Down
26 changes: 26 additions & 0 deletions templates/quorum/genesis.json.erb
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,24 @@ end
"homesteadBlock": 0,
"byzantiumBlock": 0,
"constantinopleBlock": 0,
"petersburgBlock": 0,
"istanbulBlock": 0,
"eip150block": 0,
"eip150hash": "0x0000000000000000000000000000000000000000000000000000000000000000",
"eip155block": 0,
"eip158block": 0,
<%-# for 2.6 maxCodeSize config has changed. -%>
<%- if @config["quorum"]["quorum"]["Quorum_Version"] >= "2.6.0" -%>
"maxCodeSizeConfig" : [
{
"block" : 0,
"size" : 32
}
],
<%- else -%> <%# for v2.4 and 2.5 support maxCodeSize config has changed. %>
"maxCodeSize": 35,
"maxCodeSizeChangeBlock" : 0,
<%- end -%>
"chainId": <%= @Geth_Network_Id %>,
"isQuorum":true
},
Expand Down Expand Up @@ -95,6 +108,8 @@ end
"homesteadBlock": 0,
"byzantiumBlock": 0,
"constantinopleBlock": 0,
"petersburgBlock": 0,
"istanbulBlock": 0,
"eip150Block": 0,
"eip150Hash": "0x0000000000000000000000000000000000000000000000000000000000000000",
"eip155Block": 0,
Expand All @@ -103,7 +118,18 @@ end
"epoch": 30000,
"policy": 0
},
<%-# for 2.6 maxCodeSize config has changed. -%>
<%- if @config["quorum"]["quorum"]["Quorum_Version"] >= "2.6.0" -%>
"maxCodeSizeConfig" : [
{
"block" : 0,
"size" : 32
}
],
<%- else -%> <%# for v2.4 and 2.5 support maxCodeSize config has changed. %>
"maxCodeSize": 35,
"maxCodeSizeChangeBlock" : 0,
<%- end -%>
"chainId": <%= @Geth_Network_Id %>,
"isQuorum": true
},
Expand Down