ref!: migrate from dashcore-lib to blocktx

Author: AJ ONeal

bin/crowdnode.js

@@ -21,7 +21,7 @@ let Prompt = require("./_prompt.js");
 let Qr = require("./_qr-node.js");
 let Ws = require("dashsight/ws");
 
-let Dashcore = require("@dashevo/dashcore-lib");
+let Dashcore = require("../dashcore-lit.js");
 
 const DONE = "✅";
 const TODO = "ℹ️";
@@ -663,7 +663,7 @@ async function mustGetAddr({ defaultAddr }, args) {
       return [addr, name];
     }
     //let pk = new Dashcore.PrivateKey(wif);
-    //let addr = pk.toAddress().toString();
+    //let addr = (await pk.toAddress()).toString();
     return [addr, name];
   }
 
@@ -796,8 +796,8 @@ async function generateKey({ defaultKey, plainText }, args) {
   //@ts-ignore - TODO submit JSDoc PR for Dashcore
   let pk = new Dashcore.PrivateKey();
 
-  let addr = pk.toAddress().toString();
-  let plainWif = pk.toWIF();
+  let addr = (await pk.toAddress()).toString();
+  let plainWif = await pk.toWIF();
 
   let wif = plainWif;
   if (!plainText) {
@@ -1259,7 +1259,7 @@ async function maybeReadKeyFileRaw(filepath, opts) {
   }
 
   let pk = new Dashcore.PrivateKey(privKey);
-  let pub = pk.toAddress().toString();
+  let pub = (await pk.toAddress()).toString();
 
   return {
     addr: pub,
@@ -1326,7 +1326,7 @@ async function setDefault(_, args) {
   let filepath = Path.join(keysDir, keyname);
   let wif = await maybeReadKeyFile(filepath);
   let pk = new Dashcore.PrivateKey(wif);
-  let pub = pk.toAddress().toString();
+  let pub = (await pk.toAddress()).toString();
 
   console.info("set", defaultWifPath, pub);
   await Fs.writeFile(defaultWifPath, pub, "utf8");
@@ -1439,7 +1439,7 @@ async function getAllBalances({ dashApi, defaultAddr }, args) {
 
     /*
     let pk = new Dashcore.PrivateKey(wif);
-    let pub = pk.toAddress().toString();
+    let pub = (await pk.toAddress()).toString();
     if (`${pub}.wif` !== wifname) {
       // sanity check
       warns.push({
@@ -2038,12 +2038,11 @@ async function wifFileToAddr(name) {
   }
 
   let pk = new Dashcore.PrivateKey(privKey);
-  let pub = pk.toPublicKey().toAddress().toString();
+  let pub = (await pk.toPublicKey().toAddress()).toString();
   return pub;
 }
 
 /**
- * @param {String} insightBaseUrl
  * @param {String} addr
  */
 async function collectSignupFees(addr) {

crowdnode.js

@@ -12,7 +12,7 @@
   const DUFFS = 100000000;
 
   let Dash = exports.DashApi || require("./dashapi.js");
-  let Dashcore = exports.dashcore || require("./lib/dashcore.js");
+  let Dashcore = exports.dashcore || require("./dashcore-lit.js");
   let DashSight = exports.DashSight || require("dashsight");
   let Ws = exports.DashSocket || require("dashsight/ws");
 
@@ -189,7 +189,7 @@
     // Send Request Message
     let pk = new Dashcore.PrivateKey(wif);
     let msg = CrowdNode.offset + CrowdNode.requests.signupForApi;
-    let changeAddr = pk.toPublicKey().toAddress().toString();
+    let changeAddr = (await pk.toPublicKey().toAddress()).toString();
     let tx = await CrowdNode._dashApi.createPayment(
       wif,
       hotwallet,
@@ -214,7 +214,7 @@
     // Send Request Message
     let pk = new Dashcore.PrivateKey(wif);
     let msg = CrowdNode.offset + CrowdNode.requests.acceptTerms;
-    let changeAddr = pk.toPublicKey().toAddress().toString();
+    let changeAddr = (await pk.toPublicKey().toAddress()).toString();
     let tx = await CrowdNode._dashApi.createPayment(
       wif,
       hotwallet,
@@ -240,7 +240,7 @@
   CrowdNode.deposit = async function (wif, hotwallet, amount) {
     // Send Request Message
     let pk = new Dashcore.PrivateKey(wif);
-    let changeAddr = pk.toPublicKey().toAddress().toString();
+    let changeAddr = (await pk.toPublicKey().toAddress()).toString();
 
     // TODO reserve a balance
     let tx;
@@ -279,7 +279,7 @@
     // Send Request Message
     let pk = new Dashcore.PrivateKey(wif);
     let msg = CrowdNode.offset + permil;
-    let changeAddr = pk.toPublicKey().toAddress().toString();
+    let changeAddr = (await pk.toPublicKey().toAddress()).toString();
     let tx = await CrowdNode._dashApi.createPayment(
       wif,
       hotwallet,

dashapi.js

@@ -6,12 +6,12 @@
   exports.DashApi = Dash;
 
   const DUFFS = 100000000;
-  const DUST = 10000;
   const FEE = 1000;
 
   //@ts-ignore
-  let Dashcore = exports.dashcore || require("./lib/dashcore.js");
+  let Dashcore = exports.dashcore || require("./dashcore-lit.js");
   let Transaction = Dashcore.Transaction;
+  let PrivateKey = Dashcore.PrivateKey;
 
   Dash.create = function ({
     //@ts-ignore TODO
@@ -51,8 +51,8 @@
      * @param {String} pub
      */
     dashApi.createBalanceTransfer = async function (privKey, pub) {
-      let pk = new Dashcore.PrivateKey(privKey);
-      let changeAddr = pk.toPublicKey().toAddress().toString();
+      let pk = new PrivateKey(privKey);
+      let changeAddr = (await pk.toPublicKey().toAddress()).toString();
 
       let body = await insightApi.getUtxos(changeAddr);
       let utxos = await getUtxos(body);
@@ -65,7 +65,7 @@
         //@ts-ignore - allows single value or array
         .from(utxos);
       tmpTx.to(pub, balance - 1000);
-      tmpTx.sign(pk);
+      await tmpTx.sign(pk);
 
       // TODO getsmartfeeestimate??
       // fee = 1duff/byte (2 chars hex is 1 byte)
@@ -78,26 +78,26 @@
         .from(utxos);
       tx.to(pub, balance - fee);
       tx.fee(fee);
-      tx.sign(pk);
+      await tx.sign(pk);
 
       return tx;
     };
 
     /**
      * Send with change back
      * @param {String} privKey
-     * @param {(String|import('@dashevo/dashcore-lib').Address)} payAddr
+     * @param {String} payAddr
      * @param {Number} amount
-     * @param {(String|import('@dashevo/dashcore-lib').Address)} [changeAddr]
+     * @param {String} [changeAddr]
      */
     dashApi.createPayment = async function (
       privKey,
       payAddr,
       amount,
       changeAddr,
     ) {
-      let pk = new Dashcore.PrivateKey(privKey);
-      let utxoAddr = pk.toPublicKey().toAddress().toString();
+      let pk = new PrivateKey(privKey);
+      let utxoAddr = (await pk.toPublicKey().toAddress()).toString();
       if (!changeAddr) {
         changeAddr = utxoAddr;
       }
@@ -112,7 +112,7 @@
       }
 
       // (estimate) don't send dust back as change
-      if (balance - amount <= DUST + FEE) {
+      if (balance - amount <= Transaction.DUST_AMOUNT + FEE) {
         amount = balance;
       }
 
@@ -123,7 +123,7 @@
       tmpTx.to(payAddr, amount);
       //@ts-ignore - the JSDoc is wrong in dashcore-lib/lib/transaction/transaction.js
       tmpTx.change(changeAddr);
-      tmpTx.sign(pk);
+      await tmpTx.sign(pk);
 
       // TODO getsmartfeeestimate??
       // fee = 1duff/byte (2 chars hex is 1 byte)
@@ -132,7 +132,7 @@
       let fee = 10 + tmpTx.toString().length / 2;
 
       // (adjusted) don't send dust back as change
-      if (balance + -amount + -fee <= DUST) {
+      if (balance + -amount + -fee <= Transaction.DUST_AMOUNT) {
         amount = balance - fee;
       }
 
@@ -144,7 +144,7 @@
       tx.fee(fee);
       //@ts-ignore - see above
       tx.change(changeAddr);
-      tx.sign(pk);
+      await tx.sign(pk);
 
       return tx;
     };