refactor: use Wallet lib instead of getUTXO

lib/test/createClientWithFundedWallet.js

@@ -1,14 +1,7 @@
-const {
-  PrivateKey,
-} = require('@dashevo/dashcore-lib');
-
 const Dash = require('dash');
 
 const getDAPISeeds = require('./getDAPISeeds');
-
-const fundAddress = require('./fundAddress');
-const wait = require('../wait');
-
+const fundAccount = require('./fundAccount');
 /**
  * Create and fund DashJS client
  * @param {string} [HDPrivateKey]
@@ -19,47 +12,45 @@ async function createClientWithFundedWallet(HDPrivateKey = undefined) {
   const seeds = getDAPISeeds();
 
   // Prepare to fund wallet
-  const faucetPrivateKey = PrivateKey.fromString(process.env.FAUCET_PRIVATE_KEY);
-  const faucetAddress = faucetPrivateKey
-    .toAddress(process.env.NETWORK)
-    .toString();
-
-  const walletOptions = {};
+  const faucetPrivateKey = process.env.FAUCET_PRIVATE_KEY;
 
-  if (HDPrivateKey) {
-    walletOptions.HDPrivateKey = HDPrivateKey;
-  }
-
-  const dashClient = new Dash.Client({
+  const clientOpts = {
     seeds,
-    wallet: walletOptions,
     network: process.env.NETWORK,
     apps: {
       dpns: {
         contractId: process.env.DPNS_CONTRACT_ID,
       },
     },
-  });
+  }
 
-  const account = await dashClient.getWalletAccount();
+  const walletOptions = {};
 
-  const { address: addressToFund } = account.getAddress();
+  if (HDPrivateKey) {
+    walletOptions.HDPrivateKey = HDPrivateKey;
+  }
 
-  const amount = 40000;
+  return new Promise(async (resolve, reject)=> {
+    const faucetWallet = new Dash.Client({
+      ...clientOpts,
+      wallet: {
+        privateKey: faucetPrivateKey
+      },
+    });
+
+    const newlyCreatedClient = new Dash.Client({
+      ...clientOpts,
+      wallet: walletOptions,
+    });
 
-  await fundAddress(
-    dashClient.getDAPIClient(),
-    faucetAddress,
-    faucetPrivateKey,
-    addressToFund,
-    amount,
-  );
+    const faucetAccount = await faucetWallet.getWalletAccount();
 
-  do {
-    await wait(500);
-  } while (account.getTotalBalance() < amount);
+    const accountToFund = await newlyCreatedClient.getWalletAccount();
 
-  return dashClient;
+    const amount = 40000;
+
+    await fundAccount(faucetAccount, accountToFund, amount);
+  });
 }
 
 module.exports = createClientWithFundedWallet;

lib/test/fundAccount.js

@@ -0,0 +1,43 @@
+/**
+ *
+ * @param {Account} fundedAccount
+ * @param {Account} accountToFund
+ * @param {number} amountInSatoshis
+ * @return {Promise<Transaction>}
+ */
+async function fundAccount(
+  fundedAccount,
+  accountToFund,
+  amountInSatoshis,
+) {
+  return new Promise(async (resolve, reject) => {
+    try {
+      const { address: addressToFund } = accountToFund.getAddress();
+
+      const fundingTransaction = fundedAccount.createTransaction({
+        recipient: addressToFund,
+        satoshis: amountInSatoshis,
+      });
+      const fundingResult = {
+        transaction: fundingTransaction,
+        transactionId: null
+      };
+
+      accountToFund.on('BALANCE_CHANGED', () => {
+        console.log('Balance changed');
+        resolve(fundingResult);
+      });
+
+      accountToFund.on('FETCHED_CONFIRMED_TRANSACTION', () => {
+        console.log('Fetching confirmed tx');
+        resolve(fundingResult);
+      });
+
+      fundingResult.transactionId = await fundedAccount.broadcastTransaction(fundingTransaction);
+    } catch (err){
+      reject(err);
+    }
+  });
+}
+
+module.exports = fundAccount;

test/functional/core/broadcastTransaction.spec.js

@@ -1,10 +1,7 @@
-const {
-  Transaction,
-  PrivateKey,
-} = require('@dashevo/dashcore-lib');
+const Dash = require('dash');
 
 const createClientWithoutWallet = require('../../../lib/test/createClientWithoutWallet');
