mirror of https://github.com/hyperledger/besu
Add 2/3n Commit count for IBFT blocks (#1906)
This allows Besu to interop with an Quorum IBFT-1 network which has been updated to use a 2/3 validator threshold, rather than 2F+1. Signed-off-by: Trent Mohay <trent.mohay@consensys.net>pull/1965/head
Trent Mohay
4 years ago
committed by
GitHub
parent
a4ffec24bc
commit
e2963d69af
@ -0,0 +1,71 @@ |
||||
/* |
||||
* Copyright ConsenSys AG. |
||||
* |
||||
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with |
||||
* the License. You may obtain a copy of the License at |
||||
* |
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
* |
||||
* Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on |
||||
* an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the |
||||
* specific language governing permissions and limitations under the License. |
||||
* |
||||
* SPDX-License-Identifier: Apache-2.0 |
||||
*/ |
||||
package org.hyperledger.besu.config; |
||||
|
||||
import java.util.Map; |
||||
|
||||
import com.fasterxml.jackson.databind.node.ObjectNode; |
||||
import com.google.common.collect.ImmutableMap; |
||||
|
||||
public class IbftLegacyConfigOptions { |
||||
|
||||
public static final IbftLegacyConfigOptions DEFAULT = |
||||
new IbftLegacyConfigOptions(JsonUtil.createEmptyObjectNode()); |
||||
|
||||
private static final long DEFAULT_EPOCH_LENGTH = 30_000; |
||||
private static final int DEFAULT_BLOCK_PERIOD_SECONDS = 1; |
||||
private static final int DEFAULT_ROUND_EXPIRY_SECONDS = 1; |
||||
private static final long DEFAULT_CEIL_2N_BY_3_BLOCK = 0L; |
||||
|
||||
private final ObjectNode ibftConfigRoot; |
||||
|
||||
IbftLegacyConfigOptions(final ObjectNode ibftConfigRoot) { |
||||
this.ibftConfigRoot = ibftConfigRoot; |
||||
} |
||||
|
||||
public long getEpochLength() { |
||||
return JsonUtil.getLong(ibftConfigRoot, "epochlength", DEFAULT_EPOCH_LENGTH); |
||||
} |
||||
|
||||
public int getBlockPeriodSeconds() { |
||||
return JsonUtil.getInt(ibftConfigRoot, "blockperiodseconds", DEFAULT_BLOCK_PERIOD_SECONDS); |
||||
} |
||||
|
||||
public int getRequestTimeoutSeconds() { |
||||
return JsonUtil.getInt(ibftConfigRoot, "requesttimeoutseconds", DEFAULT_ROUND_EXPIRY_SECONDS); |
||||
} |
||||
|
||||
public long getCeil2Nby3Block() { |
||||
return JsonUtil.getLong(ibftConfigRoot, "ceil2nby3block", DEFAULT_CEIL_2N_BY_3_BLOCK); |
||||
} |
||||
|
||||
Map<String, Object> asMap() { |
||||
final ImmutableMap.Builder<String, Object> builder = ImmutableMap.builder(); |
||||
if (ibftConfigRoot.has("epochlength")) { |
||||
builder.put("epochLength", getEpochLength()); |
||||
} |
||||
if (ibftConfigRoot.has("blockperiodseconds")) { |
||||
builder.put("blockPeriodSeconds", getBlockPeriodSeconds()); |
||||
} |
||||
if (ibftConfigRoot.has("requesttimeoutseconds")) { |
||||
builder.put("requestTimeoutSeconds", getRequestTimeoutSeconds()); |
||||
} |
||||
if (ibftConfigRoot.has("ceil2nby3block")) { |
||||
builder.put("ceil2nby3block", getCeil2Nby3Block()); |
||||
} |
||||
|
||||
return builder.build(); |
||||
} |
||||
} |
||||
Loading…
Reference in new issue