@btc-vision/transaction 1.3.5 → 1.3.6

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

@@ -10,4 +10,5 @@ export declare class InteractionTransaction extends SharedInteractionTransaction
     protected tapLeafScript: TapLeafScript | null;
     protected readonly contractSecret: Buffer;
     constructor(parameters: IInteractionParameters);
+    private generateFeatures;
 }

package/browser/transaction/interfaces/ITransactionParameters.d.ts

@@ -2,6 +2,9 @@ import { UTXO } from '../../utxo/interfaces/IUTXO.js';
 import { ITweakedTransactionData } from '../shared/TweakedTransaction.js';
 import { ChainId } from '../../network/ChainId.js';
 import { PsbtOutputExtended } from '@btc-vision/bitcoin';
+export interface LoadedStorage {
+    [key: string]: string[];
+}
 export interface ITransactionParameters extends ITweakedTransactionData {
     readonly from?: string;
     readonly to?: string;
@@ -28,6 +31,7 @@ export interface SharedInteractionParameters extends ITransactionParameters {
     disableAutoRefund?: boolean;
     readonly preimage: Buffer;
     readonly randomBytes?: Buffer;
+    readonly loadedStorage?: LoadedStorage;
 }
 export interface IInteractionParameters extends SharedInteractionParameters {
     readonly calldata: Buffer;

package/build/_version.d.ts

@@ -1 +1 @@
-export declare const version = "1.3.5";
+export declare const version = "1.3.6";

package/build/_version.js

@@ -1 +1 @@
-export const version = '1.3.5';
+export const version = '1.3.6';

package/build/generators/Features.d.ts

@@ -1,6 +1,11 @@
+import { LoadedStorage } from '../transaction/interfaces/ITransactionParameters.js';
 export declare enum Features {
-    UNWRAP = 0
+    ACCESS_LIST = 1
+}
+export interface Feature<T extends Features> {
+    opcode: T;
+    data: unknown;
+}
+export interface AccessListFeature extends Feature<Features.ACCESS_LIST> {
+    data: LoadedStorage;
 }
-export declare const FeatureOpCodes: {
-    [key: number]: number;
-};

package/build/generators/Features.js

@@ -1,8 +1,4 @@
-import { opcodes } from '@btc-vision/bitcoin';
 export var Features;
 (function (Features) {
-    Features[Features["UNWRAP"] = 0] = "UNWRAP";
+    Features[Features["ACCESS_LIST"] = 1] = "ACCESS_LIST";
 })(Features || (Features = {}));
-export const FeatureOpCodes = {
-    [Features.UNWRAP]: opcodes.OP_16,
-};

package/build/generators/Generator.d.ts

@@ -1,4 +1,5 @@
 import { Network } from '@btc-vision/bitcoin';
+import { Feature, Features } from './Features.js';
 export declare abstract class Generator {
     static readonly DATA_CHUNK_SIZE: number;
     static readonly MAGIC: Buffer;
@@ -7,8 +8,10 @@ export declare abstract class Generator {
     protected readonly contractSaltPubKey?: Buffer;
     protected readonly network: Network;
     protected constructor(senderPubKey: Buffer, contractSaltPubKey?: Buffer, network?: Network);
-    get senderFirstByte(): Buffer;
-    getHeader(maxPriority: bigint): Buffer;
+    buildHeader(features: Features[]): Buffer;
+    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[][];
+    private encodeAccessListFeature;
 }

package/build/generators/Generator.js

@@ -1,5 +1,8 @@
 import { networks, toXOnly } from '@btc-vision/bitcoin';
 import { BinaryWriter } from '../buffer/BinaryWriter.js';
+import { Features } from './Features.js';
+import { Address } from '../keypair/Address.js';
+import { Compressor } from '../bytecode/Compressor.js';
 export class Generator {
     constructor(senderPubKey, contractSaltPubKey, network = networks.bitcoin) {
         this.network = networks.bitcoin;
@@ -8,12 +11,18 @@ export class Generator {
         this.network = network;
         this.xSenderPubKey = toXOnly(senderPubKey);
     }
-    get senderFirstByte() {
-        return Buffer.from([this.senderPubKey[0], 0, 0, 0]);
+    buildHeader(features) {
+        let flags = 0;
+        for (const feature of features) {
+            flags |= feature;
+        }
+        const bytesU24 = Buffer.alloc(3);
+        bytesU24.writeUIntBE(flags, 0, 3);
+        return Buffer.from([this.senderPubKey[0], ...bytesU24]);
     }
-    getHeader(maxPriority) {
-        const writer = new BinaryWriter(8 + 4);
-        writer.writeBytes(this.senderFirstByte);
+    getHeader(maxPriority, features = []) {
+        const writer = new BinaryWriter(12);
+        writer.writeBytes(this.buildHeader(features));
         writer.writeU64(maxPriority);
         return Buffer.from(writer.getBuffer());
     }
@@ -29,6 +38,32 @@ export class Generator {
         }
         return chunks;
     }
+    encodeFeature(feature) {
+        switch (feature.opcode) {
+            case Features.ACCESS_LIST:
+                return this.splitBufferIntoChunks(this.encodeAccessListFeature(feature));
+            default:
+                throw new Error(`Unknown feature type: ${feature.opcode}`);
+        }
+    }
+    encodeAccessListFeature(feature) {
+        const writer = new BinaryWriter();
+        writer.writeU16(Object.keys(feature.data).length);
+        for (const contract in feature.data) {
+            const parsedContract = Address.fromString(contract);
+            const data = feature.data[contract];
+            writer.writeAddress(parsedContract);
+            writer.writeU32(data.length);
+            for (const pointer of data) {
+                const pointerBuffer = Buffer.from(pointer, 'base64');
+                if (pointerBuffer.length !== 32) {
+                    throw new Error(`Invalid pointer length: ${pointerBuffer.length}`);
+                }
+                writer.writeBytes(pointerBuffer);
+            }
+        }
+        return Compressor.compress(Buffer.from(writer.getBuffer()));
+    }
 }
 Generator.DATA_CHUNK_SIZE = 512;
 Generator.MAGIC = Buffer.from('op', 'utf-8');

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

@@ -1,8 +1,8 @@
 import { Network } from '@btc-vision/bitcoin';
-import { Features } from '../Features.js';
+import { Feature, Features } from '../Features.js';
 import { Generator } from '../Generator.js';
 export declare class CalldataGenerator extends Generator {
     constructor(senderPubKey: Buffer, contractSaltPubKey: Buffer, network?: Network);
     static getPubKeyAsBuffer(witnessKeys: Buffer[], network: Network): Buffer;
-    compile(calldata: Buffer, contractSecret: Buffer, preimage: Buffer, maxPriority: bigint, features?: Features[]): Buffer;
+    compile(calldata: Buffer, contractSecret: Buffer, preimage: Buffer, maxPriority: bigint, features?: Feature<Features>[]): Buffer;
 }

package/build/generators/builders/CalldataGenerator.js

@@ -1,7 +1,6 @@
 import { crypto, networks, opcodes, script } from '@btc-vision/bitcoin';
 import { Compressor } from '../../bytecode/Compressor.js';
 import { EcKeyPair } from '../../keypair/EcKeyPair.js';
-import { FeatureOpCodes } from '../Features.js';
 import { Generator } from '../Generator.js';
 export class CalldataGenerator extends Generator {
     constructor(senderPubKey, contractSaltPubKey, network = networks.bitcoin) {
@@ -31,8 +30,16 @@ export class CalldataGenerator extends Generator {
         const dataChunks = this.splitBufferIntoChunks(calldata);
         if (!dataChunks.length)
             throw new Error('No data chunks found');
+        const featuresList = [];
+        const featureData = [];
+        for (let i = 0; i < features.length; i++) {
+            const feature = features[i];
+            featuresList.push(feature.opcode);
+            const data = this.encodeFeature(feature);
+            featureData.push(...data);
+        }
         let compiledData = [
-            this.getHeader(maxPriority),
+            this.getHeader(maxPriority, featuresList),
             opcodes.OP_TOALTSTACK,
             preimage,
             opcodes.OP_TOALTSTACK,
@@ -53,8 +60,7 @@ export class CalldataGenerator extends Generator {
             opcodes.OP_IF,
             Generator.MAGIC,
         ];
-        const featureOpcodes = features.map((feature) => FeatureOpCodes[feature]);
-        compiledData = compiledData.concat(...featureOpcodes, ...[opcodes.OP_1NEGATE, ...dataChunks, opcodes.OP_ELSE, opcodes.OP_1, opcodes.OP_ENDIF]);
+        compiledData = compiledData.concat(...featureData, ...[opcodes.OP_1NEGATE, ...dataChunks, opcodes.OP_ELSE, opcodes.OP_1, opcodes.OP_ENDIF]);
         const asm = compiledData.flat();
         const compiled = script.compile(asm);
         const decompiled = script.decompile(compiled);

package/build/generators/builders/DeploymentGenerator.js

@@ -13,13 +13,23 @@ export class DeploymentGenerator extends Generator {
         }
         return compiled;
     }
-    getAsm(contractBytecode, contractSalt, preimage, maxPriority, calldata) {
+    getAsm(contractBytecode, contractSalt, preimage, maxPriority, calldata, features) {
         if (!this.contractSaltPubKey)
             throw new Error('Contract salt public key not set');
         const dataChunks = this.splitBufferIntoChunks(contractBytecode);
         const calldataChunks = calldata ? this.splitBufferIntoChunks(calldata) : [];
+        const featuresList = [];
+        const featureData = [];
+        if (features) {
+            for (let i = 0; i < features.length; i++) {
+                const feature = features[i];
+                featuresList.push(feature.opcode);
+                const data = this.encodeFeature(feature);
+                featureData.push(...data);
+            }
+        }
         const compiledData = [
-            this.getHeader(maxPriority),
+            this.getHeader(maxPriority, featuresList),
             opcodes.OP_TOALTSTACK,
             preimage,
             opcodes.OP_TOALTSTACK,
@@ -39,6 +49,7 @@ export class DeploymentGenerator extends Generator {
             opcodes.OP_NUMEQUAL,
             opcodes.OP_IF,
             Generator.MAGIC,
+            ...featureData,
             opcodes.OP_0,
             ...calldataChunks,
             opcodes.OP_1NEGATE,

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

@@ -1,8 +1,8 @@
 import { Network } from '@btc-vision/bitcoin';
-import { Features } from '../Features.js';
 import { Generator } from '../Generator.js';
+import { Feature, Features } from '../Features.js';
 export declare class LegacyCalldataGenerator extends Generator {
     constructor(senderPubKey: Buffer, network?: Network);
     static getPubKeyAsBuffer(witnessKeys: Buffer[], network: Network): Buffer;
-    compile(calldata: Buffer, contractSecret: Buffer, preimage: Buffer, maxPriority: bigint, features?: Features[]): Buffer;
+    compile(calldata: Buffer, contractSecret: Buffer, preimage: Buffer, maxPriority: bigint, features?: Feature<Features>[]): Buffer;
 }

package/build/generators/builders/LegacyCalldataGenerator.js

@@ -1,7 +1,6 @@
 import { crypto, networks, opcodes, script } from '@btc-vision/bitcoin';
 import { Compressor } from '../../bytecode/Compressor.js';
 import { EcKeyPair } from '../../keypair/EcKeyPair.js';
-import { FeatureOpCodes } from '../Features.js';
 import { Generator } from '../Generator.js';
 export class LegacyCalldataGenerator extends Generator {
     constructor(senderPubKey, network = networks.bitcoin) {
@@ -29,8 +28,16 @@ export class LegacyCalldataGenerator extends Generator {
         const dataChunks = this.splitBufferIntoChunks(calldata);
         if (!dataChunks.length)
             throw new Error('No data chunks found');
+        const featuresList = [];
+        const featureData = [];
+        for (let i = 0; i < features.length; i++) {
+            const feature = features[i];
+            featuresList.push(feature.opcode);
+            const data = this.encodeFeature(feature);
+            featureData.push(...data);
+        }
         let compiledData = [
-            this.getHeader(maxPriority),
+            this.getHeader(maxPriority, featuresList),
             opcodes.OP_TOALTSTACK,
             preimage,
             opcodes.OP_TOALTSTACK,
@@ -48,8 +55,7 @@ export class LegacyCalldataGenerator extends Generator {
             opcodes.OP_IF,
             Generator.MAGIC,
         ];
-        const featureOpcodes = features.map((feature) => FeatureOpCodes[feature]);
-        compiledData = compiledData.concat(...featureOpcodes, ...[opcodes.OP_1NEGATE, ...dataChunks, opcodes.OP_ELSE, opcodes.OP_1, opcodes.OP_ENDIF]);
+        compiledData = compiledData.concat(...featureData, ...[opcodes.OP_1NEGATE, ...dataChunks, opcodes.OP_ELSE, opcodes.OP_1, opcodes.OP_ENDIF]);
         const asm = compiledData.flat();
         const compiled = script.compile(asm);
         const decompiled = script.decompile(compiled);

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

@@ -10,4 +10,5 @@ export declare class InteractionTransaction extends SharedInteractionTransaction
     protected tapLeafScript: TapLeafScript | null;
     protected readonly contractSecret: Buffer;
     constructor(parameters: IInteractionParameters);
+    private generateFeatures;
 }

package/build/transaction/builders/InteractionTransaction.js

@@ -1,13 +1,24 @@
 import { TransactionType } from '../enums/TransactionType.js';
 import { SharedInteractionTransaction } from './SharedInteractionTransaction.js';
+import { Features } from '../../generators/Features.js';
 export class InteractionTransaction extends SharedInteractionTransaction {
     constructor(parameters) {
         super(parameters);
         this.type = TransactionType.INTERACTION;
         this.tapLeafScript = null;
         this.contractSecret = this.generateSecret();
-        this.compiledTargetScript = this.calldataGenerator.compile(this.calldata, this.contractSecret, this.preimage, this.priorityFee);
+        this.compiledTargetScript = this.calldataGenerator.compile(this.calldata, this.contractSecret, this.preimage, this.priorityFee, this.generateFeatures(parameters));
         this.scriptTree = this.getScriptTree();
         this.internalInit();
     }
+    generateFeatures(parameters) {
+        const features = [];
+        if (parameters.loadedStorage) {
+            features.push({
+                opcode: Features.ACCESS_LIST,
+                data: parameters.loadedStorage,
+            });
+        }
+        return features;
+    }
 }

package/build/transaction/interfaces/ITransactionParameters.d.ts

@@ -2,6 +2,9 @@ import { UTXO } from '../../utxo/interfaces/IUTXO.js';
 import { ITweakedTransactionData } from '../shared/TweakedTransaction.js';
 import { ChainId } from '../../network/ChainId.js';
 import { PsbtOutputExtended } from '@btc-vision/bitcoin';
+export interface LoadedStorage {
+    [key: string]: string[];
+}
 export interface ITransactionParameters extends ITweakedTransactionData {
     readonly from?: string;
     readonly to?: string;
@@ -28,6 +31,7 @@ export interface SharedInteractionParameters extends ITransactionParameters {
     disableAutoRefund?: boolean;
     readonly preimage: Buffer;
     readonly randomBytes?: Buffer;
+    readonly loadedStorage?: LoadedStorage;
 }
 export interface IInteractionParameters extends SharedInteractionParameters {
     readonly calldata: Buffer;

package/eslint.config.js

@@ -29,6 +29,7 @@ export default tseslint.config(
             '@typescript-eslint/no-duplicate-enum-values': 'off',
             'prefer-spread': 'off',
             '@typescript-eslint/no-empty-object-type': 'off',
+            '@typescript-eslint/prefer-literal-enum-member': 'off'
         },
     },
     {

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@btc-vision/transaction",
     "type": "module",
-    "version": "1.3.5",
+    "version": "1.3.6",
     "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.3.5';
+export const version = '1.3.6';

package/src/generators/Features.ts

@@ -1,9 +1,14 @@
-import { opcodes } from '@btc-vision/bitcoin';
+import { LoadedStorage } from '../transaction/interfaces/ITransactionParameters.js';
 
 export enum Features {
-    UNWRAP = 0, // random number just to set the first value
+    ACCESS_LIST = 1,
 }
 
-export const FeatureOpCodes: { [key: number]: number } = {
-    [Features.UNWRAP]: opcodes.OP_16,
-};
+export interface Feature<T extends Features> {
+    opcode: T;
+    data: unknown;
+}
+
+export interface AccessListFeature extends Feature<Features.ACCESS_LIST> {
+    data: LoadedStorage;
+}

package/src/generators/Generator.ts

@@ -1,5 +1,8 @@
 import { Network, networks, toXOnly } from '@btc-vision/bitcoin';
 import { BinaryWriter } from '../buffer/BinaryWriter.js';
+import { AccessListFeature, Feature, Features } from './Features.js';
+import { Address } from '../keypair/Address.js';
+import { Compressor } from '../bytecode/Compressor.js';
 
 /** Bitcoin Script Generator */
 export abstract class Generator {
@@ -48,13 +51,22 @@ export abstract class Generator {
         this.xSenderPubKey = toXOnly(senderPubKey);
     }
 
-    public get senderFirstByte(): Buffer {
-        return Buffer.from([this.senderPubKey[0], 0, 0, 0]);
+    public buildHeader(features: Features[]): Buffer {
+        let flags: number = 0;
+
+        for (const feature of features) {
+            flags |= feature;
+        }
+
+        const bytesU24 = Buffer.alloc(3);
+        bytesU24.writeUIntBE(flags, 0, 3);
+
+        return Buffer.from([this.senderPubKey[0], ...bytesU24]);
     }
 
-    public getHeader(maxPriority: bigint): Buffer {
-        const writer = new BinaryWriter(8 + 4);
-        writer.writeBytes(this.senderFirstByte);
+    public getHeader(maxPriority: bigint, features: Features[] = []): Buffer {
+        const writer = new BinaryWriter(12);
+        writer.writeBytes(this.buildHeader(features));
         writer.writeU64(maxPriority);
 
         return Buffer.from(writer.getBuffer());
@@ -92,4 +104,41 @@ export abstract class Generator {
 
         return chunks;
     }
+
+    protected encodeFeature(feature: Feature<Features>): Buffer[][] {
+        switch (feature.opcode) {
+            case Features.ACCESS_LIST:
+                return this.splitBufferIntoChunks(
+                    this.encodeAccessListFeature(feature as AccessListFeature),
+                );
+            default:
+                throw new Error(`Unknown feature type: ${feature.opcode}`);
+        }
+    }
+
+    private encodeAccessListFeature(feature: AccessListFeature): Buffer {
+        const writer = new BinaryWriter();
+
+        writer.writeU16(Object.keys(feature.data).length);
+
+        for (const contract in feature.data) {
+            const parsedContract = Address.fromString(contract);
+            const data = feature.data[contract];
+
+            writer.writeAddress(parsedContract);
+            writer.writeU32(data.length);
+
+            for (const pointer of data) {
+                const pointerBuffer = Buffer.from(pointer, 'base64');
+
+                if (pointerBuffer.length !== 32) {
+                    throw new Error(`Invalid pointer length: ${pointerBuffer.length}`);
+                }
+
+                writer.writeBytes(pointerBuffer);
+            }
+        }
+
+        return Compressor.compress(Buffer.from(writer.getBuffer()));
+    }
 }

package/src/generators/builders/CalldataGenerator.ts

@@ -2,9 +2,8 @@ import { crypto, Network, networks, opcodes, script } from '@btc-vision/bitcoin'
 import { ECPairInterface } from 'ecpair';
 import { Compressor } from '../../bytecode/Compressor.js';
 import { EcKeyPair } from '../../keypair/EcKeyPair.js';
-import { FeatureOpCodes, Features } from '../Features.js';
+import { Feature, Features } from '../Features.js';
 import { Generator } from '../Generator.js';
-import { BinaryWriter } from '../../buffer/BinaryWriter.js';
 
 /**
  * Class to generate bitcoin script for interaction transactions
@@ -59,7 +58,7 @@ export class CalldataGenerator extends Generator {
      * @param {Buffer} contractSecret - The contract secret
      * @param preimage
      * @param maxPriority - Amount of satoshis to spend max on priority fee
-     * @param {number[]} [features=[]] - The features to use (optional)
+     * @param {Feature<Features>[]} features - The features to use
      * @returns {Buffer} - The compiled script
      * @throws {Error} - If something goes wrong
      */
@@ -68,15 +67,25 @@ export class CalldataGenerator extends Generator {
         contractSecret: Buffer,
         preimage: Buffer,
         maxPriority: bigint,
-        features: Features[] = [],
+        features: Feature<Features>[] = [],
     ): Buffer {
         if (!this.contractSaltPubKey) throw new Error('Contract salt public key not set');
 
         const dataChunks: Buffer[][] = this.splitBufferIntoChunks(calldata);
         if (!dataChunks.length) throw new Error('No data chunks found');
 
-        let compiledData = [
-            this.getHeader(maxPriority),
+        const featuresList: Features[] = [];
+        const featureData: (number | Buffer | Buffer[])[] = [];
+        for (let i = 0; i < features.length; i++) {
+            const feature = features[i];
+            featuresList.push(feature.opcode);
+
+            const data = this.encodeFeature(feature);
+            featureData.push(...data);
+        }
+
+        let compiledData: (number | Buffer | Buffer[])[] = [
+            this.getHeader(maxPriority, featuresList),
             opcodes.OP_TOALTSTACK,
 
             // CHALLENGE PREIMAGE FOR REWARD,
@@ -105,11 +114,9 @@ export class CalldataGenerator extends Generator {
             Generator.MAGIC,
         ];
 
-        const featureOpcodes = features.map((feature) => FeatureOpCodes[feature]); // Get the opcodes for the features
-
         // Write calldata
         compiledData = compiledData.concat(
-            ...featureOpcodes,
+            ...featureData,
             ...[opcodes.OP_1NEGATE, ...dataChunks, opcodes.OP_ELSE, opcodes.OP_1, opcodes.OP_ENDIF],
         );
 

package/src/generators/builders/DeploymentGenerator.ts

@@ -1,5 +1,6 @@
 import { crypto, Network, networks, opcodes, script } from '@btc-vision/bitcoin';
 import { Generator } from '../Generator.js';
+import { Feature, Features } from '../Features.js';
 
 export class DeploymentGenerator extends Generator {
     constructor(
@@ -46,14 +47,28 @@ export class DeploymentGenerator extends Generator {
         preimage: Buffer,
         maxPriority: bigint,
         calldata?: Buffer,
+        features?: Feature<Features>[],
     ): (number | Buffer)[] {
         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[] = [];
+        const featureData: (number | Buffer | Buffer[])[] = [];
+
+        if (features) {
+            for (let i = 0; i < features.length; i++) {
+                const feature = features[i];
+                featuresList.push(feature.opcode);
+
+                const data = this.encodeFeature(feature);
+                featureData.push(...data);
+            }
+        }
+
         const compiledData = [
-            this.getHeader(maxPriority),
+            this.getHeader(maxPriority, featuresList),
             opcodes.OP_TOALTSTACK,
 
             // CHALLENGE PREIMAGE FOR REWARD,
@@ -80,6 +95,7 @@ export class DeploymentGenerator extends Generator {
             opcodes.OP_IF,
 
             Generator.MAGIC,
+            ...featureData,
             opcodes.OP_0,
             ...calldataChunks,
             opcodes.OP_1NEGATE,

package/src/generators/builders/LegacyCalldataGenerator.ts

@@ -2,8 +2,8 @@ import { crypto, Network, networks, opcodes, script } from '@btc-vision/bitcoin'
 import { ECPairInterface } from 'ecpair';
 import { Compressor } from '../../bytecode/Compressor.js';
 import { EcKeyPair } from '../../keypair/EcKeyPair.js';
-import { FeatureOpCodes, Features } from '../Features.js';
 import { Generator } from '../Generator.js';
+import { Feature, Features } from '../Features.js';
 
 /**
  * Class to generate bitcoin script for interaction transactions
@@ -63,13 +63,23 @@ export class LegacyCalldataGenerator extends Generator {
         contractSecret: Buffer,
         preimage: Buffer,
         maxPriority: bigint,
-        features: Features[] = [],
+        features: Feature<Features>[] = [],
     ): Buffer {
         const dataChunks: Buffer[][] = this.splitBufferIntoChunks(calldata);
         if (!dataChunks.length) throw new Error('No data chunks found');
 
+        const featuresList: Features[] = [];
+        const featureData: (number | Buffer | Buffer[])[] = [];
+        for (let i = 0; i < features.length; i++) {
+            const feature = features[i];
+            featuresList.push(feature.opcode);
+
+            const data = this.encodeFeature(feature);
+            featureData.push(...data);
+        }
+
         let compiledData = [
-            this.getHeader(maxPriority),
+            this.getHeader(maxPriority, featuresList),
             opcodes.OP_TOALTSTACK,
 
             // CHALLENGE PREIMAGE FOR REWARD,
@@ -94,11 +104,9 @@ export class LegacyCalldataGenerator extends Generator {
             Generator.MAGIC,
         ];
 
-        const featureOpcodes = features.map((feature) => FeatureOpCodes[feature]); // Get the opcodes for the features
-
         // Write calldata
         compiledData = compiledData.concat(
-            ...featureOpcodes,
+            ...featureData,
             ...[opcodes.OP_1NEGATE, ...dataChunks, opcodes.OP_ELSE, opcodes.OP_1, opcodes.OP_ENDIF],
         );
 

package/src/transaction/builders/InteractionTransaction.ts

@@ -3,6 +3,7 @@ import { TransactionType } from '../enums/TransactionType.js';
 import { TapLeafScript } from '../interfaces/Tap.js';
 import { IInteractionParameters } from '../interfaces/ITransactionParameters.js';
 import { SharedInteractionTransaction } from './SharedInteractionTransaction.js';
+import { Feature, Features } from '../../generators/Features.js';
 
 /**
  * Class for interaction transactions
@@ -32,9 +33,23 @@ export class InteractionTransaction extends SharedInteractionTransaction<Transac
             this.contractSecret,
             this.preimage,
             this.priorityFee,
+            this.generateFeatures(parameters),
         );
 
         this.scriptTree = this.getScriptTree();
         this.internalInit();
     }
+
+    private generateFeatures(parameters: IInteractionParameters): Feature<Features>[] {
+        const features: Feature<Features>[] = [];
+
+        if (parameters.loadedStorage) {
+            features.push({
+                opcode: Features.ACCESS_LIST,
+                data: parameters.loadedStorage,
+            });
+        }
+
+        return features;
+    }
 }