remove tcount

This commit is contained in:
maskpp 2024-10-22 20:55:01 +08:00
parent a5fe7353cf
commit 7231a974f0

View file

@ -48,7 +48,6 @@ var (
type environment struct { type environment struct {
signer types.Signer signer types.Signer
state *state.StateDB // apply state changes here state *state.StateDB // apply state changes here
tcount int // tx count in cycle
gasPool *core.GasPool // available gas used to pack transactions gasPool *core.GasPool // available gas used to pack transactions
coinbase common.Address coinbase common.Address
@ -279,7 +278,6 @@ func (miner *Miner) commitTransaction(env *environment, tx *types.Transaction) e
} }
env.txs = append(env.txs, tx) env.txs = append(env.txs, tx)
env.receipts = append(env.receipts, receipt) env.receipts = append(env.receipts, receipt)
env.tcount++
return nil return nil
} }
@ -304,7 +302,6 @@ func (miner *Miner) commitBlobTransaction(env *environment, tx *types.Transactio
env.sidecars = append(env.sidecars, sc) env.sidecars = append(env.sidecars, sc)
env.blobs += len(sc.Blobs) env.blobs += len(sc.Blobs)
*env.header.BlobGasUsed += receipt.BlobGasUsed *env.header.BlobGasUsed += receipt.BlobGasUsed
env.tcount++
return nil return nil
} }
@ -399,7 +396,7 @@ func (miner *Miner) commitTransactions(env *environment, plainTxs, blobTxs *tran
continue continue
} }
// Start executing the transaction // Start executing the transaction
env.state.SetTxContext(tx.Hash(), env.tcount) env.state.SetTxContext(tx.Hash(), len(env.txs))
err := miner.commitTransaction(env, tx) err := miner.commitTransaction(env, tx)
switch { switch {