From 05f715ca514250dd4fd915581ed5e6c4213cf672 Mon Sep 17 00:00:00 2001 From: Alex Sharov Date: Tue, 27 Dec 2022 13:14:24 +0700 Subject: [PATCH] E3: chain rules fix (#6448) --- cmd/state/exec3/state.go | 2 +- consensus/parlia/parlia.go | 2 +- turbo/app/snapshots.go | 2 -- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/cmd/state/exec3/state.go b/cmd/state/exec3/state.go index 62fad80ea..16127b2b9 100644 --- a/cmd/state/exec3/state.go +++ b/cmd/state/exec3/state.go @@ -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 */) diff --git a/consensus/parlia/parlia.go b/consensus/parlia/parlia.go index 031d95a95..22a3ab4d4 100644 --- a/consensus/parlia/parlia.go +++ b/consensus/parlia/parlia.go @@ -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)) } diff --git a/turbo/app/snapshots.go b/turbo/app/snapshots.go index 02af80d66..927cdefc4 100644 --- a/turbo/app/snapshots.go +++ b/turbo/app/snapshots.go @@ -157,8 +157,6 @@ func doDecompressSpeed(cliCtx *cli.Context) error { } f := args.First() - compress.SetDecompressionTableCondensity(9) - preloadFileAsync(f) decompressor, err := compress.NewDecompressor(f)