From c736b04d9b3bec8d9281146490b05075a91e7eea Mon Sep 17 00:00:00 2001
From: maskpp <maskpp266@gmail.com>
Date: Mon, 17 Jun 2024 23:09:29 +0800
Subject: [PATCH] triedb/pathdb: use maps.Clone and maps.Keys (#29985)

---
 triedb/pathdb/history.go    | 11 +++--------
 triedb/pathdb/nodebuffer.go |  5 ++---
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/triedb/pathdb/history.go b/triedb/pathdb/history.go
index 60ce3dc2bc..d77f7aa04d 100644
--- a/triedb/pathdb/history.go
+++ b/triedb/pathdb/history.go
@@ -29,6 +29,7 @@ import (
 	"github.com/ethereum/go-ethereum/ethdb"
 	"github.com/ethereum/go-ethereum/log"
 	"github.com/ethereum/go-ethereum/trie/triestate"
+	"golang.org/x/exp/maps"
 )
 
 // State history records the state changes involved in executing a block. The
@@ -244,19 +245,13 @@ type history struct {
 // newHistory constructs the state history object with provided state change set.
 func newHistory(root common.Hash, parent common.Hash, block uint64, states *triestate.Set) *history {
 	var (
-		accountList []common.Address
+		accountList = maps.Keys(states.Accounts)
 		storageList = make(map[common.Address][]common.Hash)
 	)
-	for addr := range states.Accounts {
-		accountList = append(accountList, addr)
-	}
 	slices.SortFunc(accountList, common.Address.Cmp)
 
 	for addr, slots := range states.Storages {
-		slist := make([]common.Hash, 0, len(slots))
-		for slotHash := range slots {
-			slist = append(slist, slotHash)
-		}
+		slist := maps.Keys(slots)
 		slices.SortFunc(slist, common.Hash.Cmp)
 		storageList[addr] = slist
 	}
diff --git a/triedb/pathdb/nodebuffer.go b/triedb/pathdb/nodebuffer.go
index ff09484100..d3492602c8 100644
--- a/triedb/pathdb/nodebuffer.go
+++ b/triedb/pathdb/nodebuffer.go
@@ -19,6 +19,7 @@ package pathdb
 import (
 	"bytes"
 	"fmt"
+	"maps"
 	"time"
 
 	"github.com/VictoriaMetrics/fastcache"
@@ -90,12 +91,10 @@ func (b *nodebuffer) commit(nodes map[common.Hash]map[string]*trienode.Node) *no
 			// The nodes belong to original diff layer are still accessible even
 			// after merging, thus the ownership of nodes map should still belong
 			// to original layer and any mutation on it should be prevented.
-			current = make(map[string]*trienode.Node, len(subset))
 			for path, n := range subset {
-				current[path] = n
 				delta += int64(len(n.Blob) + len(path))
 			}
-			b.nodes[owner] = current
+			b.nodes[owner] = maps.Clone(subset)
 			continue
 		}
 		for path, n := range subset {