[ETCM-355] Send fork id to peers #1030
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| package io.iohk.ethereum.network.handshaker | ||
|
|
||
| import io.iohk.ethereum.forkid.ForkId | ||
| import io.iohk.ethereum.network.EtcPeerManagerActor.PeerInfo | ||
| import io.iohk.ethereum.network.EtcPeerManagerActor.RemoteStatus | ||
| import io.iohk.ethereum.network.p2p.Message | ||
| import io.iohk.ethereum.network.p2p.MessageSerializable | ||
| import io.iohk.ethereum.network.p2p.messages.ETH64 | ||
| import io.iohk.ethereum.network.p2p.messages.ProtocolVersions | ||
|
|
||
| case class EthNodeStatus64ExchangeState( | ||
| handshakerConfiguration: EtcHandshakerConfiguration | ||
| ) extends EtcNodeStatusExchangeState[ETH64.Status] { | ||
|
|
||
| import handshakerConfiguration._ | ||
|
|
||
| def applyResponseMessage: PartialFunction[Message, HandshakerState[PeerInfo]] = { case status: ETH64.Status => | ||
| // TODO: validate fork id of the remote peer | ||
| applyRemoteStatusMessage(RemoteStatus(status)) | ||
| } | ||
|
|
||
| override protected def createStatusMsg(): MessageSerializable = { | ||
| val bestBlockHeader = getBestBlockHeader() | ||
| val chainWeight = blockchain.getChainWeightByHash(bestBlockHeader.hash).get | ||
| val genesisHash = blockchainReader.genesisHeader.hash | ||
|
|
||
| val status = ETH64.Status( | ||
| protocolVersion = ProtocolVersions.ETH64.version, | ||
| networkId = peerConfiguration.networkId, | ||
| totalDifficulty = chainWeight.totalDifficulty, | ||
| bestHash = bestBlockHeader.hash, | ||
| genesisHash = genesisHash, | ||
| forkId = ForkId.create(genesisHash, blockchainConfig)(blockchainReader.getBestBlockNumber()) | ||
| ) | ||
|
|
||
| log.debug(s"Sending status $status") | ||
| status | ||
| } | ||
|
|
||
| } |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,76 @@ | ||
| package io.iohk.ethereum.network.p2p.messages | ||
|
|
||
| import akka.util.ByteString | ||
|
|
||
| import org.bouncycastle.util.encoders.Hex | ||
|
|
||
| import io.iohk.ethereum.forkid.ForkId | ||
| import io.iohk.ethereum.forkid.ForkId._ | ||
| import io.iohk.ethereum.network.p2p.Message | ||
| import io.iohk.ethereum.network.p2p.MessageSerializableImplicit | ||
| import io.iohk.ethereum.rlp.RLPImplicitConversions._ | ||
| import io.iohk.ethereum.rlp.RLPImplicits._ | ||
| import io.iohk.ethereum.rlp._ | ||
|
|
||
| object ETH64 { | ||
|
|
||
| case class Status( | ||
| protocolVersion: Int, | ||
| networkId: Int, | ||
| totalDifficulty: BigInt, | ||
| bestHash: ByteString, | ||
| genesisHash: ByteString, | ||
| forkId: ForkId | ||
| ) extends Message { | ||
|
|
||
| override def toString: String = | ||
| s"Status { " + | ||
| s"code: $code, " + | ||
| s"protocolVersion: $protocolVersion, " + | ||
| s"networkId: $networkId, " + | ||
| s"totalDifficulty: $totalDifficulty, " + | ||
| s"bestHash: ${Hex.toHexString(bestHash.toArray[Byte])}, " + | ||
| s"genesisHash: ${Hex.toHexString(genesisHash.toArray[Byte])}," + | ||
| s"forkId: $forkId," + | ||
| s"}" | ||
|
|
||
| override def toShortString: String = toString | ||
| override def code: Int = Codes.StatusCode | ||
| } | ||
|
|
||
| object Status { | ||
| implicit class StatusEnc(val underlyingMsg: Status) | ||
| extends MessageSerializableImplicit[Status](underlyingMsg) | ||
| with RLPSerializable { | ||
| override def code: Int = Codes.StatusCode | ||
|
|
||
| override def toRLPEncodable: RLPEncodeable = { | ||
| import msg._ | ||
| RLPList(protocolVersion, networkId, totalDifficulty, bestHash, genesisHash, forkId.toRLPEncodable) | ||
| } | ||
| } | ||
|
|
||
| implicit class StatusDec(val bytes: Array[Byte]) extends AnyVal { | ||
| def toStatus: Status = rawDecode(bytes) match { | ||
| case RLPList( | ||
| protocolVersion, | ||
| networkId, | ||
| totalDifficulty, | ||
| bestHash, | ||
| genesisHash, | ||
| forkId | ||
| ) => | ||
| Status( | ||
| protocolVersion, | ||
| networkId, | ||
| totalDifficulty, | ||
| bestHash, | ||
| genesisHash, | ||
| decode[ForkId](forkId) | ||
| ) | ||
|
|
||
| case _ => throw new RuntimeException("Cannot decode Status") | ||
| } | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
would be so cool to have this fail if a new block type is introduced. just a thought, no great ideas.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not sure what you mean here
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
thinking out loud:
and an ADT out of the capabilities?