fix: incorrect query at block hash or tag (#56)

tien · Jul 26, 2024 · 18cb167 · 18cb167
1 parent 6c91896
commit 18cb167
Show file tree

Hide file tree

Showing 3 changed files with 56 additions and 45 deletions.
diff --git a/.changeset/sharp-ladybugs-move.md b/.changeset/sharp-ladybugs-move.md
@@ -0,0 +1,5 @@
+---
+"@reactive-dot/core": patch
+---
+
+Fix query crashing when specifying the `at` option.
diff --git a/packages/core/src/actions/query.ts b/packages/core/src/actions/query.ts
@@ -46,22 +46,29 @@ export function query<
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
       return (api.apis[instruction.pallet]![instruction.api] as any)(
         ...instruction.args,
-        { signal: options?.signal },
+        { signal: options?.signal, at: instruction.at },
       );
-    case "read-storage":
-      return (
+    case "read-storage": {
+      const storageEntry = api.query[instruction.pallet]![
+        instruction.storage
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        (api.query[instruction.pallet]![instruction.storage] as any).watchValue(
-          ...instruction.args,
-        )
-      );
+      ] as any;
+
+      return instruction.at?.startsWith("0x")
+        ? storageEntry.getValue(...instruction.args, { at: instruction.at })
+        : storageEntry.watchValue(
+            ...instruction.args,
+            ...[instruction.at].filter((x) => x !== undefined),
+          );
+    }
     case "read-storage-entries":
       return (
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         (api.query[instruction.pallet]![instruction.storage] as any).getEntries(
           ...instruction.args,
           {
             signal: options?.signal,
+            at: instruction.at,
           },
         )
       );

diff --git a/packages/core/src/query-builder.ts b/packages/core/src/query-builder.ts
@@ -8,8 +8,6 @@ type PapiCallOptions = Partial<{
   signal: AbortSignal;
 }>;
 
-type CallOptions = Omit<PapiCallOptions, "signal">;
-
 type OmitCallOptions<T extends readonly unknown[]> = T extends [
   infer Head,
   ...infer Tail,
@@ -20,20 +18,20 @@ type OmitCallOptions<T extends readonly unknown[]> = T extends [
   : [];
 
 type InferPapiStorageEntry<T> = T extends {
-  watchValue: (...args: [...infer Args, infer At]) => infer Response;
+  watchValue: (...args: [...infer Args, infer _]) => infer Response;
 }
-  ? { args: Args; options: { at: At }; response: Response }
-  : { args: unknown[]; options: unknown; response: unknown };
+  ? { args: Args; response: Response }
+  : { args: unknown[]; response: unknown };
 
 type InferPapiStorageEntries<T> = T extends {
   getEntries: (...args: infer Args) => infer Response;
 }
-  ? { args: OmitCallOptions<Args>; options: CallOptions; response: Response }
-  : { args: unknown[]; options: unknown; response: unknown };
+  ? { args: OmitCallOptions<Args>; response: Response }
+  : { args: unknown[]; response: unknown };
 
 type InferPapiRuntimeCall<T> = T extends (...args: infer Args) => infer Response
-  ? { args: OmitCallOptions<Args>; options: CallOptions; response: Response }
-  : { args: unknown[]; options: unknown; response: unknown };
+  ? { args: OmitCallOptions<Args>; response: Response }
+  : { args: unknown[]; response: unknown };
 
 type InferPapiConstantEntry<T> = T extends {
   (): Promise<infer Payload>;
@@ -42,6 +40,8 @@ type InferPapiConstantEntry<T> = T extends {
   ? Promise<Payload>
   : unknown;
 
+type At = "best" | "finalized" | `0x${string}`;
+
 type BaseInstruction<T extends string> = {
   instruction: T;
 };
@@ -66,6 +66,7 @@ export type StorageReadInstruction<
   pallet: TPallet;
   storage: TStorage;
   args: TArguments;
+  at: At | undefined;
 };
 
 export type StorageEntriesReadInstruction<
@@ -79,6 +80,7 @@ export type StorageEntriesReadInstruction<
   pallet: TPallet;
   storage: TStorage;
   args: TArguments;
+  at: At | undefined;
 };
 
 export type ApiCallInstruction<
@@ -92,6 +94,7 @@ export type ApiCallInstruction<
   pallet: TPallet;
   api: TApi;
   args: TArguments;
+  at: At | undefined;
 };
 
 export type MultiInstruction<TInstruction extends BaseInstruction<string>> =
@@ -253,15 +256,18 @@ export class Query<
     TArguments extends InferPapiStorageEntry<
       TypedApi<TDescriptor>["query"][TPallet][TStorage]
     >["args"],
-    TOptions extends InferPapiStorageEntry<
-      TypedApi<TDescriptor>["query"][TPallet][TStorage]
-    >["options"],
-  >(pallet: TPallet, storage: TStorage, args: TArguments, options?: TOptions) {
+  >(
+    pallet: TPallet,
+    storage: TStorage,
+    args: TArguments,
+    options?: { at?: At },
+  ) {
     return this.#append({
       instruction: "read-storage",
       pallet,
       storage,
-      args: options === undefined ? args : [...args, options],
+      args,
+      at: options?.at,
     });
   }
 
@@ -271,21 +277,18 @@ export class Query<
     TArguments extends InferPapiStorageEntry<
       TypedApi<TDescriptor>["query"][TPallet][TStorage]
     >["args"],
-    TOptions extends InferPapiStorageEntry<
-      TypedApi<TDescriptor>["query"][TPallet][TStorage]
-    >["options"],
   >(
     pallet: TPallet,
     storage: TStorage,
     args: TArguments[],
-    options?: TOptions,
+    options?: { at?: At },
   ) {
     return this.#append({
       instruction: "read-storage",
       pallet,
       storage,
-      args:
-        options === undefined ? args : args.map((args) => [...args, options]),
+      args,
+      at: options?.at,
       multi: true,
     });
   }
