modify consensusResult for block (#324)

[bytom/vapor.git] / protocol / block.go

diff --git a/protocol/block.go b/protocol/block.go
index 4870de3..6799969 100644 (file)
--- a/protocol/block.go
+++ b/protocol/block.go
@@ -238,7 +238,7 @@ func (c *Chain) reorganizeChain(blockHeader *types.BlockHeader) error {
                // the number of restored Tx should be very small or most of time ZERO
                // Error returned from validation is ignored, tx could still be lost if validation fails.
                // TODO: adjust tx timestamp so that it won't starve in pool.
-               if _, err := c.ValidateTx(tx); err != nil {
+               if _, err := c.validateTx(tx, blockHeader); err != nil {
                        log.WithFields(log.Fields{"module": logModule, "tx_id": tx.Tx.ID.String(), "error": err}).Info("restore tx fail")
                }
        }
@@ -265,11 +265,7 @@ func (c *Chain) saveBlock(block *types.Block) error {
                return err
        }
 
-       if err := consensusResult.AttachCoinbaseReward(block); err != nil {
-               return err
-       }
-
-       rewards, err := consensusResult.GetCoinbaseRewards(block.Height)
+       rewards, err := consensusResult.GetCoinbaseRewards(parent.Height)
        if err != nil {
                return err
        }
@@ -357,6 +353,8 @@ func (c *Chain) processBlock(block *types.Block) (bool, error) {
                return c.orphanManage.BlockExist(&blockHash), nil
        }
 
+       c.markTransactions(block.Transactions...)
+
        if _, err := c.store.GetBlockHeader(&block.PreviousBlockHash); err != nil {
                c.orphanManage.Add(block)
                return true, nil