polkadot-api 1.9.13 → 1.10.1

package/dist/index.js

@@ -490,14 +490,13 @@ const createStorageEntry = (pallet, name, chainHead, getWatchEntries, {
     const { at: _at } = isLastArgOptional ? lastArg : {};
     const at = _at ?? null;
     if (isSystemNumber)
-      return chainHead.bestBlocks$.pipe(
+      return chainHead.pinnedBlocks$.pipe(
         rxjs.map((blocks) => {
-          if (at === "finalized" || !at) return blocks.at(-1);
-          if (at === "best") return blocks.at(0);
-          return blocks.find((block) => block.hash === at);
-        }),
-        rxjs.map((block) => {
-          if (!block) throw new observableClient.NotBestBlockError();
+          const hash = at === "finalized" || !at ? blocks.finalized : at === "best" ? blocks.best : at;
+          const block = blocks.blocks.get(hash);
+          if (!block) {
+            throw new observableClient.BlockNotPinnedError(hash, "System.Number");
+          }
           return block.number;
         }),
         rxjs.distinctUntilChanged(),
@@ -740,7 +739,7 @@ const lenToDecoder = {
   4: substrateBindings.u32.dec,
   8: substrateBindings.u64.dec
 };
-const getNonce$ = (call$, from, at) => call$(at, NONCE_RUNTIME_CALL, from).pipe(
+const getNonceAtBlock$ = (call$, from, at) => call$(at, NONCE_RUNTIME_CALL, from).pipe(
   rxjs.map((result) => {
     const bytes = utils.fromHex(result);
     const decoder = lenToDecoder[bytes.length];
@@ -750,7 +749,7 @@ const getNonce$ = (call$, from, at) => call$(at, NONCE_RUNTIME_CALL, from).pipe(
   })
 );
 const createTx = (chainHead, signer, callData, atBlock, customSignedExtensions, hinted = {}) => rxjs.combineLatest([
-  hinted.nonce ? rxjs.of(hinted.nonce) : getNonce$(chainHead.call$, utils.toHex(signer.publicKey), atBlock.hash),
+  hinted.nonce ? rxjs.of(hinted.nonce) : getNonce$(chainHead, utils.toHex(signer.publicKey)),
   chainHead.getRuntimeContext$(atBlock.hash),
   chainHead.genesis$
 ]).pipe(
@@ -773,7 +772,8 @@ const createTx = (chainHead, signer, callData, atBlock, customSignedExtensions,
           hash: atBlock.hash
         }
       } : { mortal: false },
-      customSignedExtensions
+      customSignedExtensions,
+      asset: hinted.asset
     });
     return signer.signTx(
       callData,
@@ -783,6 +783,54 @@ const createTx = (chainHead, signer, callData, atBlock, customSignedExtensions,
     );
   })
 );
+const getNonce$ = (chainHead, from) => {
+  const followHead$ = (head) => chainHead.newBlocks$.pipe(
+    rxjs.scan((acc, block) => block.parent === acc ? block.hash : acc, head),
+    rxjs.startWith(head),
+    rxjs.distinctUntilChanged()
+  );
+  const followNonce$ = (head) => followHead$(head).pipe(
+    rxjs.take(2),
+    rxjs.switchMap((hash) => getNonceAtBlock$(chainHead.call$, from, hash))
+  );
+  const getHeadsNonce$ = (heads) => rxjs.combineLatest(
+    heads.map(
+      (head) => followNonce$(head).pipe(
+        rxjs.map((value) => ({
+          success: true,
+          value
+        })),
+        rxjs.catchError(
+          (err) => rxjs.of({
+            success: false,
+            value: err
+          })
+        )
+      )
+    )
+  ).pipe(rxjs.take(1));
+  return chainHead.pinnedBlocks$.pipe(
+    rxjs.filter((v) => !v.recovering && v.blocks.size > 0),
+    rxjs.take(1),
+    rxjs.map(({ blocks, best }) => {
+      const bestBlock = blocks.get(best);
+      return [...blocks.values()].filter(
+        (v) => !v.unpinnable && v.children.size === 0 && v.number >= bestBlock.number
+      ).map((v) => v.hash);
+    }),
+    rxjs.switchMap(getHeadsNonce$),
+    rxjs.map((result) => {
+      const winner = result.reduce(
+        (acc, v) => v.success ? v.value >= (acc ?? 0) ? v.value : acc : acc,
+        null
+      );
+      if (winner == null) {
+        throw result[0].value;
+      }
+      return winner;
+    })
+  );
+};
 
 var __defProp = Object.defineProperty;
 var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
@@ -895,7 +943,7 @@ const submit$ = (chainHead, broadcastTx$, tx, at, emitSign = false) => {
     rxjs.take(1),
     rxjs.map((blocks) => {
       const block = blocks.blocks.get(at);
-      return block && !block.unpinned ? block.hash : blocks.finalized;
+      return block ? block.hash : blocks.finalized;
     })
   );
   const validate$ = at$.pipe(
@@ -1510,6 +1558,7 @@ function createClient(provider) {
   const { broadcastTx$ } = client;
   return {
     getChainSpecData,
+    blocks$: chainHead.newBlocks$,
     finalizedBlock$: chainHead.finalized$,
     getFinalizedBlock: () => rxjs.firstValueFrom(chainHead.finalized$),
     bestBlocks$: chainHead.bestBlocks$,
@@ -1614,6 +1663,53 @@ const getOfflineApi = async ({ genesis: genesisHex, getMetadata }) => {
   return { constants, tx };
 };
 
+const withError = (builder, errName) => (pallet, name) => {
+  try {
+    return builder(pallet, name);
+  } catch {
+    throw new Error(`Runtime entry ${errName}(${pallet}.${name}) not found`);
+  }
+};
+const getTypedCodecs = async (descriptors) => {
+  const metadata = substrateBindings.decAnyMetadata(await descriptors.getMetadata()).metadata.value;
+  const target = {};
+  const createProxy = (propCall) => new Proxy(target, {
+    get(_, prop) {
+      return propCall(prop);
+    }
+  });
+  const createProxyPath = (pathCall) => {
+    const cache = {};
+    return createProxy((a) => {
+      if (!cache[a]) cache[a] = {};
+      return createProxy((b) => {
+        if (!cache[a][b]) cache[a][b] = pathCall(a, b);
+        return cache[a][b];
+      });
+    });
+  };
+  const lookup = metadataBuilders.getLookupFn(metadata);
+  const {
+    buildRuntimeCall,
+    buildStorage,
+    buildConstant,
+    buildCall,
+    buildEvent
+  } = metadataBuilders.getDynamicBuilder(lookup);
+  return {
+    query: createProxyPath((...a) => {
+      const { value, args } = withError(buildStorage, "Storage")(...a);
+      return { value, args };
+    }),
+    tx: createProxyPath((...a) => withError(buildCall, "Call")(...a).codec),
+    event: createProxyPath(
+      (...args) => withError(buildEvent, "Event")(...args).codec
+    ),
+    apis: createProxyPath(withError(buildRuntimeCall, "Runtime API")),
+    constants: createProxyPath(withError(buildConstant, "Constant"))
+  };
+};
+
 Object.defineProperty(exports, "CompatibilityLevel", {
   enumerable: true,
   get: function () { return metadataCompatibility.CompatibilityLevel; }
@@ -1645,4 +1741,5 @@ Object.defineProperty(exports, "getSs58AddressInfo", {
 exports.InvalidTxError = InvalidTxError;
 exports.createClient = createClient;
 exports.getOfflineApi = getOfflineApi;
+exports.getTypedCodecs = getTypedCodecs;
 //# sourceMappingURL=index.js.map