feat: force check that Euler height cannot be a multiple of 200, fix …

…getCurrentValidators, raise SystemTxsGas after Euler fork
node-real · Apr 29, 2022 · 746d178 · 746d178
1 parent 3c560a7
commit 746d178
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/eth/catalyst/api_test.go b/eth/catalyst/api_test.go
@@ -83,6 +83,7 @@ func generateTestChainWithFork(n int, fork int) (*core.Genesis, []*types.Block,
 		NielsBlock:          big.NewInt(0),
 		MirrorSyncBlock:     big.NewInt(0),
 		BrunoBlock:          big.NewInt(0),
+		EulerBlock:          big.NewInt(0),
 
 		Ethash: new(params.EthashConfig),
 	}

diff --git a/miner/worker.go b/miner/worker.go
@@ -761,7 +761,12 @@ func (w *worker) commitTransactions(txs *types.TransactionsByPriceAndNonce, coin
 
 	if w.current.gasPool == nil {
 		w.current.gasPool = new(core.GasPool).AddGas(w.current.header.GasLimit)
-		w.current.gasPool.SubGas(params.SystemTxsGas)
+		if w.chain.Config().IsEuler(w.current.header.Number) {
+			w.current.gasPool.SubGas(params.SystemTxsGas * 3)
+		} else {
+			w.current.gasPool.SubGas(params.SystemTxsGas)
+		}
+
 	}
 
 	var coalescedLogs []*types.Log