From 94d477cdd9ebd73fff4343dc18427d088b62684e Mon Sep 17 00:00:00 2001
From: Giulio Rebuffo <giulio.rebuffo@gmail.com>
Date: Mon, 15 Nov 2021 21:23:56 +0100
Subject: [PATCH] EIP 4399 finalized
---
core/evm.go | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/core/evm.go b/core/evm.go
index 716f037e57..6da9de9704 100644
--- a/core/evm.go
+++ b/core/evm.go
@@ -43,6 +43,15 @@ func NewEVMBlockContext(header *types.Header, getHeader func(hash common.Hash, n
panic(fmt.Errorf("header.BaseFee higher than 2^256-1"))
}
}
+
+ difficulty := new(big.Int)
+
+ if header.Eip3675 {
+ // Turn DIFFICULTY into RANDOM when the merge is done. spec: https://ethereum-magicians.org/t/eip-4399-supplant-difficulty-opcode-with-random/7368
+ difficulty.SetBytes(header.Random[:])
+ } else {
+ difficulty.Set(header.Difficulty)
+ }
if contractHasTEVM == nil {
contractHasTEVM = func(_ common.Hash) (bool, error) {
return false, nil
@@ -55,7 +64,7 @@ func NewEVMBlockContext(header *types.Header, getHeader func(hash common.Hash, n
Coinbase: beneficiary,
BlockNumber: header.Number.Uint64(),
Time: header.Time,
- Difficulty: new(big.Int).Set(header.Difficulty),
+ Difficulty: difficulty,
BaseFee: &baseFee,
GasLimit: header.GasLimit,
ContractHasTEVM: contractHasTEVM,
--
GitLab