@solana/rpc-graphql 2.0.0-experimental.aa4a701 → 2.0.0-experimental.b419cd0

package/dist/index.node.js

@@ -210,12 +210,13 @@ async function loadTransaction({ signature, ...config }, cache, rpc, _info) {
 
 // src/loaders/block.ts
 function normalizeArgs3(args) {
-  const { commitment, encoding, transactionDetails } = args;
+  const { commitment, encoding, slot, transactionDetails } = args;
   return {
     commitment: commitment ?? "confirmed",
     encoding: encoding ?? "jsonParsed",
     // Always use 0 to avoid silly errors
     maxSupportedTransactionVersion: 0,
+    slot,
     transactionDetails: transactionDetails ?? "full"
   };
 }
@@ -250,23 +251,34 @@ function processQueryResponse3({
     transactionDetails
   };
 }
-async function loadBlock({ slot, ...config }, cache, rpc, _info) {
-  const requestConfig = normalizeArgs3(config);
-  const { encoding, transactionDetails } = requestConfig;
-  const cached = cache.get(slot, config);
-  if (cached !== null) {
-    return cached;
-  }
-  const block = await rpc.getBlock(slot, requestConfig).send().catch((e) => {
+async function loadBlock(rpc, { slot, ...config }) {
+  const { encoding, transactionDetails } = config;
+  const block = await rpc.getBlock(slot, config).send().catch((e) => {
     throw e;
   });
   if (block === null) {
     return { slot };
   }
   const queryResponse = processQueryResponse3({ block, encoding, transactionDetails });
-  cache.insert(slot, requestConfig, queryResponse);
   return queryResponse;
 }
+function createBlockBatchLoadFn(rpc) {
+  const resolveBlockUsingRpc = loadBlock.bind(null, rpc);
+  return async (blockQueryArgs) => {
+    return await Promise.all(blockQueryArgs.map(async (args) => await resolveBlockUsingRpc(args)));
+  };
+}
+function createBlockLoader(rpc) {
+  const loader = new DataLoader(createBlockBatchLoadFn(rpc), { cacheKeyFn: fastStableStringify });
+  return {
+    load: async (args, info) => {
+      if (onlyPresentFieldRequested("slot", info)) {
+        return { slot: args.slot };
+      }
+      return loader.load(normalizeArgs3(args));
+    }
+  };
+}
 
 // src/loaders/program-accounts.ts
 function normalizeArgs4(args) {
@@ -323,10 +335,8 @@ function createSolanaGraphQLContext(rpc) {
   const cache = createGraphQLCache();
   return {
     accountLoader: createAccountLoader(rpc),
+    blockLoader: createBlockLoader(rpc),
     cache,
-    loadBlock(args, info) {
-      return loadBlock(args, this.cache, this.rpc);
-    },
     loadProgramAccounts(args, info) {
       return loadProgramAccounts(args, this.cache, this.rpc);
     },
@@ -2976,7 +2986,7 @@ var schemaResolvers = {
       return context.accountLoader.load(args, info);
     },
     block(_, args, context, info) {
-      return context.loadBlock(args, info);
+      return context.blockLoader.load(args, info);
     },
     programAccounts(_, args, context, info) {
       return context.loadProgramAccounts(args, info);