@talismn/balances 0.0.0-pr2075-20250710052843 → 0.0.0-pr2075-20250710071608

package/dist/talismn-balances.esm.js

@@ -1277,19 +1277,6 @@ const getUniswapV2PairContractData = async (client, contractAddress) => {
   };
 };
 
-// const TokenCacheSchema = EvmUniswapV2TokenSchema.pick({
-//   id: true,
-//   symbol: true,
-//   decimals: true,
-//   name: true,
-//   tokenAddress0: true,
-//   tokenAddress1: true,
-//   decimals0: true,
-//   decimals1: true,
-//   symbol0: true,
-//   symbol1: true,
-// })
-
 const TokenCacheSchema = z.discriminatedUnion("isValid", [z.strictObject({
   id: EvmUniswapV2TokenSchema.shape.id,
   isValid: z.literal(true),
@@ -1525,6 +1512,21 @@ const fetchRuntimeCallResult = async (connector, networkId, metadataRpc, apiName
   return call.value.dec(hex);
 };
 
+const hasStorageItem = (metadata, palletName, itemName) => {
+  const pallet = metadata.pallets.find(p => p.name === palletName);
+  if (!pallet || !pallet.storage) return false;
+  return pallet.storage.items.some(item => item.name === itemName);
+};
+const hasStorageItems = (metadata, palletName, itemNames) => {
+  const pallet = metadata.pallets.find(p => p.name === palletName);
+  if (!pallet || !pallet.storage) return false;
+  return itemNames.every(itemName => pallet.storage?.items.some(item => item.name === itemName));
+};
+const hasRuntimeApi = (metadata, apiName, method) => {
+  const api = metadata.apis.find(api => api.name === apiName);
+  if (!api || !api.methods) return false;
+  return api.methods.some(m => m.name === method);
+};
 const getConstantValue = (metadataRpc, pallet, constant) => {
   const {
     unifiedMetadata,
@@ -1539,7 +1541,6 @@ const getConstantValue = (metadataRpc, pallet, constant) => {
   if (!encodedValue) throw new Error(`Constant ${pallet}.${constant} not found`);
   return codec.dec(encodedValue);
 };
-
 const tryGetConstantValue = (metadataRpc, pallet, constant) => {
   const {
     unifiedMetadata,
@@ -1555,22 +1556,6 @@ const tryGetConstantValue = (metadataRpc, pallet, constant) => {
   return codec.dec(encodedValue);
 };
 
-const hasStorageItem = (metadata, palletName, itemName) => {
-  const pallet = metadata.pallets.find(p => p.name === palletName);
-  if (!pallet || !pallet.storage) return false;
-  return pallet.storage.items.some(item => item.name === itemName);
-};
-const hasStorageItems = (metadata, palletName, itemNames) => {
-  const pallet = metadata.pallets.find(p => p.name === palletName);
-  if (!pallet || !pallet.storage) return false;
-  return itemNames.every(itemName => pallet.storage?.items.some(item => item.name === itemName));
-};
-const hasRuntimeApi = (metadata, apiName, method) => {
-  const api = metadata.apis.find(api => api.name === apiName);
-  if (!api || !api.methods) return false;
-  return api.methods.some(m => m.name === method);
-};
-
 const buildNetworkStorageCoders = (chainId, miniMetadata, coders) => {
   if (!miniMetadata.data) return null;
   const metadata = unifyMetadata(decAnyMetadata(miniMetadata.data));
@@ -3748,41 +3733,6 @@ const buildBaseQueries = (networkId, balanceDefs, miniMetadata) => {
     };
   }).filter(isNotNil);
 };
-
-// AccountInfo is the state_storage data format for nativeToken balances
-// Theory: new chains will be at least on metadata v14, and so we won't need to hardcode their AccountInfo type.
-// But for chains we want to support which aren't on metadata v14, hardcode them here:
-// If the chain upgrades to metadata v14, this override will be ignored :)
-// const RegularAccountInfoFallback = Struct({
-//   nonce: u32,
-//   consumers: u32,
-//   providers: u32,
-//   sufficients: u32,
-//   data: Struct({ free: u128, reserved: u128, miscFrozen: u128, feeFrozen: u128 }),
-// })
-// const NoSufficientsAccountInfoFallback = Struct({
-//   nonce: u32,
-//   consumers: u32,
-//   providers: u32,
-//   data: Struct({ free: u128, reserved: u128, miscFrozen: u128, feeFrozen: u128 }),
-// })
-// const AccountInfoOverrides: Record<
-//   string,
-//   typeof RegularAccountInfoFallback | typeof NoSufficientsAccountInfoFallback | undefined
-// > = {
-//   // crown-sterlin is not yet on metadata v14
-//   "crown-sterling": NoSufficientsAccountInfoFallback,
-
-//   // crust is not yet on metadata v14
-//   "crust": NoSufficientsAccountInfoFallback,
-
-//   // kulupu is not yet on metadata v14
-//   "kulupu": RegularAccountInfoFallback,
-
-//   // nftmart is not yet on metadata v14
-//   "nftmart": RegularAccountInfoFallback,
-// }
-
 const decodeBaseResult = (coder, value, networkId) => {
   /** NOTE: This type is only a hint for typescript, the chain can actually return whatever it wants to */
 
@@ -3833,15 +3783,6 @@ const decodeLocksResult = (coder, value, networkId) => {
     amount: (lock?.amount ?? 0n).toString()
   })) ?? [];
   return locksQueryLocks;
-
-  // // locked values should be replaced entirely, not merged or appended
-  // const nonLockValues = balanceJson.values.filter(
-  //   (v) => v.source !== "substrate-native-locks",
-  // )
-  // balanceJson.values = nonLockValues.concat(locksQueryLocks)
-
-  // // fix any double-counting between Balances.Locks (for staking locks) and Staking.Ledger (for unbonding locks)
-  // balanceJson.values = updateStakingLocksUsingUnbondingLocks(balanceJson.values)
 };
 const decodeFreezesResult = (coder, value, networkId) => {
   /** NOTE: This type is only a hint for typescript, the chain can actually return whatever it wants to */
@@ -3854,14 +3795,6 @@ const decodeFreezesResult = (coder, value, networkId) => {
     amount: lock?.amount?.toString?.() ?? "0"
   })) ?? [];
   return freezesValues;
-
-  // // freezes values should be replaced entirely, not merged or appended
-  // const nonFreezesValues = balanceJson.values.filter(
-  //   (v) => v.source !== "substrate-native-freezes",
-  // )
-  // balanceJson.values = nonFreezesValues.concat(freezesQueryLocks)
-
-  // return balanceJson
 };
 const decodeHoldsResult = (coder, value, networkId) => {
   /** NOTE: This type is only a hint for typescript, the chain can actually return whatever it wants to */
@@ -3880,14 +3813,6 @@ const decodeHoldsResult = (coder, value, networkId) => {
     }
   })) ?? [];
   return holdsValues;
