Hip30 : localnet account migration fix

core/genesis.go

@@ -28,6 +28,7 @@ import (
 	"strings"
 
 	"github.com/ethereum/go-ethereum/common"
+	ethCommon "github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/common/hexutil"
 	"github.com/ethereum/go-ethereum/common/math"
 	"github.com/ethereum/go-ethereum/crypto"
@@ -252,6 +253,12 @@ func (g *Genesis) ToBlock(db ethdb.Database) *types.Block {
 		for key, value := range account.Storage {
 			statedb.SetState(addr, key, value)
 		}
+		//statedb.AddPreimage(crypto.Keccak256Hash((addr[:])), addr.Bytes()[:])
+		rawdb.WritePreimages(
+			statedb.Database().DiskDB(), map[ethCommon.Hash][]byte{
+				crypto.Keccak256Hash((addr.Bytes())): addr.Bytes(),
+			},
+		)
 	}
 	root := statedb.IntermediateRoot(false)
 	shardStateBytes, err := shard.EncodeWrapper(g.ShardState, false)

core/preimages.go

@@ -7,8 +7,6 @@ import (
 	"os"
 	"strconv"
 
-	"github.com/ethereum/go-ethereum/crypto"
-
 	ethCommon "github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/crypto"
 	"github.com/harmony-one/harmony/api/service/prometheus"

core/state_processor.go

@@ -145,7 +145,7 @@ func (p *StateProcessor) Process(
 			// ran out of accounts
 			processTxsAndStxs = false
 		}
-		if !errors.Is(err, ErrNoMigrationRequired) {
+		if !errors.Is(err, ErrNoMigrationRequired) && !errors.Is(err, ErrNoMigrationPossible) {
 			return nil, nil, nil, nil, 0, nil, statedb, err
 		}
 	} else {
@@ -576,13 +576,9 @@ func MayBalanceMigration(
 	if isDevnet || isLocalnet {
 		if config.IsOneEpochBeforeHIP30(header.Epoch()) {
 			if myShard := chain.ShardID(); myShard != shard.BeaconChainShardID {
-				parent := chain.GetBlockByHash(
+				parentRoot := chain.GetBlockByHash(
 					header.ParentHash(),
-				)
-				if parent == nil {
-					return nil, errors.Wrap(ErrNoMigrationPossible, "parent is nil")
-				}
-				parentRoot := parent.Root()
+				).Root() // for examining MPT at this root, should exist
 				// for examining MPT at this root, should exist
 				cx, err := generateOneMigrationMessage(
 					db, parentRoot,
@@ -641,13 +637,11 @@ func generateOneMigrationMessage(
 			key := accountIterator.LeafKey()
 			preimage := rawdb.ReadPreimage(db, common.BytesToHash(key))
 			if len(preimage) == 0 {
-				e := errors.New(
+				return nil, errors.New(
 					fmt.Sprintf(
 						"cannot find preimage for %x", key,
 					),
 				)
-				fmt.Println(e)
-				continue
 			}
 			address := common.BytesToAddress(preimage)
 			// skip blank address

internal/configs/sharding/localnet.go

@@ -31,8 +31,8 @@ const (
 	localnetV1Epoch = 1
 
 	localnetEpochBlock1      = 5
-	localnetBlocksPerEpoch   = 8
-	localnetBlocksPerEpochV2 = 8
+	localnetBlocksPerEpoch   = 64
+	localnetBlocksPerEpochV2 = 64
 
 	localnetVdfDifficulty = 5000 // This takes about 10s to finish the vdf
 )

node/node_newblock.go

@@ -157,6 +157,7 @@ func (node *Node) ProposeNewBlock(commitSigs chan []byte) (*types.Block, error)
 		}
 	}
 
+	// Execute all the time except for last block of epoch for shard 0
 	if !shard.Schedule.IsLastBlock(header.Number().Uint64()) || node.Consensus.ShardID != 0 {
 		// Prepare normal and staking transactions retrieved from transaction pool
 		utils.AnalysisStart("proposeNewBlockChooseFromTxnPool")

rpc/preimages.go

@@ -2,7 +2,6 @@ package rpc
 
 import (
 	"context"
-	"fmt"
 
 	"github.com/harmony-one/harmony/core"
 	"github.com/harmony-one/harmony/eth/rpc"
@@ -24,8 +23,7 @@ func NewPreimagesAPI(hmy *hmy.Harmony, version string) rpc.API {
 	}
 }
 
-func (s *PreimagesService) Export(_ context.Context, path string) error {
+func (s *PreimagesService) Export(ctx context.Context, path string) error {
 	// these are by default not blocking
 	return core.ExportPreimages(s.hmy.BlockChain, path)
 }
-