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 Added nim-quic and nim-ngtcp2 as new deps of nim-libp2p Fixing tests. 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 modified: vendor/nim-metrics new file: vendor/nim-minilru modified: vendor/nim-nat-traversal new file: vendor/nim-ngtcp2 modified: vendor/nim-presto new file: vendor/nim-quic 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 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
waku-org · Oct 8, 2024 · 7f1ea08 · 7f1ea08
1 parent 3ad613c
commit 7f1ea08
Show file tree

Hide file tree

Showing 39 changed files with 142 additions and 81 deletions.
diff --git a/.gitmodules b/.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
diff --git a/tests/waku_discv5/utils.nim b/tests/waku_discv5/utils.nim
@@ -1,4 +1,5 @@
 import
+  std/options,
   stew/results,
   stew/shims/net,
   chronos,

diff --git a/tests/waku_enr/utils.nim b/tests/waku_enr/utils.nim
@@ -1,4 +1,5 @@
 import
+  std/options,
   sequtils,
   stew/results,
   stew/shims/net,

diff --git a/tests/waku_rln_relay/test_rln_group_manager_onchain.nim b/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"

diff --git a/tests/waku_rln_relay/utils.nim b/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(sData.toBytes())
+  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)

diff --git a/tests/waku_rln_relay/utils_onchain.nim b/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)

diff --git a/vendor/nim-chronicles b/vendor/nim-chronicles
diff --git a/vendor/nim-eth b/vendor/nim-eth
diff --git a/vendor/nim-http-utils b/vendor/nim-http-utils
diff --git a/vendor/nim-json-rpc b/vendor/nim-json-rpc
diff --git a/vendor/nim-json-serialization b/vendor/nim-json-serialization
diff --git a/vendor/nim-libp2p b/vendor/nim-libp2p
diff --git a/vendor/nim-metrics b/vendor/nim-metrics
diff --git a/vendor/nim-minilru b/vendor/nim-minilru
diff --git a/vendor/nim-nat-traversal b/vendor/nim-nat-traversal
diff --git a/vendor/nim-ngtcp2 b/vendor/nim-ngtcp2
diff --git a/vendor/nim-presto b/vendor/nim-presto
diff --git a/vendor/nim-quic b/vendor/nim-quic
diff --git a/vendor/nim-secp256k1 b/vendor/nim-secp256k1
diff --git a/vendor/nim-serialization b/vendor/nim-serialization
diff --git a/vendor/nim-stew b/vendor/nim-stew
diff --git a/vendor/nim-taskpools b/vendor/nim-taskpools
diff --git a/vendor/nim-testutils b/vendor/nim-testutils
diff --git a/vendor/nim-toml-serialization b/vendor/nim-toml-serialization
diff --git a/vendor/nim-unicodedb b/vendor/nim-unicodedb
diff --git a/vendor/nim-unittest2 b/vendor/nim-unittest2
diff --git a/vendor/nim-web3 b/vendor/nim-web3
diff --git a/vendor/nim-websock b/vendor/nim-websock
diff --git a/vendor/nim-zlib b/vendor/nim-zlib
diff --git a/vendor/nimcrypto b/vendor/nimcrypto
diff --git a/waku.nimble b/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 =

diff --git a/waku/common/enr/builder.nim b/waku/common/enr/builder.nim
@@ -41,9 +41,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 = Opt.none(IpAddress),
+    tcpPort = Opt.none(Port),
+    udpPort = Opt.none(Port),
     extraFields = builder.fields,
   )
 

diff --git a/waku/common/enr/typed_record.nim b/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)

diff --git a/waku/common/utils/nat.nim b/waku/common/utils/nat.nim
@@ -44,7 +44,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.}:
@@ -55,7 +55,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()

diff --git a/waku/discovery/waku_discv5.nim b/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 =

diff --git a/waku/waku_rln_relay/conversion_utils.nim b/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)