zcash_client_sqlite: Remove inner join between `transactions` and `utxos` from `v_transactions`
Under normal usage conditions, the `transactions` table is not currently populated for transactions involving transparent UTXOs, and so this join was always resulting in transparent UTXO information being filtered out from the transaction history. Fixes [zcash/ZcashLightClientKit#1271]
This commit is contained in:
parent
4a752310e0
commit
6ebd66da76
|
@ -42,6 +42,9 @@ and this library adheres to Rust's notion of
|
|||
- `FsBlockDbError::CacheMiss`
|
||||
- `zcash_client_sqlite::FsBlockDb::write_block_metadata` now overwrites any
|
||||
existing metadata entries that have the same height as a new entry.
|
||||
- The `v_transactions` and `v_tx_outputs` views now return the 32-byte
|
||||
transaction identifier for transactions instead of the internal database
|
||||
id.
|
||||
|
||||
### Removed
|
||||
- The empty `wallet::transact` module has been removed.
|
||||
|
|
|
@ -436,8 +436,9 @@ mod tests {
|
|||
WITH
|
||||
notes AS (
|
||||
SELECT sapling_received_notes.account AS account_id,
|
||||
sapling_received_notes.tx AS id_tx,
|
||||
2 AS pool,
|
||||
transactions.block AS block,
|
||||
transactions.txid AS txid,
|
||||
2 AS pool,
|
||||
sapling_received_notes.value AS value,
|
||||
CASE
|
||||
WHEN sapling_received_notes.is_change THEN 1
|
||||
|
@ -452,32 +453,36 @@ mod tests {
|
|||
THEN 0
|
||||
ELSE 1
|
||||
END AS memo_present
|
||||
FROM sapling_received_notes
|
||||
FROM sapling_received_notes
|
||||
JOIN transactions
|
||||
ON transactions.id_tx = sapling_received_notes.tx
|
||||
UNION
|
||||
SELECT utxos.received_by_account AS account_id,
|
||||
transactions.id_tx AS id_tx,
|
||||
utxos.height AS block,
|
||||
utxos.prevout_txid AS txid,
|
||||
0 AS pool,
|
||||
utxos.value_zat AS value,
|
||||
0 AS is_change,
|
||||
1 AS received_count,
|
||||
0 AS memo_present
|
||||
FROM utxos
|
||||
JOIN transactions
|
||||
ON transactions.txid = utxos.prevout_txid
|
||||
UNION
|
||||
SELECT sapling_received_notes.account AS account_id,
|
||||
sapling_received_notes.spent AS id_tx,
|
||||
2 AS pool,
|
||||
transactions.block AS block,
|
||||
transactions.txid AS txid,
|
||||
2 AS pool,
|
||||
-sapling_received_notes.value AS value,
|
||||
0 AS is_change,
|
||||
0 AS received_count,
|
||||
0 AS memo_present
|
||||
FROM sapling_received_notes
|
||||
FROM sapling_received_notes
|
||||
JOIN transactions
|
||||
ON transactions.id_tx = sapling_received_notes.spent
|
||||
WHERE sapling_received_notes.spent IS NOT NULL
|
||||
),
|
||||
sent_note_counts AS (
|
||||
SELECT sent_notes.from_account AS account_id,
|
||||
sent_notes.tx AS id_tx,
|
||||
transactions.txid AS txid,
|
||||
COUNT(DISTINCT sent_notes.id_note) as sent_notes,
|
||||
SUM(
|
||||
CASE
|
||||
|
@ -487,21 +492,22 @@ mod tests {
|
|||
END
|
||||
) AS memo_count
|
||||
FROM sent_notes
|
||||
JOIN transactions
|
||||
ON transactions.id_tx = sent_notes.tx
|
||||
LEFT JOIN sapling_received_notes
|
||||
ON (sent_notes.tx, sent_notes.output_pool, sent_notes.output_index) =
|
||||
(sapling_received_notes.tx, 2, sapling_received_notes.output_index)
|
||||
WHERE sapling_received_notes.is_change IS NULL
|
||||
OR sapling_received_notes.is_change = 0
|
||||
GROUP BY account_id, id_tx
|
||||
GROUP BY account_id, txid
|
||||
),
|
||||
blocks_max_height AS (
|
||||
SELECT MAX(blocks.height) as max_height FROM blocks
|
||||
)
|
||||
SELECT notes.account_id AS account_id,
|
||||
transactions.id_tx AS id_tx,
|
||||
transactions.block AS mined_height,
|
||||
notes.block AS mined_height,
|
||||
notes.txid AS txid,
|
||||
transactions.tx_index AS tx_index,
|
||||
transactions.txid AS txid,
|
||||
transactions.expiry_height AS expiry_height,
|
||||
transactions.raw AS raw,
|
||||
SUM(notes.value) AS account_balance_delta,
|
||||
|
@ -515,17 +521,18 @@ mod tests {
|
|||
blocks.height IS NULL
|
||||
AND transactions.expiry_height <= blocks_max_height.max_height
|
||||
) AS expired_unmined
|
||||
FROM transactions
|
||||
JOIN notes ON notes.id_tx = transactions.id_tx
|
||||
FROM notes
|
||||
LEFT OUTER JOIN transactions
|
||||
ON notes.txid = transactions.txid
|
||||
JOIN blocks_max_height
|
||||
LEFT JOIN blocks ON blocks.height = transactions.block
|
||||
LEFT JOIN sent_note_counts
|
||||
ON sent_note_counts.account_id = notes.account_id
|
||||
AND sent_note_counts.id_tx = notes.id_tx
|
||||
GROUP BY notes.account_id, transactions.id_tx".to_owned(),
|
||||
AND sent_note_counts.txid = notes.txid
|
||||
GROUP BY notes.account_id, notes.txid".to_owned(),
|
||||
// v_tx_outputs
|
||||
"CREATE VIEW v_tx_outputs AS
|
||||
SELECT sapling_received_notes.tx AS id_tx,
|
||||
SELECT transactions.txid AS txid,
|
||||
2 AS output_pool,
|
||||
sapling_received_notes.output_index AS output_index,
|
||||
sent_notes.from_account AS from_account,
|
||||
|
@ -535,11 +542,13 @@ mod tests {
|
|||
sapling_received_notes.is_change AS is_change,
|
||||
sapling_received_notes.memo AS memo
|
||||
FROM sapling_received_notes
|
||||
JOIN transactions
|
||||
ON transactions.id_tx = sapling_received_notes.tx
|
||||
LEFT JOIN sent_notes
|
||||
ON (sent_notes.tx, sent_notes.output_pool, sent_notes.output_index) =
|
||||
(sapling_received_notes.tx, 2, sent_notes.output_index)
|
||||
UNION
|
||||
SELECT transactions.id_tx AS id_tx,
|
||||
SELECT utxos.prevout_txid AS txid,
|
||||
0 AS output_pool,
|
||||
utxos.prevout_idx AS output_index,
|
||||
NULL AS from_account,
|
||||
|
@ -549,10 +558,8 @@ mod tests {
|
|||
false AS is_change,
|
||||
NULL AS memo
|
||||
FROM utxos
|
||||
JOIN transactions
|
||||
ON transactions.txid = utxos.prevout_txid
|
||||
UNION
|
||||
SELECT sent_notes.tx AS id_tx,
|
||||
SELECT transactions.txid AS txid,
|
||||
sent_notes.output_pool AS output_pool,
|
||||
sent_notes.output_index AS output_index,
|
||||
sent_notes.from_account AS from_account,
|
||||
|
@ -562,6 +569,8 @@ mod tests {
|
|||
false AS is_change,
|
||||
sent_notes.memo AS memo
|
||||
FROM sent_notes
|
||||
JOIN transactions
|
||||
ON transactions.id_tx = sent_notes.tx
|
||||
LEFT JOIN sapling_received_notes
|
||||
ON (sent_notes.tx, sent_notes.output_pool, sent_notes.output_index) =
|
||||
(sapling_received_notes.tx, 2, sapling_received_notes.output_index)
|
||||
|
|
|
@ -12,6 +12,7 @@ mod ufvk_support;
|
|||
mod utxos_table;
|
||||
mod v_sapling_shard_unscanned_ranges;
|
||||
mod v_transactions_net;
|
||||
mod v_transactions_transparent_history;
|
||||
mod wallet_summaries;
|
||||
|
||||
use schemer_rusqlite::RusqliteMigration;
|
||||
|
@ -39,12 +40,13 @@ pub(super) fn all_migrations<P: consensus::Parameters + 'static>(
|
|||
// received_notes_nullable_nf
|
||||
// / | \
|
||||
// shardtree_support nullifier_map sapling_memo_consistency
|
||||
// |
|
||||
// add_account_birthdays
|
||||
// |
|
||||
// v_sapling_shard_unscanned_ranges
|
||||
// |
|
||||
// wallet_summaries
|
||||
// | |
|
||||
// add_account_birthdays |
|
||||
// | |
|
||||
// v_sapling_shard_unscanned_ranges |
|
||||
// | |
|
||||
// wallet_summaries |
|
||||
// v_transactions_transparent_history
|
||||
vec![
|
||||
Box::new(initial_setup::Migration {}),
|
||||
Box::new(utxos_table::Migration {}),
|
||||
|
@ -76,5 +78,6 @@ pub(super) fn all_migrations<P: consensus::Parameters + 'static>(
|
|||
params: params.clone(),
|
||||
}),
|
||||
Box::new(wallet_summaries::Migration),
|
||||
Box::new(v_transactions_transparent_history::Migration),
|
||||
]
|
||||
}
|
||||
|
|
|
@ -0,0 +1,190 @@
|
|||
//! This migration reworks transaction history views to correctly include history
|
||||
//! of transparent utxos for which we lack complete transaction information.
|
||||
|
||||
use std::collections::HashSet;
|
||||
|
||||
use schemer_rusqlite::RusqliteMigration;
|
||||
use uuid::Uuid;
|
||||
|
||||
use crate::wallet::init::WalletMigrationError;
|
||||
|
||||
use super::sapling_memo_consistency;
|
||||
|
||||
pub(super) const MIGRATION_ID: Uuid = Uuid::from_u128(0xaa0a4168_b41b_44c5_a47d_c4c66603cfab);
|
||||
|
||||
pub(super) struct Migration;
|
||||
|
||||
impl schemer::Migration for Migration {
|
||||
fn id(&self) -> Uuid {
|
||||
MIGRATION_ID
|
||||
}
|
||||
|
||||
fn dependencies(&self) -> HashSet<Uuid> {
|
||||
[sapling_memo_consistency::MIGRATION_ID]
|
||||
.into_iter()
|
||||
.collect()
|
||||
}
|
||||
|
||||
fn description(&self) -> &'static str {
|
||||
"Updates transaction history views to fix potential errors in transparent history."
|
||||
}
|
||||
}
|
||||
|
||||
impl RusqliteMigration for Migration {
|
||||
type Error = WalletMigrationError;
|
||||
|
||||
fn up(&self, transaction: &rusqlite::Transaction) -> Result<(), Self::Error> {
|
||||
transaction.execute_batch(
|
||||
"DROP VIEW v_transactions;
|
||||
CREATE VIEW v_transactions AS
|
||||
WITH
|
||||
notes AS (
|
||||
SELECT sapling_received_notes.account AS account_id,
|
||||
transactions.block AS block,
|
||||
transactions.txid AS txid,
|
||||
2 AS pool,
|
||||
sapling_received_notes.value AS value,
|
||||
CASE
|
||||
WHEN sapling_received_notes.is_change THEN 1
|
||||
ELSE 0
|
||||
END AS is_change,
|
||||
CASE
|
||||
WHEN sapling_received_notes.is_change THEN 0
|
||||
ELSE 1
|
||||
END AS received_count,
|
||||
CASE
|
||||
WHEN (sapling_received_notes.memo IS NULL OR sapling_received_notes.memo = X'F6')
|
||||
THEN 0
|
||||
ELSE 1
|
||||
END AS memo_present
|
||||
FROM sapling_received_notes
|
||||
JOIN transactions
|
||||
ON transactions.id_tx = sapling_received_notes.tx
|
||||
UNION
|
||||
SELECT utxos.received_by_account AS account_id,
|
||||
utxos.height AS block,
|
||||
utxos.prevout_txid AS txid,
|
||||
0 AS pool,
|
||||
utxos.value_zat AS value,
|
||||
0 AS is_change,
|
||||
1 AS received_count,
|
||||
0 AS memo_present
|
||||
FROM utxos
|
||||
UNION
|
||||
SELECT sapling_received_notes.account AS account_id,
|
||||
transactions.block AS block,
|
||||
transactions.txid AS txid,
|
||||
2 AS pool,
|
||||
-sapling_received_notes.value AS value,
|
||||
0 AS is_change,
|
||||
0 AS received_count,
|
||||
0 AS memo_present
|
||||
FROM sapling_received_notes
|
||||
JOIN transactions
|
||||
ON transactions.id_tx = sapling_received_notes.spent
|
||||
WHERE sapling_received_notes.spent IS NOT NULL
|
||||
),
|
||||
sent_note_counts AS (
|
||||
SELECT sent_notes.from_account AS account_id,
|
||||
transactions.txid AS txid,
|
||||
COUNT(DISTINCT sent_notes.id_note) as sent_notes,
|
||||
SUM(
|
||||
CASE
|
||||
WHEN (sent_notes.memo IS NULL OR sent_notes.memo = X'F6')
|
||||
THEN 0
|
||||
ELSE 1
|
||||
END
|
||||
) AS memo_count
|
||||
FROM sent_notes
|
||||
JOIN transactions
|
||||
ON transactions.id_tx = sent_notes.tx
|
||||
LEFT JOIN sapling_received_notes
|
||||
ON (sent_notes.tx, sent_notes.output_pool, sent_notes.output_index) =
|
||||
(sapling_received_notes.tx, 2, sapling_received_notes.output_index)
|
||||
WHERE sapling_received_notes.is_change IS NULL
|
||||
OR sapling_received_notes.is_change = 0
|
||||
GROUP BY account_id, txid
|
||||
),
|
||||
blocks_max_height AS (
|
||||
SELECT MAX(blocks.height) as max_height FROM blocks
|
||||
)
|
||||
SELECT notes.account_id AS account_id,
|
||||
notes.block AS mined_height,
|
||||
notes.txid AS txid,
|
||||
transactions.tx_index AS tx_index,
|
||||
transactions.expiry_height AS expiry_height,
|
||||
transactions.raw AS raw,
|
||||
SUM(notes.value) AS account_balance_delta,
|
||||
transactions.fee AS fee_paid,
|
||||
SUM(notes.is_change) > 0 AS has_change,
|
||||
MAX(COALESCE(sent_note_counts.sent_notes, 0)) AS sent_note_count,
|
||||
SUM(notes.received_count) AS received_note_count,
|
||||
SUM(notes.memo_present) + MAX(COALESCE(sent_note_counts.memo_count, 0)) AS memo_count,
|
||||
blocks.time AS block_time,
|
||||
(
|
||||
blocks.height IS NULL
|
||||
AND transactions.expiry_height <= blocks_max_height.max_height
|
||||
) AS expired_unmined
|
||||
FROM notes
|
||||
LEFT OUTER JOIN transactions
|
||||
ON notes.txid = transactions.txid
|
||||
JOIN blocks_max_height
|
||||
LEFT JOIN blocks ON blocks.height = transactions.block
|
||||
LEFT JOIN sent_note_counts
|
||||
ON sent_note_counts.account_id = notes.account_id
|
||||
AND sent_note_counts.txid = notes.txid
|
||||
GROUP BY notes.account_id, notes.txid;
|
||||
|
||||
DROP VIEW v_tx_outputs;
|
||||
CREATE VIEW v_tx_outputs AS
|
||||
SELECT transactions.txid AS txid,
|
||||
2 AS output_pool,
|
||||
sapling_received_notes.output_index AS output_index,
|
||||
sent_notes.from_account AS from_account,
|
||||
sapling_received_notes.account AS to_account,
|
||||
NULL AS to_address,
|
||||
sapling_received_notes.value AS value,
|
||||
sapling_received_notes.is_change AS is_change,
|
||||
sapling_received_notes.memo AS memo
|
||||
FROM sapling_received_notes
|
||||
JOIN transactions
|
||||
ON transactions.id_tx = sapling_received_notes.tx
|
||||
LEFT JOIN sent_notes
|
||||
ON (sent_notes.tx, sent_notes.output_pool, sent_notes.output_index) =
|
||||
(sapling_received_notes.tx, 2, sent_notes.output_index)
|
||||
UNION
|
||||
SELECT utxos.prevout_txid AS txid,
|
||||
0 AS output_pool,
|
||||
utxos.prevout_idx AS output_index,
|
||||
NULL AS from_account,
|
||||
utxos.received_by_account AS to_account,
|
||||
utxos.address AS to_address,
|
||||
utxos.value_zat AS value,
|
||||
false AS is_change,
|
||||
NULL AS memo
|
||||
FROM utxos
|
||||
UNION
|
||||
SELECT transactions.txid AS txid,
|
||||
sent_notes.output_pool AS output_pool,
|
||||
sent_notes.output_index AS output_index,
|
||||
sent_notes.from_account AS from_account,
|
||||
sapling_received_notes.account AS to_account,
|
||||
sent_notes.to_address AS to_address,
|
||||
sent_notes.value AS value,
|
||||
false AS is_change,
|
||||
sent_notes.memo AS memo
|
||||
FROM sent_notes
|
||||
JOIN transactions
|
||||
ON transactions.id_tx = sent_notes.tx
|
||||
LEFT JOIN sapling_received_notes
|
||||
ON (sent_notes.tx, sent_notes.output_pool, sent_notes.output_index) =
|
||||
(sapling_received_notes.tx, 2, sapling_received_notes.output_index)
|
||||
WHERE sapling_received_notes.is_change IS NULL
|
||||
OR sapling_received_notes.is_change = 0;"
|
||||
).map_err(WalletMigrationError::from)
|
||||
}
|
||||
|
||||
fn down(&self, _transaction: &rusqlite::Transaction) -> Result<(), Self::Error> {
|
||||
panic!("This migration cannot be reverted.");
|
||||
}
|
||||
}
|
Loading…
Reference in New Issue