@talismn/balances 0.9.8 → 0.9.10

package/dist/declarations/src/modules/SubstrateNativeModule/index.d.ts

@@ -2,6 +2,6 @@ import { NewBalanceModule } from "../../BalanceModule";
 import { CustomSubNativeToken, ModuleType, SubNativeChainMeta, SubNativeModuleConfig, SubNativeToken, SubNativeTransferParams } from "./types";
 export { filterBaseLocks, getLockTitle } from "./util/balanceLockTypes";
 export type { BalanceLockType } from "./util/balanceLockTypes";
-export type { CustomSubNativeToken, ModuleType, SubNativeBalance, SubNativeChainMeta, SubNativeModuleConfig, SubNativeToken, SubNativeTransferParams, } from "./types";
 export { subNativeTokenId } from "./types";
+export type { CustomSubNativeToken, ModuleType, SubNativeBalance, SubNativeChainMeta, SubNativeModuleConfig, SubNativeToken, SubNativeTransferParams, } from "./types";
 export declare const SubNativeModule: NewBalanceModule<ModuleType, SubNativeToken | CustomSubNativeToken, SubNativeChainMeta, SubNativeModuleConfig, SubNativeTransferParams>;

package/dist/declarations/src/modules/util/buildStorageCoders.d.ts

@@ -18,6 +18,12 @@ export declare const buildStorageCoders: <TBalanceModule extends AnyNewBalanceMo
     moduleType: InferModuleType<TBalanceModule>;
     coders: TCoders;
 }) => Map<string, { [Property in keyof TCoders]: {
+    args: [import("scale-ts").Encoder<any[]>, import("scale-ts").Decoder<any[]>] & {
+        enc: import("scale-ts").Encoder<any[]>;
+        dec: import("scale-ts").Decoder<any[]>;
+    } & {
+        inner: import("@talismn/scale").Codec<any>[];
+    };
     keys: {
         enc: (...args: any[]) => string;
         dec: (value: string) => any[];

package/dist/talismn-balances.cjs.dev.js

@@ -2948,11 +2948,7 @@ const buildStorageCoders = ({
   const [, miniMetadata] = findChainMeta(miniMetadatas, moduleType, chain);
   if (!miniMetadata) return [];
   if (!miniMetadata.data) return [];
-  const {
-    metadata,
-    tag
-  } = scale.decodeMetadata(miniMetadata.data);
-  if (!metadata || !tag) return [];
+  const metadata = scale.unifyMetadata(scale.decAnyMetadata(miniMetadata.data));
   try {
     const scaleBuilder = scale.getDynamicBuilder(scale.getLookupFn(metadata));
     const builtCoders = Object.fromEntries(Object.entries(coders).flatMap(([key, moduleMethodOrFn]) => {
@@ -3181,25 +3177,13 @@ const SubAssetsModule = hydrate => {
       if ((moduleConfig?.tokens ?? []).length < 1) return {
         isTestnet
       };
-      const {
-        metadataVersion,
-        metadata,
-        tag
-      } = scale.decodeMetadata(metadataRpc);
-      if (!metadata) return {
-        isTestnet
-      };
+      const metadataVersion = scale.getMetadataVersion(metadataRpc);
+      const metadata = scale.decAnyMetadata(metadataRpc);
       scale.compactMetadata(metadata, [{
         pallet: "Assets",
         items: ["Account", "Asset", "Metadata"]
       }]);
-      const miniMetadata = scale.encodeMetadata(tag === "v15" ? {
-        tag,
-        metadata
-      } : {
-        tag,
-        metadata
-      });
+      const miniMetadata = scale.encodeMetadata(metadata);
       return {
         isTestnet,
         miniMetadata,
@@ -3215,10 +3199,7 @@ const SubAssetsModule = hydrate => {
       } = chainMeta;
       if (miniMetadata === undefined || metadataVersion === undefined) return {};
       if (metadataVersion < 14) return {};
-      const {
-        metadata
-      } = scale.decodeMetadata(miniMetadata);
-      if (metadata === undefined) return {};
+      const metadata = scale.unifyMetadata(scale.decAnyMetadata(miniMetadata));
       const scaleBuilder = scale.getDynamicBuilder(scale.getLookupFn(metadata));
       const assetCoder = scaleBuilder.buildStorage("Assets", "Asset");
       const metadataCoder = scaleBuilder.buildStorage("Assets", "Metadata");
@@ -3476,14 +3457,8 @@ const SubEquilibriumModule = hydrate => {
         isTestnet
       }; // default to disabled
 
-      const {
-        metadataVersion,
-        metadata,
-        tag
-      } = scale.decodeMetadata(metadataRpc);
-      if (!metadata) return {
-        isTestnet
-      };
+      const metadataVersion = scale.getMetadataVersion(metadataRpc);
+      const metadata = scale.decAnyMetadata(metadataRpc);
       scale.compactMetadata(metadata, [{
         pallet: "EqAssets",
         items: ["Assets"]
@@ -3491,13 +3466,7 @@ const SubEquilibriumModule = hydrate => {
         pallet: "System",
         items: ["Account"]
       }]);
-      const miniMetadata = scale.encodeMetadata(tag === "v15" ? {
-        tag,
-        metadata
-      } : {
-        tag,
-        metadata
-      });
+      const miniMetadata = scale.encodeMetadata(metadata);
       return {
         isTestnet,
         miniMetadata,
@@ -3514,11 +3483,8 @@ const SubEquilibriumModule = hydrate => {
       } = chainMeta;
       if (miniMetadata === undefined || metadataVersion === undefined) return {};
       if (metadataVersion < 14) return {};
-      const {
-        metadata
-      } = scale.decodeMetadata(miniMetadata);
-      if (metadata === undefined) return {};
       try {
+        const metadata = scale.unifyMetadata(scale.decAnyMetadata(miniMetadata));
         const scaleBuilder = scale.getDynamicBuilder(scale.getLookupFn(metadata));
         const assetsCoder = scaleBuilder.buildStorage("EqAssets", "Assets");
         const stateKey = assetsCoder.keys.enc();
@@ -3758,25 +3724,13 @@ const SubForeignAssetsModule = hydrate => {
       if ((moduleConfig?.tokens ?? []).length < 1) return {
         isTestnet
       };
-      const {
-        metadataVersion,
-        metadata,
-        tag
-      } = scale.decodeMetadata(metadataRpc);
-      if (!metadata) return {
-        isTestnet
-      };
+      const metadataVersion = scale.getMetadataVersion(metadataRpc);
+      const metadata = scale.decAnyMetadata(metadataRpc);
       scale.compactMetadata(metadata, [{
         pallet: "ForeignAssets",
         items: ["Account", "Asset", "Metadata"]
       }]);
-      const miniMetadata = scale.encodeMetadata(tag === "v15" ? {
-        tag,
-        metadata
-      } : {
-        tag,
-        metadata
-      });
+      const miniMetadata = scale.encodeMetadata(metadata);
       return {
         isTestnet,
         miniMetadata,
@@ -3792,11 +3746,9 @@ const SubForeignAssetsModule = hydrate => {
       } = chainMeta;
       if (miniMetadata === undefined || metadataVersion === undefined) return {};
       if (metadataVersion < 14) return {};
-      const {
-        metadata
-      } = scale.decodeMetadata(miniMetadata);
-      if (metadata === undefined) return {};
-      const scaleBuilder = scale.getDynamicBuilder(scale.getLookupFn(metadata));
+      const metadata = scale.decAnyMetadata(miniMetadata);
+      const unifiedMetadata = scale.unifyMetadata(metadata);
+      const scaleBuilder = scale.getDynamicBuilder(scale.getLookupFn(unifiedMetadata));
       const assetCoder = scaleBuilder.buildStorage("ForeignAssets", "Asset");
       const metadataCoder = scaleBuilder.buildStorage("ForeignAssets", "Metadata");
       const tokens = {};
@@ -3898,17 +3850,14 @@ const SubForeignAssetsModule = hydrate => {
         },
         amount: BigInt(amount)
       };
-      const {
-        metadata
-      } = scale.decodeMetadata(metadataRpc);
-      if (metadata === undefined) throw new Error("Unable to decode metadata");
+      const metadata = scale.unifyMetadata(scale.decAnyMetadata(metadataRpc));
       const scaleBuilder = scale.getDynamicBuilder(scale.getLookupFn(metadata));
       try {
         const {
           location,
           codec
         } = scaleBuilder.buildCall(pallet, method);
-        const callData = polkadotApi.Binary.fromBytes(utils.mergeUint8(new Uint8Array(location), codec.enc(args)));
+        const callData = polkadotApi.Binary.fromBytes(utils.mergeUint8([new Uint8Array(location), codec.enc(args)]));
         return {
           type: "substrate",
           callData: utils.toHex(callData.asBytes())
@@ -4311,7 +4260,7 @@ const nompoolAccountId = (palletId, poolId, index) => {
   const length = encModPrefix.length + encPalletId.length + encIndex.length + encPoolId.length;
   const remainingBytes = 32 - length;
   const encEmptyH256 = new Uint8Array(remainingBytes);
-  const bytes = utils.mergeUint8(encModPrefix, encPalletId, encIndex, encPoolId, encEmptyH256);
+  const bytes = utils.mergeUint8([encModPrefix, encPalletId, encIndex, encPoolId, encEmptyH256]);
   return polkadotApi.AccountId().dec(bytes);
 };
 /** The stash account for the nomination pool */
@@ -5474,25 +5423,17 @@ const SubNativeModule = hydrate => {
       //
       // process metadata into SCALE encoders/decoders
       //
-
-      const {
-        metadataVersion,
-        metadata,
-        tag
-      } = scale.decodeMetadata(metadataRpc);
-      if (!metadata) return {
-        isTestnet,
-        symbol,
-        decimals
-      };
+      const metadataVersion = scale.getMetadataVersion(metadataRpc);
+      const metadata = scale.decAnyMetadata(metadataRpc);
+      const unifiedMetadata = scale.unifyMetadata(metadata);
 
       //
       // get runtime constants
       //
 
-      const scaleBuilder = scale.getDynamicBuilder(scale.getLookupFn(metadata));
+      const scaleBuilder = scale.getDynamicBuilder(scale.getLookupFn(unifiedMetadata));
       const getConstantValue = (palletName, constantName) => {
-        const encodedValue = metadata.pallets.find(({
+        const encodedValue = unifiedMetadata.pallets.find(({
           name
         }) => name === palletName)?.constants.find(({
           name
@@ -5541,14 +5482,8 @@ const SubNativeModule = hydrate => {
         runtimeApi: "SubnetInfoRuntimeApi",
         methods: ["get_dynamic_info"]
       }]);
-      const miniMetadata = scale.encodeMetadata(tag === "v15" ? {
-        tag,
-        metadata
-      } : {
-        tag,
-        metadata
-      });
-      const hasFreezesItem = Boolean(metadata.pallets.find(({
+      const miniMetadata = scale.encodeMetadata(metadata);
+      const hasFreezesItem = Boolean(unifiedMetadata.pallets.find(({
         name
       }) => name === "Balances")?.storage?.items.find(({
         name
@@ -7257,26 +7192,14 @@ const SubTokensModule = hydrate => {
       if ((moduleConfig?.tokens ?? []).length < 1) return {
         isTestnet
       };
-      const {
-        metadataVersion,
-        metadata,
-        tag
-      } = scale.decodeMetadata(metadataRpc);
-      if (!metadata) return {
-        isTestnet
-      };
+      const metadataVersion = scale.getMetadataVersion(metadataRpc);
+      const metadata = scale.decAnyMetadata(metadataRpc);
       const palletId = moduleConfig?.palletId ?? defaultPalletId;
       scale.compactMetadata(metadata, [{
         pallet: palletId,
         items: ["Accounts"]
       }]);
-      const miniMetadata = scale.encodeMetadata(tag === "v15" ? {
-        tag,
-        metadata
-      } : {
-        tag,
-        metadata
-      });
+      const miniMetadata = scale.encodeMetadata(metadata);
       return palletId === defaultPalletId ? {
         isTestnet,
         miniMetadata,
@@ -7372,10 +7295,7 @@ const SubTokensModule = hydrate => {
           return token.onChainId;
         }
       })();
-      const {
-        metadata
-      } = scale.decodeMetadata(metadataRpc);
-      if (metadata === undefined) throw new Error("Unable to decode metadata");
+      const metadata = scale.unifyMetadata(scale.decAnyMetadata(metadataRpc));
       const scaleBuilder = scale.getDynamicBuilder(scale.getLookupFn(metadata));
       const tryBuildCallData = (pallet, method, args) => {
         try {
@@ -7383,7 +7303,7 @@ const SubTokensModule = hydrate => {
             location,
             codec
           } = scaleBuilder.buildCall(pallet, method);
-          return [polkadotApi.Binary.fromBytes(utils.mergeUint8(new Uint8Array(location), codec.enc(args))), undefined];
+          return [polkadotApi.Binary.fromBytes(utils.mergeUint8([new Uint8Array(location), codec.enc(args)])), undefined];
         } catch (cause) {
           return [undefined, new Error("Failed to build call", {
             cause

package/dist/talismn-balances.cjs.prod.js

@@ -2948,11 +2948,7 @@ const buildStorageCoders = ({
   const [, miniMetadata] = findChainMeta(miniMetadatas, moduleType, chain);
   if (!miniMetadata) return [];
   if (!miniMetadata.data) return [];
-  const {
-    metadata,
-    tag
-  } = scale.decodeMetadata(miniMetadata.data);
-  if (!metadata || !tag) return [];
+  const metadata = scale.unifyMetadata(scale.decAnyMetadata(miniMetadata.data));
   try {
     const scaleBuilder = scale.getDynamicBuilder(scale.getLookupFn(metadata));
     const builtCoders = Object.fromEntries(Object.entries(coders).flatMap(([key, moduleMethodOrFn]) => {
@@ -3181,25 +3177,13 @@ const SubAssetsModule = hydrate => {
       if ((moduleConfig?.tokens ?? []).length < 1) return {
         isTestnet
       };
-      const {
-        metadataVersion,
-        metadata,
-        tag
-      } = scale.decodeMetadata(metadataRpc);
-      if (!metadata) return {
-        isTestnet
-      };
+      const metadataVersion = scale.getMetadataVersion(metadataRpc);
+      const metadata = scale.decAnyMetadata(metadataRpc);
       scale.compactMetadata(metadata, [{
         pallet: "Assets",
         items: ["Account", "Asset", "Metadata"]
       }]);
-      const miniMetadata = scale.encodeMetadata(tag === "v15" ? {
-        tag,
-        metadata
-      } : {
-        tag,
-        metadata
-      });
+      const miniMetadata = scale.encodeMetadata(metadata);
       return {
         isTestnet,
         miniMetadata,
@@ -3215,10 +3199,7 @@ const SubAssetsModule = hydrate => {
       } = chainMeta;
       if (miniMetadata === undefined || metadataVersion === undefined) return {};
       if (metadataVersion < 14) return {};
-      const {
-        metadata
-      } = scale.decodeMetadata(miniMetadata);
-      if (metadata === undefined) return {};
+      const metadata = scale.unifyMetadata(scale.decAnyMetadata(miniMetadata));
       const scaleBuilder = scale.getDynamicBuilder(scale.getLookupFn(metadata));
       const assetCoder = scaleBuilder.buildStorage("Assets", "Asset");
       const metadataCoder = scaleBuilder.buildStorage("Assets", "Metadata");
@@ -3476,14 +3457,8 @@ const SubEquilibriumModule = hydrate => {
         isTestnet
       }; // default to disabled
 
-      const {
-        metadataVersion,
-        metadata,
-        tag
-      } = scale.decodeMetadata(metadataRpc);
-      if (!metadata) return {
-        isTestnet
-      };
+      const metadataVersion = scale.getMetadataVersion(metadataRpc);
+      const metadata = scale.decAnyMetadata(metadataRpc);
       scale.compactMetadata(metadata, [{
         pallet: "EqAssets",
         items: ["Assets"]
@@ -3491,13 +3466,7 @@ const SubEquilibriumModule = hydrate => {
         pallet: "System",
         items: ["Account"]
       }]);
-      const miniMetadata = scale.encodeMetadata(tag === "v15" ? {
-        tag,
-        metadata
-      } : {
-        tag,
-        metadata
-      });
+      const miniMetadata = scale.encodeMetadata(metadata);
       return {
         isTestnet,
         miniMetadata,
@@ -3514,11 +3483,8 @@ const SubEquilibriumModule = hydrate => {
       } = chainMeta;
       if (miniMetadata === undefined || metadataVersion === undefined) return {};
       if (metadataVersion < 14) return {};
-      const {
-        metadata
-      } = scale.decodeMetadata(miniMetadata);
-      if (metadata === undefined) return {};
       try {
+        const metadata = scale.unifyMetadata(scale.decAnyMetadata(miniMetadata));
         const scaleBuilder = scale.getDynamicBuilder(scale.getLookupFn(metadata));
         const assetsCoder = scaleBuilder.buildStorage("EqAssets", "Assets");
         const stateKey = assetsCoder.keys.enc();
@@ -3758,25 +3724,13 @@ const SubForeignAssetsModule = hydrate => {
       if ((moduleConfig?.tokens ?? []).length < 1) return {
         isTestnet
       };
-      const {
-        metadataVersion,
-        metadata,
-        tag
-      } = scale.decodeMetadata(metadataRpc);
-      if (!metadata) return {
-        isTestnet
-      };
+      const metadataVersion = scale.getMetadataVersion(metadataRpc);
+      const metadata = scale.decAnyMetadata(metadataRpc);
       scale.compactMetadata(metadata, [{
         pallet: "ForeignAssets",
         items: ["Account", "Asset", "Metadata"]
       }]);
-      const miniMetadata = scale.encodeMetadata(tag === "v15" ? {
-        tag,
-        metadata
-      } : {
-        tag,
-        metadata
-      });
+      const miniMetadata = scale.encodeMetadata(metadata);
       return {
         isTestnet,
         miniMetadata,
@@ -3792,11 +3746,9 @@ const SubForeignAssetsModule = hydrate => {
       } = chainMeta;
       if (miniMetadata === undefined || metadataVersion === undefined) return {};
       if (metadataVersion < 14) return {};
-      const {
-        metadata
-      } = scale.decodeMetadata(miniMetadata);
-      if (metadata === undefined) return {};
-      const scaleBuilder = scale.getDynamicBuilder(scale.getLookupFn(metadata));
+      const metadata = scale.decAnyMetadata(miniMetadata);
+      const unifiedMetadata = scale.unifyMetadata(metadata);
+      const scaleBuilder = scale.getDynamicBuilder(scale.getLookupFn(unifiedMetadata));
       const assetCoder = scaleBuilder.buildStorage("ForeignAssets", "Asset");
       const metadataCoder = scaleBuilder.buildStorage("ForeignAssets", "Metadata");
       const tokens = {};
@@ -3898,17 +3850,14 @@ const SubForeignAssetsModule = hydrate => {
         },
         amount: BigInt(amount)
       };
-      const {
-        metadata
-      } = scale.decodeMetadata(metadataRpc);
-      if (metadata === undefined) throw new Error("Unable to decode metadata");
+      const metadata = scale.unifyMetadata(scale.decAnyMetadata(metadataRpc));
       const scaleBuilder = scale.getDynamicBuilder(scale.getLookupFn(metadata));
       try {
         const {
           location,
           codec
         } = scaleBuilder.buildCall(pallet, method);
-        const callData = polkadotApi.Binary.fromBytes(utils.mergeUint8(new Uint8Array(location), codec.enc(args)));
+        const callData = polkadotApi.Binary.fromBytes(utils.mergeUint8([new Uint8Array(location), codec.enc(args)]));
         return {
           type: "substrate",
           callData: utils.toHex(callData.asBytes())
@@ -4311,7 +4260,7 @@ const nompoolAccountId = (palletId, poolId, index) => {
   const length = encModPrefix.length + encPalletId.length + encIndex.length + encPoolId.length;
   const remainingBytes = 32 - length;
   const encEmptyH256 = new Uint8Array(remainingBytes);
-  const bytes = utils.mergeUint8(encModPrefix, encPalletId, encIndex, encPoolId, encEmptyH256);
+  const bytes = utils.mergeUint8([encModPrefix, encPalletId, encIndex, encPoolId, encEmptyH256]);
   return polkadotApi.AccountId().dec(bytes);
 };
 /** The stash account for the nomination pool */
@@ -5474,25 +5423,17 @@ const SubNativeModule = hydrate => {
       //
       // process metadata into SCALE encoders/decoders
       //
-
-      const {
-        metadataVersion,
-        metadata,
-        tag
-      } = scale.decodeMetadata(metadataRpc);
-      if (!metadata) return {
-        isTestnet,
-        symbol,
-        decimals
-      };
+      const metadataVersion = scale.getMetadataVersion(metadataRpc);
+      const metadata = scale.decAnyMetadata(metadataRpc);
+      const unifiedMetadata = scale.unifyMetadata(metadata);
 
       //
       // get runtime constants
       //
 
-      const scaleBuilder = scale.getDynamicBuilder(scale.getLookupFn(metadata));
+      const scaleBuilder = scale.getDynamicBuilder(scale.getLookupFn(unifiedMetadata));
       const getConstantValue = (palletName, constantName) => {
-        const encodedValue = metadata.pallets.find(({
+        const encodedValue = unifiedMetadata.pallets.find(({
           name
         }) => name === palletName)?.constants.find(({
           name
@@ -5541,14 +5482,8 @@ const SubNativeModule = hydrate => {
         runtimeApi: "SubnetInfoRuntimeApi",
         methods: ["get_dynamic_info"]
       }]);
-      const miniMetadata = scale.encodeMetadata(tag === "v15" ? {
-        tag,
-        metadata
-      } : {
-        tag,
-        metadata
-      });
-      const hasFreezesItem = Boolean(metadata.pallets.find(({
+      const miniMetadata = scale.encodeMetadata(metadata);
+      const hasFreezesItem = Boolean(unifiedMetadata.pallets.find(({
         name
       }) => name === "Balances")?.storage?.items.find(({
         name
@@ -7257,26 +7192,14 @@ const SubTokensModule = hydrate => {
       if ((moduleConfig?.tokens ?? []).length < 1) return {
         isTestnet
       };
-      const {
-        metadataVersion,
-        metadata,
-        tag
-      } = scale.decodeMetadata(metadataRpc);
-      if (!metadata) return {
-        isTestnet
-      };
+      const metadataVersion = scale.getMetadataVersion(metadataRpc);
+      const metadata = scale.decAnyMetadata(metadataRpc);
       const palletId = moduleConfig?.palletId ?? defaultPalletId;
       scale.compactMetadata(metadata, [{
         pallet: palletId,
         items: ["Accounts"]
       }]);
-      const miniMetadata = scale.encodeMetadata(tag === "v15" ? {
-        tag,
-        metadata
-      } : {
-        tag,
-        metadata
-      });
+      const miniMetadata = scale.encodeMetadata(metadata);
       return palletId === defaultPalletId ? {
         isTestnet,
         miniMetadata,
@@ -7372,10 +7295,7 @@ const SubTokensModule = hydrate => {
           return token.onChainId;
         }
       })();
-      const {
-        metadata
-      } = scale.decodeMetadata(metadataRpc);
-      if (metadata === undefined) throw new Error("Unable to decode metadata");
+      const metadata = scale.unifyMetadata(scale.decAnyMetadata(metadataRpc));
       const scaleBuilder = scale.getDynamicBuilder(scale.getLookupFn(metadata));
       const tryBuildCallData = (pallet, method, args) => {
         try {
@@ -7383,7 +7303,7 @@ const SubTokensModule = hydrate => {
             location,
             codec
           } = scaleBuilder.buildCall(pallet, method);
-          return [polkadotApi.Binary.fromBytes(utils.mergeUint8(new Uint8Array(location), codec.enc(args))), undefined];
+          return [polkadotApi.Binary.fromBytes(utils.mergeUint8([new Uint8Array(location), codec.enc(args)])), undefined];
         } catch (cause) {
           return [undefined, new Error("Failed to build call", {
             cause

package/dist/talismn-balances.esm.js

@@ -1,6 +1,6 @@
 import PromisePool$1, { PromisePool } from '@supercharge/promise-pool';
 import { fetchMiniMetadatas, fetchInitMiniMetadatas, availableTokenLogoFilenames, githubTokenLogoUrl } from '@talismn/chaindata-provider';
-import { toHex, decodeMetadata, getDynamicBuilder, getLookupFn, compactMetadata, encodeMetadata, decodeScale, encodeStateKey, papiParse } from '@talismn/scale';
+import { toHex, unifyMetadata, decAnyMetadata, getDynamicBuilder, getLookupFn, getMetadataVersion, compactMetadata, encodeMetadata, decodeScale, encodeStateKey, papiParse } from '@talismn/scale';
 import { Dexie, liveQuery } from 'dexie';
 import isEqual from 'lodash/isEqual';
 import { from, Observable, scan, share, map, switchAll, combineLatest, mergeMap, toArray, interval, startWith, exhaustMap, pipe, filter, shareReplay, combineLatestWith, distinctUntilChanged, firstValueFrom, BehaviorSubject, debounceTime, takeUntil, switchMap, withLatestFrom, concatMap } from 'rxjs';
@@ -2935,11 +2935,7 @@ const buildStorageCoders = ({
   const [, miniMetadata] = findChainMeta(miniMetadatas, moduleType, chain);
   if (!miniMetadata) return [];
   if (!miniMetadata.data) return [];
-  const {
-    metadata,
-    tag
-  } = decodeMetadata(miniMetadata.data);
-  if (!metadata || !tag) return [];
+  const metadata = unifyMetadata(decAnyMetadata(miniMetadata.data));
   try {
     const scaleBuilder = getDynamicBuilder(getLookupFn(metadata));
     const builtCoders = Object.fromEntries(Object.entries(coders).flatMap(([key, moduleMethodOrFn]) => {
@@ -3168,25 +3164,13 @@ const SubAssetsModule = hydrate => {
       if ((moduleConfig?.tokens ?? []).length < 1) return {
         isTestnet
       };
-      const {
-        metadataVersion,
-        metadata,
-        tag
-      } = decodeMetadata(metadataRpc);
-      if (!metadata) return {
-        isTestnet
-      };
+      const metadataVersion = getMetadataVersion(metadataRpc);
+      const metadata = decAnyMetadata(metadataRpc);
       compactMetadata(metadata, [{
         pallet: "Assets",
         items: ["Account", "Asset", "Metadata"]
       }]);
-      const miniMetadata = encodeMetadata(tag === "v15" ? {
-        tag,
-        metadata
-      } : {
-        tag,
-        metadata
-      });
+      const miniMetadata = encodeMetadata(metadata);
       return {
         isTestnet,
         miniMetadata,
@@ -3202,10 +3186,7 @@ const SubAssetsModule = hydrate => {
       } = chainMeta;
       if (miniMetadata === undefined || metadataVersion === undefined) return {};
       if (metadataVersion < 14) return {};
-      const {
-        metadata
-      } = decodeMetadata(miniMetadata);
-      if (metadata === undefined) return {};
+      const metadata = unifyMetadata(decAnyMetadata(miniMetadata));
       const scaleBuilder = getDynamicBuilder(getLookupFn(metadata));
       const assetCoder = scaleBuilder.buildStorage("Assets", "Asset");
       const metadataCoder = scaleBuilder.buildStorage("Assets", "Metadata");
@@ -3463,14 +3444,8 @@ const SubEquilibriumModule = hydrate => {
         isTestnet
       }; // default to disabled
 
-      const {
-        metadataVersion,
-        metadata,
-        tag
-      } = decodeMetadata(metadataRpc);
-      if (!metadata) return {
-        isTestnet
-      };
+      const metadataVersion = getMetadataVersion(metadataRpc);
+      const metadata = decAnyMetadata(metadataRpc);
       compactMetadata(metadata, [{
         pallet: "EqAssets",
         items: ["Assets"]
@@ -3478,13 +3453,7 @@ const SubEquilibriumModule = hydrate => {
         pallet: "System",
         items: ["Account"]
       }]);
-      const miniMetadata = encodeMetadata(tag === "v15" ? {
-        tag,
-        metadata
-      } : {
-        tag,
-        metadata
-      });
+      const miniMetadata = encodeMetadata(metadata);
       return {
         isTestnet,
         miniMetadata,
@@ -3501,11 +3470,8 @@ const SubEquilibriumModule = hydrate => {
       } = chainMeta;
       if (miniMetadata === undefined || metadataVersion === undefined) return {};
       if (metadataVersion < 14) return {};
-      const {
-        metadata
-      } = decodeMetadata(miniMetadata);
-      if (metadata === undefined) return {};
       try {
+        const metadata = unifyMetadata(decAnyMetadata(miniMetadata));
         const scaleBuilder = getDynamicBuilder(getLookupFn(metadata));
         const assetsCoder = scaleBuilder.buildStorage("EqAssets", "Assets");
         const stateKey = assetsCoder.keys.enc();
@@ -3745,25 +3711,13 @@ const SubForeignAssetsModule = hydrate => {
       if ((moduleConfig?.tokens ?? []).length < 1) return {
         isTestnet
       };
-      const {
-        metadataVersion,
-        metadata,
-        tag
-      } = decodeMetadata(metadataRpc);
-      if (!metadata) return {
-        isTestnet
-      };
+      const metadataVersion = getMetadataVersion(metadataRpc);
+      const metadata = decAnyMetadata(metadataRpc);
       compactMetadata(metadata, [{
         pallet: "ForeignAssets",
         items: ["Account", "Asset", "Metadata"]
       }]);
-      const miniMetadata = encodeMetadata(tag === "v15" ? {
-        tag,
-        metadata
-      } : {
-        tag,
-        metadata
-      });
+      const miniMetadata = encodeMetadata(metadata);
       return {
         isTestnet,
         miniMetadata,
@@ -3779,11 +3733,9 @@ const SubForeignAssetsModule = hydrate => {
       } = chainMeta;
       if (miniMetadata === undefined || metadataVersion === undefined) return {};
       if (metadataVersion < 14) return {};
-      const {
-        metadata
-      } = decodeMetadata(miniMetadata);
-      if (metadata === undefined) return {};
-      const scaleBuilder = getDynamicBuilder(getLookupFn(metadata));
+      const metadata = decAnyMetadata(miniMetadata);
+      const unifiedMetadata = unifyMetadata(metadata);
+      const scaleBuilder = getDynamicBuilder(getLookupFn(unifiedMetadata));
       const assetCoder = scaleBuilder.buildStorage("ForeignAssets", "Asset");
       const metadataCoder = scaleBuilder.buildStorage("ForeignAssets", "Metadata");
       const tokens = {};
@@ -3885,17 +3837,14 @@ const SubForeignAssetsModule = hydrate => {
         },
         amount: BigInt(amount)
       };
-      const {
-        metadata
-      } = decodeMetadata(metadataRpc);
-      if (metadata === undefined) throw new Error("Unable to decode metadata");
+      const metadata = unifyMetadata(decAnyMetadata(metadataRpc));
       const scaleBuilder = getDynamicBuilder(getLookupFn(metadata));
       try {
         const {
           location,
           codec
         } = scaleBuilder.buildCall(pallet, method);
-        const callData = Binary.fromBytes(mergeUint8(new Uint8Array(location), codec.enc(args)));
+        const callData = Binary.fromBytes(mergeUint8([new Uint8Array(location), codec.enc(args)]));
         return {
           type: "substrate",
           callData: toHex$1(callData.asBytes())
@@ -4298,7 +4247,7 @@ const nompoolAccountId = (palletId, poolId, index) => {
   const length = encModPrefix.length + encPalletId.length + encIndex.length + encPoolId.length;
   const remainingBytes = 32 - length;
   const encEmptyH256 = new Uint8Array(remainingBytes);
-  const bytes = mergeUint8(encModPrefix, encPalletId, encIndex, encPoolId, encEmptyH256);
+  const bytes = mergeUint8([encModPrefix, encPalletId, encIndex, encPoolId, encEmptyH256]);
   return AccountId().dec(bytes);
 };
 /** The stash account for the nomination pool */
@@ -5461,25 +5410,17 @@ const SubNativeModule = hydrate => {
       //
       // process metadata into SCALE encoders/decoders
       //
-
-      const {
-        metadataVersion,
-        metadata,
-        tag
-      } = decodeMetadata(metadataRpc);
-      if (!metadata) return {
-        isTestnet,
-        symbol,
-        decimals
-      };
+      const metadataVersion = getMetadataVersion(metadataRpc);
+      const metadata = decAnyMetadata(metadataRpc);
+      const unifiedMetadata = unifyMetadata(metadata);
 
       //
       // get runtime constants
       //
 
-      const scaleBuilder = getDynamicBuilder(getLookupFn(metadata));
+      const scaleBuilder = getDynamicBuilder(getLookupFn(unifiedMetadata));
       const getConstantValue = (palletName, constantName) => {
-        const encodedValue = metadata.pallets.find(({
+        const encodedValue = unifiedMetadata.pallets.find(({
           name
         }) => name === palletName)?.constants.find(({
           name
@@ -5528,14 +5469,8 @@ const SubNativeModule = hydrate => {
         runtimeApi: "SubnetInfoRuntimeApi",
         methods: ["get_dynamic_info"]
       }]);
-      const miniMetadata = encodeMetadata(tag === "v15" ? {
-        tag,
-        metadata
-      } : {
-        tag,
-        metadata
-      });
-      const hasFreezesItem = Boolean(metadata.pallets.find(({
+      const miniMetadata = encodeMetadata(metadata);
+      const hasFreezesItem = Boolean(unifiedMetadata.pallets.find(({
         name
       }) => name === "Balances")?.storage?.items.find(({
         name
@@ -7244,26 +7179,14 @@ const SubTokensModule = hydrate => {
       if ((moduleConfig?.tokens ?? []).length < 1) return {
         isTestnet
       };
-      const {
-        metadataVersion,
-        metadata,
-        tag
-      } = decodeMetadata(metadataRpc);
-      if (!metadata) return {
-        isTestnet
-      };
+      const metadataVersion = getMetadataVersion(metadataRpc);
+      const metadata = decAnyMetadata(metadataRpc);
       const palletId = moduleConfig?.palletId ?? defaultPalletId;
       compactMetadata(metadata, [{
         pallet: palletId,
         items: ["Accounts"]
       }]);
-      const miniMetadata = encodeMetadata(tag === "v15" ? {
-        tag,
-        metadata
-      } : {
-        tag,
-        metadata
-      });
+      const miniMetadata = encodeMetadata(metadata);
       return palletId === defaultPalletId ? {
         isTestnet,
         miniMetadata,
@@ -7359,10 +7282,7 @@ const SubTokensModule = hydrate => {
           return token.onChainId;
         }
       })();
-      const {
-        metadata
-      } = decodeMetadata(metadataRpc);
-      if (metadata === undefined) throw new Error("Unable to decode metadata");
+      const metadata = unifyMetadata(decAnyMetadata(metadataRpc));
       const scaleBuilder = getDynamicBuilder(getLookupFn(metadata));
       const tryBuildCallData = (pallet, method, args) => {
         try {
@@ -7370,7 +7290,7 @@ const SubTokensModule = hydrate => {
             location,
             codec
           } = scaleBuilder.buildCall(pallet, method);
-          return [Binary.fromBytes(mergeUint8(new Uint8Array(location), codec.enc(args))), undefined];
+          return [Binary.fromBytes(mergeUint8([new Uint8Array(location), codec.enc(args)])), undefined];
         } catch (cause) {
           return [undefined, new Error("Failed to build call", {
             cause

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@talismn/balances",
-  "version": "0.9.8",
+  "version": "0.9.10",
   "author": "Talisman",
   "homepage": "https://talisman.xyz",
   "license": "GPL-3.0-or-later",
@@ -22,7 +22,7 @@
     "node": ">=18"
   },
   "dependencies": {
-    "@polkadot-api/utils": "0.1.2",
+    "@polkadot-api/utils": "0.2.0",
     "@supercharge/promise-pool": "^3.2.0",
     "anylogger": "^1.0.11",
     "bignumber.js": "^9.1.2",
@@ -30,23 +30,23 @@
     "lodash": "4.17.21",
     "lz-string": "1.5.0",
     "pako": "^2.1.0",
-    "polkadot-api": "1.7.6",
+    "polkadot-api": "1.13.1",
     "rxjs": "^7.8.1",
     "scale-ts": "^1.6.1",
     "viem": "^2.27.3",
-    "@talismn/chain-connector": "0.10.7",
-    "@talismn/chain-connector-evm": "0.10.7",
-    "@talismn/chaindata-provider": "0.10.7",
-    "@talismn/sapi": "0.0.3",
-    "@talismn/token-rates": "2.0.8",
-    "@talismn/scale": "0.1.1",
-    "@talismn/util": "0.4.1"
+    "@talismn/chain-connector": "0.10.9",
+    "@talismn/chain-connector-evm": "0.10.9",
+    "@talismn/chaindata-provider": "0.10.9",
+    "@talismn/sapi": "0.0.4",
+    "@talismn/token-rates": "2.0.10",
+    "@talismn/scale": "0.1.2",
+    "@talismn/util": "0.4.2"
   },
   "devDependencies": {
-    "@polkadot/api-contract": "15.8.1",
-    "@polkadot/types": "15.8.1",
-    "@polkadot/util": "13.4.3",
-    "@polkadot/util-crypto": "13.4.3",
+    "@polkadot/api-contract": "16.1.2",
+    "@polkadot/types": "16.1.2",
+    "@polkadot/util": "13.5.1",
+    "@polkadot/util-crypto": "13.5.1",
     "@substrate/txwrapper-core": "7.5.3",
     "@types/jest": "^29.5.14",
     "@types/lodash": "^4.17.12",
@@ -55,8 +55,8 @@
     "jest": "^29.7.0",
     "ts-jest": "^29.2.5",
     "typescript": "^5.6.3",
-    "@talismn/tsconfig": "0.0.2",
-    "@talismn/eslint-config": "0.0.3"
+    "@talismn/eslint-config": "0.0.3",
+    "@talismn/tsconfig": "0.0.2"
   },
   "peerDependencies": {
     "@polkadot/api-contract": "*",