X-Git-Url: http://git.osdn.net/view?p=bytom%2Fvapor.git;a=blobdiff_plain;f=proposal%2Fproposal.go;fp=proposal%2Fproposal.go;h=a4c51e43870ce6b92f7a6d6cca7a4977523a5dca;hp=35c021f06132c7c2bfa46196f4c5abbac3ac5857;hb=1b35511b58dac0acdc5ca3f4f539a00d73a42430;hpb=312e5053f0a820931cb5b0c68d418f8614f426b9 diff --git a/proposal/proposal.go b/proposal/proposal.go index 35c021f0..a4c51e43 100644 --- a/proposal/proposal.go +++ b/proposal/proposal.go @@ -108,11 +108,6 @@ func NewBlockTemplate(c *protocol.Chain, txPool *protocol.TxPool, accountManager txs := txPool.GetTransactions() sort.Sort(byTime(txs)) - consensusResult, err := c.GetConsensusResultByHash(&preBlockHash) - if err != nil { - return nil, err - } - entriesTxs := []*bc.Tx{} for _, txDesc := range txs { entriesTxs = append(entriesTxs, txDesc.Tx.Tx) @@ -147,11 +142,6 @@ func NewBlockTemplate(c *protocol.Chain, txPool *protocol.TxPool, accountManager continue } - if err := consensusResult.ApplyTransaction(txDesc.Tx); err != nil { - blkGenSkipTxForErr(txPool, &tx.ID, err) - continue - } - if err := txStatus.SetStatus(len(b.Transactions), gasOnlyTx); err != nil { return nil, err } @@ -171,6 +161,11 @@ func NewBlockTemplate(c *protocol.Chain, txPool *protocol.TxPool, accountManager return nil, errors.Wrap(err, "fail on createCoinbaseTx") } + consensusResult, err := c.GetConsensusResultByHash(&preBlockHash) + if err != nil { + return nil, err + } + if err := consensusResult.AttachCoinbaseReward(b); err != nil { return nil, err }