fix cross shard transaction destination shard not adding balance

core/blockchain.go

@@ -406,6 +406,7 @@ func (bc *BlockChain) FastSyncCommitHead(hash common.Hash) error {
 }
 
 // ShardID returns the shard Id of the blockchain.
+// TODO: use a better solution before resharding shuffle nodes to different shards
 func (bc *BlockChain) ShardID() uint32 {
 	return bc.CurrentBlock().ShardID()
 }
@@ -1105,7 +1106,6 @@ func (bc *BlockChain) WriteBlockWithState(block *types.Block, receipts []*types.
 func (bc *BlockChain) InsertChain(chain types.Blocks) (int, error) {
 	n, events, logs, err := bc.insertChain(chain)
 	bc.PostChainEvents(events, logs)
-	// TODO ek – make this a post-chain event
 	if err == nil {
 		for idx, block := range chain {
 			header := block.Header()

core/state_processor.go

@@ -27,6 +27,7 @@ import (
 	"github.com/harmony-one/harmony/core/types"
 	"github.com/harmony-one/harmony/core/vm"
 	"github.com/harmony-one/harmony/internal/ctxerror"
+	"github.com/harmony-one/harmony/internal/utils"
 )
 
 // StateProcessor is a basic Processor, which takes care of transitioning
@@ -68,10 +69,6 @@ func (p *StateProcessor) Process(block *types.Block, statedb *state.DB, cfg vm.C
 		gp       = new(GasPool).AddGas(block.GasLimit())
 	)
 
-	for _, cx := range block.IncomingReceipts() {
-		ApplyIncomingReceipt(statedb, cx)
-	}
-
 	// Iterate over and process the individual transactions
 	for i, tx := range block.Transactions() {
 		statedb.Prepare(tx.Hash(), block.Hash(), i)
@@ -86,6 +83,10 @@ func (p *StateProcessor) Process(block *types.Block, statedb *state.DB, cfg vm.C
 		allLogs = append(allLogs, receipt.Logs...)
 	}
 
+	for _, cx := range block.IncomingReceipts() {
+		ApplyIncomingReceipt(p.config, statedb, header, cx)
+	}
+
 	// Finalize the block, applying any consensus engine specific extras (e.g. block rewards)
 	_, err := p.engine.Finalize(p.bc, header, statedb, block.Transactions(), receipts, outcxs, incxs)
 	if err != nil {
@@ -163,3 +164,25 @@ func ApplyTransaction(config *params.ChainConfig, bc ChainContext, author *commo
 
 	return receipt, cxReceipt, gas, err
 }
+
+// ApplyIncomingReceipt will add amount into ToAddress in the receipt
+func ApplyIncomingReceipt(config *params.ChainConfig, db *state.DB, header *types.Header, cxp *types.CXReceiptsProof) {
+	if cxp == nil {
+		return
+	}
+
+	// TODO: how to charge gas here?
+	for _, cx := range cxp.Receipts {
+		if cx == nil || cx.To == nil { // should not happend
+			utils.Logger().Warn().Msg("ApplyIncomingReceipts: Invalid incoming receipt!!")
+			continue
+		}
+		utils.Logger().Info().Msgf("ApplyIncomingReceipts: ADDING BALANCE %d", cx.Amount)
+
+		if !db.Exist(*cx.To) {
+			db.CreateAccount(*cx.To)
+		}
+		db.AddBalance(*cx.To, cx.Amount)
+		db.IntermediateRoot(config.IsEIP158(header.Number)).Bytes()
+	}
+}

core/state_transition.go

@@ -24,10 +24,7 @@ import (
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/params"
 
-	"github.com/harmony-one/harmony/core/state"
-	"github.com/harmony-one/harmony/core/types"
 	"github.com/harmony-one/harmony/core/vm"
-	common2 "github.com/harmony-one/harmony/internal/common"
 	"github.com/harmony-one/harmony/internal/utils"
 )
 
@@ -136,27 +133,6 @@ func ApplyMessage(evm *vm.EVM, msg Message, gp *GasPool) ([]byte, uint64, bool,
 	return NewStateTransition(evm, msg, gp).TransitionDb()
 }
 
-// ApplyIncomingReceipt will add amount into ToAddress in the receipt
-func ApplyIncomingReceipt(db *state.DB, cxp *types.CXReceiptsProof) {
-	if cxp == nil {
-		return
-	}
-
-	// TODO: how to charge gas here?
-	for _, cx := range cxp.Receipts {
-		if cx == nil || cx.To == nil { // should not happend
-			utils.Logger().Warn().Msg("ApplyIncomingReceipts: Invalid incoming receipt!!")
-			continue
-		}
-		utils.Logger().Info().Msgf("ApplyIncomingReceipts: ADDING BALANCE %d", cx.Amount)
-
-		if !db.Exist(*cx.To) {
-			db.CreateAccount(*cx.To)
-		}
-		db.AddBalance(*cx.To, cx.Amount)
-	}
-}
-
 // to returns the recipient of the message.
 func (st *StateTransition) to() common.Address {
 	if st.msg == nil || st.msg.To() == nil /* contract creation */ {

node/node.go

@@ -274,7 +274,7 @@ func (node *Node) getTransactionsForNewBlock(maxNumTxs int, coinbase common.Addr
 
 	node.pendingTransactions = unselected
 	node.reducePendingTransactions()
-	utils.Logger().Error().
+	utils.Logger().Info().
 		Int("remainPending", len(node.pendingTransactions)).
 		Int("selected", len(selected)).
 		Int("invalidDiscarded", len(invalid)).

node/node_newblock.go

@@ -81,7 +81,7 @@ func (node *Node) WaitForConsensusReadyv2(readySignal chan struct{}, stopChan ch
 					// Propose cross shard receipts
 					receiptsList := node.proposeReceiptsProof()
 					if len(receiptsList) != 0 {
-						if err := node.Worker.CommitReceipts(receiptsList, coinbase); err != nil {
+						if err := node.Worker.CommitReceipts(receiptsList); err != nil {
 							ctxerror.Log15(utils.GetLogger().Error,
 								ctxerror.New("cannot commit receipts").
 									WithCause(err))

node/worker/worker.go

@@ -113,7 +113,7 @@ func (w *Worker) CommitTransactions(txs types.Transactions, coinbase common.Addr
 }
 
 // CommitReceipts commits a list of already verified incoming cross shard receipts
-func (w *Worker) CommitReceipts(receiptsList []*types.CXReceiptsProof, coinbase common.Address) error {
+func (w *Worker) CommitReceipts(receiptsList []*types.CXReceiptsProof) error {
 	if w.current.gasPool == nil {
 		w.current.gasPool = new(core.GasPool).AddGas(w.current.header.GasLimit)
 	}
@@ -125,7 +125,7 @@ func (w *Worker) CommitReceipts(receiptsList []*types.CXReceiptsProof, coinbase
 	}
 
 	for _, cx := range receiptsList {
-		core.ApplyIncomingReceipt(w.current.state, cx)
+		core.ApplyIncomingReceipt(w.config, w.current.state, w.current.header, cx)
 	}
 
 	for _, cx := range receiptsList {