@btc-vision/transaction 1.0.100 → 1.0.102

package/build/transaction/builders/TransactionBuilder.js

@@ -203,7 +203,7 @@ export class TransactionBuilder extends TweakedTransaction {
         if (value < TransactionBuilder.MINIMUM_DUST) {
             throw new Error(`Value to send is less than the minimum dust ${value} < ${TransactionBuilder.MINIMUM_DUST}`);
         }
-        for (let output of this.outputs) {
+        for (const output of this.outputs) {
             if ('address' in output && output.address === this.to) {
                 output.value += Number(value);
                 return;
@@ -219,14 +219,14 @@ export class TransactionBuilder extends TweakedTransaction {
     }
     calculateTotalUTXOAmount() {
         let total = 0n;
-        for (let utxo of this.utxos) {
+        for (const utxo of this.utxos) {
             total += utxo.value;
         }
         return total;
     }
     calculateTotalVOutAmount() {
         let total = 0n;
-        for (let utxo of this.utxos) {
+        for (const utxo of this.utxos) {
             total += utxo.value;
         }
         return total;
@@ -266,7 +266,7 @@ export class TransactionBuilder extends TweakedTransaction {
         return this.tapData.output;
     }
     verifyUTXOValidity() {
-        for (let utxo of this.utxos) {
+        for (const utxo of this.utxos) {
             if (!utxo.scriptPubKey) {
                 throw new Error('Address is required');
             }
@@ -274,7 +274,7 @@ export class TransactionBuilder extends TweakedTransaction {
     }
     async setFeeOutput(output) {
         const initialValue = output.value;
-        let fee = await this.estimateTransactionFees();
+        const fee = await this.estimateTransactionFees();
         output.value = initialValue - Number(fee);
         if (output.value < TransactionBuilder.MINIMUM_DUST) {
             this.feeOutput = null;
@@ -284,7 +284,7 @@ export class TransactionBuilder extends TweakedTransaction {
         }
         else {
             this.feeOutput = output;
-            let fee = await this.estimateTransactionFees();
+            const fee = await this.estimateTransactionFees();
             if (fee > BigInt(initialValue)) {
                 throw new Error(`estimateTransactionFees: Insufficient funds to pay the fees. Fee: ${fee} > Value: ${initialValue}. Total input: ${this.totalInputAmount} sat`);
             }

package/build/transaction/builders/UnwrapTransaction.js

@@ -64,7 +64,7 @@ export class UnwrapTransaction extends SharedInteractionTransaction {
     }
     getRefund() {
         let losses = -currentConsensusConfig.UNWRAP_CONSOLIDATION_PREPAID_FEES_SAT;
-        for (let vault of this.vaultUTXOs) {
+        for (const vault of this.vaultUTXOs) {
             for (let i = 0; i < vault.utxos.length; i++) {
                 losses += currentConsensusConfig.UNWRAP_CONSOLIDATION_PREPAID_FEES_SAT;
             }
@@ -72,13 +72,13 @@ export class UnwrapTransaction extends SharedInteractionTransaction {
         return losses;
     }
     getFeeLossOrRefund() {
-        let refund = this.getRefund();
+        const refund = this.getRefund();
         return refund - this.estimatedFeeLoss;
     }
     mergeVaults() {
         const totalInputAmount = this.getVaultTotalOutputAmount(this.vaultUTXOs);
         let refund = this.getRefund();
-        let outputLeftAmount = totalInputAmount - refund - this.amount;
+        const outputLeftAmount = totalInputAmount - refund - this.amount;
         if (outputLeftAmount === currentConsensusConfig.UNWRAP_CONSOLIDATION_PREPAID_FEES_SAT) {
             refund += currentConsensusConfig.UNWRAP_CONSOLIDATION_PREPAID_FEES_SAT;
         }
@@ -90,7 +90,7 @@ export class UnwrapTransaction extends SharedInteractionTransaction {
         if (!bestVault) {
             throw new Error('No vaults provided');
         }
-        let hasConsolidation = outputLeftAmount > currentConsensusConfig.VAULT_MINIMUM_AMOUNT &&
+        const hasConsolidation = outputLeftAmount > currentConsensusConfig.VAULT_MINIMUM_AMOUNT &&
             outputLeftAmount - currentConsensusConfig.UNWRAP_CONSOLIDATION_PREPAID_FEES_SAT !== 0n;
         if (hasConsolidation) {
             this.success(`Consolidating output with ${outputLeftAmount} sat.`);

package/build/transaction/builders/WrapTransaction.js

@@ -76,7 +76,7 @@ export class WrapTransaction extends SharedInteractionTransaction {
     async buildTransaction() {
         if (!this.to)
             throw new Error('To address is required');
-        const selectedRedeem = !!this.scriptSigner
+        const selectedRedeem = this.scriptSigner
             ? this.targetScriptRedeem
             : this.leftOverFundsScriptRedeem;
         if (!selectedRedeem) {

package/build/transaction/processor/PsbtTransaction.d.ts

@@ -1,7 +1,7 @@
+import { Address } from '@btc-vision/bsi-binary';
 import { Network, Psbt, Signer, Transaction } from 'bitcoinjs-lib';
-import { ITweakedTransactionData, TweakedTransaction } from '../shared/TweakedTransaction.js';
 import { PsbtInputExtended, PsbtOutputExtended } from '../interfaces/Tap.js';
-import { Address } from '@btc-vision/bsi-binary';
+import { ITweakedTransactionData, TweakedTransaction } from '../shared/TweakedTransaction.js';
 export interface PsbtTransactionData extends ITweakedTransactionData {
     readonly psbt: Psbt;
     readonly signer: Signer;

package/build/transaction/processor/PsbtTransaction.js

@@ -59,7 +59,7 @@ export class PsbtTransaction extends TweakedTransaction {
         try {
             const inputs = this.transaction.data.inputs;
             for (let i = n; i < inputs.length; i++) {
-                let input = inputs[i];
+                const input = inputs[i];
                 if (input.finalScriptWitness) {
                     this.transaction.finalizeTaprootInput(i, input.finalScriptWitness);
                 }
@@ -70,7 +70,7 @@ export class PsbtTransaction extends TweakedTransaction {
             return true;
         }
         catch (e) {
-            this.warn(e.stack);
+            this.warn(e.stack || "Couldn't finalize inputs");
             return false;
         }
     }

package/build/transaction/shared/TweakedTransaction.js

@@ -79,7 +79,7 @@ export class TweakedTransaction extends Logger {
             throw new Error('Sighash types are required');
         }
         let signHash = 0;
-        for (let sighashType of sighashTypes) {
+        for (const sighashType of sighashTypes) {
             signHash |= sighashType;
         }
         return signHash || 0;
@@ -106,7 +106,7 @@ export class TweakedTransaction extends Logger {
         if (this.signed)
             throw new Error('Transaction is already signed');
         this.sequence = TransactionSequence.FINAL;
-        for (let input of this.inputs) {
+        for (const input of this.inputs) {
             input.sequence = TransactionSequence.FINAL;
         }
     }
@@ -168,7 +168,7 @@ export class TweakedTransaction extends Logger {
                     }
                     return;
                 }
-                catch (e) { }
+                catch { }
             }
         }
         try {
@@ -195,7 +195,7 @@ export class TweakedTransaction extends Logger {
     }
     async signInputs(transaction) {
         for (let i = 0; i < transaction.data.inputs.length; i++) {
-            let input = transaction.data.inputs[i];
+            const input = transaction.data.inputs[i];
             try {
                 await this.signInput(transaction, input, i);
             }

package/build/utils/BitcoinUtils.d.ts

@@ -1,6 +1,6 @@
 import { VaultUTXOs } from '../transaction/processor/PsbtTransaction.js';
 export declare class BitcoinUtils {
-    static btcToSatoshi(btc: number): BigInt;
+    static btcToSatoshi(btc: number): bigint;
     static rndBytes(): Buffer;
     static getUnsafeRandomValues(length: number): Buffer;
     static opnetHash(data: Buffer): string;

package/build/utils/BitcoinUtils.js

@@ -41,7 +41,7 @@ export class BitcoinUtils {
         vaults = BitcoinUtils.orderVaultsByAddress(vaults);
         let mostPublicKeys = 0;
         let vault;
-        for (let v of vaults) {
+        for (const v of vaults) {
             if (v.publicKeys.length > mostPublicKeys) {
                 mostPublicKeys = v.publicKeys.length;
                 vault = v;

package/build/utxo/OPNetLimitedProvider.d.ts

@@ -1,8 +1,8 @@
-import { FetchUTXOParams, FetchUTXOParamsMultiAddress, UTXO } from './interfaces/IUTXO.js';
-import { WrappedGeneration } from '../wbtc/WrappedGenerationParameters.js';
-import { BroadcastResponse } from './interfaces/BroadcastResponse.js';
 import { Address } from '@btc-vision/bsi-binary';
 import { UnwrapGeneration } from '../wbtc/UnwrapGeneration.js';
+import { WrappedGeneration } from '../wbtc/WrappedGenerationParameters.js';
+import { BroadcastResponse } from './interfaces/BroadcastResponse.js';
+import { FetchUTXOParams, FetchUTXOParamsMultiAddress, UTXO } from './interfaces/IUTXO.js';
 export declare class OPNetLimitedProvider {
     private readonly opnetAPIUrl;
     private readonly utxoPath;

package/build/utxo/OPNetLimitedProvider.js

@@ -1,6 +1,6 @@
-import { WrappedGeneration } from '../wbtc/WrappedGenerationParameters.js';
-import { UnwrapGeneration } from '../wbtc/UnwrapGeneration.js';
 import { currentConsensusConfig } from '../consensus/ConsensusConfig.js';
+import { UnwrapGeneration } from '../wbtc/UnwrapGeneration.js';
+import { WrappedGeneration } from '../wbtc/WrappedGenerationParameters.js';
 export class OPNetLimitedProvider {
     constructor(opnetAPIUrl) {
         this.opnetAPIUrl = opnetAPIUrl;
@@ -19,7 +19,7 @@ export class OPNetLimitedProvider {
         if (!resp.ok) {
             throw new Error(`Failed to fetch UTXO data: ${resp.statusText}`);
         }
-        const fetchedData = await resp.json();
+        const fetchedData = (await resp.json());
         if (fetchedData.length === 0) {
             throw new Error('No UTXO found');
         }
@@ -29,7 +29,7 @@ export class OPNetLimitedProvider {
         if (meetCriteria.length === 0) {
             throw new Error('No UTXO found (minAmount)');
         }
-        let finalUTXOs = [];
+        const finalUTXOs = [];
         let currentAmount = 0n;
         const amountRequested = settings.requestedAmount;
         for (const utxo of meetCriteria) {
@@ -52,7 +52,7 @@ export class OPNetLimitedProvider {
     }
     async fetchUTXOMultiAddr(settings) {
         const promises = [];
-        for (let address of settings.addresses) {
+        for (const address of settings.addresses) {
             const params = {
                 address: address,
                 minAmount: settings.minAmount,
@@ -69,7 +69,7 @@ export class OPNetLimitedProvider {
         const finalUTXOs = [];
         let currentAmount = 0n;
         for (let i = 0; i < all.length; i++) {
-            let utxo = all[i];
+            const utxo = all[i];
             if (currentAmount >= settings.requestedAmount) {
                 break;
             }
@@ -104,7 +104,7 @@ export class OPNetLimitedProvider {
         if (!resp.ok) {
             throw new Error(`Failed to fetch to rpc: ${resp.statusText}`);
         }
-        const fetchedData = await resp.json();
+        const fetchedData = (await resp.json());
         if (!fetchedData) {
             throw new Error('No data fetched');
         }

package/eslint.config.js

@@ -0,0 +1,38 @@
+// @ts-check
+
+import eslint from '@eslint/js';
+import tseslint from 'typescript-eslint';
+
+export default tseslint.config(
+    eslint.configs.recommended,
+    ...tseslint.configs.strictTypeChecked,
+    {
+        languageOptions: {
+            parserOptions: {
+                projectService: true,
+                tsconfigDirName: import.meta.dirname,
+            },
+        },
+        rules: {
+            'no-undef': 'off',
+            '@typescript-eslint/no-unused-vars': 'off',
+            'no-empty': 'off',
+            '@typescript-eslint/restrict-template-expressions': 'off',
+            '@typescript-eslint/only-throw-error': 'off',
+            '@typescript-eslint/no-unnecessary-condition': 'off',
+            '@typescript-eslint/unbound-method': 'warn',
+            '@typescript-eslint/no-confusing-void-expression': 'off',
+            '@typescript-eslint/no-extraneous-class': 'off',
+            'no-async-promise-executor': 'off',
+            '@typescript-eslint/no-misused-promises': 'off',
+            '@typescript-eslint/no-unnecessary-type-parameters': 'off',
+            '@typescript-eslint/no-duplicate-enum-values': 'off',
+            'prefer-spread': 'off',
+            '@typescript-eslint/no-empty-object-type': 'off',
+        },
+    },
+    {
+        files: ['**/*.js'],
+        ...tseslint.configs.disableTypeChecked,
+    },
+);

package/gulpfile.js

@@ -1,68 +1,42 @@
+import gulpESLintNew from 'gulp-eslint-new';
 import gulp from 'gulp';
 import gulpcache from 'gulp-cached';
+
+import gulpClean from 'gulp-clean';
 import logger from 'gulp-logger';
 import ts from 'gulp-typescript';
 
-const tsProjectESM = ts.createProject('tsconfig.json');
+process.on('uncaughtException', function (err) {
+    console.log('Caught exception: ', err);
+});
 
-function onError(e) {
-    console.error('Error:', e);
-}
+const tsProject = ts.createProject('tsconfig.json');
 
 function buildESM() {
-    return tsProjectESM
+    return tsProject
         .src()
         .pipe(gulpcache('ts-esm'))
         .pipe(
             logger({
-                before: 'Starting ESM compilation...',
-                after: 'ESM compilation done!',
+                before: 'Starting...',
+                after: 'Project compiled!',
                 extname: '.js',
                 showChange: true,
             }),
         )
-        .pipe(tsProjectESM())
-        .on('error', onError)
+        .pipe(gulpESLintNew())
+        .pipe(gulpESLintNew.format())
+        .pipe(tsProject())
         .pipe(gulp.dest('build'));
 }
 
-function buildProtoYaml() {
-    return gulp
-        .src('./src/**/*.yaml')
-        .pipe(
-            logger({
-                before: 'Processing YAML files...',
-                after: 'YAML files processed!',
-                extname: '.yaml',
-                showChange: true,
-            }),
-        )
-        .pipe(gulpcache('yaml'))
-        .pipe(gulp.dest('./build/'))
-        .on('end', () => {
-            gulp.src('./src/**/*.proto')
-                .pipe(
-                    logger({
-                        before: 'Processing Proto files...',
-                        after: 'Proto files processed!',
-                        extname: '.proto',
-                        showChange: true,
-                    }),
-                )
-                .pipe(gulpcache('proto'))
-                .pipe(gulp.dest('./build/'));
-        });
+export async function clean() {
+    return gulp.src('./build/src', { read: false }).pipe(gulpClean());
 }
 
-const build = gulp.series(buildESM, buildProtoYaml);
-
-gulp.task('build', build);
-gulp.task('default', build);
+export const build = buildESM;
+export default build;
 
-gulp.task('watch', () => {
+export function watch() {
     gulp.watch(['src/**/*.ts', 'src/**/*.js'], gulp.series(buildESM));
-    gulp.watch(
-        ['src/**/*.yaml', 'src/**/*.proto', '*.yaml', '*.proto', '*.conf', 'src/config/*.conf'],
-        buildProtoYaml,
-    );
-});
+}

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@btc-vision/transaction",
     "type": "module",
-    "version": "1.0.100",
+    "version": "1.0.102",
     "author": "BlobMaster41",
     "description": "OPNet transaction library allows you to create and sign transactions for the OPNet network.",
     "engines": {
@@ -9,6 +9,7 @@
     },
     "exports": {
         ".": {
+            "browser": "./browser/index.js",
             "import": "./build/index.js",
             "require": "./build/index.js",
             "types": "./build/index.d.ts"
@@ -20,6 +21,8 @@
         }
     },
     "browser": {
+        "./build/index.js": "./browser/index.js",
+        "./build/index.d.ts": "./browser/index.d.ts",
         "Buffer": "buffer",
         "crypto": "./src/crypto/crypto-browser.js",
         "stream": "stream-browserify",
@@ -40,7 +43,7 @@
         "smart inscriptions",
         "ordinals"
     ],
-    "license": "LICENSE.MD",
+    "license": "MIT",
     "main": "build/index.js",
     "types": "build/index.d.ts",
     "typings": "build/index.d.ts",
@@ -69,7 +72,7 @@
         "@babel/preset-react": "^7.24.1",
         "@babel/preset-typescript": "^7.24.1",
         "@types/node": "^22.5.5",
-        "eslint": "^8.57.0",
+        "eslint": "^9.10.0",
         "gulp": "^5.0.0",
         "gulp-cached": "^1.1.1",
         "gulp-logger": "^0.0.2",
@@ -79,18 +82,19 @@
         "prettier": "^3.3.1",
         "stream-browserify": "^3.0.0",
         "stream-http": "^3.2.0",
-        "typedoc": "^0.25.13",
-        "typedoc-material-theme": "^1.0.2",
-        "typescript-eslint": "^7.4.0",
-        "webpack": "^5.91.0",
+        "typedoc": "^0.26.7",
+        "typedoc-material-theme": "^1.1.0",
+        "typescript-eslint": "^8.5.0",
+        "webpack": "^5.94.0",
         "webpack-cli": "^5.1.4"
     },
     "dependencies": {
         "@babel/plugin-proposal-object-rest-spread": "^7.20.7",
         "@bitcoinerlab/secp256k1": "^1.1.1",
-        "@btc-vision/bsi-binary": "^1.0.38",
+        "@btc-vision/bsi-binary": "^1.0.39",
         "@btc-vision/bsi-bitcoin-rpc": "^1.0.26",
         "@btc-vision/logger": "^1.0.4",
+        "@eslint/js": "^9.10.0",
         "assert": "^2.1.0",
         "babel-loader": "^9.1.3",
         "babel-plugin-transform-import-meta": "^2.2.1",
@@ -103,6 +107,8 @@
         "browserify-zlib": "^0.2.0",
         "buffer": "^6.0.3",
         "ecpair": "^2.1.0",
+        "gulp-clean": "^0.4.0",
+        "gulp-eslint-new": "^2.3.0",
         "gulplog": "^2.2.0",
         "process": "^0.11.10",
         "ts-loader": "^9.5.1",

package/src/_version.ts

@@ -1 +1 @@
-export const version = '1.0.100';
+export const version = '1.0.101';

package/src/generators/Features.ts

@@ -1,5 +1,9 @@
 import { opcodes } from 'bitcoinjs-lib';
 
 export enum Features {
-    UNWRAP = opcodes.OP_16,
+    UNWRAP = 0, // random number just to set the first value
 }
+
+export const FeatureOpCodes: { [key: number]: number } = {
+    [Features.UNWRAP]: opcodes.OP_16,
+};

package/src/generators/builders/CalldataGenerator.ts

@@ -1,9 +1,9 @@
 import { crypto, Network, networks, opcodes, script } from 'bitcoinjs-lib';
 import { ECPairInterface } from 'ecpair';
 import { Compressor } from '../../bytecode/Compressor.js';
-import { Generator } from '../Generator.js';
 import { EcKeyPair } from '../../keypair/EcKeyPair.js';
-import { Features } from '../Features.js';
+import { FeatureOpCodes, Features } from '../Features.js';
+import { Generator } from '../Generator.js';
 
 /**
  * Class to generate bitcoin script for interaction transactions
@@ -27,7 +27,7 @@ export class CalldataGenerator extends Generator {
     public static getPubKeyAsBuffer(witnessKeys: Buffer[], network: Network): Buffer {
         let finalBuffer: Buffer = Buffer.alloc(0);
 
-        for (let pubKey of witnessKeys) {
+        for (const pubKey of witnessKeys) {
             const key: ECPairInterface = EcKeyPair.fromPublicKey(pubKey, network);
 
             if (!key.compressed) {
@@ -130,9 +130,11 @@ export class CalldataGenerator extends Generator {
             }
         }
 
+        const featureOpcodes = features.map((feature) => FeatureOpCodes[feature]); // Get the opcodes for the features
+
         // Write calldata
         compiledData = compiledData.concat(
-            ...features,
+            ...featureOpcodes,
             ...[opcodes.OP_1NEGATE, ...dataChunks, opcodes.OP_ELSE, opcodes.OP_1, opcodes.OP_ENDIF],
         );
 

package/src/generators/builders/MultiSignGenerator.ts

@@ -21,15 +21,17 @@ export class MultiSignGenerator {
         }
 
         if (minimumSignatures > MultiSignGenerator.MAXIMUM_SUPPORTED_SIGNATURE) {
-            throw new Error(`The maximum amount of signatures is ${MultiSignGenerator.MAXIMUM_SUPPORTED_SIGNATURE}`);
+            throw new Error(
+                `The maximum amount of signatures is ${MultiSignGenerator.MAXIMUM_SUPPORTED_SIGNATURE}`,
+            );
         }
 
         const minimumRequired = Buffer.alloc(1);
         minimumRequired.writeUInt8(minimumSignatures);
 
         /** Remove duplicates **/
-        vaultPublicKeys = vaultPublicKeys.filter((buf, index, self) =>
-            index === self.findIndex(otherBuf => buf.equals(otherBuf))
+        vaultPublicKeys = vaultPublicKeys.filter(
+            (buf, index, self) => index === self.findIndex((otherBuf) => buf.equals(otherBuf)),
         );
 
         /** We must order the pub keys. */
@@ -37,7 +39,7 @@ export class MultiSignGenerator {
 
         let included = false;
         const data = vaultPublicKeys.map((key) => {
-            let newKey = toXOnly(key);
+            const newKey = toXOnly(key);
             if (internal && !included) included = internal.equals(newKey);
 
             return newKey;

package/src/keypair/EcKeyPair.ts

@@ -1,15 +1,18 @@
-import bip32, { BIP32Interface } from 'bip32';
-import { address, initEccLib, Network, networks, payments } from 'bitcoinjs-lib';
-import { ECPairFactory, ECPairInterface } from 'ecpair';
 import * as ecc from '@bitcoinerlab/secp256k1';
 import { Address } from '@btc-vision/bsi-binary';
-import { IWallet } from './interfaces/IWallet.js';
+import bip32, { BIP32Factory, BIP32Interface } from 'bip32';
+import { address, initEccLib, Network, networks, payments } from 'bitcoinjs-lib';
 import { toXOnly } from 'bitcoinjs-lib/src/psbt/bip371.js';
+import { ECPairFactory, ECPairInterface } from 'ecpair';
+import { IWallet } from './interfaces/IWallet.js';
 
 initEccLib(ecc);
 
-// @ts-ignore
-const BIP32Factory = typeof bip32 === 'function' ? bip32 : bip32.BIP32Factory;
+const BIP32factory = typeof bip32 === 'function' ? bip32 : BIP32Factory;
+
+if (!BIP32factory) {
+    throw new Error('Failed to load BIP32 library');
+}
 
 /**
  * Class for handling EC key pairs
@@ -19,8 +22,7 @@ const BIP32Factory = typeof bip32 === 'function' ? bip32 : bip32.BIP32Factory;
  * @example import { EcKeyPair } from '@btc-vision/transaction';
  */
 export class EcKeyPair {
-    // @ts-ignore
-    public static BIP32 = BIP32Factory(ecc);
+    public static BIP32 = BIP32factory(ecc);
     public static ECPair = ECPairFactory(ecc);
 
     /**

package/src/metadata/contracts/wBTC.ts

@@ -1,8 +1,8 @@
+import { Address } from '@btc-vision/bsi-binary';
 import { Network, networks } from 'bitcoinjs-lib';
+import { ChainId } from '../../network/ChainId.js';
 import { ContractBaseMetadata } from '../ContractBaseMetadata.js';
-import { Address } from '@btc-vision/bsi-binary';
 import { WBTC_ADDRESS_FRACTAL, WBTC_ADDRESS_REGTEST, WBTC_ADDRESS_TESTNET } from '../tokens.js';
-import { ChainId } from '../../network/ChainId.js';
 
 /**
  * @description Wrapped Bitcoin (wBTC) contract metadata.
@@ -43,7 +43,7 @@ export class wBTC extends ContractBaseMetadata {
             case networks.testnet.bech32:
                 return WBTC_ADDRESS_TESTNET;
             default:
-                throw new Error(`Invalid network: ${network}`);
+                throw new Error(`Invalid network: ${network.bech32}`);
         }
     }
 

package/src/metadata/tokens.ts

@@ -4,8 +4,8 @@ import { ChainId } from '../network/ChainId.js';
 // Addresses Regtest
 export const FACTORY_ADDRESS_REGTEST: Address = 'bcrt1q9pf9fnpch9z2qrp5e3dgr2avzu3mypq3km2k40';
 export const POOL_ADDRESS_REGTEST: Address = 'bcrt1qg87nx9v9ln3qyadcn0llekzjn0hx8js46ztwky';
-export const WBTC_ADDRESS_REGTEST: Address = 'bcrt1qy44f5630m4ap4mvmgqc44qh4vndaees9y30t0m';
-export const MOTO_ADDRESS_REGTEST: Address = 'bcrt1q5txqpm5sy0s2xsprvce4ddj0088nlq8lazkd6n';
+export const WBTC_ADDRESS_REGTEST: Address = 'bcrt1qamv2ejattjgsc6k3yf3zqrp0wpuyedqgjmwx0v';
+export const MOTO_ADDRESS_REGTEST: Address = 'bcrt1qw8w4ejas2k22y54avv7hgrslg3cd0hme58h28r';
 export const ROUTER_ADDRESS_REGTEST: Address = 'bcrt1q9yd6mk324k0q4krmlxjky0pk65ul6hkf4u35e6';
 
 // Addresses Testnet

package/src/signer/TweakedSigner.ts

@@ -1,9 +1,9 @@
+import * as ecc from '@bitcoinerlab/secp256k1';
 import { initEccLib, Network, Signer } from 'bitcoinjs-lib';
 import { tapTweakHash } from 'bitcoinjs-lib/src/payments/bip341.js';
 import { toXOnly } from 'bitcoinjs-lib/src/psbt/bip371.js';
-import * as ecc from '@bitcoinerlab/secp256k1';
-import { EcKeyPair } from '../keypair/EcKeyPair.js';
 import { ECPairInterface } from 'ecpair';
+import { EcKeyPair } from '../keypair/EcKeyPair.js';
 
 initEccLib(ecc);
 
@@ -33,11 +33,11 @@ export class TweakedSigner {
      * @param {TweakSettings} opts - The tweak settings
      */
     public static tweakSigner(signer: ECPairInterface, opts: TweakSettings = {}): Signer {
-        let privateKey: Uint8Array | undefined = signer.privateKey!;
+        let privateKey: Uint8Array | undefined = signer.privateKey;
         if (!privateKey) {
             throw new Error('Private key is required for tweaking signer!');
         }
-        
+
         if (signer.publicKey[0] === 3) {
             privateKey = ecc.privateNegate(privateKey);
         }