@btc-vision/transaction 1.4.0 → 1.5.1

package/build/transaction/builders/CustomScriptTransaction.js

@@ -1,4 +1,4 @@
-import { crypto as bitCrypto, toXOnly, } from '@btc-vision/bitcoin';
+import { crypto as bitCrypto, PaymentType, toXOnly, } from '@btc-vision/bitcoin';
 import { TransactionType } from '../enums/TransactionType.js';
 import { TransactionBuilder } from './TransactionBuilder.js';
 import { CustomGenerator } from '../../generators/builders/CustomGenerator.js';
@@ -12,14 +12,20 @@ export class CustomScriptTransaction extends TransactionBuilder {
         this.tapLeafScript = null;
         this.targetScriptRedeem = null;
         this.leftOverFundsScriptRedeem = null;
-        this.customFinalizer = (_inputIndex, _input) => {
+        this.customFinalizer = (_inputIndex, input) => {
             if (!this.tapLeafScript) {
                 throw new Error('Tap leaf script is required');
             }
-            const scriptSolution = this.witnesses;
+            const scriptSolution = this.getScriptSolution(input);
             const witness = scriptSolution
                 .concat(this.tapLeafScript.script)
                 .concat(this.tapLeafScript.controlBlock);
+            if (this.annexData && this.annexData.length > 0) {
+                const annex = this.annexData[0] === 0x50
+                    ? this.annexData
+                    : Buffer.concat([Buffer.from([0x50]), this.annexData]);
+                witness.push(annex);
+            }
             return {
                 finalScriptWitness: TransactionBuilder.witnessStackToScriptWitness(witness),
             };
@@ -86,7 +92,10 @@ export class CustomScriptTransaction extends TransactionBuilder {
         }
         for (let i = 0; i < transaction.data.inputs.length; i++) {
             if (i === 0) {
-                transaction.signInput(0, this.contractSigner);
+                try {
+                    transaction.signInput(0, this.contractSigner);
+                }
+                catch (e) { }
                 transaction.signInput(0, this.getSignerKey());
                 transaction.finalizeInput(0, this.customFinalizer);
             }
@@ -101,6 +110,7 @@ export class CustomScriptTransaction extends TransactionBuilder {
             internalPubkey: this.internalPubKeyToXOnly(),
             network: this.network,
             scriptTree: this.scriptTree,
+            name: PaymentType.P2TR,
         };
     }
     generateTapData() {
@@ -118,8 +128,21 @@ export class CustomScriptTransaction extends TransactionBuilder {
             network: this.network,
             scriptTree: this.scriptTree,
             redeem: selectedRedeem,
+            name: PaymentType.P2TR,
         };
     }
+    getScriptSolution(input) {
+        if (!input.tapScriptSig) {
+            throw new Error('Tap script signature is required');
+        }
+        const witnesses = [...this.witnesses];
+        if (input.tapScriptSig) {
+            for (const sig of input.tapScriptSig) {
+                witnesses.push(sig.signature);
+            }
+        }
+        return witnesses;
+    }
     getContractSeed() {
         return bitCrypto.hash256(this.randomBytes);
     }
@@ -132,12 +155,12 @@ export class CustomScriptTransaction extends TransactionBuilder {
     }
     generateRedeemScripts() {
         this.targetScriptRedeem = {
-            pubkeys: this.getPubKeys(),
+            name: PaymentType.P2TR,
             output: this.compiledTargetScript,
             redeemVersion: 192,
         };
         this.leftOverFundsScriptRedeem = {
-            pubkeys: this.getPubKeys(),
+            name: PaymentType.P2TR,
             output: this.getLeafScript(),
             redeemVersion: 192,
         };

package/build/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 '@btc-vision/bitcoin';
+import { P2TRPayment, Psbt } from '@btc-vision/bitcoin';
 import { TransactionBuilder } from './TransactionBuilder.js';
 import { TapLeafScript } from '../interfaces/Tap.js';
 import { Address } from '../../keypair/Address.js';
@@ -12,6 +12,7 @@ export declare class DeploymentTransaction extends TransactionBuilder<Transactio
     protected readonly rewardChallenge: IMineableReward;
     protected readonly _contractAddress: Address;
     protected tapLeafScript: TapLeafScript | null;
+    private readonly deploymentVersion;
     private targetScriptRedeem;
     private leftOverFundsScriptRedeem;
     private readonly compiledTargetScript;
@@ -23,18 +24,20 @@ export declare class DeploymentTransaction extends TransactionBuilder<Transactio
     private readonly contractSigner;
     private readonly _contractPubKey;
     private readonly randomBytes;
+    private _computedAddress;
     constructor(parameters: IDeploymentParameters);
     get contractPubKey(): string;
     get contractAddress(): Address;
     get p2trAddress(): string;
     getRndBytes(): Buffer;
     getPreimage(): Buffer;
+    getContractAddress(): string;
     protected contractSignerXOnlyPubKey(): Buffer;
     protected buildTransaction(): Promise<void>;
     protected signInputsWalletBased(transaction: Psbt): Promise<void>;
     protected signInputs(transaction: Psbt): Promise<void>;
-    protected generateScriptAddress(): Payment;
-    protected generateTapData(): Payment;
+    protected generateScriptAddress(): P2TRPayment;
+    protected generateTapData(): P2TRPayment;
     private verifyCalldata;
     private verifyBytecode;
     private getContractSeed;

package/build/transaction/builders/DeploymentTransaction.js

@@ -1,19 +1,19 @@
 import { TransactionType } from '../enums/TransactionType.js';
-import { crypto as bitCrypto, toXOnly, } from '@btc-vision/bitcoin';
+import { crypto as bitCrypto, PaymentType, toXOnly, } from '@btc-vision/bitcoin';
 import { MINIMUM_AMOUNT_CA, MINIMUM_AMOUNT_REWARD, TransactionBuilder, } from './TransactionBuilder.js';
-import { DeploymentGenerator } from '../../generators/builders/DeploymentGenerator.js';
+import { DeploymentGenerator, versionBuffer, } from '../../generators/builders/DeploymentGenerator.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';
 import { ChallengeGenerator } from '../mineable/ChallengeGenerator.js';
-const p = 0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2fn;
 export class DeploymentTransaction extends TransactionBuilder {
     constructor(parameters) {
         super(parameters);
         this.type = TransactionType.DEPLOYMENT;
         this.tapLeafScript = null;
+        this.deploymentVersion = 0x00;
         this.targetScriptRedeem = null;
         this.leftOverFundsScriptRedeem = null;
         this.customFinalizer = (_inputIndex, input) => {
@@ -35,7 +35,7 @@ export class DeploymentTransaction extends TransactionBuilder {
                 finalScriptWitness: TransactionBuilder.witnessStackToScriptWitness(witness),
             };
         };
-        this.bytecode = Compressor.compress(parameters.bytecode);
+        this.bytecode = Compressor.compress(Buffer.concat([versionBuffer, parameters.bytecode]));
         this.verifyBytecode();
         if (parameters.calldata) {
             this.calldata = parameters.calldata;
@@ -70,6 +70,13 @@ export class DeploymentTransaction extends TransactionBuilder {
     getPreimage() {
         return this.preimage;
     }
+    getContractAddress() {
+        if (this._computedAddress) {
+            return this._computedAddress;
+        }
+        this._computedAddress = EcKeyPair.p2op(this.contractSeed, this.network, this.deploymentVersion);
+        return this._computedAddress;
+    }
     contractSignerXOnlyPubKey() {
         return toXOnly(Buffer.from(this.contractSigner.publicKey));
     }
@@ -105,7 +112,7 @@ export class DeploymentTransaction extends TransactionBuilder {
         }
         this.addOutput({
             value: Number(amountToCA),
-            address: this.contractAddress.p2tr(this.network),
+            address: this.getContractAddress(),
         });
         if (amountToCA === MINIMUM_AMOUNT_CA &&
             amountSpent - MINIMUM_AMOUNT_CA > MINIMUM_AMOUNT_REWARD) {
@@ -162,6 +169,7 @@ export class DeploymentTransaction extends TransactionBuilder {
     }
     generateScriptAddress() {
         return {
+            name: PaymentType.P2TR,
             internalPubkey: this.internalPubKeyToXOnly(),
             network: this.network,
             scriptTree: this.scriptTree,
@@ -178,6 +186,7 @@ export class DeploymentTransaction extends TransactionBuilder {
             throw new Error('Script tree is required');
         }
         return {
+            name: PaymentType.P2TR,
             internalPubkey: this.internalPubKeyToXOnly(),
             network: this.network,
             scriptTree: this.scriptTree,
@@ -216,12 +225,12 @@ export class DeploymentTransaction extends TransactionBuilder {
     }
     generateRedeemScripts() {
         this.targetScriptRedeem = {
-            pubkeys: this.getPubKeys(),
+            name: PaymentType.P2TR,
             output: this.compiledTargetScript,
             redeemVersion: 192,
         };
         this.leftOverFundsScriptRedeem = {
-            pubkeys: this.getPubKeys(),
+            name: PaymentType.P2TR,
             output: this.getLeafScript(),
             redeemVersion: 192,
         };

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

@@ -1,4 +1,4 @@
-import { Payment, Psbt, PsbtInput, Signer, TapScriptSig, Taptree } from '@btc-vision/bitcoin';
+import { P2TRPayment, 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';
@@ -21,8 +21,8 @@ export declare class MultiSignTransaction extends TransactionBuilder<Transaction
     static readonly signHashTypesArray: number[];
     static readonly numsPoint: Buffer<ArrayBuffer>;
     type: TransactionType.MULTI_SIG;
-    protected targetScriptRedeem: Payment | null;
-    protected leftOverFundsScriptRedeem: Payment | null;
+    protected targetScriptRedeem: P2TRPayment | null;
+    protected leftOverFundsScriptRedeem: P2TRPayment | null;
     protected readonly compiledTargetScript: Buffer;
     protected readonly scriptTree: Taptree;
     protected readonly publicKeys: Buffer[];
@@ -49,8 +49,8 @@ export declare class MultiSignTransaction extends TransactionBuilder<Transaction
     protected buildTransaction(): Promise<void>;
     protected internalBuildTransaction(transaction: Psbt, checkPartialSigs?: boolean): Promise<boolean>;
     protected signInputs(_transaction: Psbt): Promise<void>;
-    protected generateScriptAddress(): Payment;
-    protected generateTapData(): Payment;
+    protected generateScriptAddress(): P2TRPayment;
+    protected generateTapData(): P2TRPayment;
     protected getScriptSolution(input: PsbtInput): Buffer[];
     protected getScriptTree(): Taptree;
     private getTotalOutputAmount;

package/build/transaction/builders/MultiSignTransaction.js

@@ -1,4 +1,4 @@
-import { crypto as bitcoinCrypto, opcodes, Psbt, script, toXOnly, } from '@btc-vision/bitcoin';
+import { crypto as bitcoinCrypto, opcodes, PaymentType, 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';
@@ -256,6 +256,7 @@ export class MultiSignTransaction extends TransactionBuilder {
             internalPubkey: toXOnly(MultiSignTransaction.numsPoint),
             network: this.network,
             scriptTree: this.scriptTree,
+            name: PaymentType.P2TR,
         };
     }
     generateTapData() {
@@ -271,6 +272,7 @@ export class MultiSignTransaction extends TransactionBuilder {
             network: this.network,
             scriptTree: this.scriptTree,
             redeem: selectedRedeem,
+            name: PaymentType.P2TR,
         };
     }
     getScriptSolution(input) {
@@ -307,10 +309,12 @@ export class MultiSignTransaction extends TransactionBuilder {
     }
     generateRedeemScripts() {
         this.targetScriptRedeem = {
+            name: PaymentType.P2TR,
             output: this.compiledTargetScript,
             redeemVersion: 192,
         };
         this.leftOverFundsScriptRedeem = {
+            name: PaymentType.P2TR,
             output: MultiSignTransaction.LOCK_LEAF_SCRIPT,
             redeemVersion: 192,
         };

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

@@ -1,4 +1,4 @@
-import { Payment, Psbt, PsbtInput, Signer, Taptree } from '@btc-vision/bitcoin';
+import { P2TRPayment, Psbt, PsbtInput, Signer, Taptree } from '@btc-vision/bitcoin';
 import { ECPairInterface } from 'ecpair';
 import { TransactionBuilder } from './TransactionBuilder.js';
 import { TransactionType } from '../enums/TransactionType.js';
@@ -8,8 +8,8 @@ import { IMineableReward } from '../mineable/ChallengeGenerator.js';
 export declare abstract class SharedInteractionTransaction<T extends TransactionType> extends TransactionBuilder<T> {
     static readonly MAXIMUM_CALLDATA_SIZE: number;
     readonly randomBytes: Buffer;
-    protected targetScriptRedeem: Payment | null;
-    protected leftOverFundsScriptRedeem: Payment | null;
+    protected targetScriptRedeem: P2TRPayment | null;
+    protected leftOverFundsScriptRedeem: P2TRPayment | null;
     protected abstract readonly compiledTargetScript: Buffer;
     protected abstract readonly scriptTree: Taptree;
     protected readonly preimage: Buffer;
@@ -28,8 +28,8 @@ export declare abstract class SharedInteractionTransaction<T extends Transaction
     protected generateKeyPairFromSeed(): ECPairInterface;
     protected buildTransaction(): Promise<void>;
     protected signInputs(transaction: Psbt): Promise<void>;
-    protected generateScriptAddress(): Payment;
-    protected generateTapData(): Payment;
+    protected generateScriptAddress(): P2TRPayment;
+    protected generateTapData(): P2TRPayment;
     protected getScriptSolution(input: PsbtInput): Buffer[];
     protected getScriptTree(): Taptree;
     protected customFinalizer: (_inputIndex: number, input: PsbtInput) => {

package/build/transaction/builders/SharedInteractionTransaction.js

@@ -1,4 +1,4 @@
-import { address, toXOnly } from '@btc-vision/bitcoin';
+import { address, PaymentType, toXOnly } from '@btc-vision/bitcoin';
 import { MINIMUM_AMOUNT_CA, MINIMUM_AMOUNT_REWARD, TransactionBuilder } from './TransactionBuilder.js';
 import { CalldataGenerator } from '../../generators/builders/CalldataGenerator.js';
 import { Compressor } from '../../bytecode/Compressor.js';
@@ -102,6 +102,7 @@ export class SharedInteractionTransaction extends TransactionBuilder {
             internalPubkey: this.internalPubKeyToXOnly(),
             network: this.network,
             scriptTree: this.scriptTree,
+            name: PaymentType.P2TR,
         };
     }
     generateTapData() {
@@ -119,6 +120,7 @@ export class SharedInteractionTransaction extends TransactionBuilder {
             network: this.network,
             scriptTree: this.scriptTree,
             redeem: selectedRedeem,
+            name: PaymentType.P2TR,
         };
     }
     getScriptSolution(input) {
@@ -219,10 +221,12 @@ export class SharedInteractionTransaction extends TransactionBuilder {
     }
     generateRedeemScripts() {
         this.targetScriptRedeem = {
+            name: PaymentType.P2TR,
             output: this.compiledTargetScript,
             redeemVersion: 192,
         };
         this.leftOverFundsScriptRedeem = {
+            name: PaymentType.P2TR,
             output: SharedInteractionTransaction.LOCK_LEAF_SCRIPT,
             redeemVersion: 192,
         };

package/build/transaction/builders/TransactionBuilder.js

@@ -5,7 +5,7 @@ import { AddressVerificator } from '../../keypair/AddressVerificator.js';
 import { TweakedTransaction } from '../shared/TweakedTransaction.js';
 initEccLib(ecc);
 export const MINIMUM_AMOUNT_REWARD = 540n;
-export const MINIMUM_AMOUNT_CA = 330n;
+export const MINIMUM_AMOUNT_CA = 297n;
 export class TransactionBuilder extends TweakedTransaction {
     constructor(parameters) {
         super(parameters);
@@ -386,6 +386,7 @@ export class TransactionBuilder extends TweakedTransaction {
     }
 }
 TransactionBuilder.LOCK_LEAF_SCRIPT = script.compile([
-    opcodes.OP_0,
+    opcodes.OP_FALSE,
+    opcodes.OP_VERIFY,
 ]);
 TransactionBuilder.MINIMUM_DUST = 50n;

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

@@ -1,5 +1,5 @@
 import { Logger } from '@btc-vision/logger';
-import { Network, Payment, Psbt, PsbtInput, PsbtInputExtended, Signer, Transaction } from '@btc-vision/bitcoin';
+import { Network, P2TRPayment, 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';
@@ -24,8 +24,8 @@ export declare abstract class TweakedTransaction extends Logger {
     protected signed: boolean;
     protected abstract readonly transaction: Psbt;
     protected sighashTypes: number[] | undefined;
-    protected scriptData: Payment | null;
-    protected tapData: Payment | null;
+    protected scriptData: P2TRPayment | null;
+    protected tapData: P2TRPayment | null;
     protected readonly inputs: PsbtInputExtended[];
     protected sequence: number;
     protected tapLeafScript: TapLeafScript | null;
@@ -45,8 +45,8 @@ export declare abstract class TweakedTransaction extends Logger {
     disableRBF(): void;
     getTweakerHash(): Buffer | undefined;
     preEstimateTransactionFees(feeRate: bigint, numInputs: bigint, numOutputs: bigint, numSignatures: bigint, numPubkeys: bigint): bigint;
-    protected generateTapData(): Payment;
-    protected generateScriptAddress(): Payment;
+    protected generateTapData(): P2TRPayment;
+    protected generateScriptAddress(): P2TRPayment;
     protected getSignerKey(): Signer | ECPairInterface;
     protected signInput(transaction: Psbt, input: PsbtInput, i: number, signer: Signer | ECPairInterface, reverse?: boolean, errored?: boolean): Promise<void>;
     protected splitArray<T>(arr: T[], chunkSize: number): T[][];

package/build/transaction/shared/TweakedTransaction.js

@@ -1,5 +1,5 @@
 import { Logger } from '@btc-vision/logger';
-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 { address as bitAddress, crypto as bitCrypto, getFinalScripts, isP2MS, isP2PK, isP2PKH, isP2SHScript, isP2TR, isP2WPKH, isP2WSHScript, opcodes, payments, PaymentType, script, toXOnly, varuint, } from '@btc-vision/bitcoin';
 import { TweakedSigner } from '../../signer/TweakedSigner.js';
 import { canSignNonTaprootInput, isTaprootInput, pubkeyInScript, } from '../../signer/SignerUtils.js';
 export var TransactionSequence;
@@ -47,8 +47,8 @@ export class TweakedTransaction extends Logger {
         }
         function readVarInt() {
             const varint = varuint.decode(Buffer, offset);
-            offset += varuint.decode.bytes;
-            return varint;
+            offset += varint.bytes;
+            return varint.numberValue || 0;
         }
         function readVarSlice() {
             const len = readVarInt();
@@ -140,12 +140,14 @@ export class TweakedTransaction extends Logger {
         return {
             internalPubkey: this.internalPubKeyToXOnly(),
             network: this.network,
+            name: PaymentType.P2TR,
         };
     }
     generateScriptAddress() {
         return {
             internalPubkey: this.internalPubKeyToXOnly(),
             network: this.network,
+            name: PaymentType.P2TR,
         };
     }
     getSignerKey() {

package/build/verification/TapscriptVerificator.js

@@ -37,7 +37,6 @@ export class TapscriptVerificator {
             network: network,
             scriptTree: scriptTree,
             redeem: {
-                pubkeys: [params.deployerPubKey, params.contractSaltPubKey],
                 output: compiledTargetScript,
                 redeemVersion: TapscriptVerificator.TAP_SCRIPT_VERSION,
             },

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@btc-vision/transaction",
     "type": "module",
-    "version": "1.4.0",
+    "version": "1.5.1",
     "author": "BlobMaster41",
     "description": "OPNet transaction library allows you to create and sign transactions for the OPNet network.",
     "engines": {
@@ -64,16 +64,16 @@
         "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.26.9",
+        "@babel/core": "^7.27.3",
         "@babel/plugin-proposal-class-properties": "^7.18.6",
-        "@babel/plugin-transform-runtime": "^7.26.9",
-        "@babel/preset-env": "^7.26.9",
-        "@babel/preset-flow": "^7.25.9",
-        "@babel/preset-react": "^7.26.3",
-        "@babel/preset-typescript": "^7.26.0",
-        "@types/node": "^22.13.10",
+        "@babel/plugin-transform-runtime": "^7.27.3",
+        "@babel/preset-env": "^7.27.2",
+        "@babel/preset-flow": "^7.27.1",
+        "@babel/preset-react": "^7.27.1",
+        "@babel/preset-typescript": "^7.27.1",
+        "@types/node": "^22.15.26",
         "@types/sha.js": "^2.4.4",
-        "eslint": "^9.22.0",
+        "eslint": "^9.27.0",
         "gulp": "^5.0.0",
         "gulp-cached": "^1.1.1",
         "gulp-typescript": "^6.0.0-alpha.1",
@@ -82,20 +82,20 @@
         "prettier": "^3.5.3",
         "stream-browserify": "^3.0.0",
         "stream-http": "^3.2.0",
-        "typedoc": "^0.27.9",
-        "typescript-eslint": "^8.26.0",
+        "typedoc": "^0.28.5",
+        "typescript-eslint": "^8.33.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.6",
-        "@btc-vision/bitcoin-rpc": "^1.0.0",
+        "@btc-vision/bitcoin": "^6.4.5",
+        "@btc-vision/bitcoin-rpc": "^1.0.1",
         "@btc-vision/logger": "^1.0.6",
-        "@eslint/js": "^9.22.0",
-        "@noble/secp256k1": "^2.1.0",
+        "@eslint/js": "^9.27.0",
+        "@noble/secp256k1": "^2.2.3",
         "assert": "^2.1.0",
-        "babel-loader": "^9.2.1",
+        "babel-loader": "^10.0.0",
         "babel-plugin-transform-import-meta": "^2.3.2",
         "babel-preset-react": "^6.24.1",
         "babelify": "^10.0.0",
@@ -112,7 +112,7 @@
         "sha.js": "^2.4.11",
         "ts-loader": "^9.5.2",
         "ts-node": "^10.9.2",
-        "typescript": "^5.7.3",
-        "webpack": "^5.98.0"
+        "typescript": "^5.8.3",
+        "webpack": "^5.99.9"
     }
 }

package/src/buffer/BinaryReader.ts

@@ -182,7 +182,7 @@ export class BinaryReader {
      * Reads a string of the given length in raw bytes. By default, do NOT zero-stop
      * (matching how we wrote the raw bytes).
      */
-    public readString(length: u16): string {
+    public readString(length: u32): string {
         const textDecoder = new TextDecoder();
         const bytes = this.readBytes(length, false);
         return textDecoder.decode(bytes);
@@ -192,7 +192,7 @@ export class BinaryReader {
      * Reads a string that was written as [u16 length][raw bytes].
      */
     public readStringWithLength(be: boolean = true): string {
-        const length = this.readU16(be);
+        const length = this.readU32(be);
         return this.readString(length);
     }
 

package/src/buffer/BinaryWriter.ts

@@ -160,9 +160,9 @@ export class BinaryWriter {
     }
 
     public writeStringWithLength(value: string): void {
-        this.allocSafe(U16_BYTE_LENGTH + value.length);
+        this.allocSafe(U32_BYTE_LENGTH + value.length);
 
-        this.writeU16(value.length);
+        this.writeU32(value.length);
         this.writeString(value);
     }
 

package/src/generators/builders/DeploymentGenerator.ts

@@ -2,6 +2,9 @@ import { crypto, Network, networks, opcodes, script } from '@btc-vision/bitcoin'
 import { Generator } from '../Generator.js';
 import { Feature, Features } from '../Features.js';
 
+export const OPNET_DEPLOYMENT_VERSION = 0x00;
+export const versionBuffer = Buffer.from([OPNET_DEPLOYMENT_VERSION]);
+
 export class DeploymentGenerator extends Generator {
     constructor(
         senderPubKey: Buffer,
@@ -52,6 +55,7 @@ export class DeploymentGenerator extends Generator {
         if (!this.contractSaltPubKey) throw new Error('Contract salt public key not set');
 
         const dataChunks: Buffer[][] = this.splitBufferIntoChunks(contractBytecode);
+
         const calldataChunks: Buffer[][] = calldata ? this.splitBufferIntoChunks(calldata) : [];
 
         const featuresList: Features[] = [];

package/src/keypair/Address.ts

@@ -12,6 +12,7 @@ import { BitcoinUtils } from '../utils/BitcoinUtils.js';
  */
 export class Address extends Uint8Array {
     #p2tr: string | undefined;
+    #p2op: string | undefined;
     #network: Network | undefined;
     #originalPublicKey: Uint8Array | undefined;
     #keyPair: ECPairInterface | undefined;
@@ -316,6 +317,26 @@ export class Address extends Uint8Array {
         throw new Error('Public key not set');
     }
 
+    /**
+     * Get an opnet address encoded in bech32m format.
+     * @param network
+     */
+    public p2op(network: Network): string {
+        if (this.#p2op && this.#network === network) {
+            return this.#p2op;
+        }
+
+        const p2opAddy: string | undefined = EcKeyPair.p2op(this, network);
+        if (p2opAddy) {
+            this.#network = network;
+            this.#p2op = p2opAddy;
+
+            return p2opAddy;
+        }
+
+        throw new Error('Public key not set');
+    }
+
     public toTweakedHybridPublicKeyHex(): string {
         if (!this.#tweakedUncompressed) {
             throw new Error('Public key not set');

package/src/keypair/AddressVerificator.ts

@@ -7,6 +7,7 @@ initEccLib(ecc);
 
 export enum AddressTypes {
     P2PKH = 'P2PKH',
+    P2OP = 'P2OP',
     P2SH_OR_P2SH_P2WPKH = 'P2SH_OR_P2SH-P2WPKH',
     P2PK = 'P2PK',
     P2TR = 'P2TR',
@@ -169,11 +170,11 @@ export class AddressVerificator {
         try {
             // First, try to decode as a Base58Check address (P2PKH, P2SH, or P2SH-P2WPKH)
             const decodedBase58 = address.fromBase58Check(addy);
-
             if (decodedBase58.version === network.pubKeyHash) {
                 // P2PKH: Legacy address (starting with '1' for mainnet, 'm/n' for testnet)
                 return AddressTypes.P2PKH;
             }
+
             if (decodedBase58.version === network.scriptHash) {
                 // P2SH: Could be P2SH (general) or P2SH-P2WPKH (wrapped SegWit)
                 return AddressTypes.P2SH_OR_P2SH_P2WPKH;
@@ -183,12 +184,16 @@ export class AddressVerificator {
         try {
             // Try to decode as a Bech32 or Bech32m address (P2WPKH or P2TR)
             const decodedBech32 = address.fromBech32(addy);
+            if (decodedBech32.prefix === network.bech32Opnet && decodedBech32.version === 16) {
+                return AddressTypes.P2OP;
+            }
 
             if (decodedBech32.prefix === network.bech32) {
                 // P2WPKH: SegWit address (starting with 'bc1q' for mainnet, 'tb1q' for testnet)
                 if (decodedBech32.version === 0 && decodedBech32.data.length === 20) {
                     return AddressTypes.P2WPKH;
                 }
+
                 // P2TR: Taproot address (starting with 'bc1p' for mainnet, 'tb1p' for testnet)
                 if (decodedBech32.version === 1 && decodedBech32.data.length === 32) {
                     return AddressTypes.P2TR;