chore: Bump dependencies for v0.34

.gitmodules

@@ -179,3 +179,18 @@
 	branch = master
 	path = vendor/nph
 	url = https://github.com/arnetheduck/nph.git
+[submodule "vendor/nim-minilru"]
+	path = vendor/nim-minilru
+	url = https://github.com/status-im/nim-minilru.git
+	ignore = untracked
+	branch = master
+[submodule "vendor/nim-quic"]
+	path = vendor/nim-quic
+	url = https://github.com/status-im/nim-quic.git
+	ignore = untracked
+	branch = master
+[submodule "vendor/nim-ngtcp2"]
+	path = vendor/nim-ngtcp2
+	url = https://github.com/vacp2p/nim-ngtcp2.git
+	ignore = untracked
+	branch = master

apps/chat2bridge/chat2bridge.nim

@@ -1,7 +1,7 @@
 {.push raises: [].}
 
 import
-  std/[tables, times, strutils, hashes, sequtils],
+  std/[tables, times, strutils, hashes, sequtils, json],
   chronos,
   confutils,
   chronicles,
@@ -11,7 +11,6 @@ import
   metrics/chronos_httpserver,
   stew/byteutils,
   eth/net/nat,
-  json_rpc/rpcserver,
   # Matterbridge client imports
   # Waku v2 imports
   libp2p/crypto/crypto,

tests/common/test_enr_builder.nim

@@ -120,7 +120,7 @@ suite "nim-eth ENR - Ext: IP address and TCP/UDP ports":
       @(record.secp256k1.get()) == expectedPubKey
       record.ip == none(array[4, byte])
       record.tcp == none(uint16)
-      record.udp == none(uint16)
       record.ip6 == some(enrIpAddr.address_v6)
       record.tcp6 == none(uint16)
       record.udp6 == some(enrUdpPort.uint16)
+      record.udp == some(enrUdpPort.uint16)

tests/waku_discv5/utils.nim

@@ -1,4 +1,5 @@
 import
+  std/options,
   stew/results,
   stew/shims/net,
   chronos,

tests/waku_enr/utils.nim

@@ -1,4 +1,5 @@
 import
+  std/options,
   sequtils,
   stew/results,
   stew/shims/net,

tests/waku_rln_relay/test_rln_group_manager_onchain.nim

@@ -42,14 +42,14 @@ suite "Onchain group manager":
       manager.ethRpc.isSome()
       manager.wakuRlnContract.isSome()
       manager.initialized
-      manager.rlnContractDeployedBlockNumber > 0
+      manager.rlnContractDeployedBlockNumber > 0.Quantity
       manager.rlnRelayMaxMessageLimit == 100
 
     await manager.stop()
 
   asyncTest "should error on initialization when chainId does not match":
     let manager = await setup()
-    manager.chainId = CHAIN_ID + 1
+    manager.chainId = utils_onchain.CHAIN_ID + 1
 
     (await manager.init()).isErrOr:
       raiseAssert "Expected error when chainId does not match"

tests/waku_rln_relay/utils.nim

@@ -1,31 +1,32 @@
-import web3, chronos, options, stint
+import web3, chronos, options, stint, stew/byteutils
 
 proc deployContract*(
     web3: Web3, code: string, gasPrice = 0, contractInput = ""
 ): Future[ReceiptObject] {.async.} =
   # the contract input is the encoded version of contract constructor's input
   # use nim-web3/encoding.nim module to find the appropriate encoding procedure for different argument types
   # e.g., consider the following contract constructor in solidity
-  # 	constructor(uint256 x, uint256 y) 
+  # 	constructor(uint256 x, uint256 y)
   #
   # the contractInput can be calculated as follows
   # let
   #   x = 1.u256
   #   y = 5.u256
-  # contractInput = encode(x).data  &  encode(y).data 
+  # contractInput = encode(x).data  &  encode(y).data
   # Note that the order of encoded inputs should match the order of the constructor inputs
   let provider = web3.provider
   let accounts = await provider.eth_accounts()
 
   var code = code
   if code[1] notin {'x', 'X'}:
     code = "0x" & code
-  var tr: EthSend
-  tr.source = web3.defaultAccount
-  tr.data = code & contractInput
-  tr.gas = Quantity(3000000000000).some
+  var tr: TransactionArgs
+  tr.`from` = Opt.some(web3.defaultAccount)
+  let sData = code & contractInput
+  tr.data = Opt.some(hexToSeqByte(sData))
+  tr.gas = Opt.some(Quantity(3000000000000))
   if gasPrice != 0:
