@btc-vision/transaction 1.0.76 → 1.0.78

package/browser/metadata/contracts/wBTC.d.ts

@@ -9,6 +9,6 @@ export declare class wBTC extends ContractBaseMetadata {
     readonly decimals: number;
     protected readonly address: Address;
     constructor(network?: Network, chainId?: ChainId);
-    private static getWBTCAddressForChain;
     static getAddress(network?: Network, chainId?: ChainId): Address;
+    private static getWBTCAddressForChain;
 }

package/browser/transaction/interfaces/ITransactionParameters.d.ts

@@ -26,7 +26,7 @@ export interface IInteractionParameters extends SharedInteractionParameters {
     readonly to: Address;
 }
 export interface IWrapParameters extends SharedInteractionParameters {
-    readonly to?: undefined;
+    readonly to?: undefined | Address;
     readonly from: Address;
     readonly amount: bigint;
     readonly receiver?: Address;

package/browser/transaction/shared/TweakedTransaction.d.ts

@@ -4,9 +4,11 @@ import { Network, Payment, Psbt, Signer, Transaction } from 'bitcoinjs-lib';
 import { PsbtInput } from 'bip174/src/lib/interfaces.js';
 import { UTXO } from '../../utxo/interfaces/IUTXO.js';
 import { PsbtInputExtended, TapLeafScript } from '../interfaces/Tap.js';
+import { ChainId } from '../../network/ChainId.js';
 export interface ITweakedTransactionData {
     readonly signer: Signer;
     readonly network: Network;
+    readonly chainId?: ChainId;
     readonly nonWitnessUtxo?: Buffer;
 }
 export declare enum TransactionSequence {

package/build/_version.d.ts

@@ -1 +1 @@
-export declare const version = "1.0.76";
+export declare const version = "1.0.78";

package/build/_version.js

@@ -1 +1 @@
-export const version = '1.0.76';
+export const version = '1.0.78';

package/build/metadata/contracts/wBTC.d.ts

@@ -9,6 +9,6 @@ export declare class wBTC extends ContractBaseMetadata {
     readonly decimals: number;
     protected readonly address: Address;
     constructor(network?: Network, chainId?: ChainId);
-    private static getWBTCAddressForChain;
     static getAddress(network?: Network, chainId?: ChainId): Address;
+    private static getWBTCAddressForChain;
 }

package/build/metadata/contracts/wBTC.js

@@ -13,22 +13,10 @@ export class wBTC extends ContractBaseMetadata {
         this.network = network;
         this.address = wBTC.getAddress(network, chainId);
     }
-    static getWBTCAddressForChain(chainId) {
-        switch (chainId) {
-            case ChainId.Bitcoin:
-                return 'unknown';
-            case ChainId.Fractal:
-                return WBTC_ADDRESS_FRACTAL;
-            default:
-                throw new Error(`Invalid chainId: ${chainId}`);
-        }
-    }
     static getAddress(network = networks.bitcoin, chainId) {
         switch (network.bech32) {
             case networks.bitcoin.bech32:
-                if (chainId)
-                    return this.getWBTCAddressForChain(chainId);
-                return 'unknown';
+                return this.getWBTCAddressForChain(chainId ?? ChainId.Bitcoin);
             case networks.regtest.bech32:
                 return WBTC_ADDRESS_REGTEST;
             case networks.testnet.bech32:
@@ -37,4 +25,14 @@ export class wBTC extends ContractBaseMetadata {
                 throw new Error(`Invalid network: ${network}`);
         }
     }
+    static getWBTCAddressForChain(chainId) {
+        switch (chainId) {
+            case ChainId.Bitcoin:
+                return 'unknown';
+            case ChainId.Fractal:
+                return WBTC_ADDRESS_FRACTAL;
+            default:
+                throw new Error(`Invalid chainId: ${chainId}`);
+        }
+    }
 }

package/build/metadata/tokens.js

@@ -1,9 +1,9 @@
 import { ChainId } from '../network/ChainId.js';
-export const FACTORY_ADDRESS_REGTEST = 'bcrt1qgph2k9dahptnz2vu72ezd9r2p4phjm2pkgu7ht';
-export const POOL_ADDRESS_REGTEST = 'bcrt1q5nkjpjmh6xwweprcyeylwdw7aud4een7p9pphd';
+export const FACTORY_ADDRESS_REGTEST = 'bcrt1qxtpreq8zg7pp9wm550kjrhaa2r5kj6lhph9he5';
+export const POOL_ADDRESS_REGTEST = 'bcrt1qqg2a8076rwuruzetdyquj8fh5jxtc22pmh9vep';
 export const WBTC_ADDRESS_REGTEST = 'bcrt1qdr7sjgtnudda8zrfklw8l5cnrxum5hns7e46hf';
 export const MOTO_ADDRESS_REGTEST = 'bcrt1q8reuxx9naek4mqesrfsgdpjv3q7a5g2llkh6ua';
-export const ROUTER_ADDRESS_REGTEST = 'bcrt1qa6vja0swlvy4raxgv8k8kxmsfwzkgvu4ayrnd8';
+export const ROUTER_ADDRESS_REGTEST = 'bcrt1qplnz54sca73t8a03nh494jatr9ffjg6ecarrj8';
 export const FACTORY_ADDRESS_TESTNET = 'tb1qgev5kldhp5zvg6j8t9vl6x4phkrwn8nk9felxh';
 export const POOL_ADDRESS_TESTNET = 'tb1q6a7yw353hjmresphupytw5vczpqxtg4yrupayk';
 export const WBTC_ADDRESS_TESTNET = 'tb1qp28xna6pv47x6wflcplhu0a9hkld5shtvjx6xv';

package/build/transaction/TransactionFactory.js

@@ -98,12 +98,12 @@ export class TransactionFactory {
             throw new Error(`Amount is too low. Minimum consolidation is ${currentConsensusConfig.VAULT_MINIMUM_AMOUNT} sat. Received ${warpParameters.amount} sat. Make sure that you cover the unwrap consolidation fees of ${currentConsensusConfig.UNWRAP_CONSOLIDATION_PREPAID_FEES_SAT}sat.`);
         }
         const childTransactionRequiredValue = warpParameters.amount + currentConsensusConfig.UNWRAP_CONSOLIDATION_PREPAID_FEES_SAT;
-        const wbtc = new wBTC(warpParameters.network);
+        const wbtc = new wBTC(warpParameters.network, warpParameters.chainId);
         const to = wbtc.getAddress();
         const fundingParameters = {
             ...warpParameters,
             amount: childTransactionRequiredValue,
-            to: to,
+            to: warpParameters.to ?? to,
         };
         const preFundingTransaction = await this.createFundTransaction(fundingParameters);
         warpParameters.utxos = this.getUTXOAsTransaction(preFundingTransaction.tx, to, 0);
@@ -174,7 +174,7 @@ export class TransactionFactory {
             fundingTransaction: signedTransaction.tx.toHex(),
             psbt: psbt,
             feeRefundOrLoss: estimatedFees,
-            utxos: []
+            utxos: [],
         };
     }
     async unwrap(unwrapParameters) {

package/build/transaction/interfaces/ITransactionParameters.d.ts

@@ -26,7 +26,7 @@ export interface IInteractionParameters extends SharedInteractionParameters {
     readonly to: Address;
 }
 export interface IWrapParameters extends SharedInteractionParameters {
-    readonly to?: undefined;
+    readonly to?: undefined | Address;
     readonly from: Address;
     readonly amount: bigint;
     readonly receiver?: Address;

package/build/transaction/shared/TweakedTransaction.d.ts

@@ -4,9 +4,11 @@ import { Network, Payment, Psbt, Signer, Transaction } from 'bitcoinjs-lib';
 import { PsbtInput } from 'bip174/src/lib/interfaces.js';
 import { UTXO } from '../../utxo/interfaces/IUTXO.js';
 import { PsbtInputExtended, TapLeafScript } from '../interfaces/Tap.js';
+import { ChainId } from '../../network/ChainId.js';
 export interface ITweakedTransactionData {
     readonly signer: Signer;
     readonly network: Network;
+    readonly chainId?: ChainId;
     readonly nonWitnessUtxo?: Buffer;
 }
 export declare enum TransactionSequence {

package/package.json

@@ -1,6 +1,6 @@
 {
   "type": "module",
-  "version": "1.0.76",
+  "version": "1.0.78",
   "author": "BlobMaster41",
   "description": "OPNet transaction library allows you to create and sign transactions for the OPNet network.",
   "engines": {

package/src/_version.ts

@@ -1 +1 @@
-export const version = '1.0.76';
+export const version = '1.0.78';

package/src/metadata/contracts/wBTC.ts

@@ -1,58 +1,60 @@
-import { Network, networks } from 'bitcoinjs-lib';
-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.
- * */
-export class wBTC extends ContractBaseMetadata {
-    /**
-     * @description Token Name
-     */
-    public readonly tokenName: string = 'Wrapped Bitcoin';
-
-    /**
-     * @description Token Symbol
-     */
-    public readonly tokenSymbol: string = 'wBTC';
-
-    /**
-     * @description Token Decimals, same as Bitcoin
-     */
-    public readonly decimals: number = 8;
-
-    protected readonly address: Address;
-
-    constructor(protected network: Network = networks.bitcoin, chainId: ChainId = ChainId.Bitcoin) {
-        super(network);
-
-        this.address = wBTC.getAddress(network, chainId);
-    }
-
-    private static getWBTCAddressForChain(chainId: ChainId): Address {
-        switch (chainId) {
-            case ChainId.Bitcoin:
-                return 'unknown';
-            case ChainId.Fractal:
-                return WBTC_ADDRESS_FRACTAL;
-            default:
-                throw new Error(`Invalid chainId: ${chainId}`);
-        }
-    }
-
-    public static getAddress(network: Network = networks.bitcoin, chainId?: ChainId): Address {
-        switch (network.bech32) {
-            case networks.bitcoin.bech32:
-                if(chainId) return this.getWBTCAddressForChain(chainId);
-                return 'unknown';
-            case networks.regtest.bech32:
-                return WBTC_ADDRESS_REGTEST;
-            case networks.testnet.bech32:
-                return WBTC_ADDRESS_TESTNET;
-            default:
-                throw new Error(`Invalid network: ${network}`);
-        }
-    }
-}
+import { Network, networks } from 'bitcoinjs-lib';
+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.
+ * */
+export class wBTC extends ContractBaseMetadata {
+    /**
+     * @description Token Name
+     */
+    public readonly tokenName: string = 'Wrapped Bitcoin';
+
+    /**
+     * @description Token Symbol
+     */
+    public readonly tokenSymbol: string = 'wBTC';
+
+    /**
+     * @description Token Decimals, same as Bitcoin
+     */
+    public readonly decimals: number = 8;
+
+    protected readonly address: Address;
+
+    constructor(
+        protected network: Network = networks.bitcoin,
+        chainId: ChainId = ChainId.Bitcoin,
+    ) {
+        super(network);
+
+        this.address = wBTC.getAddress(network, chainId);
+    }
+
+    public static getAddress(network: Network = networks.bitcoin, chainId?: ChainId): Address {
+        switch (network.bech32) {
+            case networks.bitcoin.bech32:
+                return this.getWBTCAddressForChain(chainId ?? ChainId.Bitcoin);
+            case networks.regtest.bech32:
+                return WBTC_ADDRESS_REGTEST;
+            case networks.testnet.bech32:
+                return WBTC_ADDRESS_TESTNET;
+            default:
+                throw new Error(`Invalid network: ${network}`);
+        }
+    }
+
+    private static getWBTCAddressForChain(chainId: ChainId): Address {
+        switch (chainId) {
+            case ChainId.Bitcoin:
+                return 'unknown';
+            case ChainId.Fractal:
+                return WBTC_ADDRESS_FRACTAL;
+            default:
+                throw new Error(`Invalid chainId: ${chainId}`);
+        }
+    }
+}

package/src/metadata/tokens.ts

@@ -2,11 +2,11 @@ import { Address } from '@btc-vision/bsi-binary';
 import { ChainId } from '../network/ChainId.js';
 
 // Addresses Regtest
-export const FACTORY_ADDRESS_REGTEST: Address = 'bcrt1qgph2k9dahptnz2vu72ezd9r2p4phjm2pkgu7ht';
-export const POOL_ADDRESS_REGTEST: Address = 'bcrt1q5nkjpjmh6xwweprcyeylwdw7aud4een7p9pphd';
+export const FACTORY_ADDRESS_REGTEST: Address = 'bcrt1qxtpreq8zg7pp9wm550kjrhaa2r5kj6lhph9he5';
+export const POOL_ADDRESS_REGTEST: Address = 'bcrt1qqg2a8076rwuruzetdyquj8fh5jxtc22pmh9vep';
 export const WBTC_ADDRESS_REGTEST: Address = 'bcrt1qdr7sjgtnudda8zrfklw8l5cnrxum5hns7e46hf';
 export const MOTO_ADDRESS_REGTEST: Address = 'bcrt1q8reuxx9naek4mqesrfsgdpjv3q7a5g2llkh6ua';
-export const ROUTER_ADDRESS_REGTEST: Address = 'bcrt1qa6vja0swlvy4raxgv8k8kxmsfwzkgvu4ayrnd8';
+export const ROUTER_ADDRESS_REGTEST: Address = 'bcrt1qplnz54sca73t8a03nh494jatr9ffjg6ecarrj8';
 
 // Addresses Testnet
 export const FACTORY_ADDRESS_TESTNET: Address = 'tb1qgev5kldhp5zvg6j8t9vl6x4phkrwn8nk9felxh';