Merge branch 'hex-patricia-reader' into hex-patricia-reader-proof

cmd/evm/internal/t8ntool/transition.go

@@ -34,6 +34,7 @@ import (
 	"github.com/urfave/cli/v2"
 
 	"github.com/erigontech/erigon-lib/chain"
+	"github.com/erigontech/erigon-lib/commitment"
 	libcommon "github.com/erigontech/erigon-lib/common"
 	"github.com/erigontech/erigon-lib/common/datadir"
 	"github.com/erigontech/erigon-lib/common/hexutility"
@@ -307,7 +308,7 @@ func Main(ctx *cli.Context) error {
 	}
 	defer tx.Rollback()
 
-	sd, err := libstate.NewSharedDomains(tx, log.New())
+	sd, err := libstate.NewSharedDomains(tx, commitment.VariantHexPatriciaTrie, log.New())
 	if err != nil {
 		return err
 	}
@@ -630,7 +631,7 @@ func CalculateStateRoot(tx kv.RwTx) (*libcommon.Hash, error) {
 	defer c.Close()
 	h := libcommon.NewHasher()
 	defer libcommon.ReturnHasherToPool(h)
-	domains, err := libstate.NewSharedDomains(tx, log.New())
+	domains, err := libstate.NewSharedDomains(tx, commitment.VariantHexPatriciaTrie, log.New())
 	if err != nil {
 		return nil, fmt.Errorf("NewSharedDomains: %w", err)
 	}

cmd/evm/runner.go

@@ -32,6 +32,7 @@ import (
 	"testing"
 	"time"
 
+	"github.com/erigontech/erigon-lib/commitment"
 	"github.com/erigontech/erigon-lib/config3"
 	"github.com/erigontech/erigon-lib/kv"
 	"github.com/erigontech/erigon-lib/kv/temporal"
@@ -186,7 +187,7 @@ func runCmd(ctx *cli.Context) error {
 	}
 	defer tx.Rollback()
 
-	sd, err := state2.NewSharedDomains(tx, log.Root())
+	sd, err := state2.NewSharedDomains(tx, commitment.VariantHexPatriciaTrie, log.Root())
 	if err != nil {
 		return err
 	}

cmd/integration/commands/stages.go

@@ -38,6 +38,7 @@ import (
 	"github.com/erigontech/secp256k1"
 
 	chain2 "github.com/erigontech/erigon-lib/chain"
+	"github.com/erigontech/erigon-lib/commitment"
 	libcommon "github.com/erigontech/erigon-lib/common"
 	"github.com/erigontech/erigon-lib/common/datadir"
 	"github.com/erigontech/erigon-lib/common/dbg"
@@ -664,7 +665,7 @@ func stageSnapshots(db kv.TemporalRwDB, ctx context.Context, logger log.Logger)
 		ac := agg.BeginFilesRo()
 		defer ac.Close()
 
-		domains, err := libstate.NewSharedDomains(tx, logger)
+		domains, err := libstate.NewSharedDomains(tx, commitment.VariantHexPatriciaTrie, logger)
 		if err != nil {
 			return err
 		}
@@ -1143,7 +1144,7 @@ func stageExec(db kv.TemporalRwDB, ctx context.Context, logger log.Logger) error
 				return err
 			}
 			if execProgress == 0 {
-				doms, err := libstate.NewSharedDomains(tx, log.New())
+				doms, err := libstate.NewSharedDomains(tx, commitment.VariantHexPatriciaTrie, log.New())
 				if err != nil {
 					panic(err)
 				}

cmd/integration/commands/state_domains.go

@@ -29,6 +29,7 @@ import (
 	"sort"
 	"strings"
 
+	"github.com/erigontech/erigon-lib/commitment"
 	"github.com/erigontech/erigon-lib/etl"
 	"github.com/erigontech/erigon-lib/seg"
 	state3 "github.com/erigontech/erigon-lib/state"
@@ -471,7 +472,7 @@ func requestDomains(chainDb, stateDb kv.RwDB, ctx context.Context, readDomain st
 	stateTx, err := stateDb.BeginRw(ctx)
 	must(err)
 	defer stateTx.Rollback()
-	domains, err := state3.NewSharedDomains(stateTx, logger)
+	domains, err := state3.NewSharedDomains(stateTx, commitment.VariantHexPatriciaTrie, logger)
 	if err != nil {
 		return err
 	}

cmd/integration/commands/state_stages.go

@@ -25,6 +25,7 @@ import (
 	"os"
 	"time"
 
+	"github.com/erigontech/erigon-lib/commitment"
 	stateLib "github.com/erigontech/erigon-lib/state"
 
 	"github.com/erigontech/erigon-lib/wrap"
@@ -172,7 +173,7 @@ func syncBySmallSteps(db kv.TemporalRwDB, miningConfig params.MiningConfig, ctx
 	}
 	defer tx.Rollback()
 
-	sd, err := stateLib.NewSharedDomains(tx, logger1)
+	sd, err := stateLib.NewSharedDomains(tx, commitment.VariantHexPatriciaTrie, logger1)
 	if err != nil {
 		return err
 	}

core/chain_makers.go

@@ -30,6 +30,7 @@ import (
 	"github.com/erigontech/erigon-lib/log/v3"
 
 	"github.com/erigontech/erigon-lib/chain"
+	"github.com/erigontech/erigon-lib/commitment"
 	libcommon "github.com/erigontech/erigon-lib/common"
 	"github.com/erigontech/erigon-lib/common/length"
 	"github.com/erigontech/erigon-lib/kv"
@@ -332,7 +333,7 @@ func GenerateChain(config *chain.Config, parent *types.Block, engine consensus.E
 	defer tx.Rollback()
 	logger := log.New("generate-chain", config.ChainName)
 
-	domains, err := libstate.NewSharedDomains(tx, logger)
+	domains, err := libstate.NewSharedDomains(tx, commitment.VariantHexPatriciaTrie, logger)
 	if err != nil {
 		return nil, err
 	}
@@ -455,7 +456,7 @@ func hashKeyAndAddIncarnation(k []byte, h *libcommon.Hasher) (newK []byte, err e
 }
 
 func CalcHashRootForTests(tx kv.RwTx, header *types.Header, histV4, trace bool) (hashRoot libcommon.Hash, err error) {
-	domains, err := libstate.NewSharedDomains(tx, log.New())
+	domains, err := libstate.NewSharedDomains(tx, commitment.VariantHexPatriciaTrie, log.New())
 	if err != nil {
 		return hashRoot, fmt.Errorf("NewSharedDomains: %w", err)
 	}

core/genesis_write.go

@@ -35,6 +35,7 @@ import (
 
 	"github.com/erigontech/erigon-lib/chain"
 	"github.com/erigontech/erigon-lib/chain/networkname"
+	"github.com/erigontech/erigon-lib/commitment"
 	libcommon "github.com/erigontech/erigon-lib/common"
 	"github.com/erigontech/erigon-lib/common/datadir"
 	"github.com/erigontech/erigon-lib/common/hexutil"
@@ -522,7 +523,7 @@ func GenesisToBlock(g *types.Genesis, dirs datadir.Dirs, logger log.Logger) (*ty
 		}
 		defer tx.Rollback()
 
-		sd, err := state2.NewSharedDomains(tx, logger)
+		sd, err := state2.NewSharedDomains(tx, commitment.VariantHexPatriciaTrie, logger)
 		if err != nil {
 			return err
 		}

core/rawdb/rawtemporaldb/accessors_receipt_test.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"testing"
 
+	"github.com/erigontech/erigon-lib/commitment"
 	"github.com/erigontech/erigon-lib/common/datadir"
 	"github.com/erigontech/erigon-lib/kv"
 	"github.com/erigontech/erigon-lib/kv/temporal/temporaltest"
@@ -21,7 +22,7 @@ func TestAppendReceipt(t *testing.T) {
 	defer tx.Rollback()
 
 	ttx := tx.(kv.TemporalTx)
-	doms, err := state.NewSharedDomains(ttx, log.New())
+	doms, err := state.NewSharedDomains(ttx, commitment.VariantHexPatriciaTrie, log.New())
 	require.NoError(err)
 	defer doms.Close()
 	doms.SetTx(ttx)

core/state/access_list_test.go

@@ -23,6 +23,7 @@ import (
 
 	"github.com/erigontech/erigon-lib/log/v3"
 
+	"github.com/erigontech/erigon-lib/commitment"
 	"github.com/erigontech/erigon-lib/common"
 	"github.com/erigontech/erigon-lib/kv/rawdbv3"
 	stateLib "github.com/erigontech/erigon-lib/state"
@@ -90,8 +91,7 @@ func TestAccessList(t *testing.T) {
 	slot := common.HexToHash
 
 	_, tx, _ := NewTestTemporalDb(t)
-
-	domains, err := stateLib.NewSharedDomains(tx, log.New())
+	domains, err := stateLib.NewSharedDomains(tx, commitment.VariantHexPatriciaTrie, log.New())
 	require.NoError(t, err)
 	defer domains.Close()
 

core/state/database_test.go

@@ -31,6 +31,7 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/erigontech/erigon-lib/chain"
+	"github.com/erigontech/erigon-lib/commitment"
 	"github.com/erigontech/erigon-lib/common"
 	libcommon "github.com/erigontech/erigon-lib/common"
 	"github.com/erigontech/erigon-lib/crypto"
@@ -924,7 +925,7 @@ func TestReproduceCrash(t *testing.T) {
 	value2 := uint256.NewInt(0x58c00a51)
 
 	_, tx, _ := state.NewTestTemporalDb(t)
-	sd, err := state3.NewSharedDomains(tx, log.New())
+	sd, err := state3.NewSharedDomains(tx, commitment.VariantHexPatriciaTrie, log.New())
 	require.NoError(t, err)
 	t.Cleanup(sd.Close)
 
@@ -1344,7 +1345,7 @@ func TestChangeAccountCodeBetweenBlocks(t *testing.T) {
 	contract := libcommon.HexToAddress("0x71dd1027069078091B3ca48093B00E4735B20624")
 
 	_, tx, _ := state.NewTestTemporalDb(t)
-	sd, err := state3.NewSharedDomains(tx, log.New())
+	sd, err := state3.NewSharedDomains(tx, commitment.VariantHexPatriciaTrie, log.New())
 	require.NoError(t, err)
 	t.Cleanup(sd.Close)
 
@@ -1394,7 +1395,7 @@ func TestCacheCodeSizeSeparately(t *testing.T) {
 	//root := libcommon.HexToHash("0xb939e5bcf5809adfb87ab07f0795b05b95a1d64a90f0eddd0c3123ac5b433854")
 
 	_, tx, _ := state.NewTestTemporalDb(t)
-	sd, err := state3.NewSharedDomains(tx, log.New())
+	sd, err := state3.NewSharedDomains(tx, commitment.VariantHexPatriciaTrie, log.New())
 	require.NoError(t, err)
 	t.Cleanup(sd.Close)
 
@@ -1432,7 +1433,7 @@ func TestCacheCodeSizeInTrie(t *testing.T) {
 	root := libcommon.HexToHash("0xb939e5bcf5809adfb87ab07f0795b05b95a1d64a90f0eddd0c3123ac5b433854")
 
 	_, tx, _ := state.NewTestTemporalDb(t)
-	sd, err := state3.NewSharedDomains(tx, log.New())
+	sd, err := state3.NewSharedDomains(tx, commitment.VariantHexPatriciaTrie, log.New())
 	require.NoError(t, err)
 	t.Cleanup(sd.Close)
 

core/state/intra_block_state_logger_test.go

@@ -24,6 +24,7 @@ import (
 	"github.com/stretchr/testify/require"
 	"go.uber.org/mock/gomock"
 
+	"github.com/erigontech/erigon-lib/commitment"
 	libcommon "github.com/erigontech/erigon-lib/common"
 	"github.com/erigontech/erigon-lib/kv/rawdbv3"
 	"github.com/erigontech/erigon-lib/log/v3"
@@ -116,7 +117,7 @@ func TestStateLogger(t *testing.T) {
 		t.Run(tt.name, func(t *testing.T) {
 			_, tx, _ := NewTestTemporalDb(t)
 
-			domains, err := stateLib.NewSharedDomains(tx, log.New())
+			domains, err := stateLib.NewSharedDomains(tx, commitment.VariantHexPatriciaTrie, log.New())
 			require.NoError(t, err)
 			defer domains.Close()
 

core/state/intra_block_state_test.go

@@ -36,6 +36,7 @@ import (
 
 	"github.com/holiman/uint256"
 
+	"github.com/erigontech/erigon-lib/commitment"
 	libcommon "github.com/erigontech/erigon-lib/common"
 	"github.com/erigontech/erigon-lib/common/datadir"
 	"github.com/erigontech/erigon-lib/kv/memdb"
@@ -261,7 +262,7 @@ func (test *snapshotTest) run() bool {
 	}
 	defer tx.Rollback()
 
-	domains, err := stateLib.NewSharedDomains(tx, log.New())
+	domains, err := stateLib.NewSharedDomains(tx, commitment.VariantHexPatriciaTrie, log.New())
 	if err != nil {
 		test.err = err
 		return false

core/state/state_test.go

@@ -29,6 +29,7 @@ import (
 	checker "gopkg.in/check.v1"
 
 	"github.com/erigontech/erigon-lib/chain"
+	"github.com/erigontech/erigon-lib/commitment"
 	"github.com/erigontech/erigon-lib/common"
 	"github.com/erigontech/erigon-lib/common/datadir"
 	"github.com/erigontech/erigon-lib/crypto"
@@ -139,7 +140,7 @@ func (s *StateSuite) SetUpTest(c *checker.C) {
 	}
 	defer tx.Rollback()
 
-	domains, err := stateLib.NewSharedDomains(tx, log.New())
+	domains, err := stateLib.NewSharedDomains(tx, commitment.VariantHexPatriciaTrie, log.New())
 	if err != nil {
 		panic(err)
 	}
@@ -252,7 +253,7 @@ func TestSnapshot2(t *testing.T) {
 	t.Parallel()
 	_, tx, _ := NewTestTemporalDb(t)
 
-	domains, err := stateLib.NewSharedDomains(tx, log.New())
+	domains, err := stateLib.NewSharedDomains(tx, commitment.VariantHexPatriciaTrie, log.New())
 	require.NoError(t, err)
 	defer domains.Close()
 
@@ -416,7 +417,7 @@ func TestDump(t *testing.T) {
 	t.Parallel()
 	_, tx, _ := NewTestTemporalDb(t)
 
-	domains, err := state.NewSharedDomains(tx, log.New())
+	domains, err := state.NewSharedDomains(tx, commitment.VariantHexPatriciaTrie, log.New())
 	require.NoError(t, err)
 	defer domains.Close()
 

core/test/domains_restart_test.go

@@ -33,6 +33,7 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/erigontech/erigon-lib/chain/networkname"
+	"github.com/erigontech/erigon-lib/commitment"
 	libcommon "github.com/erigontech/erigon-lib/common"
 	"github.com/erigontech/erigon-lib/common/datadir"
 	"github.com/erigontech/erigon-lib/common/length"
@@ -103,7 +104,7 @@ func Test_AggregatorV3_RestartOnDatadir_WithoutDB(t *testing.T) {
 	domCtx := agg.BeginFilesRo()
 	defer domCtx.Close()
 
-	domains, err := state.NewSharedDomains(tx, log.New())
+	domains, err := state.NewSharedDomains(tx, commitment.VariantHexPatriciaTrie, log.New())
 	require.NoError(t, err)
 	defer domains.Close()
 	domains.SetTxNum(0)
@@ -215,7 +216,7 @@ func Test_AggregatorV3_RestartOnDatadir_WithoutDB(t *testing.T) {
 	require.NoError(t, err)
 	domCtx = agg.BeginFilesRo()
 	defer domCtx.Close()
-	domains, err = state.NewSharedDomains(tx, log.New())
+	domains, err = state.NewSharedDomains(tx, commitment.VariantHexPatriciaTrie, log.New())
 	require.NoError(t, err)
 	defer domains.Close()
 
@@ -249,7 +250,7 @@ func Test_AggregatorV3_RestartOnDatadir_WithoutDB(t *testing.T) {
 	defer tx.Rollback()
 	domCtx = agg.BeginFilesRo()
 	defer domCtx.Close()
-	domains, err = state.NewSharedDomains(tx, log.New())
+	domains, err = state.NewSharedDomains(tx, commitment.VariantHexPatriciaTrie, log.New())
 	require.NoError(t, err)
 	defer domains.Close()
 	writer = state2.NewWriterV4(domains)
@@ -309,7 +310,7 @@ func Test_AggregatorV3_RestartOnDatadir_WithoutAnything(t *testing.T) {
 	domCtx := agg.BeginFilesRo()
 	defer domCtx.Close()
 
-	domains, err := state.NewSharedDomains(tx, log.New())
+	domains, err := state.NewSharedDomains(tx, commitment.VariantHexPatriciaTrie, log.New())
 	require.NoError(t, err)
 	defer domains.Close()
 	domains.SetTxNum(0)
@@ -399,7 +400,7 @@ func Test_AggregatorV3_RestartOnDatadir_WithoutAnything(t *testing.T) {
 
 	domCtx = agg.BeginFilesRo()
 	defer domCtx.Close()
-	domains, err = state.NewSharedDomains(tx, log.New())
+	domains, err = state.NewSharedDomains(tx, commitment.VariantHexPatriciaTrie, log.New())
 	require.NoError(t, err)
 	defer domains.Close()
 
@@ -419,7 +420,7 @@ func Test_AggregatorV3_RestartOnDatadir_WithoutAnything(t *testing.T) {
 	defer tx.Rollback()
 	domCtx = agg.BeginFilesRo()
 	defer domCtx.Close()
-	domains, err = state.NewSharedDomains(tx, log.New())
+	domains, err = state.NewSharedDomains(tx, commitment.VariantHexPatriciaTrie, log.New())
 	require.NoError(t, err)
 	defer domains.Close()
 
@@ -486,7 +487,7 @@ func TestCommit(t *testing.T) {
 
 	domCtx := agg.BeginFilesRo()
 	defer domCtx.Close()
-	domains, err := state.NewSharedDomains(tx, log.New())
+	domains, err := state.NewSharedDomains(tx, commitment.VariantHexPatriciaTrie, log.New())
 	require.NoError(t, err)
 	defer domains.Close()
 

core/vm/gas_table_test.go

@@ -31,6 +31,7 @@ import (
 	"github.com/holiman/uint256"
 	"github.com/stretchr/testify/require"
 
+	"github.com/erigontech/erigon-lib/commitment"
 	libcommon "github.com/erigontech/erigon-lib/common"
 	"github.com/erigontech/erigon-lib/common/datadir"
 	"github.com/erigontech/erigon-lib/common/hexutil"
@@ -118,7 +119,7 @@ func testTemporalTxSD(t *testing.T, db *temporal.DB) (kv.RwTx, *state3.SharedDom
 	require.NoError(t, err)
 	t.Cleanup(tx.Rollback)
 
-	sd, err := state3.NewSharedDomains(tx, log.New())
+	sd, err := state3.NewSharedDomains(tx, commitment.VariantHexPatriciaTrie, log.New())
 	require.NoError(t, err)
 	t.Cleanup(sd.Close)
 
@@ -200,7 +201,7 @@ func TestCreateGas(t *testing.T) {
 		eface := *(*[2]uintptr)(unsafe.Pointer(&tx))
 		fmt.Printf("init tx %x\n", eface[1])
 
-		domains, err := state3.NewSharedDomains(txc.Tx, log.New())
+		domains, err := state3.NewSharedDomains(txc.Tx, commitment.VariantHexPatriciaTrie, log.New())
 		require.NoError(t, err)
 		defer domains.Close()
 		txc.Doms = domains