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