feat: decode standard instructions

Author: xavier-brochard

packages/snap/package.json

@@ -52,6 +52,7 @@
     "@solana-program/compute-budget": "0.7.0",
     "@solana-program/system": "0.7.0",
     "@solana-program/token": "0.5.1",
+    "@solana-program/token-2022": "^0.4.2",
     "@solana/kit": "2.1.0",
     "@testing-library/jest-dom": "^6.6.2",
     "@types/express": "^5.0.0",

packages/snap/src/core/serialization/deserialize.test.ts

@@ -86,4 +86,10 @@ describe('deserialize', () => {
       nullValue: null,
     });
   });
+
+  it('deserializes Uint8Array', () => {
+    const input = { __type: 'Uint8Array', value: 'AQID' };
+    const result = deserialize(input);
+    expect(result).toStrictEqual(new Uint8Array([1, 2, 3]));
+  });
 });

packages/snap/src/core/serialization/deserialize.ts

@@ -1,4 +1,5 @@
 import type { Json } from '@metamask/snaps-sdk';
+import { getBase64Codec } from '@solana/kit';
 import BigNumber from 'bignumber.js';
 
 import type { Serializable } from './types';
@@ -28,5 +29,9 @@ export const deserialize = (serializedValue: Json): Serializable =>
       return BigInt(value.value);
     }
 
+    if (value.__type === 'Uint8Array') {
+      return getBase64Codec().encode(value.value);
+    }
+
     return value;
   });

packages/snap/src/core/serialization/serialize.test.ts

@@ -95,4 +95,13 @@ describe('serialize', () => {
       },
     });
   });
+
+  it('serializes Uint8Array', () => {
+    const input = new Uint8Array([1, 2, 3]);
+    const result = serialize(input);
+    expect(result).toStrictEqual({
+      __type: 'Uint8Array',
+      value: 'AQID',
+    });
+  });
 });

packages/snap/src/core/serialization/serialize.ts

@@ -1,5 +1,6 @@
 /* eslint-disable @typescript-eslint/naming-convention */
 import type { Json } from '@metamask/snaps-sdk';
+import { getBase64Codec } from '@solana/kit';
 import BigNumber from 'bignumber.js';
 import { cloneDeepWith } from 'lodash';
 
@@ -35,6 +36,13 @@ export const serialize = (value: Serializable): Record<string, Json> =>
       };
     }
 
+    if (val instanceof Uint8Array) {
+      return {
+        __type: 'Uint8Array',
+        value: getBase64Codec().decode(val),
+      };
+    }
+
     // Return undefined to let lodash handle the cloning of other values
     return undefined;
   });

packages/snap/src/core/serialization/types.ts

@@ -10,6 +10,7 @@ export type Serializable =
   | null
   | bigint
   | BigNumber
+  | Uint8Array
   | Serializable[]
   | {
       [prop: string]: Serializable;

packages/snap/src/core/services/execution/TransactionHelper.test.ts

@@ -199,7 +199,6 @@ describe('TransactionHelper', () => {
       transactionMessageBase64Encoded,
       getMultipleAccountsResponse,
       signedTransaction,
-      signedTransactionBase64Encoded,
       signature,
     } = scenario;
 
@@ -218,28 +217,6 @@ describe('TransactionHelper', () => {
       });
     });
 
-    describe('extractInstructionsFromBase64String', () => {
-      it(`Scenario ${name}: successfully extracts instructions from a base64 encoded transaction message`, async () => {
-        const result =
-          await transactionHelper.extractInstructionsFromUnknownBase64String(
-            transactionMessageBase64Encoded,
-            scope,
-          );
-
-        expect(result).not.toHaveLength(0);
-      });
-
-      it(`Scenario ${name}: successfully extracts instructions from a base64 encoded transaction`, async () => {
-        const result =
-          await transactionHelper.extractInstructionsFromUnknownBase64String(
-            signedTransactionBase64Encoded,
-            scope,
-          );
-
-        expect(result).not.toHaveLength(0);
-      });
-    });
-
     describe('partiallySignBase64String', () => {
       describe('when the base64 string represents a transaction message', () => {
         it(`Scenario ${name}: signs a transaction message successfully`, async () => {

packages/snap/src/core/services/execution/TransactionHelper.ts

@@ -2,7 +2,6 @@ import type { Infer } from '@metamask/superstruct';
 import { assert } from '@metamask/superstruct';
 import type {
   BaseTransactionMessage,
-  CompilableTransactionMessage,
   GetTransactionApi,
   Transaction,
   TransactionMessageBytesBase64,
@@ -22,7 +21,7 @@ import {
   type Blockhash,
 } from '@solana/kit';
 
-import type { SolanaKeyringAccount } from '../../../entities';
+import { type SolanaKeyringAccount } from '../../../entities';
 import type { Network } from '../../constants/solana';
 import type { DecompileTransactionMessageFetchingLookupTablesConfig } from '../../sdk-extensions/codecs';
 import {
@@ -394,37 +393,4 @@ export class TransactionHelper {
 
     return partiallySignTransaction([keyPair], transaction);
   }
-
-  /**
-   * Extracts the instructions from a base64 string, adapting the logic depending on whether
-   * the string represents a transaction or a transaction message.
-   *
-   * @param base64EncodedString - The base64 encoded string to extract the instructions from.
-   * @param scope - The network on which the transaction is being sent.
-   * @returns The instructions from the base64 encoded string.
-   * @throws If the base64 encoded string is not a valid transaction or transaction message.
-   */
-  async extractInstructionsFromUnknownBase64String(
-    base64EncodedString: Infer<typeof Base64Struct>,
-    scope: Network,
-  ): Promise<CompilableTransactionMessage['instructions']> {
-    const rpc = this.#connection.getRpc(scope);
-
-    const transactionOrTransactionMessage =
-      await fromUnknowBase64StringToTransactionOrTransactionMessage(
-        base64EncodedString,
-        rpc,
-      );
-
-    if ('instructions' in transactionOrTransactionMessage) {
-      return transactionOrTransactionMessage.instructions;
-    }
-
-    const transactionMessage = await fromBytesToCompilableTransactionMessage(
-      transactionOrTransactionMessage.messageBytes,
-      rpc,
-    );
-
-    return transactionMessage.instructions;
-  }
 }

packages/snap/src/core/utils/instructions.ts

@@ -1 +1,2 @@
+export * from './instructions';
 export * from './keyring-account';