diff --git a/VERSION.FUSE.txt b/VERSION.FUSE.txt index 9eefef7bd65..7a9f89d81ab 100644 --- a/VERSION.FUSE.txt +++ b/VERSION.FUSE.txt @@ -1 +1 @@ -4.0.6 \ No newline at end of file +6.0.2 \ No newline at end of file diff --git a/src/Nethermind/Chains/fuse.json b/src/Nethermind/Chains/fuse.json index e9d6f355c1c..5f3de842792 100644 --- a/src/Nethermind/Chains/fuse.json +++ b/src/Nethermind/Chains/fuse.json @@ -10,9 +10,7 @@ "validators": { "multi": { "0": { - "list": [ - "0xd9176e84898a0054680aec3f7c056b200c3d96c3" - ] + "list": ["0xd9176e84898a0054680aec3f7c056b200c3d96c3"] }, "100": { "safeContract": "0x3014ca10b91cb3D0AD85fEf7A3Cb95BCAc9c0f79" @@ -48,6 +46,22 @@ "eip2028Transition": "0xd29240", "eip2929Transition": "0xd29240", "eip2930Transition": "0xd29240", + "eip1559Transition": "0x1D653E8", + "eip2565Transition": "0x1D653E8", + "eip3198Transition": "0x1D653E8", + "eip3529Transition": "0x1D653E8", + "eip3541Transition": "0x1D653E8", + "eip1559BaseFeeMinValueTransition": "0x1D653E8", + "eip3651TransitionTimestamp": "0x66A78440", + "eip3855TransitionTimestamp": "0x66A78440", + "eip3860TransitionTimestamp": "0x66A78440", + "eip1153TransitionTimestamp": "0x66A78440", + "eip5656TransitionTimestamp": "0x66A78440", + "eip6780TransitionTimestamp": "0x66A78440", + "eip1559BaseFeeMaxChangeDenominator": "0x8", + "eip1559ElasticityMultiplier": "0x2", + "eip1559BaseFeeInitialValue": "0x3b9aca00", + "eip1559BaseFeeMinValue": "0x2540be400", "maxCodeSize": 24576, "maxCodeSizeTransition": "0x0" }, @@ -59,6 +73,7 @@ } }, "difficulty": "0x20000", + "baseFeePerGas": "0x2540BE400", "gasLimit": "0x989680" }, "nodes": [ @@ -221,4 +236,4 @@ "balance": "300000000000000000000000000" } } -} \ No newline at end of file +} diff --git a/src/Nethermind/Chains/spark.json b/src/Nethermind/Chains/spark.json index 02240ce9288..e1e91bc9df6 100644 --- a/src/Nethermind/Chains/spark.json +++ b/src/Nethermind/Chains/spark.json @@ -10,9 +10,7 @@ "validators": { "multi": { "0": { - "list": [ - "0xba7829b381f07cca0d186bdf619fdc6c7f756d0a" - ] + "list": ["0xba7829b381f07cca0d186bdf619fdc6c7f756d0a"] }, "1000": { "safeContract": "0xC8c3a332f9e4CE6bfFFcf967026cB006Db2311c7" @@ -80,6 +78,22 @@ "eip2028Transition": "0x13d620", "eip2929Transition": "0x13d620", "eip2930Transition": "0x13d620", + "eip1559Transition": "0xE06938", + "eip2565Transition": "0xF4FC04", + "eip3198Transition": "0xF4FC04", + "eip3529Transition": "0xF4FC04", + "eip3541Transition": "0xF4FC04", + "eip1559BaseFeeMinValueTransition": "0xF4FC04", + "eip3651TransitionTimestamp": "0x664746C0", + "eip3855TransitionTimestamp": "0x664746C0", + "eip3860TransitionTimestamp": "0x664746C0", + "eip1153TransitionTimestamp": "0x664746C0", + "eip5656TransitionTimestamp": "0x664746C0", + "eip6780TransitionTimestamp": "0x664746C0", + "eip1559BaseFeeMaxChangeDenominator": "0x8", + "eip1559ElasticityMultiplier": "0x2", + "eip1559BaseFeeInitialValue": "0x3b9aca00", + "eip1559BaseFeeMinValue": "0x2540be400", "maxCodeSize": 24576, "maxCodeSizeTransition": "0x0" }, @@ -91,6 +105,7 @@ } }, "difficulty": "0x20000", + "baseFeePerGas": "0x2540BE400", "gasLimit": "0x5F5E100" }, "nodes": [ @@ -149,10 +164,19 @@ "0x0000000000000000000000000000000000000005": { "builtin": { "name": "modexp", - "activate_at": 0, "pricing": { - "modexp": { - "divisor": 20 + "0": { + "price": { + "modexp": { + "divisor": 20 + } + } + }, + "0xF4FC04": { + "info": "EIP-2565: ModExp Gas Cost.", + "price": { + "modexp2565": {} + } } } } @@ -160,11 +184,21 @@ "0x0000000000000000000000000000000000000006": { "builtin": { "name": "alt_bn128_add", - "activate_at": 0, "pricing": { - "linear": { - "base": 500, - "word": 0 + "0": { + "price": { + "alt_bn128_const_operations": { + "price": 500 + } + } + }, + "0xF4FC04": { + "info": "EIP-1108 Istanbul HF", + "price": { + "alt_bn128_const_operations": { + "price": 150 + } + } } } } @@ -172,11 +206,21 @@ "0x0000000000000000000000000000000000000007": { "builtin": { "name": "alt_bn128_mul", - "activate_at": 0, "pricing": { - "linear": { - "base": 40000, - "word": 0 + "0": { + "price": { + "alt_bn128_const_operations": { + "price": 4000 + } + } + }, + "0xF4FC04": { + "info": "EIP-1108 Istanbul HF", + "price": { + "alt_bn128_const_operations": { + "price": 6000 + } + } } } } @@ -184,11 +228,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 + } + } + }, + "0xF4FC04": { + "info": "EIP-1108 Istanbul HF", + "price": { + "alt_bn128_pairing": { + "base": 45000, + "pair": 34000 + } + } + } + } + } + }, + "0x0000000000000000000000000000000000000009": { + "builtin": { + "name": "blake2_f", + "pricing": { + "0xF4FC04": { + "info": "EIP-152 Istanbul HF", + "price": { + "blake2_f": { + "gas_per_round": 1 + } + } } } } @@ -197,4 +268,4 @@ "balance": "300000000000000000000000000" } } -} \ No newline at end of file +} diff --git a/src/Nethermind/Nethermind.Runner/configs/fuse.cfg b/src/Nethermind/Nethermind.Runner/configs/fuse.cfg index c7e9966d44f..67db0bb19ca 100644 --- a/src/Nethermind/Nethermind.Runner/configs/fuse.cfg +++ b/src/Nethermind/Nethermind.Runner/configs/fuse.cfg @@ -46,7 +46,7 @@ "PersistenceInterval": 16384 }, "Mining": { - "MinGasPrice": "10000000000" + "MinGasPrice": "1000000000" }, "Merge": { "Enabled": false diff --git a/src/Nethermind/Nethermind.Runner/configs/fuse_archive.cfg b/src/Nethermind/Nethermind.Runner/configs/fuse_archive.cfg index b164d812fe9..bdc92030713 100644 --- a/src/Nethermind/Nethermind.Runner/configs/fuse_archive.cfg +++ b/src/Nethermind/Nethermind.Runner/configs/fuse_archive.cfg @@ -35,7 +35,7 @@ "Mode": "None" }, "Mining": { - "MinGasPrice": "10000000000" + "MinGasPrice": "1000000000" }, "Merge": { "Enabled": false diff --git a/src/Nethermind/Nethermind.Runner/configs/fuse_validator.cfg b/src/Nethermind/Nethermind.Runner/configs/fuse_validator.cfg index fa318875253..6c2d129a598 100644 --- a/src/Nethermind/Nethermind.Runner/configs/fuse_validator.cfg +++ b/src/Nethermind/Nethermind.Runner/configs/fuse_validator.cfg @@ -47,7 +47,7 @@ }, "Mining": { "Enabled": true, - "MinGasPrice": "10000000000", + "MinGasPrice": "1000000000", "TargetBlockGasLimit": "20000000" }, "Merge": { 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": {