From 261d189af50bd079bb2aa58747ce80fc68a73f69 Mon Sep 17 00:00:00 2001 From: Hesham Date: Mon, 6 May 2024 11:50:11 +0200 Subject: [PATCH 1/3] Update the genesis file for the Spark --- VERSION.FUSE.txt | 2 +- src/Nethermind/Chains/spark.json | 92 ++++++++++++++++--- .../Nethermind.Runner/configs/spark.cfg | 2 +- .../configs/spark_archive.cfg | 2 +- .../configs/spark_validator.cfg | 2 +- 5 files changed, 81 insertions(+), 19 deletions(-) diff --git a/VERSION.FUSE.txt b/VERSION.FUSE.txt index 28cbf7c0aae..f4965a313a2 100644 --- a/VERSION.FUSE.txt +++ b/VERSION.FUSE.txt @@ -1 +1 @@ -5.0.0 \ No newline at end of file +6.0.0 \ No newline at end of file diff --git a/src/Nethermind/Chains/spark.json b/src/Nethermind/Chains/spark.json index 0c620b8d7e3..38f935571b6 100644 --- a/src/Nethermind/Chains/spark.json +++ b/src/Nethermind/Chains/spark.json @@ -82,6 +82,12 @@ "eip1559BaseFeeMaxChangeDenominator": "0x8", "eip1559ElasticityMultiplier": "0x2", "eip1559BaseFeeInitialValue": "0x3b9aca00", + "eip1559BaseFeeMinValue": "0x2540be400", + "eip1559BaseFeeMinValueTransition": "0xF14DD4", + "eip2565Transition": "0xF14DD4", + "eip3198Transition": "0xF14DD4", + "eip3529Transition": "0xF14DD4", + "eip3541Transition": "0xF14DD4", "maxCodeSize": 24576, "maxCodeSizeTransition": "0x0" }, @@ -151,10 +157,19 @@ "0x0000000000000000000000000000000000000005": { "builtin": { "name": "modexp", - "activate_at": 0, "pricing": { - "modexp": { - "divisor": 20 + "0": { + "price": { + "modexp": { + "divisor": 20 + } + } + }, + "0xF14DD4": { + "info": "EIP-2565: ModExp Gas Cost.", + "price": { + "modexp2565": {} + } } } } @@ -162,11 +177,21 @@ "0x0000000000000000000000000000000000000006": { "builtin": { "name": "alt_bn128_add", - "activate_at": 0, "pricing": { - "linear": { - "base": 500, - "word": 0 + "0": { + "price": { + "alt_bn128_const_operations": { + "price": 500 + } + } + }, + "0xF14DD4": { + "info": "EIP-1108 Istanbul HF", + "price": { + "alt_bn128_const_operations": { + "price": 150 + } + } } } } @@ -174,11 +199,21 @@ "0x0000000000000000000000000000000000000007": { "builtin": { "name": "alt_bn128_mul", - "activate_at": 0, "pricing": { - "linear": { - "base": 40000, - "word": 0 + "0": { + "price": { + "alt_bn128_const_operations": { + "price": 4000 + } + } + }, + "0xF14DD4": { + "info": "EIP-1108 Istanbul HF", + "price": { + "alt_bn128_const_operations": { + "price": 6000 + } + } } } } @@ -186,11 +221,38 @@ "0x0000000000000000000000000000000000000008": { "builtin": { "name": "alt_bn128_pairing", - "activate_at": 0, "pricing": { - "alt_bn128_pairing": { - "base": 100000, - "pair": 80000 + "0": { + "price": { + "alt_bn128_pairing": { + "base": 100000, + "pair": 80000 + } + } + }, + "0xF14DD4": { + "info": "EIP-1108 Istanbul HF", + "price": { + "alt_bn128_pairing": { + "base": 45000, + "pair": 34000 + } + } + } + } + } + }, + "0x0000000000000000000000000000000000000009": { + "builtin": { + "name": "blake2_f", + "pricing": { + "0xF14DD4": { + "info": "EIP-152 Istanbul HF", + "price": { + "blake2_f": { + "gas_per_round": 1 + } + } } } } diff --git a/src/Nethermind/Nethermind.Runner/configs/spark.cfg b/src/Nethermind/Nethermind.Runner/configs/spark.cfg index b3ab49263e7..db39f1e2a6d 100644 --- a/src/Nethermind/Nethermind.Runner/configs/spark.cfg +++ b/src/Nethermind/Nethermind.Runner/configs/spark.cfg @@ -51,7 +51,7 @@ "PersistenceInterval": 16384 }, "Mining": { - "MinGasPrice": "10000000000" + "MinGasPrice": "1000000000" }, "Merge": { "Enabled": false diff --git a/src/Nethermind/Nethermind.Runner/configs/spark_archive.cfg b/src/Nethermind/Nethermind.Runner/configs/spark_archive.cfg index afd55a1abe3..9894183550a 100644 --- a/src/Nethermind/Nethermind.Runner/configs/spark_archive.cfg +++ b/src/Nethermind/Nethermind.Runner/configs/spark_archive.cfg @@ -35,7 +35,7 @@ "Mode": "None" }, "Mining": { - "MinGasPrice": "10000000000" + "MinGasPrice": "1000000000" }, "Merge": { "Enabled": false diff --git a/src/Nethermind/Nethermind.Runner/configs/spark_validator.cfg b/src/Nethermind/Nethermind.Runner/configs/spark_validator.cfg index e3bd603a63b..fb61d28bf09 100644 --- a/src/Nethermind/Nethermind.Runner/configs/spark_validator.cfg +++ b/src/Nethermind/Nethermind.Runner/configs/spark_validator.cfg @@ -47,7 +47,7 @@ }, "Mining": { "Enabled": true, - "MinGasPrice": "10000000000", + "MinGasPrice": "1000000000", "TargetBlockGasLimit": "20000000" }, "Merge": { From 5bb658fc0afdb148d850b1b99a26abba4b761e72 Mon Sep 17 00:00:00 2001 From: Hesham Date: Thu, 16 May 2024 10:06:38 +0200 Subject: [PATCH 2/3] Add Shanghai, Cancun EIPs --- src/Nethermind/Chains/spark.json | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/src/Nethermind/Chains/spark.json b/src/Nethermind/Chains/spark.json index 38f935571b6..ac560aef12d 100644 --- a/src/Nethermind/Chains/spark.json +++ b/src/Nethermind/Chains/spark.json @@ -83,11 +83,17 @@ "eip1559ElasticityMultiplier": "0x2", "eip1559BaseFeeInitialValue": "0x3b9aca00", "eip1559BaseFeeMinValue": "0x2540be400", - "eip1559BaseFeeMinValueTransition": "0xF14DD4", - "eip2565Transition": "0xF14DD4", - "eip3198Transition": "0xF14DD4", - "eip3529Transition": "0xF14DD4", - "eip3541Transition": "0xF14DD4", + "eip1559BaseFeeMinValueTransition": "0xF4B906", + "eip2565Transition": "0xF4B906", + "eip3198Transition": "0xF4B906", + "eip3529Transition": "0xF4B906", + "eip3541Transition": "0xF4B906", + "eip3651TransitionTimestamp": "0x6645FFCC", + "eip3855TransitionTimestamp": "0x6645FFCC", + "eip3860TransitionTimestamp": "0x6645FFCC", + "eip1153TransitionTimestamp": "0x6645FFCC", + "eip5656TransitionTimestamp": "0x6645FFCC", + "eip6780TransitionTimestamp": "0x6645FFCC", "maxCodeSize": 24576, "maxCodeSizeTransition": "0x0" }, @@ -165,7 +171,7 @@ } } }, - "0xF14DD4": { + "0xF4B906": { "info": "EIP-2565: ModExp Gas Cost.", "price": { "modexp2565": {} @@ -185,7 +191,7 @@ } } }, - "0xF14DD4": { + "0xF4B906": { "info": "EIP-1108 Istanbul HF", "price": { "alt_bn128_const_operations": { @@ -207,7 +213,7 @@ } } }, - "0xF14DD4": { + "0xF4B906": { "info": "EIP-1108 Istanbul HF", "price": { "alt_bn128_const_operations": { @@ -230,7 +236,7 @@ } } }, - "0xF14DD4": { + "0xF4B906": { "info": "EIP-1108 Istanbul HF", "price": { "alt_bn128_pairing": { @@ -246,7 +252,7 @@ "builtin": { "name": "blake2_f", "pricing": { - "0xF14DD4": { + "0xF4B906": { "info": "EIP-152 Istanbul HF", "price": { "blake2_f": { From 4d7f00c5a72d7305b0e90625a895450a6bae91a9 Mon Sep 17 00:00:00 2001 From: Hesham Date: Thu, 16 May 2024 10:07:32 +0200 Subject: [PATCH 3/3] Rollback MinGasPrice --- src/Nethermind/Nethermind.Runner/configs/spark.cfg | 2 +- src/Nethermind/Nethermind.Runner/configs/spark_archive.cfg | 2 +- src/Nethermind/Nethermind.Runner/configs/spark_validator.cfg | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Nethermind/Nethermind.Runner/configs/spark.cfg b/src/Nethermind/Nethermind.Runner/configs/spark.cfg index db39f1e2a6d..b3ab49263e7 100644 --- a/src/Nethermind/Nethermind.Runner/configs/spark.cfg +++ b/src/Nethermind/Nethermind.Runner/configs/spark.cfg @@ -51,7 +51,7 @@ "PersistenceInterval": 16384 }, "Mining": { - "MinGasPrice": "1000000000" + "MinGasPrice": "10000000000" }, "Merge": { "Enabled": false diff --git a/src/Nethermind/Nethermind.Runner/configs/spark_archive.cfg b/src/Nethermind/Nethermind.Runner/configs/spark_archive.cfg index 9894183550a..afd55a1abe3 100644 --- a/src/Nethermind/Nethermind.Runner/configs/spark_archive.cfg +++ b/src/Nethermind/Nethermind.Runner/configs/spark_archive.cfg @@ -35,7 +35,7 @@ "Mode": "None" }, "Mining": { - "MinGasPrice": "1000000000" + "MinGasPrice": "10000000000" }, "Merge": { "Enabled": false diff --git a/src/Nethermind/Nethermind.Runner/configs/spark_validator.cfg b/src/Nethermind/Nethermind.Runner/configs/spark_validator.cfg index fb61d28bf09..e3bd603a63b 100644 --- a/src/Nethermind/Nethermind.Runner/configs/spark_validator.cfg +++ b/src/Nethermind/Nethermind.Runner/configs/spark_validator.cfg @@ -47,7 +47,7 @@ }, "Mining": { "Enabled": true, - "MinGasPrice": "1000000000", + "MinGasPrice": "10000000000", "TargetBlockGasLimit": "20000000" }, "Merge": {