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
@@ -1397,7 +1397,7 @@ func (pool *TxPool) reset(oldHead, newHead *types.Header) {
 	pool.istanbul.Store(pool.chainconfig.IsIstanbul(next))
 	pool.eip2718.Store(pool.chainconfig.IsBerlin(next))
 	pool.eip1559.Store(pool.chainconfig.IsLondon(next))
-	pool.shanghai.Store(pool.chainconfig.IsShanghai(uint64(time.Now().Unix())))
+	pool.shanghai.Store(pool.chainconfig.IsShanghai(next, uint64(time.Now().Unix())))
 }

 // promoteExecutables moves transactions that have become processable from the