diff --git a/zcash_client_backend/src/data_api/chain.rs b/zcash_client_backend/src/data_api/chain.rs
index 4053bcd66..89bcf8fc2 100644
--- a/zcash_client_backend/src/data_api/chain.rs
+++ b/zcash_client_backend/src/data_api/chain.rs
@@ -260,7 +260,7 @@ where
db_update.insert_block(height, block_hash, block_time, &tree)?;
for tx in txs {
- let tx_row = db_update.put_tx(&tx, height)?;
+ let tx_row = db_update.put_tx_meta(&tx, height)?;
// Mark notes as spent and remove them from the scanning cache
for spend in &tx.shielded_spends {
@@ -280,7 +280,7 @@ where
output.witness.position() as u64,
);
- let note_id = db_update.put_note(&output, &nf, tx_row)?;
+ let note_id = db_update.put_received_note(&output, Some(&nf), tx_row)?;
// Save witness for note.
witnesses.push((note_id, output.witness));
diff --git a/zcash_client_backend/src/data_api/mod.rs b/zcash_client_backend/src/data_api/mod.rs
index 527b7ff89..c9772516d 100644
--- a/zcash_client_backend/src/data_api/mod.rs
+++ b/zcash_client_backend/src/data_api/mod.rs
@@ -2,19 +2,22 @@ use zcash_primitives::{
block::BlockHash,
consensus::{self, BlockHeight},
merkle_tree::{CommitmentTree, IncrementalWitness},
- primitives::PaymentAddress,
+ note_encryption::Memo,
+ primitives::{Note, PaymentAddress},
sapling::Node,
- transaction::components::Amount,
+ transaction::{components::Amount, Transaction, TxId},
zip32::ExtendedFullViewingKey,
};
use crate::{
+ decrypt::DecryptedOutput,
proto::compact_formats::CompactBlock,
wallet::{AccountId, WalletShieldedOutput, WalletTx},
};
pub mod chain;
pub mod error;
+pub mod wallet;
pub trait DBOps {
type Error;
@@ -41,6 +44,8 @@ pub trait DBOps {
fn get_block_hash(&self, block_height: BlockHeight) -> Result