polkadot-api 1.8.0 → 1.8.2

package/dist/index.js

@@ -54,10 +54,18 @@ const createCompatibilityToken = (chainDefinition, chainHead) => {
     compatibilityTokenApi.set(token, {
       runtime,
       getPalletEntryPoint(opType, pallet, name) {
-        return entryPoints[descriptors[opType][pallet][name]];
+        const idx = descriptors[opType]?.[pallet]?.[name];
+        if (idx == null)
+          throw new Error(
+            `Descriptor for ${opType} ${pallet}.${name} does not exist`
+          );
+        return entryPoints[idx];
       },
       getApiEntryPoint(name, method) {
-        return entryPoints[descriptors.apis[name][method]];
+        const idx = descriptors.apis?.[name]?.[method];
+        if (idx == null)
+          throw new Error(`Descriptor for API ${name}.${method} does not exist`);
+        return entryPoints[idx];
       },
       typedefNodes
     });
@@ -109,6 +117,11 @@ const compatibilityHelper = (descriptors, getDescriptorEntryPoint, getRuntimeEnt
     ctx || (ctx = compatibilityApi.runtime());
     const descriptorEntryPoint = getDescriptorEntryPoint(compatibilityApi);
     const runtimeEntryPoint = getRuntimeEntryPoint(ctx);
+    if (runtimeEntryPoint == null)
+      return {
+        args: metadataCompatibility.CompatibilityLevel.Incompatible,
+        values: metadataCompatibility.CompatibilityLevel.Incompatible
+      };
     const descriptorNodes = compatibilityApi.typedefNodes;
     const cache = getMetadataCache(ctx);
     return metadataCompatibility.entryPointsAreCompatible(
@@ -139,6 +152,7 @@ const compatibilityHelper = (descriptors, getDescriptorEntryPoint, getRuntimeEnt
     if (levels.args > metadataCompatibility.CompatibilityLevel.Partial) return true;
     if (levels.values === metadataCompatibility.CompatibilityLevel.Incompatible) return false;
     const entryPoint = getRuntimeEntryPoint(ctx);
+    if (entryPoint == null) return false;
     return metadataCompatibility.valueIsCompatibleWithDest(
       entryPoint.args,
       (id) => getRuntimeTypedef(ctx, id),
@@ -314,7 +328,7 @@ const continueWith = (mapper) => (source) => new rxjs.Observable((observer) => {
 });
 
 const isOptionalArg = (lastArg) => typeof lastArg === "object" && lastArg !== null && Object.entries(lastArg).every(
-  ([k, v]) => k === "at" && (v === void 0 || typeof v === "string") || k === "signal" && (v === void 0 || v instanceof AbortSignal)
+  ([k, v]) => k === "at" && (v === undefined || typeof v === "string") || k === "signal" && (v === undefined || v instanceof AbortSignal)
 );
 
 const selfDependent = () => {
@@ -704,23 +718,6 @@ var chainSignedExtensions = /*#__PURE__*/Object.freeze({
   getNonce: getNonce
 });
 
-const empty$ = rxjs.of({
-  value: empty,
-  additionalSigned: empty
-});
-const getCustomSignExt = (obj, key, encoder) => {
-  if (!(key in obj)) return empty;
-  const x = obj[key];
-  return x instanceof Uint8Array ? x : encoder(x);
-};
-const getEncodedSignExtFromCustom = (custom, valueEnc, additionalSignedEnc) => rxjs.of({
-  value: getCustomSignExt(custom, "value", valueEnc),
-  additionalSigned: getCustomSignExt(
-    custom,
-    "additionalSigned",
-    additionalSignedEnc
-  )
-});
 const createTx = (chainHead, signer, callData, atBlock, customSignedExtensions, hinted = {}) => chainHead.getRuntimeContext$(atBlock.hash).pipe(
   rxjs.take(1),
   rxjs.mergeMap((ctx) => {
@@ -732,7 +729,7 @@ const createTx = (chainHead, signer, callData, atBlock, customSignedExtensions,
       at: atBlock.hash,
       from: signer.publicKey
     };
-    const mortality = !hinted.mortality ? { period: 64, blockNumber: atBlock.number } : hinted.mortality.mortal ? { period: hinted.mortality.period, blockNumber: atBlock.number } : void 0;
+    const mortality = !hinted.mortality ? { period: 64, blockNumber: atBlock.number } : hinted.mortality.mortal ? { period: hinted.mortality.period, blockNumber: atBlock.number } : undefined;
     return rxjs.combineLatest(
       Object.fromEntries(
         ctx.lookup.metadata.extrinsic.signedExtensions.map(({ identifier, type, additionalSigned }) => {
@@ -746,13 +743,28 @@ const createTx = (chainHead, signer, callData, atBlock, customSignedExtensions,
             if (identifier === "CheckNonce" && "nonce" in hinted)
               return getNonce(hinted.nonce);
             const fn = chainSignedExtensions[identifier];
-            const [valueEnc] = ctx.dynamicBuilder.buildDefinition(type);
-            const [additionalSignedEnc] = ctx.dynamicBuilder.buildDefinition(additionalSigned);
-            return fn ? fn(signedExtensionsCtx) : valueEnc === substrateBindings._void[0] && additionalSignedEnc === substrateBindings._void[0] ? empty$ : identifier in customSignedExtensions ? getEncodedSignExtFromCustom(
-              customSignedExtensions[identifier],
-              valueEnc,
-              additionalSignedEnc
-            ) : null;
+            if (fn) return fn(signedExtensionsCtx);
+            const customEntry = customSignedExtensions[identifier];
+            const [[valueEnc], [additionalSignedEnc]] = [
+              type,
+              additionalSigned
+            ].map(ctx.dynamicBuilder.buildDefinition);
+            try {
+              return rxjs.of(
+                utils.mapObject(
+                  {
+                    value: valueEnc,
+                    additionalSigned: additionalSignedEnc
+                  },
+                  (encoder, key) => {
+                    const input = customEntry?.[key];
+                    return input instanceof Uint8Array ? input : encoder(input);
+                  }
+                )
+              );
+            } catch {
+              return null;
+            }
           };
           return [identifier, stream()];
         }).filter((x) => x[1])
@@ -1350,15 +1362,20 @@ const createApi = (compatibilityToken, chainHead, broadcast$) => {
         compatibilityToken,
         (r) => r.getPalletEntryPoint(OpType.Storage, pallet, name),
         // TODO this is way sub-optimal. Needs some rethought - maybe a builder for entry points?.
-        (ctx) => metadataCompatibility.storageEntryPoint(
-          getPallet(ctx, pallet).storage.items.find((s) => s.name === name)
-        )
+        (ctx) => {
+          const item = getPallet(ctx, pallet)?.storage?.items.find(
+            (s) => s.name === name
+          );
+          return item == null ? null : metadataCompatibility.storageEntryPoint(item);
+        }
       )
     )
   );
   const getEnumEntry = (ctx, side, id, name) => {
+    if (id == null) return null;
     const entry = ctx.lookup(id);
     if (entry.type !== "enum") throw new Error("Expected enum");
+    if (entry.value[name] == null) return null;
     const node = metadataCompatibility.enumValueEntryPointNode(entry.value[name]);
     return {
       args: side === "args" ? node : metadataCompatibility.voidEntryPointNode,
@@ -1374,7 +1391,7 @@ const createApi = (compatibilityToken, chainHead, broadcast$) => {
       compatibilityHelper(
         compatibilityToken,
         (r) => r.getPalletEntryPoint(OpType.Tx, pallet, name),
-        (ctx) => getEnumEntry(ctx, "args", getPallet(ctx, pallet).calls, name)
+        (ctx) => getEnumEntry(ctx, "args", getPallet(ctx, pallet)?.calls, name)
       ),
       true
     )
@@ -1387,7 +1404,7 @@ const createApi = (compatibilityToken, chainHead, broadcast$) => {
       compatibilityHelper(
         compatibilityToken,
         (r) => r.getPalletEntryPoint(OpType.Event, pallet, name),
-        (ctx) => getEnumEntry(ctx, "values", getPallet(ctx, pallet).events, name)
+        (ctx) => getEnumEntry(ctx, "values", getPallet(ctx, pallet)?.events, name)
       )
     )
   );
@@ -1398,9 +1415,12 @@ const createApi = (compatibilityToken, chainHead, broadcast$) => {
       compatibilityHelper(
         compatibilityToken,
         (r) => r.getPalletEntryPoint(OpType.Const, pallet, name),
-        (ctx) => metadataCompatibility.singleValueEntryPoint(
-          getPallet(ctx, pallet).constants.find((c) => c.name === name).type
-        )
+        (ctx) => {
+          const item = getPallet(ctx, pallet)?.constants.find(
+            (c) => c.name === name
+          )?.type;
+          return item == null ? null : metadataCompatibility.singleValueEntryPoint(item);
+        }
       )
     )
   );
@@ -1433,7 +1453,7 @@ const createApi = (compatibilityToken, chainHead, broadcast$) => {
         compatibilityHelper(
           compatibilityToken,
           (r) => r.getPalletEntryPoint(OpType.Tx, pallet, call),
-          (ctx) => getEnumEntry(ctx, "args", getPallet(ctx, pallet).calls, call)
+          (ctx) => getEnumEntry(ctx, "args", getPallet(ctx, pallet)?.calls, call)
         ),
         false
       )(args);