From 36e63d47518d9d1ef1eaeec11b32fcf6f135d87b Mon Sep 17 00:00:00 2001
From: 2ro <17595647+2ro@users.noreply.github.com>
Date: Wed, 17 Jun 2026 22:10:25 -0400
Subject: [PATCH] sync upstream Grim: bump node + wallet, adapt tx_log_iter
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Upstream Grim advanced past the fork base with a node + wallet version update
(b51a46b → its "node + wallet: update to latest versions"). Bumped both
submodules (node → bce5a71, wallet → c2db754) and applied the one source
adaptation that update requires: `tx_log_iter()` now yields Result items, so the
three call sites filter Ok + unwrap before use. The upstream Tor/arti-0.43 commit
is skipped — Goblin removed Tor entirely.
---
 Cargo.lock           | 20 ++++++++++----------
 node                 |  2 +-
 src/wallet/wallet.rs |  6 ++++++
 wallet               |  2 +-
 4 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index e40917f..ddd180e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4552,7 +4552,7 @@ dependencies = [
 
 [[package]]
 name = "grin_api"
-version = "5.4.0"
+version = "5.4.1"
 dependencies = [
  "async-stream",
  "bytes 1.11.1",
@@ -4585,7 +4585,7 @@ dependencies = [
 
 [[package]]
 name = "grin_chain"
-version = "5.4.0"
+version = "5.4.1"
 dependencies = [
  "bit-vec 0.6.3",
  "bitflags 1.3.2",
@@ -4607,7 +4607,7 @@ dependencies = [
 
 [[package]]
 name = "grin_config"
-version = "5.4.0"
+version = "5.4.1"
 dependencies = [
  "dirs 2.0.2",
  "grin_core",
@@ -4622,7 +4622,7 @@ dependencies = [
 
 [[package]]
 name = "grin_core"
-version = "5.4.0"
+version = "5.4.1"
 dependencies = [
  "blake2-rfc",
  "byteorder",
@@ -4647,7 +4647,7 @@ dependencies = [
 
 [[package]]
 name = "grin_keychain"
-version = "5.4.0"
+version = "5.4.1"
 dependencies = [
  "blake2-rfc",
  "byteorder",
@@ -4668,7 +4668,7 @@ dependencies = [
 
 [[package]]
 name = "grin_p2p"
-version = "5.4.0"
+version = "5.4.1"
 dependencies = [
  "bitflags 1.3.2",
  "built",
@@ -4690,7 +4690,7 @@ dependencies = [
 
 [[package]]
 name = "grin_pool"
-version = "5.4.0"
+version = "5.4.1"
 dependencies = [
  "blake2-rfc",
  "chrono",
@@ -4721,7 +4721,7 @@ dependencies = [
 
 [[package]]
 name = "grin_servers"
-version = "5.4.0"
+version = "5.4.1"
 dependencies = [
  "async-stream",
  "chrono",
@@ -4751,7 +4751,7 @@ dependencies = [
 
 [[package]]
 name = "grin_store"
-version = "5.4.0"
+version = "5.4.1"
 dependencies = [
  "byteorder",
  "croaring",
@@ -4769,7 +4769,7 @@ dependencies = [
 
 [[package]]
 name = "grin_util"
-version = "5.4.0"
+version = "5.4.1"
 dependencies = [
  "anyhow",
  "backtrace",
diff --git a/node b/node
index 386ac1e..bce5a71 160000
--- a/node
+++ b/node
@@ -1 +1 @@
-Subproject commit 386ac1ed5c37d44853c63e294242b16ebc12e963
+Subproject commit bce5a7144be4085dc9f4bcbb66d860ffeef9b4ca
diff --git a/src/wallet/wallet.rs b/src/wallet/wallet.rs
index 3b4e973..a2f9da2 100644
--- a/src/wallet/wallet.rs
+++ b/src/wallet/wallet.rs
@@ -915,6 +915,8 @@ impl Wallet {
 		// Retrieve txs from database.
 		let mut txs: Vec<TxLogEntry> = w
 			.tx_log_iter()?
+			.filter(|tx| tx.is_ok())
+			.map(|tx| tx.unwrap())
 			.filter(|tx_entry| tx_entry.parent_key_id == parent_key_id)
 			// Filter transactions to not show txs without slate (usually unspent outputs).
 			.filter(|tx| {
@@ -958,6 +960,8 @@ impl Wallet {
 			let parent_key_id = w.parent_key_id();
 			// Retrieve txs from database.
 			w.tx_log_iter()?
+				.filter(|tx| tx.is_ok())
+				.map(|tx| tx.unwrap())
 				.filter(|tx_entry| tx_entry.parent_key_id == parent_key_id)
 				.filter(|tx_entry| {
 					if tx_entry.tx_type == TxLogEntryType::TxSent
@@ -1843,6 +1847,8 @@ impl Wallet {
 					// Find wallet transaction to update or create.
 					let txs = w
 						.tx_log_iter()?
+						.filter(|tx| tx.is_ok())
+						.map(|tx| tx.unwrap())
 						.filter(|entry| {
 							if let Some(excess) = entry.kernel_excess {
 								return excess == proof.excess;
diff --git a/wallet b/wallet
index 8847ee5..c2db754 160000
--- a/wallet
+++ b/wallet
@@ -1 +1 @@
-Subproject commit 8847ee51578301ea7e525eecfb2df50cd75d7cbb
+Subproject commit c2db754552b9e5c57c4a843c68744df0cc744ff8