refactor(experimental): fix memo instructions in GraphQL

This PR fixes the `transformParsedInstruction(..)` function to support proper parsing of `spl-memo` instructions.
solana-labs · Jan 9, 2024 · 7f1f0fd · 7f1f0fd
1 parent 0835c79
commit 7f1f0fd
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 1 deletion.
diff --git a/packages/rpc-graphql/src/__tests__/__setup__.ts b/packages/rpc-graphql/src/__tests__/__setup__.ts
@@ -1385,6 +1385,9 @@ export const mockTransactionStake = {
     },
 };
 
+// There's a memo instruction in this one
+export const mockTransactionMemo = mockTransactionStake;
+
 export const mockTransactionVote = {
     blockTime: 1699617237,
     meta: {

diff --git a/packages/rpc-graphql/src/__tests__/transaction-tests.ts b/packages/rpc-graphql/src/__tests__/transaction-tests.ts
@@ -16,6 +16,7 @@ import {
     mockTransactionBase58,
     mockTransactionBase64,
     mockTransactionGeneric,
+    mockTransactionMemo,
     mockTransactionSystem,
     mockTransactionToken,
     mockTransactionVote,
@@ -562,6 +563,45 @@ describe('transaction', () => {
                 },
             });
         });
+        it('can get a `SplMemoInstruction` instruction', async () => {
+            expect.assertions(1);
+            fetchMock.mockOnce(JSON.stringify(mockRpcResponse(mockTransactionMemo)));
+            const source = /* GraphQL */ `
+                query testQuery {
+                    transaction(signature: "${defaultTransactionSignature}") {
+                        ... on TransactionParsed {
+                            data {
+                                message {
+                                    instructions {
+                                            programId
+                                        ... on SplMemoInstruction {
+                                            memo
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            `;
+            const result = await rpcGraphQL.query(source);
+            expect(result).toMatchObject({
+                data: {
+                    transaction: {
+                        data: {
+                            message: {
+                                instructions: expect.arrayContaining([
+                                    {
+                                        memo: 'fb_07ce1448',
+                                        programId: 'MemoSq4gqABAXKb96qnH8TysNcWxMyWCqXgDLGmfcHr',
+                                    },
+                                ]),
+                            },
+                        },
+                    },
+                },
+            });
+        });
         it('can get a `InitializeMint` instruction', async () => {
             expect.assertions(1);
             fetchMock.mockOnce(JSON.stringify(mockRpcResponse(mockTransactionToken)));

diff --git a/packages/rpc-graphql/src/loaders/transformers/transaction.ts b/packages/rpc-graphql/src/loaders/transformers/transaction.ts
@@ -2,6 +2,11 @@
 
 function transformParsedInstruction(parsedInstruction: any) {
     if ('parsed' in parsedInstruction) {
+        if (typeof parsedInstruction.parsed === 'string' && parsedInstruction.program === 'spl-memo') {
+            const { parsed: memo, program: programName, programId } = parsedInstruction;
+            const instructionType = 'memo';
+            return { instructionType, memo, programId, programName };
+        }
         const {
             parsed: { info: data, type: instructionType },
             program: programName,

diff --git a/packages/rpc-graphql/src/schema/instruction.ts b/packages/rpc-graphql/src/schema/instruction.ts
@@ -189,7 +189,7 @@ export const instructionTypeDefs = /* GraphQL */ `
     # SplMemo
     type SplMemoInstruction implements TransactionInstruction {
         programId: Address
-        data: String
+        memo: String
     }
 
     # SplToken: InitializeMint