Update Aleut genesis block (#2149)

Signed-off-by: Abdelhamid Bakhta <abdelhamid.bakhta@consensys.net>
pull/2160/head
Abdelhamid Bakhta 4 years ago committed by GitHub
parent bb1ad364a2
commit 1486d1cf2d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 4
      config/src/main/java/org/hyperledger/besu/config/JsonGenesisConfigOptions.java
  2. 2
      config/src/main/java/org/hyperledger/besu/config/StubGenesisConfigOptions.java
  3. 2
      config/src/test/java/org/hyperledger/besu/config/GenesisConfigOptionsTest.java

@ -257,7 +257,7 @@ public class JsonGenesisConfigOptions implements GenesisConfigOptions {
@Override
// TODO EIP-1559 change for the actual fork name when known
public OptionalLong getEIP1559BlockNumber() {
return ExperimentalEIPs.eip1559Enabled ? getOptionalLong("eip1559block") : OptionalLong.empty();
return ExperimentalEIPs.eip1559Enabled ? getOptionalLong("aleutblock") : OptionalLong.empty();
}
@Override
@ -393,7 +393,7 @@ public class JsonGenesisConfigOptions implements GenesisConfigOptions {
getThanosBlockNumber().ifPresent(l -> builder.put("thanosBlock", l));
getEcip1049BlockNumber().ifPresent(l -> builder.put("ecip1049Block", l));
getEIP1559BlockNumber().ifPresent(l -> builder.put("eip1559Block", l));
getEIP1559BlockNumber().ifPresent(l -> builder.put("aleutblock", l));
getContractSizeLimit().ifPresent(l -> builder.put("contractSizeLimit", l));
getEvmStackSize().ifPresent(l -> builder.put("evmstacksize", l));
getEcip1017EraRounds().ifPresent(l -> builder.put("ecip1017EraRounds", l));

@ -267,7 +267,7 @@ public class StubGenesisConfigOptions implements GenesisConfigOptions {
getMuirGlacierBlockNumber().ifPresent(l -> builder.put("muirGlacierBlock", l));
getBerlinBlockNumber().ifPresent(l -> builder.put("berlinBlock", l));
// TODO EIP-1559 change for the actual fork name when known
getEIP1559BlockNumber().ifPresent(l -> builder.put("eip1559Block", l));
getEIP1559BlockNumber().ifPresent(l -> builder.put("aleutblock", l));
// classic fork blocks
getClassicForkBlock().ifPresent(l -> builder.put("classicForkBlock", l));

@ -191,7 +191,7 @@ public class GenesisConfigOptionsTest {
public void shouldGetEIP1559BlockNumber() {
try {
ExperimentalEIPs.eip1559Enabled = true;
final GenesisConfigOptions config = fromConfigOptions(singletonMap("eip1559block", 1000));
final GenesisConfigOptions config = fromConfigOptions(singletonMap("aleutblock", 1000));
assertThat(config.getEIP1559BlockNumber()).hasValue(1000);
} finally {
ExperimentalEIPs.eip1559Enabled = ExperimentalEIPs.EIP1559_ENABLED_DEFAULT_VALUE;

Loading…
Cancel
Save