From fd74cbfb74e3ccbe0e0c96d21d9e8417d98927bf Mon Sep 17 00:00:00 2001 From: garyschulte Date: Mon, 14 Jun 2021 14:23:36 -0700 Subject: [PATCH] handle both baseFee and baseFeePerGas in test_setChainParams (#2427) Signed-off-by: garyschulte --- .../besu/ethereum/retesteth/methods/TestSetChainParams.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ethereum/retesteth/src/main/java/org/hyperledger/besu/ethereum/retesteth/methods/TestSetChainParams.java b/ethereum/retesteth/src/main/java/org/hyperledger/besu/ethereum/retesteth/methods/TestSetChainParams.java index 578848909f..6ee04a05b1 100644 --- a/ethereum/retesteth/src/main/java/org/hyperledger/besu/ethereum/retesteth/methods/TestSetChainParams.java +++ b/ethereum/retesteth/src/main/java/org/hyperledger/besu/ethereum/retesteth/methods/TestSetChainParams.java @@ -136,9 +136,10 @@ public class TestSetChainParams implements JsonRpcMethod { if (params.containsKey("londonForkBlock")) { // TODO EIP-1559 change for the actual fork name when known + JsonObject genesisConfig = chainParamsJson.getJsonObject("genesis", new JsonObject()); ExperimentalEIPs.initialBasefee = Optional.ofNullable( - chainParamsJson.getJsonObject("genesis", new JsonObject()).getString("baseFee")) + genesisConfig.getString("baseFeePerGas", genesisConfig.getString("baseFee"))) .map(Long::decode) .orElse(ExperimentalEIPs.EIP1559_BASEFEE_DEFAULT_VALUE); }