maindb v4

api/accounts/accounts.go

@@ -48,7 +48,7 @@ func New(
 
 func (a *Accounts) getCode(addr thor.Address, summary *chain.BlockSummary) ([]byte, error) {
 	code, err := a.stater.
-		NewState(summary.Header.StateRoot(), summary.Header.Number(), summary.Conflicts, summary.SteadyNum).
+		NewState(summary.Root()).
 		GetCode(addr)
 	if err != nil {
 		return nil, err
@@ -74,7 +74,7 @@ func (a *Accounts) handleGetCode(w http.ResponseWriter, req *http.Request) error
 }
 
 func (a *Accounts) getAccount(addr thor.Address, summary *chain.BlockSummary) (*Account, error) {
-	state := a.stater.NewState(summary.Header.StateRoot(), summary.Header.Number(), summary.Conflicts, summary.SteadyNum)
+	state := a.stater.NewState(summary.Root())
 	b, err := state.GetBalance(addr)
 	if err != nil {
 		return nil, err
@@ -97,7 +97,7 @@ func (a *Accounts) getAccount(addr thor.Address, summary *chain.BlockSummary) (*
 
 func (a *Accounts) getStorage(addr thor.Address, key thor.Bytes32, summary *chain.BlockSummary) (thor.Bytes32, error) {
 	storage, err := a.stater.
-		NewState(summary.Header.StateRoot(), summary.Header.Number(), summary.Conflicts, summary.SteadyNum).
+		NewState(summary.Root()).
 		GetStorage(addr, key)
 
 	if err != nil {
@@ -200,7 +200,7 @@ func (a *Accounts) batchCall(ctx context.Context, batchCallData *BatchCallData,
 		return nil, err
 	}
 	header := summary.Header
-	state := a.stater.NewState(header.StateRoot(), header.Number(), summary.Conflicts, summary.SteadyNum)
+	state := a.stater.NewState(summary.Root())
 
 	signer, _ := header.Signer()
 	rt := runtime.New(a.repo.NewChain(header.ParentID()), state,

api/accounts/accounts_test.go

@@ -238,7 +238,7 @@ func packTx(repo *chain.Repository, stater *state.Stater, transaction *tx.Transa
 	if _, err := stage.Commit(); err != nil {
 		t.Fatal(err)
 	}
-	if err := repo.AddBlock(b, receipts, 0); err != nil {
+	if err := repo.AddBlock(b, receipts, 0, false); err != nil {
 		t.Fatal(err)
 	}
 	if err := repo.SetBestBlockID(b.Header().ID()); err != nil {

api/blocks/blocks_test.go

@@ -111,7 +111,7 @@ func initBlockServer(t *testing.T) {
 	if _, err := stage.Commit(); err != nil {
 		t.Fatal(err)
 	}
-	if err := repo.AddBlock(block, receipts, 0); err != nil {
+	if err := repo.AddBlock(block, receipts, 0, false); err != nil {
 		t.Fatal(err)
 	}
 	if err := repo.SetBestBlockID(block.Header().ID()); err != nil {

api/debug/debug.go

@@ -217,7 +217,7 @@ func (d *Debug) handleTraceCall(w http.ResponseWriter, req *http.Request) error
 
 func (d *Debug) traceCall(ctx context.Context, tracer tracers.Tracer, summary *chain.BlockSummary, txCtx *xenv.TransactionContext, gas uint64, clause *tx.Clause) (interface{}, error) {
 	header := summary.Header
-	state := d.stater.NewState(header.StateRoot(), header.Number(), summary.Conflicts, summary.SteadyNum)
+	state := d.stater.NewState(summary.Root())
 	signer, _ := header.Signer()
 	rt := runtime.New(
 		d.repo.NewChain(header.ID()),

api/transactions/transactions.go

@@ -51,7 +51,7 @@ func (t *Transactions) getRawTransaction(txID thor.Bytes32, head thor.Bytes32, a
 		return nil, err
 	}
 
-	summary, err := t.repo.GetBlockSummary(meta.BlockID)
+	header, err := chain.GetBlockHeader(meta.BlockNum)
 	if err != nil {
 		return nil, err
 	}
@@ -62,9 +62,9 @@ func (t *Transactions) getRawTransaction(txID thor.Bytes32, head thor.Bytes32, a
 	return &rawTransaction{
 		RawTx: RawTx{hexutil.Encode(raw)},
 		Meta: &TxMeta{
-			BlockID:        summary.Header.ID(),
-			BlockNumber:    summary.Header.Number(),
-			BlockTimestamp: summary.Header.Timestamp(),
+			BlockID:        header.ID(),
+			BlockNumber:    header.Number(),
+			BlockTimestamp: header.Timestamp(),
 		},
 	}, nil
 }
@@ -84,11 +84,11 @@ func (t *Transactions) getTransactionByID(txID thor.Bytes32, head thor.Bytes32,
 		return nil, err
 	}
 
-	summary, err := t.repo.GetBlockSummary(meta.BlockID)
+	header, err := chain.GetBlockHeader(meta.BlockNum)
 	if err != nil {
 		return nil, err
 	}
-	return convertTransaction(tx, summary.Header), nil
+	return convertTransaction(tx, header), nil
 }
 
 // GetTransactionReceiptByID get tx's receipt
@@ -107,12 +107,12 @@ func (t *Transactions) getTransactionReceiptByID(txID thor.Bytes32, head thor.By
 		return nil, err
 	}
 
-	summary, err := t.repo.GetBlockSummary(meta.BlockID)
+	header, err := chain.GetBlockHeader(meta.BlockNum)
 	if err != nil {
 		return nil, err
 	}
 
-	return convertReceipt(receipt, summary.Header, tx)
+	return convertReceipt(receipt, header, tx)
 }
 func (t *Transactions) handleSendTransaction(w http.ResponseWriter, req *http.Request) error {
 	var rawTx *RawTx

api/transactions/transactions_test.go

@@ -163,7 +163,7 @@ func initTransactionServer(t *testing.T) {
 	if _, err := stage.Commit(); err != nil {
 		t.Fatal(err)
 	}
-	if err := repo.AddBlock(b, receipts, 0); err != nil {
+	if err := repo.AddBlock(b, receipts, 0, false); err != nil {
 		t.Fatal(err)
 	}
 	if err := repo.SetBestBlockID(b.Header().ID()); err != nil {

bft/engine.go

@@ -321,7 +321,7 @@ func (engine *BFTEngine) findCheckpointByQuality(target uint32, finalized, paren
 }
 
 func (engine *BFTEngine) getMaxBlockProposers(sum *chain.BlockSummary) (uint64, error) {
-	state := engine.stater.NewState(sum.Header.StateRoot(), sum.Header.Number(), sum.Conflicts, sum.SteadyNum)
+	state := engine.stater.NewState(sum.Root())
 	params, err := builtin.Params.Native(state).Get(thor.KeyMaxBlockProposers)
 	if err != nil {
 		return 0, err

bft/engine_test.go

@@ -149,7 +149,7 @@ func (test *TestBFT) newBlock(parentSummary *chain.BlockSummary, master genesis.
 		return nil, err
 	}
 
-	if err = test.repo.AddBlock(b, nil, conflicts); err != nil {
+	if err = test.repo.AddBlock(b, nil, conflicts, false); err != nil {
 		return nil, err
 	}
 

builtin/authority/authority_test.go

@@ -13,6 +13,7 @@ import (
 	"github.com/vechain/thor/v2/muxdb"
 	"github.com/vechain/thor/v2/state"
 	"github.com/vechain/thor/v2/thor"
+	"github.com/vechain/thor/v2/trie"
 )
 
 func M(a ...interface{}) []interface{} {
@@ -21,7 +22,7 @@ func M(a ...interface{}) []interface{} {
 
 func TestAuthority(t *testing.T) {
 	db := muxdb.NewMem()
-	st := state.New(db, thor.Bytes32{}, 0, 0, 0)
+	st := state.New(db, trie.Root{})
 
 	p1 := thor.BytesToAddress([]byte("p1"))
 	p2 := thor.BytesToAddress([]byte("p2"))

builtin/energy/energy_test.go

@@ -13,6 +13,7 @@ import (
 	"github.com/vechain/thor/v2/muxdb"
 	"github.com/vechain/thor/v2/state"
 	"github.com/vechain/thor/v2/thor"
+	"github.com/vechain/thor/v2/trie"
 )
 
 func M(a ...interface{}) []interface{} {
@@ -21,7 +22,7 @@ func M(a ...interface{}) []interface{} {
 
 func TestEnergy(t *testing.T) {
 	db := muxdb.NewMem()
-	st := state.New(db, thor.Bytes32{}, 0, 0, 0)
+	st := state.New(db, trie.Root{})
 
 	acc := thor.BytesToAddress([]byte("a1"))
 
@@ -46,7 +47,7 @@ func TestEnergy(t *testing.T) {
 
 func TestInitialSupply(t *testing.T) {
 	db := muxdb.NewMem()
-	st := state.New(db, thor.Bytes32{}, 0, 0, 0)
+	st := state.New(db, trie.Root{})
 
 	eng := New(thor.BytesToAddress([]byte("eng")), st, 0)
 
@@ -64,7 +65,7 @@ func TestInitialSupply(t *testing.T) {
 
 func TestInitialSupplyError(t *testing.T) {
 	db := muxdb.NewMem()
-	st := state.New(db, thor.Bytes32{}, 0, 0, 0)
+	st := state.New(db, trie.Root{})
 
 	eng := New(thor.BytesToAddress([]byte("a1")), st, 0)
 
@@ -78,7 +79,7 @@ func TestInitialSupplyError(t *testing.T) {
 
 func TestTotalSupply(t *testing.T) {
 	db := muxdb.NewMem()
-	st := state.New(db, thor.Bytes32{}, 0, 0, 0)
+	st := state.New(db, trie.Root{})
 
 	eng := New(thor.BytesToAddress([]byte("eng")), st, 0)
 
@@ -92,7 +93,7 @@ func TestTotalSupply(t *testing.T) {
 
 func TestTokenTotalSupply(t *testing.T) {
 	db := muxdb.NewMem()
-	st := state.New(db, thor.Bytes32{}, 0, 0, 0)
+	st := state.New(db, trie.Root{})
 
 	eng := New(thor.BytesToAddress([]byte("eng")), st, 0)
 
@@ -106,7 +107,7 @@ func TestTokenTotalSupply(t *testing.T) {
 
 func TestTotalBurned(t *testing.T) {
 	db := muxdb.NewMem()
-	st := state.New(db, thor.Bytes32{}, 0, 0, 0)
+	st := state.New(db, trie.Root{})
 
 	eng := New(thor.BytesToAddress([]byte("eng")), st, 0)
 
@@ -120,7 +121,7 @@ func TestTotalBurned(t *testing.T) {
 
 func TestEnergyGrowth(t *testing.T) {
 	db := muxdb.NewMem()
-	st := state.New(db, thor.Bytes32{}, 0, 0, 0)
+	st := state.New(db, trie.Root{})
 
 	acc := thor.BytesToAddress([]byte("a1"))
 

builtin/executor_test.go

@@ -19,6 +19,7 @@ import (
 	"github.com/vechain/thor/v2/runtime"
 	"github.com/vechain/thor/v2/state"
 	"github.com/vechain/thor/v2/thor"
+	"github.com/vechain/thor/v2/trie"
 	"github.com/vechain/thor/v2/tx"
 	"github.com/vechain/thor/v2/xenv"
 )
@@ -73,7 +74,7 @@ func initExectorTest() *ctest {
 	})
 
 	repo, _ := chain.NewRepository(db, b0)
-	st := state.New(db, b0.Header().StateRoot(), 0, 0, 0)
+	st := state.New(db, trie.Root{Hash: b0.Header().StateRoot()})
 	chain := repo.NewChain(b0.Header().ID())
 
 	rt := runtime.New(chain, st, &xenv.BlockContext{Time: uint64(time.Now().Unix())}, thor.NoFork)

builtin/native_calls_test.go

@@ -26,6 +26,7 @@ import (
 	"github.com/vechain/thor/v2/runtime"
 	"github.com/vechain/thor/v2/state"
 	"github.com/vechain/thor/v2/thor"
+	"github.com/vechain/thor/v2/trie"
 	"github.com/vechain/thor/v2/tx"
 	"github.com/vechain/thor/v2/vm"
 	"github.com/vechain/thor/v2/xenv"
@@ -121,7 +122,7 @@ func (c *ccase) Assert(t *testing.T) *ccase {
 	assert.True(t, ok, "should have method")
 
 	constant := method.Const()
-	stage, err := c.rt.State().Stage(0, 0)
+	stage, err := c.rt.State().Stage(trie.Version{})
 	assert.Nil(t, err, "should stage state")
 	stateRoot := stage.Hash()
 
@@ -140,7 +141,7 @@ func (c *ccase) Assert(t *testing.T) *ccase {
 	vmout, _, err := exec()
 	assert.Nil(t, err)
 	if constant || vmout.VMErr != nil {
-		stage, err := c.rt.State().Stage(0, 0)
+		stage, err := c.rt.State().Stage(trie.Version{})
 		assert.Nil(t, err, "should stage state")
 		newStateRoot := stage.Hash()
 		assert.Equal(t, stateRoot, newStateRoot)
@@ -195,7 +196,7 @@ func TestParamsNative(t *testing.T) {
 		return nil
 	})
 	repo, _ := chain.NewRepository(db, b0)
-	st := state.New(db, b0.Header().StateRoot(), 0, 0, 0)
+	st := state.New(db, trie.Root{Hash: b0.Header().StateRoot()})
 	chain := repo.NewChain(b0.Header().ID())
 
 	rt := runtime.New(chain, st, &xenv.BlockContext{}, thor.NoFork)
@@ -263,7 +264,7 @@ func TestAuthorityNative(t *testing.T) {
 		return nil
 	})
 	repo, _ := chain.NewRepository(db, b0)
-	st := state.New(db, b0.Header().StateRoot(), 0, 0, 0)
+	st := state.New(db, trie.Root{Hash: b0.Header().StateRoot()})
 	chain := repo.NewChain(b0.Header().ID())
 
 	rt := runtime.New(chain, st, &xenv.BlockContext{}, thor.NoFork)
@@ -369,7 +370,7 @@ func TestEnergyNative(t *testing.T) {
 	})
 
 	repo, _ := chain.NewRepository(db, b0)
-	st := state.New(db, b0.Header().StateRoot(), 0, 0, 0)
+	st := state.New(db, trie.Root{Hash: b0.Header().StateRoot()})
 	chain := repo.NewChain(b0.Header().ID())
 
 	st.SetEnergy(addr, eng, b0.Header().Timestamp())
@@ -495,7 +496,7 @@ func TestPrototypeNative(t *testing.T) {
 	gene := genesis.NewDevnet()
 	genesisBlock, _, _, _ := gene.Build(state.NewStater(db))
 	repo, _ := chain.NewRepository(db, genesisBlock)
-	st := state.New(db, genesisBlock.Header().StateRoot(), 0, 0, 0)
+	st := state.New(db, trie.Root{Hash: genesisBlock.Header().StateRoot()})
 	chain := repo.NewChain(genesisBlock.Header().ID())
 
 	st.SetStorage(thor.Address(acc1), key, value)
@@ -768,14 +769,14 @@ func TestPrototypeNativeWithLongerBlockNumber(t *testing.T) {
 	db := muxdb.NewMem()
 	gene := genesis.NewDevnet()
 	genesisBlock, _, _, _ := gene.Build(state.NewStater(db))
-	st := state.New(db, genesisBlock.Header().StateRoot(), 0, 0, 0)
+	st := state.New(db, trie.Root{Hash: genesisBlock.Header().StateRoot()})
 	repo, _ := chain.NewRepository(db, genesisBlock)
 	launchTime := genesisBlock.Header().Timestamp()
 
 	for i := 1; i < 100; i++ {
 		st.SetBalance(acc1, big.NewInt(int64(i)))
 		st.SetEnergy(acc1, big.NewInt(int64(i)), launchTime+uint64(i)*10)
-		stage, _ := st.Stage(uint32(i), 0)
+		stage, _ := st.Stage(trie.Version{Major: uint32(i)})
 		stateRoot, _ := stage.Commit()
 		b := new(block.Builder).
 			ParentID(repo.BestBlockSummary().Header.ID()).
@@ -784,11 +785,11 @@ func TestPrototypeNativeWithLongerBlockNumber(t *testing.T) {
 			StateRoot(stateRoot).
 			Build().
 			WithSignature(sig[:])
-		repo.AddBlock(b, tx.Receipts{}, 0)
+		repo.AddBlock(b, tx.Receipts{}, 0, false)
 		repo.SetBestBlockID(b.Header().ID())
 	}
 
-	st = state.New(db, repo.BestBlockSummary().Header.StateRoot(), repo.BestBlockSummary().Header.Number(), 0, 0)
+	st = state.New(db, repo.BestBlockSummary().Root())
 	chain := repo.NewBestChain()
 
 	rt := runtime.New(chain, st, &xenv.BlockContext{
@@ -838,14 +839,14 @@ func TestPrototypeNativeWithBlockNumber(t *testing.T) {
 	db := muxdb.NewMem()
 	gene := genesis.NewDevnet()
 	genesisBlock, _, _, _ := gene.Build(state.NewStater(db))
-	st := state.New(db, genesisBlock.Header().StateRoot(), 0, 0, 0)
+	st := state.New(db, trie.Root{Hash: genesisBlock.Header().StateRoot()})
 	repo, _ := chain.NewRepository(db, genesisBlock)
 	launchTime := genesisBlock.Header().Timestamp()
 
 	for i := 1; i < 100; i++ {
 		st.SetBalance(acc1, big.NewInt(int64(i)))
 		st.SetEnergy(acc1, big.NewInt(int64(i)), launchTime+uint64(i)*10)
-		stage, _ := st.Stage(uint32(i), 0)
+		stage, _ := st.Stage(trie.Version{Major: uint32(i)})
 		stateRoot, _ := stage.Commit()
 		b := new(block.Builder).
 			ParentID(repo.BestBlockSummary().Header.ID()).
@@ -854,11 +855,11 @@ func TestPrototypeNativeWithBlockNumber(t *testing.T) {
 			StateRoot(stateRoot).
 			Build().
 			WithSignature(sig[:])
-		repo.AddBlock(b, tx.Receipts{}, 0)
+		repo.AddBlock(b, tx.Receipts{}, 0, false)
 		repo.SetBestBlockID(b.Header().ID())
 	}
 
-	st = state.New(db, repo.BestBlockSummary().Header.StateRoot(), repo.BestBlockSummary().Header.Number(), 0, repo.BestBlockSummary().SteadyNum)
+	st = state.New(db, repo.BestBlockSummary().Root())
 	chain := repo.NewBestChain()
 
 	rt := runtime.New(chain, st, &xenv.BlockContext{
@@ -898,7 +899,7 @@ func newBlock(parent *block.Block, score uint64, timestamp uint64, privateKey *e
 
 func TestExtensionNative(t *testing.T) {
 	db := muxdb.NewMem()
-	st := state.New(db, thor.Bytes32{}, 0, 0, 0)
+	st := state.New(db, trie.Root{})
 	gene := genesis.NewDevnet()
 	genesisBlock, _, _, _ := gene.Build(state.NewStater(db))
 	repo, _ := chain.NewRepository(db, genesisBlock)
@@ -920,9 +921,9 @@ func TestExtensionNative(t *testing.T) {
 
 	gasPayer := thor.BytesToAddress([]byte("gasPayer"))
 
-	err := repo.AddBlock(b1, nil, 0)
+	err := repo.AddBlock(b1, nil, 0, false)
 	assert.Equal(t, err, nil)
-	err = repo.AddBlock(b2, nil, 0)
+	err = repo.AddBlock(b2, nil, 0, false)
 	assert.Equal(t, err, nil)
 
 	assert.Equal(t, builtin.Extension.Address, builtin.Extension.Address)