Minor renaming/rephrasing/fixups

Author: shesek

contrib/libbwt.h

@@ -6,7 +6,8 @@
 #define BWT_OK 0
 #define BWT_ERR -1
 
-typedef void (*bwt_callback)(const char*, float, uint32_t, const char*);
+typedef void (*bwt_callback)(const char* msg_type, float progress,
+                             uint32_t detail_n, const char* detail_s);
 
 int32_t bwt_start(const char* json_config,
                   bwt_callback callback,

contrib/nodejs-bwt-daemon/README.md

@@ -67,7 +67,7 @@ let bwtd = await BwtDaemon({
   gap_limit: 100,
 
   // Progress notifications for history scanning (a full rescan from genesis can take 20-30 minutes)
-  progress_cb: (type, progress, detail) => console.log('bwt progress %s %f%%', type, progress*100, detail),
+  progress: (type, progress, detail) => console.log('bwt %s progress %f%%', type, progress*100, detail),
 })
 
 // Get the assigned address/port for the Electrum/HTTP servers

contrib/nodejs-bwt-daemon/example.js

@@ -11,7 +11,7 @@ const BwtDaemon = require('bwt-daemon')
     electrum: true,
     http: true,
     verbose: 2,
-    progress_cb: (type, progress, detail) => console.log('bwt progress %s %f%%', type, progress*100, detail),
+    progress: (type, progress, detail) => console.log('bwt progress %s %f%%', type, progress*100, detail),
   })
 
   console.log('bwt running', bwtd.electrum_addr, bwtd.http_addr)

contrib/nodejs-bwt-daemon/index.js

@@ -22,7 +22,7 @@ function start_bwt(options, progress_cb, done) {
       , progress_cb_ffi = ffi.Callback('void', [ 'string', 'float', 'uint32', 'string' ], progress_cb)
       , shutdown_ptrptr = ref.alloc(shutdownPtrPtr)
 
-  debug('starting');
+  debug('starting with %O', options);
   libbwt.bwt_start.async(opt_json, progress_cb_ffi, shutdown_ptrptr, function(err, code) {
     if (err) return done(err)
     if (code != OK) return done(new Error(`bwt failed with code ${code}`))
@@ -35,9 +35,9 @@ function start_bwt(options, progress_cb, done) {
 function init(options) {
   return new Promise((resolve, reject) => {
     let opt_progress = null
-    if (options.progress_cb) {
-      opt_progress = options.progress_cb
-      delete options.progress_cb
+    if (options.progress) {
+      opt_progress = options.progress
+      delete options.progress
     }
 
     // Convenience shortcuts

scripts/build.sh

@@ -98,4 +98,4 @@ for platform in x86_64-linux x86_64-win x86_64-osx arm32v7 arm64v8; do
 done
 
 # remove subdirectories, keep release tarballs
-rm -r dist/*/
+rm -rf dist/*/

scripts/release.sh

@@ -29,7 +29,7 @@ changelog="`sed -nr '/^## (Unreleased|'$version' )/{n;:a;n;/^## /q;p;ba}' CHANGE
 grep '## Unreleased' CHANGELOG.md > /dev/null \
   && sed -i "s/^## Unreleased/## $version - `date +%Y-%m-%d`/" CHANGELOG.md
 
-sed -i -r "s~bwt-[0-9.]+-x86_64~bwt-$version-x86_64~g; s~/(download|tag)/v[0-9.]+~/\1/v$version~;" README.md
+sed -i -r "s~bwt-[0-9a-z.-]+-x86_64-linux\.~bwt-$version-x86_64-linux.~g; s~/(download|tag)/v[0-9a-z.-]+~/\1/v$version~;" README.md
 
 echo -e "Releasing bwt v$version\n================\n\n$changelog\n\n"
 
@@ -82,7 +82,7 @@ fi
 
 if [ -z "$SKIP_PUBLISH_NPM_DAEMON" ]; then
   echo Publishing bwt-daemon to npm...
-  (cd contrib/nodejs-bwt-daemon && npm publish)
+  npm publish dist/nodejs-bwt-daemon-$version.tgz
 fi
 
 if [[ -z "$SKIP_UPLOAD" && -n "$GH_TOKEN" ]]; then

src/interface.rs

@@ -92,6 +92,7 @@ mod ffi {
             detail_n as u32,
             detail_s.as_ptr(),
         );
+        // drop CStrings
     }
 
     // Spawn a thread to receive mpsc progress updates and forward them to the callback_fn

src/util/descriptor.rs

@@ -74,7 +74,7 @@ impl DescKeyInfo {
 
         ensure!(
             valid_networks,
-            "Descriptor xpubs do not match the configured network {}",
+            "xpubs do not match the configured network {}",
             network
         );
 

src/wallet.rs

@@ -81,7 +81,7 @@ impl WalletWatcher {
         }
         if wallets.is_empty() {
             error!("Please provide at least one wallet to track (via --descriptor, --xpub or --bare-xpub).");
-            bail!("no xpubs provided");
+            bail!("No descriptors/xpubs provided");
         }
         Self::new(wallets)
     }