status-im
/
nim-eth
mirror of https://github.com/status-im/nim-eth.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Change update back to use var parameter of Record

This commit is contained in:
kdeme 2020-07-08 14:23:43 +02:00
parent d3db83fa0a
commit 4f3df3c9b2
No known key found for this signature in database
GPG Key ID: 4E8DD21420AF43F5
3 changed files with 42 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
eth/p2p/discoveryv5/enr.nim
View File

@ -233,8 +233,8 @@ proc find(r: Record, key: string): Option[int] =
if k == key: if k == key:
return some(i) return some(i)
proc update*(record: Record, pk: PrivateKey, fieldPairs: openarray[FieldPair]): proc update*(record: var Record, pk: PrivateKey,
EnrResult[Record] = fieldPairs: openarray[FieldPair]): EnrResult[void] =
var r = record var r = record
let pubkey = r.get(PublicKey) let pubkey = r.get(PublicKey)
@ -262,14 +262,15 @@ proc update*(record: Record, pk: PrivateKey, fieldPairs: openarray[FieldPair]):
return err("Maximum sequence number reached") return err("Maximum sequence number reached")
r.seqNum.inc() r.seqNum.inc()
r.raw = ? makeEnrRaw(r.seqNum, pk, r.pairs) r.raw = ? makeEnrRaw(r.seqNum, pk, r.pairs)
record = r
ok(r) ok()
proc update*(r: Record, pk: PrivateKey, proc update*(r: var Record, pk: PrivateKey,
ip: Option[ValidIpAddress], ip: Option[ValidIpAddress],
tcpPort, udpPort: Port, tcpPort, udpPort: Port,
extraFields: openarray[FieldPair] = []): extraFields: openarray[FieldPair] = []):
EnrResult[Record] = EnrResult[void] =
var fields = newSeq[FieldPair]() var fields = newSeq[FieldPair]()
fields.addAddress(ip, tcpPort, udpPort) fields.addAddress(ip, tcpPort, udpPort)

30
eth/p2p/discoveryv5/protocol.nim
View File

