@btc-vision/transaction 1.2.8 → 1.2.9

package/browser/keypair/Wallet.d.ts

@@ -1,4 +1,3 @@
-import { IWallet } from './interfaces/IWallet.js';
 import { ECPairInterface } from 'ecpair';
 import { Network } from '@btc-vision/bitcoin';
 import { Address } from './Address.js';
@@ -12,7 +11,7 @@ export declare class Wallet {
     private readonly _bufferPubKey;
     private readonly _tweakedKey;
     private readonly _address;
-    constructor(wallet: IWallet, network?: Network);
+    constructor(privateKeyOrWif: string, network?: Network);
     get address(): Address;
     get tweakedPubKeyKey(): Buffer;
     get keypair(): ECPairInterface;
@@ -24,4 +23,5 @@ export declare class Wallet {
     get publicKey(): Buffer;
     get xOnly(): Buffer;
     static fromWif(wif: string, network?: Network): Wallet;
+    static new(network?: Network): Wallet;
 }

package/browser/utils/BitcoinUtils.d.ts

@@ -2,5 +2,6 @@ export declare class BitcoinUtils {
     static btcToSatoshi(btc: number): bigint;
     static rndBytes(): Buffer;
     static getSafeRandomValues(length: number): Buffer;
+    static isValidHex(hex: string): boolean;
     static opnetHash(data: Buffer): string;
 }

package/build/_version.d.ts

@@ -1 +1 @@
-export declare const version = "1.2.7";
+export declare const version = "1.2.9";

package/build/_version.js

@@ -1 +1 @@
-export const version = '1.2.7';
+export const version = '1.2.9';

package/build/deterministic/Map.d.ts

@@ -5,7 +5,7 @@ export declare class Map<K, V> {
     get size(): i32;
     keys(): K[];
     values(): V[];
-    entires(): [K, V][];
+    entries(): [K, V][];
     set(key: K, value: V): void;
     indexOf(key: K): i32;
     get(key: K): V | undefined;

package/build/deterministic/Map.js

@@ -12,7 +12,7 @@ export class Map {
     values() {
         return this._values;
     }
-    entires() {
+    entries() {
         const result = [];
         for (let i = 0; i < this._keys.length; i++) {
             result.push([this._keys[i], this._values[i]]);

package/build/keypair/Address.js

@@ -15,10 +15,7 @@ import { ADDRESS_BYTE_LENGTH } from '../utils/lengths.js';
 import { AddressVerificator } from './AddressVerificator.js';
 import { EcKeyPair } from './EcKeyPair.js';
 import { ContractAddress } from '../transaction/ContractAddress.js';
-const hexPattern = /^[0-9a-fA-F]+$/;
-const isHexadecimal = (input) => {
-    return hexPattern.test(input);
-};
+import { BitcoinUtils } from '../utils/BitcoinUtils.js';
 export class Address extends Uint8Array {
     constructor(bytes) {
         super(ADDRESS_BYTE_LENGTH);
@@ -52,7 +49,7 @@ export class Address extends Uint8Array {
         if (pubKey.startsWith('0x')) {
             pubKey = pubKey.slice(2);
         }
-        if (!isHexadecimal(pubKey)) {
+        if (!BitcoinUtils.isValidHex(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'));

package/build/keypair/AddressVerificator.js

@@ -1,6 +1,7 @@
 import { address, initEccLib } from '@btc-vision/bitcoin';
 import * as ecc from '@bitcoinerlab/secp256k1';
 import { EcKeyPair } from './EcKeyPair.js';
+import { BitcoinUtils } from '../utils/BitcoinUtils.js';
 initEccLib(ecc);
 export var AddressTypes;
 (function (AddressTypes) {
@@ -53,8 +54,7 @@ export class AddressVerificator {
             if (input.startsWith('0x')) {
                 input = input.slice(2);
             }
-            const hexRegex = /^[0-9a-fA-F]+$/;
-            if (!hexRegex.test(input)) {
+            if (!BitcoinUtils.isValidHex(input)) {
                 return false;
             }
             if (input.length === 64) {

package/build/keypair/Wallet.d.ts

@@ -1,4 +1,3 @@
-import { IWallet } from './interfaces/IWallet.js';
 import { ECPairInterface } from 'ecpair';
 import { Network } from '@btc-vision/bitcoin';
 import { Address } from './Address.js';
@@ -12,7 +11,7 @@ export declare class Wallet {
     private readonly _bufferPubKey;
     private readonly _tweakedKey;
     private readonly _address;
-    constructor(wallet: IWallet, network?: Network);
+    constructor(privateKeyOrWif: string, network?: Network);
     get address(): Address;
     get tweakedPubKeyKey(): Buffer;
     get keypair(): ECPairInterface;
@@ -24,4 +23,5 @@ export declare class Wallet {
     get publicKey(): Buffer;
     get xOnly(): Buffer;
     static fromWif(wif: string, network?: Network): Wallet;
+    static new(network?: Network): Wallet;
 }

package/build/keypair/Wallet.js

@@ -1,17 +1,26 @@
 import { EcKeyPair } from './EcKeyPair.js';
 import { networks, toXOnly } from '@btc-vision/bitcoin';
 import { Address } from './Address.js';
+import { BitcoinUtils } from '../utils/BitcoinUtils.js';
 export class Wallet {
-    constructor(wallet, network = networks.bitcoin) {
+    constructor(privateKeyOrWif, network = networks.bitcoin) {
         this.network = network;
-        this._keypair = EcKeyPair.fromWIF(wallet.privateKey, this.network);
-        this._p2wpkh = EcKeyPair.getP2WPKHAddress(this._keypair, this.network);
-        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 = EcKeyPair.tweakPublicKey(this._keypair.publicKey.toString('hex'));
+        const parsedPrivateKey = privateKeyOrWif.startsWith('0x')
+            ? privateKeyOrWif.replace('0x', '')
+            : privateKeyOrWif;
+        if (BitcoinUtils.isValidHex(parsedPrivateKey)) {
+            this._keypair = EcKeyPair.fromPrivateKey(Buffer.from(parsedPrivateKey, 'hex'), this.network);
+        }
+        else {
+            this._keypair = EcKeyPair.fromWIF(parsedPrivateKey, this.network);
+        }
         this._bufferPubKey = this._keypair.publicKey;
         this._address = new Address(this._keypair.publicKey);
+        this._p2tr = this._address.p2tr(this.network);
+        this._p2wpkh = this._address.p2wpkh(this.network);
+        this._legacy = this._address.p2pkh(this.network);
+        this._segwitLegacy = this._address.p2wpkh(this.network);
+        this._tweakedKey = this._address.toBuffer();
     }
     get address() {
         return this._address;
@@ -50,6 +59,9 @@ export class Wallet {
         return toXOnly(this._bufferPubKey);
     }
     static fromWif(wif, network = networks.bitcoin) {
-        return new Wallet({ privateKey: wif, address: '', publicKey: '' }, network);
+        return new Wallet(wif, network);
+    }
+    static new(network = networks.bitcoin) {
+        return new Wallet(EcKeyPair.generateWallet(network).privateKey, network);
     }
 }

package/build/transaction/builders/SharedInteractionTransaction.js

@@ -198,11 +198,11 @@ export class SharedInteractionTransaction extends TransactionBuilder {
         }
     }
     getPubKeys() {
-        const pubkeys = [Buffer.from(this.signer.publicKey)];
+        const pubKeys = [Buffer.from(this.signer.publicKey)];
         if (this.scriptSigner) {
-            pubkeys.push(Buffer.from(this.scriptSigner.publicKey));
+            pubKeys.push(Buffer.from(this.scriptSigner.publicKey));
         }
-        return pubkeys;
+        return pubKeys;
     }
     generateRedeemScripts() {
         this.targetScriptRedeem = {

package/build/utils/BitcoinUtils.d.ts

@@ -2,5 +2,6 @@ export declare class BitcoinUtils {
     static btcToSatoshi(btc: number): bigint;
     static rndBytes(): Buffer;
     static getSafeRandomValues(length: number): Buffer;
+    static isValidHex(hex: string): boolean;
     static opnetHash(data: Buffer): string;
 }

package/build/utils/BitcoinUtils.js

@@ -1,4 +1,5 @@
 import { createHash } from 'crypto';
+const hexPattern = /^[0-9a-fA-F]+$/;
 export class BitcoinUtils {
     static btcToSatoshi(btc) {
         return BigInt(btc * 100000000);
@@ -25,6 +26,9 @@ export class BitcoinUtils {
             throw new Error('No secure random number generator available. Please upgrade your environment.');
         }
     }
+    static isValidHex(hex) {
+        return hexPattern.test(hex);
+    }
     static opnetHash(data) {
         const hashed = createHash('sha512');
         hashed.update(data);

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@btc-vision/transaction",
     "type": "module",
-    "version": "1.2.8",
+    "version": "1.2.9",
     "author": "BlobMaster41",
     "description": "OPNet transaction library allows you to create and sign transactions for the OPNet network.",
     "engines": {
@@ -89,7 +89,7 @@
     "dependencies": {
         "@babel/plugin-proposal-object-rest-spread": "^7.20.7",
         "@bitcoinerlab/secp256k1": "^1.1.1",
-        "@btc-vision/bitcoin": "^6.3.4",
+        "@btc-vision/bitcoin": "^6.3.5",
         "@btc-vision/bitcoin-rpc": "^1.0.0",
         "@btc-vision/logger": "^1.0.6",
         "@eslint/js": "^9.14.0",

package/src/_version.ts

@@ -1 +1 @@
-export const version = '1.2.7';
+export const version = '1.2.9';

package/src/deterministic/Map.ts

@@ -15,8 +15,8 @@ export class Map<K, V> {
     public values(): V[] {
         return this._values;
     }
-    
-    public entires(): [K, V][] {
+
+    public entries(): [K, V][] {
         const result: [K, V][] = [];
         for (let i: i32 = 0; i < this._keys.length; i++) {
             result.push([this._keys[i], this._values[i]]);

package/src/keypair/Address.ts

@@ -4,11 +4,7 @@ import { ADDRESS_BYTE_LENGTH } from '../utils/lengths.js';
 import { AddressVerificator } from './AddressVerificator.js';
 import { EcKeyPair } from './EcKeyPair.js';
 import { ContractAddress } from '../transaction/ContractAddress.js';
-
-const hexPattern = /^[0-9a-fA-F]+$/;
-const isHexadecimal = (input: string): boolean => {
-    return hexPattern.test(input);
-};
+import { BitcoinUtils } from '../utils/BitcoinUtils.js';
 
 /**
  * Objects of type "Address" are the representation of tweaked public keys. They can be converted to different address formats.
@@ -72,7 +68,7 @@ export class Address extends Uint8Array {
             pubKey = pubKey.slice(2);
         }
 
-        if (!isHexadecimal(pubKey)) {
+        if (!BitcoinUtils.isValidHex(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.',
             );

package/src/keypair/AddressVerificator.ts

@@ -1,6 +1,7 @@
 import { address, initEccLib, Network } from '@btc-vision/bitcoin';
 import * as ecc from '@bitcoinerlab/secp256k1';
 import { EcKeyPair } from './EcKeyPair.js';
+import { BitcoinUtils } from '../utils/BitcoinUtils.js';
 
 initEccLib(ecc);
 
@@ -100,8 +101,7 @@ export class AddressVerificator {
 
             // Compressed public keys are 66 characters long (0x02 or 0x03 prefix + 32 bytes)
             // Uncompressed public keys are 130 characters long (0x04 prefix + 64 bytes)
-            const hexRegex = /^[0-9a-fA-F]+$/;
-            if (!hexRegex.test(input)) {
+            if (!BitcoinUtils.isValidHex(input)) {
                 return false;
             }
 

package/src/keypair/Wallet.ts

@@ -1,8 +1,8 @@
-import { IWallet } from './interfaces/IWallet.js';
 import { ECPairInterface } from 'ecpair';
 import { EcKeyPair } from './EcKeyPair.js';
 import { Network, networks, toXOnly } from '@btc-vision/bitcoin';
 import { Address } from './Address.js';
+import { BitcoinUtils } from '../utils/BitcoinUtils.js';
 
 /**
  * Wallet class
@@ -57,20 +57,31 @@ export class Wallet {
     private readonly _address: Address;
 
     constructor(
-        wallet: IWallet,
+        privateKeyOrWif: string,
         public readonly network: Network = networks.bitcoin,
     ) {
-        this._keypair = EcKeyPair.fromWIF(wallet.privateKey, this.network);
-
-        this._p2wpkh = EcKeyPair.getP2WPKHAddress(this._keypair, this.network);
-        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 = EcKeyPair.tweakPublicKey(this._keypair.publicKey.toString('hex'));
+        const parsedPrivateKey = privateKeyOrWif.startsWith('0x')
+            ? privateKeyOrWif.replace('0x', '')
+            : privateKeyOrWif;
+
+        if (BitcoinUtils.isValidHex(parsedPrivateKey)) {
+            this._keypair = EcKeyPair.fromPrivateKey(
+                Buffer.from(parsedPrivateKey, 'hex'),
+                this.network,
+            );
+        } else {
+            this._keypair = EcKeyPair.fromWIF(parsedPrivateKey, this.network);
+        }
 
         this._bufferPubKey = this._keypair.publicKey;
         this._address = new Address(this._keypair.publicKey);
+
+        this._p2tr = this._address.p2tr(this.network);
+        this._p2wpkh = this._address.p2wpkh(this.network);
+        this._legacy = this._address.p2pkh(this.network);
+        this._segwitLegacy = this._address.p2wpkh(this.network);
+
+        this._tweakedKey = this._address.toBuffer();
     }
 
     /**
@@ -168,6 +179,14 @@ export class Wallet {
      * @returns {Wallet} The wallet
      */
     public static fromWif(wif: string, network: Network = networks.bitcoin): Wallet {
-        return new Wallet({ privateKey: wif, address: '', publicKey: '' }, network);
+        return new Wallet(wif, network);
+    }
+
+    /**
+     * Create a new fresh wallet
+     * @param {Network} network The network
+     */
+    public static new(network: Network = networks.bitcoin): Wallet {
+        return new Wallet(EcKeyPair.generateWallet(network).privateKey, network);
     }
 }

package/src/transaction/builders/SharedInteractionTransaction.ts

@@ -388,13 +388,13 @@ export abstract class SharedInteractionTransaction<
      * @returns {Buffer[]} The public keys
      */
     private getPubKeys(): Buffer[] {
-        const pubkeys = [Buffer.from(this.signer.publicKey)];
+        const pubKeys = [Buffer.from(this.signer.publicKey)];
 
         if (this.scriptSigner) {
-            pubkeys.push(Buffer.from(this.scriptSigner.publicKey));
+            pubKeys.push(Buffer.from(this.scriptSigner.publicKey));
         }
 
-        return pubkeys;
+        return pubKeys;
     }
 
     /**

package/src/utils/BitcoinUtils.ts

@@ -1,5 +1,7 @@
 import { createHash } from 'crypto';
 
+const hexPattern = /^[0-9a-fA-F]+$/;
+
 /**
  * Utility class for Bitcoin related functions
  */
@@ -51,6 +53,10 @@ export class BitcoinUtils {
         }
     }
 
+    public static isValidHex(hex: string): boolean {
+        return hexPattern.test(hex);
+    }
+
     /**
      * Hashes the given data
      * @param {Buffer} data - The data to hash
@@ -64,37 +70,4 @@ export class BitcoinUtils {
 
         return `0x${Buffer.from(hash).toString('hex')}`;
     }
-
-    /**
-     * Deterministically order vaults by address
-     * @param {VaultUTXOs[]} vaults - The vaults to order
-     * @returns {VaultUTXOs[]} The ordered vaults
-     */
-    /*public static orderVaultsByAddress(vaults: VaultUTXOs[]): VaultUTXOs[] {
-        return vaults.sort((a, b) => {
-            return a.vault.localeCompare(b.vault);
-        });
-    }*/
-
-    /**
-     * Find the vault with the most public keys in a deterministic way.
-     * @param {VaultUTXOs[]} vaults - The vaults to search
-     * @returns {VaultUTXOs} The vault with the most public keys
-     */
-    /*public static findVaultWithMostPublicKeys(vaults: VaultUTXOs[]): VaultUTXOs {
-        vaults = BitcoinUtils.orderVaultsByAddress(vaults);
-
-        let mostPublicKeys: number = 0;
-        let vault: VaultUTXOs | undefined;
-        for (const v of vaults) {
-            if (v.publicKeys.length > mostPublicKeys) {
-                mostPublicKeys = v.publicKeys.length;
-                vault = v;
-            }
-        }
-
-        if (!vault) throw new Error('No vault with public keys found.');
-
-        return vault;
-    }*/
 }