[ETCM-43][ETCM-46] Add opt-out field #675
Merged
Conversation
This file contains hidden or 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
ntallar
added
BREAKS CONFIG
ntallar
changed the title
ntallar
force-pushed
the
etcm-43-opt-out-header-field
branch
from
3f62ec0 to
0bea179
Compare
ntallar
force-pushed
the
etcm-43-opt-out-header-field
branch
from
0bea179 to
da98f44
Compare
Base automatically changed from
chore/blockchainconfig-as-caseclass
to
develop
September 17, 2020 13:39
ntallar
force-pushed
the
etcm-43-opt-out-header-field
branch
from
be1e679 to
a97f773
Compare
mirkoAlic
reviewed
Sep 17, 2020
| @@ -11,6 +11,8 @@ | |||
| atlantis-block-number = "0" | |||
| agharta-block-number = "0" | |||
| phoenix-block-number = "0" | |||
| # FIXME: Once the testnet is up an running we should determine this value | |||
There was a problem hiding this comment.
maybe we should provide a new file especially for the new testnet, WDTY?
There was a problem hiding this comment.
Should we still keep the configurations for a private testnet? It could get a bit messy given that we have private.conf, private.json and private-testnet.conf
We could have for our chains/ files:
- Keep private-testnet.conf (current private.conf) and private-testnet.json (current private.json), with private-testnet.conf having ecip1098 activated at block 0 as currently
- Add internal-testnet.conf and internal-tesnet.json for our testnet
We could have for our conf/ files:
- Have a testnet-changes.conf file with the testnet configuration overrides (i.e. disabling pruning and discovery)
- Have a private-testnet.conf and a internal-testnet.conf that would just select the correct chain
There was a problem hiding this comment.
maybe we could discuss this in a call.
mirkoAlic
reviewed
Sep 17, 2020
| val isEcip1098Activated = blockHeader.number >= blockchainConfig.ecip1098BlockNumber | ||
| val isOptOutDefined = blockHeader.optOut.isDefined | ||
|
|
||
| if(isEcip1098Activated && isOptOutDefined) Right(BlockHeaderValid) |
mirkoAlic
reviewed
Sep 17, 2020
| val emptyOmmerHash = ByteString(Hex.decode("1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347")) | ||
|
|
||
| def getEncodedWithoutNonce(blockHeader: BlockHeader): Array[Byte] = { | ||
| val rlpEncoded = blockHeader.toRLPEncodable match { | ||
| case rlpList: RLPList => | ||
| case rlpList: RLPList if rlpList.items.length == (NumberOfFields - 1) => |
There was a problem hiding this comment.
i prefer something like: if (isPreviousToEcip1089(rlpList) => WDYT?
There was a problem hiding this comment.
I found a way I preferred most, to not require the NumberOfFields value, I'll soon push it
mirkoAlic
reviewed
Sep 17, 2020
| RLPList(rlpList.items.dropRight(2): _*) | ||
|
|
||
| case rlpList: RLPList if rlpList.items.length == NumberOfFields => |
mirkoAlic
reviewed
Sep 17, 2020
| @@ -73,8 +81,17 @@ object BlockHeader { | |||
| implicit class BlockHeaderEnc(blockHeader: BlockHeader) extends RLPSerializable { | |||
There was a problem hiding this comment.
A comment regarding the reason behind optOut match { will help future generations i guess..hehe.
mirkoAlic
reviewed
Sep 17, 2020
| val headerWithOptOutInvalidlyOn = validBlockHeader.copy(optOut = Some(true)) | ||
|
|
||
| val validationResult = blockHeaderValidator.validate(headerWithOptOutInvalidlyOn, validParentBlockHeader) | ||
| validationResult shouldBe Left(HeaderOptOutError) |
There was a problem hiding this comment.
(minor) maybe we could provide differenciation between this scenario and the following one, i mean in terms of HeaderOptOutError description. Still not sure if is worthy, wdyt?
…more details to opt-out validation error
mmrozek
reviewed
Sep 21, 2020
src/main/scala/io/iohk/ethereum/consensus/ConsensusConfig.scala
Outdated
Show resolved
Hide resolved
added 3 commits
September 21, 2020 09:57
mmrozek
approved these changes
Sep 22, 2020
| @@ -135,7 +135,7 @@ class GenesisDataLoader( | |||
| extraData = genesisData.extraData, | |||
| mixHash = genesisData.mixHash.getOrElse(zeros(hashLength)), | |||
| nonce = genesisData.nonce, | |||
| optOut = None | |||
| treasuryOptOut = None | |||
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
First changes for supporting treasury (as specified here)
Depends on #674Proposed Solution
Pending
Testing