1
0
forked from GRIN/grim

sync upstream Grim: bump node + wallet, adapt tx_log_iter

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.
This commit is contained in:
2ro
2026-06-17 22:10:25 -04:00
parent f0b5410c13
commit 36e63d4751
4 changed files with 18 additions and 12 deletions
Generated
+10 -10
View File
@@ -4552,7 +4552,7 @@ dependencies = [
[[package]] [[package]]
name = "grin_api" name = "grin_api"
version = "5.4.0" version = "5.4.1"
dependencies = [ dependencies = [
"async-stream", "async-stream",
"bytes 1.11.1", "bytes 1.11.1",
@@ -4585,7 +4585,7 @@ dependencies = [
[[package]] [[package]]
name = "grin_chain" name = "grin_chain"
version = "5.4.0" version = "5.4.1"
dependencies = [ dependencies = [
"bit-vec 0.6.3", "bit-vec 0.6.3",
"bitflags 1.3.2", "bitflags 1.3.2",
@@ -4607,7 +4607,7 @@ dependencies = [
[[package]] [[package]]
name = "grin_config" name = "grin_config"
version = "5.4.0" version = "5.4.1"
dependencies = [ dependencies = [
"dirs 2.0.2", "dirs 2.0.2",
"grin_core", "grin_core",
@@ -4622,7 +4622,7 @@ dependencies = [
[[package]] [[package]]
name = "grin_core" name = "grin_core"
version = "5.4.0" version = "5.4.1"
dependencies = [ dependencies = [
"blake2-rfc", "blake2-rfc",
"byteorder", "byteorder",
@@ -4647,7 +4647,7 @@ dependencies = [
[[package]] [[package]]
name = "grin_keychain" name = "grin_keychain"
version = "5.4.0" version = "5.4.1"
dependencies = [ dependencies = [
"blake2-rfc", "blake2-rfc",
"byteorder", "byteorder",
@@ -4668,7 +4668,7 @@ dependencies = [
[[package]] [[package]]
name = "grin_p2p" name = "grin_p2p"
version = "5.4.0" version = "5.4.1"
dependencies = [ dependencies = [
"bitflags 1.3.2", "bitflags 1.3.2",
"built", "built",
@@ -4690,7 +4690,7 @@ dependencies = [
[[package]] [[package]]
name = "grin_pool" name = "grin_pool"
version = "5.4.0" version = "5.4.1"
dependencies = [ dependencies = [
"blake2-rfc", "blake2-rfc",
"chrono", "chrono",
@@ -4721,7 +4721,7 @@ dependencies = [
[[package]] [[package]]
name = "grin_servers" name = "grin_servers"
version = "5.4.0" version = "5.4.1"
dependencies = [ dependencies = [
"async-stream", "async-stream",
"chrono", "chrono",
@@ -4751,7 +4751,7 @@ dependencies = [
[[package]] [[package]]
name = "grin_store" name = "grin_store"
version = "5.4.0" version = "5.4.1"
dependencies = [ dependencies = [
"byteorder", "byteorder",
"croaring", "croaring",
@@ -4769,7 +4769,7 @@ dependencies = [
[[package]] [[package]]
name = "grin_util" name = "grin_util"
version = "5.4.0" version = "5.4.1"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"backtrace", "backtrace",
+1 -1
Submodule node updated: 386ac1ed5c...bce5a7144b
+6
View File
@@ -915,6 +915,8 @@ impl Wallet {
// Retrieve txs from database. // Retrieve txs from database.
let mut txs: Vec<TxLogEntry> = w let mut txs: Vec<TxLogEntry> = w
.tx_log_iter()? .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| tx_entry.parent_key_id == parent_key_id)
// Filter transactions to not show txs without slate (usually unspent outputs). // Filter transactions to not show txs without slate (usually unspent outputs).
.filter(|tx| { .filter(|tx| {
@@ -958,6 +960,8 @@ impl Wallet {
let parent_key_id = w.parent_key_id(); let parent_key_id = w.parent_key_id();
// Retrieve txs from database. // Retrieve txs from database.
w.tx_log_iter()? 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| tx_entry.parent_key_id == parent_key_id)
.filter(|tx_entry| { .filter(|tx_entry| {
if tx_entry.tx_type == TxLogEntryType::TxSent if tx_entry.tx_type == TxLogEntryType::TxSent
@@ -1843,6 +1847,8 @@ impl Wallet {
// Find wallet transaction to update or create. // Find wallet transaction to update or create.
let txs = w let txs = w
.tx_log_iter()? .tx_log_iter()?
.filter(|tx| tx.is_ok())
.map(|tx| tx.unwrap())
.filter(|entry| { .filter(|entry| {
if let Some(excess) = entry.kernel_excess { if let Some(excess) = entry.kernel_excess {
return excess == proof.excess; return excess == proof.excess;
+1 -1
Submodule wallet updated: 8847ee5157...c2db754552