sort keys for logging

core/blockchain.go

@@ -146,6 +146,10 @@ func ExecuteBlockEphemerally(
 		}
 	}
 
+	if state.TraceLog {
+		fmt.Printf("XXX all transactions executed\n")
+	}
+
 	receiptSha := types.DeriveSha(receipts)
 	if !vmConfig.StatelessExec && chainConfig.IsByzantium(header.Number.Uint64()) && !vmConfig.NoReceipts && receiptSha != block.ReceiptHash() {
 		return nil, fmt.Errorf("mismatched receipt headers for block %d (%s != %s)", block.NumberU64(), receiptSha.Hex(), block.ReceiptHash().Hex())

core/state/intra_block_state.go

@@ -19,6 +19,7 @@ package state
 
 import (
 	"fmt"
+	"slices"
 	"sort"
 
 	"github.com/holiman/uint256"
@@ -718,7 +719,18 @@ func (sdb *IntraBlockState) MakeWriteSet(chainRules *chain.Rules, stateWriter St
 	for addr := range sdb.journal.dirties {
 		sdb.stateObjectsDirty[addr] = struct{}{}
 	}
-	for addr, stateObject := range sdb.stateObjects {
+
+	keys := make([]string, len(sdb.stateObjects))
+	i := 0
+	for k := range sdb.stateObjects {
+		keys[i] = k.Hex()
+		i++
+	}
+	slices.Sort(keys)
+
+	for _, addrHex := range keys {
+		addr := libcommon.HexToAddress(addrHex)
+		stateObject := sdb.stateObjects[addr]
 		_, isDirty := sdb.stateObjectsDirty[addr]
 		if err := updateAccount(chainRules.IsSpuriousDragon, chainRules.IsAura, stateWriter, addr, stateObject, isDirty); err != nil {
 			return err

core/state/state_object.go

@@ -21,6 +21,7 @@ import (
 	"fmt"
 	"io"
 	"math/big"
+	"slices"
 
 	"github.com/holiman/uint256"
 	libcommon "github.com/ledgerwatch/erigon-lib/common"
@@ -251,8 +252,17 @@ func (so *stateObject) setState(key *libcommon.Hash, value uint256.Int) {
 
 // updateTrie writes cached storage modifications into the object's storage trie.
 func (so *stateObject) updateTrie(stateWriter StateWriter) error {
-	for key, value := range so.dirtyStorage {
-		value := value
+	keys := make([]string, len(so.dirtyStorage))
+	i := 0
+	for k := range so.dirtyStorage {
+		keys[i] = k.Hex()
+		i++
+	}
+	slices.Sort(keys)
+
+	for _, keyHex := range keys {
+		key := libcommon.HexToHash(keyHex)
+		value := so.dirtyStorage[key]
 		original := so.blockOriginStorage[key]
 		so.originStorage[key] = value
 		if err := stateWriter.WriteAccountStorage(so.address, so.data.GetIncarnation(), &key, &original, &value); err != nil {