github/darkfi
1
1
Fork 0
mirror of https://github.com/darkrenaissance/darkfi.git synced 2026-01-10 07:08:05 -05:00
Code Issues Packages Projects Releases Wiki Activity

drk: another minor scan fix

Browse Source
This commit is contained in:
skoupidi
2024-02-14 15:44:16 +02:00
parent 67692cf354
commit d4af12f264
1 changed files with 33 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
bin/drk/src/rpc.rs
View File

@@ -225,46 +225,46 @@ impl Drk {
height += 1;
};
let req = JsonRequest::new("blockchain.last_known_block", JsonValue::Array(vec![]));
let rep = match self.rpc_client.request(req).await {
Ok(r) => r,
Err(e) => {
eprintln!("[scan_blocks] RPC client request failed: {e:?}");
return Err(WalletDbError::GenericError)
}
};
let last = *rep.get::<f64>().unwrap() as u64;
eprintln!("Requested to scan from block number: {height}");
eprintln!("Last known block number reported by darkfid: {last}");
// Already scanned last known block
if height == last {
return Ok(())
}
while height <= last {
eprint!("Requesting block {}... ", height);
let block = match self.get_block_by_height(height).await {
loop {
let req = JsonRequest::new("blockchain.last_known_block", JsonValue::Array(vec![]));
let rep = match self.rpc_client.request(req).await {
Ok(r) => r,
Err(e) => {
eprintln!("[scan_blocks] RPC client request failed: {e:?}");
return Err(WalletDbError::GenericError)
}
};
if let Err(e) = self.scan_block_money(&block).await {
eprintln!("[scan_blocks] Scan block Money failed: {e:?}");
return Err(WalletDbError::GenericError)
};
if let Err(e) = self.scan_block_dao(&block).await {
eprintln!("[scan_blocks] Scan block DAO failed: {e:?}");
return Err(WalletDbError::GenericError)
};
self.update_tx_history_records_status(&block.txs, "Finalized").await?;
height += 1;
}
let last = *rep.get::<f64>().unwrap() as u64;
Ok(())
eprintln!("Requested to scan from block number: {height}");
eprintln!("Last known block number reported by darkfid: {last}");
// Already scanned last known block
if height >= last {
return Ok(())
}
while height <= last {
eprint!("Requesting block {}... ", height);
let block = match self.get_block_by_height(height).await {
Ok(r) => r,
Err(e) => {
eprintln!("[scan_blocks] RPC client request failed: {e:?}");
return Err(WalletDbError::GenericError)
}
};
if let Err(e) = self.scan_block_money(&block).await {
eprintln!("[scan_blocks] Scan block Money failed: {e:?}");
return Err(WalletDbError::GenericError)
};
if let Err(e) = self.scan_block_dao(&block).await {
eprintln!("[scan_blocks] Scan block DAO failed: {e:?}");
return Err(WalletDbError::GenericError)
};
self.update_tx_history_records_status(&block.txs, "Finalized").await?;
height += 1;
}
}
}
// Queries darkfid for a block with given height