dev: merge v1310

48Club · Mar 4, 2024 · 3462009 · 3462009
1 parent 2da2166
commit 3462009
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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
 	}