Copy MultiGasPool in miner environment

celo-org · May 7, 2024 · 7107f13 · 7107f13
1 parent 7d0fbb4
commit 7107f13
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/core/celo_multi_gaspool.go b/core/celo_multi_gaspool.go
@@ -64,3 +64,16 @@ func (mgp MultiGasPool) GetPool(c *FeeCurrency) *GasPool {
 	// pools have been created already in the constructor.
 	return mgp.getOrInitPool(*c, nil)
 }
+
+func (mgp MultiGasPool) Copy() *MultiGasPool {
+	pools := make(map[FeeCurrency]*GasPool, len(mgp.pools))
+	for fc, gp := range mgp.pools {
+		gpCpy := *gp
+		pools[fc] = &gpCpy
+	}
+	return &MultiGasPool{
+		pools:         pools,
+		blockGasLimit: mgp.blockGasLimit,
+		defaultLimit:  mgp.defaultLimit,
+	}
+}
diff --git a/miner/worker.go b/miner/worker.go
@@ -114,6 +114,9 @@ func (env *environment) copy() *environment {
 		gasPool := *env.gasPool
 		cpy.gasPool = &gasPool
 	}
+	if env.multiGasPool != nil {
+		cpy.multiGasPool = env.multiGasPool.Copy()
+	}
 	cpy.txs = make([]*types.Transaction, len(env.txs))
 	copy(cpy.txs, env.txs)