E3: chain rules fix (#6448)

This commit is contained in:
Alex Sharov 2022-12-27 13:14:24 +07:00 committed by GitHub
parent ba585f494b
commit 05f715ca51
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 4 deletions

View File

@ -197,7 +197,7 @@ func (rw *Worker) RunTxTask(txTask *exec22.TxTask) {
getHashFn := core.GetHashFn(header, rw.getHeader)
blockContext = core.NewEVMBlockContext(header, getHashFn, rw.engine, nil /* author */)
}
rw.evm.ResetBetweenBlocks(blockContext, core.NewEVMTxContext(msg), ibs, vmConfig, txTask.Rules)
rw.evm.ResetBetweenBlocks(blockContext, core.NewEVMTxContext(msg), ibs, vmConfig, rules)
vmenv = rw.evm
}
applyRes, err := core.ApplyMessage(vmenv, msg, gp, true /* refunds */, false /* gasBailout */)

View File

@ -776,7 +776,7 @@ func (p *Parlia) finalize(header *types.Header, state *state.IntraBlockState, tx
//log.Error("distributeIncoming", "block hash", header.Hash(), "error", err, "systemTxs", len(systemTxs))
return nil, nil, err
}
log.Debug("distribute successful", "txns", txs.Len(), "receipts", len(receipts), "gasUsed", header.GasUsed)
//log.Debug("distribute successful", "txns", txs.Len(), "receipts", len(receipts), "gasUsed", header.GasUsed)
if len(systemTxs) > 0 {
return nil, nil, fmt.Errorf("the length of systemTxs is still %d", len(systemTxs))
}

View File

@ -157,8 +157,6 @@ func doDecompressSpeed(cliCtx *cli.Context) error {
}
f := args.First()
compress.SetDecompressionTableCondensity(9)
preloadFileAsync(f)
decompressor, err := compress.NewDecompressor(f)