status-im/nim-eth-p2p
2
0
Fork 0
mirror of https://github.com/status-im/nim-eth-p2p.git synced 2025-01-15 01:14:26 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #12 from status-im/discv4enode2

Browse Source 
ENode integration part 2.
This commit is contained in:
Yuriy Glukhov 2018-05-02 10:48:00 +03:00 committed by GitHub
commit 7c2e8daae4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ethp2p.nim
View File

@ -8,5 +8,5 @@
# MIT license (LICENSE-MIT) # MIT license (LICENSE-MIT)
# #
import ethp2p/ecies, ethp2p/auth, ethp2p/hexdump, ethp2p/enode import ethp2p/[ecies, auth, hexdump, enode, rlpxcrypt, discovery, kademlia]
export ecies, auth, enode, hexdump export ecies, auth, enode, hexdump, rlpxcrypt, discovery, kademlia

10
ethp2p/discovery.nim
View File

@ -162,7 +162,7 @@ proc sendNeighbours*(d: DiscoveryProtocol, node: Node, neighbours: seq[Node]) =
if nodes.len != 0: flush() if nodes.len != 0: flush()
proc newDiscoveryProtocol*(privKey: PrivateKey, address: Address, bootstrapNodes: openarray[string]): DiscoveryProtocol = proc newDiscoveryProtocol*(privKey: PrivateKey, address: Address, bootstrapNodes: openarray[ENode]): DiscoveryProtocol =
result.new() result.new()
result.privKey = privKey result.privKey = privKey
result.address = address result.address = address
@ -312,12 +312,16 @@ when isMainModule:
# let (remotePubkey, cmdId, payload) = unpack(m) # let (remotePubkey, cmdId, payload) = unpack(m)
# assert(remotePubkey.raw_key.toHex == privKey.public_key.raw_key.toHex) # assert(remotePubkey.raw_key.toHex == privKey.public_key.raw_key.toHex)
var bootnodes = newSeq[ENode]()
for item in LOCAL_BOOTNODES:
bootnodes.add(initENode(item))
let listenPort = Port(30310) let listenPort = Port(30310)
var address = Address(udpPort: listenPort, tcpPort: listenPort) var address = Address(udpPort: listenPort, tcpPort: listenPort)
address.ip.family = IpAddressFamily.IPv4 address.ip.family = IpAddressFamily.IPv4
let discovery = newDiscoveryProtocol(privkey, address, LOCAL_BOOTNODES) let discovery = newDiscoveryProtocol(privkey, address, bootnodes)
echo discovery.thisNode.pubkey echo discovery.thisNode.node.pubkey
echo "this_node.id: ", discovery.thisNode.id.toHex() echo "this_node.id: ", discovery.thisNode.id.toHex()
discovery.open() discovery.open()

5
ethp2p/kademlia.nim
View File

@ -61,6 +61,11 @@ proc newNode*(uriString: string): Node =
result.node = initENode(uriString) result.node = initENode(uriString)
result.id = result.node.pubkey.toNodeId() result.id = result.node.pubkey.toNodeId()
proc newNode*(enode: ENode): Node =
result.new()
result.node = enode
result.id = result.node.pubkey.toNodeId()
proc distanceTo(n: Node, id: NodeId): UInt256 = n.id xor id proc distanceTo(n: Node, id: NodeId): UInt256 = n.id xor id
proc `$`*(n: Node): string = proc `$`*(n: Node): string =