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.
Added IBFT Proposed block creation classes
IBFT requires various aspects of the mining infrastructure in order to create a proposed block. This includes specifically the BlockCreator and MiningCoordinating, the mining executor is not required at this stage, nor is the miner.
- Loading branch information
tmohay
committed
Nov 21, 2018
1 parent
4d95c60
commit 697694f
Showing
17 changed files
with
277 additions
and
105 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
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
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
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
25 changes: 25 additions & 0 deletions
25
consensus/common/src/main/java/tech/pegasys/pantheon/consensus/common/ConsensusHelpers.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,25 @@ | ||
/* | ||
* Copyright 2018 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.common; | ||
|
||
import tech.pegasys.pantheon.util.bytes.BytesValue; | ||
import tech.pegasys.pantheon.util.bytes.BytesValues; | ||
|
||
public class ConsensusHelpers { | ||
|
||
public static BytesValue zeroLeftPad(final BytesValue input, final int requiredLength) { | ||
final int paddingByteCount = Math.max(0, requiredLength - input.size()); | ||
return BytesValues.concatenate(BytesValue.wrap(new byte[paddingByteCount]), input) | ||
.slice(0, requiredLength); | ||
} | ||
} |
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
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
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
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
110 changes: 110 additions & 0 deletions
110
...main/java/tech/pegasys/pantheon/consensus/ibft/blockcreation/IbftBlockCreatorFactory.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,110 @@ | ||
/* | ||
* Copyright 2018 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.blockcreation; | ||
|
||
import tech.pegasys.pantheon.consensus.common.ConsensusHelpers; | ||
import tech.pegasys.pantheon.consensus.common.ValidatorVote; | ||
import tech.pegasys.pantheon.consensus.common.VoteTally; | ||
import tech.pegasys.pantheon.consensus.ibft.IbftContext; | ||
import tech.pegasys.pantheon.consensus.ibft.IbftExtraData; | ||
import tech.pegasys.pantheon.consensus.ibft.Vote; | ||
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.core.MiningParameters; | ||
import tech.pegasys.pantheon.ethereum.core.PendingTransactions; | ||
import tech.pegasys.pantheon.ethereum.core.Wei; | ||
import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; | ||
import tech.pegasys.pantheon.util.bytes.BytesValue; | ||
|
||
import java.util.ArrayList; | ||
import java.util.Collections; | ||
import java.util.List; | ||
import java.util.Optional; | ||
import java.util.function.Function; | ||
|
||
public class IbftBlockCreatorFactory { | ||
|
||
private final Function<Long, Long> gasLimitCalculator; | ||
private final PendingTransactions pendingTransactions; | ||
protected final ProtocolContext<IbftContext> protocolContext; | ||
protected final ProtocolSchedule<IbftContext> protocolSchedule; | ||
private final Address localAddress; | ||
|
||
private volatile BytesValue vanityData; | ||
private volatile Wei minTransactionGasPrice; | ||
|
||
public IbftBlockCreatorFactory( | ||
final Function<Long, Long> gasLimitCalculator, | ||
final PendingTransactions pendingTransactions, | ||
final ProtocolContext<IbftContext> protocolContext, | ||
final ProtocolSchedule<IbftContext> protocolSchedule, | ||
final MiningParameters miningParams, | ||
final Address localAddress) { | ||
this.gasLimitCalculator = gasLimitCalculator; | ||
this.pendingTransactions = pendingTransactions; | ||
this.protocolContext = protocolContext; | ||
this.protocolSchedule = protocolSchedule; | ||
this.localAddress = localAddress; | ||
this.minTransactionGasPrice = miningParams.getMinTransactionGasPrice(); | ||
this.vanityData = miningParams.getExtraData(); | ||
} | ||
|
||
public IbftBlockCreator create(final BlockHeader parentHeader, final int round) { | ||
return new IbftBlockCreator( | ||
localAddress, | ||
ph -> createExtraData(round), | ||
pendingTransactions, | ||
protocolContext, | ||
protocolSchedule, | ||
gasLimitCalculator, | ||
minTransactionGasPrice, | ||
parentHeader); | ||
} | ||
|
||
public void setExtraData(final BytesValue extraData) { | ||
this.vanityData = extraData.copy(); | ||
} | ||
|
||
public void setMinTransactionGasPrice(final Wei minTransactionGasPrice) { | ||
this.minTransactionGasPrice = minTransactionGasPrice.copy(); | ||
} | ||
|
||
public Wei getMinTransactionGasPrice() { | ||
return minTransactionGasPrice; | ||
} | ||
|
||
public BytesValue createExtraData(final int round) { | ||
final VoteTally voteTally = protocolContext.getConsensusState().getVoteTally(); | ||
final Optional<ValidatorVote> proposal = | ||
protocolContext.getConsensusState().getVoteProposer().getVote(localAddress, voteTally); | ||
|
||
final List<Address> validators = new ArrayList<>(voteTally.getCurrentValidators()); | ||
|
||
final IbftExtraData extraData = | ||
new IbftExtraData( | ||
ConsensusHelpers.zeroLeftPad(vanityData, IbftExtraData.EXTRA_VANITY_LENGTH), | ||
Collections.emptyList(), | ||
toVote(proposal), | ||
round, | ||
validators); | ||
|
||
return extraData.encode(); | ||
} | ||
|
||
private static Optional<Vote> toVote(final Optional<ValidatorVote> input) { | ||
return input | ||
.map(v -> Optional.of(new Vote(v.getRecipient(), v.getVotePolarity()))) | ||
.orElse(Optional.empty()); | ||
} | ||
} |
Oops, something went wrong.