@@ -296,17 +299,18 @@ export class Query<
     TArguments extends InferPapiStorageEntries<
       TypedApi<TDescriptor>["query"][TPallet][TStorage]
     >["args"],
-    TOptions extends Array<
-      InferPapiStorageEntries<
-        TypedApi<TDescriptor>["query"][TPallet][TStorage]
-      >["options"]
-    >,
-  >(pallet: TPallet, storage: TStorage, args: TArguments, options?: TOptions) {
+  >(
+    pallet: TPallet,
+    storage: TStorage,
+    args: TArguments,
+    options?: { at?: At },
+  ) {
     return this.#append({
       instruction: "read-storage-entries",
       pallet,
       storage,
-      args: options === undefined ? args : [...args, options],
+      args,
+      at: options?.at,
     });
   }
 
@@ -316,15 +320,13 @@ export class Query<
     TArguments extends InferPapiRuntimeCall<
       TypedApi<TDescriptor>["apis"][TPallet][TApi]
     >["args"],
-    TOptions extends InferPapiRuntimeCall<
-      TypedApi<TDescriptor>["apis"][TPallet][TApi]
-    >["options"],
-  >(pallet: TPallet, api: TApi, args: TArguments, options?: TOptions) {
+  >(pallet: TPallet, api: TApi, args: TArguments, options?: { at?: At }) {
     return this.#append({
       instruction: "call-api",
       pallet,
       api,
-      args: options === undefined ? args : [...args, options],
+      args,
+      at: options?.at,
     });
   }
 
@@ -334,16 +336,13 @@ export class Query<
     TArguments extends InferPapiRuntimeCall<
       TypedApi<TDescriptor>["apis"][TPallet][TApi]
     >["args"],
-    TOptions extends InferPapiRuntimeCall<
-      TypedApi<TDescriptor>["apis"][TPallet][TApi]
-    >["options"],
-  >(pallet: TPallet, api: TApi, args: TArguments[], options?: TOptions) {
+  >(pallet: TPallet, api: TApi, args: TArguments[], options?: { at?: At }) {
     return this.#append({
       instruction: "call-api",
       pallet,
       api,
-      args:
-        options === undefined ? args : args.map((args) => [...args, options]),
+      args,
+      at: options?.at,
       multi: true,
     });
   }