@btc-vision/transaction 1.0.120 → 1.0.122

package/browser/keypair/Address.d.ts

@@ -1,12 +1,9 @@
 import { Network } from '@btc-vision/bitcoin';
-import { ECPairInterface } from 'ecpair';
 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/EcKeyPair.d.ts

@@ -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/build/_version.d.ts

@@ -1 +1 @@
-export declare const version = "1.0.120";
+export declare const version = "1.0.122";

package/build/_version.js

@@ -1 +1 @@
-export const version = '1.0.120';
+export const version = '1.0.122';

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/keypair/Address.d.ts

@@ -1,12 +1,9 @@
 import { Network } from '@btc-vision/bitcoin';
-import { ECPairInterface } from 'ecpair';
 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,34 @@ 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 '@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;
+        super(32);
         _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 +48,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 +63,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 +89,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 +107,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 +140,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 +149,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/EcKeyPair.d.ts

@@ -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/build/keypair/EcKeyPair.js

@@ -3,13 +3,17 @@ import bip32, { BIP32Factory } from 'bip32';
 import { address, initEccLib, networks, payments } from '@btc-vision/bitcoin';
 import { toXOnly } from '@btc-vision/bitcoin/src/psbt/bip371.js';
 import { ECPairFactory } from 'ecpair';
-import { CURVE, Point, utils } from '@noble/secp256k1';
+import { CURVE, ProjectivePoint as Point } from '@noble/secp256k1';
 import { taggedHash } from '@btc-vision/bitcoin/src/crypto.js';
 initEccLib(ecc);
 const BIP32factory = typeof bip32 === 'function' ? bip32 : BIP32Factory;
 if (!BIP32factory) {
     throw new Error('Failed to load BIP32 library');
 }
