Skip to content

Commit e561209

Browse files
committed
Minor texts/formatting/logging updates
1 parent 21d40c0 commit e561209

8 files changed

Lines changed: 21 additions & 21 deletions

File tree

.travis.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
language: rust
22
rust: [ stable ]
33
cache: { cargo: true }
4+
env: [ CARGO_TERM_COLOR=always ]
45

56
jobs:
67
include:
@@ -53,7 +54,7 @@ jobs:
5354
- >
5455
rm -rf dist/*/ &&
5556
echo '-----BEGIN SHA256SUM-----' &&
56-
(cd dist && sha256sum *) &&
57+
(cd dist && sha256sum * | sort) &&
5758
echo
5859
# XXX if: branch in (master, dev, latest) OR tag IS present
5960

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010

1111
- Support for tracking standalone addresses (#14)
1212

13+
Using `--address <address>` or `--address-file <path>`.
14+
1315
- New config options: `force_rescan` (9e7ccbe), `setup_logger` (35fc49f) and `require_addresses` (162790d)
1416

1517
- Gracefully wait for bitcoind to warm-up (dec6d46)

README.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,8 @@ You can set multiple `--xpub`s to track. This also supports ypubs and zpubs.
141141

142142
You can also track output script descriptors using `--descriptor`. For example, `--descriptor 'wpkh(<xpub>/0/*)'`.
143143

144+
Standalone addresses can be tracked with `--address <address>` or `--addresses-file <path>`.
145+
144146
To speed up rescanning for historical transactions, you can provide the wallet creation date with `--rescan-since <timestmap>`.
145147
The timestamp can be a `YYYY-MM-DD` formatted string, or 'now' to disable rescanning and watch for new
146148
transactions only (for newly created wallets).
@@ -194,7 +196,8 @@ This removes several large dependencies and disables the `track-spends` database
194196

195197
You can use bwt with pruning, but:
196198

197-
1. You will have to provide a rescan date (via `--rescan-since`) that is within the range of non-pruned blocks, or use `none` to disable rescanning entirely.
199+
1. You can only scan for transactions in the non-pruned history and will have to provide a rescan
200+
date that is within the range of non-pruned blocks.
198201

199202
2. Electrum needs to be run with `--skipmerklecheck` to tolerate missing SPV proofs for transactions in pruned blocks.
200203

scripts/release-footer.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
------------
33

4-
Also see the vVERSION downloads for [bwt-electrum-plugin](https://github.com/bwt-dev/bwt-electrum-plugin/releases/tag/vVERSION), [libbwt](https://github.com/bwt-dev/libbwt/releases/tag/vVERSION), [libbwt-nodejs](https://github.com/bwt-dev/libbwt-nodejs/releases/tag/vVERSION) and [libbwt-jni](https://github.com/bwt-dev/libbwt-jni/releases/tag/vVERSION).
4+
Also see the vVERSION releases for [bwt-electrum-plugin](https://github.com/bwt-dev/bwt-electrum-plugin/releases/tag/vVERSION), [libbwt](https://github.com/bwt-dev/libbwt/releases/tag/vVERSION), [libbwt-nodejs](https://github.com/bwt-dev/libbwt-nodejs/releases/tag/vVERSION) and [libbwt-jni](https://github.com/bwt-dev/libbwt-jni/releases/tag/vVERSION).
55

66
### Installation
77

src/app.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,9 @@ impl App {
6666
}
6767

6868
let (sync_tx, sync_rx) = mpsc::channel();
69-
// debounce sync message rate to avoid excessive indexing when bitcoind catches up
69+
70+
#[cfg(any(feature = "electrum", unix))]
71+
// debounce external sync message rate to avoid excessive indexing when bitcoind catches up
7072
let debounced_sync_tx = debounce_sender(sync_tx.clone(), DEBOUNCE_SEC);
7173

7274
#[cfg(feature = "electrum")]

src/http.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -515,7 +515,7 @@ impl HttpServer {
515515
spawn(warp_server, addr, addr_tx, shutdown_rx);
516516
});
517517

518-
let bound_addr = block_on_future(addr_rx).unwrap();
518+
let bound_addr = block_on_future(addr_rx).expect("failed starting http server");
519519
info!("HTTP REST API server running on http://{}/", bound_addr);
520520

521521
HttpServer {

src/indexer.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -453,7 +453,7 @@ fn spawn_send_progress_thread(
453453
return;
454454
}
455455
if let Err(e) = wait_wallet_scan(&rpc, progress_tx, Some(shutdown_rx), interval) {
456-
debug!("progress thread aborted: {:?}", e);
456+
trace!("progress thread aborted: {:?}", e);
457457
}
458458
});
459459

src/wallet.rs

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -353,11 +353,7 @@ impl Wallet {
353353
end_index: u32,
354354
rescan: bool,
355355
) -> Vec<(Address, RescanSince, String)> {
356-
let rescan_since = if rescan {
357-
self.rescan_since
358-
} else {
359-
RescanSince::Now
360-
};
356+
let rescan_since = iif!(rescan, self.rescan_since, RescanSince::Now);
361357

362358
(start_index..=end_index)
363359
.map(|index| {
@@ -437,16 +433,12 @@ fn batch_import(rpc: &RpcClient, import_reqs: Vec<(Address, RescanSince, String)
437433
let results = rpc.import_multi(
438434
&import_reqs
439435
.iter()
440-
.map(|(address, rescan, label)| {
441-
trace!("importing {} as {}", address, label,);
442-
443-
ImportMultiRequest {
444-
label: Some(&label),
445-
watchonly: Some(true),
446-
timestamp: (*rescan).into(),
447-
script_pubkey: Some(ImportMultiRequestScriptPubkey::Address(&address)),
448-
..Default::default()
449-
}
436+
.map(|(address, rescan, label)| ImportMultiRequest {
437+
label: Some(&label),
438+
watchonly: Some(true),
439+
timestamp: (*rescan).into(),
440+
script_pubkey: Some(ImportMultiRequestScriptPubkey::Address(&address)),
441+
..Default::default()
450442
})
451443
.collect::<Vec<_>>(),
452444
None,

0 commit comments

Comments
 (0)