Merge branch 'develop' into v1.4.0-beta-candidate

maticnetwork · May 29, 2024 · 8710b45 · 8710b45
2 parents 1a92ccd + 3278c79
commit 8710b45
Show file tree

Hide file tree

Showing 70 changed files with 1,717 additions and 281 deletions.
diff --git a/Makefile b/Makefile
@@ -34,6 +34,7 @@ protoc:
 
 generate-mocks:
  go generate mockgen -destination=./tests/bor/mocks/IHeimdallClient.go -package=mocks ./consensus/bor IHeimdallClient
+ go generate mockgen -destination=./eth/filters/IDatabase.go -package=filters ./ethdb Database
  go generate mockgen -destination=./eth/filters/IBackend.go -package=filters ./eth/filters Backend
  go generate mockgen -destination=../eth/filters/IDatabase.go -package=filters ./ethdb Database
 

diff --git a/accounts/scwallet/securechannel.go b/accounts/scwallet/securechannel.go
@@ -20,7 +20,6 @@ import (
  "bytes"
  "crypto/aes"
  "crypto/cipher"
- "crypto/elliptic"
  "crypto/rand"
  "crypto/sha256"
  "crypto/sha512"
@@ -73,13 +72,11 @@ func NewSecureChannelSession(card *pcsc.Card, keyData []byte) (*SecureChannelSes
  if err != nil {
  return nil, fmt.Errorf("could not unmarshal public key from card: %v", err)
  }
-
- secret, _ := key.Curve.ScalarMult(cardPublic.X, cardPublic.Y, key.D.Bytes())
-
+ secret, _ := crypto.S256().ScalarMult(cardPublic.X, cardPublic.Y, key.D.Bytes())
  return &SecureChannelSession{
  card: card,
  secret: secret.Bytes(),
- publicKey: elliptic.Marshal(crypto.S256(), key.PublicKey.X, key.PublicKey.Y),
+ publicKey: crypto.FromECDSAPub(&key.PublicKey),
  }, nil
 }
 

diff --git a/build/checksums.txt b/build/checksums.txt
@@ -5,22 +5,22 @@
 # https://github.com/ethereum/execution-spec-tests/releases/download/v1.0.6/
 485af7b66cf41eb3a8c1bd46632913b8eb95995df867cf665617bbc9b4beedd1 fixtures_develop.tar.gz
 
-# version:golang 1.21.5
+# version:golang 1.22.1
 # https://go.dev/dl/
-285cbbdf4b6e6e62ed58f370f3f6d8c30825d6e56c5853c66d3c23bcdb09db19 go1.21.5.src.tar.gz
-a2e1d5743e896e5fe1e7d96479c0a769254aed18cf216cf8f4c3a2300a9b3923 go1.21.5.darwin-amd64.tar.gz
-d0f8ac0c4fb3efc223a833010901d02954e3923cfe2c9a2ff0e4254a777cc9cc go1.21.5.darwin-arm64.tar.gz
-2c05bbe0dc62456b90b7ddd354a54f373b7c377a98f8b22f52ab694b4f6cca58 go1.21.5.freebsd-386.tar.gz
-30b6c64e9a77129605bc12f836422bf09eec577a8c899ee46130aeff81567003 go1.21.5.freebsd-amd64.tar.gz
-8f4dba9cf5c61757bbd7e9ebdb93b6a30a1b03f4a636a1ba0cc2f27b907ab8e1 go1.21.5.linux-386.tar.gz
-e2bc0b3e4b64111ec117295c088bde5f00eeed1567999ff77bc859d7df70078e go1.21.5.linux-amd64.tar.gz
-841cced7ecda9b2014f139f5bab5ae31785f35399f236b8b3e75dff2a2978d96 go1.21.5.linux-arm64.tar.gz
-837f4bf4e22fcdf920ffeaa4abf3d02d1314e03725431065f4d44c46a01b42fe go1.21.5.linux-armv6l.tar.gz
-907b8c6ec4be9b184952e5d3493be66b1746442394a8bc78556c56834cd7c38b go1.21.5.linux-ppc64le.tar.gz
-9c4a81b72ebe44368813cd03684e1080a818bf915d84163abae2ed325a1b2dc0 go1.21.5.linux-s390x.tar.gz
-6da2418889dfb37763d0eb149c4a8d728c029e12f0cd54fbca0a31ae547e2d34 go1.21.5.windows-386.zip
-bbe603cde7c9dee658f45164b4d06de1eff6e6e6b800100824e7c00d56a9a92f go1.21.5.windows-amd64.zip
-9b7acca50e674294e43202df4fbc26d5af4d8bc3170a3342a1514f09a2dab5e9 go1.21.5.windows-arm64.zip
+79c9b91d7f109515a25fc3ecdaad125d67e6bdb54f6d4d98580f46799caea321 go1.22.1.src.tar.gz
+3bc971772f4712fec0364f4bc3de06af22a00a12daab10b6f717fdcd13156cc0 go1.22.1.darwin-amd64.tar.gz
+f6a9cec6b8a002fcc9c0ee24ec04d67f430a52abc3cfd613836986bcc00d8383 go1.22.1.darwin-arm64.tar.gz
+99f81c10d5a3f8a886faf8fa86aaa2aaf929fbed54a972ae5eec3c5e0bdb961a go1.22.1.freebsd-386.tar.gz
+51c614ddd92ee4a9913a14c39bf80508d9cfba08561f24d2f075fd00f3cfb067 go1.22.1.freebsd-amd64.tar.gz
+8484df36d3d40139eaf0fe5e647b006435d826cc12f9ae72973bf7ec265e0ae4 go1.22.1.linux-386.tar.gz
+aab8e15785c997ae20f9c88422ee35d962c4562212bb0f879d052a35c8307c7f go1.22.1.linux-amd64.tar.gz
+e56685a245b6a0c592fc4a55f0b7803af5b3f827aaa29feab1f40e491acf35b8 go1.22.1.linux-arm64.tar.gz
+8cb7a90e48c20daed39a6ac8b8a40760030ba5e93c12274c42191d868687c281 go1.22.1.linux-armv6l.tar.gz
+ac775e19d93cc1668999b77cfe8c8964abfbc658718feccfe6e0eb87663cd668 go1.22.1.linux-ppc64le.tar.gz
+7bb7dd8e10f95c9a4cc4f6bef44c816a6e7c9e03f56ac6af6efbb082b19b379f go1.22.1.linux-s390x.tar.gz
+0c5ebb7eb39b7884ec99f92b425d4c03a96a72443562aafbf6e7d15c42a3108a go1.22.1.windows-386.zip
+cf9c66a208a106402a527f5b956269ca506cfe535fc388e828d249ea88ed28ba go1.22.1.windows-amd64.zip
+85b8511b298c9f4199ecae26afafcc3d46155bac934d43f2357b9224bcaa310f go1.22.1.windows-arm64.zip
 
 # version:golangci 1.51.1
 # https://github.com/golangci/golangci-lint/releases/

diff --git a/cmd/geth/chaincmd.go b/cmd/geth/chaincmd.go
@@ -197,7 +197,7 @@ func initGenesis(ctx *cli.Context) error {
  overrides.OverrideVerkle = new(big.Int).SetInt64(v)
  }
  for _, name := range []string{"chaindata", "lightchaindata"} {
- chaindb, err := stack.OpenDatabaseWithFreezer(name, 0, 0, ctx.String(utils.AncientFlag.Name), "", false)
+ chaindb, err := stack.OpenDatabaseWithFreezer(name, 0, 0, ctx.String(utils.AncientFlag.Name), "", false, false, false)
  if err != nil {
  utils.Fatalf("Failed to open database: %v", err)
  }
@@ -413,7 +413,7 @@ func importPreimages(ctx *cli.Context) error {
  stack, _ := makeConfigNode(ctx)
  defer stack.Close()
 
- db := utils.MakeChainDatabase(ctx, stack, false)
+ db := utils.MakeChainDatabase(ctx, stack, false, false)
  defer db.Close()
  start := time.Now()
 
@@ -427,9 +427,8 @@ func importPreimages(ctx *cli.Context) error {
 }
 
 func parseDumpConfig(ctx *cli.Context, stack *node.Node) (*state.DumpConfig, ethdb.Database, common.Hash, error) {
- db := utils.MakeChainDatabase(ctx, stack, true)
+ db := utils.MakeChainDatabase(ctx, stack, true, false)
  defer db.Close()
-
  var header *types.Header
 
  if ctx.NArg() > 1 {

diff --git a/cmd/geth/dbcmd.go b/cmd/geth/dbcmd.go
@@ -290,7 +290,7 @@ func inspect(ctx *cli.Context) error {
  stack, _ := makeConfigNode(ctx)
  defer stack.Close()
 
- db := utils.MakeChainDatabase(ctx, stack, true)
+ db := utils.MakeChainDatabase(ctx, stack, true, false)
  defer db.Close()
 
  return rawdb.InspectDatabase(db, prefix, start)
@@ -317,7 +317,7 @@ func checkStateContent(ctx *cli.Context) error {
  stack, _ := makeConfigNode(ctx)
  defer stack.Close()
 
- db := utils.MakeChainDatabase(ctx, stack, true)
+ db := utils.MakeChainDatabase(ctx, stack, true, false)
  defer db.Close()
 
  var (
@@ -381,7 +381,7 @@ func dbStats(ctx *cli.Context) error {
  stack, _ := makeConfigNode(ctx)
  defer stack.Close()
 
- db := utils.MakeChainDatabase(ctx, stack, true)
+ db := utils.MakeChainDatabase(ctx, stack, true, false)
  defer db.Close()
 
  showLeveldbStats(db)
@@ -393,7 +393,7 @@ func dbCompact(ctx *cli.Context) error {
  stack, _ := makeConfigNode(ctx)
  defer stack.Close()
 
- db := utils.MakeChainDatabase(ctx, stack, false)
+ db := utils.MakeChainDatabase(ctx, stack, false, false)
  defer db.Close()
 
  log.Info("Stats before compaction")
@@ -421,7 +421,7 @@ func dbGet(ctx *cli.Context) error {
  stack, _ := makeConfigNode(ctx)
  defer stack.Close()
 
- db := utils.MakeChainDatabase(ctx, stack, true)
+ db := utils.MakeChainDatabase(ctx, stack, true, false)
  defer db.Close()
 
  key, err := common.ParseHexOrString(ctx.Args().Get(0))
@@ -450,7 +450,7 @@ func dbDelete(ctx *cli.Context) error {
  stack, _ := makeConfigNode(ctx)
  defer stack.Close()
 
- db := utils.MakeChainDatabase(ctx, stack, false)
+ db := utils.MakeChainDatabase(ctx, stack, false, false)
  defer db.Close()
 
  key, err := common.ParseHexOrString(ctx.Args().Get(0))
@@ -481,7 +481,7 @@ func dbPut(ctx *cli.Context) error {
  stack, _ := makeConfigNode(ctx)
  defer stack.Close()
 
- db := utils.MakeChainDatabase(ctx, stack, false)
+ db := utils.MakeChainDatabase(ctx, stack, false, false)
  defer db.Close()
 
  var (
@@ -520,7 +520,7 @@ func dbDumpTrie(ctx *cli.Context) error {
  stack, _ := makeConfigNode(ctx)
  defer stack.Close()
 
- db := utils.MakeChainDatabase(ctx, stack, true)
+ db := utils.MakeChainDatabase(ctx, stack, true, false)
  defer db.Close()
 
  triedb := utils.MakeTrieDatabase(ctx, db, false, true, false)
@@ -658,7 +658,7 @@ func importLDBdata(ctx *cli.Context) error {
  close(stop)
  }()
 
- db := utils.MakeChainDatabase(ctx, stack, false)
+ db := utils.MakeChainDatabase(ctx, stack, false, false)
  defer db.Close()
  return utils.ImportLDBData(db, fName, int64(start), stop)
 }
@@ -767,17 +767,15 @@ func exportChaindata(ctx *cli.Context) error {
  close(stop)
  }()
 
- db := utils.MakeChainDatabase(ctx, stack, true)
+ db := utils.MakeChainDatabase(ctx, stack, true, false)
  defer db.Close()
  return utils.ExportChaindata(ctx.Args().Get(1), kind, exporter(db), stop)
 }
 
 func showMetaData(ctx *cli.Context) error {
  stack, _ := makeConfigNode(ctx)
  defer stack.Close()
- db := utils.MakeChainDatabase(ctx, stack, true)
- defer db.Close()
-
+ db := utils.MakeChainDatabase(ctx, stack, true, false)
  ancients, err := db.Ancients()
  if err != nil {
  fmt.Fprintf(os.Stderr, "Error accessing ancients: %v", err)
@@ -803,6 +801,5 @@ func showMetaData(ctx *cli.Context) error {
  table.SetHeader([]string{"Field", "Value"})
  table.AppendBulk(data)
  table.Render()
-
  return nil
 }
diff --git a/cmd/geth/main.go b/cmd/geth/main.go
@@ -288,8 +288,6 @@ func main() {
 // prepare manipulates memory cache allowance and setups metric system.
 // This function should be called before launching devp2p stack.
 func prepare(ctx *cli.Context) {
- const light = "light"
-
  // If we're running a known preset, log it for convenience.
  switch {
  case ctx.IsSet(utils.GoerliFlag.Name):

diff --git a/cmd/geth/snapshot.go b/cmd/geth/snapshot.go
@@ -172,7 +172,7 @@ func pruneState(ctx *cli.Context) error {
  stack, _ := makeConfigNode(ctx)
  defer stack.Close()
 
- chaindb := utils.MakeChainDatabase(ctx, stack, false)
+ chaindb := utils.MakeChainDatabase(ctx, stack, false, false)
  defer chaindb.Close()
 
  if rawdb.ReadStateScheme(chaindb) != rawdb.HashScheme {
@@ -215,9 +215,8 @@ func verifyState(ctx *cli.Context) error {
  stack, _ := makeConfigNode(ctx)
  defer stack.Close()
 
- chaindb := utils.MakeChainDatabase(ctx, stack, true)
+ chaindb := utils.MakeChainDatabase(ctx, stack, true, false)
  defer chaindb.Close()
-
  headBlock := rawdb.ReadHeadBlock(chaindb)
  if headBlock == nil {
  log.Error("Failed to load head block")
@@ -268,7 +267,7 @@ func checkDanglingStorage(ctx *cli.Context) error {
  stack, _ := makeConfigNode(ctx)
  defer stack.Close()
 
- db := utils.MakeChainDatabase(ctx, stack, true)
+ db := utils.MakeChainDatabase(ctx, stack, true, false)
  defer db.Close()
  return snapshot.CheckDanglingStorage(db)
 }
@@ -280,7 +279,7 @@ func traverseState(ctx *cli.Context) error {
  stack, _ := makeConfigNode(ctx)
  defer stack.Close()
 
- chaindb := utils.MakeChainDatabase(ctx, stack, true)
+ chaindb := utils.MakeChainDatabase(ctx, stack, true, false)
  defer chaindb.Close()
 
  triedb := utils.MakeTrieDatabase(ctx, chaindb, false, true, false)
@@ -404,7 +403,7 @@ func traverseRawState(ctx *cli.Context) error {
  stack, _ := makeConfigNode(ctx)
  defer stack.Close()
 
- chaindb := utils.MakeChainDatabase(ctx, stack, true)
+ chaindb := utils.MakeChainDatabase(ctx, stack, true, false)
  defer chaindb.Close()
 
  triedb := utils.MakeTrieDatabase(ctx, chaindb, false, true, false)
@@ -684,7 +683,7 @@ func snapshotExportPreimages(ctx *cli.Context) error {
  stack, _ := makeConfigNode(ctx)
  defer stack.Close()
 
- chaindb := utils.MakeChainDatabase(ctx, stack, true)
+ chaindb := utils.MakeChainDatabase(ctx, stack, true, false)
  defer chaindb.Close()
 
  triedb := utils.MakeTrieDatabase(ctx, chaindb, false, true, false)
@@ -743,7 +742,7 @@ func checkAccount(ctx *cli.Context) error {
  stack, _ := makeConfigNode(ctx)
  defer stack.Close()
 
- chaindb := utils.MakeChainDatabase(ctx, stack, true)
+ chaindb := utils.MakeChainDatabase(ctx, stack, true, false)
  defer chaindb.Close()
 
  start := time.Now()

diff --git a/cmd/geth/verkle.go b/cmd/geth/verkle.go
@@ -117,7 +117,7 @@ func verifyVerkle(ctx *cli.Context) error {
  stack, _ := makeConfigNode(ctx)
  defer stack.Close()
 
- chaindb := utils.MakeChainDatabase(ctx, stack, true)
+ chaindb := utils.MakeChainDatabase(ctx, stack, true, false)
  defer chaindb.Close()
  headBlock := rawdb.ReadHeadBlock(chaindb)
 
@@ -172,7 +172,7 @@ func expandVerkle(ctx *cli.Context) error {
  stack, _ := makeConfigNode(ctx)
  defer stack.Close()
 
- chaindb := utils.MakeChainDatabase(ctx, stack, true)
+ chaindb := utils.MakeChainDatabase(ctx, stack, true, false)
  defer chaindb.Close()
  var (
  rootC common.Hash

diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go
@@ -2112,8 +2112,8 @@ func SplitTagsFlag(tagsFlag string) map[string]string {
  return tagsMap
 }
 
-// MakeChainDatabase opens a database using the flags passed to the client and will hard crash if it fails.
-func MakeChainDatabase(ctx *cli.Context, stack *node.Node, readonly bool) ethdb.Database {
+// MakeChainDatabase opens a LevelDB using the flags passed to the client and will hard crash if it fails.
+func MakeChainDatabase(ctx *cli.Context, stack *node.Node, readonly, disableFreeze bool) ethdb.Database {
  var (
  cache = ctx.Int(CacheFlag.Name) * ctx.Int(CacheDatabaseFlag.Name) / 100
  handles = MakeDatabaseHandles(ctx.Int(FDLimitFlag.Name))
@@ -2134,7 +2134,7 @@ func MakeChainDatabase(ctx *cli.Context, stack *node.Node, readonly bool) ethdb.
  case ctx.String(SyncModeFlag.Name) == "light":
  chainDb, err = stack.OpenDatabase("lightchaindata", cache, handles, "", readonly)
  default:
- chainDb, err = stack.OpenDatabaseWithFreezer("chaindata", cache, handles, ctx.String(AncientFlag.Name), "", readonly)
+ chainDb, err = stack.OpenDatabaseWithFreezer("chaindata", cache, handles, ctx.String(AncientFlag.Name), "", readonly, disableFreeze, false)
  }
 
  if err != nil {
@@ -2153,7 +2153,7 @@ func tryMakeReadOnlyDatabase(ctx *cli.Context, stack *node.Node) ethdb.Database
  if rawdb.PreexistingDatabase(stack.ResolvePath("chaindata")) == "" {
  readonly = false
  }
- return MakeChainDatabase(ctx, stack, readonly)
+ return MakeChainDatabase(ctx, stack, readonly, false)
 }
 
 func IsNetworkPreset(ctx *cli.Context) bool {
@@ -2218,7 +2218,7 @@ func MakeGenesis(ctx *cli.Context) *core.Genesis {
 func MakeChain(ctx *cli.Context, stack *node.Node, readonly bool) (*core.BlockChain, ethdb.Database) {
  var (
  gspec = MakeGenesis(ctx)
- chainDb = MakeChainDatabase(ctx, stack, readonly)
+ chainDb = MakeChainDatabase(ctx, stack, readonly, false)
  )
 
  config, err := core.LoadChainConfig(chainDb, gspec)

diff --git a/consensus/bor/api.go b/consensus/bor/api.go
@@ -317,6 +317,10 @@ func (api *API) GetRootHash(start uint64, end uint64) (string, error) {
 
  for i := 0; i < len(blockHeaders); i++ {
  blockHeader := blockHeaders[i]
+ // Handle no header case, which is possible if ancient pruning was done
+ if blockHeader == nil {
+ return "", errUnknownBlock
+ }
  header := crypto.Keccak256(appendBytes32(
  blockHeader.Number.Bytes(),
  new(big.Int).SetUint64(blockHeader.Time).Bytes(),

diff --git a/core/blockchain.go b/core/blockchain.go
@@ -411,7 +411,12 @@ func NewBlockChain(db ethdb.Database, cacheConfig *CacheConfig, genesis *Genesis
  }
  }
  // Ensure that a previous crash in SetHead doesn't leave extra ancients
- if frozen, err := bc.db.Ancients(); err == nil && frozen > 0 {
+ //nolint:nestif
+ if frozen, err := bc.db.ItemAmountInAncient(); err == nil && frozen > 0 {
+ frozen, err = bc.db.Ancients()
+ if err != nil {
+ return nil, err
+ }
  var (
  needRewind bool
  low uint64

diff --git a/core/blockchain_repair_test.go b/core/blockchain_repair_test.go
@@ -1768,6 +1768,8 @@ func testRepairWithScheme(t *testing.T, tt *rewindTest, snapshots bool, scheme s
  Directory: datadir,
  AncientsDirectory: ancient,
  Ephemeral: true,
+ IsLastOffset: false,
+ DisableFreeze: false,
  })
  if err != nil {
  t.Fatalf("Failed to create persistent database: %v", err)
@@ -1849,6 +1851,8 @@ func testRepairWithScheme(t *testing.T, tt *rewindTest, snapshots bool, scheme s
  Directory: datadir,
  AncientsDirectory: ancient,
  Ephemeral: true,
+ IsLastOffset: false,
+ DisableFreeze: false,
  })
  if err != nil {
  t.Fatalf("Failed to reopen persistent database: %v", err)
@@ -1913,6 +1917,8 @@ func testIssue23496(t *testing.T, scheme string) {
  db, err := rawdb.Open(rawdb.OpenOptions{
  Directory: datadir,
  AncientsDirectory: ancient,
+ IsLastOffset: false,
+ DisableFreeze: false,
  })
  if err != nil {
  t.Fatalf("Failed to create persistent database: %v", err)
@@ -1971,6 +1977,8 @@ func testIssue23496(t *testing.T, scheme string) {
  Directory: datadir,
  AncientsDirectory: ancient,
  Ephemeral: true,
+ IsLastOffset: false,
+ DisableFreeze: false,
  })
  if err != nil {
  t.Fatalf("Failed to reopen persistent database: %v", err)