From 2021405411fe4c260b8c83a170345f736e77be9f Mon Sep 17 00:00:00 2001 From: Andrew Pohl Date: Tue, 5 Oct 2021 17:18:39 +0100 Subject: [PATCH 01/11] Update to OE 3.2.6 fork at block 14million --- Dockerfile | 17 +++++++++++++---- Version | 2 +- Version_legacy | 4 ++++ config/spec.json | 7 +++++++ 4 files changed, 25 insertions(+), 5 deletions(-) create mode 100644 Version_legacy diff --git a/Dockerfile b/Dockerfile index 0670a25..1861e94 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ -FROM ubuntu:18.04 - +FROM alpine:3.13.2 AS builder + ENV HOME=/home/parity ENV PARITY_HOME_DIR=$HOME/.local/share/io.parity.ethereum ENV PARITY_CONFIG_FILE_CHAIN=$PARITY_HOME_DIR/spec.json @@ -11,7 +11,16 @@ ENV PARITY_WRAPPER_SCRIPT=$HOME/parity_wrapper.sh RUN mkdir -p $PARITY_HOME_DIR && ls -la $PARITY_HOME_DIR -COPY --from=parity/parity:v2.5.13-stable /bin/parity $PARITY_BIN +# add depends +RUN apk add --no-cache \ + libstdc++ \ + eudev-libs \ + libgcc \ + curl \ + jq \ + bash + +COPY --from=openethereum/openethereum:v3.2.6 /home/openethereum/openethereum $PARITY_BIN ### Network RPC WebSocket EXPOSE 30300 8545 8546 @@ -29,4 +38,4 @@ RUN chmod +x $PARITY_WRAPPER_SCRIPT RUN ln -s $PARITY_HOME_DIR /config && ln -s $PARITY_DATA_DIR /data # Start -ENTRYPOINT ["/home/parity/parity_wrapper.sh"] +ENTRYPOINT ["/home/parity/parity_wrapper.sh"] \ No newline at end of file diff --git a/Version b/Version index b649854..af8b694 100644 --- a/Version +++ b/Version @@ -1,4 +1,4 @@ DOCKER_IMAGE_ORACLE_VERSION="3.0.0" DOCKER_IMAGE_FUSE_APP_VERSION="1.0.0" -DOCKER_IMAGE_FUSE_PARITY_VERSION="1.0.0" +DOCKER_IMAGE_FUSE_PARITY_VERSION="2.0.0_OE" DOCKER_IMAGE_NET_STATS_VERSION="1.0.0" \ No newline at end of file diff --git a/Version_legacy b/Version_legacy new file mode 100644 index 0000000..b649854 --- /dev/null +++ b/Version_legacy @@ -0,0 +1,4 @@ +DOCKER_IMAGE_ORACLE_VERSION="3.0.0" +DOCKER_IMAGE_FUSE_APP_VERSION="1.0.0" +DOCKER_IMAGE_FUSE_PARITY_VERSION="1.0.0" +DOCKER_IMAGE_NET_STATS_VERSION="1.0.0" \ No newline at end of file diff --git a/config/spec.json b/config/spec.json index c15cd56..f3777e0 100644 --- a/config/spec.json +++ b/config/spec.json @@ -39,6 +39,13 @@ "eip145Transition": "0x38ada7", "eip1014Transition": "0x38ada7", "eip1052Transition": "0x38ada7", + "eip1283Transition": "0xd59f80", + "eip1344Transition": "0xd59f80", + "eip1706Transition": "0xd59f80", + "eip1884Transition": "0xd59f80", + "eip2028Transition": "0xd59f80", + "eip2929Transition": "0xd59f80", + "eip2930Transition": "0xd59f80", "maxCodeSize": 24576, "maxCodeSizeTransition": "0x0" }, From b3616084e2759bed7f2341445941e1a2b44dc2f5 Mon Sep 17 00:00:00 2001 From: Andrew Pohl Date: Tue, 5 Oct 2021 17:43:34 +0100 Subject: [PATCH 02/11] Add support for easy upgrading from Parity to OE --- scripts/examples/.env.bootnode.example | 5 ++- scripts/examples/.env.bridgeValidator.example | 5 ++- scripts/examples/.env.explorer.example | 5 ++- scripts/examples/.env.node.example | 5 ++- scripts/examples/.env.validator.example | 5 ++- scripts/quickstart.sh | 31 +++++++++++++++++-- 6 files changed, 48 insertions(+), 8 deletions(-) diff --git a/scripts/examples/.env.bootnode.example b/scripts/examples/.env.bootnode.example index c5af5c0..2e80bf7 100644 --- a/scripts/examples/.env.bootnode.example +++ b/scripts/examples/.env.bootnode.example @@ -7,4 +7,7 @@ BOOTNODES=enode://e21e2053005e40653d055fc01a07768357749d27d630702c203b1a3c00bdf2 PERMISSION_PREFIX= # Set to true to fuses pre-exsisting snapshot to speed up initial sync (note this will require additional disk space to store the temp zip) -USE_SNAPSHOT=false \ No newline at end of file +USE_SNAPSHOT=false + +# Set to PARITY OR OE note passed block 14million OE will be the only supported client +CLIENT=OE \ No newline at end of file diff --git a/scripts/examples/.env.bridgeValidator.example b/scripts/examples/.env.bridgeValidator.example index b08a92c..f67a20d 100644 --- a/scripts/examples/.env.bridgeValidator.example +++ b/scripts/examples/.env.bridgeValidator.example @@ -24,4 +24,7 @@ MAX_PROCESSING_TIME=60000 FOREIGN_GAS_PRICE_ORACLE_URL= # Set to true to fuses pre-exsisting snapshot to speed up initial sync (note this will require additional disk space to store the temp zip) -USE_SNAPSHOT=false \ No newline at end of file +USE_SNAPSHOT=false + +# Set to PARITY OR OE note passed block 14million OE will be the only supported client +CLIENT=OE \ No newline at end of file diff --git a/scripts/examples/.env.explorer.example b/scripts/examples/.env.explorer.example index 0a750ed..63e3119 100644 --- a/scripts/examples/.env.explorer.example +++ b/scripts/examples/.env.explorer.example @@ -3,4 +3,7 @@ ROLE=explorer NODE_KEY= # in case `sudo` is needed -PERMISSION_PREFIX= \ No newline at end of file +PERMISSION_PREFIX= + +# Set to PARITY OR OE note passed block 14million OE will be the only supported client +CLIENT=OE \ No newline at end of file diff --git a/scripts/examples/.env.node.example b/scripts/examples/.env.node.example index 1d986f0..accdb7f 100644 --- a/scripts/examples/.env.node.example +++ b/scripts/examples/.env.node.example @@ -12,4 +12,7 @@ NUMBER_OF_RPC_THREADS=1 NUMBER_OF_HTTP_CONNECTIONS_THREADS=4 # Set to true to fuses pre-exsisting snapshot to speed up initial sync (note this will require additional disk space to store the temp zip) -USE_SNAPSHOT=false \ No newline at end of file +USE_SNAPSHOT=false + +# Set to PARITY OR OE note passed block 14million OE will be the only supported client +CLIENT=OE \ No newline at end of file diff --git a/scripts/examples/.env.validator.example b/scripts/examples/.env.validator.example index 47a257a..f2ce083 100644 --- a/scripts/examples/.env.validator.example +++ b/scripts/examples/.env.validator.example @@ -10,4 +10,7 @@ VAL_NAME= MAX_PROCESSING_TIME=60000 # Set to true to fuses pre-exsisting snapshot to speed up initial sync (note this will require additional disk space to store the temp zip) -USE_SNAPSHOT=false \ No newline at end of file +USE_SNAPSHOT=false + +# Set to PARITY OR OE note passed block 14million OE will be the only supported client +CLIENT=OE \ No newline at end of file diff --git a/scripts/quickstart.sh b/scripts/quickstart.sh index 0ddf4ee..91caff6 100755 --- a/scripts/quickstart.sh +++ b/scripts/quickstart.sh @@ -40,7 +40,10 @@ REQUIRED_DRIVE_SPACE_MB=15360 REQUIRED_RAM_MB=1800 DEFAULT_GAS_ORACLE="https:\/\/ethgasstation.info\/json\/ethgasAPI.json" -SNAPSHOT_NODE="https://node-snapshot.s3.eu-central-1.amazonaws.com/db.tar.gz" +PARITY_SNAPSHOT="https://node-snapshot.s3.eu-central-1.amazonaws.com/db.tar.gz" +OE_SNAPSHOT="https://node-snapshot-oe.s3.eu-central-1.amazonaws.com/db.tar.gz" + +SNAPSHOT_NODE="$OE_SNAPSHOT" WARNINGS=() @@ -324,6 +327,14 @@ function pullSnapShot { echo -e "\nPulling snapshot..." if [[ $ROLE != explorer ]] ; then + if [ -z "$CLIENT" ] ; then + SNAPSHOT_NODE="$OE_SNAPSHOT" + elif [ $CLIENT == "OE" ]; then + SNAPSHOT_NODE="$OE_SNAPSHOT" + else + SNAPSHOT_NODE="$PARITY_SNAPSHOT" + fi + echo -e "clearing out old folder" if [[ -d "$DATABASE_DIR/FuseNetwork/db" ]] ; then rm -r "$DATABASE_DIR/FuseNetwork/db" @@ -382,6 +393,9 @@ function setup { if [ "$OVERRIDE_VERSION_FILE" == false ] ; then echo -e "\nGrab docker Versions" + if [ $CLIENT == "PARITY" ]; then + VERSION_FILE="$VERSION_FILE_legacy" + fi wget -O versionFile $VERSION_FILE export $(grep -v '^#' versionFile | xargs) else @@ -534,9 +548,20 @@ function run { fi fi - if ! [ -z "$USE_SNAPSHOT" ] ; then - if [[ $USE_SNAPSHOT == true ]] ; then + if [[ $TESTNET != true ]] ; then + if [ -z "$CLIENT" ] ; then + if [[ $ROLE == explorer ]] ; then + displayErrorAndExit "Explorer snapshot not present, Script is assuming a migration from parity to OE, if this is not the case please add CLIENT=OE/ CLIENT=PARITY to your .env file. To upgrade your DB please run the upgrade tool https://github.com/openethereum/3.1-db-upgrade-tool" + fi + echo -e "\n\n NO CLIENT SET ASSUME running parity, need to update DB\n\n" pullSnapShot + echo "CLIENT=OE" >> $ENV_FILE + else + if ! [ -z "$USE_SNAPSHOT" ] ; then + if [[ $USE_SNAPSHOT == true ]] ; then + pullSnapShot + fi + fi fi fi From 9674777deb955dba0c183742ebd7b8fa3a585e43 Mon Sep 17 00:00:00 2001 From: Andrew Pohl Date: Thu, 7 Oct 2021 11:25:18 +0100 Subject: [PATCH 03/11] Add price transitions for upcoming fork --- config/spec.json | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/config/spec.json b/config/spec.json index f3777e0..fd927ce 100644 --- a/config/spec.json +++ b/config/spec.json @@ -64,10 +64,11 @@ "0x0000000000000000000000000000000000000002": { "balance": "1", "builtin": { "name": "sha256", "pricing": { "linear": { "base": 60, "word": 12 } } } }, "0x0000000000000000000000000000000000000003": { "balance": "1", "builtin": { "name": "ripemd160", "pricing": { "linear": { "base": 600, "word": 120 } } } }, "0x0000000000000000000000000000000000000004": { "balance": "1", "builtin": { "name": "identity", "pricing": { "linear": { "base": 15, "word": 3 } } } }, - "0x0000000000000000000000000000000000000005": { "builtin": { "name": "modexp", "activate_at": 0, "pricing": { "modexp": { "divisor": 20 } } } }, - "0x0000000000000000000000000000000000000006": { "builtin": { "name": "alt_bn128_add", "activate_at": 0, "pricing": { "linear": { "base": 500, "word": 0 } } } }, - "0x0000000000000000000000000000000000000007": { "builtin": { "name": "alt_bn128_mul", "activate_at": 0, "pricing": { "linear": { "base": 40000, "word": 0 } } } }, - "0x0000000000000000000000000000000000000008": { "builtin": { "name": "alt_bn128_pairing", "activate_at": 0, "pricing": { "alt_bn128_pairing": { "base": 100000, "pair": 80000 } } } }, + "0x0000000000000000000000000000000000000005": { "builtin": { "name": "modexp", "pricing": { "0": { "price": { "modexp": { "divisor": 20 } } }, "0xd59f80": { "info": "EIP-2565: ModExp Gas Cost.", "price": { "modexp2565": {} } } } } }, + "0x0000000000000000000000000000000000000006": { "builtin": { "name": "alt_bn128_add", "pricing": { "0": { "price": { "alt_bn128_const_operations": { "price": 500 } } }, "0xd59f80": { "info": "Istanbul HF", "price": { "alt_bn128_const_operations": { "price": 500 } } } } } }, + "0x0000000000000000000000000000000000000007": { "builtin": { "name": "alt_bn128_mul", "pricing": { "0": { "price": { "alt_bn128_const_operations": { "price": 4000 } } }, "0xd59f80": { "info": "Istanbul HF", "price": { "alt_bn128_const_operations": { "price": 6000 } } } } } }, + "0x0000000000000000000000000000000000000008": { "builtin": { "name": "alt_bn128_pairing", "pricing": { "0": { "price": { "alt_bn128_pairing": { "base": 100000, "pair": 80000 } } }, "0xd59f80": { "info": "Istanbul HF", "price": { "alt_bn128_pairing": { "base": 45000, "pair": 34000 } } } } } }, + "0x0000000000000000000000000000000000000008": { "builtin": { "name": "blake2_f", "pricing": { "0xd59f80": { "info": "Istanbul HF", "price": { "blake2_f": { "gas_per_round": 1 } } } } } }, "0xd9176e84898a0054680aec3f7c056b200c3d96c3": { "balance": "300000000000000000000000000" } } } From 6f95db9443799ac934f2ce431c041d4ac240eb8a Mon Sep 17 00:00:00 2001 From: Andrew Pohl Date: Thu, 7 Oct 2021 11:57:40 +0100 Subject: [PATCH 04/11] fix bug in last commit --- config/spec.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/spec.json b/config/spec.json index fd927ce..9b32486 100644 --- a/config/spec.json +++ b/config/spec.json @@ -68,7 +68,7 @@ "0x0000000000000000000000000000000000000006": { "builtin": { "name": "alt_bn128_add", "pricing": { "0": { "price": { "alt_bn128_const_operations": { "price": 500 } } }, "0xd59f80": { "info": "Istanbul HF", "price": { "alt_bn128_const_operations": { "price": 500 } } } } } }, "0x0000000000000000000000000000000000000007": { "builtin": { "name": "alt_bn128_mul", "pricing": { "0": { "price": { "alt_bn128_const_operations": { "price": 4000 } } }, "0xd59f80": { "info": "Istanbul HF", "price": { "alt_bn128_const_operations": { "price": 6000 } } } } } }, "0x0000000000000000000000000000000000000008": { "builtin": { "name": "alt_bn128_pairing", "pricing": { "0": { "price": { "alt_bn128_pairing": { "base": 100000, "pair": 80000 } } }, "0xd59f80": { "info": "Istanbul HF", "price": { "alt_bn128_pairing": { "base": 45000, "pair": 34000 } } } } } }, - "0x0000000000000000000000000000000000000008": { "builtin": { "name": "blake2_f", "pricing": { "0xd59f80": { "info": "Istanbul HF", "price": { "blake2_f": { "gas_per_round": 1 } } } } } }, + "0x0000000000000000000000000000000000000009": { "builtin": { "name": "blake2_f", "pricing": { "0xd59f80": { "info": "Istanbul HF", "price": { "blake2_f": { "gas_per_round": 1 } } } } } }, "0xd9176e84898a0054680aec3f7c056b200c3d96c3": { "balance": "300000000000000000000000000" } } } From 2fb7cb2589b4fbdf53aff09a4579354248a1eb5a Mon Sep 17 00:00:00 2001 From: Andrew Pohl Date: Fri, 8 Oct 2021 11:29:45 +0100 Subject: [PATCH 05/11] Removed OE suffix --- Version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Version b/Version index af8b694..2b92aca 100644 --- a/Version +++ b/Version @@ -1,4 +1,4 @@ DOCKER_IMAGE_ORACLE_VERSION="3.0.0" DOCKER_IMAGE_FUSE_APP_VERSION="1.0.0" -DOCKER_IMAGE_FUSE_PARITY_VERSION="2.0.0_OE" +DOCKER_IMAGE_FUSE_PARITY_VERSION="2.0.0" DOCKER_IMAGE_NET_STATS_VERSION="1.0.0" \ No newline at end of file From 98c63d59ea847d061beb8ec58b4a959f94cd160d Mon Sep 17 00:00:00 2001 From: Andrew Pohl Date: Sat, 9 Oct 2021 11:58:28 +0100 Subject: [PATCH 06/11] Add Y/N prompt to upgrade --- scripts/quickstart.sh | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/scripts/quickstart.sh b/scripts/quickstart.sh index 91caff6..020f5ed 100755 --- a/scripts/quickstart.sh +++ b/scripts/quickstart.sh @@ -550,12 +550,23 @@ function run { if [[ $TESTNET != true ]] ; then if [ -z "$CLIENT" ] ; then - if [[ $ROLE == explorer ]] ; then + read -p "Do you want to upgrade your Client? [Y/N] (this will cause ~30mins downtime and requires 20GB free diskspace, UPGRADE IS REQUIRED BEFORE BLOCK 14MILLION)" -n 1 -r + echo # (optional) move to a new line + if [[ $REPLY =~ ^[Yy]$ ]] ; then + if [[ $ROLE == explorer ]] ; then displayErrorAndExit "Explorer snapshot not present, Script is assuming a migration from parity to OE, if this is not the case please add CLIENT=OE/ CLIENT=PARITY to your .env file. To upgrade your DB please run the upgrade tool https://github.com/openethereum/3.1-db-upgrade-tool" + fi + echo -e "\n\n NO CLIENT SET ASSUME running parity, need to update DB\n\n" + pullSnapShot + echo "CLIENT=OE" >> $ENV_FILE + else + CLIENT="PARITY" + #re run setup to pull Parity version + setup + if [[ $USE_SNAPSHOT == true ]] ; then + pullSnapShot + fi fi - echo -e "\n\n NO CLIENT SET ASSUME running parity, need to update DB\n\n" - pullSnapShot - echo "CLIENT=OE" >> $ENV_FILE else if ! [ -z "$USE_SNAPSHOT" ] ; then if [[ $USE_SNAPSHOT == true ]] ; then From 8ccea94ceea2c644b8408ff1577af71a4bf74328 Mon Sep 17 00:00:00 2001 From: Andrew Pohl Date: Sat, 9 Oct 2021 16:54:32 +0100 Subject: [PATCH 07/11] Add EIP info to bultin price changes --- config/spec.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/config/spec.json b/config/spec.json index 9b32486..dacf10c 100644 --- a/config/spec.json +++ b/config/spec.json @@ -65,10 +65,10 @@ "0x0000000000000000000000000000000000000003": { "balance": "1", "builtin": { "name": "ripemd160", "pricing": { "linear": { "base": 600, "word": 120 } } } }, "0x0000000000000000000000000000000000000004": { "balance": "1", "builtin": { "name": "identity", "pricing": { "linear": { "base": 15, "word": 3 } } } }, "0x0000000000000000000000000000000000000005": { "builtin": { "name": "modexp", "pricing": { "0": { "price": { "modexp": { "divisor": 20 } } }, "0xd59f80": { "info": "EIP-2565: ModExp Gas Cost.", "price": { "modexp2565": {} } } } } }, - "0x0000000000000000000000000000000000000006": { "builtin": { "name": "alt_bn128_add", "pricing": { "0": { "price": { "alt_bn128_const_operations": { "price": 500 } } }, "0xd59f80": { "info": "Istanbul HF", "price": { "alt_bn128_const_operations": { "price": 500 } } } } } }, - "0x0000000000000000000000000000000000000007": { "builtin": { "name": "alt_bn128_mul", "pricing": { "0": { "price": { "alt_bn128_const_operations": { "price": 4000 } } }, "0xd59f80": { "info": "Istanbul HF", "price": { "alt_bn128_const_operations": { "price": 6000 } } } } } }, - "0x0000000000000000000000000000000000000008": { "builtin": { "name": "alt_bn128_pairing", "pricing": { "0": { "price": { "alt_bn128_pairing": { "base": 100000, "pair": 80000 } } }, "0xd59f80": { "info": "Istanbul HF", "price": { "alt_bn128_pairing": { "base": 45000, "pair": 34000 } } } } } }, - "0x0000000000000000000000000000000000000009": { "builtin": { "name": "blake2_f", "pricing": { "0xd59f80": { "info": "Istanbul HF", "price": { "blake2_f": { "gas_per_round": 1 } } } } } }, + "0x0000000000000000000000000000000000000006": { "builtin": { "name": "alt_bn128_add", "pricing": { "0": { "price": { "alt_bn128_const_operations": { "price": 500 } } }, "0xd59f80": { "info": "EIP-1108 Istanbul HF", "price": { "alt_bn128_const_operations": { "price": 150 } } } } } }, + "0x0000000000000000000000000000000000000007": { "builtin": { "name": "alt_bn128_mul", "pricing": { "0": { "price": { "alt_bn128_const_operations": { "price": 4000 } } }, "0xd59f80": { "info": "EIP-1108 Istanbul HF", "price": { "alt_bn128_const_operations": { "price": 6000 } } } } } }, + "0x0000000000000000000000000000000000000008": { "builtin": { "name": "alt_bn128_pairing", "pricing": { "0": { "price": { "alt_bn128_pairing": { "base": 100000, "pair": 80000 } } }, "0xd59f80": { "info": "EIP-1108 Istanbul HF", "price": { "alt_bn128_pairing": { "base": 45000, "pair": 34000 } } } } } }, + "0x0000000000000000000000000000000000000009": { "builtin": { "name": "blake2_f", "pricing": { "0xd59f80": { "info": "EIP-152 Istanbul HF", "price": { "blake2_f": { "gas_per_round": 1 } } } } } }, "0xd9176e84898a0054680aec3f7c056b200c3d96c3": { "balance": "300000000000000000000000000" } } } From 507d300d490d4a3bc45dbc3e35e89946a221f356 Mon Sep 17 00:00:00 2001 From: Andrew Pohl Date: Sat, 9 Oct 2021 17:11:47 +0100 Subject: [PATCH 08/11] Fixes for maintaining legacy support --- scripts/quickstart.sh | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/scripts/quickstart.sh b/scripts/quickstart.sh index 020f5ed..ce2e3cb 100755 --- a/scripts/quickstart.sh +++ b/scripts/quickstart.sh @@ -9,20 +9,21 @@ QUICKSTART_VERSION="1.0.0" #set this to true to allow for hardcoded versioning for debugging OVERRIDE_VERSION_FILE=false VERSION_FILE="https://raw.githubusercontent.com/fuseio/fuse-network/master/Version" +VERSION_FILE_LEGACY="https://raw.githubusercontent.com/fuseio/fuse-network/master/Version_legacy" DOCKER_IMAGE_ORACLE_VERSION="3.0.0" DOCKER_IMAGE_FUSE_APP_VERSION="1.0.0" DOCKER_IMAGE_FUSE_PARITY_VERSION="1.0.0" DOCKER_IMAGE_NET_STATS_VERSION="1.0.0" ENV_FILE=".env" -DOCKER_IMAGE_PARITY="fusenet/node" +DOCKER_IMAGE_PARITY_REPO="fusenet/node" DOCKER_CONTAINER_PARITY="fusenet" -DOCKER_IMAGE_APP="fusenet/validator-app" +DOCKER_IMAGE_APP_REPO="fusenet/validator-app" DOCKER_CONTAINER_APP="fuseapp" -DOCKER_IMAGE_NETSTAT="fusenet/netstat" +DOCKER_IMAGE_NETSTAT_REPO="fusenet/netstat" DOCKER_CONTAINER_NETSTAT="fusenetstat" DOCKER_COMPOSE_ORACLE="https://raw.githubusercontent.com/fuseio/fuse-bridge/master/native-to-erc20/oracle/docker-compose.keystore.yml" -DOCKER_IMAGE_ORACLE="fusenet/native-to-erc20-oracle" +DOCKER_IMAGE_ORACLE_REPO="fusenet/native-to-erc20-oracle" DOCKER_CONTAINER_ORACLE="fuseoracle" DOCKER_LOG_OPTS="--log-opt max-size=10m --log-opt max-file=25 --log-opt compress=true" BASE_DIR=$(pwd)/fusenet @@ -394,7 +395,7 @@ function setup { if [ "$OVERRIDE_VERSION_FILE" == false ] ; then echo -e "\nGrab docker Versions" if [ $CLIENT == "PARITY" ]; then - VERSION_FILE="$VERSION_FILE_legacy" + VERSION_FILE="$VERSION_FILE_LEGACY" fi wget -O versionFile $VERSION_FILE export $(grep -v '^#' versionFile | xargs) @@ -410,10 +411,10 @@ function setup { # Pull the docker images. echo -e "\nPull the docker images..." - DOCKER_IMAGE_PARITY="$DOCKER_IMAGE_PARITY:$DOCKER_IMAGE_FUSE_PARITY_VERSION" - DOCKER_IMAGE_NETSTAT="$DOCKER_IMAGE_NETSTAT:$DOCKER_IMAGE_NET_STATS_VERSION" - DOCKER_IMAGE_APP="$DOCKER_IMAGE_APP:$DOCKER_IMAGE_FUSE_APP_VERSION" - DOCKER_IMAGE_ORACLE="$DOCKER_IMAGE_ORACLE:$DOCKER_IMAGE_ORACLE_VERSION" + DOCKER_IMAGE_PARITY="$DOCKER_IMAGE_PARITY_REPO:$DOCKER_IMAGE_FUSE_PARITY_VERSION" + DOCKER_IMAGE_NETSTAT="$DOCKER_IMAGE_NETSTAT_REPO:$DOCKER_IMAGE_NET_STATS_VERSION" + DOCKER_IMAGE_APP="$DOCKER_IMAGE_APP_REPO:$DOCKER_IMAGE_FUSE_APP_VERSION" + DOCKER_IMAGE_ORACLE="$DOCKER_IMAGE_ORACLE_REPO:$DOCKER_IMAGE_ORACLE_VERSION" $PERMISSION_PREFIX docker pull $DOCKER_IMAGE_PARITY $PERMISSION_PREFIX docker pull $DOCKER_IMAGE_NETSTAT From a75dc06c3b72c432d440357bd1782e5a07ff3cec Mon Sep 17 00:00:00 2001 From: Andrew-Pohl <55916961+Andrew-Pohl@users.noreply.github.com> Date: Mon, 25 Oct 2021 09:55:33 +0100 Subject: [PATCH 09/11] Change fork block to 13.8 million --- Version | 2 +- config/spec.json | 24 ++++++++++++------------ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Version b/Version index 2b92aca..9415699 100644 --- a/Version +++ b/Version @@ -1,4 +1,4 @@ DOCKER_IMAGE_ORACLE_VERSION="3.0.0" DOCKER_IMAGE_FUSE_APP_VERSION="1.0.0" -DOCKER_IMAGE_FUSE_PARITY_VERSION="2.0.0" +DOCKER_IMAGE_FUSE_PARITY_VERSION="2.0.1" DOCKER_IMAGE_NET_STATS_VERSION="1.0.0" \ No newline at end of file diff --git a/config/spec.json b/config/spec.json index dacf10c..3893dc8 100644 --- a/config/spec.json +++ b/config/spec.json @@ -39,13 +39,13 @@ "eip145Transition": "0x38ada7", "eip1014Transition": "0x38ada7", "eip1052Transition": "0x38ada7", - "eip1283Transition": "0xd59f80", - "eip1344Transition": "0xd59f80", - "eip1706Transition": "0xd59f80", - "eip1884Transition": "0xd59f80", - "eip2028Transition": "0xd59f80", - "eip2929Transition": "0xd59f80", - "eip2930Transition": "0xd59f80", + "eip1283Transition": "0xd29240", + "eip1344Transition": "0xd29240", + "eip1706Transition": "0xd29240", + "eip1884Transition": "0xd29240", + "eip2028Transition": "0xd29240", + "eip2929Transition": "0xd29240", + "eip2930Transition": "0xd29240", "maxCodeSize": 24576, "maxCodeSizeTransition": "0x0" }, @@ -64,11 +64,11 @@ "0x0000000000000000000000000000000000000002": { "balance": "1", "builtin": { "name": "sha256", "pricing": { "linear": { "base": 60, "word": 12 } } } }, "0x0000000000000000000000000000000000000003": { "balance": "1", "builtin": { "name": "ripemd160", "pricing": { "linear": { "base": 600, "word": 120 } } } }, "0x0000000000000000000000000000000000000004": { "balance": "1", "builtin": { "name": "identity", "pricing": { "linear": { "base": 15, "word": 3 } } } }, - "0x0000000000000000000000000000000000000005": { "builtin": { "name": "modexp", "pricing": { "0": { "price": { "modexp": { "divisor": 20 } } }, "0xd59f80": { "info": "EIP-2565: ModExp Gas Cost.", "price": { "modexp2565": {} } } } } }, - "0x0000000000000000000000000000000000000006": { "builtin": { "name": "alt_bn128_add", "pricing": { "0": { "price": { "alt_bn128_const_operations": { "price": 500 } } }, "0xd59f80": { "info": "EIP-1108 Istanbul HF", "price": { "alt_bn128_const_operations": { "price": 150 } } } } } }, - "0x0000000000000000000000000000000000000007": { "builtin": { "name": "alt_bn128_mul", "pricing": { "0": { "price": { "alt_bn128_const_operations": { "price": 4000 } } }, "0xd59f80": { "info": "EIP-1108 Istanbul HF", "price": { "alt_bn128_const_operations": { "price": 6000 } } } } } }, - "0x0000000000000000000000000000000000000008": { "builtin": { "name": "alt_bn128_pairing", "pricing": { "0": { "price": { "alt_bn128_pairing": { "base": 100000, "pair": 80000 } } }, "0xd59f80": { "info": "EIP-1108 Istanbul HF", "price": { "alt_bn128_pairing": { "base": 45000, "pair": 34000 } } } } } }, - "0x0000000000000000000000000000000000000009": { "builtin": { "name": "blake2_f", "pricing": { "0xd59f80": { "info": "EIP-152 Istanbul HF", "price": { "blake2_f": { "gas_per_round": 1 } } } } } }, + "0x0000000000000000000000000000000000000005": { "builtin": { "name": "modexp", "pricing": { "0": { "price": { "modexp": { "divisor": 20 } } }, "0xd29240": { "info": "EIP-2565: ModExp Gas Cost.", "price": { "modexp2565": {} } } } } }, + "0x0000000000000000000000000000000000000006": { "builtin": { "name": "alt_bn128_add", "pricing": { "0": { "price": { "alt_bn128_const_operations": { "price": 500 } } }, "0xd29240": { "info": "EIP-1108 Istanbul HF", "price": { "alt_bn128_const_operations": { "price": 150 } } } } } }, + "0x0000000000000000000000000000000000000007": { "builtin": { "name": "alt_bn128_mul", "pricing": { "0": { "price": { "alt_bn128_const_operations": { "price": 4000 } } }, "0xd29240": { "info": "EIP-1108 Istanbul HF", "price": { "alt_bn128_const_operations": { "price": 6000 } } } } } }, + "0x0000000000000000000000000000000000000008": { "builtin": { "name": "alt_bn128_pairing", "pricing": { "0": { "price": { "alt_bn128_pairing": { "base": 100000, "pair": 80000 } } }, "0xd29240": { "info": "EIP-1108 Istanbul HF", "price": { "alt_bn128_pairing": { "base": 45000, "pair": 34000 } } } } } }, + "0x0000000000000000000000000000000000000009": { "builtin": { "name": "blake2_f", "pricing": { "0xd29240": { "info": "EIP-152 Istanbul HF", "price": { "blake2_f": { "gas_per_round": 1 } } } } } }, "0xd9176e84898a0054680aec3f7c056b200c3d96c3": { "balance": "300000000000000000000000000" } } } From acada113b540d4242cd5582400e10ccafaf89640 Mon Sep 17 00:00:00 2001 From: Andrew-Pohl <55916961+Andrew-Pohl@users.noreply.github.com> Date: Mon, 25 Oct 2021 12:26:43 +0100 Subject: [PATCH 10/11] Fixed a bug in the script --- scripts/quickstart.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/scripts/quickstart.sh b/scripts/quickstart.sh index ce2e3cb..c0bb106 100755 --- a/scripts/quickstart.sh +++ b/scripts/quickstart.sh @@ -394,9 +394,11 @@ function setup { if [ "$OVERRIDE_VERSION_FILE" == false ] ; then echo -e "\nGrab docker Versions" - if [ $CLIENT == "PARITY" ]; then - VERSION_FILE="$VERSION_FILE_LEGACY" - fi + if [ ! -z "$CLIENT" ] ; then + if [ $CLIENT == "PARITY" ]; then + VERSION_FILE="$VERSION_FILE_LEGACY" + fi + fi wget -O versionFile $VERSION_FILE export $(grep -v '^#' versionFile | xargs) else From 914ffefbea59cd1b4b685b4f90f157ad2db9214e Mon Sep 17 00:00:00 2001 From: Andrew Pohl Date: Thu, 4 Nov 2021 13:53:33 +0000 Subject: [PATCH 11/11] bump block size to 20million inc version to 2.0.2 --- Version_testNet | 2 +- config/spark/spec.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Version_testNet b/Version_testNet index 6e1b259..234c3a2 100644 --- a/Version_testNet +++ b/Version_testNet @@ -1,3 +1,3 @@ DOCKER_IMAGE_FUSE_APP_VERSION="1.0.0" -DOCKER_IMAGE_FUSE_PARITY_VERSION="2.0.1_OE" +DOCKER_IMAGE_FUSE_PARITY_VERSION="2.0.2" DOCKER_IMAGE_NET_STATS_VERSION="1.0.0" \ No newline at end of file diff --git a/config/spark/spec.json b/config/spark/spec.json index 177b2c2..97a6ac1 100644 --- a/config/spark/spec.json +++ b/config/spark/spec.json @@ -57,7 +57,7 @@ } }, "difficulty": "0x20000", - "gasLimit": "0x5F5E100" + "gasLimit": "0x1312D00" }, "accounts": { "0x0000000000000000000000000000000000000001": {