From 3380b469d84d8406016f2c9684b38d25eac4373a Mon Sep 17 00:00:00 2001 From: Jason Frame Date: Thu, 31 Jan 2019 09:23:09 +1000 Subject: [PATCH 1/6] rename revisedibft config section to ibft2 --- acceptance-tests/src/test/resources/ibft/ibft.json | 2 +- .../pegasys/pantheon/config/GenesisConfigOptions.java | 4 ++-- .../pegasys/pantheon/config/JsonGenesisConfigOptions.java | 8 ++++---- .../pegasys/pantheon/config/StubGenesisConfigOptions.java | 4 ++-- docs/Consensus-Protocols/IBFT.md | 2 +- docs/Consensus-Protocols/Overview-Consensus.md | 2 +- .../pantheon/controller/IbftPantheonController.java | 2 +- .../pegasys/pantheon/controller/PantheonController.java | 2 +- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/acceptance-tests/src/test/resources/ibft/ibft.json b/acceptance-tests/src/test/resources/ibft/ibft.json index 5206103a92..50967cc5d8 100644 --- a/acceptance-tests/src/test/resources/ibft/ibft.json +++ b/acceptance-tests/src/test/resources/ibft/ibft.json @@ -7,7 +7,7 @@ "eip155Block": 3, "eip158Block": 3, "byzantiumBlock": 1035301, - "revisedibft": { + "ibft2": { "blockperiodseconds": 1, "epochlength": 30000, "requesttimeoutseconds": 5 diff --git a/config/src/main/java/tech/pegasys/pantheon/config/GenesisConfigOptions.java b/config/src/main/java/tech/pegasys/pantheon/config/GenesisConfigOptions.java index b31b77e796..6a0f326c19 100644 --- a/config/src/main/java/tech/pegasys/pantheon/config/GenesisConfigOptions.java +++ b/config/src/main/java/tech/pegasys/pantheon/config/GenesisConfigOptions.java @@ -21,7 +21,7 @@ public interface GenesisConfigOptions { boolean isIbft(); - boolean isRevisedIbft(); + boolean isIbft2(); boolean isClique(); @@ -29,7 +29,7 @@ public interface GenesisConfigOptions { CliqueConfigOptions getCliqueConfigOptions(); - IbftConfigOptions getRevisedIbftConfigOptions(); + IbftConfigOptions getIbft2ConfigOptions(); EthashConfigOptions getEthashConfigOptions(); diff --git a/config/src/main/java/tech/pegasys/pantheon/config/JsonGenesisConfigOptions.java b/config/src/main/java/tech/pegasys/pantheon/config/JsonGenesisConfigOptions.java index 1265b84c22..305093927e 100644 --- a/config/src/main/java/tech/pegasys/pantheon/config/JsonGenesisConfigOptions.java +++ b/config/src/main/java/tech/pegasys/pantheon/config/JsonGenesisConfigOptions.java @@ -21,7 +21,7 @@ public class JsonGenesisConfigOptions implements GenesisConfigOptions { private static final String ETHASH_CONFIG_KEY = "ethash"; private static final String IBFT_CONFIG_KEY = "ibft"; - private static final String REVISED_IBFT_CONFIG_KEY = "revisedibft"; + private static final String REVISED_IBFT_CONFIG_KEY = "ibft2"; private static final String CLIQUE_CONFIG_KEY = "clique"; private final JsonObject configRoot; @@ -45,7 +45,7 @@ public boolean isClique() { } @Override - public boolean isRevisedIbft() { + public boolean isIbft2() { return configRoot.containsKey(REVISED_IBFT_CONFIG_KEY); } @@ -57,8 +57,8 @@ public IbftConfigOptions getIbftConfigOptions() { } @Override - public IbftConfigOptions getRevisedIbftConfigOptions() { - return isRevisedIbft() + public IbftConfigOptions getIbft2ConfigOptions() { + return isIbft2() ? new IbftConfigOptions(configRoot.getJsonObject(REVISED_IBFT_CONFIG_KEY)) : IbftConfigOptions.DEFAULT; } diff --git a/config/src/test-support/java/tech/pegasys/pantheon/config/StubGenesisConfigOptions.java b/config/src/test-support/java/tech/pegasys/pantheon/config/StubGenesisConfigOptions.java index 27fdfc049c..f15645ed5a 100644 --- a/config/src/test-support/java/tech/pegasys/pantheon/config/StubGenesisConfigOptions.java +++ b/config/src/test-support/java/tech/pegasys/pantheon/config/StubGenesisConfigOptions.java @@ -42,7 +42,7 @@ public boolean isClique() { } @Override - public boolean isRevisedIbft() { + public boolean isIbft2() { return false; } @@ -57,7 +57,7 @@ public CliqueConfigOptions getCliqueConfigOptions() { } @Override - public IbftConfigOptions getRevisedIbftConfigOptions() { + public IbftConfigOptions getIbft2ConfigOptions() { return IbftConfigOptions.DEFAULT; } diff --git a/docs/Consensus-Protocols/IBFT.md b/docs/Consensus-Protocols/IBFT.md index bbfd3e5e4d..f2ca4d8006 100644 --- a/docs/Consensus-Protocols/IBFT.md +++ b/docs/Consensus-Protocols/IBFT.md @@ -23,7 +23,7 @@ To use IBFT 2.0 requires an IBFT 2.0 genesis file. The genesis file defines prop { "config": { ... - "revisedibft": { + "ibft2": { "blockperiodseconds": 2, "epochlength": 30000, "requesttimeoutseconds": 10 diff --git a/docs/Consensus-Protocols/Overview-Consensus.md b/docs/Consensus-Protocols/Overview-Consensus.md index d17554ccc3..57db1c6e38 100644 --- a/docs/Consensus-Protocols/Overview-Consensus.md +++ b/docs/Consensus-Protocols/Overview-Consensus.md @@ -44,7 +44,7 @@ The genesis file specifies the consensus protocol for a chain `config`: { "config": { .... - "revisedibft": { + "ibft2": { ... } }, diff --git a/pantheon/src/main/java/tech/pegasys/pantheon/controller/IbftPantheonController.java b/pantheon/src/main/java/tech/pegasys/pantheon/controller/IbftPantheonController.java index b9fd077e6a..502686804e 100644 --- a/pantheon/src/main/java/tech/pegasys/pantheon/controller/IbftPantheonController.java +++ b/pantheon/src/main/java/tech/pegasys/pantheon/controller/IbftPantheonController.java @@ -143,7 +143,7 @@ public static PantheonController init( genesisState.writeStateTo(worldStateArchive.getMutable(Hash.EMPTY_TRIE_HASH)); final IbftConfigOptions ibftConfig = - genesisConfig.getConfigOptions().getRevisedIbftConfigOptions(); + genesisConfig.getConfigOptions().getIbft2ConfigOptions(); final EpochManager epochManager = new EpochManager(ibftConfig.getEpochLength()); final BlockInterface blockInterface = new IbftBlockInterface(); diff --git a/pantheon/src/main/java/tech/pegasys/pantheon/controller/PantheonController.java b/pantheon/src/main/java/tech/pegasys/pantheon/controller/PantheonController.java index b8d251889f..4cad6b8cac 100644 --- a/pantheon/src/main/java/tech/pegasys/pantheon/controller/PantheonController.java +++ b/pantheon/src/main/java/tech/pegasys/pantheon/controller/PantheonController.java @@ -62,7 +62,7 @@ static PantheonController fromConfig( miningParameters, nodeKeys, metricsSystem); - } else if (configOptions.isRevisedIbft()) { + } else if (configOptions.isIbft2()) { return IbftPantheonController.init( storageProvider, genesisConfigFile, From a30481c0cdb255e12c4eb79f65fddd539d443263 Mon Sep 17 00:00:00 2001 From: Jason Frame Date: Thu, 31 Jan 2019 10:02:20 +1000 Subject: [PATCH 2/6] remove doc changes for ibft --- docs/Consensus-Protocols/IBFT.md | 2 +- docs/Consensus-Protocols/Overview-Consensus.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/Consensus-Protocols/IBFT.md b/docs/Consensus-Protocols/IBFT.md index f2ca4d8006..bbfd3e5e4d 100644 --- a/docs/Consensus-Protocols/IBFT.md +++ b/docs/Consensus-Protocols/IBFT.md @@ -23,7 +23,7 @@ To use IBFT 2.0 requires an IBFT 2.0 genesis file. The genesis file defines prop { "config": { ... - "ibft2": { + "revisedibft": { "blockperiodseconds": 2, "epochlength": 30000, "requesttimeoutseconds": 10 diff --git a/docs/Consensus-Protocols/Overview-Consensus.md b/docs/Consensus-Protocols/Overview-Consensus.md index 57db1c6e38..d17554ccc3 100644 --- a/docs/Consensus-Protocols/Overview-Consensus.md +++ b/docs/Consensus-Protocols/Overview-Consensus.md @@ -44,7 +44,7 @@ The genesis file specifies the consensus protocol for a chain `config`: { "config": { .... - "ibft2": { + "revisedibft": { ... } }, From 26b596679840e6677f10218216fda46ce0cf2939 Mon Sep 17 00:00:00 2001 From: Jason Frame Date: Thu, 31 Jan 2019 10:16:43 +1000 Subject: [PATCH 3/6] spotless --- .../pegasys/pantheon/controller/IbftPantheonController.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pantheon/src/main/java/tech/pegasys/pantheon/controller/IbftPantheonController.java b/pantheon/src/main/java/tech/pegasys/pantheon/controller/IbftPantheonController.java index 502686804e..2e65048da7 100644 --- a/pantheon/src/main/java/tech/pegasys/pantheon/controller/IbftPantheonController.java +++ b/pantheon/src/main/java/tech/pegasys/pantheon/controller/IbftPantheonController.java @@ -142,8 +142,7 @@ public static PantheonController init( final WorldStateArchive worldStateArchive = new WorldStateArchive(worldStateStorage); genesisState.writeStateTo(worldStateArchive.getMutable(Hash.EMPTY_TRIE_HASH)); - final IbftConfigOptions ibftConfig = - genesisConfig.getConfigOptions().getIbft2ConfigOptions(); + final IbftConfigOptions ibftConfig = genesisConfig.getConfigOptions().getIbft2ConfigOptions(); final EpochManager epochManager = new EpochManager(ibftConfig.getEpochLength()); final BlockInterface blockInterface = new IbftBlockInterface(); From e08c67edc1ded70bb683097bd04ab3eca6bf3bfd Mon Sep 17 00:00:00 2001 From: Jason Frame Date: Thu, 31 Jan 2019 15:42:27 +1000 Subject: [PATCH 4/6] pr changes --- .../pegasys/pantheon/config/JsonGenesisConfigOptions.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config/src/main/java/tech/pegasys/pantheon/config/JsonGenesisConfigOptions.java b/config/src/main/java/tech/pegasys/pantheon/config/JsonGenesisConfigOptions.java index 305093927e..9b2e90fe62 100644 --- a/config/src/main/java/tech/pegasys/pantheon/config/JsonGenesisConfigOptions.java +++ b/config/src/main/java/tech/pegasys/pantheon/config/JsonGenesisConfigOptions.java @@ -21,7 +21,7 @@ public class JsonGenesisConfigOptions implements GenesisConfigOptions { private static final String ETHASH_CONFIG_KEY = "ethash"; private static final String IBFT_CONFIG_KEY = "ibft"; - private static final String REVISED_IBFT_CONFIG_KEY = "ibft2"; + private static final String IBFT2_CONFIG_KEY = "ibft2"; private static final String CLIQUE_CONFIG_KEY = "clique"; private final JsonObject configRoot; @@ -46,7 +46,7 @@ public boolean isClique() { @Override public boolean isIbft2() { - return configRoot.containsKey(REVISED_IBFT_CONFIG_KEY); + return configRoot.containsKey(IBFT2_CONFIG_KEY); } @Override @@ -59,7 +59,7 @@ public IbftConfigOptions getIbftConfigOptions() { @Override public IbftConfigOptions getIbft2ConfigOptions() { return isIbft2() - ? new IbftConfigOptions(configRoot.getJsonObject(REVISED_IBFT_CONFIG_KEY)) + ? new IbftConfigOptions(configRoot.getJsonObject(IBFT2_CONFIG_KEY)) : IbftConfigOptions.DEFAULT; } From 538857116a68df8066730c43dba84e9b1b63e461 Mon Sep 17 00:00:00 2001 From: Jason Frame Date: Thu, 31 Jan 2019 15:53:27 +1000 Subject: [PATCH 5/6] rename ibft in config methods to ibftLegacy --- .../pantheon/config/GenesisConfigOptions.java | 4 ++-- .../pantheon/config/JsonGenesisConfigOptions.java | 6 +++--- .../pantheon/config/StubGenesisConfigOptions.java | 4 ++-- .../pantheon/config/GenesisConfigOptionsTest.java | 14 +++++++------- .../pantheon/config/IbftConfigOptionsTest.java | 2 +- .../consensus/ibft/IbftProtocolSchedule.java | 2 +- .../consensus/ibftlegacy/IbftProtocolSchedule.java | 2 +- .../controller/IbftLegacyPantheonController.java | 3 ++- .../pantheon/controller/PantheonController.java | 2 +- 9 files changed, 20 insertions(+), 19 deletions(-) diff --git a/config/src/main/java/tech/pegasys/pantheon/config/GenesisConfigOptions.java b/config/src/main/java/tech/pegasys/pantheon/config/GenesisConfigOptions.java index 6a0f326c19..8d9673c16f 100644 --- a/config/src/main/java/tech/pegasys/pantheon/config/GenesisConfigOptions.java +++ b/config/src/main/java/tech/pegasys/pantheon/config/GenesisConfigOptions.java @@ -19,13 +19,13 @@ public interface GenesisConfigOptions { boolean isEthHash(); - boolean isIbft(); + boolean isIbftLegacy(); boolean isIbft2(); boolean isClique(); - IbftConfigOptions getIbftConfigOptions(); + IbftConfigOptions getIbftLegacyConfigOptions(); CliqueConfigOptions getCliqueConfigOptions(); diff --git a/config/src/main/java/tech/pegasys/pantheon/config/JsonGenesisConfigOptions.java b/config/src/main/java/tech/pegasys/pantheon/config/JsonGenesisConfigOptions.java index 9b2e90fe62..bbb8f9b4d4 100644 --- a/config/src/main/java/tech/pegasys/pantheon/config/JsonGenesisConfigOptions.java +++ b/config/src/main/java/tech/pegasys/pantheon/config/JsonGenesisConfigOptions.java @@ -35,7 +35,7 @@ public boolean isEthHash() { } @Override - public boolean isIbft() { + public boolean isIbftLegacy() { return configRoot.containsKey(IBFT_CONFIG_KEY); } @@ -50,8 +50,8 @@ public boolean isIbft2() { } @Override - public IbftConfigOptions getIbftConfigOptions() { - return isIbft() + public IbftConfigOptions getIbftLegacyConfigOptions() { + return isIbftLegacy() ? new IbftConfigOptions(configRoot.getJsonObject(IBFT_CONFIG_KEY)) : IbftConfigOptions.DEFAULT; } diff --git a/config/src/test-support/java/tech/pegasys/pantheon/config/StubGenesisConfigOptions.java b/config/src/test-support/java/tech/pegasys/pantheon/config/StubGenesisConfigOptions.java index f15645ed5a..6ab5abbf7e 100644 --- a/config/src/test-support/java/tech/pegasys/pantheon/config/StubGenesisConfigOptions.java +++ b/config/src/test-support/java/tech/pegasys/pantheon/config/StubGenesisConfigOptions.java @@ -32,7 +32,7 @@ public boolean isEthHash() { } @Override - public boolean isIbft() { + public boolean isIbftLegacy() { return false; } @@ -47,7 +47,7 @@ public boolean isIbft2() { } @Override - public IbftConfigOptions getIbftConfigOptions() { + public IbftConfigOptions getIbftLegacyConfigOptions() { return IbftConfigOptions.DEFAULT; } diff --git a/config/src/test/java/tech/pegasys/pantheon/config/GenesisConfigOptionsTest.java b/config/src/test/java/tech/pegasys/pantheon/config/GenesisConfigOptionsTest.java index a7fac49800..b14359ed77 100644 --- a/config/src/test/java/tech/pegasys/pantheon/config/GenesisConfigOptionsTest.java +++ b/config/src/test/java/tech/pegasys/pantheon/config/GenesisConfigOptionsTest.java @@ -37,17 +37,17 @@ public void shouldNotUseEthHashIfEthHashNotPresent() { } @Test - public void shouldUseIbftWhenIbftInConfig() { + public void shouldUseIbftLegacyWhenIbftInConfig() { final GenesisConfigOptions config = fromConfigOptions(singletonMap("ibft", emptyMap())); - assertThat(config.isIbft()).isTrue(); - assertThat(config.getIbftConfigOptions()).isNotSameAs(IbftConfigOptions.DEFAULT); + assertThat(config.isIbftLegacy()).isTrue(); + assertThat(config.getIbftLegacyConfigOptions()).isNotSameAs(IbftConfigOptions.DEFAULT); } @Test - public void shouldNotUseIbftIfIbftNotPresent() { + public void shouldNotUseIbftLegacyIfIbftNotPresent() { final GenesisConfigOptions config = fromConfigOptions(emptyMap()); - assertThat(config.isIbft()).isFalse(); - assertThat(config.getIbftConfigOptions()).isSameAs(IbftConfigOptions.DEFAULT); + assertThat(config.isIbftLegacy()).isFalse(); + assertThat(config.getIbftLegacyConfigOptions()).isSameAs(IbftConfigOptions.DEFAULT); } @Test @@ -130,7 +130,7 @@ public void shouldGetChainIdWhenSpecified() { public void shouldSupportEmptyGenesisConfig() { final GenesisConfigOptions config = GenesisConfigFile.fromConfig("{}").getConfigOptions(); assertThat(config.isEthHash()).isFalse(); - assertThat(config.isIbft()).isFalse(); + assertThat(config.isIbftLegacy()).isFalse(); assertThat(config.isClique()).isFalse(); assertThat(config.getHomesteadBlockNumber()).isEmpty(); } diff --git a/config/src/test/java/tech/pegasys/pantheon/config/IbftConfigOptionsTest.java b/config/src/test/java/tech/pegasys/pantheon/config/IbftConfigOptionsTest.java index 18add31e3a..161e1be1ff 100644 --- a/config/src/test/java/tech/pegasys/pantheon/config/IbftConfigOptionsTest.java +++ b/config/src/test/java/tech/pegasys/pantheon/config/IbftConfigOptionsTest.java @@ -84,6 +84,6 @@ private IbftConfigOptions fromConfigOptions(final Map ibftConfig return GenesisConfigFile.fromConfig( new JsonObject(singletonMap("config", singletonMap("ibft", ibftConfigOptions)))) .getConfigOptions() - .getIbftConfigOptions(); + .getIbftLegacyConfigOptions(); } } diff --git a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/IbftProtocolSchedule.java b/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/IbftProtocolSchedule.java index f7157a5b8d..014028980e 100644 --- a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/IbftProtocolSchedule.java +++ b/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/IbftProtocolSchedule.java @@ -35,7 +35,7 @@ public class IbftProtocolSchedule { private static final int DEFAULT_CHAIN_ID = 1; public static ProtocolSchedule create(final GenesisConfigOptions config) { - final IbftConfigOptions ibftConfig = config.getIbftConfigOptions(); + final IbftConfigOptions ibftConfig = config.getIbftLegacyConfigOptions(); final long epochLength = ibftConfig.getEpochLength(); final long blockPeriod = ibftConfig.getBlockPeriodSeconds(); final EpochManager epochManager = new EpochManager(epochLength); diff --git a/consensus/ibftlegacy/src/main/java/tech/pegasys/pantheon/consensus/ibftlegacy/IbftProtocolSchedule.java b/consensus/ibftlegacy/src/main/java/tech/pegasys/pantheon/consensus/ibftlegacy/IbftProtocolSchedule.java index f0f1b0e89c..1e45af85d0 100644 --- a/consensus/ibftlegacy/src/main/java/tech/pegasys/pantheon/consensus/ibftlegacy/IbftProtocolSchedule.java +++ b/consensus/ibftlegacy/src/main/java/tech/pegasys/pantheon/consensus/ibftlegacy/IbftProtocolSchedule.java @@ -37,7 +37,7 @@ public class IbftProtocolSchedule { private static final int DEFAULT_CHAIN_ID = 1; public static ProtocolSchedule create(final GenesisConfigOptions config) { - final IbftConfigOptions ibftConfig = config.getIbftConfigOptions(); + final IbftConfigOptions ibftConfig = config.getIbftLegacyConfigOptions(); final long epochLength = ibftConfig.getEpochLength(); final long blockPeriod = ibftConfig.getBlockPeriodSeconds(); final EpochManager epochManager = new EpochManager(epochLength); diff --git a/pantheon/src/main/java/tech/pegasys/pantheon/controller/IbftLegacyPantheonController.java b/pantheon/src/main/java/tech/pegasys/pantheon/controller/IbftLegacyPantheonController.java index d93a1f1453..1ff5aaec5b 100644 --- a/pantheon/src/main/java/tech/pegasys/pantheon/controller/IbftLegacyPantheonController.java +++ b/pantheon/src/main/java/tech/pegasys/pantheon/controller/IbftLegacyPantheonController.java @@ -120,7 +120,8 @@ public static PantheonController init( final WorldStateArchive worldStateArchive = new WorldStateArchive(worldStateStorage); genesisState.writeStateTo(worldStateArchive.getMutable(Hash.EMPTY_TRIE_HASH)); - final IbftConfigOptions ibftConfig = genesisConfig.getConfigOptions().getIbftConfigOptions(); + final IbftConfigOptions ibftConfig = + genesisConfig.getConfigOptions().getIbftLegacyConfigOptions(); final EpochManager epochManager = new EpochManager(ibftConfig.getEpochLength()); final VoteTally voteTally = diff --git a/pantheon/src/main/java/tech/pegasys/pantheon/controller/PantheonController.java b/pantheon/src/main/java/tech/pegasys/pantheon/controller/PantheonController.java index 4cad6b8cac..2d91c71c64 100644 --- a/pantheon/src/main/java/tech/pegasys/pantheon/controller/PantheonController.java +++ b/pantheon/src/main/java/tech/pegasys/pantheon/controller/PantheonController.java @@ -71,7 +71,7 @@ static PantheonController fromConfig( networkId, nodeKeys, metricsSystem); - } else if (configOptions.isIbft()) { + } else if (configOptions.isIbftLegacy()) { return IbftLegacyPantheonController.init( storageProvider, genesisConfigFile, From ce151e4f981f1e0a1e188a71a9005e5f1ee82b27 Mon Sep 17 00:00:00 2001 From: Jason Frame Date: Thu, 31 Jan 2019 16:01:45 +1000 Subject: [PATCH 6/6] pr changes --- .../pegasys/pantheon/config/JsonGenesisConfigOptions.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config/src/main/java/tech/pegasys/pantheon/config/JsonGenesisConfigOptions.java b/config/src/main/java/tech/pegasys/pantheon/config/JsonGenesisConfigOptions.java index bbb8f9b4d4..18ee4ad291 100644 --- a/config/src/main/java/tech/pegasys/pantheon/config/JsonGenesisConfigOptions.java +++ b/config/src/main/java/tech/pegasys/pantheon/config/JsonGenesisConfigOptions.java @@ -20,7 +20,7 @@ public class JsonGenesisConfigOptions implements GenesisConfigOptions { private static final String ETHASH_CONFIG_KEY = "ethash"; - private static final String IBFT_CONFIG_KEY = "ibft"; + private static final String IBFT_LEGACY_CONFIG_KEY = "ibft"; private static final String IBFT2_CONFIG_KEY = "ibft2"; private static final String CLIQUE_CONFIG_KEY = "clique"; private final JsonObject configRoot; @@ -36,7 +36,7 @@ public boolean isEthHash() { @Override public boolean isIbftLegacy() { - return configRoot.containsKey(IBFT_CONFIG_KEY); + return configRoot.containsKey(IBFT_LEGACY_CONFIG_KEY); } @Override @@ -52,7 +52,7 @@ public boolean isIbft2() { @Override public IbftConfigOptions getIbftLegacyConfigOptions() { return isIbftLegacy() - ? new IbftConfigOptions(configRoot.getJsonObject(IBFT_CONFIG_KEY)) + ? new IbftConfigOptions(configRoot.getJsonObject(IBFT_LEGACY_CONFIG_KEY)) : IbftConfigOptions.DEFAULT; }