Fix return type of getTokenAccountsByDelegate/Owner (#2027)

solana-labs · Jan 11, 2024 · 23420ec · 23420ec
1 parent acab173
commit 23420ec
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 4 deletions.
diff --git a/packages/rpc-core/src/rpc-methods/__typetests__/rpc-methods-test.ts b/packages/rpc-core/src/rpc-methods/__typetests__/rpc-methods-test.ts
@@ -0,0 +1,36 @@
+import { Address } from '@solana/addresses';
+import { Rpc } from '@solana/rpc-transport';
+
+import { SolanaRpcMethods } from '..';
+
+const rpc = {} as unknown as Rpc<SolanaRpcMethods>;
+
+// getTokenAccountsByDelegate
+async () => {
+    const tokenAccountsByDelegate = await rpc
+        .getTokenAccountsByDelegate(
+            'delegate' as Address,
+            { programId: 'program' as Address },
+            { encoding: 'jsonParsed' },
+        )
+        .send();
+
+    const firstAccount = tokenAccountsByDelegate.value[0];
+    firstAccount.pubkey satisfies Address;
+    firstAccount.account.data.program satisfies Address;
+    firstAccount.account.data.parsed.type satisfies 'account';
+    firstAccount.account.data.parsed.info.mint satisfies Address;
+};
+
+// getTokenAccountsByOwner
+async () => {
+    const tokenAccountsByOwner = await rpc
+        .getTokenAccountsByOwner('owner' as Address, { programId: 'program' as Address }, { encoding: 'jsonParsed' })
+        .send();
+
+    const firstAccount = tokenAccountsByOwner.value[0];
+    firstAccount.pubkey satisfies Address;
+    firstAccount.account.data.program satisfies Address;
+    firstAccount.account.data.parsed.type satisfies 'account';
+    firstAccount.account.data.parsed.info.mint satisfies Address;
+};
diff --git a/packages/rpc-core/src/rpc-methods/getTokenAccountsByDelegate.ts b/packages/rpc-core/src/rpc-methods/getTokenAccountsByDelegate.ts
@@ -19,11 +19,11 @@ import {
 type TokenAccountInfoWithJsonData = Readonly<{
     data: Readonly<{
         /** Name of the program that owns this account. */
-        program: {
+        program: Address;
+        parsed: {
             info: TokenAccount;
             type: 'account';
         };
-        parsed: unknown;
         space: U64UnsafeBeyond2Pow53Minus1;
     }>;
 }>;

diff --git a/packages/rpc-core/src/rpc-methods/getTokenAccountsByOwner.ts b/packages/rpc-core/src/rpc-methods/getTokenAccountsByOwner.ts
@@ -19,11 +19,11 @@ import {
 type TokenAccountInfoWithJsonData = Readonly<{
     data: Readonly<{
         /** Name of the program that owns this account. */
-        program: {
+        program: Address;
+        parsed: {
             info: TokenAccount;
             type: 'account';
         };
-        parsed: unknown;
         space: U64UnsafeBeyond2Pow53Minus1;
     }>;
 }>;