+const mod = (a, b) => {
+    const result = a % b;
+    return result >= 0n ? result : result + b;
+};
 export class EcKeyPair {
     static fromWIF(wif, network = networks.bitcoin) {
         return this.ECPair.fromWIF(wif, network);
@@ -89,18 +93,21 @@ export class EcKeyPair {
         return address;
     }
     static tweakPublicKey(compressedPubKeyHex) {
-        if (compressedPubKeyHex.startsWith('0x')) {
+        if (typeof compressedPubKeyHex === 'string' && compressedPubKeyHex.startsWith('0x')) {
             compressedPubKeyHex = compressedPubKeyHex.slice(2);
         }
+        if (typeof compressedPubKeyHex !== 'string') {
+            compressedPubKeyHex = compressedPubKeyHex.toString('hex');
+        }
         let P = Point.fromHex(compressedPubKeyHex);
-        if (!P.hasEvenY()) {
+        if ((P.y & 1n) !== 0n) {
             P = P.negate();
         }
         const x = P.toRawBytes(true).slice(1);
         const tHash = taggedHash('TapTweak', Buffer.from(x));
-        const t = utils.mod(BigInt('0x' + Buffer.from(tHash).toString('hex')), CURVE.n);
-        const Q = P.add(Point.BASE.multiply(t));
-        return Q.toHex(true);
+        const t = mod(BigInt('0x' + Buffer.from(tHash).toString('hex')), CURVE.n);
+        const Q = P.add(Point.BASE.mul(t));
+        return Buffer.from(Q.toRawBytes(true));
     }
     static generateWallet(network = networks.bitcoin) {
         const keyPair = this.ECPair.makeRandom({
@@ -176,7 +183,7 @@ export class EcKeyPair {
         const privKey = fromSeed.privateKey;
         if (!privKey)
             throw new Error('Failed to generate key pair');
-        return this.ECPair.fromPrivateKey(privKey, { network });
+        return this.ECPair.fromPrivateKey(Buffer.from(privKey), { network });
     }
 }
 EcKeyPair.BIP32 = BIP32factory(ecc);

package/build/keypair/Wallet.js

@@ -10,7 +10,7 @@ export class Wallet {
         this._p2tr = EcKeyPair.getTaprootAddress(this._keypair, this.network);
         this._legacy = EcKeyPair.getLegacyAddress(this._keypair, this.network);
         this._segwitLegacy = EcKeyPair.getLegacySegwitAddress(this._keypair, this.network);
-        this._tweakedKey = Buffer.from(EcKeyPair.tweakPublicKey(this._keypair.publicKey.toString('hex')), 'hex');
+        this._tweakedKey = EcKeyPair.tweakPublicKey(this._keypair.publicKey.toString('hex'));
         this._bufferPubKey = this._keypair.publicKey;
         this._address = new Address(this._keypair.publicKey);
     }

package/build/utils/BitcoinUtils.js

@@ -19,11 +19,7 @@ export class BitcoinUtils {
             return Buffer.from(array);
         }
         else {
-            const randomValues = [];
-            for (let i = 0; i < length; i++) {
-                randomValues.push(Math.floor(Math.random() * 256));
-            }
-            return Buffer.from(randomValues);
+            throw new Error('No secure random number generator available. Please upgrade your environment.');
         }
     }
     static opnetHash(data) {

package/gulpfile.js

@@ -3,7 +3,7 @@ import gulp from 'gulp';
 import gulpcache from 'gulp-cached';
 
 import gulpClean from 'gulp-clean';
-import logger from 'gulp-logger';
+import logger from 'gulp-logger-new';
 import ts from 'gulp-typescript';
 
 process.on('uncaughtException', function (err) {

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@btc-vision/transaction",
     "type": "module",
-    "version": "1.0.120",
+    "version": "1.0.122",
     "author": "BlobMaster41",
     "description": "OPNet transaction library allows you to create and sign transactions for the OPNet network.",
     "engines": {
@@ -64,29 +64,28 @@
         "docs": "typedoc --out docs --exclude 'src/tests/*.ts' --tsconfig tsconfig.json --readme README.md --name OPNet --plugin typedoc-material-theme --themeColor '#cb9820' --exclude src/tests/test.ts --exclude src/index.ts src"
     },
     "devDependencies": {
-        "@babel/core": "^7.25.2",
+        "@babel/core": "^7.26.0",
         "@babel/plugin-proposal-class-properties": "^7.18.6",
-        "@babel/plugin-transform-runtime": "^7.24.3",
-        "@babel/preset-env": "^7.24.4",
-        "@babel/preset-flow": "^7.24.1",
-        "@babel/preset-react": "^7.24.1",
-        "@babel/preset-typescript": "^7.24.1",
-        "@types/node": "^22.5.5",
+        "@babel/plugin-transform-runtime": "^7.25.9",
+        "@babel/preset-env": "^7.26.0",
+        "@babel/preset-flow": "^7.25.9",
+        "@babel/preset-react": "^7.25.9",
+        "@babel/preset-typescript": "^7.26.0",
+        "@types/node": "^22.8.7",
         "@types/sha.js": "^2.4.4",
-        "eslint": "^9.10.0",
+        "eslint": "^9.14.0",
         "gulp": "^5.0.0",
         "gulp-cached": "^1.1.1",
-        "gulp-logger": "^0.0.2",
         "gulp-typescript": "^6.0.0-alpha.1",
         "https-browserify": "^1.0.0",
         "os-browserify": "^0.3.0",
-        "prettier": "^3.3.1",
+        "prettier": "^3.3.3",
         "stream-browserify": "^3.0.0",
         "stream-http": "^3.2.0",
-        "typedoc": "^0.26.7",
+        "typedoc": "^0.26.11",
         "typedoc-material-theme": "^1.1.0",
-        "typescript-eslint": "^8.5.0",
-        "webpack": "^5.94.0",
+        "typescript-eslint": "^8.13.0",
+        "webpack": "^5.96.1",
         "webpack-cli": "^5.1.4"
     },
     "dependencies": {
@@ -95,25 +94,26 @@
         "@btc-vision/bitcoin": "^6.3.0",
         "@btc-vision/bsi-bitcoin-rpc": "^1.0.29",
         "@btc-vision/logger": "^1.0.6",
-        "@eslint/js": "^9.10.0",
-        "@noble/secp256k1": "^1.7.1",
+        "@eslint/js": "^9.14.0",
+        "@noble/secp256k1": "^2.1.0",
         "assert": "^2.1.0",
-        "babel-loader": "^9.1.3",
+        "babel-loader": "^9.2.1",
         "babel-plugin-transform-import-meta": "^2.2.1",
         "babel-preset-react": "^6.24.1",
         "babelify": "^10.0.0",
         "bech32": "^2.0.0",
         "bignumber.js": "^9.1.2",
-        "bip32": "^4.0.0",
+        "bip32": "^5.0.0-rc.0",
         "browserify-zlib": "^0.2.0",
         "buffer": "^6.0.3",
         "ecpair": "^2.1.0",
         "gulp-clean": "^0.4.0",
-        "gulp-eslint-new": "^2.3.0",
+        "gulp-eslint-new": "^2.4.0",
+        "gulp-logger-new": "^1.0.1",
         "process": "^0.11.10",
         "sha.js": "^2.4.11",
         "ts-loader": "^9.5.1",
         "ts-node": "^10.9.2",
-        "typescript": "^5.6.2"
+        "typescript": "^5.6.3"
     }
 }

package/src/_version.ts

@@ -1 +1 @@
-export const version = '1.0.120';
+export const version = '1.0.122';

package/src/buffer/BinaryWriter.ts

@@ -90,8 +90,9 @@ export class BinaryWriter {
     }
 
     public writeAddress(value: Address): void {
-        const bytes = this.fromAddress(value);
-        this.writeBytes(bytes);
+        this.verifyAddress(value);
+
+        this.writeBytes(value);
     }
 
     public writeStringWithLength(value: string): void {
@@ -305,14 +306,12 @@ export class BinaryWriter {
         });
     }
 
-    private fromAddress(pubKey: Address): Uint8Array {
-        if (pubKey.tweakedBytes.byteLength > ADDRESS_BYTE_LENGTH) {
+    private verifyAddress(pubKey: Address): void {
+        if (pubKey.byteLength > ADDRESS_BYTE_LENGTH) {
             throw new Error(
                 `Address is too long ${pubKey.byteLength} > ${ADDRESS_BYTE_LENGTH} bytes`,
             );
         }
-
-        return pubKey.tweakedBytes;
     }
 
     private resize(size: u32): void {

package/src/keypair/Address.ts

@@ -1,18 +1,26 @@
 import { Network } from '@btc-vision/bitcoin';
 import { EcKeyPair } from './EcKeyPair.js';
 import { ECPairInterface } from 'ecpair';
-import { ADDRESS_BYTE_LENGTH } from '../utils/types.js';
 import { AddressVerificator } from './AddressVerificator.js';
 import { toXOnly } from '@btc-vision/bitcoin/src/psbt/bip371.js';
 
+const hexPattern = /^[0-9a-fA-F]+$/;
+const isHexadecimal = (input: string): boolean => {
+    return hexPattern.test(input);
+};
+
+/**
+ * Objects of type "Address" are the representation of tweaked public keys. They can be converted to different address formats.
+ * @category KeyPair
+ */
 export class Address extends Uint8Array {
-    private isP2TROnly: boolean = false;
     #p2tr: string | undefined;
     #network: Network | undefined;
-    #tweakedBytes: Uint8Array | undefined;
+    #originalPublicKey: Uint8Array | undefined;
+    #keyPair: ECPairInterface | undefined;
 
     public constructor(bytes?: ArrayLike<number>) {
-        super(bytes?.length || ADDRESS_BYTE_LENGTH);
+        super(32);
 
         if (!bytes) {
             return;
@@ -21,25 +29,24 @@ export class Address extends Uint8Array {
         this.set(bytes);
     }
 
-    private _keyPair: ECPairInterface | undefined;
+    /**
+     * If available, this will return the original public key associated with the address.
+     * @returns {Uint8Array} The original public key used to create the address.
+     */
+    public get originalPublicKey(): Uint8Array | undefined {
+        return this.#originalPublicKey;
+    }
 
     /**
      * Get the key pair for the address
+     * @description This is only for internal use. Please use address.tweakedBytes instead.
      */
-    public get keyPair(): ECPairInterface {
-        if (!this._keyPair) {
+    private get keyPair(): ECPairInterface {
+        if (!this.#keyPair) {
             throw new Error('Public key not set for address');
         }
 
-        return this._keyPair;
-    }
-
-    /**
-     * Get the tweaked bytes
-     * @returns {Uint8Array} The tweaked bytes
-     */
-    public get tweakedBytes(): Uint8Array {
-        return this.#tweakedBytes || this;
+        return this.#keyPair;
     }
 
     public static dead(): Address {
@@ -62,6 +69,12 @@ export class Address extends Uint8Array {
             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'));
     }
 
@@ -91,15 +104,14 @@ export class Address extends Uint8Array {
     }
 
     public equals(a: Address): boolean {
-        const b = this.isP2TROnly ? this : (this.#tweakedBytes as Uint8Array);
-        const c = a.isP2TROnly ? a : (a.#tweakedBytes as Uint8Array);
+        const b: Address = this as Address;
 
-        if (c.length !== b.length) {
+        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;
             }
         }
@@ -112,13 +124,11 @@ export class Address extends Uint8Array {
      * @returns {boolean} If bigger
      */
     public lessThan(a: Address): boolean {
-        // Compare the two addresses byte-by-byte, treating them as big-endian uint256
-        const b = this.isP2TROnly ? this : (this.#tweakedBytes as Uint8Array);
-        const c = a.isP2TROnly ? a : (a.#tweakedBytes as Uint8Array);
+        const b: Address = this as Address;
 
         for (let i = 0; i < 32; i++) {
             const thisByte = b[i];
-            const aByte = c[i];
+            const aByte = a[i];
 
             if (thisByte < aByte) {
                 return true; // this is less than a
@@ -136,12 +146,11 @@ export class Address extends Uint8Array {
      */
     public greaterThan(a: Address): boolean {
         // Compare the two addresses byte-by-byte, treating them as big-endian uint256
-        const b = this.isP2TROnly ? this : (this.#tweakedBytes as Uint8Array);
-        const c = a.isP2TROnly ? a : (a.#tweakedBytes as Uint8Array);
+        const b = this as Address;
 
         for (let i = 0; i < 32; i++) {
             const thisByte = b[i];
-            const aByte = c[i];
+            const aByte = a[i];
 
             if (thisByte > aByte) {
                 return true; // this is greater than a
@@ -164,23 +173,19 @@ export class Address extends Uint8Array {
         }
 
         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));
+            this.#originalPublicKey = Uint8Array.from(publicKey);
+            this.#keyPair = EcKeyPair.fromPublicKey(this.#originalPublicKey);
 
-            this.#tweakedBytes = toXOnly(
-                Buffer.from(
-                    EcKeyPair.tweakPublicKey(this._keyPair.publicKey.toString('hex')),
-                    'hex',
-                ),
+            const tweakedBytes = toXOnly(
+                EcKeyPair.tweakPublicKey(Buffer.from(this.#originalPublicKey)),
             );
-
-            super.set(publicKey);
+            
+            super.set(tweakedBytes);
         }
     }
 
@@ -237,10 +242,7 @@ export class Address extends Uint8Array {
             return this.#p2tr;
         }
 
-        const p2trAddy: string | undefined = EcKeyPair.tweakedPubKeyBufferToAddress(
-            this.isP2TROnly ? this : (this.#tweakedBytes as Uint8Array),
-            network,
-        );
+        const p2trAddy: string | undefined = EcKeyPair.tweakedPubKeyBufferToAddress(this, network);
 
         if (p2trAddy) {
             this.#network = network;