X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=protocol%2Ftx.go;h=bdd35162fa77f3c57c327cc40bc66647bfca2643;hb=refs%2Fheads%2Frevert-357-master;hp=234b01072ebf1b45db2e2fa1a1d862f8f7baa9c8;hpb=1b35511b58dac0acdc5ca3f4f539a00d73a42430;p=bytom%2Fvapor.git diff --git a/protocol/tx.go b/protocol/tx.go index 234b0107..bdd35162 100644 --- a/protocol/tx.go +++ b/protocol/tx.go @@ -28,12 +28,12 @@ func (c *Chain) ValidateTx(tx *types.Tx) (bool, error) { } c.markTransactions(tx) - - return c.validateTx(tx) + bh := c.BestBlockHeader() + return c.validateTx(tx, bh) } // validateTx validates the given transaction without checking duplication. -func (c *Chain) validateTx(tx *types.Tx) (bool, error) { +func (c *Chain) validateTx(tx *types.Tx, bh *types.BlockHeader) (bool, error) { if ok := c.txPool.HaveTransaction(&tx.ID); ok { return false, c.txPool.GetErrCache(&tx.ID) } @@ -43,7 +43,6 @@ func (c *Chain) validateTx(tx *types.Tx) (bool, error) { return false, ErrDustTx } - bh := c.BestBlockHeader() gasStatus, err := validation.ValidateTx(tx.Tx, types.MapBlock(&types.Block{BlockHeader: *bh})) if !gasStatus.GasValid { c.txPool.AddErrCache(&tx.ID, err)