From 36dd1086ab51a261a19cffe897e98b366dd65e58 Mon Sep 17 00:00:00 2001
From: Arnaud <arno.deville@gmail.com>
Date: Thu, 13 Feb 2025 05:24:34 +0100
Subject: [PATCH] Update for Nim 2.0.x (#9)

* Update for Nim 2.0.x

* Update to Nim 2.0.14

* use version range for deps, bump nimcrypto

* remove 1.6 from ci test

* Update the lock file again

* fromBytes -> fromBytesBE

---------

Co-authored-by: Eric <5089238+emizzle@users.noreply.github.com>
---
 .github/workflows/ci.yml       |  2 +-
 contractabi.nimble             |  8 ++--
 nimble.lock                    | 86 ++++++++++++++++++++++------------
 tests/contractabi/examples.nim |  2 +-
 4 files changed, 61 insertions(+), 37 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 14238b2..7fea4a8 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        nim: [1.6.14, stable]
+        nim: [2.0.14, stable]
     steps:
     - uses: actions/checkout@v2
     - uses: iffy/install-nim@v3
diff --git a/contractabi.nimble b/contractabi.nimble
index 29f6133..c113968 100644
--- a/contractabi.nimble
+++ b/contractabi.nimble
@@ -1,10 +1,10 @@
-version = "0.6.0"
+version = "0.7.0"
 author = "Contract ABI Authors"
 description = "ABI Encoding for Ethereum contracts"
 license = "MIT"
 
-requires "stint"
-requires "stew"
-requires "nimcrypto >= 0.6.0 & < 0.7.0"
+requires "stint >= 0.8.0 & < 0.9.0"
+requires "stew >= 0.2.0 & < 0.3.0"
+requires "nimcrypto >= 0.6.2 & < 0.7.0"
 requires "questionable >= 0.10.10 & < 0.11.0"
 requires "upraises >= 0.1.0 & < 0.2.0"
diff --git a/nimble.lock b/nimble.lock
index 7a0a4b5..2b15b12 100644
--- a/nimble.lock
+++ b/nimble.lock
@@ -1,56 +1,80 @@
 {
   "version": 2,
   "packages": {
-    "stew": {
-      "version": "0.1.0",
-      "vcsRevision": "6ad35b876fb6ebe0dfee0f697af173acc47906ee",
-      "url": "https://github.com/status-im/nim-stew.git",
-      "downloadMethod": "git",
-      "dependencies": [],
-      "checksums": {
-        "sha1": "46d58c4feb457f3241e3347778334e325dce5268"
-      }
-    },
-    "stint": {
-      "version": "0.0.1",
-      "vcsRevision": "036c71d06a6b22f8f967ba9d54afd2189c3872ca",
-      "url": "https://github.com/status-im/stint.git",
-      "downloadMethod": "git",
-      "dependencies": [
-        "stew"
-      ],
-      "checksums": {
-        "sha1": "0f187a2115315ca898e5f9a30c5e506cf6057062"
-      }
-    },
     "nimcrypto": {
-      "version": "0.6.0",
-      "vcsRevision": "1c8d6e3caf3abc572136ae9a1da81730c4eb4288",
+      "version": "0.6.2",
+      "vcsRevision": "dc07e3058c6904eef965394493b6ea99aa2adefc",
       "url": "https://github.com/cheatfate/nimcrypto",
       "downloadMethod": "git",
       "dependencies": [],
       "checksums": {
-        "sha1": "da3b105ad6bd7beef25c69f03afccb5e5233d483"
+        "sha1": "8e3e42530f54c8c312942a89640b7e0f687f33a5"
       }
     },
     "questionable": {
-      "version": "0.10.10",
-      "vcsRevision": "b3cf35ac450fd42c9ea83dc084f5cba2efc55da3",
+      "version": "0.10.15",
+      "vcsRevision": "82d90b67bcfb7f2e918b61dace2ff1a4ced60935",
       "url": "https://github.com/markspanbroek/questionable",
       "downloadMethod": "git",
       "dependencies": [],
       "checksums": {
-        "sha1": "8bb23a05d7f21619010471aa009e27d3fa73d93a"
+        "sha1": "3238ff637c7b44d2fa8fcb839a8ded968e389de3"
+      }
+    },
+    "results": {
+      "version": "0.5.0",
+      "vcsRevision": "57b2392ad69849e3e2d02b74a8a0feee2c3d9570",
+      "url": "https://github.com/arnetheduck/nim-results",
+      "downloadMethod": "git",
+      "dependencies": [],
+      "checksums": {
+        "sha1": "901e2ed088160fdcb8fdf3b315ce62baedc3f7ba"
+      }
+    },
+    "unittest2": {
+      "version": "0.2.3",
+      "vcsRevision": "845b6af28b9f68f02d320e03ad18eccccea7ddb9",
+      "url": "https://github.com/status-im/nim-unittest2",
+      "downloadMethod": "git",
+      "dependencies": [],
+      "checksums": {
+        "sha1": "6936b4e4676c9b37537d93f31cb8fc46f4ebaacb"
+      }
+    },
+    "stew": {
+      "version": "0.2.0",
+      "vcsRevision": "79e4fa5a9d3374db17ed63622714d3e1094c7f34",
+      "url": "https://github.com/status-im/nim-stew",
+      "downloadMethod": "git",
+      "dependencies": [
+        "results",
+        "unittest2"
+      ],
+      "checksums": {
+        "sha1": "26d477c735913b7daa1dab53dd74803c88209634"
+      }
+    },
+    "stint": {
+      "version": "0.8.1",
+      "vcsRevision": "1a2c661e3f50ff696b0b6692fab0d7bb2abf10cc",
+      "url": "https://github.com/status-im/nim-stint",
+      "downloadMethod": "git",
+      "dependencies": [
+        "stew",
+        "unittest2"
+      ],
+      "checksums": {
+        "sha1": "fe3c8b7b0484135294b8fb3dab5b1a030a08bddc"
       }
     },
     "upraises": {
       "version": "0.1.0",
-      "vcsRevision": "ff4f8108e44fba9b35cac535ab63d3927e8fd3c2",
-      "url": "https://github.com/markspanbroek/upraises.git",
+      "vcsRevision": "d9f268db1021959fe0f2c7a5e49fba741f9932a0",
+      "url": "https://github.com/markspanbroek/upraises",
       "downloadMethod": "git",
       "dependencies": [],
       "checksums": {
-        "sha1": "a0243c8039e12d547dbb2e9c73789c16bb8bc956"
+        "sha1": "176234f808b44a0be763df706ed634d6e8df17bb"
       }
     }
   },
diff --git a/tests/contractabi/examples.nim b/tests/contractabi/examples.nim
index 07b2588..31c83fe 100644
--- a/tests/contractabi/examples.nim
+++ b/tests/contractabi/examples.nim
@@ -20,7 +20,7 @@ proc example*[T](_: type seq[T], len = 0..5): seq[T] =
   newSeqWith(chosenlen, T.example)
 
 proc example*(T: type StUint): T =
-  T.fromBytes(array[sizeof(T), byte].example)
+  T.fromBytesBE(array[sizeof(T), byte].example)
 
 proc example*(T: type StInt): T =
   cast[T](StUint[T.bits].example)