@btc-vision/transaction 1.0.119 → 1.0.121

package/browser/keypair/Address.d.ts

@@ -1,12 +1,9 @@
-import { Network } from 'bitcoinjs-lib';
-import { ECPairInterface } from 'ecpair';
+import { Network } from '@btc-vision/bitcoin';
 export declare class Address extends Uint8Array {
     #private;
-    private isP2TROnly;
     constructor(bytes?: ArrayLike<number>);
-    private _keyPair;
-    get keyPair(): ECPairInterface;
-    get tweakedBytes(): Uint8Array;
+    get originalPublicKey(): Uint8Array | undefined;
+    private get keyPair();
     static dead(): Address;
     static fromString(pubKey: string): Address;
     static wrap(bytes: ArrayLike<number>): Address;

package/browser/keypair/AddressVerificator.d.ts

@@ -1,4 +1,4 @@
-import { Network } from 'bitcoinjs-lib';
+import { Network } from '@btc-vision/bitcoin';
 export declare enum AddressTypes {
     P2PKH = "P2PKH",
     P2SH_OR_P2SH_P2WPKH = "P2SH_OR_P2SH-P2WPKH",

package/browser/keypair/EcKeyPair.d.ts

@@ -1,5 +1,5 @@
 import { BIP32API, BIP32Interface } from 'bip32';
-import { Network, Signer } from 'bitcoinjs-lib';
+import { Network, Signer } from '@btc-vision/bitcoin';
 import { ECPairAPI, ECPairInterface } from 'ecpair';
 import { IWallet } from './interfaces/IWallet.js';
 export declare class EcKeyPair {
@@ -14,7 +14,7 @@ export declare class EcKeyPair {
     static tweakedPubKeyToAddress(tweakedPubKeyHex: string, network: Network): string;
     static tweakedPubKeyBufferToAddress(tweakedPubKeyBuffer: Buffer | Uint8Array, network: Network): string;
     static xOnlyTweakedPubKeyToAddress(tweakedPubKeyHex: string, network: Network): string;
-    static tweakPublicKey(compressedPubKeyHex: string): string;
+    static tweakPublicKey(compressedPubKeyHex: string | Buffer): Buffer;
     static generateWallet(network?: Network): IWallet;
     static verifyContractAddress(contractAddress: string, network?: Network): boolean;
     static getLegacySegwitAddress(keyPair: ECPairInterface, network?: Network): string;

package/browser/keypair/Wallet.d.ts

@@ -1,6 +1,6 @@
 import { IWallet } from './interfaces/IWallet.js';
 import { ECPairInterface } from 'ecpair';
-import { Network } from 'bitcoinjs-lib';
+import { Network } from '@btc-vision/bitcoin';
 import { Address } from './Address.js';
 export declare class Wallet {
     readonly network: Network;

package/browser/metadata/ContractBaseMetadata.d.ts

@@ -1,4 +1,4 @@
-import { Network } from 'bitcoinjs-lib';
+import { Network } from '@btc-vision/bitcoin';
 export declare abstract class ContractBaseMetadata {
     protected network: Network;
     protected abstract readonly address: string;

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

@@ -1,4 +1,4 @@
-import { Network } from 'bitcoinjs-lib';
+import { Network } from '@btc-vision/bitcoin';
 import { ChainId } from '../../network/ChainId.js';
 import { ContractBaseMetadata } from '../ContractBaseMetadata.js';
 export declare class wBTC extends ContractBaseMetadata {

package/browser/signer/TweakedSigner.d.ts

@@ -1,4 +1,4 @@
-import { Network } from 'bitcoinjs-lib';
+import { Network } from '@btc-vision/bitcoin';
 import { ECPairInterface } from 'ecpair';
 export interface TweakSettings {
     readonly network?: Network;

package/browser/transaction/TransactionFactory.d.ts

@@ -1,4 +1,4 @@
-import { Transaction } from 'bitcoinjs-lib';
+import { Transaction } from '@btc-vision/bitcoin';
 import { UTXO } from '../utxo/interfaces/IUTXO.js';
 import { ICustomTransactionParameters } from './builders/CustomScriptTransaction.js';
 import { FundingTransaction } from './builders/FundingTransaction.js';

package/browser/transaction/browser/BrowserSignerBase.d.ts

@@ -1,4 +1,4 @@
-import { Network, Psbt, Signer } from 'bitcoinjs-lib';
+import { Network, Psbt, Signer } from '@btc-vision/bitcoin';
 export declare abstract class CustomKeypair implements Signer {
     abstract network: Network;
     abstract publicKey: Buffer;

package/browser/transaction/browser/extensions/UnisatSigner.d.ts

@@ -1,4 +1,4 @@
-import { Network, Psbt } from 'bitcoinjs-lib';
+import { Network, Psbt } from '@btc-vision/bitcoin';
 import { CustomKeypair } from '../BrowserSignerBase.js';
 import { Unisat } from '../types/Unisat.js';
 declare global {

package/browser/transaction/builders/CustomScriptTransaction.d.ts

@@ -1,7 +1,7 @@
 import { TransactionType } from '../enums/TransactionType.js';
 import { TapLeafScript } from '../interfaces/Tap.js';
 import { SharedInteractionParameters } from '../interfaces/ITransactionParameters.js';
-import { Payment, Psbt, Stack } from 'bitcoinjs-lib';
+import { Payment, Psbt, Stack } from '@btc-vision/bitcoin';
 import { TransactionBuilder } from './TransactionBuilder.js';
 export interface ICustomTransactionParameters extends SharedInteractionParameters {
     readonly script: (Buffer | Stack)[];

package/browser/transaction/builders/DeploymentTransaction.d.ts

@@ -1,6 +1,6 @@
 import { TransactionType } from '../enums/TransactionType.js';
 import { IDeploymentParameters } from '../interfaces/ITransactionParameters.js';
-import { Payment, Psbt } from 'bitcoinjs-lib';
+import { Payment, Psbt } from '@btc-vision/bitcoin';
 import { TransactionBuilder } from './TransactionBuilder.js';
 import { TapLeafScript } from '../interfaces/Tap.js';
 import { Address } from '../../keypair/Address.js';

package/browser/transaction/builders/FundingTransaction.d.ts

@@ -1,6 +1,6 @@
 import { TransactionType } from '../enums/TransactionType.js';
 import { IFundingTransactionParameters } from '../interfaces/ITransactionParameters.js';
-import { Signer } from 'bitcoinjs-lib';
+import { Signer } from '@btc-vision/bitcoin';
 import { TransactionBuilder } from './TransactionBuilder.js';
 import { ECPairInterface } from 'ecpair';
 export declare class FundingTransaction extends TransactionBuilder<TransactionType.FUNDING> {

package/browser/transaction/builders/InteractionTransaction.d.ts

@@ -1,4 +1,4 @@
-import { Taptree } from 'bitcoinjs-lib/src/types.js';
+import { Taptree } from '@btc-vision/bitcoin/src/types.js';
 import { TransactionType } from '../enums/TransactionType.js';
 import { TapLeafScript } from '../interfaces/Tap.js';
 import { IInteractionParameters } from '../interfaces/ITransactionParameters.js';

package/browser/transaction/builders/MultiSignTransaction.d.ts

@@ -1,5 +1,5 @@
-import { Payment, Psbt, PsbtInput, Signer, TapScriptSig } from 'bitcoinjs-lib';
-import { Taptree } from 'bitcoinjs-lib/src/types.js';
+import { Payment, Psbt, PsbtInput, Signer, TapScriptSig } from '@btc-vision/bitcoin';
+import { Taptree } from '@btc-vision/bitcoin/src/types.js';
 import { TransactionBuilder } from './TransactionBuilder.js';
 import { TransactionType } from '../enums/TransactionType.js';
 import { ITransactionParameters } from '../interfaces/ITransactionParameters.js';

package/browser/transaction/builders/SharedInteractionTransaction.d.ts

@@ -1,5 +1,5 @@
-import { Payment, Psbt, PsbtInput, Signer } from 'bitcoinjs-lib';
-import { Taptree } from 'bitcoinjs-lib/src/types.js';
+import { Payment, Psbt, PsbtInput, Signer } from '@btc-vision/bitcoin';
+import { Taptree } from '@btc-vision/bitcoin/src/types.js';
 import { ECPairInterface } from 'ecpair';
 import { TransactionBuilder } from './TransactionBuilder.js';
 import { TransactionType } from '../enums/TransactionType.js';

package/browser/transaction/builders/TransactionBuilder.d.ts

@@ -1,4 +1,4 @@
-import { Network, Psbt, PsbtInputExtended, PsbtOutputExtended, Signer, Transaction } from 'bitcoinjs-lib';
+import { Network, Psbt, PsbtInputExtended, PsbtOutputExtended, Signer, Transaction } from '@btc-vision/bitcoin';
 import { UpdateInput } from '../interfaces/Tap.js';
 import { TransactionType } from '../enums/TransactionType.js';
 import { IFundingTransactionParameters, ITransactionParameters } from '../interfaces/ITransactionParameters.js';

package/browser/transaction/builders/UnwrapSegwitTransaction.d.ts

@@ -1,8 +1,8 @@
-import { Taptree } from 'bitcoinjs-lib/src/types.js';
+import { Taptree } from '@btc-vision/bitcoin/src/types.js';
 import { TransactionType } from '../enums/TransactionType.js';
 import { IUnwrapParameters } from '../interfaces/ITransactionParameters.js';
 import { SharedInteractionTransaction } from './SharedInteractionTransaction.js';
-import { Psbt } from 'bitcoinjs-lib';
+import { Psbt } from '@btc-vision/bitcoin';
 import { VaultUTXOs } from '../processor/PsbtTransaction.js';
 export declare class UnwrapSegwitTransaction extends SharedInteractionTransaction<TransactionType.WBTC_UNWRAP> {
     private static readonly UNWRAP_SELECTOR;

package/browser/transaction/builders/UnwrapTransaction.d.ts

@@ -1,8 +1,8 @@
-import { Taptree } from 'bitcoinjs-lib/src/types.js';
+import { Taptree } from '@btc-vision/bitcoin/src/types.js';
 import { TransactionType } from '../enums/TransactionType.js';
 import { IUnwrapParameters } from '../interfaces/ITransactionParameters.js';
 import { SharedInteractionTransaction } from './SharedInteractionTransaction.js';
-import { Network, Payment, Psbt, PsbtInput } from 'bitcoinjs-lib';
+import { Network, Payment, Psbt, PsbtInput } from '@btc-vision/bitcoin';
 import { VaultUTXOs } from '../processor/PsbtTransaction.js';
 export declare class UnwrapTransaction extends SharedInteractionTransaction<TransactionType.WBTC_UNWRAP> {
     private static readonly UNWRAP_SELECTOR;

package/browser/transaction/builders/WrapTransaction.d.ts

@@ -1,4 +1,4 @@
-import { Taptree } from 'bitcoinjs-lib/src/types.js';
+import { Taptree } from '@btc-vision/bitcoin/src/types.js';
 import { TransactionType } from '../enums/TransactionType.js';
 import { TapLeafScript } from '../interfaces/Tap.js';
 import { IWrapParameters } from '../interfaces/ITransactionParameters.js';

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

@@ -4,7 +4,7 @@ import { ITweakedTransactionData } from '../shared/TweakedTransaction.js';
 import { VaultUTXOs } from '../processor/PsbtTransaction.js';
 import { ChainId } from '../../network/ChainId.js';
 import { Address } from '../../keypair/Address.js';
-import { PsbtOutputExtended } from 'bitcoinjs-lib';
+import { PsbtOutputExtended } from '@btc-vision/bitcoin';
 export interface ITransactionParameters extends ITweakedTransactionData {
     readonly from?: string;
     readonly to?: string;

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

@@ -1,4 +1,4 @@
-import { PsbtInput as _PsbtInput, PsbtInputUpdate as _PsbtInputUpdate, PsbtOutput as _PsbtOutput, TapBip32Derivation as _TapBip32Derivation, TapInternalKey as _TapInternalKey, TapKeySig as _TapKeySig, TapLeaf as _TapLeaf, TapLeafScript as _TapLeafScript, TapMerkleRoot as _TapMerkleRoot, TapScriptSig as _TapScriptSig, TapTree as _TapTree } from 'bitcoinjs-lib';
+import { PsbtInput as _PsbtInput, PsbtInputUpdate as _PsbtInputUpdate, PsbtOutput as _PsbtOutput, TapBip32Derivation as _TapBip32Derivation, TapInternalKey as _TapInternalKey, TapKeySig as _TapKeySig, TapLeaf as _TapLeaf, TapLeafScript as _TapLeafScript, TapMerkleRoot as _TapMerkleRoot, TapScriptSig as _TapScriptSig, TapTree as _TapTree } from '@btc-vision/bitcoin';
 export interface TapLeafScript {
     readonly leafVersion: number;
     readonly controlBlock: Buffer;

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

@@ -1,4 +1,4 @@
-import { Network, Psbt, PsbtInputExtended, PsbtOutputExtended, Signer, Transaction } from 'bitcoinjs-lib';
+import { Network, Psbt, PsbtInputExtended, PsbtOutputExtended, Signer, Transaction } from '@btc-vision/bitcoin';
 import { ITweakedTransactionData, TweakedTransaction } from '../shared/TweakedTransaction.js';
 export interface PsbtTransactionData extends ITweakedTransactionData {
     readonly psbt: Psbt;

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

@@ -1,4 +1,4 @@
-import { Network } from 'bitcoinjs-lib';
+import { Network } from '@btc-vision/bitcoin';
 export declare class P2TR_MS {
     static generateMultiSigAddress(pubKeys: Buffer[], minimumSignatureRequired: number, network?: Network): string;
 }

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

@@ -1,5 +1,5 @@
 import { Logger } from '@btc-vision/logger';
-import { Network, Payment, Psbt, PsbtInput, PsbtInputExtended, Signer, Transaction } from 'bitcoinjs-lib';
+import { Network, Payment, Psbt, PsbtInput, PsbtInputExtended, Signer, Transaction } from '@btc-vision/bitcoin';
 import { ECPairInterface } from 'ecpair';
 import { UTXO } from '../../utxo/interfaces/IUTXO.js';
 import { TapLeafScript } from '../interfaces/Tap.js';

package/browser/utxo/OPNetLimitedProvider.d.ts

@@ -1,4 +1,4 @@
-import { Network } from 'bitcoinjs-lib';
+import { Network } from '@btc-vision/bitcoin';
 import { Address, Wallet } from '../opnet.js';
 import { UnwrapGeneration } from '../wbtc/UnwrapGeneration.js';
 import { WrappedGeneration } from '../wbtc/WrappedGenerationParameters.js';

package/browser/verification/TapscriptVerificator.d.ts

@@ -1,5 +1,5 @@
-import { Network } from 'bitcoinjs-lib';
-import { Taptree } from 'bitcoinjs-lib/src/types.js';
+import { Network } from '@btc-vision/bitcoin';
+import { Taptree } from '@btc-vision/bitcoin/src/types.js';
 export interface ContractAddressVerificationParams {
     readonly deployerPubKey: Buffer;
     readonly contractSaltPubKey: Buffer;

package/build/_version.d.ts

@@ -1 +1 @@
-export declare const version = "1.0.119";
+export declare const version = "1.0.121";

package/build/_version.js

@@ -1 +1 @@
-export const version = '1.0.119';
+export const version = '1.0.121';

package/build/buffer/BinaryWriter.d.ts

@@ -40,7 +40,7 @@ export declare class BinaryWriter {
     writeSelectorArray(value: Selector[]): void;
     private getChecksum;
     private writeMethodSelectorMap;
-    private fromAddress;
+    private verifyAddress;
     private resize;
     private getDefaultBuffer;
 }

package/build/buffer/BinaryWriter.js

@@ -67,8 +67,8 @@ export class BinaryWriter {
         }
     }
     writeAddress(value) {
-        const bytes = this.fromAddress(value);
-        this.writeBytes(bytes);
+        this.verifyAddress(value);
+        this.writeBytes(value);
     }
     writeStringWithLength(value) {
         this.allocSafe(value.length + 2);
@@ -239,11 +239,10 @@ export class BinaryWriter {
             this.writeSelector(selector);
         });
     }
-    fromAddress(pubKey) {
-        if (pubKey.tweakedBytes.byteLength > ADDRESS_BYTE_LENGTH) {
+    verifyAddress(pubKey) {
+        if (pubKey.byteLength > ADDRESS_BYTE_LENGTH) {
             throw new Error(`Address is too long ${pubKey.byteLength} > ${ADDRESS_BYTE_LENGTH} bytes`);
         }
-        return pubKey.tweakedBytes;
     }
     resize(size) {
         const buf = new Uint8Array(this.buffer.byteLength + size);

package/build/generators/AddressGenerator.d.ts

@@ -1,4 +1,4 @@
-import { Network } from 'bitcoinjs-lib';
+import { Network } from '@btc-vision/bitcoin';
 export declare class AddressGenerator {
     static generatePKSH(sha256Hash: Buffer, network: Network): string;
     static generateTaprootAddress(pubKey: Buffer, network: {

package/build/generators/AddressGenerator.js

@@ -1,7 +1,7 @@
 import { bech32, bech32m } from 'bech32';
-import { initEccLib } from 'bitcoinjs-lib';
+import { initEccLib } from '@btc-vision/bitcoin';
 import * as ecc from '@bitcoinerlab/secp256k1';
-import { ripemd160 } from 'bitcoinjs-lib/src/crypto.js';
+import { ripemd160 } from '@btc-vision/bitcoin/src/crypto.js';
 initEccLib(ecc);
 export class AddressGenerator {
     static generatePKSH(sha256Hash, network) {

package/build/generators/Features.js

@@ -1,4 +1,4 @@
-import { opcodes } from 'bitcoinjs-lib';
+import { opcodes } from '@btc-vision/bitcoin';
 export var Features;
 (function (Features) {
     Features[Features["UNWRAP"] = 0] = "UNWRAP";

package/build/generators/Generator.d.ts

@@ -1,4 +1,4 @@
-import { Network } from 'bitcoinjs-lib';
+import { Network } from '@btc-vision/bitcoin';
 export declare abstract class Generator {
     static readonly DATA_CHUNK_SIZE: number;
     static readonly MAGIC: Buffer;

package/build/generators/Generator.js

@@ -1,5 +1,5 @@
-import { networks } from 'bitcoinjs-lib';
-import { toXOnly } from 'bitcoinjs-lib/src/psbt/bip371.js';
+import { networks } from '@btc-vision/bitcoin';
+import { toXOnly } from '@btc-vision/bitcoin/src/psbt/bip371.js';
 export class Generator {
     constructor(senderPubKey, contractSaltPubKey, network = networks.bitcoin) {
         this.network = networks.bitcoin;

package/build/generators/builders/CalldataGenerator.d.ts

@@ -1,4 +1,4 @@
-import { Network } from 'bitcoinjs-lib';
+import { Network } from '@btc-vision/bitcoin';
 import { Features } from '../Features.js';
 import { Generator } from '../Generator.js';
 export declare class CalldataGenerator extends Generator {

package/build/generators/builders/CalldataGenerator.js

@@ -1,4 +1,4 @@
-import { crypto, networks, opcodes, script } from 'bitcoinjs-lib';
+import { crypto, networks, opcodes, script } from '@btc-vision/bitcoin';
 import { Compressor } from '../../bytecode/Compressor.js';
 import { EcKeyPair } from '../../keypair/EcKeyPair.js';
 import { FeatureOpCodes } from '../Features.js';

package/build/generators/builders/CustomGenerator.d.ts

@@ -1,4 +1,4 @@
-import { Network, Stack } from 'bitcoinjs-lib';
+import { Network, Stack } from '@btc-vision/bitcoin';
 import { Generator } from '../Generator.js';
 export declare class CustomGenerator extends Generator {
     constructor(senderPubKey: Buffer, network?: Network);

package/build/generators/builders/CustomGenerator.js

@@ -1,4 +1,4 @@
-import { networks, script } from 'bitcoinjs-lib';
+import { networks, script } from '@btc-vision/bitcoin';
 import { Generator } from '../Generator.js';
 export class CustomGenerator extends Generator {
     constructor(senderPubKey, network = networks.bitcoin) {

package/build/generators/builders/DeploymentGenerator.d.ts

@@ -1,4 +1,4 @@
-import { Network } from 'bitcoinjs-lib';
+import { Network } from '@btc-vision/bitcoin';
 import { Generator } from '../Generator.js';
 export declare class DeploymentGenerator extends Generator {
     constructor(senderPubKey: Buffer, contractSaltPubKey: Buffer, network?: Network);

package/build/generators/builders/DeploymentGenerator.js

@@ -1,4 +1,4 @@
-import { crypto, networks, opcodes, script } from 'bitcoinjs-lib';
+import { crypto, networks, opcodes, script } from '@btc-vision/bitcoin';
 import { Generator } from '../Generator.js';
 export class DeploymentGenerator extends Generator {
     constructor(senderPubKey, contractSaltPubKey, network = networks.bitcoin) {

package/build/generators/builders/LegacyCalldataGenerator.d.ts

@@ -1,4 +1,4 @@
-import { Network } from 'bitcoinjs-lib';
+import { Network } from '@btc-vision/bitcoin';
 import { Features } from '../Features.js';
 import { Generator } from '../Generator.js';
 export declare class LegacyCalldataGenerator extends Generator {

package/build/generators/builders/LegacyCalldataGenerator.js

@@ -1,4 +1,4 @@
-import { networks, opcodes, script } from 'bitcoinjs-lib';
+import { networks, opcodes, script } from '@btc-vision/bitcoin';
 import { Compressor } from '../../bytecode/Compressor.js';
 import { EcKeyPair } from '../../keypair/EcKeyPair.js';
 import { FeatureOpCodes } from '../Features.js';

package/build/generators/builders/MultiSignGenerator.js

@@ -1,5 +1,5 @@
-import { opcodes, script } from 'bitcoinjs-lib';
-import { toXOnly } from 'bitcoinjs-lib/src/psbt/bip371.js';
+import { opcodes, script } from '@btc-vision/bitcoin';
+import { toXOnly } from '@btc-vision/bitcoin/src/psbt/bip371.js';
 export class MultiSignGenerator {
     static compile(vaultPublicKeys, minimumSignatures = 0, internal) {
         if (minimumSignatures < 2) {

package/build/keypair/Address.d.ts

@@ -1,12 +1,9 @@
-import { Network } from 'bitcoinjs-lib';
-import { ECPairInterface } from 'ecpair';
+import { Network } from '@btc-vision/bitcoin';
 export declare class Address extends Uint8Array {
     #private;
-    private isP2TROnly;
     constructor(bytes?: ArrayLike<number>);
-    private _keyPair;
-    get keyPair(): ECPairInterface;
-    get tweakedBytes(): Uint8Array;
+    get originalPublicKey(): Uint8Array | undefined;
+    private get keyPair();
     static dead(): Address;
     static fromString(pubKey: string): Address;
     static wrap(bytes: ArrayLike<number>): Address;

package/build/keypair/Address.js

@@ -9,31 +9,35 @@ var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
     return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
 };
-var _Address_p2tr, _Address_network, _Address_tweakedBytes;
+var _Address_p2tr, _Address_network, _Address_originalPublicKey, _Address_keyPair;
 import { EcKeyPair } from './EcKeyPair.js';
 import { ADDRESS_BYTE_LENGTH } from '../utils/types.js';
 import { AddressVerificator } from './AddressVerificator.js';
-import { toXOnly } from 'bitcoinjs-lib/src/psbt/bip371.js';
+import { toXOnly } from '@btc-vision/bitcoin/src/psbt/bip371.js';
+const hexPattern = /^[0-9a-fA-F]+$/;
+const isHexadecimal = (input) => {
+    return hexPattern.test(input);
+};
 export class Address extends Uint8Array {
     constructor(bytes) {
         super(bytes?.length || ADDRESS_BYTE_LENGTH);
-        this.isP2TROnly = false;
         _Address_p2tr.set(this, void 0);
         _Address_network.set(this, void 0);
-        _Address_tweakedBytes.set(this, void 0);
+        _Address_originalPublicKey.set(this, void 0);
+        _Address_keyPair.set(this, void 0);
         if (!bytes) {
             return;
         }
         this.set(bytes);
     }
+    get originalPublicKey() {
+        return __classPrivateFieldGet(this, _Address_originalPublicKey, "f");
+    }
     get keyPair() {
-        if (!this._keyPair) {
+        if (!__classPrivateFieldGet(this, _Address_keyPair, "f")) {
             throw new Error('Public key not set for address');
         }
-        return this._keyPair;
-    }
-    get tweakedBytes() {
-        return __classPrivateFieldGet(this, _Address_tweakedBytes, "f") || this;
+        return __classPrivateFieldGet(this, _Address_keyPair, "f");
     }
     static dead() {
         return Address.fromString('0x04678afdb0fe5548271967f1a67130b7105cd6a828e03909a67962e0ea1f61deb649f6bc3f4cef38c4f35504e51ec112de5c384df7ba0b8d578a4c702b6bf11d5f');
@@ -45,6 +49,9 @@ export class Address extends Uint8Array {
         if (pubKey.startsWith('0x')) {
             pubKey = pubKey.slice(2);
         }
+        if (!isHexadecimal(pubKey)) {
+            throw new Error('You must only pass public keys in hexadecimal format. If you have an address such as bc1q... you must convert it to a public key first. Please refer to await provider.getPublicKeyInfo("bc1q..."). If the public key associated with the address is not found, you must force the user to enter the destination public key. It looks like: 0x020373626d317ae8788ce3280b491068610d840c23ecb64c14075bbb9f670af52c.');
+        }
         return new Address(Buffer.from(pubKey, 'hex'));
     }
     static wrap(bytes) {
@@ -57,24 +64,22 @@ export class Address extends Uint8Array {
         return Buffer.from(this);
     }
     equals(a) {
-        const b = this.isP2TROnly ? this : __classPrivateFieldGet(this, _Address_tweakedBytes, "f");
-        const c = a.isP2TROnly ? a : __classPrivateFieldGet(a, _Address_tweakedBytes, "f");
-        if (c.length !== b.length) {
+        const b = this;
+        if (a.length !== b.length) {
             return false;
         }
         for (let i = 0; i < b.length; i++) {
-            if (b[i] !== c[i]) {
+            if (b[i] !== a[i]) {
                 return false;
             }
         }
         return true;
     }
     lessThan(a) {
-        const b = this.isP2TROnly ? this : __classPrivateFieldGet(this, _Address_tweakedBytes, "f");
-        const c = a.isP2TROnly ? a : __classPrivateFieldGet(a, _Address_tweakedBytes, "f");
+        const b = this;
         for (let i = 0; i < 32; i++) {
             const thisByte = b[i];
-            const aByte = c[i];
+            const aByte = a[i];
             if (thisByte < aByte) {
                 return true;
             }
@@ -85,11 +90,10 @@ export class Address extends Uint8Array {
         return false;
     }
     greaterThan(a) {
-        const b = this.isP2TROnly ? this : __classPrivateFieldGet(this, _Address_tweakedBytes, "f");
-        const c = a.isP2TROnly ? a : __classPrivateFieldGet(a, _Address_tweakedBytes, "f");
+        const b = this;
         for (let i = 0; i < 32; i++) {
             const thisByte = b[i];
-            const aByte = c[i];
+            const aByte = a[i];
             if (thisByte > aByte) {
                 return true;
             }
@@ -104,15 +108,15 @@ export class Address extends Uint8Array {
             throw new Error(`Invalid public key length ${publicKey.length}`);
         }
         if (publicKey.length === 32) {
-            this.isP2TROnly = true;
             const buf = Buffer.alloc(32);
             buf.set(publicKey);
             super.set(publicKey);
         }
         else {
-            this._keyPair = EcKeyPair.fromPublicKey(Uint8Array.from(publicKey));
-            __classPrivateFieldSet(this, _Address_tweakedBytes, toXOnly(Buffer.from(EcKeyPair.tweakPublicKey(this._keyPair.publicKey.toString('hex')), 'hex')), "f");
-            super.set(publicKey);
+            __classPrivateFieldSet(this, _Address_originalPublicKey, Uint8Array.from(publicKey), "f");
+            __classPrivateFieldSet(this, _Address_keyPair, EcKeyPair.fromPublicKey(__classPrivateFieldGet(this, _Address_originalPublicKey, "f")), "f");
+            const tweakedBytes = toXOnly(EcKeyPair.tweakPublicKey(Buffer.from(__classPrivateFieldGet(this, _Address_originalPublicKey, "f"))));
+            super.set(tweakedBytes);
         }
     }
     isValid(network) {
@@ -137,7 +141,7 @@ export class Address extends Uint8Array {
         if (__classPrivateFieldGet(this, _Address_p2tr, "f") && __classPrivateFieldGet(this, _Address_network, "f") === network) {
             return __classPrivateFieldGet(this, _Address_p2tr, "f");
         }
-        const p2trAddy = EcKeyPair.tweakedPubKeyBufferToAddress(this.isP2TROnly ? this : __classPrivateFieldGet(this, _Address_tweakedBytes, "f"), network);
+        const p2trAddy = EcKeyPair.tweakedPubKeyBufferToAddress(this, network);
         if (p2trAddy) {
             __classPrivateFieldSet(this, _Address_network, network, "f");
             __classPrivateFieldSet(this, _Address_p2tr, p2trAddy, "f");
@@ -146,4 +150,4 @@ export class Address extends Uint8Array {
         throw new Error('Public key not set');
     }
 }
-_Address_p2tr = new WeakMap(), _Address_network = new WeakMap(), _Address_tweakedBytes = new WeakMap();
+_Address_p2tr = new WeakMap(), _Address_network = new WeakMap(), _Address_originalPublicKey = new WeakMap(), _Address_keyPair = new WeakMap();

package/build/keypair/AddressVerificator.d.ts

@@ -1,4 +1,4 @@
-import { Network } from 'bitcoinjs-lib';
+import { Network } from '@btc-vision/bitcoin';
 export declare enum AddressTypes {
     P2PKH = "P2PKH",
     P2SH_OR_P2SH_P2WPKH = "P2SH_OR_P2SH-P2WPKH",

package/build/keypair/AddressVerificator.js

@@ -1,4 +1,4 @@
-import { address, initEccLib } from 'bitcoinjs-lib';
+import { address, initEccLib } from '@btc-vision/bitcoin';
 import * as ecc from '@bitcoinerlab/secp256k1';
 import { EcKeyPair } from './EcKeyPair.js';
 initEccLib(ecc);

package/build/keypair/EcKeyPair.d.ts

@@ -1,5 +1,5 @@
 import { BIP32API, BIP32Interface } from 'bip32';
-import { Network, Signer } from 'bitcoinjs-lib';
+import { Network, Signer } from '@btc-vision/bitcoin';
 import { ECPairAPI, ECPairInterface } from 'ecpair';
 import { IWallet } from './interfaces/IWallet.js';
 export declare class EcKeyPair {
@@ -14,7 +14,7 @@ export declare class EcKeyPair {
     static tweakedPubKeyToAddress(tweakedPubKeyHex: string, network: Network): string;
     static tweakedPubKeyBufferToAddress(tweakedPubKeyBuffer: Buffer | Uint8Array, network: Network): string;
     static xOnlyTweakedPubKeyToAddress(tweakedPubKeyHex: string, network: Network): string;
-    static tweakPublicKey(compressedPubKeyHex: string): string;
+    static tweakPublicKey(compressedPubKeyHex: string | Buffer): Buffer;
     static generateWallet(network?: Network): IWallet;
     static verifyContractAddress(contractAddress: string, network?: Network): boolean;
     static getLegacySegwitAddress(keyPair: ECPairInterface, network?: Network): string;