diff --git a/core/quorum/block_maker.go b/core/quorum/block_maker.go index 233621023..a5e6b0aaf 100755 --- a/core/quorum/block_maker.go +++ b/core/quorum/block_maker.go @@ -26,7 +26,6 @@ type pendingState struct { gp *core.GasPool ownedAccounts *set.Set txs types.Transactions // set of transactions - txsHashes *set.Set lowGasTxs types.Transactions failedTxs types.Transactions parent *types.Block @@ -56,7 +55,6 @@ func (ps *pendingState) applyTransaction(tx *types.Transaction, bc *core.BlockCh return err, nil } ps.txs = append(ps.txs, tx) - ps.txsHashes.Add(tx.Hash()) ps.receipts = append(ps.receipts, receipt) return nil, logs @@ -75,11 +73,6 @@ func (ps *pendingState) applyTransactions(txs *types.TransactionsByPriorityAndNo if tx == nil { break } - - if ps.txsHashes.Has(tx.Hash()) { - continue - } - // Error may be ignored here. The error has already been checked // during transaction acceptance is the transaction pool. from, _ := tx.From() diff --git a/core/quorum/block_voting.go b/core/quorum/block_voting.go index 8271cb7df..ea30c467b 100755 --- a/core/quorum/block_voting.go +++ b/core/quorum/block_voting.go @@ -110,7 +110,6 @@ func (bv *BlockVoting) resetPendingState(parent *types.Block) { header: bv.makeHeader(parent), gp: new(core.GasPool), ownedAccounts: accountAddressesSet(bv.am.Accounts()), - txsHashes: set.New(), } ps.gp.AddGas(ps.header.GasLimit) @@ -311,11 +310,9 @@ func (bv *BlockVoting) createBlock() (*types.Block, error) { ch, err := bv.canonHash(bv.pState.header.Number.Uint64()) if err != nil { - bv.resetPendingState(bv.bc.CurrentFastBlock()) return nil, err } if ch != bv.pState.parent.Hash() { - bv.resetPendingState(bv.bc.CurrentFastBlock()) return nil, fmt.Errorf("invalid canonical hash, expected %s got %s", ch.Hex(), bv.pState.header.Hash().Hex()) }