-
-  // // values should be replaced entirely, not merged or appended
-  // const nonHoldsValues = balanceJson.values.filter(
-  //   (v) => v.source !== "substrate-native-holds",
-  // )
-  // balanceJson.values = nonHoldsValues.concat(holdsQueryLocks)
-
-  // return balanceJson
 };
 const decodeStakingLedgerResult = (coder, value, networkId) => {
   /** NOTE: This type is only a hint for typescript, the chain can actually return whatever it wants to */
@@ -3902,29 +3827,6 @@ const decodeStakingLedgerResult = (coder, value, networkId) => {
     amount: totalUnlocking.toString()
   }];
   return stakingLedgerResults;
-
-  // if (totalUnlocking <= 0n) unbondingQueryLocks = []
-  // else {
-  //   unbondingQueryLocks = [
-  //     {
-  //       type: "locked",
-  //       source: "substrate-native-unbonding",
-  //       label: "Unbonding",
-  //       amount: totalUnlocking.toString(),
-  //     },
-  //   ]
-  // }
-
-  // // unbonding values should be replaced entirely, not merged or appended
-  // const nonUnbondingValues = balanceJson.values.filter(
-  //   (v) => v.source !== "substrate-native-unbonding",
-  // )
-  // balanceJson.values = nonUnbondingValues.concat(unbondingQueryLocks)
-
-  // // fix any double-counting between Balances.Locks (for staking locks) and Staking.Ledger (for unbonding locks)
-  // balanceJson.values = updateStakingLocksUsingUnbondingLocks(balanceJson.values)
-
-  // return balanceJson
 };
 const decodePoolMemberResult = (coder, value, networkId) => {
   /** NOTE: This type is only a hint for typescript, the chain can actually return whatever it wants to */
@@ -3951,109 +3853,6 @@ const decodePoolMemberResult = (coder, value, networkId) => {
   };
 };
 