@ -178,8 +178,9 @@ func getRecord*(d: Protocol): Record =
proc updateRecord*( proc updateRecord*(
d: Protocol, enrFields: openarray[(string, seq[byte])]): DiscResult[void] = d: Protocol, enrFields: openarray[(string, seq[byte])]): DiscResult[void] =
let fields = mapIt(enrFields, toFieldPair(it[0], it[1])) let fields = mapIt(enrFields, toFieldPair(it[0], it[1]))
d.localNode.record = ? d.localNode.record.update(d.privateKey, fields) d.localNode.record.update(d.privateKey, fields)
ok() # TODO: Would it make sense to actively ping ("broadcast") to all the peers
# we stored a handshake with in order to get that ENR updated?
proc send(d: Protocol, a: Address, data: seq[byte]) = proc send(d: Protocol, a: Address, data: seq[byte]) =
let ta = initTAddress(a.ip, a.port) let ta = initTAddress(a.ip, a.port)
@ -710,18 +711,19 @@ proc newProtocol*(privKey: PrivateKey, db: Database,
# Anyhow, nim-beacon-chain would also require some changes to support port # Anyhow, nim-beacon-chain would also require some changes to support port
# remapping through NAT and this API is also subject to change once we # remapping through NAT and this API is also subject to change once we
# introduce support for ipv4 + ipv6 binding/listening. # introduce support for ipv4 + ipv6 binding/listening.
let let extraFields = mapIt(localEnrFields, toFieldPair(it[0], it[1]))
extraFields = mapIt(localEnrFields, toFieldPair(it[0], it[1])) # TODO:
# TODO: # - Defect as is now or return a result for enr errors?
# - Defect as is now or return a result for enr errors? # - In case incorrect key, allow for new enr based on new key (new node id)?
# - In case incorrect key, allow for new enr based on new key (new node id)? var record: Record
enr = if previousRecord.isSome(): if previousRecord.isSome():
previousRecord.get().update(privKey, externalIp, tcpPort, udpPort, record = previousRecord.get()
extraFields).expect("Record within size limits and correct key") record.update(privKey, externalIp, tcpPort, udpPort,
else: extraFields).expect("Record within size limits and correct key")
enr.Record.init(1, privKey, externalIp, tcpPort, udpPort, else:
extraFields).expect("Record within size limits") record = enr.Record.init(1, privKey, externalIp, tcpPort, udpPort,
node = newNode(enr).expect("Properly initialized record") extraFields).expect("Record within size limits")
let node = newNode(record).expect("Properly initialized record")
# TODO Consider whether this should be a Defect # TODO Consider whether this should be a Defect
doAssert rng != nil, "RNG initialization failed" doAssert rng != nil, "RNG initialization failed"

39
tests/p2p/test_enr.nim
View File

@ -95,26 +95,23 @@ suite "ENR":
var r = Record.init(1, pk, none(ValidIpAddress), Port(9000), Port(9000))[] var r = Record.init(1, pk, none(ValidIpAddress), Port(9000), Port(9000))[]
block: # Insert new k:v pair, update of seqNum should occur. block: # Insert new k:v pair, update of seqNum should occur.
let res = r.update(pk, [newField]) let updated = r.update(pk, [newField])
check res.isOk() check updated.isOk()
r = res[]
check: check:
r.get("test", uint) == 123 r.get("test", uint) == 123
r.seqNum == 2 r.seqNum == 2
block: # Insert same k:v pair, no update of seqNum should occur. block: # Insert same k:v pair, no update of seqNum should occur.
let res = r.update(pk, [newField]) let updated = r.update(pk, [newField])
check res.isOk() check updated.isOk()
r = res[]
check: check:
r.get("test", uint) == 123 r.get("test", uint) == 123
r.seqNum == 2 r.seqNum == 2
block: # Insert k:v pair with changed value, update of seqNum should occur. block: # Insert k:v pair with changed value, update of seqNum should occur.
let updatedField = toFieldPair("test", 1234'u) let updatedField = toFieldPair("test", 1234'u)
let res = r.update(pk, [updatedField]) let updated = r.update(pk, [updatedField])
check res.isOk() check updated.isOk()
r = res[]
check: check:
r.get("test", uint) == 1234 r.get("test", uint) == 1234
r.seqNum == 3 r.seqNum == 3
@ -130,9 +127,9 @@ suite "ENR":
let newField = toFieldPair("test", 123'u) let newField = toFieldPair("test", 123'u)
let newField2 = toFieldPair("zzz", 123'u) let newField2 = toFieldPair("zzz", 123'u)
let res = r.update(pk, [newField, newField2]) let updated = r.update(pk, [newField, newField2])
check res.isOk() check updated.isOk()
check $res[] == """(123: "abc", a12: 1, abc: 1234, id: "v4", secp256k1: 0x02E51EFA66628CE09F689BC2B82F165A75A9DDECBB6A804BE15AC3FDF41F3B34E7, test: 123, z: 0x00, zzz: 123)""" check $r == """(123: "abc", a12: 1, abc: 1234, id: "v4", secp256k1: 0x02E51EFA66628CE09F689BC2B82F165A75A9DDECBB6A804BE15AC3FDF41F3B34E7, test: 123, z: 0x00, zzz: 123)"""
test "ENR update size too big": test "ENR update size too big":
let pk = PrivateKey.fromHex( let pk = PrivateKey.fromHex(
@ -142,8 +139,8 @@ suite "ENR":
check r.isOk() check r.isOk()
let newField = toFieldPair("test", 123'u) let newField = toFieldPair("test", 123'u)
let res = r[].update(pk, [newField]) let updated = r[].update(pk, [newField])
check res.isErr() check updated.isErr()
test "ENR update invalid key": test "ENR update invalid key":
let pk = PrivateKey.fromHex( let pk = PrivateKey.fromHex(
@ -155,8 +152,8 @@ suite "ENR":
let let
wrongPk = PrivateKey.random(rng[]) wrongPk = PrivateKey.random(rng[])
newField = toFieldPair("test", 123'u) newField = toFieldPair("test", 123'u)
res = r[].update(wrongPk, [newField]) updated = r[].update(wrongPk, [newField])
check res.isErr() check updated.isErr()
test "ENR update address": test "ENR update address":
let let
@ -165,18 +162,16 @@ suite "ENR":
var r = Record.init(1, pk, none(ValidIpAddress), Port(9000), Port(9000))[] var r = Record.init(1, pk, none(ValidIpAddress), Port(9000), Port(9000))[]
block: block:
let res = r.update(pk, none(ValidIpAddress), Port(9000), Port(9000)) let updated = r.update(pk, none(ValidIpAddress), Port(9000), Port(9000))
check res.isOk() check updated.isOk()
r = res[]
check: check:
r.get("tcp", uint) == 9000 r.get("tcp", uint) == 9000
r.get("udp", uint) == 9000 r.get("udp", uint) == 9000
r.seqNum == 1 r.seqNum == 1
block: block:
let res = r.update(pk, none(ValidIpAddress), Port(9001), Port(9002)) let updated = r.update(pk, none(ValidIpAddress), Port(9001), Port(9002))
check res.isOk() check updated.isOk()
r = res[]
check: check:
r.get("tcp", uint) == 9001 r.get("tcp", uint) == 9001
r.get("udp", uint) == 9002 r.get("udp", uint) == 9002