Bitcoind for onchain

src/SpecterWallet.ts

@@ -41,7 +41,8 @@ export class SpecterWallet {
       this.logger.info("specter wallet has not been instantiated")
 
       // currently use for testing purpose. need to refactor
-      return ""
+      return "outside"
+      // return ""
     }
 
     if (specterWallets.length > 1) {
@@ -77,7 +78,8 @@ export class SpecterWallet {
   async getBitcoindBalance(): Promise<number> {
     if (!this.bitcoindClient) {
       const wallet = await this.setBitcoindClient()
-      if (wallet === "") {
+      if (wallet === "outside") {
+        // if (wallet === "") {
         return 0
       }
     }
@@ -90,7 +92,8 @@ export class SpecterWallet {
 
     if (!this.bitcoindClient) {
       const wallet = await this.setBitcoindClient()
-      if (wallet === "") {
+      if (wallet === "outside") {
+        // if (wallet === "") {
         return
       }
     }
@@ -169,7 +172,8 @@ export class SpecterWallet {
   async toColdStorage({ sats }) {
     if (!this.bitcoindClient) {
       const wallet = await this.setBitcoindClient()
-      if (wallet === "") {
+      if (wallet === "outside") {
+        // if (wallet === "") {
         this.logger.warn("no wallet has been setup")
         return
       }
@@ -221,7 +225,8 @@ export class SpecterWallet {
   async toLndWallet({ sats }) {
     if (!this.bitcoindClient) {
       const wallet = await this.setBitcoindClient()
-      if (wallet === "") {
+      if (wallet === "outside") {
+        // if (wallet === "") {
         return
       }
     }

src/bitcoind.ts

@@ -9,8 +9,9 @@ export const getBalancesDetail = async (): Promise<
   const balances: { wallet: string; balance: number }[] = []
 
   for await (const wallet of wallets) {
-    // do not use the default wallet for now (expect for testing).
-    if (wallet === "") {
+    // do not use the outside wallet for now (except for testing).
+    if (wallet === "outside") {
+      // if (wallet === "") {
       continue
     }
 

src/utils.ts

@@ -36,10 +36,16 @@ const connection_obj = {
   version: "0.21.0",
 }
 
+// Using a single bitcoind node client
 export const BitcoindClient = ({ wallet = "" }) =>
   new bitcoindClient({ ...connection_obj, wallet })
+
+// For use when only the bitcoind client itself is needed, not wallet specific
 export const bitcoindDefaultClient = BitcoindClient({ wallet: "" })
 
+export const bitcoindOutsideWalletClient = BitcoindClient({ wallet: "outside" })
+export const bitcoindHotWalletClient = BitcoindClient({ wallet: "hot" })
+
 export const addContact = async ({ uid, username }) => {
   // https://stackoverflow.com/questions/37427610/mongodb-update-or-insert-object-in-array
 

test/integration/02a-fund-bitcoind.spec.ts → test/integration/02a-fund-outside.spec.ts

@@ -4,7 +4,7 @@
 import { createChainAddress } from "lightning"
 import mongoose from "mongoose"
 import { setupMongoConnection } from "src/mongodb"
-import { bitcoindDefaultClient } from "src/utils"
+import { bitcoindDefaultClient, bitcoindOutsideWalletClient } from "src/utils"
 import {
   checkIsBalanced,
   lnd1,
@@ -45,23 +45,22 @@ afterAll(async () => {
   jest.restoreAllMocks()
 })
 
-it("funds bitcoind wallet", async () => {
+it("funds outside bitcoind wallet", async () => {
+  // it("funds bitcoind wallet", async () => {
   let balance
 
-  try {
-    // depend of bitcoind version. needed in < 0.20 but failed in 0.21?
-    const { name } = await bitcoindDefaultClient.createWallet("")
-    expect(name).toBe("")
-  } catch (err) {
-    console.log({ err })
-  }
+  // depend of bitcoind version. needed in < 0.20 but failed in 0.21?
+  const { name } = await bitcoindDefaultClient.createWallet("outside")
+  expect(name).toBe("outside")
+  // const { name } = await bitcoindDefaultClient.createWallet("")
+  // expect(name).toBe("")
 
-  balance = await bitcoindDefaultClient.getBalance()
+  balance = await bitcoindOutsideWalletClient.getBalance()
 
-  const bitcoindAddress = await bitcoindDefaultClient.getNewAddress()
-  await bitcoindDefaultClient.generateToAddress(numOfBlock, bitcoindAddress)
-  await bitcoindDefaultClient.generateToAddress(100, RANDOM_ADDRESS)
-  balance = await bitcoindDefaultClient.getBalance()
+  const bitcoindAddress = await bitcoindOutsideWalletClient.getNewAddress()
+  await bitcoindOutsideWalletClient.generateToAddress(numOfBlock, bitcoindAddress)
+  await bitcoindOutsideWalletClient.generateToAddress(100, RANDOM_ADDRESS)
+  balance = await bitcoindOutsideWalletClient.getBalance()
   expect(balance).toBe(initialBitcoinWalletBalance + blockReward * numOfBlock)
 })
 
@@ -71,8 +70,9 @@ it("funds outside lnd node", async () => {
   ).address
   expect(lndOutside1_wallet_addr.substr(0, 4)).toBe("bcrt")
 
-  await bitcoindDefaultClient.sendToAddress(lndOutside1_wallet_addr, amount_BTC)
-  await bitcoindDefaultClient.generateToAddress(6, RANDOM_ADDRESS)
+  // Funded by the outside wallet
+  await bitcoindOutsideWalletClient.sendToAddress(lndOutside1_wallet_addr, amount_BTC)
+  await bitcoindOutsideWalletClient.generateToAddress(6, RANDOM_ADDRESS)
 
   await waitUntilBlockHeight({ lnd: lnd1, blockHeight: 100 + numOfBlock + 6 })
   await waitUntilBlockHeight({ lnd: lndOutside1, blockHeight: 100 + numOfBlock + 6 })