go.mod, chain: upgrade to go-ethereum v1.15.0

Also updating the testchain for Prague devnet-6 conformance.
lightclient · Feb 10, 2025 · 32ba1b7 · 32ba1b7
1 parent 0719c20
commit 32ba1b7
Show file tree

Hide file tree

Showing 8 changed files with 141 additions and 84 deletions.
diff --git a/chain/chain.rlp b/chain/chain.rlp
diff --git a/chain/forkenv.json b/chain/forkenv.json
@@ -1,4 +1,7 @@
 {
+  "HIVE_CANCUN_BLOB_BASE_FEE_UPDATE_FRACTION": "3338477",
+  "HIVE_CANCUN_BLOB_MAX": "6",
+  "HIVE_CANCUN_BLOB_TARGET": "3",
   "HIVE_CANCUN_TIMESTAMP": "0",
   "HIVE_CHAIN_ID": "3503995874084926",
   "HIVE_FORK_ARROW_GLACIER": "0",
@@ -15,6 +18,9 @@
   "HIVE_FORK_TANGERINE": "0",
   "HIVE_MERGE_BLOCK_ID": "0",
   "HIVE_NETWORK_ID": "3503995874084926",
+  "HIVE_PRAGUE_BLOB_BASE_FEE_UPDATE_FRACTION": "5007716",
+  "HIVE_PRAGUE_BLOB_MAX": "9",
+  "HIVE_PRAGUE_BLOB_TARGET": "6",
   "HIVE_PRAGUE_TIMESTAMP": "0",
   "HIVE_SHANGHAI_TIMESTAMP": "0",
   "HIVE_TERMINAL_TOTAL_DIFFICULTY": "131072"

diff --git a/chain/genesis.json b/chain/genesis.json
@@ -20,7 +20,19 @@
     "pragueTime": 0,
     "terminalTotalDifficulty": 131072,
     "depositContractAddress": "0x0000000000000000000000000000000000000000",
-    "ethash": {}
+    "ethash": {},
+    "blobSchedule": {
+      "cancun": {
+        "target": 3,
+        "max": 6,
+        "baseFeeUpdateFraction": 3338477
+      },
+      "prague": {
+        "target": 6,
+        "max": 9,
+        "baseFeeUpdateFraction": 5007716
+      }
+    }
   },
   "nonce": "0x0",
   "timestamp": "0x0",
