This repository has been archived by the owner on Sep 26, 2019. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 130
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Ibft split extradata validation rule into components (#581)
In order to validate a block separate to its commit seals, the commit seals must be validated separately to the validator content of the block. At this stage, the commit rule is _not_ light, however this change is to be conducted in subsequent PRs.
- Loading branch information
Showing
6 changed files
with
239 additions
and
142 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
76 changes: 76 additions & 0 deletions
76
.../pegasys/pantheon/consensus/ibft/headervalidationrules/IbftCommitSealsValidationRule.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,76 @@ | ||
| /* | ||
| * Copyright 2019 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. | ||
| */ | ||
| package tech.pegasys.pantheon.consensus.ibft.headervalidationrules; | ||
|
|
||
| import static tech.pegasys.pantheon.consensus.ibft.IbftHelpers.calculateRequiredValidatorQuorum; | ||
|
|
||
| import tech.pegasys.pantheon.consensus.common.ValidatorProvider; | ||
| import tech.pegasys.pantheon.consensus.ibft.IbftBlockHashing; | ||
| import tech.pegasys.pantheon.consensus.ibft.IbftContext; | ||
| import tech.pegasys.pantheon.consensus.ibft.IbftExtraData; | ||
| import tech.pegasys.pantheon.ethereum.ProtocolContext; | ||
| import tech.pegasys.pantheon.ethereum.core.Address; | ||
| import tech.pegasys.pantheon.ethereum.core.BlockHeader; | ||
| import tech.pegasys.pantheon.ethereum.mainnet.AttachedBlockHeaderValidationRule; | ||
|
|
||
| import java.util.Collection; | ||
| import java.util.List; | ||
|
|
||
| import org.apache.logging.log4j.LogManager; | ||
| import org.apache.logging.log4j.Logger; | ||
|
|
||
| /** | ||
| * Ensures the commit seals in the block header were created by known validators (as determined by | ||
| * tracking votes and validator state on the blockchain). | ||
| * | ||
| * <p>This also ensures sufficient commit seals exist in the block to make it valid. | ||
| */ | ||
| public class IbftCommitSealsValidationRule | ||
| implements AttachedBlockHeaderValidationRule<IbftContext> { | ||
|
|
||
| private static final Logger LOGGER = LogManager.getLogger(); | ||
|
|
||
| @Override | ||
| public boolean validate( | ||
| final BlockHeader header, | ||
| final BlockHeader parent, | ||
| final ProtocolContext<IbftContext> protocolContext) { | ||
| final ValidatorProvider validatorProvider = protocolContext.getConsensusState().getVoteTally(); | ||
| final IbftExtraData ibftExtraData = IbftExtraData.decode(header.getExtraData()); | ||
|
|
||
| final List<Address> committers = | ||
| IbftBlockHashing.recoverCommitterAddresses(header, ibftExtraData); | ||
|
|
||
| return validateCommitters(committers, validatorProvider.getValidators()); | ||
| } | ||
|
|
||
| private boolean validateCommitters( | ||
| final Collection<Address> committers, final Collection<Address> storedValidators) { | ||
|
|
||
| final int minimumSealsRequired = calculateRequiredValidatorQuorum(storedValidators.size()); | ||
| if (committers.size() < minimumSealsRequired) { | ||
| LOGGER.trace( | ||
| "Insufficient committers to seal block. (Required {}, received {})", | ||
| minimumSealsRequired, | ||
| committers.size()); | ||
| return false; | ||
| } | ||
|
|
||
| if (!storedValidators.containsAll(committers)) { | ||
| LOGGER.trace("Not all committers are in the locally maintained validator list."); | ||
| return false; | ||
| } | ||
|
|
||
| return true; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
52 changes: 52 additions & 0 deletions
52
...ch/pegasys/pantheon/consensus/ibft/headervalidationrules/HeaderValidationTestHelpers.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,52 @@ | ||
| /* | ||
| * Copyright 2019 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. | ||
| */ | ||
| package tech.pegasys.pantheon.consensus.ibft.headervalidationrules; | ||
|
|
||
| import tech.pegasys.pantheon.consensus.ibft.IbftExtraData; | ||
| import tech.pegasys.pantheon.consensus.ibft.IbftExtraDataFixture; | ||
| import tech.pegasys.pantheon.consensus.ibft.Vote; | ||
| import tech.pegasys.pantheon.crypto.SECP256K1.KeyPair; | ||
| import tech.pegasys.pantheon.ethereum.core.Address; | ||
| import tech.pegasys.pantheon.ethereum.core.BlockHeader; | ||
| import tech.pegasys.pantheon.ethereum.core.BlockHeaderTestFixture; | ||
| import tech.pegasys.pantheon.util.bytes.BytesValue; | ||
|
|
||
| import java.util.List; | ||
| import java.util.Optional; | ||
|
|
||
| public class HeaderValidationTestHelpers { | ||
|
|
||
| public static BlockHeader createProposedBlockHeader( | ||
| final List<Address> validators, | ||
| final List<KeyPair> committerKeyPairs, | ||
| final boolean useDifferentRoundNumbersForCommittedSeals) { | ||
| final int BASE_ROUND_NUMBER = 5; | ||
| final BlockHeaderTestFixture builder = new BlockHeaderTestFixture(); | ||
| builder.number(1); // must NOT be block 0, as that should not contain seals at all | ||
|
|
||
| final BlockHeader header = builder.buildHeader(); | ||
|
|
||
| final IbftExtraData ibftExtraData = | ||
| IbftExtraDataFixture.createExtraData( | ||
| header, | ||
| BytesValue.wrap(new byte[IbftExtraData.EXTRA_VANITY_LENGTH]), | ||
| Optional.of(Vote.authVote(Address.fromHexString("1"))), | ||
| validators, | ||
| committerKeyPairs, | ||
| BASE_ROUND_NUMBER, | ||
| useDifferentRoundNumbersForCommittedSeals); | ||
|
|
||
| builder.extraData(ibftExtraData.encode()); | ||
| return builder.buildHeader(); | ||
| } | ||
| } |
Oops, something went wrong.