maindb v4

api/accounts/accounts_test.go

@@ -314,7 +314,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

@@ -200,7 +200,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_test.go

@@ -33,6 +33,7 @@ import (
 	"github.com/vechain/thor/v2/test/datagen"
 	"github.com/vechain/thor/v2/thor"
 	"github.com/vechain/thor/v2/tracers/logger"
+	"github.com/vechain/thor/v2/trie"
 	"github.com/vechain/thor/v2/tx"
 
 	// Force-load the tracer native engines to trigger registration
@@ -95,7 +96,7 @@ func TestDebug(t *testing.T) {
 
 func TestStorageRangeFunc(t *testing.T) {
 	db := muxdb.NewMem()
-	state := state.New(db, thor.Bytes32{}, 0, 0, 0)
+	state := state.New(db, trie.Root{})
 
 	// Create an account and set storage values
 	addr := thor.BytesToAddress([]byte("account1"))
@@ -125,7 +126,7 @@ func TestStorageRangeFunc(t *testing.T) {
 
 func TestStorageRangeMaxResult(t *testing.T) {
 	db := muxdb.NewMem()
-	state := state.New(db, thor.Bytes32{}, 0, 0, 0)
+	state := state.New(db, trie.Root{})
 
 	addr := thor.BytesToAddress([]byte("account1"))
 	for i := 0; i < 1001; i++ {
@@ -569,7 +570,7 @@ func initDebugServer(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 {

api/metrics_test.go

@@ -48,7 +48,7 @@ func TestMetricsMiddleware(t *testing.T) {
 	repo, _ := chain.NewRepository(db, b)
 
 	// inject some invalid data to db
-	data := db.NewStore("chain.data")
+	data := db.NewStore("chain.hdr")
 	var blkID thor.Bytes32
 	rand.Read(blkID[:])
 	data.Put(blkID[:], []byte("invalid data"))

api/subscriptions/block_reader_test.go

@@ -105,7 +105,7 @@ func initChain(t *testing.T) (*chain.Repository, []*block.Block, *txpool.TxPool)
 		t.Fatal(err)
 	}
 	insertMockOutputEvent(receipts)
-	if err := repo.AddBlock(blk, receipts, 0); err != nil {
+	if err := repo.AddBlock(blk, receipts, 0, false); err != nil {
 		t.Fatal(err)
 	}
 	if err := repo.SetBestBlockID(blk.Header().ID()); err != nil {

api/subscriptions/pending_tx_test.go

@@ -120,7 +120,7 @@ func addNewBlock(repo *chain.Repository, stater *state.Stater, b0 *block.Block,
 	if _, err := stage.Commit(); err != nil {
 		t.Fatal(err)
 	}
-	if err := repo.AddBlock(blk, receipts, 0); err != nil {
+	if err := repo.AddBlock(blk, receipts, 0, false); err != nil {
 		t.Fatal(err)
 	}
 	if err := repo.SetBestBlockID(blk.Header().ID()); err != nil {

api/subscriptions/subscriptions_test.go

@@ -293,7 +293,7 @@ func initChainMultipleBlocks(t *testing.T, blockCount int) (*chain.Repository, [
 		if _, err := stage.Commit(); err != nil {
 			t.Fatal(err)
 		}
-		if err := repo.AddBlock(blk, receipts, 0); err != nil {
+		if err := repo.AddBlock(blk, receipts, 0, false); err != nil {
 			t.Fatal(err)
 		}
 		if err := repo.SetBestBlockID(blk.Header().ID()); err != nil {

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

@@ -321,7 +321,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 {

api/utils/revisions.go

@@ -136,22 +136,21 @@ func GetSummaryAndState(rev *Revision, repo *chain.Repository, bft bft.Committer
 		mocked := builder.Build()
 
 		// state is also reused from the parent block
-		st := stater.NewState(best.Header.StateRoot(), best.Header.Number(), best.Conflicts, best.SteadyNum)
+		st := stater.NewState(best.Root())
 
 		// rebuild the block summary with the next header (mocked) AND the best block status
 		return &chain.BlockSummary{
 			Header:    mocked.Header(),
 			Txs:       best.Txs,
 			Size:      uint64(mocked.Size()),
 			Conflicts: best.Conflicts,
-			SteadyNum: best.SteadyNum,
 		}, st, nil
 	}
 	sum, err := GetSummary(rev, repo, bft)
 	if err != nil {
 		return nil, nil, err
 	}
 
-	st := stater.NewState(sum.Header.StateRoot(), sum.Header.Number(), sum.Conflicts, sum.SteadyNum)
+	st := stater.NewState(sum.Root())
 	return sum, st, nil
 }

bft/engine.go

@@ -392,7 +392,7 @@ func (engine *Engine) findCheckpointByQuality(target uint32, finalized, headID t
 }
 
 func (engine *Engine) 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

@@ -134,7 +134,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)