@@ -30,25 +42,25 @@
   "mixHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
   "coinbase": "0x0000000000000000000000000000000000000000",
   "alloc": {
-    "000f3df6d732807ef1319fb7b8bb8522d0beac02": {
-      "code": "0x3373fffffffffffffffffffffffffffffffffffffffe14604d57602036146024575f5ffd5b5f35801560495762001fff810690815414603c575f5ffd5b62001fff01545f5260205ff35b5f5ffd5b62001fff42064281555f359062001fff015500",
-      "balance": "0x2a"
+    "00000961ef480eb55e80d19ad83579a64c007002": {
+      "code": "0x3373fffffffffffffffffffffffffffffffffffffffe1460cb5760115f54807fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff146101f457600182026001905f5b5f82111560685781019083028483029004916001019190604d565b909390049250505036603814608857366101f457346101f4575f5260205ff35b34106101f457600154600101600155600354806003026004013381556001015f35815560010160203590553360601b5f5260385f601437604c5fa0600101600355005b6003546002548082038060101160df575060105b5f5b8181146101835782810160030260040181604c02815460601b8152601401816001015481526020019060020154807fffffffffffffffffffffffffffffffff00000000000000000000000000000000168252906010019060401c908160381c81600701538160301c81600601538160281c81600501538160201c81600401538160181c81600301538160101c81600201538160081c81600101535360010160e1565b910180921461019557906002556101a0565b90505f6002555f6003555b5f54807fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff14156101cd57505f5b6001546002828201116101e25750505f6101e8565b01600290035b5f555f600155604c025ff35b5f5ffd",
+      "balance": "0x1"
     },
-    "00431f263ce400f4455c2dcf564e53007ca4bbbb": {
+    "0000bbddc7ce488642fb579f8b00f3a590007251": {
       "code": "0x3373fffffffffffffffffffffffffffffffffffffffe1460d35760115f54807fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff1461019a57600182026001905f5b5f82111560685781019083028483029004916001019190604d565b9093900492505050366060146088573661019a573461019a575f5260205ff35b341061019a57600154600101600155600354806004026004013381556001015f358155600101602035815560010160403590553360601b5f5260605f60143760745fa0600101600355005b6003546002548082038060021160e7575060025b5f5b8181146101295782810160040260040181607402815460601b815260140181600101548152602001816002015481526020019060030154905260010160e9565b910180921461013b5790600255610146565b90505f6002555f6003555b5f54807fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff141561017357505f5b6001546001828201116101885750505f61018e565b01600190035b5f555f6001556074025ff35b5f5ffd",
       "balance": "0x1"
     },
-    "0c15f14308530b7cdb8460094bbb9cc28b9aaaaa": {
-      "code": "0x3373fffffffffffffffffffffffffffffffffffffffe1460cb5760115f54807fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff146101f457600182026001905f5b5f82111560685781019083028483029004916001019190604d565b909390049250505036603814608857366101f457346101f4575f5260205ff35b34106101f457600154600101600155600354806003026004013381556001015f35815560010160203590553360601b5f5260385f601437604c5fa0600101600355005b6003546002548082038060101160df575060105b5f5b8181146101835782810160030260040181604c02815460601b8152601401816001015481526020019060020154807fffffffffffffffffffffffffffffffff00000000000000000000000000000000168252906010019060401c908160381c81600701538160301c81600601538160281c81600501538160201c81600401538160181c81600301538160101c81600201538160081c81600101535360010160e1565b910180921461019557906002556101a0565b90505f6002555f6003555b5f54807fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff14156101cd57505f5b6001546002828201116101e25750505f6101e8565b01600290035b5f555f600155604c025ff35b5f5ffd",
+    "0000f90827f1c53a10cb7a02335b175320002935": {
+      "code": "0x3373fffffffffffffffffffffffffffffffffffffffe14604657602036036042575f35600143038111604257611fff81430311604257611fff9006545f5260205ff35b5f5ffd5b5f35611fff60014303065500",
       "balance": "0x1"
     },
+    "000f3df6d732807ef1319fb7b8bb8522d0beac02": {
+      "code": "0x3373fffffffffffffffffffffffffffffffffffffffe14604d57602036146024575f5ffd5b5f35801560495762001fff810690815414603c575f5ffd5b62001fff01545f5260205ff35b5f5ffd5b62001fff42064281555f359062001fff015500",
+      "balance": "0x2a"
+    },
     "0c2c51a0990aee1d73c1228de158688341557508": {
       "balance": "0xc097ce7bc90715b34b9f1000000000"
     },
-    "0f792be4b0c0cb4dae440ef133e90c0ecd48cccc": {
-      "code": "0x3373fffffffffffffffffffffffffffffffffffffffe14604657602036036042575f35600143038111604257611fff81430311604257611fff9006545f5260205ff35b5f5ffd5b5f35611fff60014303065500",
-      "balance": "0x1"
-    },
     "14e46043e63d0e3cdcf2530519f4cfaf35058cb2": {
       "balance": "0xc097ce7bc90715b34b9f1000000000"
     },

diff --git a/chain/headfcu.json b/chain/headfcu.json
@@ -4,9 +4,9 @@
   "method": "engine_forkchoiceUpdatedV3",
   "params": [
     {
-      "headBlockHash": "0xd3353956d9ff9053a5b7197f00d6f49d13a5d99c33bbbcf1e827fa2afdef1f3f",
-      "safeBlockHash": "0xd3353956d9ff9053a5b7197f00d6f49d13a5d99c33bbbcf1e827fa2afdef1f3f",
-      "finalizedBlockHash": "0xd3353956d9ff9053a5b7197f00d6f49d13a5d99c33bbbcf1e827fa2afdef1f3f"
+      "headBlockHash": "0x514c48e760c62a38f91e011149b1b4a619bb3a7f750ec4430061bf19c3336635",
+      "safeBlockHash": "0x514c48e760c62a38f91e011149b1b4a619bb3a7f750ec4430061bf19c3336635",
+      "finalizedBlockHash": "0x514c48e760c62a38f91e011149b1b4a619bb3a7f750ec4430061bf19c3336635"
     },
     null
   ]