upstream: merge tag 'geth-v1.15.1' into bsc-develop

buddh0 · buddh0 · commit b1c2ea93a752 · 2025-02-17T09:54:54.000+08:00
diff --git a/cmd/evm/testdata/evmrun/3.out.1.txt b/cmd/evm/testdata/evmrun/3.out.1.txt
@@ -1,12 +1,13 @@
 {
     "root": "b444481d1367188172f8c6091e948aaa68bae763fd26d6b9e994306a66bf69f9",
     "accounts": {
-        "pre(0x30d7a0694cb29af31b982480e11d7ebb003a3fca4026939149071f014689b142)": {
+        "0x0000000000000000000000007265636569766572": {
             "balance": "0",
             "nonce": 0,
             "root": "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "codeHash": "0x3e48ef54b89079a075f3b8fc253c657a86b110a7aed3568c1517b10edf2c3eb6",
             "code": "0x6040",
+            "address": "0x0000000000000000000000007265636569766572",
             "key": "0x30d7a0694cb29af31b982480e11d7ebb003a3fca4026939149071f014689b142"
         }
     }
diff --git a/cmd/evm/testdata/evmrun/4.out.1.txt b/cmd/evm/testdata/evmrun/4.out.1.txt
@@ -1,12 +1,13 @@
 {
     "root": "b444481d1367188172f8c6091e948aaa68bae763fd26d6b9e994306a66bf69f9",
     "accounts": {
-        "pre(0x30d7a0694cb29af31b982480e11d7ebb003a3fca4026939149071f014689b142)": {
+        "0x0000000000000000000000007265636569766572": {
             "balance": "0",
             "nonce": 0,
             "root": "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "codeHash": "0x3e48ef54b89079a075f3b8fc253c657a86b110a7aed3568c1517b10edf2c3eb6",
             "code": "0x6040",
+            "address": "0x0000000000000000000000007265636569766572",
             "key": "0x30d7a0694cb29af31b982480e11d7ebb003a3fca4026939149071f014689b142"
         }
     }
diff --git a/core/genesis.go b/core/genesis.go
@@ -387,6 +387,11 @@ func SetupGenesisBlockWithOverride(db ethdb.Database, triedb *triedb.Database, g
 	}
 	newCfg := genesis.chainConfigOrDefault(ghash, storedCfg)
 
+	// Sanity-check the new configuration.
+	if err := newCfg.CheckConfigForkOrder(); err != nil {
+		return nil, common.Hash{}, nil, err
+	}
+
 	// TODO(rjl493456442) better to define the comparator of chain config
 	// and short circuit if the chain config is not changed.
 	compatErr := storedCfg.CheckCompatible(newCfg, head.Number.Uint64(), head.Time)
diff --git a/core/rawdb/freezer_table.go b/core/rawdb/freezer_table.go
@@ -420,6 +420,13 @@ func (t *freezerTable) repairIndex() error {
 	// If legacy metadata is detected, attempt to recover the offset from the
 	// index file to avoid clearing the entire table.
 	if t.metadata.version == freezerTableV1 {
+		// Skip truncation if the legacy metadata is opened in read-only mode.
+		// Since all items in the legacy index file were forcibly synchronized,
+		// data integrity is guaranteed. Therefore, it's safe to leave any extra
+		// items untruncated in this special scenario.
+		if t.readonly {
+			return nil
+		}
 		t.logger.Info("Recovering freezer flushOffset for legacy table", "offset", size)
 		return t.metadata.setFlushOffset(size, true)
 	}
diff --git a/go.mod b/go.mod
@@ -69,7 +69,7 @@ require (
 	github.com/shirou/gopsutil v3.21.11+incompatible
 	github.com/status-im/keycard-go v0.2.0
 	github.com/stretchr/testify v1.10.0
-	github.com/supranational/blst v0.3.13
+	github.com/supranational/blst v0.3.14
 	github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7
 	github.com/tendermint/go-amino v0.14.1
 	github.com/tendermint/iavl v0.12.0
diff --git a/go.sum b/go.sum
@@ -1146,8 +1146,8 @@ github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXl
 github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
 github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
-github.com/supranational/blst v0.3.13 h1:AYeSxdOMacwu7FBmpfloBz5pbFXDmJL33RuwnKtmTjk=
-github.com/supranational/blst v0.3.13/go.mod h1:jZJtfjgudtNl4en1tzwPIV3KjUnQUvG3/j+w+fVonLw=
+github.com/supranational/blst v0.3.14 h1:xNMoHRJOTwMn63ip6qoWJ2Ymgvj7E2b9jY2FAwY+qRo=
+github.com/supranational/blst v0.3.14/go.mod h1:jZJtfjgudtNl4en1tzwPIV3KjUnQUvG3/j+w+fVonLw=
 github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 h1:epCh84lMvA70Z7CTTCmYQn2CKbY8j86K7/FAIr141uY=
 github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7/go.mod h1:q4W45IWZaF22tdD+VEXcAWRA037jwmWEB5VWYORlTpc=
 github.com/tarm/serial v0.0.0-20180830185346-98f6abe2eb07/go.mod h1:kDXzergiv9cbyO7IOYJZWg1U88JhDg3PB6klq9Hg2pA=
diff --git a/params/config.go b/params/config.go
@@ -1297,13 +1297,13 @@ func (c *ChainConfig) CheckConfigForkOrder() error {
 	} {
 		if cur.config != nil {
 			if err := cur.config.validate(); err != nil {
-				return fmt.Errorf("invalid blob configuration for fork %s: %v", cur.name, err)
+				return fmt.Errorf("invalid chain configuration in blobSchedule for fork %q: %v", cur.name, err)
 			}
 		}
 		if cur.timestamp != nil {
 			// If the fork is configured, a blob schedule must be defined for it.
 			if cur.config == nil {
-				return fmt.Errorf("unsupported fork configuration: missing blob configuration entry for %v in schedule", cur.name)
+				return fmt.Errorf("invalid chain configuration: missing entry for fork %q in blobSchedule", cur.name)
 			}
 		}
 	}
diff --git a/trie/secure_trie.go b/trie/secure_trie.go
@@ -275,6 +275,7 @@ func (t *StateTrie) Copy() *StateTrie {
 		trie:        *t.trie.Copy(),
 		db:          t.db,
 		secKeyCache: t.secKeyCache,
+		preimages:   t.preimages,
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1,12 +1,13 @@`
`1`	`1`	`{`
`2`	`2`	`"root": "b444481d1367188172f8c6091e948aaa68bae763fd26d6b9e994306a66bf69f9",`
`3`	`3`	`"accounts": {`
`4`		`- "pre(0x30d7a0694cb29af31b982480e11d7ebb003a3fca4026939149071f014689b142)": {`
	`4`	`+ "0x0000000000000000000000007265636569766572": {`
`5`	`5`	`"balance": "0",`
`6`	`6`	`"nonce": 0,`
`7`	`7`	`"root": "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",`
`8`	`8`	`"codeHash": "0x3e48ef54b89079a075f3b8fc253c657a86b110a7aed3568c1517b10edf2c3eb6",`
`9`	`9`	`"code": "0x6040",`
	`10`	`+ "address": "0x0000000000000000000000007265636569766572",`
`10`	`11`	`"key": "0x30d7a0694cb29af31b982480e11d7ebb003a3fca4026939149071f014689b142"`
`11`	`12`	`}`
`12`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1297,13 +1297,13 @@ func (c *ChainConfig) CheckConfigForkOrder() error {`
`1297`	`1297`	`} {`
`1298`	`1298`	`if cur.config != nil {`
`1299`	`1299`	`if err := cur.config.validate(); err != nil {`
`1300`		`- return fmt.Errorf("invalid blob configuration for fork %s: %v", cur.name, err)`
	`1300`	`+ return fmt.Errorf("invalid chain configuration in blobSchedule for fork %q: %v", cur.name, err)`
`1301`	`1301`	`}`
`1302`	`1302`	`}`
`1303`	`1303`	`if cur.timestamp != nil {`
`1304`	`1304`	`// If the fork is configured, a blob schedule must be defined for it.`
`1305`	`1305`	`if cur.config == nil {`
`1306`		`- return fmt.Errorf("unsupported fork configuration: missing blob configuration entry for %v in schedule", cur.name)`
	`1306`	`+ return fmt.Errorf("invalid chain configuration: missing entry for fork %q in blobSchedule", cur.name)`
`1307`	`1307`	`}`
`1308`	`1308`	`}`
`1309`	`1309`	`}`
Original file line number	Diff line number	Diff line change
`@@ -275,6 +275,7 @@ func (t StateTrie) Copy() StateTrie {`
`275`	`275`	`trie: *t.trie.Copy(),`
`276`	`276`	`db: t.db,`
`277`	`277`	`secKeyCache: t.secKeyCache,`
	`278`	`+ preimages: t.preimages,`
`278`	`279`	`}`
`279`	`280`	`}`
`280`	`281`