From 961e65be4c359b5fa2798049ba290e7f2ee66cf2 Mon Sep 17 00:00:00 2001
From: ardocrat <ardocrat@gri.mw>
Date: Fri, 9 Jan 2026 23:08:34 +0000
Subject: [PATCH] build: grin submodules

Use node and wallet submodules to avoid dependency conflicts inside grin-wallet on grin repo update.

Reviewed-on: https://code.gri.mw/GUI/grim/pulls/29
---
 .gitmodules |  7 ++++++
 Cargo.lock  | 71 ++++++++++++-----------------------------------------
 Cargo.toml  | 52 +++++++++++++++++++--------------------
 node        |  1 +
 wallet      |  1 +
 5 files changed, 51 insertions(+), 81 deletions(-)
 create mode 100644 .gitmodules
 create mode 160000 node
 create mode 160000 wallet

diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..d7703fc
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,7 @@
+[submodule "node"]
+	path = node
+	url = https://code.gri.mw/ardocrat/node
+[submodule "wallet"]
+	path = wallet
+	url = https://code.gri.mw/ardocrat/wallet
+    branch = grim
\ No newline at end of file
diff --git a/Cargo.lock b/Cargo.lock
index a41aa59..213af8a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3581,7 +3581,7 @@ dependencies = [
  "grin_keychain",
  "grin_p2p",
  "grin_servers",
- "grin_util 5.4.0-alpha.0",
+ "grin_util",
  "grin_wallet_api",
  "grin_wallet_controller",
  "grin_wallet_impls",
@@ -3642,7 +3642,6 @@ dependencies = [
 [[package]]
 name = "grin_api"
 version = "5.4.0-alpha.0"
-source = "git+https://code.gri.mw/ardocrat/node?rev=a3ee15a8b27216cd2ff4b3b99894cd98dd33fa7e#a3ee15a8b27216cd2ff4b3b99894cd98dd33fa7e"
 dependencies = [
  "async-stream",
  "bytes 1.10.1",
@@ -3653,7 +3652,7 @@ dependencies = [
  "grin_p2p",
  "grin_pool",
  "grin_store",
- "grin_util 5.4.0-alpha.0",
+ "grin_util",
  "http 0.2.12",
  "hyper 0.14.32",
  "hyper-rustls 0.23.2",
@@ -3676,7 +3675,6 @@ dependencies = [
 [[package]]
 name = "grin_chain"
 version = "5.4.0-alpha.0"
-source = "git+https://code.gri.mw/ardocrat/node?rev=a3ee15a8b27216cd2ff4b3b99894cd98dd33fa7e#a3ee15a8b27216cd2ff4b3b99894cd98dd33fa7e"
 dependencies = [
  "bit-vec 0.6.3",
  "bitflags 1.3.2",
@@ -3687,7 +3685,7 @@ dependencies = [
  "grin_core",
  "grin_keychain",
  "grin_store",
- "grin_util 5.4.0-alpha.0",
+ "grin_util",
  "lazy_static",
  "log",
  "lru-cache",
@@ -3699,13 +3697,12 @@ dependencies = [
 [[package]]
 name = "grin_config"
 version = "5.4.0-alpha.0"
-source = "git+https://code.gri.mw/ardocrat/node?rev=a3ee15a8b27216cd2ff4b3b99894cd98dd33fa7e#a3ee15a8b27216cd2ff4b3b99894cd98dd33fa7e"
 dependencies = [
  "dirs 2.0.2",
  "grin_core",
  "grin_p2p",
  "grin_servers",
- "grin_util 5.4.0-alpha.0",
+ "grin_util",
  "rand 0.6.5",
  "serde",
  "serde_derive",
@@ -3715,7 +3712,6 @@ dependencies = [
 [[package]]
 name = "grin_core"
 version = "5.4.0-alpha.0"
-source = "git+https://code.gri.mw/ardocrat/node?rev=a3ee15a8b27216cd2ff4b3b99894cd98dd33fa7e#a3ee15a8b27216cd2ff4b3b99894cd98dd33fa7e"
 dependencies = [
  "blake2-rfc",
  "byteorder",
@@ -3724,7 +3720,7 @@ dependencies = [
  "croaring",
  "enum_primitive",
  "grin_keychain",
- "grin_util 5.4.0-alpha.0",
+ "grin_util",
  "lazy_static",
  "log",
  "lru-cache",
@@ -3741,12 +3737,11 @@ dependencies = [
 [[package]]
 name = "grin_keychain"
 version = "5.4.0-alpha.0"
-source = "git+https://code.gri.mw/ardocrat/node?rev=a3ee15a8b27216cd2ff4b3b99894cd98dd33fa7e#a3ee15a8b27216cd2ff4b3b99894cd98dd33fa7e"
 dependencies = [
  "blake2-rfc",
  "byteorder",
  "digest 0.9.0",
- "grin_util 5.4.0-alpha.0",
+ "grin_util",
  "hmac 0.11.0",
  "lazy_static",
  "log",
@@ -3763,7 +3758,6 @@ dependencies = [
 [[package]]
 name = "grin_p2p"
 version = "5.4.0-alpha.0"
-source = "git+https://code.gri.mw/ardocrat/node?rev=a3ee15a8b27216cd2ff4b3b99894cd98dd33fa7e#a3ee15a8b27216cd2ff4b3b99894cd98dd33fa7e"
 dependencies = [
  "bitflags 1.3.2",
  "bytes 0.5.6",
@@ -3772,7 +3766,7 @@ dependencies = [
  "grin_chain",
  "grin_core",
  "grin_store",
- "grin_util 5.4.0-alpha.0",
+ "grin_util",
  "log",
  "lru-cache",
  "num",
@@ -3785,13 +3779,12 @@ dependencies = [
 [[package]]
 name = "grin_pool"
 version = "5.4.0-alpha.0"
-source = "git+https://code.gri.mw/ardocrat/node?rev=a3ee15a8b27216cd2ff4b3b99894cd98dd33fa7e#a3ee15a8b27216cd2ff4b3b99894cd98dd33fa7e"
 dependencies = [
  "blake2-rfc",
  "chrono",
  "grin_core",
  "grin_keychain",
- "grin_util 5.4.0-alpha.0",
+ "grin_util",
  "log",
  "rand 0.6.5",
  "serde",
@@ -3817,7 +3810,6 @@ dependencies = [
 [[package]]
 name = "grin_servers"
 version = "5.4.0-alpha.0"
-source = "git+https://code.gri.mw/ardocrat/node?rev=a3ee15a8b27216cd2ff4b3b99894cd98dd33fa7e#a3ee15a8b27216cd2ff4b3b99894cd98dd33fa7e"
 dependencies = [
  "async-stream",
  "chrono",
@@ -3830,7 +3822,7 @@ dependencies = [
  "grin_p2p",
  "grin_pool",
  "grin_store",
- "grin_util 5.4.0-alpha.0",
+ "grin_util",
  "http 0.2.12",
  "hyper 0.14.32",
  "hyper-rustls 0.23.2",
@@ -3849,12 +3841,11 @@ dependencies = [
 [[package]]
 name = "grin_store"
 version = "5.4.0-alpha.0"
-source = "git+https://code.gri.mw/ardocrat/node?rev=a3ee15a8b27216cd2ff4b3b99894cd98dd33fa7e#a3ee15a8b27216cd2ff4b3b99894cd98dd33fa7e"
 dependencies = [
  "byteorder",
  "croaring",
  "grin_core",
- "grin_util 5.4.0-alpha.0",
+ "grin_util",
  "libc",
  "lmdb-zero",
  "log",
@@ -3865,33 +3856,9 @@ dependencies = [
  "thiserror 1.0.69",
 ]
 
-[[package]]
-name = "grin_util"
-version = "5.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d1433d76d0e95c2ed20e1008e9891adfae64812d1bdc5ec71ed5499dcaca2986"
-dependencies = [
- "anyhow",
- "backtrace",
- "base64 0.12.3",
- "byteorder",
- "grin_secp256k1zkp",
- "lazy_static",
- "log",
- "log4rs",
- "parking_lot 0.10.2",
- "rand 0.6.5",
- "serde",
- "serde_derive",
- "walkdir",
- "zeroize",
- "zip",
-]
-
 [[package]]
 name = "grin_util"
 version = "5.4.0-alpha.0"
-source = "git+https://code.gri.mw/ardocrat/node?rev=a3ee15a8b27216cd2ff4b3b99894cd98dd33fa7e#a3ee15a8b27216cd2ff4b3b99894cd98dd33fa7e"
 dependencies = [
  "anyhow",
  "backtrace",
@@ -3913,7 +3880,6 @@ dependencies = [
 [[package]]
 name = "grin_wallet_api"
 version = "5.4.0-alpha.1"
-source = "git+https://code.gri.mw/ardocrat/wallet?rev=8c9171e640f4a95bec7e22d9acb1725ebb2e30a1#8c9171e640f4a95bec7e22d9acb1725ebb2e30a1"
 dependencies = [
  "base64 0.12.3",
  "chrono",
@@ -3921,7 +3887,7 @@ dependencies = [
  "ed25519-dalek 1.0.1",
  "grin_core",
  "grin_keychain",
- "grin_util 5.4.0-alpha.0",
+ "grin_util",
  "grin_wallet_config",
  "grin_wallet_impls",
  "grin_wallet_libwallet",
@@ -3938,11 +3904,10 @@ dependencies = [
 [[package]]
 name = "grin_wallet_config"
 version = "5.4.0-alpha.1"
-source = "git+https://code.gri.mw/ardocrat/wallet?rev=8c9171e640f4a95bec7e22d9acb1725ebb2e30a1#8c9171e640f4a95bec7e22d9acb1725ebb2e30a1"
 dependencies = [
  "dirs 2.0.2",
  "grin_core",
- "grin_util 5.4.0-alpha.0",
+ "grin_util",
  "grin_wallet_util",
  "rand 0.6.5",
  "serde",
@@ -3953,7 +3918,6 @@ dependencies = [
 [[package]]
 name = "grin_wallet_controller"
 version = "5.4.0-alpha.1"
-source = "git+https://code.gri.mw/ardocrat/wallet?rev=8c9171e640f4a95bec7e22d9acb1725ebb2e30a1#8c9171e640f4a95bec7e22d9acb1725ebb2e30a1"
 dependencies = [
  "chrono",
  "easy-jsonrpc-mw",
@@ -3961,7 +3925,7 @@ dependencies = [
  "grin_api",
  "grin_core",
  "grin_keychain",
- "grin_util 5.4.0-alpha.0",
+ "grin_util",
  "grin_wallet_api",
  "grin_wallet_config",
  "grin_wallet_impls",
@@ -3987,7 +3951,6 @@ dependencies = [
 [[package]]
 name = "grin_wallet_impls"
 version = "5.4.0-alpha.1"
-source = "git+https://code.gri.mw/ardocrat/wallet?rev=8c9171e640f4a95bec7e22d9acb1725ebb2e30a1#8c9171e640f4a95bec7e22d9acb1725ebb2e30a1"
 dependencies = [
  "base64 0.12.3",
  "blake2-rfc",
@@ -4001,7 +3964,7 @@ dependencies = [
  "grin_core",
  "grin_keychain",
  "grin_store",
- "grin_util 5.4.0-alpha.0",
+ "grin_util",
  "grin_wallet_config",
  "grin_wallet_libwallet",
  "grin_wallet_util",
@@ -4026,7 +3989,6 @@ dependencies = [
 [[package]]
 name = "grin_wallet_libwallet"
 version = "5.4.0-alpha.1"
-source = "git+https://code.gri.mw/ardocrat/wallet?rev=8c9171e640f4a95bec7e22d9acb1725ebb2e30a1#8c9171e640f4a95bec7e22d9acb1725ebb2e30a1"
 dependencies = [
  "age",
  "base64 0.9.3",
@@ -4041,7 +4003,7 @@ dependencies = [
  "grin_core",
  "grin_keychain",
  "grin_store",
- "grin_util 5.4.0-alpha.0",
+ "grin_util",
  "grin_wallet_config",
  "grin_wallet_util",
  "hmac 0.12.1",
@@ -4065,11 +4027,10 @@ dependencies = [
 [[package]]
 name = "grin_wallet_util"
 version = "5.4.0-alpha.1"
-source = "git+https://code.gri.mw/ardocrat/wallet?rev=8c9171e640f4a95bec7e22d9acb1725ebb2e30a1#8c9171e640f4a95bec7e22d9acb1725ebb2e30a1"
 dependencies = [
  "data-encoding",
  "ed25519-dalek 1.0.1",
- "grin_util 5.3.3",
+ "grin_util",
  "rand 0.6.5",
  "serde",
  "serde_derive",
diff --git a/Cargo.toml b/Cargo.toml
index b469a22..15cb599 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -38,24 +38,24 @@ log = "0.4.27"
 #grin_util = "5.3.3"
 
 # test
-grin_api = { git = "https://code.gri.mw/ardocrat/node", rev = "a3ee15a8b27216cd2ff4b3b99894cd98dd33fa7e" }
-grin_chain = { git = "https://code.gri.mw/ardocrat/node", rev = "a3ee15a8b27216cd2ff4b3b99894cd98dd33fa7e" }
-grin_config = { git = "https://code.gri.mw/ardocrat/node", rev = "a3ee15a8b27216cd2ff4b3b99894cd98dd33fa7e" }
-grin_core = { git = "https://code.gri.mw/ardocrat/node", rev = "a3ee15a8b27216cd2ff4b3b99894cd98dd33fa7e" }
-grin_p2p = { git = "https://code.gri.mw/ardocrat/node", rev = "a3ee15a8b27216cd2ff4b3b99894cd98dd33fa7e" }
-grin_servers = { git = "https://code.gri.mw/ardocrat/node", rev = "a3ee15a8b27216cd2ff4b3b99894cd98dd33fa7e" }
-grin_keychain = { git = "https://code.gri.mw/ardocrat/node", rev = "a3ee15a8b27216cd2ff4b3b99894cd98dd33fa7e" }
-grin_util = { git = "https://code.gri.mw/ardocrat/node", rev = "a3ee15a8b27216cd2ff4b3b99894cd98dd33fa7e" }
+#grin_api = { git = "https://code.gri.mw/ardocrat/node", rev = "a3ee15a8b27216cd2ff4b3b99894cd98dd33fa7e" }
+#grin_chain = { git = "https://code.gri.mw/ardocrat/node", rev = "a3ee15a8b27216cd2ff4b3b99894cd98dd33fa7e" }
+#grin_config = { git = "https://code.gri.mw/ardocrat/node", rev = "a3ee15a8b27216cd2ff4b3b99894cd98dd33fa7e" }
+#grin_core = { git = "https://code.gri.mw/ardocrat/node", rev = "a3ee15a8b27216cd2ff4b3b99894cd98dd33fa7e" }
+#grin_p2p = { git = "https://code.gri.mw/ardocrat/node", rev = "a3ee15a8b27216cd2ff4b3b99894cd98dd33fa7e" }
+#grin_servers = { git = "https://code.gri.mw/ardocrat/node", rev = "a3ee15a8b27216cd2ff4b3b99894cd98dd33fa7e" }
+#grin_keychain = { git = "https://code.gri.mw/ardocrat/node", rev = "a3ee15a8b27216cd2ff4b3b99894cd98dd33fa7e" }
+#grin_util = { git = "https://code.gri.mw/ardocrat/node", rev = "a3ee15a8b27216cd2ff4b3b99894cd98dd33fa7e" }
 
 # local
-#grin_api = { path = "../grin/api" }
-#grin_chain = { path = "../grin/chain" }
-#grin_config = { path = "../grin/config" }
-#grin_core = { path = "../grin/core" }
-#grin_p2p = { path = "../grin/p2p" }
-#grin_servers = { path = "../grin/servers" }
-#grin_keychain = { path = "../grin/keychain" }
-#grin_util = { path = "../grin/util" }
+grin_api = { path = "node/api" }
+grin_chain = { path = "node/chain" }
+grin_config = { path = "node/config" }
+grin_core = { path = "node/core" }
+grin_p2p = { path = "node/p2p" }
+grin_servers = { path = "node/servers" }
+grin_keychain = { path = "node/keychain" }
+grin_util = { path = "node/util" }
 
 ## grin wallet
 #grin_wallet_impls = "5.3.3"
@@ -65,18 +65,18 @@ grin_util = { git = "https://code.gri.mw/ardocrat/node", rev = "a3ee15a8b27216cd
 #grin_wallet_controller = "5.3.3"
 
 # test
-grin_wallet_impls = { git = "https://code.gri.mw/ardocrat/wallet", rev = "8c9171e640f4a95bec7e22d9acb1725ebb2e30a1" }
-grin_wallet_api = { git = "https://code.gri.mw/ardocrat/wallet", rev = "8c9171e640f4a95bec7e22d9acb1725ebb2e30a1" }
-grin_wallet_libwallet = { git = "https://code.gri.mw/ardocrat/wallet", rev = "8c9171e640f4a95bec7e22d9acb1725ebb2e30a1" }
-grin_wallet_util = { git = "https://code.gri.mw/ardocrat/wallet", rev = "8c9171e640f4a95bec7e22d9acb1725ebb2e30a1" }
-grin_wallet_controller = { git = "https://code.gri.mw/ardocrat/wallet", rev = "8c9171e640f4a95bec7e22d9acb1725ebb2e30a1" }
+#grin_wallet_impls = { git = "https://code.gri.mw/ardocrat/wallet", rev = "8c9171e640f4a95bec7e22d9acb1725ebb2e30a1" }
+#grin_wallet_api = { git = "https://code.gri.mw/ardocrat/wallet", rev = "8c9171e640f4a95bec7e22d9acb1725ebb2e30a1" }
+#grin_wallet_libwallet = { git = "https://code.gri.mw/ardocrat/wallet", rev = "8c9171e640f4a95bec7e22d9acb1725ebb2e30a1" }
+#grin_wallet_util = { git = "https://code.gri.mw/ardocrat/wallet", rev = "8c9171e640f4a95bec7e22d9acb1725ebb2e30a1" }
+#grin_wallet_controller = { git = "https://code.gri.mw/ardocrat/wallet", rev = "8c9171e640f4a95bec7e22d9acb1725ebb2e30a1" }
 
 # local
-#grin_wallet_impls = { path = "../wallet/impls" }
-#grin_wallet_api = { path = "../wallet/api"}
-#grin_wallet_libwallet = { path = "../wallet/libwallet" }
-#grin_wallet_util = { path = "../wallet/util" }
-#grin_wallet_controller = { path = "../wallet/controller" }
+grin_wallet_impls = { path = "wallet/impls" }
+grin_wallet_api = { path = "wallet/api"}
+grin_wallet_libwallet = { path = "wallet/libwallet" }
+grin_wallet_util = { path = "wallet/util" }
+grin_wallet_controller = { path = "wallet/controller" }
 
 ## ui
 egui = { version = "0.33.0", default-features = false }
diff --git a/node b/node
new file mode 160000
index 0000000..376c85b
--- /dev/null
+++ b/node
@@ -0,0 +1 @@
+Subproject commit 376c85bab5fffa608e372c21e95241018e741252
diff --git a/wallet b/wallet
new file mode 160000
index 0000000..5c5d149
--- /dev/null
+++ b/wallet
@@ -0,0 +1 @@
+Subproject commit 5c5d1492741410c0b74dde9c23ade155a64a0dd4