From 3462009f50befb169430fa02a70ab2a8aacef1e1 Mon Sep 17 00:00:00 2001 From: Jolly Zhao Date: Mon, 4 Mar 2024 21:40:24 +0800 Subject: [PATCH] dev: merge v1310 --- miner/worker.go | 2 +- miner/worker_puissant.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/miner/worker.go b/miner/worker.go index c7d0780267..ede02155e4 100644 --- a/miner/worker.go +++ b/miner/worker.go @@ -708,7 +708,7 @@ func (w *worker) prepareWork(genParams *generateParams) (*core.MinerEnvironment, if !w.chainConfig.IsFeynman(header.Number, header.Time) { // Handle upgrade build-in system contract code - systemcontracts.UpgradeBuildInSystemContract(w.chainConfig, header.Number, parent.Time, header.Time, env.state) + systemcontracts.UpgradeBuildInSystemContract(w.chainConfig, header.Number, parent.Time, header.Time, env.State) } return env, nil diff --git a/miner/worker_puissant.go b/miner/worker_puissant.go index 4b93c066ad..5ef1a8a39d 100644 --- a/miner/worker_puissant.go +++ b/miner/worker_puissant.go @@ -51,7 +51,7 @@ func (w *worker) makeEnv(parent *types.Header, header *types.Header, coinbase co // Retrieve the parent state to execute on top and start a prefetcher for // the miner to speed block sealing up a bit - topState, err := w.chain.StateAtWithSharedPool(parent.Root) + topState, err := w.chain.StateAt(parent.Root) if err != nil { return nil, err }