-const getInputsByAddress = require('../../../lib/test/getInputsByAddress');
+const fundAccount = require('../../../lib/test/fundAccount');
 
 describe('Core', () => {
   describe('broadcastTransaction', () => {
@@ -21,29 +18,32 @@ describe('Core', () => {
     });
 
     it('should sent transaction and return transaction ID', async () => {
-      const faucetPrivateKey = PrivateKey.fromString(process.env.FAUCET_PRIVATE_KEY);
-      const faucetAddress = faucetPrivateKey
-        .toAddress(process.env.NETWORK)
-        .toString();
-
-      const address = new PrivateKey()
-        .toAddress(process.env.NETWORK)
-        .toString();
+      const faucetPrivateKey = process.env.FAUCET_PRIVATE_KEY;
 
       const amount = 10000;
 
-      const inputs = await getInputsByAddress(client.getDAPIClient(), faucetAddress);
+      const clientOpts = {
+        network: process.env.NETWORK,
+      }
 
-      const transaction = new Transaction();
+      const faucetWallet = new Dash.Client({
+        ...clientOpts,
+        wallet: {
+          privateKey: faucetPrivateKey
+        },
+      });
+      const faucetAccount = await faucetWallet.getWalletAccount();
 
-      transaction.from(inputs.slice(-1)[0])
-        .to(address, amount)
-        .change(faucetAddress)
-        .sign(faucetPrivateKey);
+      const walletToFund = new Dash.Client({
+        ...clientOpts,
+        wallet: {
+          privateKey: null,
+        },
+      });
 
-      const serializedTransaction = Buffer.from(transaction.serialize(), 'hex');
+      const accountToFund = await walletToFund.getWalletAccount();
 
-      const result = await client.getDAPIClient().core.broadcastTransaction(serializedTransaction);
+      const { transactionId: result} = await fundAccount(faucetAccount, accountToFund, amount);
 
       expect(result).to.be.a('string');
     });

test/functional/core/getAddressSummary.spec.js

@@ -1,10 +1,8 @@
-const {
-  PrivateKey,
-} = require('@dashevo/dashcore-lib');
+const Dash = require('dash');
 
 const createClientWithoutWallet = require('../../../lib/test/createClientWithoutWallet');
 
-const fundAddress = require('../../../lib/test/fundAddress');
+const fundAccount = require('../../../lib/test/fundAccount');
 
 describe('Core', () => {
   describe('getAddressSummary', () => {
@@ -22,22 +20,33 @@ describe('Core', () => {
     });
 
     before(async () => {
-      const faucetPrivateKey = PrivateKey.fromString(process.env.FAUCET_PRIVATE_KEY);
-      const faucetAddress = faucetPrivateKey
-        .toAddress(process.env.NETWORK)
-        .toString();
-
-      address = new PrivateKey()
-        .toAddress(process.env.NETWORK)
-        .toString();
-
-      await fundAddress(
-        client.getDAPIClient(),
-        faucetAddress,
-        faucetPrivateKey,
-        address,
-        20000,
-      );
+      const faucetPrivateKey = process.env.FAUCET_PRIVATE_KEY;
+
+      const clientOpts = {
+        network: process.env.NETWORK,
+      }
+
+      const faucetWallet = new Dash.Client({
+        ...clientOpts,
+        wallet: {
+          privateKey: faucetPrivateKey
+        },
+      });
+      const faucetAccount = await faucetWallet.getWalletAccount();
+
+      const walletToFund = new Dash.Client({
+        ...clientOpts,
+        wallet: {
+          privateKey: null,
+        },
+      });
+
+      const accountToFund = await walletToFund.getWalletAccount();
+
+      const amount = 20000;
+
+      await fundAccount(faucetAccount, accountToFund, amount);
+
     });
 
     it('should return address summary', async () => {

test/functional/core/getTransaction.spec.js

@@ -1,11 +1,12 @@
+const Dash = require('dash');
+
 const {
   Transaction,
-  PrivateKey,
 } = require('@dashevo/dashcore-lib');
 
 const createClientWithoutWallet = require('../../../lib/test/createClientWithoutWallet');
 
-const fundAddress = require('../../../lib/test/fundAddress');
+const fundAccount = require('../../../lib/test/fundAccount');
 
 describe('Core', () => {
   describe('getTransaction', () => {
@@ -22,22 +23,31 @@ describe('Core', () => {
     });
 
     it('should respond with a transaction by it\'s ID', async () => {
-      const faucetPrivateKey = PrivateKey.fromString(process.env.FAUCET_PRIVATE_KEY);
-      const faucetAddress = faucetPrivateKey
-        .toAddress(process.env.NETWORK)
-        .toString();
-
-      const address = new PrivateKey()
-        .toAddress(process.env.NETWORK)
-        .toString();
-
-      const transactionId = await fundAddress(
-        client.getDAPIClient(),
-        faucetAddress,
-        faucetPrivateKey,
-        address,
-        20000,
-      );
+      const faucetPrivateKey = process.env.FAUCET_PRIVATE_KEY;
+
+      const amount = 20000;
+
+      const clientOpts = {
+        network: process.env.NETWORK,
+      }
+
+      const faucetWallet = new Dash.Client({
+        ...clientOpts,
+        wallet: {
+          privateKey: faucetPrivateKey
+        },
+      });
+      const faucetAccount = await faucetWallet.getWalletAccount();
+
+      const walletToFund = new Dash.Client({
+        ...clientOpts,
+        wallet: {
+          privateKey: null,
+        },
+      });
+      const accountToFund = await walletToFund.getWalletAccount();
+
+      const { transactionId } = await fundAccount(faucetAccount, accountToFund, amount);
 
       const result = await client.getDAPIClient().core.getTransaction(transactionId);
       const receivedTx = new Transaction(Buffer.from(result));