-// const getBaseQuery = (
-//   networkId: string,
-//   address: string,
-//   coder: ScaleStorageCoder,
-// ): RpcStateQuery<Array<AmountWithLabel<string>>> | null => {
-//   // For chains which are using metadata < v14
-//   const getFallbackStateKey = () => {
-//     const addressBytes = decodeAnyAddress(address) // TODO replace with modern api, this is slow
-//     const addressHash = blake2Concat(addressBytes).replace(/^0x/, "")
-//     const moduleHash = "26aa394eea5630e07c48ae0c9558cef7" // util_crypto.xxhashAsHex("System", 128);
-//     const storageHash = "b99d880ec681799c0cf30e8886371da9" // util_crypto.xxhashAsHex("Account", 128);
-//     const moduleStorageHash = `${moduleHash}${storageHash}` // System.Account is the state_storage key prefix for nativeToken balances
-//     return `0x${moduleStorageHash}${addressHash}`
-//   }
-
-//   // const scaleCoder = chainStorageCoders.get(chainId)?.base
-//   // NOTE: Only use fallback key when `scaleCoder` is not defined
-//   // i.e. when chain doesn't have metadata v14/v15
-//   const stateKey = coder
-//     ? encodeStateKey(coder, `Invalid address in ${networkId} base query ${address}`, address)
-//     : getFallbackStateKey()
-//   if (!stateKey) return null
-
-//   const decodeResult = (change: string | null) => {
-//     // BEGIN: Handle chains which use metadata < v14
-//     let oldChainBalance = null
-//     if (!coder) {
-//       const scaleAccountInfo = AccountInfoOverrides[networkId]
-//       if (scaleAccountInfo === undefined) {
-//         // chain metadata version is < 15 and we also don't have an override hardcoded in
-//         // the best way to handle this case: log a warning and return an empty balance
-//         log.debug(
-//           `Native token on chain ${networkId} has no balance type for decoding. Defaulting to a balance of 0 (zero).`,
-//         )
-//         return []
-//       }
-
-//       try {
-//         // eslint-disable-next-line no-var
-//         oldChainBalance = change === null ? null : scaleAccountInfo.dec(change)
-//       } catch (error) {
-//         log.warn(
-//           `Failed to create pre-metadataV14 balance type for native on chain ${networkId}: ${error?.toString()}`,
-//         )
-//         return []
-//       }
-//     }
-//     // END: Handle chains which use metadata < v14
-
-//     /** NOTE: This type is only a hint for typescript, the chain can actually return whatever it wants to */
-//     type DecodedType = {
-//       data?: {
-//         flags?: bigint
-//         free?: bigint
-//         frozen?: bigint
-//         reserved?: bigint
-
-//         // deprecated fields (they only show up on old chains)
-//         feeFrozen?: bigint
-//         miscFrozen?: bigint
-//       }
-//     }
-//     const decoded =
-//       decodeScale<DecodedType>(
-//         coder,
-//         change,
-//         `Failed to decode base native balance on chain ${networkId}`,
-//       ) ?? oldChainBalance
-
-//     const free = (decoded?.data?.free ?? 0n).toString()
-//     const reserved = (decoded?.data?.reserved ?? 0n).toString()
-//     const miscLock = (
-//       (decoded?.data?.miscFrozen ?? 0n) +
-//       // new chains don't split their `frozen` amount into `feeFrozen` and `miscFrozen`.
-//       // for these chains, we'll use the `frozen` amount as `miscFrozen`.
-//       ((decoded?.data as DecodedType["data"])?.frozen ?? 0n)
-//     ).toString()
-//     const feesLock = (decoded?.data?.feeFrozen ?? 0n).toString()
-
-//     // even if these values are 0, we still need to add them to the balanceJson.values array
-//     // so that the balance pool can handle newly zeroed balances
-//     // const existingValues = Object.fromEntries(
-//     //   balanceJson.values.map((v) => [getValueId(v), v]),
-//     // )
-//     const newValues: AmountWithLabel<string>[] = [
-//       { type: "free", label: "free", amount: free.toString() },
-//       { type: "reserved", label: "reserved", amount: reserved.toString() },
-//       { type: "locked", label: "misc", amount: miscLock.toString() },
-//       { type: "locked", label: "fees", amount: feesLock.toString() },
-//     ]
-
-//     return newValues
-
-//     // const newValuesObj = Object.fromEntries(newValues.map((v) => [getValueId(v), v]))
-
-//     // balanceJson.values = Object.values({ ...existingValues, ...newValuesObj })
-
-//     // return balanceJson
-//   }
-
-//   return { chainId: networkId, stateKey, decodeResult }
-// }
-
 /**
  * Each nominationPool in the nominationPools pallet has access to some accountIds which have no
  * associated private key. Instead, they are derived from this function.
@@ -4101,7 +3900,9 @@ const buildNomPoolQueries = (networkId, partialBalances, miniMetadata) => {
         }) => total + BigInt(amount ?? "0"), 0n);
         return {
           ...balance,
-          values: [...(balance.values ?? []), {
+          values: [...(balance.values?.filter(({
+            source
+          }) => source !== "nompools-staking") ?? []), {
             source: "nompools-staking",
             type: "nompool",
             label: "nompools-staking",
@@ -4231,7 +4032,9 @@ const fetchBalances$2 = async ({
   const subtensorBalancesByAddress = await firstValueFrom(subtensorBalances$);
   for (const [address, subtensorBalances] of Object.entries(subtensorBalancesByAddress)) {
     const balance = balances.find(b => b.address === address);
-    if (balance?.values) balance.values.push(...subtensorBalances);
+    if (balance?.values) balance.values = [...balance.values.filter(({
+      source
+    }) => source !== "subtensor-staking"), ...subtensorBalances];
   }
   return {
     success: balances,
@@ -4345,13 +4148,9 @@ const getMiniMetadata$2 = ({
   }, {
     pallet: "Staking",
     items: ["Ledger"]
-  },
-  // TotalColdkeyStake is used until v.2.2.1, then it is replaced by StakingHotkeys+Stake
-  // Need to keep TotalColdkeyStake for a while so chaindata keeps including it in miniMetadatas, so it doesnt break old versions of the wallet
-  // TODO: Since chaindata v4 this is safe to now delete
-  {
+  }, {
     pallet: "SubtensorModule",
-    items: ["TotalColdkeyStake", "StakingHotkeys", "Stake"]
+    items: ["StakingHotkeys", "Stake"]
   }], [{
     runtimeApi: "StakeInfoRuntimeApi",
     methods: ["get_stake_info_for_coldkey"]
@@ -4483,7 +4282,9 @@ const subscribeBalances$2 = ({
     // add subtensor balances to base balances
     for (const [address, subtensorBalances] of toPairs(subtensorBalancesByAddress)) {
       const balance = baseBalances.find(b => b.address === address);
-      if (balance?.values) balance.values.push(...subtensorBalances);
+      if (balance?.values) balance.values = [...balance.values.filter(({
+        source
+      }) => source !== "subtensor-staking"), ...subtensorBalances];
     }
     return {
       success: baseBalances,
@@ -6338,8 +6139,10 @@ const getMetadataRpc = async (chainConnector, networkId) => {
   if (CACHE$1.has(networkId)) return CACHE$1.get(networkId);
   const pResult = fetchBestMetadata((method, params, isCacheable) => chainConnector.send(networkId, method, params, isCacheable, {
     expectErrors: true
-  }), true // allow fallback to 14 as modules dont use any v15 or v16 specifics yet
-  );
+  }),
+  // do not allow fallback to v14 unless unavailable.
+  // substrate-native and substrate-hydration need v15 metadata for runtime api calls
+  false);
   CACHE$1.set(networkId, pResult);
   try {
     return await pResult;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@talismn/balances",
-  "version": "0.0.0-pr2075-20250710052843",
+  "version": "0.0.0-pr2075-20250710071608",
   "author": "Talisman",
   "homepage": "https://talisman.xyz",
   "license": "GPL-3.0-or-later",
@@ -34,13 +34,13 @@
     "scale-ts": "^1.6.1",
     "viem": "^2.27.3",
     "zod": "^3.25.62",
-    "@talismn/chaindata-provider": "0.0.0-pr2075-20250710052843",
-    "@talismn/chain-connector": "0.0.0-pr2075-20250710052843",
-    "@talismn/chain-connector-evm": "0.0.0-pr2075-20250710052843",
-    "@talismn/scale": "0.0.0-pr2075-20250710052843",
-    "@talismn/util": "0.0.0-pr2075-20250710052843",
-    "@talismn/sapi": "0.0.0-pr2075-20250710052843",
-    "@talismn/token-rates": "0.0.0-pr2075-20250710052843"
+    "@talismn/chain-connector-evm": "0.0.0-pr2075-20250710071608",
+    "@talismn/chaindata-provider": "0.0.0-pr2075-20250710071608",
+    "@talismn/chain-connector": "0.0.0-pr2075-20250710071608",
+    "@talismn/sapi": "0.0.0-pr2075-20250710071608",
+    "@talismn/scale": "0.0.0-pr2075-20250710071608",
+    "@talismn/token-rates": "0.0.0-pr2075-20250710071608",
+    "@talismn/util": "0.0.0-pr2075-20250710071608"
   },
   "devDependencies": {
     "@polkadot/api-contract": "16.1.2",

package/dist/declarations/src/modules/shared/getContantValue.d.ts

@@ -1 +0,0 @@
-export declare const getConstantValue: <T>(metadataRpc: `0x${string}`, pallet: string, constant: string) => T;