status-im/nim-eth-p2p
2
0
Fork 0
mirror of https://github.com/status-im/nim-eth-p2p.git synced 2025-02-20 02:28:10 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #9 from status-im/peer-pool-preparations

Browse Source 
Api adaptation for PeerPool
This commit is contained in:
zah 2018-04-19 15:40:43 +03:00 committed by GitHub
commit 47657ac096
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
ethp2p/rlpx.nim
View File

@ -16,11 +16,11 @@ type
id: P2PNodeId # XXX: not fillet yed id: P2PNodeId # XXX: not fillet yed
socket: AsyncSocket socket: AsyncSocket
dispatcher: Dispatcher dispatcher: Dispatcher
# privKey: AesKey
networkId: int networkId: int
sessionSecrets: ConnectionSecret sessionSecrets: ConnectionSecret
connectionState: ConnectionState connectionState: ConnectionState
protocolStates: seq[RootRef] protocolStates: seq[RootRef]
remote*: Node
MessageHandler* = proc(x: Peer, data: var Rlp) MessageHandler* = proc(x: Peer, data: var Rlp)
@ -64,11 +64,6 @@ type
MalformedMessageError* = object of Exception MalformedMessageError* = object of Exception
KeyPair* = object
# XXX: This should probably be in eth_keys
pubKey*: PublicKey
privKey*: PrivateKey
const const
baseProtocolVersion = 4 baseProtocolVersion = 4
clienId = "Nimbus 0.1.0" clienId = "Nimbus 0.1.0"
@ -83,6 +78,8 @@ var
# Dispatcher # Dispatcher
# #
proc `$`*(p: Peer): string {.inline.} = $p.remote
proc hash(d: Dispatcher): int = proc hash(d: Dispatcher): int =
hash(d.protocolOffsets) hash(d.protocolOffsets)
@ -529,11 +526,10 @@ rlpxProtocol p2p, 0:
import typetraits import typetraits
proc rlpxConnect*(myKeys: KeyPair, remoteKey: PublicKey, proc rlpxConnect*(myKeys: KeyPair, remote: Node): Future[Peer] {.async.} =
address: Address): Future[Peer] {.async.} =
# TODO: Make sure to close the socket in case of exception # TODO: Make sure to close the socket in case of exception
result.socket = newAsyncSocket() result.socket = newAsyncSocket()
await result.socket.connect($address.ip, address.tcpPort) await result.socket.connect($remote.address.ip, remote.address.tcpPort)
const encryptionEnabled = true const encryptionEnabled = true
@ -548,12 +544,12 @@ proc rlpxConnect*(myKeys: KeyPair, remoteKey: PublicKey,
arr.toOpenArray(0, `arr Len` - 1) arr.toOpenArray(0, `arr Len` - 1)
var handshake = newHandshake({Initiator}) var handshake = newHandshake({Initiator})
handshake.host.seckey = myKeys.privKey handshake.host.seckey = myKeys.seckey
handshake.host.pubkey = myKeys.pubKey handshake.host.pubkey = myKeys.pubKey
var authMsg: array[AuthMessageMaxEIP8, byte] var authMsg: array[AuthMessageMaxEIP8, byte]
var authMsgLen = 0 var authMsgLen = 0
check authMessage(handshake, remoteKey, authMsg, authMsgLen, check authMessage(handshake, remote.pubkey, authMsg, authMsgLen,
encrypt = encryptionEnabled) encrypt = encryptionEnabled)
await result.socket.send(addr authMsg[0], authMsgLen) await result.socket.send(addr authMsg[0], authMsgLen)
@ -576,6 +572,7 @@ proc rlpxConnect*(myKeys: KeyPair, remoteKey: PublicKey,
result.dispatcher = getDispatcher(response.capabilities) result.dispatcher = getDispatcher(response.capabilities)
result.id = response.nodeId result.id = response.nodeId
result.connectionState = Connected result.connectionState = Connected
result.remote = remote
newSeq(result.protocolStates, gProtocols.len) newSeq(result.protocolStates, gProtocols.len)
# XXX: initialize the sub-protocol states # XXX: initialize the sub-protocol states