feat: remove unnecesary bitcoin network index fetching function

DLC-link · Jul 15, 2024 · 9e91d16 · 9e91d16
1 parent f2ee37e
commit 9e91d16
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 21 deletions.
diff --git a/src/dlc-handlers/ledger-dlc-handler.ts b/src/dlc-handlers/ledger-dlc-handler.ts
@@ -328,7 +328,8 @@ export class LedgerDLCHandler {
         this.walletAccountIndex,
         this.walletAddressIndex,
         multisigPayment,
-        this.bitcoinNetwork
+        this.bitcoinNetwork,
+        this.bitcoinNetworkIndex
       );
 
       const formattedFundingPSBT = Psbt.fromBuffer(Buffer.from(fundingTransaction.toPSBT()), {
@@ -403,7 +404,8 @@ export class LedgerDLCHandler {
         this.walletAccountIndex,
         this.walletAddressIndex,
         multisigPayment,
-        this.bitcoinNetwork
+        this.bitcoinNetwork,
+        this.bitcoinNetworkIndex
       );
 
       const formattedWithdrawPSBT = Psbt.fromBuffer(Buffer.from(withdrawTransaction.toPSBT()), {
@@ -463,7 +465,8 @@ export class LedgerDLCHandler {
       this.walletAccountIndex,
       this.walletAddressIndex,
       multisigPayment,
-      this.bitcoinNetwork
+      this.bitcoinNetwork,
+      this.bitcoinNetworkIndex
     );
 
     const formattedDepositPSBT = Psbt.fromBuffer(Buffer.from(depositTransaction.toPSBT()), {

diff --git a/src/functions/bitcoin/bitcoin-functions.ts b/src/functions/bitcoin/bitcoin-functions.ts
@@ -371,13 +371,12 @@ export function createBitcoinInputSigningConfiguration(
   walletAccountIndex: number,
   walletAddressIndex: number,
   multisigPayment: P2TROut,
-  bitcoinNetwork: Network
+  bitcoinNetwork: Network,
+  bitcoinNetworkIndex: number
 ): BitcoinInputSigningConfig[] {
-  const networkIndex = getBitcoinNetworkIndex(bitcoinNetwork);
-
-  const nativeSegwitDerivationPath = `m/84'/${networkIndex}'/${walletAccountIndex}'/0/${walletAddressIndex}`;
-  const taprootDerivationPath = `m/86'/${networkIndex}'/${walletAccountIndex}'/0/${walletAddressIndex}`;
-  const multisigDerivationPath = `m/86'/${networkIndex}'/${walletAccountIndex}'/0/0`;
+  const nativeSegwitDerivationPath = `m/84'/${bitcoinNetworkIndex}'/${walletAccountIndex}'/0/${walletAddressIndex}`;
+  const taprootDerivationPath = `m/86'/${bitcoinNetworkIndex}'/${walletAccountIndex}'/0/${walletAddressIndex}`;
+  const multisigDerivationPath = `m/86'/${bitcoinNetworkIndex}'/${walletAccountIndex}'/0/0`;
 
   const multisigPaymentScript = multisigPayment.script;
 
@@ -473,18 +472,6 @@ export function finalizeUserInputs(transaction: Transaction, userPayment: P2TROu
   });
 }
 
-export function getBitcoinNetworkIndex(bitcoinNetwork: Network): number {
-  switch (bitcoinNetwork) {
-    case bitcoin:
-      return 0;
-    case testnet:
-    case regtest:
-      return 1;
-    default:
-      throw new Error('Unsupported Bitcoin Network');
-  }
-}
-
 /**
  * Converts an ECDSA Public Key to a Schnorr Public Key.
  * @param publicKey - The ECDSA Public Key.