@solana/rpc-graphql 2.0.0-experimental.99a64e9 → 2.0.0-experimental.9c8a30e

package/dist/index.native.js

@@ -34,7 +34,19 @@ function createGraphQLCache() {
 }
 
 // src/context.ts
-async function resolveAccount({ address, encoding = "jsonParsed", ...config }, cache, rpc) {
+async function resolveAccount({ address, encoding = "jsonParsed", ...config }, cache, rpc, info) {
+  if (info && info.fieldNodes[0].selectionSet) {
+    const selectionSet = info.fieldNodes[0].selectionSet;
+    const requestedFields = selectionSet.selections.map((field) => {
+      if (field.kind === "Field") {
+        return field.name.value;
+      }
+      return null;
+    });
+    if (requestedFields && requestedFields.length === 1 && requestedFields[0] === "address") {
+      return { address };
+    }
+  }
   const requestConfig = { encoding, ...config };
   const cached = cache.get(address, requestConfig);
   if (cached !== null) {
@@ -44,11 +56,14 @@ async function resolveAccount({ address, encoding = "jsonParsed", ...config }, c
     throw e;
   });
   if (account === null) {
-    return null;
+    return {
+      address
+    };
   }
   const [data, responseEncoding] = Array.isArray(account.data) ? encoding === "jsonParsed" ? [account.data[0], "base64"] : [account.data[0], encoding] : [account.data, "jsonParsed"];
   const queryResponse = {
     ...account,
+    address,
     data,
     encoding: responseEncoding
   };
@@ -82,13 +97,14 @@ async function resolveProgramAccounts({ programAddress, encoding = "jsonParsed",
   }).catch((e) => {
     throw e;
   });
-  const queryResponse = programAccounts.map((programAccount2) => {
-    const [data, responseEncoding] = Array.isArray(programAccount2.account.data) ? encoding === "jsonParsed" ? [programAccount2.account.data[0], "base64"] : [programAccount2.account.data[0], encoding] : [programAccount2.account.data, "jsonParsed"];
-    const pubkey = programAccount2.pubkey;
-    const account = { ...programAccount2.account, data, encoding: responseEncoding };
+  const queryResponse = programAccounts.map((programAccount) => {
+    const [data, responseEncoding] = Array.isArray(programAccount.account.data) ? encoding === "jsonParsed" ? [programAccount.account.data[0], "base64"] : [programAccount.account.data[0], encoding] : [programAccount.account.data, "jsonParsed"];
+    const pubkey = programAccount.pubkey;
     return {
-      account,
-      pubkey
+      ...programAccount.account,
+      address: pubkey,
+      data,
+      encoding: responseEncoding
     };
   });
   cache.insert(programAddress, requestConfig, queryResponse);
@@ -123,8 +139,8 @@ function createSolanaGraphQLContext(rpc) {
   const cache = createGraphQLCache();
   return {
     cache,
-    resolveAccount(args) {
-      return resolveAccount(args, this.cache, this.rpc);
+    resolveAccount(args, info) {
+      return resolveAccount(args, this.cache, this.rpc, info);
     },
     resolveBlock(args) {
       return resolveBlock(args, this.cache, this.rpc);
@@ -266,7 +282,7 @@ var dataSliceInputType = () => {
         length: number(),
         offset: number()
       },
-      name: "DataSliceConfig"
+      name: "DataSlice"
     });
   return memoisedDataSliceInputType;
 };
@@ -341,6 +357,7 @@ var memoisedAccountInterfaceFields;
 var accountInterfaceFields = () => {
   if (!memoisedAccountInterfaceFields) {
     memoisedAccountInterfaceFields = {
+      address: string(),
       encoding: string(),
       executable: boolean(),
       lamports: bigint(),
@@ -400,6 +417,7 @@ var accountType = (name, description, data) => new GraphQLObjectType({
   fields: {
     ...accountInterfaceFields(),
     data,
+    // Nested Account interface
     owner: {
       args: {
         commitment: type(commitmentInputType()),
@@ -407,7 +425,7 @@ var accountType = (name, description, data) => new GraphQLObjectType({
         encoding: type(accountEncodingInputType()),
         minContextSlot: bigint()
       },
-      resolve: (parent, args, context) => context.resolveAccount({ ...args, address: parent.owner }),
+      resolve: (parent, args, context, info) => context.resolveAccount({ ...args, address: parent.owner }, info),
       type: accountInterface()
     }
   },
@@ -451,7 +469,18 @@ var accountNonceAccount = () => {
       "NonceAccount",
       "A nonce account",
       accountDataJsonParsed("Nonce", {
-        authority: string(),
+        // Nested Account interface
+        authority: {
+          args: {
+            commitment: type(commitmentInputType()),
+            dataSlice: type(dataSliceInputType()),
+            encoding: type(accountEncodingInputType()),
+            minContextSlot: bigint()
+          },
+          // eslint-disable-next-line @typescript-eslint/no-explicit-any
+          resolve: (parent, args, context, info) => context.resolveAccount({ ...args, address: parent.authority }, info),
+          type: accountInterface()
+        },
         blockhash: string(),
         feeCalculator: object("NonceFeeCalculator", {
           lamportsPerSignature: string()
@@ -468,7 +497,18 @@ var accountLookupTable = () => {
       "An address lookup table account",
       accountDataJsonParsed("LookupTable", {
         addresses: list(string()),
-        authority: string(),
+        // Nested Account interface
+        authority: {
+          args: {
+            commitment: type(commitmentInputType()),
+            dataSlice: type(dataSliceInputType()),
+            encoding: type(accountEncodingInputType()),
+            minContextSlot: bigint()
+          },
+          // eslint-disable-next-line @typescript-eslint/no-explicit-any
+          resolve: (parent, args, context, info) => context.resolveAccount({ ...args, address: parent.authority }, info),
+          type: accountInterface()
+        },
         deactivationSlot: string(),
         lastExtendedSlot: string(),
         lastExtendedSlotStartIndex: number()
@@ -486,7 +526,18 @@ var accountMint = () => {
         decimals: number(),
         freezeAuthority: string(),
         isInitialized: boolean(),
-        mintAuthority: string(),
+        // Nested Account interface
+        mintAuthority: {
+          args: {
+            commitment: type(commitmentInputType()),
+            dataSlice: type(dataSliceInputType()),
+            encoding: type(accountEncodingInputType()),
+            minContextSlot: bigint()
+          },
+          // eslint-disable-next-line @typescript-eslint/no-explicit-any
+          resolve: (parent, args, context, info) => context.resolveAccount({ ...args, address: parent.mintAuthority }, info),
+          type: accountInterface()
+        },
         supply: string()
       })
     );
@@ -501,7 +552,18 @@ var accountTokenAccount = () => {
       accountDataJsonParsed("TokenAccount", {
         isNative: boolean(),
         mint: string(),
-        owner: string(),
+        // Nested Account interface
+        owner: {
+          args: {
+            commitment: type(commitmentInputType()),
+            dataSlice: type(dataSliceInputType()),
+            encoding: type(accountEncodingInputType()),
+            minContextSlot: bigint()
+          },
+          // eslint-disable-next-line @typescript-eslint/no-explicit-any
+          resolve: (parent, args, context, info) => context.resolveAccount({ ...args, address: parent.owner }, info),
+          type: accountInterface()
+        },
         state: string(),
         tokenAmount: type(tokenAmountType())
       })
@@ -517,11 +579,44 @@ var accountStakeAccount = () => {
       accountDataJsonParsed("Stake", {
         meta: object("StakeMeta", {
           authorized: object("StakeMetaAuthorized", {
-            staker: string(),
-            withdrawer: string()
+            // Nested Account interface
+            staker: {
+              args: {
+                commitment: type(commitmentInputType()),
+                dataSlice: type(dataSliceInputType()),
+                encoding: type(accountEncodingInputType()),
+                minContextSlot: bigint()
+              },
+              // eslint-disable-next-line @typescript-eslint/no-explicit-any
+              resolve: (parent, args, context, info) => context.resolveAccount({ ...args, address: parent.staker }, info),
+              type: accountInterface()
+            },
+            // Nested Account interface
+            withdrawer: {
+              args: {
+                commitment: type(commitmentInputType()),
+                dataSlice: type(dataSliceInputType()),
+                encoding: type(accountEncodingInputType()),
+                minContextSlot: bigint()
+              },
+              // eslint-disable-next-line @typescript-eslint/no-explicit-any
+              resolve: (parent, args, context, info) => context.resolveAccount({ ...args, address: parent.withdrawer }, info),
+              type: accountInterface()
+            }
           }),
           lockup: object("StakeMetaLockup", {
-            custodian: string(),
+            // Nested Account interface
+            custodian: {
+              args: {
+                commitment: type(commitmentInputType()),
+                dataSlice: type(dataSliceInputType()),
+                encoding: type(accountEncodingInputType()),
+                minContextSlot: bigint()
+              },
+              // eslint-disable-next-line @typescript-eslint/no-explicit-any
+              resolve: (parent, args, context, info) => context.resolveAccount({ ...args, address: parent.custodian }, info),
+              type: accountInterface()
+            },
             epoch: bigint(),
             unixTimestamp: bigint()
           }),
@@ -533,7 +628,18 @@ var accountStakeAccount = () => {
             activationEpoch: bigint(),
             deactivationEpoch: bigint(),
             stake: string(),
-            voter: string(),
+            // Nested Account interface
+            voter: {
+              args: {
+                commitment: type(commitmentInputType()),
+                dataSlice: type(dataSliceInputType()),
+                encoding: type(accountEncodingInputType()),
+                minContextSlot: bigint()
+              },
+              // eslint-disable-next-line @typescript-eslint/no-explicit-any
+              resolve: (parent, args, context, info) => context.resolveAccount({ ...args, address: parent.voter }, info),
+              type: accountInterface()
+            },
             warmupCooldownRate: number()
           })
         })
@@ -550,11 +656,33 @@ var accountVoteAccount = () => {
       accountDataJsonParsed("Vote", {
         authorizedVoters: list(
           object("VoteAuthorizedVoter", {
-            authorizedVoter: string(),
+            // Nested Account interface
+            authorizedVoter: {
+              args: {
+                commitment: type(commitmentInputType()),
+                dataSlice: type(dataSliceInputType()),
+                encoding: type(accountEncodingInputType()),
+                minContextSlot: bigint()
+              },
+              // eslint-disable-next-line @typescript-eslint/no-explicit-any
+              resolve: (parent, args, context, info) => context.resolveAccount({ ...args, address: parent.authorizedVoter }, info),
+              type: accountInterface()
+            },
             epoch: bigint()
           })
         ),
-        authorizedWithdrawer: string(),
+        // Nested Account interface
+        authorizedWithdrawer: {
+          args: {
+            commitment: type(commitmentInputType()),
+            dataSlice: type(dataSliceInputType()),
+            encoding: type(accountEncodingInputType()),
+            minContextSlot: bigint()
+          },
+          // eslint-disable-next-line @typescript-eslint/no-explicit-any
+          resolve: (parent, args, context, info) => context.resolveAccount({ ...args, address: parent.authorizedWithdrawer }, info),
+          type: accountInterface()
+        },
         commission: number(),
         epochCredits: list(
           object("VoteEpochCredits", {
@@ -567,7 +695,18 @@ var accountVoteAccount = () => {
           slot: bigint(),
           timestamp: bigint()
         }),
-        nodePubkey: string(),
+        // Nested Account interface
+        node: {
+          args: {
+            commitment: type(commitmentInputType()),
+            dataSlice: type(dataSliceInputType()),
+            encoding: type(accountEncodingInputType()),
+            minContextSlot: bigint()
+          },
+          // eslint-disable-next-line @typescript-eslint/no-explicit-any
+          resolve: (parent, args, context, info) => context.resolveAccount({ ...args, address: parent.nodePubkey }, info),
+          type: accountInterface()
+        },
         priorVoters: list(string()),
         rootSlot: bigint(),
         votes: list(
@@ -607,7 +746,8 @@ var accountQuery = () => ({
       encoding: type(accountEncodingInputType()),
       minContextSlot: bigint()
     },
-    resolve: (_parent, args, context) => context.resolveAccount(args),
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    resolve: (_parent, args, context, info) => context.resolveAccount(args, info),
     type: accountInterface()
   }
 });
@@ -2136,15 +2276,6 @@ var blockQuery = () => ({
     type: blockInterface()
   }
 });
-var programAccount = () => new GraphQLObjectType({
-  fields: {
-    account: type(accountInterface()),
-    pubkey: string()
-  },
-  name: "ProgramAccount"
-});
-
-// src/schema/program-accounts/query.ts
 var programAccountsQuery = () => ({
   programAccounts: {
     args: {
@@ -2157,7 +2288,7 @@ var programAccountsQuery = () => ({
       withContext: string()
     },
     resolve: (_parent, args, context) => context.resolveProgramAccounts(args),
-    type: new GraphQLList(programAccount())
+    type: new GraphQLList(accountInterface())
   }
 });