From f3879ed666930318a9ef7d030c5d03446b6f5e50 Mon Sep 17 00:00:00 2001
From: Arnaud <arnaud@status.im>
Date: Fri, 14 Feb 2025 10:55:38 +0100
Subject: [PATCH] Update dependencies and remove support to Nim 1.6 due to
 dependencies issue

---
 .github/workflows/ci.yml |  4 ++--
 Readme.md                |  8 ++++++++
 nimble.lock              | 25 +++++++++++++------------
 nitro.nimble             | 12 +++++-------
 4 files changed, 28 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b488d16..11ba4e7 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -8,13 +8,13 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macOS-latest, windows-latest]
-        nim: [stable, 1.6.14, 2.0.14]
+        nim: [stable, 2.0.14]
     steps:
     - uses: actions/checkout@v2
     - uses: iffy/install-nim@v3
       with:
         version: ${{ matrix.nim }}
     - name: Build
-      run: nimble install -y
+      run: nimble install -y --maximumtaggedversions=2
     - name: Test
       run: nimble test -y
diff --git a/Readme.md b/Readme.md
index 6df93d2..87774e4 100644
--- a/Readme.md
+++ b/Readme.md
@@ -10,3 +10,11 @@ References
   - [statechannels.org](https://statechannels.org/)
   - [Nitro paper](https://magmo.com/nitro-protocol.pdf)
   - [Nitro smart contracts & Javascript code](https://github.com/statechannels/statechannels/tree/master/packages/nitro-protocol)
+
+# Installation
+
+To avoid conflicts with previous versions of `contractabi`, use the following command to install dependencies:
+
+```bash
+nimble install --maximumtaggedversions=2
+```
\ No newline at end of file
diff --git a/nimble.lock b/nimble.lock
index 69da998..6090a9f 100644
--- a/nimble.lock
+++ b/nimble.lock
@@ -2,13 +2,13 @@
   "version": 2,
   "packages": {
     "results": {
-      "version": "0.5.0",
-      "vcsRevision": "57b2392ad69849e3e2d02b74a8a0feee2c3d9570",
+      "version": "0.5.1",
+      "vcsRevision": "df8113dda4c2d74d460a8fa98252b0b771bf1f27",
       "url": "https://github.com/arnetheduck/nim-results",
       "downloadMethod": "git",
       "dependencies": [],
       "checksums": {
-        "sha1": "901e2ed088160fdcb8fdf3b315ce62baedc3f7ba"
+        "sha1": "a9c011f74bc9ed5c91103917b9f382b12e82a9e7"
       }
     },
     "unittest2": {
@@ -35,15 +35,16 @@
       }
     },
     "stint": {
-      "version": "2.0.0",
-      "vcsRevision": "3236fa68394f1e3a06e2bc34218aacdd2d675923",
+      "version": "0.8.1",
+      "vcsRevision": "1a2c661e3f50ff696b0b6692fab0d7bb2abf10cc",
       "url": "https://github.com/status-im/nim-stint",
       "downloadMethod": "git",
       "dependencies": [
-        "stew"
+        "stew",
+        "unittest2"
       ],
       "checksums": {
-        "sha1": "50744885ee1c320675078b46520268bf3c3c5d81"
+        "sha1": "fe3c8b7b0484135294b8fb3dab5b1a030a08bddc"
       }
     },
     "nimcrypto": {
@@ -77,8 +78,8 @@
       }
     },
     "contractabi": {
-      "version": "0.7.0",
-      "vcsRevision": "363f8b4852b05c089b1e35ef3a0a882d51c996bc",
+      "version": "0.7.1",
+      "vcsRevision": "524bda044baecdf1ead4f179bdad2b8706ae3a5a",
       "url": "https://github.com/status-im/nim-contract-abi",
       "downloadMethod": "git",
       "dependencies": [
@@ -89,12 +90,12 @@
         "upraises"
       ],
       "checksums": {
-        "sha1": "be9a6b1dc2dc3057f68a6e69f77eb6b873909b04"
+        "sha1": "c45b2abde354c731ed9cb3bf30a8fe0a444ed027"
       }
     },
     "secp256k1": {
       "version": "0.6.0.3.2",
-      "vcsRevision": "e5f0ed8bc27d477b13c174d9c2768d2b0c41da07",
+      "vcsRevision": "62e16b4dff513f1eea7148a8cbba8a8c547b9546",
       "url": "https://github.com/status-im/nim-secp256k1",
       "downloadMethod": "git",
       "dependencies": [
@@ -102,7 +103,7 @@
         "nimcrypto"
       ],
       "checksums": {
-        "sha1": "6df5d2c8236d715553c9c2c66d568ceaf48c454a"
+        "sha1": "443802551ed2f7ba273df38e06a18164dffa14c9"
       }
     }
   },
diff --git a/nitro.nimble b/nitro.nimble
index b381aca..287e487 100644
--- a/nitro.nimble
+++ b/nitro.nimble
@@ -3,13 +3,11 @@ author = "Nim Nitro developers"
 license = "MIT"
 description = "Nitro state channels"
 
-requires "nim >= 1.6.14"
+requires "nim >= 2.0.14 < 3.0.0"
 requires "nimcrypto >= 0.6.0 & < 0.7.0"
 requires "questionable >= 0.10.10 & < 0.11.0"
 requires "upraises >= 0.1.0 & < 0.2.0"
-# Update to nim 2.0.x
-# Avoid downloading stint 0.8.0
-requires "contractabi#363f8b4852b05c089b1e35ef3a0a882d51c996bc"
-requires "secp256k1 >= 0.6.0"
-requires "stint#3236fa68394f1e3a06e2bc34218aacdd2d675923"
-requires "stew >= 0.2.0"
+requires "contractabi >= 0.7.1 & < 0.8.0"
+requires "secp256k1 >= 0.6.0 & < 0.7.0"
+requires "stint >= 0.8.0 & < 0.9.0"
+requires "stew >= 0.2.0 & < 0.3.0"