@chainflip/utils 0.8.4 → 0.8.6

package/dist/chainflip.cjs

@@ -247,19 +247,7 @@ var assetContractId = {
   HubUsdt: 12,
   HubUsdc: 13
 };
-function isValidAssetAndChain(assetAndChain) {
-  const { asset, chain } = assetAndChain;
-  if (!(chain in chainConstants)) return false;
-  const validAssets = chainConstants[chain].assets;
-  return validAssets.includes(asset);
-}
 function getInternalAsset(asset, assert = true) {
-  if (!isValidAssetAndChain(asset)) {
-    if (assert) {
-      throw new Error(`invalid asset and chain combination: ${JSON.stringify(asset)}`);
-    }
-    return null;
-  }
   const map = {
     Ethereum: {
       USDC: "Usdc",
@@ -288,7 +276,14 @@ function getInternalAsset(asset, assert = true) {
     }
   };
   const chain = map[asset.chain];
-  return chain[asset.asset];
+  const internalAsset = chain?.[asset.asset];
+  if (internalAsset) return internalAsset;
+  if (assert) throw new Error(`invalid asset and chain combination: ${JSON.stringify(asset)}`);
+  return null;
+}
+function isValidAssetAndChain(assetAndChain) {
+  const asset = getInternalAsset(assetAndChain, false);
+  return asset !== null;
 }
 function getInternalAssets({
   srcAsset,

package/dist/chainflip.d.cts

@@ -31,10 +31,16 @@ type BaseChainAssetMap<T> = {
 };
 type AssetAndChain = {
     [C in ChainflipChain]: {
-        chain: C;
-        asset: keyof ChainAssetMap<unknown>[C];
-    };
+        [A in keyof ChainAssetMap<unknown>[C]]: {
+            chain: C;
+            asset: A;
+        };
+    }[keyof ChainAssetMap<unknown>[C]];
 }[ChainflipChain];
+type BaseAssetAndChain = Exclude<AssetAndChain, {
+    chain: 'Ethereum';
+    asset: 'USDC';
+}>;
 type ChainMap<T> = {
     [C in ChainflipChain]: T;
 };
@@ -181,10 +187,12 @@ declare const chainConstants: {
 declare const internalAssetToRpcAsset: InternalAssetMap<AssetAndChain>;
 declare const chainContractId: ChainMap<number>;
 declare const assetContractId: InternalAssetMap<number>;
-declare function isValidAssetAndChain(assetAndChain: UncheckedAssetAndChain): assetAndChain is AssetAndChain;
+declare function getInternalAsset(asset: BaseAssetAndChain): BaseChainflipAsset;
+declare function getInternalAsset(asset: AssetAndChain): ChainflipAsset;
 declare function getInternalAsset(asset: UncheckedAssetAndChain): ChainflipAsset;
 declare function getInternalAsset(asset: UncheckedAssetAndChain, assert: true): ChainflipAsset;
 declare function getInternalAsset(asset: UncheckedAssetAndChain, assert: boolean): ChainflipAsset | null;
+declare function isValidAssetAndChain(assetAndChain: UncheckedAssetAndChain): assetAndChain is AssetAndChain;
 declare function getInternalAssets(data: {
     srcAsset: AssetSymbol;
     srcChain: ChainflipChain;
@@ -213,4 +221,4 @@ declare function getInternalAssets(data: {
     destAsset: ChainflipAsset | null;
 };
 
-export { type AddressType, type AssetAndChain, type AssetOfChain, type AssetSymbol, type BaseChainAssetMap, type BaseChainflipAsset, type ChainAssetMap, type ChainMap, type ChainflipAsset, type ChainflipChain, type ChainflipEvmChain, type ChainflipNetwork, type InternalAssetMap, type RpcAsset, type UncheckedAssetAndChain, addressTypes, assetConstants, assetContractId, assetSymbols, baseChainflipAssets, chainConstants, chainContractId, chainflipAssets, chainflipChains, chainflipEvmChains, chainflipNetworks, getInternalAsset, getInternalAssets, internalAssetToRpcAsset, isValidAssetAndChain, readAssetValue, rpcAssets };
+export { type AddressType, type AssetAndChain, type AssetOfChain, type AssetSymbol, type BaseAssetAndChain, type BaseChainAssetMap, type BaseChainflipAsset, type ChainAssetMap, type ChainMap, type ChainflipAsset, type ChainflipChain, type ChainflipEvmChain, type ChainflipNetwork, type InternalAssetMap, type RpcAsset, type UncheckedAssetAndChain, addressTypes, assetConstants, assetContractId, assetSymbols, baseChainflipAssets, chainConstants, chainContractId, chainflipAssets, chainflipChains, chainflipEvmChains, chainflipNetworks, getInternalAsset, getInternalAssets, internalAssetToRpcAsset, isValidAssetAndChain, readAssetValue, rpcAssets };

package/dist/chainflip.d.ts

@@ -31,10 +31,16 @@ type BaseChainAssetMap<T> = {
 };
 type AssetAndChain = {
     [C in ChainflipChain]: {
-        chain: C;
-        asset: keyof ChainAssetMap<unknown>[C];
-    };
+        [A in keyof ChainAssetMap<unknown>[C]]: {
+            chain: C;
+            asset: A;
+        };
+    }[keyof ChainAssetMap<unknown>[C]];
 }[ChainflipChain];
+type BaseAssetAndChain = Exclude<AssetAndChain, {
+    chain: 'Ethereum';
+    asset: 'USDC';
+}>;
 type ChainMap<T> = {
     [C in ChainflipChain]: T;
 };
@@ -181,10 +187,12 @@ declare const chainConstants: {
 declare const internalAssetToRpcAsset: InternalAssetMap<AssetAndChain>;
 declare const chainContractId: ChainMap<number>;
 declare const assetContractId: InternalAssetMap<number>;
-declare function isValidAssetAndChain(assetAndChain: UncheckedAssetAndChain): assetAndChain is AssetAndChain;
+declare function getInternalAsset(asset: BaseAssetAndChain): BaseChainflipAsset;
+declare function getInternalAsset(asset: AssetAndChain): ChainflipAsset;
 declare function getInternalAsset(asset: UncheckedAssetAndChain): ChainflipAsset;
 declare function getInternalAsset(asset: UncheckedAssetAndChain, assert: true): ChainflipAsset;
 declare function getInternalAsset(asset: UncheckedAssetAndChain, assert: boolean): ChainflipAsset | null;
+declare function isValidAssetAndChain(assetAndChain: UncheckedAssetAndChain): assetAndChain is AssetAndChain;
 declare function getInternalAssets(data: {
     srcAsset: AssetSymbol;
     srcChain: ChainflipChain;
@@ -213,4 +221,4 @@ declare function getInternalAssets(data: {
     destAsset: ChainflipAsset | null;
 };
 
-export { type AddressType, type AssetAndChain, type AssetOfChain, type AssetSymbol, type BaseChainAssetMap, type BaseChainflipAsset, type ChainAssetMap, type ChainMap, type ChainflipAsset, type ChainflipChain, type ChainflipEvmChain, type ChainflipNetwork, type InternalAssetMap, type RpcAsset, type UncheckedAssetAndChain, addressTypes, assetConstants, assetContractId, assetSymbols, baseChainflipAssets, chainConstants, chainContractId, chainflipAssets, chainflipChains, chainflipEvmChains, chainflipNetworks, getInternalAsset, getInternalAssets, internalAssetToRpcAsset, isValidAssetAndChain, readAssetValue, rpcAssets };
+export { type AddressType, type AssetAndChain, type AssetOfChain, type AssetSymbol, type BaseAssetAndChain, type BaseChainAssetMap, type BaseChainflipAsset, type ChainAssetMap, type ChainMap, type ChainflipAsset, type ChainflipChain, type ChainflipEvmChain, type ChainflipNetwork, type InternalAssetMap, type RpcAsset, type UncheckedAssetAndChain, addressTypes, assetConstants, assetContractId, assetSymbols, baseChainflipAssets, chainConstants, chainContractId, chainflipAssets, chainflipChains, chainflipEvmChains, chainflipNetworks, getInternalAsset, getInternalAssets, internalAssetToRpcAsset, isValidAssetAndChain, readAssetValue, rpcAssets };

package/dist/chainflip.js

@@ -16,7 +16,7 @@ import {
   isValidAssetAndChain,
   readAssetValue,
   rpcAssets
-} from "./chunk-6LZGVCU6.js";
+} from "./chunk-4DFBUXHM.js";
 export {
   addressTypes,
   assetConstants,

package/dist/{chunk-6LZGVCU6.js → chunk-4DFBUXHM.js}

@@ -207,19 +207,7 @@ var assetContractId = {
   HubUsdt: 12,
   HubUsdc: 13
 };
-function isValidAssetAndChain(assetAndChain) {
-  const { asset, chain } = assetAndChain;
-  if (!(chain in chainConstants)) return false;
-  const validAssets = chainConstants[chain].assets;
-  return validAssets.includes(asset);
-}
 function getInternalAsset(asset, assert = true) {
-  if (!isValidAssetAndChain(asset)) {
-    if (assert) {
-      throw new Error(`invalid asset and chain combination: ${JSON.stringify(asset)}`);
-    }
-    return null;
-  }
   const map = {
     Ethereum: {
       USDC: "Usdc",
@@ -248,7 +236,14 @@ function getInternalAsset(asset, assert = true) {
     }
   };
   const chain = map[asset.chain];
-  return chain[asset.asset];
+  const internalAsset = chain?.[asset.asset];
+  if (internalAsset) return internalAsset;
+  if (assert) throw new Error(`invalid asset and chain combination: ${JSON.stringify(asset)}`);
+  return null;
+}
+function isValidAssetAndChain(assetAndChain) {
+  const asset = getInternalAsset(assetAndChain, false);
+  return asset !== null;
 }
 function getInternalAssets({
   srcAsset,
@@ -277,7 +272,7 @@ export {
   internalAssetToRpcAsset,
   chainContractId,
   assetContractId,
-  isValidAssetAndChain,
   getInternalAsset,
+  isValidAssetAndChain,
   getInternalAssets
 };

package/dist/consts.cjs

@@ -153,6 +153,10 @@ var brokerAliasMap = {
   cFPD5DrrsHb7Wi5nmBcFuPDcGRsWhv5Bz6vvzGqFYPFhbR3Sw: {
     name: "Squid",
     twitter: "@squidrouter"
+  },
+  cFJZvt5AiEGwUiFFNxhDuLRcgC1WBR6tE7gaQQfe8dqbzoYkx: {
+    name: "Symbiosis",
+    twitter: "@symbiosis_fi"
   }
 };
 var lpAliasMap = {

package/dist/consts.js

@@ -119,6 +119,10 @@ var brokerAliasMap = {
   cFPD5DrrsHb7Wi5nmBcFuPDcGRsWhv5Bz6vvzGqFYPFhbR3Sw: {
     name: "Squid",
     twitter: "@squidrouter"
+  },
+  cFJZvt5AiEGwUiFFNxhDuLRcgC1WBR6tE7gaQQfe8dqbzoYkx: {
+    name: "Symbiosis",
+    twitter: "@symbiosis_fi"
   }
 };
 var lpAliasMap = {

package/dist/tickMath.js

@@ -1,6 +1,6 @@
 import {
   assetConstants
-} from "./chunk-6LZGVCU6.js";
+} from "./chunk-4DFBUXHM.js";
 
 // src/tickMath.ts
 import BigNumber from "bignumber.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chainflip/utils",
-  "version": "0.8.4",
+  "version": "0.8.6",
   "type": "module",
   "files": [
     "dist",