Dynamic state snapshots

.github/workflows/actions.yml

@@ -76,7 +76,7 @@ jobs:
           cache-dependency-path: go.sum
 
       - name: Run Go Test
-        run: go test -coverprofile coverage.out -timeout 20m `go list ./... | grep -v e2e`
+        run: go test -coverprofile coverage.out -timeout 25m `go list ./... | grep -v e2e`
 
       - name: Upload coverage file to Codecov
         uses: codecov/codecov-action@v3

.golangci.yml

@@ -51,9 +51,15 @@ issues:
   exclude-rules:
     - path: _test\.go
       linters:
+        - dupl
+        - errorlint
+        - forcetypeassert
         - gosec
-        - unparam
         - lll
+        - nlreturn
+        - prealloc
+        - unparam
+        - wsl
     - linters:
         - staticcheck
       path: "state/runtime/precompiled/base.go"

blockchain/blockchain.go

@@ -15,6 +15,7 @@ import (
 	"github.com/dogechain-lab/dogechain/contracts/upgrader"
 	"github.com/dogechain-lab/dogechain/contracts/validatorset"
 	"github.com/dogechain-lab/dogechain/helper/common"
+	"github.com/dogechain-lab/dogechain/helper/rawdb"
 	"github.com/dogechain-lab/dogechain/state"
 	"github.com/dogechain-lab/dogechain/types"
 	"github.com/dogechain-lab/dogechain/types/buildroot"
@@ -118,7 +119,7 @@ func (b *Blockchain) updateGasPriceAvg(newValues []*big.Int) {
 	defer b.gpAverage.Unlock()
 
 	//	Sum the values for quick reference
-	sum := big.NewInt(0)
+	sum := new(big.Int)
 	for _, val := range newValues {
 		sum = sum.Add(sum, val)
 	}
@@ -194,19 +195,16 @@ func (b *Blockchain) GetAvgGasPrice() *big.Int {
 func NewBlockchain(
 	logger hclog.Logger,
 	config *chain.Chain,
-	storageBuilder storage.StorageBuilder,
 	consensus Verifier,
+	db storage.Storage,
 	executor Executor,
 	metrics *Metrics,
 ) (*Blockchain, error) {
-	if storageBuilder == nil {
-		return nil, ErrNilStorageBuilder
-	}
-
 	b := &Blockchain{
 		logger:    logger.Named("blockchain"),
 		config:    config,
 		consensus: consensus,
+		db:        db,
 		executor:  executor,
 		stream:    newEventStream(context.Background()),
 		gpAverage: &gasPriceAverage{
@@ -216,17 +214,6 @@ func NewBlockchain(
 		metrics: NewDummyMetrics(metrics),
 	}
 
-	var (
-		db  storage.Storage
-		err error
-	)
-
-	if db, err = storageBuilder.Build(); err != nil {
-		return nil, err
-	}
-
-	b.db = db
-
 	if err := b.initCaches(defaultCacheSize); err != nil {
 		return nil, err
 	}
@@ -483,7 +470,7 @@ func (b *Blockchain) writeCanonicalHeader(event *Event, h *types.Header) error {
 		return fmt.Errorf("parent difficulty not found")
 	}
 
-	newTD := big.NewInt(0).Add(parentTD, new(big.Int).SetUint64(h.Difficulty))
+	newTD := new(big.Int).Add(parentTD, new(big.Int).SetUint64(h.Difficulty))
 	if err := b.db.WriteCanonicalHeader(h, newTD); err != nil {
 		return err
 	}
@@ -515,7 +502,7 @@ func (b *Blockchain) advanceHead(newHeader *types.Header) (*big.Int, error) {
 	}
 
 	// Check if there was a parent difficulty
-	parentTD := big.NewInt(0)
+	parentTD := new(big.Int)
 
 	if newHeader.ParentHash != types.StringToHash("") {
 		td, ok := b.readTotalDifficulty(newHeader.ParentHash)
@@ -527,7 +514,7 @@ func (b *Blockchain) advanceHead(newHeader *types.Header) (*big.Int, error) {
 	}
 
 	// Calculate the new total difficulty
-	newTD := big.NewInt(0).Add(parentTD, big.NewInt(0).SetUint64(newHeader.Difficulty))
+	newTD := new(big.Int).Add(parentTD, new(big.Int).SetUint64(newHeader.Difficulty))
 	if err := b.db.WriteTotalDifficulty(newHeader.Hash, newTD); err != nil {
 		return nil, err
 	}
@@ -717,11 +704,15 @@ func (b *Blockchain) VerifyFinalizedBlock(block *types.Block) error {
 		return ErrNoBlockHeader
 	}
 
+	b.logger.Debug("verify finalized block header", "number", block.Number())
+
 	// Make sure the consensus layer verifies this block header
 	if err := b.consensus.VerifyHeader(block.Header); err != nil {
 		return fmt.Errorf("failed to verify the header: %w", err)
 	}
 
+	b.logger.Debug("verify finalized block body", "number", block.Number())
+
 	// Do the initial block verification
 	if err := b.verifyBlock(block); err != nil {
 		return err
@@ -1072,6 +1063,7 @@ func (b *Blockchain) extractBlockReceipts(block *types.Block) ([]*types.Receipt,
 	// Check the cache for the block receipts
 	receipts, ok := b.receiptsCache.Get(block.Header.Hash)
 	if !ok {
+		b.logger.Info("execute block transactions due to no receipts cache")
 		// No receipts found in the cache, execute the transactions from the block
 		// and fetch them
 		blockResult, err := b.executeBlockTransactions(block)
@@ -1136,7 +1128,7 @@ func (b *Blockchain) writeBody(block *types.Block) error {
 // ReadTxLookup returns the block hash using the transaction hash
 func (b *Blockchain) ReadTxLookup(hash types.Hash) (types.Hash, bool) {
 	if b.isStopped() {
-		return types.ZeroHash, false
+		return types.Hash{}, false
 	}
 
 	v, ok := b.db.ReadTxLookup(hash)
@@ -1185,43 +1177,15 @@ func (b *Blockchain) verifyGasLimit(header, parentHeader *types.Header) error {
 	return nil
 }
 
-// GetHashHelper is used by the EVM, so that the SC can get the hash of the header number
-func (b *Blockchain) GetHashHelper(header *types.Header) func(i uint64) (res types.Hash) {
-	return func(i uint64) (res types.Hash) {
-		num, hash := header.Number-1, header.ParentHash
-
-		for {
-			if num == i {
-				res = hash
-
-				return
-			}
-
-			h, ok := b.GetHeaderByHash(hash)
-			if !ok {
-				return
-			}
-
-			hash = h.ParentHash
-
-			if num == 0 {
-				return
-			}
-
-			num--
-		}
-	}
-}
-
 // GetHashByNumber returns the block hash using the block number
 func (b *Blockchain) GetHashByNumber(blockNumber uint64) types.Hash {
 	if b.isStopped() {
-		return types.ZeroHash
+		return types.Hash{}
 	}
 
 	block, ok := b.GetBlockByNumber(blockNumber, false)
 	if !ok {
-		return types.ZeroHash
+		return types.Hash{}
 	}
 
 	return block.Hash()
@@ -1260,9 +1224,9 @@ func (b *Blockchain) writeHeaderImpl(evnt *Event, header *types.Header) error {
 	// Write the difficulty
 	if err := b.db.WriteTotalDifficulty(
 		header.Hash,
-		big.NewInt(0).Add(
+		new(big.Int).Add(
 			parentTD,
-			big.NewInt(0).SetUint64(header.Difficulty),
+			new(big.Int).SetUint64(header.Difficulty),
 		),
 	); err != nil {
 		return err
@@ -1282,7 +1246,7 @@ func (b *Blockchain) writeHeaderImpl(evnt *Event, header *types.Header) error {
 	// Update the headers cache
 	b.headersCache.Add(header.Hash, header)
 
-	incomingTD := big.NewInt(0).Add(parentTD, big.NewInt(0).SetUint64(header.Difficulty))
+	incomingTD := new(big.Int).Add(parentTD, new(big.Int).SetUint64(header.Difficulty))
 	if incomingTD.Cmp(currentTD) > 0 {
 		// new block has higher difficulty, reorg the chain
 		if err := b.handleReorg(evnt, currentHeader, header); err != nil {
@@ -1305,7 +1269,8 @@ func (b *Blockchain) writeHeaderImpl(evnt *Event, header *types.Header) error {
 func (b *Blockchain) writeFork(header *types.Header) error {
 	forks, err := b.db.ReadForks()
 	if err != nil {
-		if errors.Is(err, storage.ErrNotFound) {
+		// too many error types
+		if err.Error() == rawdb.ErrNotFound.Error() {
 			forks = []types.Hash{}
 		} else {
 			return err
@@ -1484,8 +1449,7 @@ func (b *Blockchain) Close() error {
 
 	b.wg.Wait()
 
-	// close db at last
-	return b.db.Close()
+	return nil
 }
 
 func (b *Blockchain) stop() {

blockchain/blockchain_test.go

@@ -10,9 +10,10 @@ import (
 	"github.com/dogechain-lab/dogechain/blockchain/storage"
 	"github.com/dogechain-lab/dogechain/blockchain/storage/kvstorage"
 	"github.com/dogechain-lab/dogechain/chain"
+	"github.com/dogechain-lab/dogechain/helper/kvdb/memorydb"
+	"github.com/dogechain-lab/dogechain/helper/rawdb"
 	"github.com/dogechain-lab/dogechain/state"
 	"github.com/dogechain-lab/dogechain/types"
-	"github.com/hashicorp/go-hclog"
 	"github.com/stretchr/testify/assert"
 )
 
@@ -490,7 +491,7 @@ func TestInsertHeaders(t *testing.T) {
 			assert.Equal(t, head.Hash, expected.Hash)
 
 			forks, err := b.GetForks()
-			if err != nil && !errors.Is(err, storage.ErrNotFound) {
+			if err != nil && (err.Error() != rawdb.ErrNotFound.Error()) {
 				t.Fatal(err)
 			}
 
@@ -545,8 +546,7 @@ func TestForkUnknownParents(t *testing.T) {
 }
 
 func TestBlockchainWriteBody(t *testing.T) {
-	storage, err := kvstorage.NewMemoryStorageBuilder(hclog.NewNullLogger()).Build()
-	assert.NoError(t, err)
+	storage := kvstorage.NewKeyValueStorage(memorydb.New())
 
 	b := &Blockchain{
 		db:      storage,
@@ -704,8 +704,8 @@ func TestBlockchain_VerifyBlockParent(t *testing.T) {
 	t.Parallel()
 
 	emptyHeader := &types.Header{
-		Hash:       types.ZeroHash,
-		ParentHash: types.ZeroHash,
+		Hash:       types.Hash{},
+		ParentHash: types.Hash{},
 	}
 	emptyHeader.ComputeHash()
 
@@ -729,7 +729,7 @@ func TestBlockchain_VerifyBlockParent(t *testing.T) {
 		// Create a dummy block
 		block := &types.Block{
 			Header: &types.Header{
-				ParentHash: types.ZeroHash,
+				ParentHash: types.Hash{},
 			},
 		}
 
@@ -855,8 +855,8 @@ func TestBlockchain_VerifyBlockBody(t *testing.T) {
 	t.Parallel()
 
 	emptyHeader := &types.Header{
-		Hash:       types.ZeroHash,
-		ParentHash: types.ZeroHash,
+		Hash:       types.Hash{},
+		ParentHash: types.Hash{},
 	}
 
 	t.Run("Invalid SHA3 Uncles root", func(t *testing.T) {
@@ -869,7 +869,7 @@ func TestBlockchain_VerifyBlockBody(t *testing.T) {
 
 		block := &types.Block{
 			Header: &types.Header{
-				Sha3Uncles: types.ZeroHash,
+				Sha3Uncles: types.Hash{},
 			},
 		}