@btc-vision/transaction 1.7.16 → 1.7.17

package/build/_version.d.ts

@@ -1 +1 @@
-export declare const version = "1.7.16";
+export declare const version = "1.7.17";

package/build/_version.js

@@ -1 +1 @@
-export const version = '1.7.16';
+export const version = '1.7.17';

package/build/generators/Generator.d.ts

@@ -1,4 +1,5 @@
 import { Network } from '@btc-vision/bitcoin';
+import { BinaryWriter } from '../buffer/BinaryWriter.js';
 import { Feature, Features } from './Features.js';
 export declare abstract class Generator {
     static readonly DATA_CHUNK_SIZE: number;
@@ -12,7 +13,7 @@ export declare abstract class Generator {
     getHeader(maxPriority: bigint, features?: Features[]): Buffer;
     abstract compile(...args: unknown[]): Buffer;
     protected splitBufferIntoChunks(buffer: Buffer, chunkSize?: number): Array<Buffer[]>;
-    protected encodeFeature(feature: Feature<Features>): Buffer[][];
+    protected encodeFeature(feature: Feature<Features>, finalBuffer: BinaryWriter): void;
     private encodeAccessListFeature;
     private encodeChallengeSubmission;
     private encodeLinkRequest;

package/build/generators/Generator.js

@@ -38,22 +38,22 @@ export class Generator {
         }
         return chunks;
     }
-    encodeFeature(feature) {
+    encodeFeature(feature, finalBuffer) {
         switch (feature.opcode) {
             case Features.ACCESS_LIST: {
-                return this.splitBufferIntoChunks(this.encodeAccessListFeature(feature));
+                return this.encodeAccessListFeature(feature, finalBuffer);
             }
             case Features.EPOCH_SUBMISSION: {
-                return this.splitBufferIntoChunks(this.encodeChallengeSubmission(feature));
+                return this.encodeChallengeSubmission(feature, finalBuffer);
             }
             case Features.MLDSA_LINK_PUBKEY: {
-                return this.splitBufferIntoChunks(this.encodeLinkRequest(feature));
+                return this.encodeLinkRequest(feature, finalBuffer);
             }
             default:
                 throw new Error(`Unknown feature type: ${feature.opcode}`);
         }
     }
-    encodeAccessListFeature(feature) {
+    encodeAccessListFeature(feature, finalBuffer) {
         const writer = new BinaryWriter();
         writer.writeU16(Object.keys(feature.data).length);
         for (const contract in feature.data) {
@@ -69,9 +69,9 @@ export class Generator {
                 writer.writeBytes(pointerBuffer);
             }
         }
-        return Compressor.compress(Buffer.from(writer.getBuffer()));
+        finalBuffer.writeBytesWithLength(Compressor.compress(Buffer.from(writer.getBuffer())));
     }
-    encodeChallengeSubmission(feature) {
+    encodeChallengeSubmission(feature, finalBuffer) {
         if ('verifySignature' in feature.data && !feature.data.verifySignature()) {
             throw new Error('Invalid signature in challenge submission feature');
         }
@@ -81,9 +81,9 @@ export class Generator {
         if (feature.data.graffiti) {
             writer.writeBytesWithLength(feature.data.graffiti);
         }
-        return Buffer.from(writer.getBuffer());
+        finalBuffer.writeBytesWithLength(writer.getBuffer());
     }
-    encodeLinkRequest(feature) {
+    encodeLinkRequest(feature, finalBuffer) {
         const data = feature.data;
         const writer = new BinaryWriter();
         writer.writeU8(data.level);
@@ -100,7 +100,7 @@ export class Generator {
             throw new Error('Legacy signature must be exactly 64 bytes');
         }
         writer.writeBytes(data.legacySignature);
-        return Buffer.from(writer.getBuffer());
+        finalBuffer.writeBytesWithLength(writer.getBuffer());
     }
 }
 Generator.DATA_CHUNK_SIZE = 512;

package/build/generators/builders/CalldataGenerator.js

@@ -2,6 +2,7 @@ import { crypto, networks, opcodes, script } from '@btc-vision/bitcoin';
 import { Compressor } from '../../bytecode/Compressor.js';
 import { EcKeyPair } from '../../keypair/EcKeyPair.js';
 import { Generator } from '../Generator.js';
+import { BinaryWriter } from '../../buffer/BinaryWriter.js';
 export class CalldataGenerator extends Generator {
     constructor(senderPubKey, contractSaltPubKey, network = networks.bitcoin) {
         super(senderPubKey, contractSaltPubKey, network);
@@ -32,15 +33,15 @@ export class CalldataGenerator extends Generator {
             throw new Error('No data chunks found');
         const featuresList = [];
         const featureData = [];
-        const features = featuresRaw.sort((a, b) => a.priority - b.priority);
-        if (features.length) {
+        if (featuresRaw && featuresRaw.length) {
+            const features = featuresRaw.sort((a, b) => a.priority - b.priority);
+            const finalBuffer = new BinaryWriter();
             for (let i = 0; i < features.length; i++) {
                 const feature = features[i];
                 featuresList.push(feature.opcode);
-                const data = this.encodeFeature(feature);
-                featureData.push(...data);
-                featureData.push(opcodes.OP_0);
+                this.encodeFeature(feature, finalBuffer);
             }
+            featureData.push(...this.splitBufferIntoChunks(Buffer.from(finalBuffer.getBuffer())));
         }
         let compiledData = [
             this.getHeader(maxPriority, featuresList),

package/build/generators/builders/DeploymentGenerator.js

@@ -1,5 +1,6 @@
 import { crypto, networks, opcodes, script } from '@btc-vision/bitcoin';
 import { Generator } from '../Generator.js';
+import { BinaryWriter } from '../../buffer/BinaryWriter.js';
 export const OPNET_DEPLOYMENT_VERSION = 0x00;
 export const versionBuffer = Buffer.from([OPNET_DEPLOYMENT_VERSION]);
 export class DeploymentGenerator extends Generator {
@@ -22,15 +23,15 @@ export class DeploymentGenerator extends Generator {
         const calldataChunks = calldata ? this.splitBufferIntoChunks(calldata) : [];
         const featuresList = [];
         const featureData = [];
-        if (featuresRaw) {
+        if (featuresRaw && featuresRaw.length) {
             const features = featuresRaw.sort((a, b) => a.priority - b.priority);
+            const finalBuffer = new BinaryWriter();
             for (let i = 0; i < features.length; i++) {
                 const feature = features[i];
                 featuresList.push(feature.opcode);
-                const data = this.encodeFeature(feature);
-                featureData.push(...data);
-                featureData.push(opcodes.OP_0);
+                this.encodeFeature(feature, finalBuffer);
             }
+            featureData.push(...this.splitBufferIntoChunks(Buffer.from(finalBuffer.getBuffer())));
         }
         const compiledData = [
             this.getHeader(maxPriority, featuresList),

package/build/generators/builders/LegacyCalldataGenerator.js

@@ -2,6 +2,7 @@ import { crypto, networks, opcodes, script } from '@btc-vision/bitcoin';
 import { Compressor } from '../../bytecode/Compressor.js';
 import { EcKeyPair } from '../../keypair/EcKeyPair.js';
 import { Generator } from '../Generator.js';
+import { BinaryWriter } from '../../buffer/BinaryWriter.js';
 export class LegacyCalldataGenerator extends Generator {
     constructor(senderPubKey, network = networks.bitcoin) {
         super(senderPubKey, Buffer.alloc(0), network);
@@ -30,15 +31,15 @@ export class LegacyCalldataGenerator extends Generator {
             throw new Error('No data chunks found');
         const featuresList = [];
         const featureData = [];
-        const features = featuresRaw.sort((a, b) => a.priority - b.priority);
-        if (features.length) {
+        if (featuresRaw && featuresRaw.length) {
+            const features = featuresRaw.sort((a, b) => a.priority - b.priority);
+            const finalBuffer = new BinaryWriter();
             for (let i = 0; i < features.length; i++) {
                 const feature = features[i];
                 featuresList.push(feature.opcode);
-                const data = this.encodeFeature(feature);
-                featureData.push(...data);
-                featureData.push(opcodes.OP_0);
+                this.encodeFeature(feature, finalBuffer);
             }
+            featureData.push(...this.splitBufferIntoChunks(Buffer.from(finalBuffer.getBuffer())));
         }
         let compiledData = [
             this.getHeader(maxPriority, featuresList),

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

@@ -9,5 +9,4 @@ export declare class P2WDAGenerator extends Generator {
     compile(calldata: Buffer, contractSecret: Buffer, challenge: ChallengeSolution, maxPriority: bigint, featuresRaw?: Feature<Features>[]): Buffer;
     getHeader(maxPriority: bigint, features?: Features[]): Buffer;
     private writeFeatures;
-    private encodeFeatureData;
 }

package/build/generators/builders/P2WDAGenerator.js

@@ -1,6 +1,5 @@
 import { networks } from '@btc-vision/bitcoin';
 import { BinaryWriter } from '../../buffer/BinaryWriter.js';
-import { Features } from '../Features.js';
 import { Generator } from '../Generator.js';
 export class P2WDAGenerator extends Generator {
     constructor(senderPubKey, contractSaltPubKey, network = networks.bitcoin) {
@@ -40,23 +39,7 @@ export class P2WDAGenerator extends Generator {
         writer.writeU16(features.length);
         for (const feature of features) {
             writer.writeU8(feature.opcode);
-            const encodedData = this.encodeFeatureData(feature);
-            writer.writeU32(encodedData.length);
-            writer.writeBytes(encodedData);
-        }
-    }
-    encodeFeatureData(feature) {
-        switch (feature.opcode) {
-            case Features.ACCESS_LIST: {
-                const chunks = this.encodeFeature(feature);
-                return Buffer.concat(chunks.flat());
-            }
-            case Features.EPOCH_SUBMISSION: {
-                const chunks = this.encodeFeature(feature);
-                return Buffer.concat(chunks.flat());
-            }
-            default:
-                throw new Error(`Unknown feature type: ${feature.opcode}`);
+            this.encodeFeature(feature, writer);
         }
     }
 }

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@btc-vision/transaction",
     "type": "module",
-    "version": "1.7.16",
+    "version": "1.7.17",
     "author": "BlobMaster41",
     "description": "OPNet transaction library allows you to create and sign transactions for the OPNet network.",
     "engines": {

package/src/_version.ts

@@ -1 +1 @@
-export const version = '1.7.16';
+export const version = '1.7.17';

package/src/generators/Generator.ts

@@ -105,29 +105,26 @@ export abstract class Generator {
         return chunks;
     }
 
-    protected encodeFeature(feature: Feature<Features>): Buffer[][] {
+    protected encodeFeature(feature: Feature<Features>, finalBuffer: BinaryWriter): void {
         switch (feature.opcode) {
             case Features.ACCESS_LIST: {
-                return this.splitBufferIntoChunks(
-                    this.encodeAccessListFeature(feature as AccessListFeature),
-                );
+                return this.encodeAccessListFeature(feature as AccessListFeature, finalBuffer);
             }
             case Features.EPOCH_SUBMISSION: {
-                return this.splitBufferIntoChunks(
-                    this.encodeChallengeSubmission(feature as EpochSubmissionFeature),
+                return this.encodeChallengeSubmission(
+                    feature as EpochSubmissionFeature,
+                    finalBuffer,
                 );
             }
             case Features.MLDSA_LINK_PUBKEY: {
-                return this.splitBufferIntoChunks(
-                    this.encodeLinkRequest(feature as MLDSALinkRequest),
-                );
+                return this.encodeLinkRequest(feature as MLDSALinkRequest, finalBuffer);
             }
             default:
                 throw new Error(`Unknown feature type: ${feature.opcode}`);
         }
     }
 
-    private encodeAccessListFeature(feature: AccessListFeature): Buffer {
+    private encodeAccessListFeature(feature: AccessListFeature, finalBuffer: BinaryWriter): void {
         const writer = new BinaryWriter();
 
         writer.writeU16(Object.keys(feature.data).length);
@@ -150,10 +147,13 @@ export abstract class Generator {
             }
         }
 
-        return Compressor.compress(Buffer.from(writer.getBuffer()));
+        finalBuffer.writeBytesWithLength(Compressor.compress(Buffer.from(writer.getBuffer())));
     }
 
-    private encodeChallengeSubmission(feature: EpochSubmissionFeature): Buffer {
+    private encodeChallengeSubmission(
+        feature: EpochSubmissionFeature,
+        finalBuffer: BinaryWriter,
+    ): void {
         if ('verifySignature' in feature.data && !feature.data.verifySignature()) {
             throw new Error('Invalid signature in challenge submission feature');
         }
@@ -166,10 +166,10 @@ export abstract class Generator {
             writer.writeBytesWithLength(feature.data.graffiti);
         }
 
-        return Buffer.from(writer.getBuffer());
+        finalBuffer.writeBytesWithLength(writer.getBuffer());
     }
 
-    private encodeLinkRequest(feature: MLDSALinkRequest): Buffer {
+    private encodeLinkRequest(feature: MLDSALinkRequest, finalBuffer: BinaryWriter): void {
         const data = feature.data;
 
         const writer = new BinaryWriter();
@@ -194,6 +194,6 @@ export abstract class Generator {
 
         writer.writeBytes(data.legacySignature);
 
-        return Buffer.from(writer.getBuffer());
+        finalBuffer.writeBytesWithLength(writer.getBuffer());
     }
 }

package/src/generators/builders/CalldataGenerator.ts

@@ -5,6 +5,7 @@ import { EcKeyPair } from '../../keypair/EcKeyPair.js';
 import { Feature, Features } from '../Features.js';
 import { Generator } from '../Generator.js';
 import { ChallengeSolution } from '../../epoch/ChallengeSolution.js';
+import { BinaryWriter } from '../../buffer/BinaryWriter.js';
 
 /**
  * Class to generate bitcoin script for interaction transactions
@@ -78,18 +79,20 @@ export class CalldataGenerator extends Generator {
         const featuresList: Features[] = [];
         const featureData: (number | Buffer | Buffer[])[] = [];
 
-        const features: Feature<Features>[] = featuresRaw.sort((a, b) => a.priority - b.priority);
-        if (features.length) {
+        if (featuresRaw && featuresRaw.length) {
+            const features: Feature<Features>[] = featuresRaw.sort(
+                (a, b) => a.priority - b.priority,
+            );
+
+            const finalBuffer = new BinaryWriter();
             for (let i = 0; i < features.length; i++) {
                 const feature = features[i];
                 featuresList.push(feature.opcode);
 
-                const data = this.encodeFeature(feature);
-                featureData.push(...data);
-
-                // Separator between features so decoder knows where each ends
-                featureData.push(opcodes.OP_0);
+                this.encodeFeature(feature, finalBuffer);
             }
+
+            featureData.push(...this.splitBufferIntoChunks(Buffer.from(finalBuffer.getBuffer())));
         }
 
         let compiledData: (number | Buffer | Buffer[])[] = [

package/src/generators/builders/DeploymentGenerator.ts

@@ -2,6 +2,7 @@ import { crypto, Network, networks, opcodes, script } from '@btc-vision/bitcoin'
 import { Generator } from '../Generator.js';
 import { Feature, Features } from '../Features.js';
 import { ChallengeSolution } from '../../epoch/ChallengeSolution.js';
+import { BinaryWriter } from '../../buffer/BinaryWriter.js';
 
 export const OPNET_DEPLOYMENT_VERSION = 0x00;
 export const versionBuffer = Buffer.from([OPNET_DEPLOYMENT_VERSION]);
@@ -71,21 +72,20 @@ export class DeploymentGenerator extends Generator {
         const featuresList: Features[] = [];
         const featureData: (number | Buffer | Buffer[])[] = [];
 
-        if (featuresRaw) {
+        if (featuresRaw && featuresRaw.length) {
             const features: Feature<Features>[] = featuresRaw.sort(
                 (a, b) => a.priority - b.priority,
             );
 
+            const finalBuffer = new BinaryWriter();
             for (let i = 0; i < features.length; i++) {
                 const feature = features[i];
                 featuresList.push(feature.opcode);
 
-                const data = this.encodeFeature(feature);
-                featureData.push(...data);
-
-                // Separator between features so decoder knows where each ends
-                featureData.push(opcodes.OP_0);
+                this.encodeFeature(feature, finalBuffer);
             }
+
+            featureData.push(...this.splitBufferIntoChunks(Buffer.from(finalBuffer.getBuffer())));
         }
 
         const compiledData = [

package/src/generators/builders/LegacyCalldataGenerator.ts

@@ -4,6 +4,7 @@ import { Compressor } from '../../bytecode/Compressor.js';
 import { EcKeyPair } from '../../keypair/EcKeyPair.js';
 import { Generator } from '../Generator.js';
 import { Feature, Features } from '../Features.js';
+import { BinaryWriter } from '../../buffer/BinaryWriter.js';
 
 /**
  * Class to generate bitcoin script for interaction transactions
@@ -71,19 +72,21 @@ export class LegacyCalldataGenerator extends Generator {
 
         const featuresList: Features[] = [];
         const featureData: (number | Buffer | Buffer[])[] = [];
-        const features: Feature<Features>[] = featuresRaw.sort((a, b) => a.priority - b.priority);
 
-        if (features.length) {
+        if (featuresRaw && featuresRaw.length) {
+            const features: Feature<Features>[] = featuresRaw.sort(
+                (a, b) => a.priority - b.priority,
+            );
+
+            const finalBuffer = new BinaryWriter();
             for (let i = 0; i < features.length; i++) {
                 const feature = features[i];
                 featuresList.push(feature.opcode);
 
-                const data = this.encodeFeature(feature);
-                featureData.push(...data);
-
-                // Separator between features so decoder knows where each ends
-                featureData.push(opcodes.OP_0);
+                this.encodeFeature(feature, finalBuffer);
             }
+
+            featureData.push(...this.splitBufferIntoChunks(Buffer.from(finalBuffer.getBuffer())));
         }
 
         let compiledData = [

package/src/generators/builders/P2WDAGenerator.ts

@@ -32,9 +32,6 @@ export class P2WDAGenerator extends Generator {
         maxWitnessFields: number = 10,
         maxBytesPerWitness: number = 80,
     ): boolean {
-        // Account for Schnorr signature (64 bytes) and compression
-        // Assume 30% compression ratio (conservative estimate)
-
         const signatureSize = 64;
         const compressionRatio = 0.7;
 
@@ -79,12 +76,10 @@ export class P2WDAGenerator extends Generator {
 
         const writer = new BinaryWriter();
 
-        // Version byte
         writer.writeU8(P2WDAGenerator.P2WDA_VERSION);
 
         const features: Feature<Features>[] = featuresRaw.sort((a, b) => a.priority - b.priority);
 
-        // Header
         writer.writeBytes(
             this.getHeader(
                 maxPriority,
@@ -92,33 +87,19 @@ export class P2WDAGenerator extends Generator {
             ),
         );
 
-        // Contract secret
         writer.writeBytes(contractSecret);
 
-        // Challenge components for epoch rewards
         writer.writeBytes(challenge.publicKey.toBuffer());
         writer.writeBytes(challenge.solution);
 
-        // Calldata with length prefix
         writer.writeU32(calldata.length);
         writer.writeBytes(calldata);
 
-        // Features
         this.writeFeatures(writer, features);
 
         return Buffer.from(writer.getBuffer());
     }
 
-    /**
-     * Create a minimal header for P2WDA operations
-     *
-     * The header contains essential transaction metadata in a compact format:
-     * [sender_pubkey_prefix(1)] [feature_flags(3)] [max_priority(8)]
-     *
-     * @param maxPriority Maximum priority fee
-     * @param features Feature opcodes to set in flags
-     * @returns 12-byte header
-     */
     public override getHeader(maxPriority: bigint, features: Features[] = []): Buffer {
         return super.getHeader(maxPriority, features);
     }
@@ -133,48 +114,11 @@ export class P2WDAGenerator extends Generator {
      * @param features Array of features to encode
      */
     private writeFeatures(writer: BinaryWriter, features: Feature<Features>[]): void {
-        // Write feature count
         writer.writeU16(features.length);
 
         for (const feature of features) {
-            // Write feature opcode
             writer.writeU8(feature.opcode);
-
-            // Encode feature data
-            const encodedData = this.encodeFeatureData(feature);
-
-            // Write feature data with length prefix
-            writer.writeU32(encodedData.length);
-            writer.writeBytes(encodedData);
-        }
-    }
-
-    /**
-     * Encode a single feature's data
-     *
-     * Unlike the base Generator class, we don't split into chunks here
-     * since P2WDA handles chunking at the witness level
-     *
-     * @param feature The feature to encode
-     * @returns Encoded feature data
-     */
-    private encodeFeatureData(feature: Feature<Features>): Buffer {
-        switch (feature.opcode) {
-            case Features.ACCESS_LIST: {
-                // Access lists are already encoded efficiently by the parent class
-                const chunks = this.encodeFeature(feature);
-                // Flatten chunks since P2WDA doesn't need script-level chunking
-                return Buffer.concat(chunks.flat());
-            }
-
-            case Features.EPOCH_SUBMISSION: {
-                // Epoch submissions are also handled by parent
-                const chunks = this.encodeFeature(feature);
-                return Buffer.concat(chunks.flat());
-            }
-
-            default:
-                throw new Error(`Unknown feature type: ${feature.opcode}`);
+            this.encodeFeature(feature, writer);
         }
     }
 }