-    tr.gasPrice = some(gasPrice)
+    tr.gasPrice = Opt.some(gasPrice.Quantity)
 
   let r = await web3.send(tr)
   return await web3.getMinedTransactionReceipt(r)

tests/waku_rln_relay/utils_onchain.nim

@@ -10,6 +10,8 @@ import
   chronicles,
   stint,
   web3,
+  web3/conversions,
+  web3/eth_api_types,
   json,
   libp2p/crypto/crypto,
   eth/keys
@@ -27,6 +29,18 @@ import
 
 const CHAIN_ID* = 1337
 
+template skip0xPrefix(hexStr: string): int =
+  ## Returns the index of the first meaningful char in `hexStr` by skipping
+  ## "0x" prefix
+  if hexStr.len > 1 and hexStr[0] == '0' and hexStr[1] in {'x', 'X'}: 2 else: 0
+
+func strip0xPrefix(s: string): string =
+  let prefixLen = skip0xPrefix(s)
+  if prefixLen != 0:
+    s[prefixLen .. ^1]
+  else:
+    s
+
 proc generateCredentials*(rlnInstance: ptr RLN): IdentityCredential =
   let credRes = membershipKeyGen(rlnInstance)
   return credRes.get()
@@ -85,12 +99,13 @@ proc uploadRLNContract*(ethClientAddress: string): Future[Address] {.async.} =
   debug "Address of the deployed rlnv2 contract: ", wakuRlnContractAddress
 
   # need to send concat: impl & init_bytes
-  let contractInput = encode(wakuRlnContractAddress).data & Erc1967ProxyContractInput
+  let contractInput =
+    byteutils.toHex(encode(wakuRlnContractAddress)) & Erc1967ProxyContractInput
   debug "contractInput", contractInput
   let proxyReceipt =
     await web3.deployContract(Erc1967Proxy, contractInput = contractInput)
 
-  debug "proxy receipt", proxyReceipt
+  debug "proxy receipt", contractAddress = proxyReceipt.contractAddress.get()
   let proxyAddress = proxyReceipt.contractAddress.get()
 
   let newBalance = await web3.provider.eth_getBalance(web3.defaultAccount, "latest")
@@ -106,17 +121,17 @@ proc createEthAccount*(
 ): Future[(keys.PrivateKey, Address)] {.async.} =
   let web3 = await newWeb3(EthClient)
   let accounts = await web3.provider.eth_accounts()
-  let gasPrice = int(await web3.provider.eth_gasPrice())
+  let gasPrice = Quantity(await web3.provider.eth_gasPrice())
   web3.defaultAccount = accounts[0]
 
   let pk = keys.PrivateKey.random(rng[])
   let acc = Address(toCanonicalAddress(pk.toPublicKey()))
 
-  var tx: EthSend
-  tx.source = accounts[0]
-  tx.value = some(ethToWei(ethAmount))
-  tx.to = some(acc)
-  tx.gasPrice = some(gasPrice)
+  var tx: TransactionArgs
+  tx.`from` = Opt.some(accounts[0])
+  tx.value = Opt.some(ethToWei(ethAmount))
+  tx.to = Opt.some(acc)
+  tx.gasPrice = Opt.some(gasPrice)
 
   # Send ethAmount to acc
   discard await web3.send(tx)

waku.nimble

@@ -23,7 +23,9 @@ requires "nim >= 2.0.8",
   "web3",
   "presto",
   "regex",
-  "db_connector"
+  "db_connector",
+  "minilru",
+  "quic"
 
 ### Helper functions
 proc buildModule(filePath, params = "", lang = "c"): bool =

waku/common/enr/builder.nim

@@ -7,15 +7,27 @@ import
   eth/p2p/discoveryv5/enr,
   libp2p/crypto/crypto as libp2p_crypto
 
+import ./typed_record
+
 ## Builder
 
 type EnrBuilder* = object
   seqNumber: uint64
   privateKey: eth_keys.PrivateKey
+  ipAddress: Opt[IpAddress]
+  tcpPort: Opt[Port]
+  udpPort: Opt[Port]
   fields: seq[FieldPair]
 
 proc init*(T: type EnrBuilder, key: eth_keys.PrivateKey, seqNum: uint64 = 1): T =
-  EnrBuilder(seqNumber: seqNum, privateKey: key, fields: newSeq[FieldPair]())
+  EnrBuilder(
+    seqNumber: seqNum,
+    privateKey: key,
+    ipAddress: Opt.none(IpAddress),
+    tcpPort: Opt.none(Port),
+    udpPort: Opt.none(Port),
+    fields: newSeq[FieldPair](),
+  )
 
 proc init*(T: type EnrBuilder, key: libp2p_crypto.PrivateKey, seqNum: uint64 = 1): T =
   # TODO: Inconvenient runtime assertion. Move this assertion to compile time
