Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

timestamp set for dencun on mainnet. #6545

Merged
merged 4 commits into from
Feb 9, 2024
Merged

timestamp set for dencun on mainnet. #6545

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
74bad9a
timestamp set for dencun on mainnet, lfg.
jflo Feb 8, 2024
8350401
adds confirmed forkid
jflo Feb 8, 2024
90774d1
unit tests were re-initting
jflo Feb 8, 2024
5a539a0
adds cancun to post-merge overrides
jflo Feb 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions besu/src/test/java/org/hyperledger/besu/ForkIdsNetworkConfigTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,8 +107,9 @@ public static Collection<Object[]> parameters() {
new ForkId(Bytes.ofUnsignedInt(0xb715077dL), 13773000L),
new ForkId(Bytes.ofUnsignedInt(0x20c327fcL), 15050000L),
new ForkId(Bytes.ofUnsignedInt(0xf0afd0e3L), 1681338455L),
new ForkId(Bytes.ofUnsignedInt(0xdce96c2dL), 0L),
new ForkId(Bytes.ofUnsignedInt(0xdce96c2dL), 0L))
new ForkId(Bytes.ofUnsignedInt(0xdce96c2dL), 1710338135L),
new ForkId(Bytes.ofUnsignedInt(0x9f3d2254L), 0L),
new ForkId(Bytes.ofUnsignedInt(0x9f3d2254L), 0L))
},
new Object[] {
NetworkName.MORDOR,
Expand Down
1 change: 1 addition & 0 deletions config/src/main/resources/mainnet.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"grayGlacierBlock": 15050000,
"terminalTotalDifficulty": 58750000000000000000000,
"shanghaiTime": 1681338455,
"cancunTime": 1710338135,
"ethash": {
},
"discovery": {
Expand Down
7 changes: 6 additions & 1 deletion .../reference-test/java/org/hyperledger/besu/ethereum/mainnet/DifficultyCalculatorTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@

import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import java.util.stream.Stream;

Expand All @@ -46,12 +48,15 @@
public class DifficultyCalculatorTests {

public static Stream<Arguments> getTestParametersForConfig() throws IOException {
Map<String, String> postMergeOverrides = new HashMap<>();
postMergeOverrides.put("shanghaiTime", "999999999999");
postMergeOverrides.put("cancunTime","999999999999");
return Stream.of(
Arguments.of(
"/BasicTests/difficultyMainNetwork.json",
MainnetProtocolSchedule.fromConfig(
GenesisConfigFile.mainnet()
.getConfigOptions(Map.of("shanghaiTime", "999999999999")),
.getConfigOptions(postMergeOverrides),
EvmConfiguration.DEFAULT)),
Arguments.of(
"/DifficultyTests/dfGrayGlacier/difficultyGrayGlacierForkBlock.json",
Expand Down
2 changes: 0 additions & 2 deletions evm/src/main/java/org/hyperledger/besu/evm/precompile/KZGPointEvalPrecompiledContract.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,6 @@ public static void init() {
"Loading network trusted setup from classpath resource {}", trustedSetupResourceName);
CKZG4844JNI.loadTrustedSetupFromResource(
trustedSetupResourceName, KZGPointEvalPrecompiledContract.class);
} else {
throw new IllegalStateException("KZG trusted setup was already loaded");
}
}

Expand Down
Loading