From cdd175279caccc34780a9bb05369c8a93ee4d4f6 Mon Sep 17 00:00:00 2001
From: markspanbroek <mark@spanbroek.net>
Date: Wed, 16 Nov 2022 07:10:23 -0500
Subject: [PATCH] Fix nimble requirements (#305)

* [build] Update nim-ethers to 0.2.4

* [build] set correct lrucache requirement in nimble file
---
 codex.nimble                 | 4 ++--
 codex/contracts/requests.nim | 8 --------
 vendor/nim-contract-abi      | 2 +-
 vendor/nim-ethers            | 2 +-
 4 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/codex.nimble b/codex.nimble
index dbef1421..c137a222 100644
--- a/codex.nimble
+++ b/codex.nimble
@@ -13,7 +13,7 @@ requires "nim >= 1.2.0",
          "chronicles >= 0.7.2",
          "chronos >= 2.5.2",
          "confutils",
-         "ethers >= 0.2.0 & < 0.3.0",
+         "ethers >= 0.2.4 & < 0.3.0",
          "libbacktrace",
          "libp2p",
          "metrics",
@@ -25,7 +25,7 @@ requires "nim >= 1.2.0",
          "secp256k1",
          "stew",
          "upraises >= 0.1.0 & < 0.2.0",
-         "lrucache",
+         "https://github.com/status-im/lrucache.nim#1.2.2",
          "leopard >= 0.1.0 & < 0.2.0",
          "blscurve",
          "libp2pdht",
diff --git a/codex/contracts/requests.nim b/codex/contracts/requests.nim
index 15d7b5c4..2f4551b3 100644
--- a/codex/contracts/requests.nim
+++ b/codex/contracts/requests.nim
@@ -104,9 +104,6 @@ func solidityType*(_: type StorageAsk): string =
 func solidityType*(_: type StorageRequest): string =
   solidityType(StorageRequest.fieldTypes)
 
-func solidityType*[T: RequestId | SlotId | Nonce](_: type T): string =
-  solidityType(array[32, byte])
-
 func encode*(encoder: var AbiEncoder, por: StoragePoR) =
   encoder.write(por.fieldValues)
 
@@ -125,11 +122,6 @@ func encode*(encoder: var AbiEncoder, id: RequestId | SlotId | Nonce) =
 func encode*(encoder: var AbiEncoder, request: StorageRequest) =
   encoder.write(request.fieldValues)
 
-func decode*[T: RequestId | SlotId | Nonce](decoder: var AbiDecoder,
-                                            _: type T): ?!T =
-  let nonce = ?decoder.read(type array[32, byte])
-  success T(nonce)
-
 func decode*(decoder: var AbiDecoder, T: type StoragePoR): ?!T =
   let tupl = ?decoder.read(StoragePoR.fieldTypes)
   success StoragePoR.fromTuple(tupl)
diff --git a/vendor/nim-contract-abi b/vendor/nim-contract-abi
index b111c27b..61f8f59b 160000
--- a/vendor/nim-contract-abi
+++ b/vendor/nim-contract-abi
@@ -1 +1 @@
-Subproject commit b111c27b619fc1d81fb1c6942372824a18a71960
+Subproject commit 61f8f59b3917d8e27c6eb4330a6d8cf428e98b2d
diff --git a/vendor/nim-ethers b/vendor/nim-ethers
index e8592bb9..e462649a 160000
--- a/vendor/nim-ethers
+++ b/vendor/nim-ethers
@@ -1 +1 @@
-Subproject commit e8592bb92219f5fcec25af22bed474a4f95c0a54
+Subproject commit e462649aecc9dedc1cdc1319a9089d2e40578284