polkadot-api 1.6.1 → 1.6.2

package/dist/esm/storage.mjs

@@ -1,5 +1,5 @@
 import './utils/shareLatest.mjs';
-import { map, distinctUntilChanged, debounceTime } from 'rxjs';
+import { filter, take, map, identity, shareReplay, pipe, withLatestFrom, distinctUntilChanged, debounceTime } from 'rxjs';
 import { firstValueFromWithSignal } from './utils/firstValueFromWithSignal.mjs';
 import { raceMap } from './utils/raceMap.mjs';
 import { isOptionalArg } from './utils/optional-arg.mjs';
@@ -17,6 +17,18 @@ const createStorageEntry = (pallet, name, chainHead, {
   valuesAreCompatible
 }) => {
   const isSystemNumber = pallet === "System" && name === "Number";
+  const sysNumberMapper$ = chainHead.runtime$.pipe(
+    filter(Boolean),
+    take(1),
+    map(
+      ({ dynamicBuilder }) => typeof dynamicBuilder.buildStorage("System", "Number").dec(new Uint8Array(32)) === "bigint" ? BigInt : identity
+    ),
+    shareReplay()
+  );
+  const bigIntOrNumber = pipe(
+    withLatestFrom(sysNumberMapper$),
+    map(([input, mapper]) => mapper(input))
+  );
   const incompatibleError = () => new Error(`Incompatible runtime entry Storage(${pallet}.${name})`);
   const invalidArgs = (args) => new Error(`Invalid Arguments calling ${pallet}.${name}(${args})`);
   const getCodec = (ctx) => {
@@ -32,7 +44,8 @@ const createStorageEntry = (pallet, name, chainHead, {
     if (isSystemNumber)
       return chainHead.bestBlocks$.pipe(
         map((blocks) => blocks.at(target === "best" ? 0 : -1).number),
-        distinctUntilChanged()
+        distinctUntilChanged(),
+        bigIntOrNumber
       );
     return chainHead[target === "best" ? "best$" : "finalized$"].pipe(
       debounceTime(0),
@@ -72,7 +85,8 @@ const createStorageEntry = (pallet, name, chainHead, {
           if (!block) throw new NotBestBlockError();
           return block.number;
         }),
-        distinctUntilChanged()
+        distinctUntilChanged(),
+        bigIntOrNumber
       );
     } else {
       const descriptors = await waitDescriptors();

package/dist/esm/storage.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"storage.mjs","sources":["../../src/storage.ts"],"sourcesContent":["import { firstValueFromWithSignal, isOptionalArg, raceMap } from \"@/utils\"\nimport {\n  ChainHead$,\n  NotBestBlockError,\n  RuntimeContext,\n} from \"@polkadot-api/observable-client\"\nimport { StorageItemInput, StorageResult } from \"@polkadot-api/substrate-client\"\nimport { Observable, debounceTime, distinctUntilChanged, map } from \"rxjs\"\nimport {\n  CompatibilityFunctions,\n  CompatibilityHelper,\n  minCompatLevel,\n} from \"./compatibility\"\nimport { CompatibilityLevel } from \"@polkadot-api/metadata-compatibility\"\n\ntype CallOptions = Partial<{\n  /**\n   * `at` could be a blockHash, `best`, or `finalized` (default)\n   */\n  at: string\n  /**\n   * `signal` allows you to abort an ongoing Promise. See [MDN\n   * docs](https://developer.mozilla.org/en-US/docs/Web/API/AbortSignal) for\n   * more information\n   */\n  signal: AbortSignal\n}>\n\ntype WithCallOptions<Args extends Array<any>> = [\n  ...args: Args,\n  options?: CallOptions,\n]\n\ntype PossibleParents<A extends Array<any>> = A extends [...infer Left, any]\n  ? Left | PossibleParents<Left>\n  : ArrayPossibleParents<A>\n\n// Fixed-size arrays values can't be extracted one-by-one, so that's a specific case\ntype ArrayPossibleParents<\n  A extends Array<any>,\n  Count extends Array<any> = [],\n  R = [],\n> = A extends Array<infer T> & { length: infer L }\n  ? number extends L\n    ? Array<T> // Case variable-size array it's an unknown amount of entries\n    : L extends Count[\"length\"]\n      ? R\n      : ArrayPossibleParents<A, [...Count, T], R | Count>\n  : never\n\ntype StorageEntryWithoutKeys<Unsafe, D, Payload> = {\n  /**\n   * Get `Payload` (Promise-based) for the storage entry.\n   *\n   * @param options  Optionally set which block to target (latest known\n   *                 finalized is the default) and an AbortSignal.\n   */\n  getValue: (options?: CallOptions) => Promise<Payload>\n  /**\n   * Watch changes in `Payload` (observable-based) for the storage entry.\n   *\n   * @param bestOrFinalized  Optionally choose which block to query and watch\n   *                         changes, `best` or `finalized` (default)\n   */\n  watchValue: (bestOrFinalized?: \"best\" | \"finalized\") => Observable<Payload>\n} & (Unsafe extends true ? {} : CompatibilityFunctions<D>)\n\nexport type StorageEntryWithKeys<\n  Unsafe,\n  D,\n  Args extends Array<any>,\n  Payload,\n> = {\n  /**\n   * Get `Payload` (Promise-based) for the storage entry with a specific set of\n   * `Args`.\n   *\n   * @param args  All keys needed for that storage entry.\n   *              At the end, optionally set which block to target (latest\n   *              known finalized is the default) and an AbortSignal.\n   */\n  getValue: (...args: [...WithCallOptions<Args>]) => Promise<Payload>\n  /**\n   * Watch changes in `Payload` (observable-based) for the storage entry.\n   *\n   * @param args  All keys needed for that storage entry.\n   *              At the end, optionally choose which block to query and\n   *              watch changes, `best` or `finalized` (default)\n   */\n  watchValue: (\n    ...args: [...Args, bestOrFinalized?: \"best\" | \"finalized\"]\n  ) => Observable<Payload>\n  /**\n   * Get an Array of `Payload` (Promise-based) for the storage entry with\n   * several sets of `Args`.\n   *\n   * @param keys     Array of sets of keys needed for the storage entry.\n   * @param options  Optionally set which block to target (latest known\n   *                 finalized is the default) and an AbortSignal.\n   */\n  getValues: (\n    keys: Array<[...Args]>,\n    options?: CallOptions,\n  ) => Promise<Array<Payload>>\n  /**\n   * Get an Array of `Payload` (Promise-based) for the storage entry with a\n   * subset of `Args`.\n   *\n   * @param args  Subset of keys needed for the storage entry.\n   *              At the end, optionally set which block to target (latest\n   *              known finalized is the default) and an AbortSignal.\n   * @example\n   *\n   *   // this is a query with 3 keys\n   *   typedApi.query.Pallet.Query.getEntries({ at: \"best\" }) // no keys\n   *   typedApi.query.Pallet.Query.getEntries(arg1, { at: \"finalized\" }) // 1/3 keys\n   *   typedApi.query.Pallet.Query.getEntries(arg1, arg2, { at: \"0x12345678\" }) // 2/3 keys\n   *\n   */\n  getEntries: (\n    ...args: WithCallOptions<PossibleParents<Args>>\n  ) => Promise<Array<{ keyArgs: Args; value: NonNullable<Payload> }>>\n} & (Unsafe extends true ? {} : CompatibilityFunctions<D>)\n\nexport type StorageEntry<\n  Unsafe,\n  D,\n  Args extends Array<any>,\n  Payload,\n> = Args extends []\n  ? StorageEntryWithoutKeys<Unsafe, D, Payload>\n  : StorageEntryWithKeys<Unsafe, D, Args, Payload>\n\nexport type Storage$ = <Type extends StorageItemInput[\"type\"]>(\n  hash: string | null,\n  type: Type,\n  key: string,\n  childTrie: string | null,\n) => Observable<StorageResult<Type>>\n\nexport const createStorageEntry = (\n  pallet: string,\n  name: string,\n  chainHead: ChainHead$,\n  {\n    isCompatible,\n    getCompatibilityLevel,\n    getCompatibilityLevels,\n    waitDescriptors,\n    withCompatibleRuntime,\n    argsAreCompatible,\n    valuesAreCompatible,\n  }: CompatibilityHelper,\n): StorageEntry<any, any, any, any> => {\n  const isSystemNumber = pallet === \"System\" && name === \"Number\"\n\n  const incompatibleError = () =>\n    new Error(`Incompatible runtime entry Storage(${pallet}.${name})`)\n  const invalidArgs = (args: Array<any>) =>\n    new Error(`Invalid Arguments calling ${pallet}.${name}(${args})`)\n\n  const getCodec = (ctx: RuntimeContext) => {\n    try {\n      return ctx.dynamicBuilder.buildStorage(pallet, name)\n    } catch {\n      throw new Error(`Runtime entry Storage(${pallet}.${name}) not found`)\n    }\n  }\n\n  const watchValue = (...args: Array<any>) => {\n    const target = args[args.length - 1]\n    const actualArgs =\n      target === \"best\" || target === \"finalized\" ? args.slice(0, -1) : args\n\n    if (isSystemNumber)\n      return chainHead.bestBlocks$.pipe(\n        map((blocks) => blocks.at(target === \"best\" ? 0 : -1)!.number),\n        distinctUntilChanged(),\n      )\n\n    return chainHead[target === \"best\" ? \"best$\" : \"finalized$\"].pipe(\n      debounceTime(0),\n      withCompatibleRuntime(chainHead, (x) => x.hash),\n      raceMap(([block, runtime, ctx]) => {\n        const codecs = getCodec(ctx)\n        if (!argsAreCompatible(runtime, ctx, actualArgs))\n          throw incompatibleError()\n        return chainHead\n          .storage$(block.hash, \"value\", () => codecs.enc(...actualArgs))\n          .pipe(\n            map((val) => {\n              if (!valuesAreCompatible(runtime, ctx, val))\n                throw incompatibleError()\n              return { val, codecs }\n            }),\n          )\n      }, 4),\n      distinctUntilChanged((a, b) => a.val === b.val),\n      map(({ val, codecs }) =>\n        val === null ? codecs.fallback : codecs.dec(val),\n      ),\n    )\n  }\n\n  const getValue = async (...args: Array<any>) => {\n    const lastArg = args[args.length - 1]\n    const isLastArgOptional = isOptionalArg(lastArg)\n    const { signal, at: _at }: CallOptions = isLastArgOptional ? lastArg : {}\n    const at = _at ?? null\n\n    let result$: Observable<any>\n    if (isSystemNumber) {\n      result$ = chainHead.bestBlocks$.pipe(\n        map((blocks) => {\n          if (at === \"finalized\" || !at) return blocks.at(-1)\n          if (at === \"best\") return blocks.at(0)\n          return blocks.find((block) => block.hash === at)\n        }),\n        map((block) => {\n          if (!block) throw new NotBestBlockError()\n          return block.number\n        }),\n        distinctUntilChanged(),\n      )\n    } else {\n      const descriptors = await waitDescriptors()\n      result$ = chainHead.storage$(\n        at,\n        \"value\",\n        (ctx) => {\n          const codecs = getCodec(ctx)\n          const actualArgs =\n            args.length === codecs.len ? args : args.slice(0, -1)\n          if (args !== actualArgs && !isLastArgOptional) throw invalidArgs(args)\n          if (!argsAreCompatible(descriptors, ctx, actualArgs))\n            throw incompatibleError()\n          return codecs.enc(...actualArgs)\n        },\n        null,\n        (data, ctx) => {\n          const codecs = getCodec(ctx)\n          const value = data === null ? codecs.fallback : codecs.dec(data)\n          if (!valuesAreCompatible(descriptors, ctx, value))\n            throw incompatibleError()\n          return value\n        },\n      )\n    }\n\n    return firstValueFromWithSignal(result$, signal)\n  }\n\n  const getEntries = async (...args: Array<any>) => {\n    const lastArg = args[args.length - 1]\n    const isLastArgOptional = isOptionalArg(lastArg)\n    const { signal, at: _at }: CallOptions = isLastArgOptional ? lastArg : {}\n    const at = _at ?? null\n\n    const descriptors = await waitDescriptors()\n    const result$ = chainHead.storage$(\n      at,\n      \"descendantsValues\",\n      (ctx) => {\n        const codecs = getCodec(ctx)\n        // TODO partial compatibility check for args that become optional\n        if (\n          minCompatLevel(getCompatibilityLevels(descriptors, ctx)) ===\n          CompatibilityLevel.Incompatible\n        )\n          throw incompatibleError()\n\n        if (args.length > codecs.len) throw invalidArgs(args)\n        const actualArgs =\n          args.length > 0 && isLastArgOptional ? args.slice(0, -1) : args\n        if (args.length === codecs.len && actualArgs === args)\n          throw invalidArgs(args)\n        return codecs.enc(...actualArgs)\n      },\n      null,\n      (values, ctx) => {\n        const codecs = getCodec(ctx)\n        if (\n          values.some(\n            ({ value }) => !valuesAreCompatible(descriptors, ctx, value),\n          )\n        )\n          throw incompatibleError()\n        return values.map(({ key, value }) => ({\n          keyArgs: codecs.keyDecoder(key),\n          value: codecs.dec(value),\n        }))\n      },\n    )\n    return firstValueFromWithSignal(result$, signal)\n  }\n\n  const getValues = (keyArgs: Array<Array<any>>, options?: CallOptions) =>\n    Promise.all(\n      keyArgs.map((args) => getValue(...(options ? [...args, options] : args))),\n    )\n\n  return {\n    isCompatible,\n    getCompatibilityLevel,\n    getValue,\n    getValues,\n    getEntries,\n    watchValue,\n  }\n}\n"],"names":[],"mappings":"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"}
+{"version":3,"file":"storage.mjs","sources":["../../src/storage.ts"],"sourcesContent":["import { firstValueFromWithSignal, isOptionalArg, raceMap } from \"@/utils\"\nimport {\n  ChainHead$,\n  NotBestBlockError,\n  RuntimeContext,\n} from \"@polkadot-api/observable-client\"\nimport { StorageItemInput, StorageResult } from \"@polkadot-api/substrate-client\"\nimport {\n  Observable,\n  OperatorFunction,\n  debounceTime,\n  distinctUntilChanged,\n  filter,\n  identity,\n  map,\n  pipe,\n  shareReplay,\n  take,\n  withLatestFrom,\n} from \"rxjs\"\nimport {\n  CompatibilityFunctions,\n  CompatibilityHelper,\n  minCompatLevel,\n} from \"./compatibility\"\nimport { CompatibilityLevel } from \"@polkadot-api/metadata-compatibility\"\n\ntype CallOptions = Partial<{\n  /**\n   * `at` could be a blockHash, `best`, or `finalized` (default)\n   */\n  at: string\n  /**\n   * `signal` allows you to abort an ongoing Promise. See [MDN\n   * docs](https://developer.mozilla.org/en-US/docs/Web/API/AbortSignal) for\n   * more information\n   */\n  signal: AbortSignal\n}>\n\ntype WithCallOptions<Args extends Array<any>> = [\n  ...args: Args,\n  options?: CallOptions,\n]\n\ntype PossibleParents<A extends Array<any>> = A extends [...infer Left, any]\n  ? Left | PossibleParents<Left>\n  : ArrayPossibleParents<A>\n\n// Fixed-size arrays values can't be extracted one-by-one, so that's a specific case\ntype ArrayPossibleParents<\n  A extends Array<any>,\n  Count extends Array<any> = [],\n  R = [],\n> = A extends Array<infer T> & { length: infer L }\n  ? number extends L\n    ? Array<T> // Case variable-size array it's an unknown amount of entries\n    : L extends Count[\"length\"]\n      ? R\n      : ArrayPossibleParents<A, [...Count, T], R | Count>\n  : never\n\ntype StorageEntryWithoutKeys<Unsafe, D, Payload> = {\n  /**\n   * Get `Payload` (Promise-based) for the storage entry.\n   *\n   * @param options  Optionally set which block to target (latest known\n   *                 finalized is the default) and an AbortSignal.\n   */\n  getValue: (options?: CallOptions) => Promise<Payload>\n  /**\n   * Watch changes in `Payload` (observable-based) for the storage entry.\n   *\n   * @param bestOrFinalized  Optionally choose which block to query and watch\n   *                         changes, `best` or `finalized` (default)\n   */\n  watchValue: (bestOrFinalized?: \"best\" | \"finalized\") => Observable<Payload>\n} & (Unsafe extends true ? {} : CompatibilityFunctions<D>)\n\nexport type StorageEntryWithKeys<\n  Unsafe,\n  D,\n  Args extends Array<any>,\n  Payload,\n> = {\n  /**\n   * Get `Payload` (Promise-based) for the storage entry with a specific set of\n   * `Args`.\n   *\n   * @param args  All keys needed for that storage entry.\n   *              At the end, optionally set which block to target (latest\n   *              known finalized is the default) and an AbortSignal.\n   */\n  getValue: (...args: [...WithCallOptions<Args>]) => Promise<Payload>\n  /**\n   * Watch changes in `Payload` (observable-based) for the storage entry.\n   *\n   * @param args  All keys needed for that storage entry.\n   *              At the end, optionally choose which block to query and\n   *              watch changes, `best` or `finalized` (default)\n   */\n  watchValue: (\n    ...args: [...Args, bestOrFinalized?: \"best\" | \"finalized\"]\n  ) => Observable<Payload>\n  /**\n   * Get an Array of `Payload` (Promise-based) for the storage entry with\n   * several sets of `Args`.\n   *\n   * @param keys     Array of sets of keys needed for the storage entry.\n   * @param options  Optionally set which block to target (latest known\n   *                 finalized is the default) and an AbortSignal.\n   */\n  getValues: (\n    keys: Array<[...Args]>,\n    options?: CallOptions,\n  ) => Promise<Array<Payload>>\n  /**\n   * Get an Array of `Payload` (Promise-based) for the storage entry with a\n   * subset of `Args`.\n   *\n   * @param args  Subset of keys needed for the storage entry.\n   *              At the end, optionally set which block to target (latest\n   *              known finalized is the default) and an AbortSignal.\n   * @example\n   *\n   *   // this is a query with 3 keys\n   *   typedApi.query.Pallet.Query.getEntries({ at: \"best\" }) // no keys\n   *   typedApi.query.Pallet.Query.getEntries(arg1, { at: \"finalized\" }) // 1/3 keys\n   *   typedApi.query.Pallet.Query.getEntries(arg1, arg2, { at: \"0x12345678\" }) // 2/3 keys\n   *\n   */\n  getEntries: (\n    ...args: WithCallOptions<PossibleParents<Args>>\n  ) => Promise<Array<{ keyArgs: Args; value: NonNullable<Payload> }>>\n} & (Unsafe extends true ? {} : CompatibilityFunctions<D>)\n\nexport type StorageEntry<\n  Unsafe,\n  D,\n  Args extends Array<any>,\n  Payload,\n> = Args extends []\n  ? StorageEntryWithoutKeys<Unsafe, D, Payload>\n  : StorageEntryWithKeys<Unsafe, D, Args, Payload>\n\nexport type Storage$ = <Type extends StorageItemInput[\"type\"]>(\n  hash: string | null,\n  type: Type,\n  key: string,\n  childTrie: string | null,\n) => Observable<StorageResult<Type>>\n\nexport const createStorageEntry = (\n  pallet: string,\n  name: string,\n  chainHead: ChainHead$,\n  {\n    isCompatible,\n    getCompatibilityLevel,\n    getCompatibilityLevels,\n    waitDescriptors,\n    withCompatibleRuntime,\n    argsAreCompatible,\n    valuesAreCompatible,\n  }: CompatibilityHelper,\n): StorageEntry<any, any, any, any> => {\n  const isSystemNumber = pallet === \"System\" && name === \"Number\"\n  const sysNumberMapper$ = chainHead.runtime$.pipe(\n    filter(Boolean),\n    take(1),\n    map(({ dynamicBuilder }) =>\n      typeof dynamicBuilder\n        .buildStorage(\"System\", \"Number\")\n        .dec(new Uint8Array(32)) === \"bigint\"\n        ? BigInt\n        : identity,\n    ),\n    shareReplay(),\n  )\n  const bigIntOrNumber: OperatorFunction<number, number | bigint> = pipe(\n    withLatestFrom(sysNumberMapper$),\n    map(([input, mapper]) => mapper(input)),\n  )\n\n  const incompatibleError = () =>\n    new Error(`Incompatible runtime entry Storage(${pallet}.${name})`)\n  const invalidArgs = (args: Array<any>) =>\n    new Error(`Invalid Arguments calling ${pallet}.${name}(${args})`)\n\n  const getCodec = (ctx: RuntimeContext) => {\n    try {\n      return ctx.dynamicBuilder.buildStorage(pallet, name)\n    } catch {\n      throw new Error(`Runtime entry Storage(${pallet}.${name}) not found`)\n    }\n  }\n\n  const watchValue = (...args: Array<any>) => {\n    const target = args[args.length - 1]\n    const actualArgs =\n      target === \"best\" || target === \"finalized\" ? args.slice(0, -1) : args\n\n    if (isSystemNumber)\n      return chainHead.bestBlocks$.pipe(\n        map((blocks) => blocks.at(target === \"best\" ? 0 : -1)!.number),\n        distinctUntilChanged(),\n        bigIntOrNumber,\n      )\n\n    return chainHead[target === \"best\" ? \"best$\" : \"finalized$\"].pipe(\n      debounceTime(0),\n      withCompatibleRuntime(chainHead, (x) => x.hash),\n      raceMap(([block, runtime, ctx]) => {\n        const codecs = getCodec(ctx)\n        if (!argsAreCompatible(runtime, ctx, actualArgs))\n          throw incompatibleError()\n        return chainHead\n          .storage$(block.hash, \"value\", () => codecs.enc(...actualArgs))\n          .pipe(\n            map((val) => {\n              if (!valuesAreCompatible(runtime, ctx, val))\n                throw incompatibleError()\n              return { val, codecs }\n            }),\n          )\n      }, 4),\n      distinctUntilChanged((a, b) => a.val === b.val),\n      map(({ val, codecs }) =>\n        val === null ? codecs.fallback : codecs.dec(val),\n      ),\n    )\n  }\n\n  const getValue = async (...args: Array<any>) => {\n    const lastArg = args[args.length - 1]\n    const isLastArgOptional = isOptionalArg(lastArg)\n    const { signal, at: _at }: CallOptions = isLastArgOptional ? lastArg : {}\n    const at = _at ?? null\n\n    let result$: Observable<any>\n    if (isSystemNumber) {\n      result$ = chainHead.bestBlocks$.pipe(\n        map((blocks) => {\n          if (at === \"finalized\" || !at) return blocks.at(-1)\n          if (at === \"best\") return blocks.at(0)\n          return blocks.find((block) => block.hash === at)\n        }),\n        map((block) => {\n          if (!block) throw new NotBestBlockError()\n          return block.number\n        }),\n        distinctUntilChanged(),\n        bigIntOrNumber,\n      )\n    } else {\n      const descriptors = await waitDescriptors()\n      result$ = chainHead.storage$(\n        at,\n        \"value\",\n        (ctx) => {\n          const codecs = getCodec(ctx)\n          const actualArgs =\n            args.length === codecs.len ? args : args.slice(0, -1)\n          if (args !== actualArgs && !isLastArgOptional) throw invalidArgs(args)\n          if (!argsAreCompatible(descriptors, ctx, actualArgs))\n            throw incompatibleError()\n          return codecs.enc(...actualArgs)\n        },\n        null,\n        (data, ctx) => {\n          const codecs = getCodec(ctx)\n          const value = data === null ? codecs.fallback : codecs.dec(data)\n          if (!valuesAreCompatible(descriptors, ctx, value))\n            throw incompatibleError()\n          return value\n        },\n      )\n    }\n\n    return firstValueFromWithSignal(result$, signal)\n  }\n\n  const getEntries = async (...args: Array<any>) => {\n    const lastArg = args[args.length - 1]\n    const isLastArgOptional = isOptionalArg(lastArg)\n    const { signal, at: _at }: CallOptions = isLastArgOptional ? lastArg : {}\n    const at = _at ?? null\n\n    const descriptors = await waitDescriptors()\n    const result$ = chainHead.storage$(\n      at,\n      \"descendantsValues\",\n      (ctx) => {\n        const codecs = getCodec(ctx)\n        // TODO partial compatibility check for args that become optional\n        if (\n          minCompatLevel(getCompatibilityLevels(descriptors, ctx)) ===\n          CompatibilityLevel.Incompatible\n        )\n          throw incompatibleError()\n\n        if (args.length > codecs.len) throw invalidArgs(args)\n        const actualArgs =\n          args.length > 0 && isLastArgOptional ? args.slice(0, -1) : args\n        if (args.length === codecs.len && actualArgs === args)\n          throw invalidArgs(args)\n        return codecs.enc(...actualArgs)\n      },\n      null,\n      (values, ctx) => {\n        const codecs = getCodec(ctx)\n        if (\n          values.some(\n            ({ value }) => !valuesAreCompatible(descriptors, ctx, value),\n          )\n        )\n          throw incompatibleError()\n        return values.map(({ key, value }) => ({\n          keyArgs: codecs.keyDecoder(key),\n          value: codecs.dec(value),\n        }))\n      },\n    )\n    return firstValueFromWithSignal(result$, signal)\n  }\n\n  const getValues = (keyArgs: Array<Array<any>>, options?: CallOptions) =>\n    Promise.all(\n      keyArgs.map((args) => getValue(...(options ? [...args, options] : args))),\n    )\n\n  return {\n    isCompatible,\n    getCompatibilityLevel,\n    getValue,\n    getValues,\n    getEntries,\n    watchValue,\n  }\n}\n"],"names":[],"mappings":"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"}

package/dist/esm/tx/create-tx.mjs

@@ -29,6 +29,7 @@ const createTx = (chainHead, signer, callData, atBlock, customSignedExtensions,
   mergeMap((ctx) => {
     const signedExtensionsCtx = {
       lookupFn: ctx.lookup,
+      dynamicBuilder: ctx.dynamicBuilder,
       chainHead,
       callData,
       at: atBlock.hash,

package/dist/esm/tx/create-tx.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"create-tx.mjs","sources":["../../../src/tx/create-tx.ts"],"sourcesContent":["import { Observable, combineLatest, mergeMap, of, take } from \"rxjs\"\nimport { BlockInfo, ChainHead$ } from \"@polkadot-api/observable-client\"\nimport {\n  ChargeAssetTxPayment,\n  ChargeTransactionPayment,\n  CheckMortality,\n} from \"./signed-extensions/user\"\nimport * as chainSignedExtensions from \"./signed-extensions/chain\"\nimport type { PolkadotSigner } from \"@polkadot-api/polkadot-signer\"\nimport { _void, Encoder } from \"@polkadot-api/substrate-bindings\"\nimport { empty } from \"./signed-extensions/utils\"\nimport { CustomSignedExtensionValues } from \"./types\"\n\ntype HintedSignedExtensions = Partial<{\n  tip: bigint\n  mortality: { mortal: false } | { mortal: true; period: number }\n  asset: Uint8Array\n  nonce: number\n}>\n\nconst empty$ = of({\n  value: empty,\n  additionalSigned: empty,\n})\n\nconst getCustomSignExt = <T extends Record<string, any>>(\n  obj: T,\n  key: string,\n  encoder: Encoder<any>,\n) => {\n  if (!(key in obj)) return empty\n  const x = obj[key] as any\n  return x instanceof Uint8Array ? x : encoder(x)\n}\n\nconst getEncodedSignExtFromCustom = (\n  custom: CustomSignedExtensionValues,\n  valueEnc: Encoder<any>,\n  additionalSignedEnc: Encoder<any>,\n) =>\n  of({\n    value: getCustomSignExt(custom, \"value\", valueEnc),\n    additionalSigned: getCustomSignExt(\n      custom,\n      \"additionalSigned\",\n      additionalSignedEnc,\n    ),\n  })\n\nexport const createTx: (\n  chainHead: ChainHead$,\n  signer: PolkadotSigner,\n  callData: Uint8Array,\n  atBlock: BlockInfo,\n  customSignExt: Record<string, CustomSignedExtensionValues>,\n  hinted?: HintedSignedExtensions,\n) => Observable<Uint8Array> = (\n  chainHead,\n  signer,\n  callData,\n  atBlock,\n  customSignedExtensions,\n  hinted = {},\n) =>\n  chainHead.getRuntimeContext$(atBlock.hash).pipe(\n    take(1),\n    mergeMap((ctx) => {\n      const signedExtensionsCtx = {\n        lookupFn: ctx.lookup,\n        chainHead: chainHead,\n        callData: callData,\n        at: atBlock.hash,\n        from: signer.publicKey,\n      }\n\n      const mortality: Parameters<typeof CheckMortality>[0] = !hinted.mortality\n        ? { period: 64, blockNumber: atBlock.number }\n        : hinted.mortality.mortal\n          ? { period: hinted.mortality.period, blockNumber: atBlock.number }\n          : undefined // immortal\n\n      return combineLatest(\n        ctx.lookup.metadata.extrinsic.signedExtensions\n          .map(({ identifier, type, additionalSigned }) => {\n            if (identifier === \"CheckMortality\")\n              return CheckMortality(mortality, signedExtensionsCtx)\n\n            if (identifier === \"ChargeTransactionPayment\")\n              return ChargeTransactionPayment(hinted.tip ?? 0n)\n\n            if (identifier === \"ChargeAssetTxPayment\")\n              return ChargeAssetTxPayment(hinted.tip ?? 0n, hinted.asset)\n\n            if (identifier === \"CheckNonce\" && \"nonce\" in hinted)\n              return chainSignedExtensions.getNonce(hinted.nonce!)\n\n            const fn = chainSignedExtensions[identifier as \"CheckGenesis\"]\n            const [valueEnc] = ctx.dynamicBuilder.buildDefinition(type)\n            const [additionalSignedEnc] =\n              ctx.dynamicBuilder.buildDefinition(additionalSigned)\n            return fn\n              ? fn(signedExtensionsCtx)\n              : valueEnc === _void[0] && additionalSignedEnc === _void[0]\n                ? empty$\n                : identifier in customSignedExtensions\n                  ? getEncodedSignExtFromCustom(\n                      customSignedExtensions[identifier],\n                      valueEnc,\n                      additionalSignedEnc,\n                    )\n                  : null\n          })\n          .filter((x) => !!x),\n      ).pipe(\n        mergeMap((signedExtensions) =>\n          signer.signTx(\n            callData,\n            Object.fromEntries(\n              ctx.lookup.metadata.extrinsic.signedExtensions.map(\n                ({ identifier }, idx) => [\n                  identifier,\n                  { identifier, ...signedExtensions[idx] },\n                ],\n              ),\n            ),\n            ctx.metadataRaw,\n            atBlock.number,\n          ),\n        ),\n      )\n    }),\n  )\n"],"names":["chainSignedExtensions.getNonce","chainSignedExtensions"],"mappings":"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"}
+{"version":3,"file":"create-tx.mjs","sources":["../../../src/tx/create-tx.ts"],"sourcesContent":["import { Observable, combineLatest, mergeMap, of, take } from \"rxjs\"\nimport { BlockInfo, ChainHead$ } from \"@polkadot-api/observable-client\"\nimport {\n  ChargeAssetTxPayment,\n  ChargeTransactionPayment,\n  CheckMortality,\n} from \"./signed-extensions/user\"\nimport * as chainSignedExtensions from \"./signed-extensions/chain\"\nimport type { PolkadotSigner } from \"@polkadot-api/polkadot-signer\"\nimport { _void, Encoder } from \"@polkadot-api/substrate-bindings\"\nimport { empty } from \"./signed-extensions/utils\"\nimport { CustomSignedExtensionValues } from \"./types\"\n\ntype HintedSignedExtensions = Partial<{\n  tip: bigint\n  mortality: { mortal: false } | { mortal: true; period: number }\n  asset: Uint8Array\n  nonce: number\n}>\n\nconst empty$ = of({\n  value: empty,\n  additionalSigned: empty,\n})\n\nconst getCustomSignExt = <T extends Record<string, any>>(\n  obj: T,\n  key: string,\n  encoder: Encoder<any>,\n) => {\n  if (!(key in obj)) return empty\n  const x = obj[key] as any\n  return x instanceof Uint8Array ? x : encoder(x)\n}\n\nconst getEncodedSignExtFromCustom = (\n  custom: CustomSignedExtensionValues,\n  valueEnc: Encoder<any>,\n  additionalSignedEnc: Encoder<any>,\n) =>\n  of({\n    value: getCustomSignExt(custom, \"value\", valueEnc),\n    additionalSigned: getCustomSignExt(\n      custom,\n      \"additionalSigned\",\n      additionalSignedEnc,\n    ),\n  })\n\nexport const createTx: (\n  chainHead: ChainHead$,\n  signer: PolkadotSigner,\n  callData: Uint8Array,\n  atBlock: BlockInfo,\n  customSignExt: Record<string, CustomSignedExtensionValues>,\n  hinted?: HintedSignedExtensions,\n) => Observable<Uint8Array> = (\n  chainHead,\n  signer,\n  callData,\n  atBlock,\n  customSignedExtensions,\n  hinted = {},\n) =>\n  chainHead.getRuntimeContext$(atBlock.hash).pipe(\n    take(1),\n    mergeMap((ctx) => {\n      const signedExtensionsCtx = {\n        lookupFn: ctx.lookup,\n        dynamicBuilder: ctx.dynamicBuilder,\n        chainHead: chainHead,\n        callData: callData,\n        at: atBlock.hash,\n        from: signer.publicKey,\n      }\n\n      const mortality: Parameters<typeof CheckMortality>[0] = !hinted.mortality\n        ? { period: 64, blockNumber: atBlock.number }\n        : hinted.mortality.mortal\n          ? { period: hinted.mortality.period, blockNumber: atBlock.number }\n          : undefined // immortal\n\n      return combineLatest(\n        ctx.lookup.metadata.extrinsic.signedExtensions\n          .map(({ identifier, type, additionalSigned }) => {\n            if (identifier === \"CheckMortality\")\n              return CheckMortality(mortality, signedExtensionsCtx)\n\n            if (identifier === \"ChargeTransactionPayment\")\n              return ChargeTransactionPayment(hinted.tip ?? 0n)\n\n            if (identifier === \"ChargeAssetTxPayment\")\n              return ChargeAssetTxPayment(hinted.tip ?? 0n, hinted.asset)\n\n            if (identifier === \"CheckNonce\" && \"nonce\" in hinted)\n              return chainSignedExtensions.getNonce(hinted.nonce!)\n\n            const fn = chainSignedExtensions[identifier as \"CheckGenesis\"]\n            const [valueEnc] = ctx.dynamicBuilder.buildDefinition(type)\n            const [additionalSignedEnc] =\n              ctx.dynamicBuilder.buildDefinition(additionalSigned)\n            return fn\n              ? fn(signedExtensionsCtx)\n              : valueEnc === _void[0] && additionalSignedEnc === _void[0]\n                ? empty$\n                : identifier in customSignedExtensions\n                  ? getEncodedSignExtFromCustom(\n                      customSignedExtensions[identifier],\n                      valueEnc,\n                      additionalSignedEnc,\n                    )\n                  : null\n          })\n          .filter((x) => !!x),\n      ).pipe(\n        mergeMap((signedExtensions) =>\n          signer.signTx(\n            callData,\n            Object.fromEntries(\n              ctx.lookup.metadata.extrinsic.signedExtensions.map(\n                ({ identifier }, idx) => [\n                  identifier,\n                  { identifier, ...signedExtensions[idx] },\n                ],\n              ),\n            ),\n            ctx.metadataRaw,\n            atBlock.number,\n          ),\n        ),\n      )\n    }),\n  )\n"],"names":["chainSignedExtensions.getNonce","chainSignedExtensions"],"mappings":"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"}

package/dist/esm/tx/signed-extensions/utils.mjs

@@ -1,14 +1,18 @@
 import { getDynamicBuilder } from '@polkadot-api/metadata-builders';
-import { Storage, u32, Twox64Concat } from '@polkadot-api/substrate-bindings';
 import { fromHex } from '@polkadot-api/utils';
-import { noop, map, of } from 'rxjs';
+import { map, of } from 'rxjs';
 
 const empty = new Uint8Array();
-const genesisHashStorageKey = Storage("System")("BlockHash", noop, [
-  u32,
-  Twox64Concat
-]).enc(0);
-const genesisHashFromCtx = (ctx) => ctx.chainHead.storage$(ctx.at, "value", () => genesisHashStorageKey, null).pipe(map((result) => fromHex(result)));
+const genesisHashFromCtx = (ctx) => {
+  const { enc } = ctx.dynamicBuilder.buildStorage("System", "BlockHash");
+  let key;
+  try {
+    key = enc(0);
+  } catch {
+    key = enc(0n);
+  }
+  return ctx.chainHead.storage$(ctx.at, "value", () => key, null).pipe(map((result) => fromHex(result)));
+};
 const systemVersionProp$ = (propName, lookupFn) => {
   const dynamicBuilder = getDynamicBuilder(lookupFn);
   const constant = lookupFn.metadata.pallets.find((x) => x.name === "System").constants.find((s) => s.name === "Version");

package/dist/esm/tx/signed-extensions/utils.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"utils.mjs","sources":["../../../../src/tx/signed-extensions/utils.ts"],"sourcesContent":["import {\n  getDynamicBuilder,\n  MetadataLookup,\n} from \"@polkadot-api/metadata-builders\"\nimport { Storage, Twox64Concat, u32 } from \"@polkadot-api/substrate-bindings\"\nimport { fromHex } from \"@polkadot-api/utils\"\nimport { map, noop, of } from \"rxjs\"\nimport type { ChainExtensionCtx } from \"./internal-types\"\n\nexport const empty = new Uint8Array()\n\nconst genesisHashStorageKey = Storage(\"System\")(\"BlockHash\", noop, [\n  u32,\n  Twox64Concat,\n]).enc(0)\n\nexport const genesisHashFromCtx = (ctx: ChainExtensionCtx) =>\n  ctx.chainHead\n    .storage$(ctx.at, \"value\", () => genesisHashStorageKey, null)\n    .pipe(map((result) => fromHex(result!)))\n\nexport const systemVersionProp$ = (\n  propName: string,\n  lookupFn: MetadataLookup,\n) => {\n  const dynamicBuilder = getDynamicBuilder(lookupFn)\n\n  const constant = lookupFn.metadata.pallets\n    .find((x) => x.name === \"System\")!\n    .constants!.find((s) => s.name === \"Version\")!\n\n  const systemVersion = lookupFn(constant.type)\n  const systemVersionDec = dynamicBuilder.buildDefinition(constant.type).dec\n\n  if (systemVersion.type !== \"struct\") throw new Error(\"not a struct\")\n\n  const valueEnc = dynamicBuilder.buildDefinition(\n    systemVersion.value[propName].id,\n  ).enc\n\n  return of(valueEnc(systemVersionDec(constant.value)[propName]))\n}\n"],"names":[],"mappings":";;;;;AASa,MAAA,KAAA,GAAQ,IAAI,UAAW,GAAA;AAEpC,MAAM,qBAAwB,GAAA,OAAA,CAAQ,QAAQ,CAAA,CAAE,aAAa,IAAM,EAAA;AAAA,EACjE,GAAA;AAAA,EACA,YAAA;AACF,CAAC,CAAA,CAAE,IAAI,CAAC,CAAA,CAAA;AAEK,MAAA,kBAAA,GAAqB,CAAC,GACjC,KAAA,GAAA,CAAI,UACD,QAAS,CAAA,GAAA,CAAI,IAAI,OAAS,EAAA,MAAM,uBAAuB,IAAI,CAAA,CAC3D,KAAK,GAAI,CAAA,CAAC,WAAW,OAAQ,CAAA,MAAO,CAAC,CAAC,EAAA;AAE9B,MAAA,kBAAA,GAAqB,CAChC,QAAA,EACA,QACG,KAAA;AACH,EAAM,MAAA,cAAA,GAAiB,kBAAkB,QAAQ,CAAA,CAAA;AAEjD,EAAA,MAAM,WAAW,QAAS,CAAA,QAAA,CAAS,OAChC,CAAA,IAAA,CAAK,CAAC,CAAM,KAAA,CAAA,CAAE,IAAS,KAAA,QAAQ,EAC/B,SAAW,CAAA,IAAA,CAAK,CAAC,CAAM,KAAA,CAAA,CAAE,SAAS,SAAS,CAAA,CAAA;AAE9C,EAAM,MAAA,aAAA,GAAgB,QAAS,CAAA,QAAA,CAAS,IAAI,CAAA,CAAA;AAC5C,EAAA,MAAM,gBAAmB,GAAA,cAAA,CAAe,eAAgB,CAAA,QAAA,CAAS,IAAI,CAAE,CAAA,GAAA,CAAA;AAEvE,EAAA,IAAI,cAAc,IAAS,KAAA,QAAA,EAAgB,MAAA,IAAI,MAAM,cAAc,CAAA,CAAA;AAEnE,EAAA,MAAM,WAAW,cAAe,CAAA,eAAA;AAAA,IAC9B,aAAA,CAAc,KAAM,CAAA,QAAQ,CAAE,CAAA,EAAA;AAAA,GAC9B,CAAA,GAAA,CAAA;AAEF,EAAO,OAAA,EAAA,CAAG,SAAS,gBAAiB,CAAA,QAAA,CAAS,KAAK,CAAE,CAAA,QAAQ,CAAC,CAAC,CAAA,CAAA;AAChE;;;;"}
+{"version":3,"file":"utils.mjs","sources":["../../../../src/tx/signed-extensions/utils.ts"],"sourcesContent":["import {\n  getDynamicBuilder,\n  MetadataLookup,\n} from \"@polkadot-api/metadata-builders\"\nimport { fromHex } from \"@polkadot-api/utils\"\nimport { map, of } from \"rxjs\"\nimport type { ChainExtensionCtx } from \"./internal-types\"\n\nexport const empty = new Uint8Array()\n\nexport const genesisHashFromCtx = (ctx: ChainExtensionCtx) => {\n  // there are chains (e.g. kilt) that use u64 as block number\n  // u64 is encoded as bigint\n  // using dynamic builder for safety\n  const { enc } = ctx.dynamicBuilder.buildStorage(\"System\", \"BlockHash\")\n  let key: string\n  try {\n    // for u32\n    key = enc(0)\n  } catch {\n    // for u64\n    key = enc(0n)\n  }\n  return ctx.chainHead\n    .storage$(ctx.at, \"value\", () => key, null)\n    .pipe(map((result) => fromHex(result!)))\n}\n\nexport const systemVersionProp$ = (\n  propName: string,\n  lookupFn: MetadataLookup,\n) => {\n  const dynamicBuilder = getDynamicBuilder(lookupFn)\n\n  const constant = lookupFn.metadata.pallets\n    .find((x) => x.name === \"System\")!\n    .constants!.find((s) => s.name === \"Version\")!\n\n  const systemVersion = lookupFn(constant.type)\n  const systemVersionDec = dynamicBuilder.buildDefinition(constant.type).dec\n\n  if (systemVersion.type !== \"struct\") throw new Error(\"not a struct\")\n\n  const valueEnc = dynamicBuilder.buildDefinition(\n    systemVersion.value[propName].id,\n  ).enc\n\n  return of(valueEnc(systemVersionDec(constant.value)[propName]))\n}\n"],"names":[],"mappings":";;;;AAQa,MAAA,KAAA,GAAQ,IAAI,UAAW,GAAA;AAEvB,MAAA,kBAAA,GAAqB,CAAC,GAA2B,KAAA;AAI5D,EAAA,MAAM,EAAE,GAAI,EAAA,GAAI,IAAI,cAAe,CAAA,YAAA,CAAa,UAAU,WAAW,CAAA,CAAA;AACrE,EAAI,IAAA,GAAA,CAAA;AACJ,EAAI,IAAA;AAEF,IAAA,GAAA,GAAM,IAAI,CAAC,CAAA,CAAA;AAAA,GACL,CAAA,MAAA;AAEN,IAAA,GAAA,GAAM,IAAI,EAAE,CAAA,CAAA;AAAA,GACd;AACA,EAAA,OAAO,IAAI,SACR,CAAA,QAAA,CAAS,GAAI,CAAA,EAAA,EAAI,SAAS,MAAM,GAAA,EAAK,IAAI,CAAA,CACzC,KAAK,GAAI,CAAA,CAAC,WAAW,OAAQ,CAAA,MAAO,CAAC,CAAC,CAAA,CAAA;AAC3C,EAAA;AAEa,MAAA,kBAAA,GAAqB,CAChC,QAAA,EACA,QACG,KAAA;AACH,EAAM,MAAA,cAAA,GAAiB,kBAAkB,QAAQ,CAAA,CAAA;AAEjD,EAAA,MAAM,WAAW,QAAS,CAAA,QAAA,CAAS,OAChC,CAAA,IAAA,CAAK,CAAC,CAAM,KAAA,CAAA,CAAE,IAAS,KAAA,QAAQ,EAC/B,SAAW,CAAA,IAAA,CAAK,CAAC,CAAM,KAAA,CAAA,CAAE,SAAS,SAAS,CAAA,CAAA;AAE9C,EAAM,MAAA,aAAA,GAAgB,QAAS,CAAA,QAAA,CAAS,IAAI,CAAA,CAAA;AAC5C,EAAA,MAAM,gBAAmB,GAAA,cAAA,CAAe,eAAgB,CAAA,QAAA,CAAS,IAAI,CAAE,CAAA,GAAA,CAAA;AAEvE,EAAA,IAAI,cAAc,IAAS,KAAA,QAAA,EAAgB,MAAA,IAAI,MAAM,cAAc,CAAA,CAAA;AAEnE,EAAA,MAAM,WAAW,cAAe,CAAA,eAAA;AAAA,IAC9B,aAAA,CAAc,KAAM,CAAA,QAAQ,CAAE,CAAA,EAAA;AAAA,GAC9B,CAAA,GAAA,CAAA;AAEF,EAAO,OAAA,EAAA,CAAG,SAAS,gBAAiB,CAAA,QAAA,CAAS,KAAK,CAAE,CAAA,QAAQ,CAAC,CAAC,CAAA,CAAA;AAChE;;;;"}

package/dist/index.js

@@ -496,6 +496,18 @@ const createStorageEntry = (pallet, name, chainHead, {
   valuesAreCompatible
 }) => {
   const isSystemNumber = pallet === "System" && name === "Number";
+  const sysNumberMapper$ = chainHead.runtime$.pipe(
+    rxjs.filter(Boolean),
+    rxjs.take(1),
+    rxjs.map(
+      ({ dynamicBuilder }) => typeof dynamicBuilder.buildStorage("System", "Number").dec(new Uint8Array(32)) === "bigint" ? BigInt : rxjs.identity
+    ),
+    rxjs.shareReplay()
+  );
+  const bigIntOrNumber = rxjs.pipe(
+    rxjs.withLatestFrom(sysNumberMapper$),
+    rxjs.map(([input, mapper]) => mapper(input))
+  );
   const incompatibleError = () => new Error(`Incompatible runtime entry Storage(${pallet}.${name})`);
   const invalidArgs = (args) => new Error(`Invalid Arguments calling ${pallet}.${name}(${args})`);
   const getCodec = (ctx) => {
@@ -511,7 +523,8 @@ const createStorageEntry = (pallet, name, chainHead, {
     if (isSystemNumber)
       return chainHead.bestBlocks$.pipe(
         rxjs.map((blocks) => blocks.at(target === "best" ? 0 : -1).number),
-        rxjs.distinctUntilChanged()
+        rxjs.distinctUntilChanged(),
+        bigIntOrNumber
       );
     return chainHead[target === "best" ? "best$" : "finalized$"].pipe(
       rxjs.debounceTime(0),
@@ -551,7 +564,8 @@ const createStorageEntry = (pallet, name, chainHead, {
           if (!block) throw new observableClient.NotBestBlockError();
           return block.number;
         }),
-        rxjs.distinctUntilChanged()
+        rxjs.distinctUntilChanged(),
+        bigIntOrNumber
       );
     } else {
       const descriptors = await waitDescriptors();
@@ -626,11 +640,16 @@ const createStorageEntry = (pallet, name, chainHead, {
 };
 
 const empty = new Uint8Array();
-const genesisHashStorageKey = substrateBindings.Storage("System")("BlockHash", rxjs.noop, [
-  substrateBindings.u32,
-  substrateBindings.Twox64Concat
-]).enc(0);
-const genesisHashFromCtx = (ctx) => ctx.chainHead.storage$(ctx.at, "value", () => genesisHashStorageKey, null).pipe(rxjs.map((result) => utils.fromHex(result)));
+const genesisHashFromCtx = (ctx) => {
+  const { enc } = ctx.dynamicBuilder.buildStorage("System", "BlockHash");
+  let key;
+  try {
+    key = enc(0);
+  } catch {
+    key = enc(0n);
+  }
+  return ctx.chainHead.storage$(ctx.at, "value", () => key, null).pipe(rxjs.map((result) => utils.fromHex(result)));
+};
 const systemVersionProp$ = (propName, lookupFn) => {
   const dynamicBuilder = metadataBuilders.getDynamicBuilder(lookupFn);
   const constant = lookupFn.metadata.pallets.find((x) => x.name === "System").constants.find((s) => s.name === "Version");
@@ -763,6 +782,7 @@ const createTx = (chainHead, signer, callData, atBlock, customSignedExtensions,
   rxjs.mergeMap((ctx) => {
     const signedExtensionsCtx = {
       lookupFn: ctx.lookup,
+      dynamicBuilder: ctx.dynamicBuilder,
       chainHead,
       callData,
       at: atBlock.hash,