@btc-vision/transaction 1.1.17 → 1.2.1

package/build/transaction/builders/DeploymentTransaction.js

@@ -1,13 +1,13 @@
 import { TransactionType } from '../enums/TransactionType.js';
-import { crypto as bitCrypto } from '@btc-vision/bitcoin';
+import { crypto as bitCrypto, toXOnly, } from '@btc-vision/bitcoin';
 import { TransactionBuilder } from './TransactionBuilder.js';
 import { DeploymentGenerator } from '../../generators/builders/DeploymentGenerator.js';
-import { toXOnly } from '@btc-vision/bitcoin/src/psbt/bip371.js';
 import { EcKeyPair } from '../../keypair/EcKeyPair.js';
 import { BitcoinUtils } from '../../utils/BitcoinUtils.js';
 import { Compressor } from '../../bytecode/Compressor.js';
 import { SharedInteractionTransaction } from './SharedInteractionTransaction.js';
 import { Address } from '../../keypair/Address.js';
+const p = 0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2fn;
 export class DeploymentTransaction extends TransactionBuilder {
     constructor(parameters) {
         super(parameters);

package/build/transaction/builders/FundingTransaction.js

@@ -18,13 +18,13 @@ export class FundingTransaction extends TransactionBuilder {
             this.splitInputs(this.amount);
         }
         else if (this.isPubKeyDestination) {
-            const p2pkScript = script.compile([
+            const pubKeyScript = script.compile([
                 Buffer.from(this.to.replace('0x', ''), 'hex'),
                 opcodes.OP_CHECKSIG,
             ]);
             this.addOutput({
                 value: Number(this.amount),
-                script: p2pkScript,
+                script: pubKeyScript,
             });
         }
         else {

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

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

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

@@ -1,5 +1,4 @@
-import { Payment, Psbt, PsbtInput, Signer, TapScriptSig } from '@btc-vision/bitcoin';
-import { Taptree } from '@btc-vision/bitcoin/src/types.js';
+import { Payment, Psbt, PsbtInput, Signer, TapScriptSig, Taptree } from '@btc-vision/bitcoin';
 import { TransactionBuilder } from './TransactionBuilder.js';
 import { TransactionType } from '../enums/TransactionType.js';
 import { ITransactionParameters } from '../interfaces/ITransactionParameters.js';
@@ -20,7 +19,7 @@ export interface MultiSignFromBase64Params extends Omit<MultiSignParameters, 'ps
 export declare class MultiSignTransaction extends TransactionBuilder<TransactionType.MULTI_SIG> {
     static readonly LOCK_LEAF_SCRIPT: Buffer;
     static readonly signHashTypesArray: number[];
-    static readonly numsPoint: Buffer;
+    static readonly numsPoint: Buffer<ArrayBuffer>;
     type: TransactionType.MULTI_SIG;
     protected targetScriptRedeem: Payment | null;
     protected leftOverFundsScriptRedeem: Payment | null;
@@ -41,7 +40,7 @@ export declare class MultiSignTransaction extends TransactionBuilder<Transaction
         signed: boolean;
     };
     static partialFinalizer: (inputIndex: number, input: PsbtInput, partialSignatures: Buffer[], orderedPubKeys: Buffer[], isFinal: boolean) => {
-        finalScriptWitness: Buffer;
+        finalScriptWitness: Buffer<ArrayBufferLike>;
     };
     static dedupeSignatures(original: TapScriptSig[], partial: TapScriptSig[]): TapScriptSig[];
     static attemptFinalizeInputs(psbt: Psbt, startIndex: number, orderedPubKeys: Buffer[][], isFinal: boolean): boolean;

package/build/transaction/builders/MultiSignTransaction.js

@@ -1,8 +1,7 @@
-import { crypto as bitcoinCrypto, opcodes, Psbt, script, } from '@btc-vision/bitcoin';
+import { crypto as bitcoinCrypto, opcodes, Psbt, script, toXOnly, } from '@btc-vision/bitcoin';
 import { TransactionBuilder } from './TransactionBuilder.js';
 import { TransactionType } from '../enums/TransactionType.js';
 import { MultiSignGenerator } from '../../generators/builders/MultiSignGenerator.js';
-import { toXOnly } from '@btc-vision/bitcoin/src/psbt/bip371.js';
 import { EcKeyPair } from '../../keypair/EcKeyPair.js';
 export class MultiSignTransaction extends TransactionBuilder {
     constructor(parameters) {

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

@@ -1,5 +1,4 @@
-import { Payment, Psbt, PsbtInput, Signer } from '@btc-vision/bitcoin';
-import { Taptree } from '@btc-vision/bitcoin/src/types.js';
+import { Payment, Psbt, PsbtInput, Signer, Taptree } from '@btc-vision/bitcoin';
 import { ECPairInterface } from 'ecpair';
 import { TransactionBuilder } from './TransactionBuilder.js';
 import { TransactionType } from '../enums/TransactionType.js';
@@ -30,7 +29,7 @@ export declare abstract class SharedInteractionTransaction<T extends Transaction
     protected getScriptSolution(input: PsbtInput): Buffer[];
     protected getScriptTree(): Taptree;
     protected customFinalizer: (_inputIndex: number, input: PsbtInput) => {
-        finalScriptWitness: Buffer;
+        finalScriptWitness: Buffer<ArrayBufferLike>;
     };
     protected signInputsWalletBased(transaction: Psbt): Promise<void>;
     private signInputsNonWalletBased;

package/build/transaction/builders/SharedInteractionTransaction.js

@@ -1,10 +1,9 @@
-import { address } from '@btc-vision/bitcoin';
+import { address, toXOnly } from '@btc-vision/bitcoin';
 import { TransactionBuilder } from './TransactionBuilder.js';
 import { CalldataGenerator } from '../../generators/builders/CalldataGenerator.js';
 import { Compressor } from '../../bytecode/Compressor.js';
 import { EcKeyPair } from '../../keypair/EcKeyPair.js';
 import { BitcoinUtils } from '../../utils/BitcoinUtils.js';
-import { toXOnly } from '@btc-vision/bitcoin/src/psbt/bip371.js';
 export class SharedInteractionTransaction extends TransactionBuilder {
     constructor(parameters) {
         super(parameters);

package/build/transaction/builders/TransactionBuilder.js

@@ -1,5 +1,4 @@
-import { initEccLib, opcodes, Psbt, script, Transaction, } from '@btc-vision/bitcoin';
-import { varuint } from '@btc-vision/bitcoin/src/bufferutils.js';
+import { initEccLib, opcodes, Psbt, script, Transaction, varuint, } from '@btc-vision/bitcoin';
 import * as ecc from '@bitcoinerlab/secp256k1';
 import { EcKeyPair } from '../../keypair/EcKeyPair.js';
 import { AddressVerificator } from '../../keypair/AddressVerificator.js';
@@ -207,6 +206,16 @@ export class TransactionBuilder extends TweakedTransaction {
                     tapInternalKey: this.internalPubKeyToXOnly(),
                 });
             }
+            else if (AddressVerificator.isValidPublicKey(this.from, this.network)) {
+                const pubKeyScript = script.compile([
+                    Buffer.from(this.from.replace('0x', ''), 'hex'),
+                    opcodes.OP_CHECKSIG,
+                ]);
+                await this.setFeeOutput({
+                    value: Number(sendBackAmount),
+                    script: pubKeyScript,
+                });
+            }
             else {
                 await this.setFeeOutput({
                     value: Number(sendBackAmount),

package/build/transaction/shared/TweakedTransaction.js

@@ -1,10 +1,7 @@
 import { Logger } from '@btc-vision/logger';
-import { address as bitAddress, crypto as bitCrypto, getFinalScripts, opcodes, payments, script, } from '@btc-vision/bitcoin';
+import { address as bitAddress, crypto as bitCrypto, getFinalScripts, isP2MS, isP2PK, isP2PKH, isP2SHScript, isP2TR, isP2WPKH, isP2WSHScript, opcodes, payments, script, toXOnly, varuint, } from '@btc-vision/bitcoin';
 import { TweakedSigner } from '../../signer/TweakedSigner.js';
-import { toXOnly } from '@btc-vision/bitcoin/src/psbt/bip371.js';
-import { varuint } from '@btc-vision/bitcoin/src/bufferutils.js';
 import { canSignNonTaprootInput, isTaprootInput, pubkeyInScript, } from '../../signer/SignerUtils.js';
-import { isP2MS, isP2PK, isP2PKH, isP2SHScript, isP2TR, isP2WPKH, isP2WSHScript, } from '@btc-vision/bitcoin/src/psbt/psbtutils.js';
 export var TransactionSequence;
 (function (TransactionSequence) {
     TransactionSequence[TransactionSequence["REPLACE_BY_FEE"] = 4294967293] = "REPLACE_BY_FEE";

package/build/utils/BufferHelper.js

@@ -13,7 +13,7 @@ export class BufferHelper {
         return buffer;
     }
     static uint8ArrayToHex(input) {
-        return Buffer.from(input, 0, input.byteLength).toString('hex');
+        return Buffer.from(input.buffer, 0, input.byteLength).toString('hex');
     }
     static hexToUint8Array(input) {
         if (input.startsWith('0x')) {

package/build/verification/TapscriptVerificator.d.ts

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

package/build/verification/TapscriptVerificator.js

@@ -1,5 +1,4 @@
-import { crypto as bitCrypto, networks, payments } from '@btc-vision/bitcoin';
-import { toXOnly } from '@btc-vision/bitcoin/src/psbt/bip371.js';
+import { crypto as bitCrypto, networks, payments, toXOnly, } from '@btc-vision/bitcoin';
 import { DeploymentGenerator } from '../generators/builders/DeploymentGenerator.js';
 import { TransactionBuilder } from '../transaction/builders/TransactionBuilder.js';
 import { Address } from '../keypair/Address.js';

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@btc-vision/transaction",
     "type": "module",
-    "version": "1.1.17",
+    "version": "1.2.1",
     "author": "BlobMaster41",
     "description": "OPNet transaction library allows you to create and sign transactions for the OPNet network.",
     "engines": {
@@ -71,7 +71,7 @@
         "@babel/preset-flow": "^7.25.9",
         "@babel/preset-react": "^7.25.9",
         "@babel/preset-typescript": "^7.26.0",
-        "@types/node": "^22.8.7",
+        "@types/node": "^22.10.2",
         "@types/sha.js": "^2.4.4",
         "eslint": "^9.14.0",
         "gulp": "^5.0.0",
@@ -82,16 +82,14 @@
         "prettier": "^3.3.3",
         "stream-browserify": "^3.0.0",
         "stream-http": "^3.2.0",
-        "typedoc": "^0.26.11",
-        "typedoc-material-theme": "^1.1.0",
-        "typescript-eslint": "^8.13.0",
-        "webpack": "^5.96.1",
-        "webpack-cli": "^5.1.4"
+        "typedoc": "^0.27.6",
+        "typescript-eslint": "^8.19.0",
+        "webpack-cli": "^6.0.1"
     },
     "dependencies": {
         "@babel/plugin-proposal-object-rest-spread": "^7.20.7",
         "@bitcoinerlab/secp256k1": "^1.1.1",
-        "@btc-vision/bitcoin": "^6.3.1",
+        "@btc-vision/bitcoin": "^6.3.2",
         "@btc-vision/bsi-bitcoin-rpc": "^1.0.29",
         "@btc-vision/logger": "^1.0.6",
         "@eslint/js": "^9.14.0",
@@ -102,6 +100,7 @@
         "babel-preset-react": "^6.24.1",
         "babelify": "^10.0.0",
         "bech32": "^2.0.0",
+        "bip174": "^2.1.1",
         "bip32": "^5.0.0-rc.0",
         "browserify-zlib": "^0.2.0",
         "buffer": "^6.0.3",
@@ -113,6 +112,7 @@
         "sha.js": "^2.4.11",
         "ts-loader": "^9.5.1",
         "ts-node": "^10.9.2",
-        "typescript": "^5.6.3"
+        "typescript": "^5.7.2",
+        "webpack": "^5.97.1"
     }
 }

package/src/_version.ts

@@ -1 +1 @@
-export const version = '1.1.17';
+export const version = '1.2.1';

package/src/buffer/BinaryReader.ts

@@ -17,7 +17,7 @@ export class BinaryReader {
     private currentOffset: i32 = 0;
 
     constructor(bytes: BufferLike) {
-        this.buffer = new DataView(bytes.buffer);
+        this.buffer = new DataView(bytes.buffer, bytes.byteOffset, bytes.byteLength);
     }
 
     public static stringCompare(a: string, b: string): number {
@@ -37,7 +37,7 @@ export class BinaryReader {
     }
 
     public setBuffer(bytes: BufferLike): void {
-        this.buffer = new DataView(bytes.buffer);
+        this.buffer = new DataView(bytes.buffer, bytes.byteOffset, bytes.byteLength);
 
         this.currentOffset = 0;
     }

package/src/buffer/BinaryWriter.ts

@@ -354,7 +354,7 @@ export class BinaryWriter {
             buf[i] = this.buffer.getUint8(i);
         }
 
-        this.buffer = new DataView(buf.buffer);
+        this.buffer = new DataView(buf.buffer, buf.byteOffset, buf.byteLength);
     }
 
     private getDefaultBuffer(length: number = 0): DataView {

package/src/generators/AddressGenerator.ts

@@ -1,7 +1,6 @@
 import { bech32, bech32m } from 'bech32';
-import { initEccLib, Network } from '@btc-vision/bitcoin';
+import { initEccLib, Network, ripemd160 } from '@btc-vision/bitcoin';
 import * as ecc from '@bitcoinerlab/secp256k1';
-import { ripemd160 } from '@btc-vision/bitcoin/src/crypto.js';
 
 initEccLib(ecc);
 

package/src/generators/Generator.ts

@@ -1,5 +1,4 @@
-import { Network, networks } from '@btc-vision/bitcoin';
-import { toXOnly } from '@btc-vision/bitcoin/src/psbt/bip371.js';
+import { Network, networks, toXOnly } from '@btc-vision/bitcoin';
 
 /** Bitcoin Script Generator */
 export abstract class Generator {

package/src/generators/builders/MultiSignGenerator.ts

@@ -1,5 +1,4 @@
-import { opcodes, script } from '@btc-vision/bitcoin';
-import { toXOnly } from '@btc-vision/bitcoin/src/psbt/bip371.js';
+import { opcodes, script, toXOnly } from '@btc-vision/bitcoin';
 
 /**
  * Generate a bitcoin script for a multisign interaction

package/src/keypair/Address.ts

@@ -1,9 +1,9 @@
-import { Network } from '@btc-vision/bitcoin';
-import { toXOnly } from '@btc-vision/bitcoin/src/psbt/bip371.js';
+import { decompressPublicKey, Network, toXOnly, UncompressedPublicKey } from '@btc-vision/bitcoin';
 import { ECPairInterface } from 'ecpair';
 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 => {
@@ -19,6 +19,8 @@ export class Address extends Uint8Array {
     #network: Network | undefined;
     #originalPublicKey: Uint8Array | undefined;
     #keyPair: ECPairInterface | undefined;
+    #uncompressed: UncompressedPublicKey | undefined;
+    #tweakedUncompressed: Buffer | undefined;
 
     public constructor(bytes?: ArrayLike<number>) {
         super(ADDRESS_BYTE_LENGTH);
@@ -88,6 +90,19 @@ export class Address extends Uint8Array {
         return new Address(bytes);
     }
 
+    public static uncompressedToCompressed(publicKey: ArrayLike<number>): Buffer {
+        const buffer = Uint8Array.from(publicKey);
+
+        const x = buffer.slice(1, 33);
+        const y = buffer.slice(33);
+
+        const compressed = Buffer.alloc(33);
+        compressed[0] = 0x02 + (y[y.length - 1] & 0x01);
+        compressed.set(x, 1);
+
+        return compressed;
+    }
+
     /**
      * Converts the address to a hex string
      * @returns {string} The hex string
@@ -104,6 +119,38 @@ export class Address extends Uint8Array {
         return Buffer.from(this);
     }
 
+    public toUncompressedHex(): string {
+        if (!this.#uncompressed) {
+            throw new Error('Public key not set');
+        }
+
+        return '0x' + this.#uncompressed.uncompressed.toString('hex');
+    }
+
+    public toUncompressedBuffer(): Buffer {
+        if (!this.#uncompressed) {
+            throw new Error('Public key not set');
+        }
+
+        return this.#uncompressed.uncompressed;
+    }
+
+    public toHybridPublicKeyHex(): string {
+        if (!this.#uncompressed) {
+            throw new Error('Public key not set');
+        }
+
+        return '0x' + this.#uncompressed.hybrid.toString('hex');
+    }
+
+    public toHybridPublicKeyBuffer(): Buffer {
+        if (!this.#uncompressed) {
+            throw new Error('Public key not set');
+        }
+
+        return this.#uncompressed.hybrid;
+    }
+
     public originalPublicKeyBuffer(): Buffer {
         if (!this.#originalPublicKey) {
             throw new Error('Public key not set');
@@ -186,16 +233,11 @@ export class Address extends Uint8Array {
             const buf = Buffer.alloc(ADDRESS_BYTE_LENGTH);
             buf.set(publicKey);
 
+            this.#tweakedUncompressed = ContractAddress.generateHybridKeyFromHash(buf);
+
             super.set(publicKey);
         } else {
-            this.#originalPublicKey = Uint8Array.from(publicKey);
-            this.#keyPair = EcKeyPair.fromPublicKey(this.#originalPublicKey);
-
-            const tweakedBytes = toXOnly(
-                EcKeyPair.tweakPublicKey(Buffer.from(this.#originalPublicKey)),
-            );
-
-            super.set(tweakedBytes);
+            this.autoFormat(publicKey);
         }
     }
 
@@ -273,4 +315,43 @@ export class Address extends Uint8Array {
 
         throw new Error('Public key not set');
     }
+
+    public toTweakedHybridPublicKeyHex(): string {
+        if (!this.#tweakedUncompressed) {
+            throw new Error('Public key not set');
+        }
+
+        return '0x' + this.#tweakedUncompressed.toString('hex');
+    }
+
+    public toTweakedHybridPublicKeyBuffer(): Buffer {
+        if (!this.#tweakedUncompressed) {
+            throw new Error('Public key not set');
+        }
+
+        return this.#tweakedUncompressed;
+    }
+
+    private autoFormat(publicKey: ArrayLike<number>): void {
+        const firstByte = publicKey[0];
+
+        if (firstByte === 0x03 || firstByte === 0x02) {
+            // do nothing
+        } else if (firstByte === 0x04 || firstByte === 0x06 || firstByte === 0x07) {
+            // uncompressed
+            publicKey = Address.uncompressedToCompressed(publicKey);
+        }
+
+        this.#originalPublicKey = Uint8Array.from(publicKey);
+        this.#keyPair = EcKeyPair.fromPublicKey(this.#originalPublicKey);
+        this.#uncompressed = decompressPublicKey(this.#originalPublicKey);
+
+        const tweakedBytes: Buffer = toXOnly(
+            EcKeyPair.tweakPublicKey(Buffer.from(this.#originalPublicKey)),
+        );
+
+        this.#tweakedUncompressed = ContractAddress.generateHybridKeyFromHash(tweakedBytes);
+
+        super.set(tweakedBytes);
+    }
 }

package/src/keypair/AddressVerificator.ts

@@ -109,14 +109,18 @@ export class AddressVerificator {
                 return true;
             }
 
+            const pubKeyBuffer = Buffer.from(input, 'hex');
+            if ((input.length === 130 && pubKeyBuffer[0] === 0x06) || pubKeyBuffer[0] === 0x07) {
+                return true;
+            }
+
             if (input.length === 66 || input.length === 130) {
                 // Check if the input can be parsed as a valid public key
-                const pubKeyBuffer = Buffer.from(input, 'hex');
                 EcKeyPair.fromPublicKey(pubKeyBuffer, network);
 
                 return true;
             }
-        } catch {
+        } catch (e) {
             return false;
         }
 

package/src/keypair/EcKeyPair.ts

@@ -1,11 +1,18 @@
 import * as ecc from '@bitcoinerlab/secp256k1';
 import bip32, { BIP32API, BIP32Factory, BIP32Interface } from 'bip32';
-import { address, initEccLib, Network, networks, payments, Signer } from '@btc-vision/bitcoin';
+import {
+    address,
+    initEccLib,
+    Network,
+    networks,
+    payments,
+    Signer,
+    taggedHash,
+    toXOnly,
+} from '@btc-vision/bitcoin';
 import { ECPairAPI, ECPairFactory, ECPairInterface } from 'ecpair';
 import { IWallet } from './interfaces/IWallet.js';
 import { CURVE, ProjectivePoint as Point } from '@noble/secp256k1';
-import { taggedHash } from '@btc-vision/bitcoin/src/crypto.js';
-import { toXOnly } from '@btc-vision/bitcoin/src/psbt/bip371.js';
 
 initEccLib(ecc);
 
@@ -154,8 +161,10 @@ export class EcKeyPair {
         }
 
         // Convert the tweaked public key hex string to a Buffer
-        let tweakedPubKeyBuffer = Buffer.from(tweakedPubKeyHex, 'hex');
-        if (tweakedPubKeyBuffer.length !== 32) tweakedPubKeyBuffer = toXOnly(tweakedPubKeyBuffer);
+        let tweakedPubKeyBuffer: Buffer = Buffer.from(tweakedPubKeyHex, 'hex');
+        if (tweakedPubKeyBuffer.length !== 32) {
+            tweakedPubKeyBuffer = toXOnly(tweakedPubKeyBuffer);
+        }
 
         return EcKeyPair.tweakedPubKeyBufferToAddress(tweakedPubKeyBuffer, network);
     }

package/src/keypair/MessageSigner.ts

@@ -1,9 +1,8 @@
 import { ECPairInterface } from 'ecpair';
 import * as ecc from '@bitcoinerlab/secp256k1';
-import { crypto, Network } from '@btc-vision/bitcoin';
+import { crypto, Network, toXOnly } from '@btc-vision/bitcoin';
 import { TweakedSigner } from '../signer/TweakedSigner.js';
 import { EcKeyPair } from './EcKeyPair.js';
-import { toXOnly } from '@btc-vision/bitcoin/src/psbt/bip371.js';
 
 export interface SignedMessage {
     readonly signature: Uint8Array;