@actioncodes/protocol 1.1.0 → 1.1.2

package/dist/adapters/base.d.ts

@@ -11,13 +11,20 @@ export declare abstract class BaseChainAdapter<T = any> {
      * @param meta - ProtocolMetaV1 object
      * @returns Chain-specific encoded data
      */
-    abstract encode(meta: ProtocolMetaV1): any;
+    abstract encodeMeta(meta: ProtocolMetaV1): any;
     /**
      * Decode protocol meta from chain-specific transaction
      * @param tx - Chain-specific transaction
      * @returns Decoded ProtocolMetaV1 or null
      */
-    abstract decode(tx: T): ProtocolMetaV1 | null;
+    abstract decodeMeta(tx: T): ProtocolMetaV1 | null;
+    /**
+     * Inject protocol meta into chain-specific transaction
+     * @param serializedTx - Serialized transaction string
+     * @param meta - ProtocolMetaV1 object
+     * @returns Serialized transaction with injected meta
+     */
+    abstract injectMeta(serializedTx: string, meta: ProtocolMetaV1): string;
     /**
      * Validate transaction with protocol meta and authority list
      * @param tx - Chain-specific transaction

package/dist/adapters/base.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"base.d.ts","sourceRoot":"","sources":["../../src/adapters/base.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAE3C,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAEzC;;;GAGG;AACH,8BAAsB,gBAAgB,CAAC,CAAC,GAAG,GAAG;IAC1C,QAAQ,CAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IAEhC;;;;OAIG;IACH,QAAQ,CAAC,MAAM,CAAC,IAAI,EAAE,cAAc,GAAG,GAAG;IAE1C;;;;OAIG;IACH,QAAQ,CAAC,MAAM,CAAC,EAAE,EAAE,CAAC,GAAG,cAAc,GAAG,IAAI;IAE7C;;;;;;OAMG;IACH,QAAQ,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC,EAAE,WAAW,EAAE,MAAM,EAAE,EAAE,cAAc,CAAC,EAAE,MAAM,GAAG,OAAO;IAEjF;;;;;OAKG;IACH,QAAQ,CAAC,kBAAkB,CAAC,EAAE,EAAE,CAAC,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO;IAE3D;;;;;;OAMG;IACH,eAAe,CAAC,EAAE,EAAE,CAAC,EAAE,WAAW,EAAE,MAAM,EAAE,EAAE,cAAc,GAAE,MAAkB,GAAG,OAAO;IA8B1F;;;;;;OAMG;IACH,SAAS,CAAC,QAAQ,CAAC,4BAA4B,CAAC,EAAE,EAAE,CAAC,EAAE,IAAI,EAAE,cAAc,GAAG,OAAO;IAErF;;;;;;OAMG;IACH,uBAAuB,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,GAAE,MAA6B,GAAG,MAAM;IAIvG;;;;;;OAMG;IACH,QAAQ,CAAC,mBAAmB,CAAC,UAAU,EAAE,UAAU,GAAG,OAAO;IAE7D;;;;;;;;OAQG;IACH,QAAQ,CAAC,mBAAmB,CACxB,UAAU,EAAE,UAAU,EACtB,GAAG,EAAE,GAAG,GACT,OAAO,CAAC,UAAU,CAAC;CACzB"}
+{"version":3,"file":"base.d.ts","sourceRoot":"","sources":["../../src/adapters/base.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAE3C,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAEzC;;;GAGG;AACH,8BAAsB,gBAAgB,CAAC,CAAC,GAAG,GAAG;IAC1C,QAAQ,CAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IAEhC;;;;OAIG;IACH,QAAQ,CAAC,UAAU,CAAC,IAAI,EAAE,cAAc,GAAG,GAAG;IAE9C;;;;OAIG;IACH,QAAQ,CAAC,UAAU,CAAC,EAAE,EAAE,CAAC,GAAG,cAAc,GAAG,IAAI;IAEjD;;;;;OAKG;IACH,QAAQ,CAAC,UAAU,CAAC,YAAY,EAAE,MAAM,EAAE,IAAI,EAAE,cAAc,GAAG,MAAM;IAEvE;;;;;;OAMG;IACH,QAAQ,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC,EAAE,WAAW,EAAE,MAAM,EAAE,EAAE,cAAc,CAAC,EAAE,MAAM,GAAG,OAAO;IAEjF;;;;;OAKG;IACH,QAAQ,CAAC,kBAAkB,CAAC,EAAE,EAAE,CAAC,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO;IAE3D;;;;;;OAMG;IACH,eAAe,CAAC,EAAE,EAAE,CAAC,EAAE,WAAW,EAAE,MAAM,EAAE,EAAE,cAAc,GAAE,MAAkB,GAAG,OAAO;IA8B1F;;;;;;OAMG;IACH,SAAS,CAAC,QAAQ,CAAC,4BAA4B,CAAC,EAAE,EAAE,CAAC,EAAE,IAAI,EAAE,cAAc,GAAG,OAAO;IAErF;;;;;;OAMG;IACH,uBAAuB,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,GAAE,MAA6B,GAAG,MAAM;IAIvG;;;;;;OAMG;IACH,QAAQ,CAAC,mBAAmB,CAAC,UAAU,EAAE,UAAU,GAAG,OAAO;IAE7D;;;;;;;;OAQG;IACH,QAAQ,CAAC,mBAAmB,CACxB,UAAU,EAAE,UAAU,EACtB,GAAG,EAAE,GAAG,GACT,OAAO,CAAC,UAAU,CAAC;CACzB"}

package/dist/adapters/base.js

@@ -16,7 +16,7 @@ class BaseChainAdapter {
      */
     detectTampering(tx, authorities, expectedPrefix = 'DEFAULT') {
         // First, decode the protocol meta from the transaction
-        const meta = this.decode(tx);
+        const meta = this.decodeMeta(tx);
         if (!meta) {
             return false; // No protocol meta found
         }

package/dist/adapters/solana/solana.d.ts

@@ -18,13 +18,26 @@ export declare class SolanaAdapter extends BaseChainAdapter<SolanaTransaction> {
      * @param meta - The protocol meta to encode
      * @returns TransactionInstruction for the memo
      */
-    encode(meta: ProtocolMetaV1): TransactionInstruction;
+    encodeMeta(meta: ProtocolMetaV1): TransactionInstruction;
     /**
      * Decode protocol meta from Solana transaction (legacy or versioned)
-     * @param tx - The Solana transaction
+     * @param tx - The Solana transaction (can be deserialized object or base64 string)
      * @returns Decoded ProtocolMetaV1 or null if not found
      */
-    decode(tx: SolanaTransaction): ProtocolMetaV1 | null;
+    decodeMeta(tx: SolanaTransaction | string): ProtocolMetaV1 | null;
+    /**
+     * Deserialize a Solana transaction from base64 string
+     * @param base64String - Base64 encoded transaction
+     * @returns SolanaTransaction object
+     */
+    deserializeTransaction(base64String: string): SolanaTransaction;
+    /**
+     * Inject protocol meta into Solana transaction
+     * @param serializedTx - Serialized transaction string (base64)
+     * @param meta - ProtocolMetaV1 object
+     * @returns Serialized transaction with injected meta
+     */
+    injectMeta(serializedTx: string, meta: ProtocolMetaV1): string;
     /**
      * Validate transaction with protocol meta and authority list
      * @param tx - The Solana transaction
@@ -35,11 +48,11 @@ export declare class SolanaAdapter extends BaseChainAdapter<SolanaTransaction> {
     validate(tx: SolanaTransaction, authorities: string[], expectedPrefix?: string): boolean;
     /**
      * Check if the issuer has signed the transaction
-     * @param tx - The Solana transaction
+     * @param tx - The Solana transaction (can be deserialized object or base64 string)
      * @param issuer - Issuer public key to check
      * @returns True if issuer has signed
      */
-    hasIssuerSignature(tx: SolanaTransaction, issuer: string): boolean;
+    hasIssuerSignature(tx: SolanaTransaction | string, issuer: string): boolean;
     /**
      * Decode protocol meta from legacy Solana transaction
      */
@@ -67,6 +80,7 @@ export declare class SolanaAdapter extends BaseChainAdapter<SolanaTransaction> {
      * @returns True if transaction integrity is valid
      */
     protected validateTransactionIntegrity(tx: SolanaTransaction, meta: ProtocolMetaV1): boolean;
+    verifyCodeSignature(actionCode: ActionCode): boolean;
     /**
      * Decode protocol meta from base64 string (for backward compatibility)
      * @param base64String - Base64 encoded transaction
@@ -74,18 +88,10 @@ export declare class SolanaAdapter extends BaseChainAdapter<SolanaTransaction> {
      */
     decodeFromBase64(base64String: string): ProtocolMetaV1 | null;
     /**
-     * Validate base64 transaction (for backward compatibility)
-     * @param base64String - Base64 encoded transaction
-     * @param authorities - Array of valid protocol authority public keys (base58)
-     * @param expectedPrefix - Expected protocol prefix (default: 'DEFAULT')
-     * @returns True if transaction is valid
-     */
-    validateFromBase64(base64String: string, authorities: string[], expectedPrefix?: string): boolean;
-    verifyCodeSignature(actionCode: ActionCode): boolean;
-    /**
-     * Sign the transaction with the protocol key using a callback approach
-     * @param signCallback - Callback function that performs the actual signing
-     * @returns Promise that resolves to the signed transaction
+     * Sign the transaction with the protocol key
+     * @param actionCode - The action code containing the transaction
+     * @param key - The keypair to sign with
+     * @returns Promise that resolves to the signed action code
      */
     signWithProtocolKey(actionCode: ActionCode, key: Keypair): Promise<ActionCode>;
 }

package/dist/adapters/solana/solana.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"solana.d.ts","sourceRoot":"","sources":["../../../src/adapters/solana/solana.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,WAAW,EACX,sBAAsB,EACtB,oBAAoB,EAGpB,OAAO,EACV,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,cAAc,EAAsB,MAAM,YAAY,CAAC;AAChE,OAAO,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAE3C,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAG9C;;GAEG;AACH,MAAM,MAAM,iBAAiB,GAAG,WAAW,GAAG,oBAAoB,CAAC;AAEnE;;;GAGG;AACH,qBAAa,aAAc,SAAQ,gBAAgB,CAAC,iBAAiB,CAAC;IAClE,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,eAAe,CAAmB;IAE1D,QAAQ,CAAC,KAAK,YAAY;IAE1B;;;;OAIG;IACH,MAAM,CAAC,IAAI,EAAE,cAAc,GAAG,sBAAsB;IAKpD;;;;OAIG;IACH,MAAM,CAAC,EAAE,EAAE,iBAAiB,GAAG,cAAc,GAAG,IAAI;IAWpD;;;;;;OAMG;IACH,QAAQ,CAAC,EAAE,EAAE,iBAAiB,EAAE,WAAW,EAAE,MAAM,EAAE,EAAE,cAAc,GAAE,MAAkB,GAAG,OAAO;IAInG;;;;;OAKG;IACH,kBAAkB,CAAC,EAAE,EAAE,iBAAiB,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO;IAWlE;;OAEG;IACH,OAAO,CAAC,uBAAuB;IAqB/B;;OAEG;IACH,OAAO,CAAC,0BAA0B;IAUlC;;OAEG;IACH,OAAO,CAAC,eAAe;IAuBvB;;OAEG;IACH,OAAO,CAAC,wBAAwB;IAMhC;;OAEG;IACH,OAAO,CAAC,2BAA2B;IAenC;;;;;OAKG;IACH,SAAS,CAAC,4BAA4B,CAAC,EAAE,EAAE,iBAAiB,EAAE,IAAI,EAAE,cAAc,GAAG,OAAO;IA6B5F;;;;OAIG;IACH,gBAAgB,CAAC,YAAY,EAAE,MAAM,GAAG,cAAc,GAAG,IAAI;IAgB7D;;;;;;OAMG;IACH,kBAAkB,CAAC,YAAY,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,EAAE,cAAc,GAAE,MAAkB,GAAG,OAAO;IAiBrG,mBAAmB,CAAC,UAAU,EAAE,UAAU,GAAG,OAAO;IAa3D;;;;OAIG;IACG,mBAAmB,CACrB,UAAU,EAAE,UAAU,EACtB,GAAG,EAAE,OAAO,GACb,OAAO,CAAC,UAAU,CAAC;CAkCzB"}
+{"version":3,"file":"solana.d.ts","sourceRoot":"","sources":["../../../src/adapters/solana/solana.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,WAAW,EACX,sBAAsB,EACtB,oBAAoB,EAGpB,OAAO,EACV,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,cAAc,EAAsB,MAAM,YAAY,CAAC;AAChE,OAAO,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAE3C,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAG9C;;GAEG;AACH,MAAM,MAAM,iBAAiB,GAAG,WAAW,GAAG,oBAAoB,CAAC;AAEnE;;;GAGG;AACH,qBAAa,aAAc,SAAQ,gBAAgB,CAAC,iBAAiB,CAAC;IAClE,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,eAAe,CAAmB;IAE1D,QAAQ,CAAC,KAAK,YAAY;IAE1B;;;;OAIG;IACH,UAAU,CAAC,IAAI,EAAE,cAAc,GAAG,sBAAsB;IAgBxD;;;;OAIG;IACH,UAAU,CAAC,EAAE,EAAE,iBAAiB,GAAG,MAAM,GAAG,cAAc,GAAG,IAAI;IAoBjE;;;;OAIG;IACI,sBAAsB,CAAC,YAAY,EAAE,MAAM,GAAG,iBAAiB;IActE;;;;;OAKG;IACH,UAAU,CAAC,YAAY,EAAE,MAAM,EAAE,IAAI,EAAE,cAAc,GAAG,MAAM;IA2E9D;;;;;;OAMG;IACH,QAAQ,CAAC,EAAE,EAAE,iBAAiB,EAAE,WAAW,EAAE,MAAM,EAAE,EAAE,cAAc,GAAE,MAAkB,GAAG,OAAO;IAInG;;;;;OAKG;IACH,kBAAkB,CAAC,EAAE,EAAE,iBAAiB,GAAG,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO;IAoB3E;;OAEG;IACH,OAAO,CAAC,uBAAuB;IAqB/B;;OAEG;IACH,OAAO,CAAC,0BAA0B;IAUlC;;OAEG;IACH,OAAO,CAAC,eAAe;IAuBvB;;OAEG;IACH,OAAO,CAAC,wBAAwB;IAMhC;;OAEG;IACH,OAAO,CAAC,2BAA2B;IAenC;;;;;OAKG;IACH,SAAS,CAAC,4BAA4B,CAAC,EAAE,EAAE,iBAAiB,EAAE,IAAI,EAAE,cAAc,GAAG,OAAO;IA6BrF,mBAAmB,CAAC,UAAU,EAAE,UAAU,GAAG,OAAO;IAa3D;;;;OAIG;IACH,gBAAgB,CAAC,YAAY,EAAE,MAAM,GAAG,cAAc,GAAG,IAAI;IAI7D;;;;;OAKG;IACG,mBAAmB,CACrB,UAAU,EAAE,UAAU,EACtB,GAAG,EAAE,OAAO,GACb,OAAO,CAAC,UAAU,CAAC;CAwCzB"}

package/dist/adapters/solana/solana.js

@@ -54,16 +54,35 @@ class SolanaAdapter extends base_1.BaseChainAdapter {
      * @param meta - The protocol meta to encode
      * @returns TransactionInstruction for the memo
      */
-    encode(meta) {
+    encodeMeta(meta) {
         const metaString = meta_1.ProtocolMetaParser.serialize(meta);
-        return (0, spl_memo_1.createMemoInstruction)(metaString);
+        const signerPubkeys = [];
+        try {
+            if (meta.iss && meta.iss !== 'undefined') {
+                const pubkey = new web3_js_1.PublicKey(meta.iss);
+                signerPubkeys.push(pubkey);
+            }
+        }
+        catch (error) {
+            // Ignore error, issuer is not a valid public key
+        }
+        return (0, spl_memo_1.createMemoInstruction)(metaString, signerPubkeys);
     }
     /**
      * Decode protocol meta from Solana transaction (legacy or versioned)
-     * @param tx - The Solana transaction
+     * @param tx - The Solana transaction (can be deserialized object or base64 string)
      * @returns Decoded ProtocolMetaV1 or null if not found
      */
-    decode(tx) {
+    decodeMeta(tx) {
+        // If it's a string, deserialize it first
+        if (typeof tx === 'string') {
+            try {
+                tx = this.deserializeTransaction(tx);
+            }
+            catch {
+                return null;
+            }
+        }
         // Check if it's a versioned transaction
         if ('message' in tx && tx.message) {
             return this.decodeVersionedTransaction(tx);
@@ -75,6 +94,90 @@ class SolanaAdapter extends base_1.BaseChainAdapter {
             return null;
         }
     }
+    /**
+     * Deserialize a Solana transaction from base64 string
+     * @param base64String - Base64 encoded transaction
+     * @returns SolanaTransaction object
+     */
+    deserializeTransaction(base64String) {
+        try {
+            const buffer = buffer_1.Buffer.from(base64String, 'base64');
+            // Try legacy first, then versioned
+            try {
+                return web3_js_1.Transaction.from(buffer);
+            }
+            catch {
+                return web3_js_1.VersionedTransaction.deserialize(buffer);
+            }
+        }
+        catch (error) {
+            throw new Error('Failed to deserialize Solana transaction');
+        }
+    }
+    /**
+     * Inject protocol meta into Solana transaction
+     * @param serializedTx - Serialized transaction string (base64)
+     * @param meta - ProtocolMetaV1 object
+     * @returns Serialized transaction with injected meta
+     */
+    injectMeta(serializedTx, meta) {
+        // Deserialize the transaction using existing pattern
+        const tx = this.deserializeTransaction(serializedTx);
+        const metaIx = this.encodeMeta(meta);
+        if (tx instanceof web3_js_1.VersionedTransaction) {
+            // Convert TransactionInstruction to MessageCompiledInstruction for versioned transactions
+            // Create new static account keys array with all required keys
+            const newStaticAccountKeys = [...tx.message.staticAccountKeys];
+            // Add any missing keys from the memo instruction
+            metaIx.keys.forEach(({ pubkey }) => {
+                if (!newStaticAccountKeys.some(key => key.equals(pubkey))) {
+                    newStaticAccountKeys.push(pubkey);
+                }
+            });
+            // Ensure programId is also in static keys
+            if (!newStaticAccountKeys.some(key => key.equals(metaIx.programId))) {
+                newStaticAccountKeys.push(metaIx.programId);
+            }
+            // Create new compiled instructions array
+            const newCompiledInstructions = [...tx.message.compiledInstructions];
+            // Find the program ID index in the new static keys
+            const programIdIndex = newStaticAccountKeys.findIndex(key => key.equals(metaIx.programId));
+            const accountKeyIndexes = metaIx.keys.map(key => {
+                const index = newStaticAccountKeys.findIndex(staticKey => staticKey.equals(key.pubkey));
+                if (index === -1) {
+                    throw new Error(`Account key ${key.pubkey.toBase58()} not found in static account keys`);
+                }
+                return index;
+            });
+            const compiledInstruction = {
+                programIdIndex,
+                accountKeyIndexes,
+                data: metaIx.data
+            };
+            newCompiledInstructions.push(compiledInstruction);
+            // Create new MessageV0 with updated data
+            const newMessage = new web3_js_1.MessageV0({
+                header: tx.message.header,
+                staticAccountKeys: newStaticAccountKeys,
+                recentBlockhash: tx.message.recentBlockhash,
+                compiledInstructions: newCompiledInstructions,
+                addressTableLookups: tx.message.addressTableLookups,
+            });
+            // Create new VersionedTransaction
+            const newVersionedTx = new web3_js_1.VersionedTransaction(newMessage);
+            return buffer_1.Buffer.from(newVersionedTx.serialize()).toString('base64');
+        }
+        else if (tx instanceof web3_js_1.Transaction) {
+            tx.instructions.push(metaIx);
+            // Clear existing signatures since we modified the transaction
+            tx.signatures = [];
+            // Serialize the transaction back without requiring signatures
+            return tx.serialize({ requireAllSignatures: false }).toString('base64');
+        }
+        else {
+            throw new Error('Invalid transaction type');
+        }
+    }
     /**
      * Validate transaction with protocol meta and authority list
      * @param tx - The Solana transaction
@@ -87,11 +190,20 @@ class SolanaAdapter extends base_1.BaseChainAdapter {
     }
     /**
      * Check if the issuer has signed the transaction
-     * @param tx - The Solana transaction
+     * @param tx - The Solana transaction (can be deserialized object or base64 string)
      * @param issuer - Issuer public key to check
      * @returns True if issuer has signed
      */
     hasIssuerSignature(tx, issuer) {
+        // If it's a string, deserialize it first
+        if (typeof tx === 'string') {
+            try {
+                tx = this.deserializeTransaction(tx);
+            }
+            catch {
+                return false;
+            }
+        }
         // Check if it's a versioned transaction
         if ('message' in tx && tx.message) {
             return this.hasIssuerSignatureVersioned(tx, issuer);
@@ -114,13 +226,13 @@ class SolanaAdapter extends base_1.BaseChainAdapter {
                     try {
                         const memoString = new TextDecoder().decode(memoData);
                         const meta = meta_1.ProtocolMetaParser.parse(memoString);
-                        if (meta && meta.version !== '1') {
-                            return null;
+                        if (meta && meta.version === '1') {
+                            return meta;
                         }
-                        return meta;
+                        // Continue searching if this memo is not a valid protocol meta
                     }
                     catch {
-                        return null;
+                        // Continue searching if this memo cannot be parsed
                     }
                 }
             }
@@ -151,13 +263,13 @@ class SolanaAdapter extends base_1.BaseChainAdapter {
                     try {
                         const memoString = new TextDecoder().decode(memoData);
                         const meta = meta_1.ProtocolMetaParser.parse(memoString);
-                        if (meta && meta.version !== '1') {
-                            return null;
+                        if (meta && meta.version === '1') {
+                            return meta;
                         }
-                        return meta;
+                        // Continue searching if this memo is not a valid protocol meta
                     }
                     catch {
-                        return null;
+                        // Continue searching if this memo cannot be parsed
                     }
                 }
             }
@@ -195,7 +307,7 @@ class SolanaAdapter extends base_1.BaseChainAdapter {
         // Additional Solana-specific validation can be added here
         // For example, checking transaction signatures, recent blockhash, etc.
         // Verify that the memo instruction contains the expected protocol meta
-        const decodedMeta = this.decode(tx);
+        const decodedMeta = this.decodeMeta(tx);
         if (!decodedMeta) {
             return false;
         }
@@ -213,52 +325,6 @@ class SolanaAdapter extends base_1.BaseChainAdapter {
             decodedMeta.iss === meta.iss &&
             decodedMeta.params === meta.params);
     }
-    /**
-     * Decode protocol meta from base64 string (for backward compatibility)
-     * @param base64String - Base64 encoded transaction
-     * @returns Decoded ProtocolMetaV1 or null
-     */
-    decodeFromBase64(base64String) {
-        try {
-            const buffer = buffer_1.Buffer.from(base64String, 'base64');
-            // Try legacy first, then versioned
-            try {
-                const transaction = web3_js_1.Transaction.from(buffer);
-                return this.decode(transaction);
-            }
-            catch {
-                const transaction = web3_js_1.VersionedTransaction.deserialize(buffer);
-                return this.decode(transaction);
-            }
-        }
-        catch {
-            return null;
-        }
-    }
-    /**
-     * Validate base64 transaction (for backward compatibility)
-     * @param base64String - Base64 encoded transaction
-     * @param authorities - Array of valid protocol authority public keys (base58)
-     * @param expectedPrefix - Expected protocol prefix (default: 'DEFAULT')
-     * @returns True if transaction is valid
-     */
-    validateFromBase64(base64String, authorities, expectedPrefix = 'DEFAULT') {
-        try {
-            const buffer = buffer_1.Buffer.from(base64String, 'base64');
-            // Try legacy first, then versioned
-            try {
-                const transaction = web3_js_1.Transaction.from(buffer);
-                return this.validate(transaction, authorities, expectedPrefix);
-            }
-            catch {
-                const transaction = web3_js_1.VersionedTransaction.deserialize(buffer);
-                return this.validate(transaction, authorities, expectedPrefix);
-            }
-        }
-        catch {
-            return false;
-        }
-    }
     verifyCodeSignature(actionCode) {
         try {
             const message = this.getCodeSignatureMessage(actionCode.code, actionCode.timestamp, actionCode.prefix);
@@ -272,30 +338,48 @@ class SolanaAdapter extends base_1.BaseChainAdapter {
         }
     }
     /**
-     * Sign the transaction with the protocol key using a callback approach
-     * @param signCallback - Callback function that performs the actual signing
-     * @returns Promise that resolves to the signed transaction
+     * Decode protocol meta from base64 string (for backward compatibility)
+     * @param base64String - Base64 encoded transaction
+     * @returns Decoded ProtocolMetaV1 or null
+     */
+    decodeFromBase64(base64String) {
+        return this.decodeMeta(base64String);
+    }
+    /**
+     * Sign the transaction with the protocol key
+     * @param actionCode - The action code containing the transaction
+     * @param key - The keypair to sign with
+     * @returns Promise that resolves to the signed action code
      */
     async signWithProtocolKey(actionCode, key) {
         try {
             if (!actionCode.transaction?.transaction) {
                 throw new Error('No transaction found');
             }
-            const tx = web3_js_1.Transaction.from(buffer_1.Buffer.from(actionCode.transaction.transaction, 'base64'));
-            tx.partialSign(key);
-            const meta = this.decode(tx);
+            const tx = this.deserializeTransaction(actionCode.transaction.transaction);
+            // Check if transaction has protocol meta
+            const meta = this.decodeMeta(tx);
             if (!meta) {
                 throw new Error('Invalid transaction, protocol meta not found');
             }
+            // Validate transaction integrity
             if (!this.validateTransactionIntegrity(tx, meta)) {
                 throw new Error('Invalid transaction, transaction integrity not valid');
             }
+            // Sign the transaction
+            if (tx instanceof web3_js_1.Transaction) {
+                tx.partialSign(key);
+            }
+            else if (tx instanceof web3_js_1.VersionedTransaction) {
+                tx.sign([key]);
+            }
+            else {
+                throw new Error('Invalid transaction type');
+            }
             const newActionCode = Object.assign({}, actionCode, {
                 transaction: {
                     ...actionCode.transaction,
-                    transaction: buffer_1.Buffer.from(tx.serialize({
-                        requireAllSignatures: false
-                    })).toString('base64'),
+                    transaction: tx.serialize({ requireAllSignatures: false }).toString('base64'),
                 }
             });
             return newActionCode;

package/dist/protocol.d.ts

@@ -68,13 +68,15 @@ export declare class ActionCodesProtocol {
      */
     createActionCode(pubkey: string, signFn: (message: string) => Promise<string>, chain: SupportedChain, prefix?: string, timestamp?: number): Promise<ActionCode>;
     /**
-     * Attach a transaction to an action code
+     * Attach a transaction to an action code with automatic protocol meta injection
      * @param actionCode - ActionCode to attach transaction to
-     * @param transaction - Chain-specific transaction data
+     * @param transaction - Chain-specific transaction data (serialized)
+     * @param issuer - Issuer public key for protocol meta, this is the proof of who is attaching the transaction to the action code
+     * @param params - Optional parameters for protocol meta
      * @param txType - Optional transaction type
-     * @returns Updated ActionCode
+     * @returns Updated ActionCode with injected protocol meta
      */
-    attachTransaction(actionCode: ActionCode, transaction: string, txType?: string): ActionCode;
+    attachTransaction(actionCode: ActionCode, transaction: string, issuer: string, params?: string, txType?: string): ActionCode;
     /**
      * Finalize an action code with transaction signature
      * @param actionCode - ActionCode to finalize
@@ -87,9 +89,10 @@ export declare class ActionCodesProtocol {
      * @param actionCode - ActionCode to create meta for
      * @param issuer - Optional issuer public key
      * @param params - Optional parameters
+     * @param timestamp - Optional timestamp (defaults to action code timestamp)
      * @returns ProtocolMetaV1 object
      */
-    createProtocolMeta(actionCode: ActionCode, issuer?: string, params?: string): ProtocolMetaV1;
+    createProtocolMeta(actionCode: ActionCode, issuer?: string, params?: string, timestamp?: number): ProtocolMetaV1;
     /**
      * Encode protocol meta for a specific chain
      * @param meta - ProtocolMetaV1 object
@@ -106,7 +109,7 @@ export declare class ActionCodesProtocol {
     decodeProtocolMeta(transaction: any, chain: string): ProtocolMetaV1 | null;
     /**
      * Validate a transaction with protocol meta
-     * @param transaction - Chain-specific transaction
+     * @param transaction - Chain-specific transaction (can be serialized string or deserialized object)
      * @param chain - Source chain
      * @param authorities - Array of valid protocol authority identifiers
      * @param expectedPrefix - Expected protocol prefix

package/dist/protocol.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"protocol.d.ts","sourceRoot":"","sources":["../src/protocol.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"protocol.d.ts","sourceRoot":"","sources":["../src/protocol.ts"],"names":[],"mappings":"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"}

package/dist/protocol.js

@@ -111,20 +111,39 @@ class ActionCodesProtocol {
         return actionCode;
     }
     /**
-     * Attach a transaction to an action code
+     * Attach a transaction to an action code with automatic protocol meta injection
      * @param actionCode - ActionCode to attach transaction to
-     * @param transaction - Chain-specific transaction data
+     * @param transaction - Chain-specific transaction data (serialized)
+     * @param issuer - Issuer public key for protocol meta, this is the proof of who is attaching the transaction to the action code
+     * @param params - Optional parameters for protocol meta
      * @param txType - Optional transaction type
-     * @returns Updated ActionCode
+     * @returns Updated ActionCode with injected protocol meta
      */
-    attachTransaction(actionCode, transaction, txType) {
+    attachTransaction(actionCode, transaction, issuer, params, txType) {
         const chain = actionCode.chain;
         if (!this.isChainSupported(chain)) {
             throw new Error(`Chain '${chain}' is not supported`);
         }
+        const adapter = this.getChainAdapter(chain);
+        if (!adapter) {
+            throw new Error(`No adapter found for chain '${chain}'`);
+        }
+        // Create protocol meta for the transaction using the action code's timestamp
+        const protocolMeta = this.createProtocolMeta(actionCode, issuer, params);
+        // Check if transaction already has protocol meta
+        const existingMeta = adapter.decodeMeta(transaction);
+        let finalTransaction;
+        if (existingMeta && existingMeta.id === protocolMeta.id) {
+            // Transaction already has the correct protocol meta, use as-is
+            finalTransaction = transaction;
+        }
+        else {
+            // Inject protocol meta into the transaction using the adapter
+            finalTransaction = adapter.injectMeta(transaction, protocolMeta);
+        }
         // Create transaction object
         const txObject = {
-            transaction,
+            transaction: finalTransaction,
             txType: txType || chain
         };
         // Update ActionCode
@@ -164,10 +183,11 @@ class ActionCodesProtocol {
      * @param actionCode - ActionCode to create meta for
      * @param issuer - Optional issuer public key
      * @param params - Optional parameters
+     * @param timestamp - Optional timestamp (defaults to action code timestamp)
      * @returns ProtocolMetaV1 object
      */
-    createProtocolMeta(actionCode, issuer, params) {
-        return meta_1.ProtocolMetaParser.fromInitiator(actionCode.pubkey, issuer || actionCode.pubkey, actionCode.prefix, params);
+    createProtocolMeta(actionCode, issuer, params, timestamp) {
+        return meta_1.ProtocolMetaParser.fromInitiator(actionCode.pubkey, issuer || actionCode.pubkey, actionCode.prefix, params, timestamp || actionCode.timestamp);
     }
     /**
      * Encode protocol meta for a specific chain
@@ -180,7 +200,7 @@ class ActionCodesProtocol {
         if (!adapter) {
             throw new Error(`Chain '${chain}' is not supported`);
         }
-        return adapter.encode(meta);
+        return adapter.encodeMeta(meta);
     }
     /**
      * Decode protocol meta from a transaction
@@ -193,11 +213,11 @@ class ActionCodesProtocol {
         if (!adapter) {
             return null;
         }
-        return adapter.decode(transaction);
+        return adapter.decodeMeta(transaction);
     }
     /**
      * Validate a transaction with protocol meta
-     * @param transaction - Chain-specific transaction
+     * @param transaction - Chain-specific transaction (can be serialized string or deserialized object)
      * @param chain - Source chain
      * @param authorities - Array of valid protocol authority identifiers
      * @param expectedPrefix - Expected protocol prefix
@@ -208,6 +228,7 @@ class ActionCodesProtocol {
         if (!adapter) {
             return false;
         }
+        // Otherwise use the regular validate method
         return adapter.validate(transaction, authorities, expectedPrefix);
     }
     /**
@@ -251,7 +272,7 @@ class ActionCodesProtocol {
         if (!adapter) {
             return null;
         }
-        return adapter.decode(transaction);
+        return adapter.decodeMeta(transaction);
     }
     /**
      * Get protocol configuration