chore: bump dependencies for v0.35 (#3255)

Changes:
	modified:   .gitmodules
	modified:   tests/waku_discv5/utils.nim
	modified:   tests/waku_enr/utils.nim
	modified:   tests/waku_rln_relay/test_rln_group_manager_onchain.nim
	modified:   tests/waku_rln_relay/utils.nim
	modified:   tests/waku_rln_relay/utils_onchain.nim

        modified:   vendor/nim-chronicles
	modified:   vendor/nim-eth
	modified:   vendor/nim-http-utils
	modified:   vendor/nim-json-rpc
	modified:   vendor/nim-json-serialization
	modified:   vendor/nim-libp2p - 1.8.0!
	modified:   vendor/nim-metrics
	new file:   vendor/nim-minilru
	modified:   vendor/nim-nat-traversal
	modified:   vendor/nim-presto
	modified:   vendor/nim-secp256k1
	modified:   vendor/nim-serialization
	modified:   vendor/nim-stew
	modified:   vendor/nim-taskpools
	modified:   vendor/nim-testutils
	modified:   vendor/nim-toml-serialization
	modified:   vendor/nim-unicodedb
	modified:   vendor/nim-unittest2
	modified:   vendor/nim-web3 - from distinct branch that solves Ethereum ABI issue.
	modified:   vendor/nim-websock
	modified:   vendor/nim-zlib
	modified:   vendor/nimcrypto
	modified:   waku.nimble

        modified:   waku/common/enr/builder.nim
	modified:   waku/common/enr/typed_record.nim
	modified:   waku/common/utils/nat.nim
	modified:   waku/discovery/waku_discv5.nim
	modified:   waku/waku_rln_relay/conversion_utils.nim
	modified:   waku/waku_rln_relay/group_manager/on_chain/group_manager.nim
	modified:   waku/waku_rln_relay/rln/wrappers.nim
	modified:   waku/waku_rln_relay/rln_relay.nim

* Eliminate C compilation issue with chat2bridge due to an overcomplicating import from json_rpc instead of using std/json
* Adapt ENR Record handling to new interface of nim-eth
* Fix chrash in group_manager on_chain
* Fix signature of register and MemberRegister to UInt256, check transaction success in register
* Upgrade json-rpc and serialization
* Update to match latest enr and nat interface
* Using of extracted result of contract macro - with necessary adaption
* Bump nim-chornicles, nim-libp2p, nimcrypto
* Bump nim-web3, nim-eth and deps - on_chain/group_manager.nim adaption
* Added status-im/nim-minilru submodule required by latest nim-eth
Fixing tests.
* group_manager: adapt smart contract param types
* update web3 vendor
* bump vendors for v0.35.0
* protobuf.nim: fix compilation error after nim-libp2p bump
* changes to make it compile after rebase from master
---------

Co-authored-by: NagyZoltanPeter <113987313+NagyZoltanPeter@users.noreply.github.com>

.gitmodules

@@ -174,3 +174,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

@@ -50,11 +50,11 @@ suite "Onchain group manager":
       manager.ethRpc.isSome()
       manager.wakuRlnContract.isSome()
       manager.initialized
-      manager.rlnContractDeployedBlockNumber > 0
+      manager.rlnContractDeployedBlockNumber > 0.Quantity
       manager.rlnRelayMaxMessageLimit == 100
 
   asyncTest "should error on initialization when chainId does not match":
-    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,4 +1,4 @@
-import web3, chronos, options, stint
+import web3, chronos, options, stint, stew/byteutils
 
 proc deployContract*(
     web3: Web3, code: string, gasPrice = 0, contractInput = ""
@@ -20,12 +20,13 @@ proc deployContract*(
   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,
@@ -28,6 +30,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()
@@ -86,12 +100,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")
@@ -119,11 +134,11 @@ proc sendEthTransfer*(
 
   let gasPrice = int(await web3.provider.eth_gasPrice())
 
-  var tx: EthSend
-  tx.source = accountFrom
-  tx.to = some(accountTo)
-  tx.value = some(amountWei)
-  tx.gasPrice = some(gasPrice)
+  var tx: TransactionArgs
+  tx.`from` = Opt.some(accountFrom)
+  tx.to = Opt.some(accountTo)
+  tx.value = Opt.some(amountWei)
+  tx.gasPrice = Opt.some(Quantity(gasPrice))
 
   # TODO: handle the error if sending fails
   let txHash = await web3.send(tx)
@@ -136,6 +151,34 @@ proc sendEthTransfer*(
 
   return txHash
 
+proc ethToWei(eth: UInt256): UInt256 =
+  eth * 1000000000000000000.u256
+
+proc createEthAccount*(
+    ethAmount: UInt256 = 1000.u256
+): Future[(keys.PrivateKey, Address)] {.async.} =
+  let web3 = await newWeb3(EthClient)
+  let accounts = await web3.provider.eth_accounts()
+  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: TransactionArgs
+  tx.`from` = Opt.some(accounts[0])
+  tx.value = Opt.some(ethToWei(ethAmount))
+  tx.to = Opt.some(acc)
+  tx.gasPrice = Opt.some(Quantity(gasPrice))
+
+  # Send ethAmount to acc
+  discard await web3.send(tx)
+  let balance = await web3.provider.eth_getBalance(acc, "latest")
+  assert balance == ethToWei(ethAmount),
+    fmt"Balance is {balance} but expected {ethToWei(ethAmount)}"
+
+  return (pk, acc)
+
 proc createEthAccount*(web3: Web3): (keys.PrivateKey, Address) =
   let pk = keys.PrivateKey.random(rng[])
   let acc = Address(toCanonicalAddress(pk.toPublicKey()))
@@ -205,9 +248,6 @@ proc stopAnvil*(runAnvil: Process) {.used.} =
   except:
     error "Anvil daemon termination failed: ", err = getCurrentExceptionMsg()
 
-proc ethToWei(eth: UInt256): UInt256 =
-  eth * 1000000000000000000.u256
-
 proc setupOnchainGroupManager*(
     ethClientAddress: string = EthClient, amountEth: UInt256 = 10.u256
 ): Future[OnchainGroupManager] {.async.} =

vendor/db_connector

@@ -1 +1 @@
-Subproject commit 70d2ab3ff9907cb5b1d863bfb333a0ced5ee1596
+Subproject commit 74aef399e5c232f95c9fc5c987cebac846f09d62

vendor/nim-chronicles

@@ -1 +1 @@
-Subproject commit 4524912fcacfd3965e32a9fe23c9bb12d48177ff
+Subproject commit 32ac8679680ea699f7dbc046e8e0131cac97d41a

vendor/nim-confutils

@@ -1 +1 @@
-Subproject commit cb640db2cd66d7f4a1810a7df51b55f6f59cf3c5
+Subproject commit e214b3992a31acece6a9aada7d0a1ad37c928f3b

vendor/nim-eth

@@ -1 +1 @@
-Subproject commit bb5cb6a4d0dbb592b395ab41cda3fd3f1fdc443e
+Subproject commit c6c9dc7ae01656eba8126b913e84bdfb95c8c323

vendor/nim-faststreams

@@ -1 +1 @@
-Subproject commit dbc4a95df60238157dcf286f6125188cb72f37c1
+Subproject commit 2b08c774afaafd600cf4c6f994cf78b8aa090c0c

vendor/nim-http-utils

@@ -1 +1 @@
-Subproject commit 8b88ad6dd9a6326c29f82067800c483d9410d873
+Subproject commit 79cbab1460f4c0cdde2084589d017c43a3d7b4f1

vendor/nim-json-rpc

@@ -1 +1 @@
-Subproject commit 33360528d208aaa70a6ed914619fe76321760d54
+Subproject commit c0ac848733e42e672081f429fb146451894f7711

vendor/nim-json-serialization

@@ -1 +1 @@
-Subproject commit 8a4ed98bbd0a9479df15af2fa31da38a586ea6d5
+Subproject commit 2b1c5eb11df3647a2cee107cd4cce3593cbb8bcf

vendor/nim-libbacktrace

@@ -1 +1 @@
-Subproject commit b6e26f03c091a8e3bba6adc06198fc3055bacc66
+Subproject commit dbade9ba250da7db519c5cdfb225d03ca1255efc

vendor/nim-libp2p

@@ -1 +1 @@
-Subproject commit 8855bce0854ecf4adad7a0556bb2b2d2f98e0e20
+Subproject commit c5aa3736f96e4d66f6aa653a2351ded74b7d21a9

vendor/nim-metrics

@@ -1 +1 @@
-Subproject commit 29bb7ba63cd884770169891687595348a70cf166
+Subproject commit 25ffd054fd774f8cf7935e75d6cad542306d7802

vendor/nim-minilru

@@ -0,0 +1 @@
+Subproject commit 2682cffa8733f3b61751c65a963941315e887bac

vendor/nim-nat-traversal

@@ -1 +1 @@
-Subproject commit a3aa0c5f9d2a2870f1fd0f7a613d4fe025c84ab7
+Subproject commit 213ac13dfe5c4830474912c48181b86b73f1ec1f

vendor/nim-presto

@@ -1 +1 @@
-Subproject commit 2190421e09938696cd95d54b1f4753446c84c7a2
+Subproject commit 3ccb356220b70f7d9eb0fbd58b674c4080f78014

vendor/nim-regex

@@ -1 +1 @@
-Subproject commit cb8b7bfdcdc2272aadf92153c668acd3c901bd6b
+Subproject commit 0673df07cb266e15942c3b5f5b8a4732f049cd73

vendor/nim-results

@@ -1 +1 @@
-Subproject commit 71d404b314479a6205bfd050f4fe5fe49cdafc69
+Subproject commit df8113dda4c2d74d460a8fa98252b0b771bf1f27

vendor/nim-secp256k1

@@ -1 +1 @@
-Subproject commit 4470f49bcd6bcbfb59f0eeb67315ca9ddac0bdc0
+Subproject commit 62e16b4dff513f1eea7148a8cbba8a8c547b9546

vendor/nim-serialization

@@ -1 +1 @@
-Subproject commit 298a9554a885b2df59737bb3461aac8d0d339724
+Subproject commit 2086c99608b4bf472e1ef5fe063710f280243396

vendor/nim-sqlite3-abi

@@ -1 +1 @@
-Subproject commit acd3c327433784226b412757bdb5455b5be04c55
+Subproject commit cc4fefd538aa43814c5864c540fb75b567c2dcc3

vendor/nim-stew

@@ -1 +1 @@
-Subproject commit d4634c5405ac188e7050d348332edb6c3b09a527
+Subproject commit 687d1b4ab1a91e6cc9c92e4fd4d98bec7874c259

vendor/nim-stint

@@ -1 +1 @@
-Subproject commit 7c81df9adc80088f46a4c2b8bf2a46c26fab057c
+Subproject commit 1a2c661e3f50ff696b0b6692fab0d7bb2abf10cc

vendor/nim-taskpools

@@ -1 +1 @@
-Subproject commit d4c43137c0590cb47f893a66ca8cb027fa6c217e
+Subproject commit 7b74a716a40249720fd7da428113147942b9642d

vendor/nim-testutils

@@ -1 +1 @@
-Subproject commit ae476c67314ac4b294d21040315e0f716189a70e
+Subproject commit 14a56ae5aada81bed43e29d2368fc8ab8a449bf5

vendor/nim-toml-serialization

@@ -1 +1 @@
-Subproject commit cb1fc73f3519fed5f3a8fbfa90afc9a96d5f5f5c
+Subproject commit fea85b27f0badcf617033ca1bc05444b5fd8aa7a

vendor/nim-unicodedb

@@ -1 +1 @@
-Subproject commit 8c8959d84c12ecda6ea14c67bd68675b1936f8cf
+Subproject commit 66f2458710dc641dd4640368f9483c8a0ec70561

vendor/nim-unittest2

@@ -1 +1 @@
-Subproject commit e96f3215030cbfa13abc2f5827069b6f8ba87e38
+Subproject commit 88a613ffa4dbe452971beb937ea2db736dc9a9f4

vendor/nim-web3

@@ -1 +1 @@
-Subproject commit 428b931e7c4f1284b4272bc2c11fca2bd70991cd
+Subproject commit 94aac8a77cd265fe779ce8ed25a028340b925fd1

vendor/nim-websock

@@ -1 +1 @@
-Subproject commit 63bcc2902d884c63101e144555ad99421734a70a
+Subproject commit ebe308a79a7b440a11dfbe74f352be86a3883508

vendor/nim-zlib

@@ -1 +1 @@
-Subproject commit 45b06fca15ce0f09586067d950da30c10227865a
+Subproject commit 3f7998095264d262a8d99e2be89045e6d9301537

vendor/nimcrypto

@@ -1 +1 @@
-Subproject commit 71bca15508e2c0548f32b42a69bcfb1ccd9ab9ff
+Subproject commit dc07e3058c6904eef965394493b6ea99aa2adefc

vendor/nph

@@ -1 +1 @@
-Subproject commit 31bdced07d3dc3d254669bd94210101c701deeda
+Subproject commit 0d8000e741fa11ed48fdd116f24b4251b92aa9b5

vendor/zerokit

@@ -1 +1 @@
-Subproject commit e6238fd7228dd645eb7d6f3bf2077a8623c38fcf
+Subproject commit b9d27039c3266af108882d7a8bafc37400d29855

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

waku/common/protobuf.nim

@@ -57,21 +57,7 @@ proc `==`*(a: zint64, b: zint64): bool =
 proc `$`*(err: ProtobufError): string =
   case err.kind
   of DecodeFailure:
-    case err.error
-    of VarintDecode:
-      return "VarintDecode"
-    of MessageIncomplete:
-      return "MessageIncomplete"
-    of BufferOverflow:
-      return "BufferOverflow"
-    of MessageTooBig:
-      return "MessageTooBig"
-    of BadWireType:
-      return "BadWireType"
-    of IncorrectBlob:
-      return "IncorrectBlob"
-    of RequiredFieldMissing:
-      return "RequiredFieldMissing"
+    return $err.error ## assume that ProtoError is pure
   of MissingRequiredField:
     return "MissingRequiredField " & err.field
   of InvalidLengthField:

waku/common/utils/nat.nim

@@ -39,7 +39,7 @@ proc setupNat*(
       warn "NAT already initialized, skipping as cannot be done multiple times"
     else:
       singletonNat = true
-      var extIp = none(IpAddress)
+      var extIp = Opt.none(IpAddress)
       try:
         extIp = getExternalIP(strategy)
       except Exception:
@@ -49,7 +49,7 @@ proc setupNat*(
         endpoint.ip = some(extIp.get())
         # RedirectPorts in considered a gcsafety violation
         # because it obtains the address of a non-gcsafe proc?
-        var extPorts: Option[(Port, Port)]
+        var extPorts: Opt[(Port, Port)]
         try:
           extPorts = (
             {.gcsafe.}:
@@ -60,7 +60,7 @@ proc setupNat*(
         except CatchableError:
           # TODO: nat.nim Error: can raise an unlisted exception: Exception. Isolate here for now.
           error "unable to determine external ports"
-          extPorts = none((Port, Port))
+          extPorts = Opt.none((Port, Port))
 
         if extPorts.isSome():
           let (extTcpPort, extUdpPort) = extPorts.get()

waku/discovery/waku_discv5.nim

@@ -87,10 +87,10 @@ proc new*(
     privKey = conf.privateKey,
     bootstrapRecords = conf.bootstrapRecords,
     enrAutoUpdate = conf.autoupdateRecord,
-    previousRecord = record,
-    enrIp = none(IpAddress),
-    enrTcpPort = none(Port),
-    enrUdpPort = none(Port),
+    previousRecord = record.toOpt(),
+    enrIp = Opt.none(IpAddress),
+    enrTcpPort = Opt.none(Port),
+    enrUdpPort = Opt.none(Port),
   )
 
   let shardPredOp =

waku/factory/waku.nim

@@ -357,7 +357,7 @@ proc updateAddressInENR(waku: ptr Waku): Result[void, string] =
     return err("failed to parse the private key: " & $error)
 
   let enrFields = @[toFieldPair(MultiaddrEnrField, encodedAddrs)]
-  waku[].node.enr.update(parsedPk, enrFields).isOkOr:
+  waku[].node.enr.update(parsedPk, extraFields = enrFields).isOkOr:
     return err("failed to update multiaddress in ENR updateAddressInENR: " & $error)
 
   debug "Waku node ENR updated successfully with new multiaddress",

waku/waku_rln_relay/conversion_utils.nim

@@ -128,3 +128,8 @@ proc fromEpoch*(epoch: Epoch): uint64 =
   ## decodes bytes of `epoch` (in little-endian) to uint64
   let t = fromBytesLE(uint64, array[32, byte](epoch))
   return t
+
+func `+`*(a, b: Quantity): Quantity {.borrow.}
+
+func u256*(n: Quantity): UInt256 {.inline.} =
+  n.uint64.stuint(256)

waku/waku_rln_relay/group_manager/on_chain/group_manager.nim

@@ -3,10 +3,11 @@
 import
   os,
   web3,
-  web3/ethtypes,
+  web3/eth_api_types,
+  web3/primitives,
   eth/keys as keys,
   chronicles,
-  nimcrypto/keccak,
+  nimcrypto/keccak as keccak,
   stint,
   json,
   std/tables,
@@ -30,12 +31,11 @@ logScope:
 # using the when predicate does not work within the contract macro, hence need to dupe
 contract(WakuRlnContract):
   # this serves as an entrypoint into the rln membership set
-  proc register(idCommitment: UInt256, userMessageLimit: UInt32)
+  proc register(idCommitment: UInt256, userMessageLimit: EthereumUInt32)
   # Initializes the implementation contract (only used in unit tests)
   proc initialize(maxMessageLimit: UInt256)
   # this event is raised when a new member is registered
-  proc MemberRegistered(rateCommitment: UInt256, index: Uint32) {.event.}
-
+  proc MemberRegistered(rateCommitment: UInt256, index: EthereumUInt32) {.event.}
   # this function denotes existence of a given user
   proc memberExists(idCommitment: Uint256): UInt256 {.view.}
   # this constant describes the next index of a new member
@@ -100,7 +100,7 @@ proc setMetadata*(
   try:
     let metadataSetRes = g.rlnInstance.setMetadata(
       RlnMetadata(
-        lastProcessedBlock: normalizedBlock,
+        lastProcessedBlock: normalizedBlock.uint64,
         chainId: g.chainId,
         contractAddress: g.ethContractAddress,
         validRoots: g.validRoots.toSeq(),
@@ -190,12 +190,16 @@ method register*(
   g.registrationTxHash = some(txHash)
   # the receipt topic holds the hash of signature of the raised events
   # TODO: make this robust. search within the event list for the event
-  debug "ts receipt", tsReceipt
+  debug "ts receipt", receipt = tsReceipt[]
+
+  if tsReceipt.status.isNone() or tsReceipt.status.get() != 1.Quantity:
+    raise newException(ValueError, "register: transaction failed")
+
   let firstTopic = tsReceipt.logs[0].topics[0]
   # the hash of the signature of MemberRegistered(uint256,uint32) event is equal to the following hex value
   if firstTopic !=
-      cast[FixedBytes[32]](keccak256.digest("MemberRegistered(uint256,uint32)").data):
-    raise newException(ValueError, "unexpected event signature")
+      cast[FixedBytes[32]](keccak.keccak256.digest("MemberRegistered(uint256,uint32)").data):
+    raise newException(ValueError, "register: unexpected event signature")
 
   # the arguments of the raised event i.e., MemberRegistered are encoded inside the data field
   # data = rateCommitment encoded as 256 bits || index encoded as 32 bits
@@ -231,11 +235,10 @@ proc parseEvent(
   ## returns an error if it cannot parse the `data` parameter
   var rateCommitment: UInt256
   var index: UInt256
-  var data: string
-  # Remove the 0x prefix
+  var data: seq[byte]
   try:
-    data = strip0xPrefix(log["data"].getStr())
-  except CatchableError:
+    data = hexToSeqByte(log["data"].getStr())
+  except ValueError:
     return err(
       "failed to parse the data field of the MemberRegistered event: " &
         getCurrentExceptionMsg()
@@ -243,9 +246,9 @@ proc parseEvent(
   var offset = 0
   try:
     # Parse the rateCommitment
-    offset += decode(data, offset, rateCommitment)
+    offset += decode(data, 0, offset, rateCommitment)
     # Parse the index
-    offset += decode(data, offset, index)
+    offset += decode(data, 0, offset, index)
     return ok(
       Membership(
         rateCommitment: rateCommitment.toRateCommitment(),
@@ -291,13 +294,17 @@ proc getRawEvents(
   let ethRpc = g.ethRpc.get()
   let wakuRlnContract = g.wakuRlnContract.get()
 
-  var events: JsonNode
-  g.retryWrapper(events, "Failed to get the events"):
+  var eventStrs: seq[JsonString]
+  g.retryWrapper(eventStrs, "Failed to get the events"):
     await wakuRlnContract.getJsonLogs(
       MemberRegistered,
-      fromBlock = some(fromBlock.blockId()),
-      toBlock = some(toBlock.blockId()),
+      fromBlock = Opt.some(fromBlock.blockId()),
+      toBlock = Opt.some(toBlock.blockId()),
     )
+
+  var events = newJArray()
+  for eventStr in eventStrs:
+    events.add(parseJson(eventStr.string))
   return events
 
 proc getBlockTable(
@@ -314,7 +321,7 @@ proc getBlockTable(
     return blockTable
 
   for event in events:
-    let blockNumber = parseHexInt(event["blockNumber"].getStr()).uint
+    let blockNumber = parseHexInt(event["blockNumber"].getStr()).BlockNumber
     let removed = event["removed"].getBool()
     let parsedEventRes = parseEvent(MemberRegistered, event)
     if parsedEventRes.isErr():
@@ -450,13 +457,13 @@ proc startOnchainSync(
   let ethRpc = g.ethRpc.get()
 
   # static block chunk size
-  let blockChunkSize = 2_000
+  let blockChunkSize = 2_000.BlockNumber
   # delay between rpc calls to not overload the rate limit
   let rpcDelay = 200.milliseconds
   # max number of futures to run concurrently
   let maxFutures = 10
 
-  var fromBlock =
+  var fromBlock: BlockNumber =
     if g.latestProcessedBlock > g.rlnContractDeployedBlockNumber:
       info "syncing from last processed block", blockNumber = g.latestProcessedBlock
       g.latestProcessedBlock + 1
@@ -479,11 +486,11 @@ proc startOnchainSync(
       if fromBlock >= currentLatestBlock:
         break
 
-      if fromBlock + blockChunkSize.uint > currentLatestBlock.uint:
+      if fromBlock + blockChunkSize > currentLatestBlock:
         g.retryWrapper(currentLatestBlock, "Failed to get the latest block number"):
           cast[BlockNumber](await ethRpc.provider.eth_blockNumber())
 
-      let toBlock = min(fromBlock + BlockNumber(blockChunkSize), currentLatestBlock)
+      let toBlock = min(fromBlock + blockChunkSize, currentLatestBlock)
       debug "fetching events", fromBlock = fromBlock, toBlock = toBlock
       await sleepAsync(rpcDelay)
       futs.add(g.getAndHandleEvents(fromBlock, toBlock))
@@ -551,7 +558,7 @@ method init*(g: OnchainGroupManager): Future[GroupManagerResult[void]] {.async.}
     let pk = g.ethPrivateKey.get()
     let parsedPk = keys.PrivateKey.fromHex(pk).valueOr:
       return err("failed to parse the private key" & ": " & $error)
-    ethRpc.privateKey = some(parsedPk)
+    ethRpc.privateKey = Opt.some(parsedPk)
     ethRpc.defaultAccount =
       ethRpc.privateKey.get().toPublicKey().toCanonicalAddress().Address
 
@@ -605,7 +612,7 @@ method init*(g: OnchainGroupManager): Future[GroupManagerResult[void]] {.async.}
 
     if metadata.contractAddress != g.ethContractAddress.toLower():
       return err("persisted data: contract address mismatch")
-    g.latestProcessedBlock = metadata.lastProcessedBlock
+    g.latestProcessedBlock = metadata.lastProcessedBlock.BlockNumber
     g.validRoots = metadata.validRoots.toDeque()
 
   var deployedBlockNumber: Uint256
@@ -661,10 +668,10 @@ method stop*(g: OnchainGroupManager): Future[void] {.async, gcsafe.} =
 proc isSyncing*(g: OnchainGroupManager): Future[bool] {.async, gcsafe.} =
   let ethRpc = g.ethRpc.get()
 
-  var syncing: JsonNode
+  var syncing: SyncingStatus
   g.retryWrapper(syncing, "Failed to get the syncing status"):
     await ethRpc.provider.eth_syncing()
-  return syncing.getBool()
+  return syncing.syncing
 
 method isReady*(g: OnchainGroupManager): Future[bool] {.async.} =
   initializedGuard(g)
@@ -677,7 +684,7 @@ method isReady*(g: OnchainGroupManager): Future[bool] {.async.} =
     cast[BlockNumber](await g.ethRpc.get().provider.eth_blockNumber())
 
   # the node is still able to process messages if it is behind the latest block by a factor of the valid roots
-  if u256(g.latestProcessedBlock) < (u256(currentBlock) - u256(g.validRoots.len)):
+  if u256(g.latestProcessedBlock.uint64) < (u256(currentBlock) - u256(g.validRoots.len)):
     return false
 
   return not (await g.isSyncing())

waku/waku_rln_relay/rln_relay.nim

@@ -8,7 +8,7 @@ import
   stint,
   web3,
   json,
-  web3/ethtypes,
+  web3/eth_api_types,
   eth/keys,
   libp2p/protocols/pubsub/rpc/messages,
   libp2p/protocols/pubsub/pubsub,

waku/waku_store_sync/reconciliation.nim

@@ -1,7 +1,7 @@
 {.push raises: [].}
 
 import
-  std/sequtils,
+  std/[sequtils, options],
   stew/byteutils,
   results,
   chronicles,