@@ -41,9 +53,9 @@ proc build*(builder: EnrBuilder): EnrResult[enr.Record] =
   enr.Record.init(
     seqNum = builder.seqNumber,
     pk = builder.privateKey,
-    ip = none(IpAddress),
-    tcpPort = none(Port),
-    udpPort = none(Port),
+    ip = builder.ipAddress,
+    tcpPort = builder.tcpPort,
+    udpPort = builder.udpPort,
     extraFields = builder.fields,
   )
 
@@ -52,38 +64,14 @@ proc build*(builder: EnrBuilder): EnrResult[enr.Record] =
 proc addAddressAndPorts(
     builder: var EnrBuilder, ip: IpAddress, tcpPort, udpPort: Option[Port]
 ) =
-  # Based on: https://github.com/status-im/nim-eth/blob/4b22fcd/eth/p2p/discoveryv5/enr.nim#L166
-  let isV6 = ip.family == IPv6
-
-  let ipField =
-    if isV6:
-      toFieldPair("ip6", ip.address_v6)
-    else:
-      toFieldPair("ip", ip.address_v4)
-  builder.addFieldPair(ipField)
-
-  if tcpPort.isSome():
-    let
-      tcpPortFieldKey = if isV6: "tcp6" else: "tcp"
-      tcpPortFieldValue = tcpPort.get()
-    builder.addFieldPair(tcpPortFieldKey, tcpPortFieldValue.uint16)
-
-  if udpPort.isSome():
-    let
-      udpPortFieldKey = if isV6: "udp6" else: "udp"
-      udpPortFieldValue = udpPort.get()
-    builder.addFieldPair(udpPortFieldKey, udpPortFieldValue.uint16)
+  builder.ipAddress = Opt.some(ip)
+  builder.tcpPort = tcpPort.toOpt()
+  builder.udpPort = udpPort.toOpt()
 
 proc addPorts(builder: var EnrBuilder, tcp, udp: Option[Port]) =
   # Based on: https://github.com/status-im/nim-eth/blob/4b22fcd/eth/p2p/discoveryv5/enr.nim#L166
-
-  if tcp.isSome():
-    let tcpPort = tcp.get()
-    builder.addFieldPair("tcp", tcpPort.uint16)
-
-  if udp.isSome():
-    let udpPort = udp.get()
-    builder.addFieldPair("udp", udpPort.uint16)
+  builder.tcpPort = tcp.toOpt()
+  builder.udpPort = udp.toOpt()
 
 proc withIpAddressAndPorts*(
     builder: var EnrBuilder,

waku/common/enr/typed_record.nim

@@ -4,6 +4,19 @@ import std/options, results, eth/keys as eth_keys, libp2p/crypto/crypto as libp2
 
 import eth/p2p/discoveryv5/enr except TypedRecord, toTypedRecord
 
+## Since enr changed to result.Opt[T] from Option[T] for intercompatibility introduce a conversion between
+func toOpt*[T](o: Option[T]): Opt[T] =
+  if o.isSome():
+    return Opt.some(o.get())
+  else:
+    return Opt.none(T)
+
+func toOption*[T](o: Opt[T]): Option[T] =
+  if o.isSome():
+    return some(o.get())
+  else:
+    return none(T)
+
 ## ENR typed record
 
 # Record identity scheme
@@ -31,7 +44,7 @@ proc init(T: type TypedRecord, record: Record): T =
   TypedRecord(raw: record)
 
 proc tryGet*(record: TypedRecord, field: string, T: type): Option[T] =
-  record.raw.tryGet(field, T)
+  return record.raw.tryGet(field, T).toOption()
 
 func toTyped*(record: Record): EnrResult[TypedRecord] =
   let tr = TypedRecord.init(record)
@@ -71,10 +84,16 @@ func tcp*(record: TypedRecord): Option[uint16] =
   record.tryGet("tcp", uint16)
 
 func tcp6*(record: TypedRecord): Option[uint16] =
-  record.tryGet("tcp6", uint16)
+  let port = record.tryGet("tcp6", uint16)
+  if port.isNone():
+    return record.tcp()
+  return port
 
 func udp*(record: TypedRecord): Option[uint16] =
   record.tryGet("udp", uint16)
 
 func udp6*(record: TypedRecord): Option[uint16] =
-  record.tryGet("udp6", uint16)
+  let port = record.tryGet("udp6", uint16)
+  if port.isNone():
+    return record.udp()
+  return port