all: tie timestamp based forks to the passage of London (#27279)

2023-05-19 11:27:19 +03:00
parent 6a6318b1d2
commit 85a4b82b33
14 changed files with 31 additions and 29 deletions
@@ -318,7 +318,7 @@ func (pool *TxPool) setNewHead(head *types.Header) {
 	next := new(big.Int).Add(head.Number, big.NewInt(1))
 	pool.istanbul = pool.config.IsIstanbul(next)
 	pool.eip2718 = pool.config.IsBerlin(next)
-	pool.shanghai = pool.config.IsShanghai(uint64(time.Now().Unix()))
+	pool.shanghai = pool.config.IsShanghai(next, uint64(time.Now().Unix()))
 }

 // Stop stops the light transaction pool