@chainflip/utils 0.8.3 → 0.8.5

package/dist/base58.js

@@ -2,8 +2,8 @@ import {
   CHARSET,
   decode,
   encode
-} from "./chunk-HOUVS5DD.js";
-import "./chunk-W23CNAUU.js";
+} from "./chunk-3P6TXYEI.js";
+import "./chunk-XGNPN5CY.js";
 import "./chunk-ZHIKNZLU.js";
 import "./chunk-HBIFE4XN.js";
 export {

package/dist/bytes.cjs

@@ -88,14 +88,11 @@ var decodeBytesWithCharset = (input, charset) => {
   const bytes = input.split("").map((char) => charMap[char]);
   return new Uint8Array(convertBase(bytes, charset.length, 256));
 };
-var addPrefix = (input) => {
-  const [, bytes] = /^(?:0x)?([a-f\d]*)$/i.exec(input) || [];
-  assert(bytes, "Invalid hex string");
-  return `0x${bytes}`;
-};
 function reverseBytes(input) {
-  const reversed = bytesToHex(hexToBytes(addPrefix(input)).reverse());
-  return input.startsWith("0x") ? reversed : reversed.slice(2);
+  const bytes = /^(?:0x)?([\da-f]+)$/gi.exec(input)?.[1];
+  assert(bytes && bytes.length % 2 === 0 && bytes.length > 0, "Invalid hex string");
+  const reversed = bytes.match(/.{2}/g).reverse().join("");
+  return input.startsWith("0x") ? `0x${reversed}` : reversed;
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/bytes.js

@@ -4,7 +4,7 @@ import {
   encodeBytesWithCharset,
   hexToBytes,
   reverseBytes
-} from "./chunk-W23CNAUU.js";
+} from "./chunk-XGNPN5CY.js";
 import "./chunk-ZHIKNZLU.js";
 import "./chunk-HBIFE4XN.js";
 export {

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-HOUVS5DD.js → chunk-3P6TXYEI.js}

@@ -1,7 +1,7 @@
 import {
   decodeBytesWithCharset,
   encodeBytesWithCharset
-} from "./chunk-W23CNAUU.js";
+} from "./chunk-XGNPN5CY.js";
 
 // src/base58.ts
 var CHARSET = "123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz";

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/{chunk-W23CNAUU.js → chunk-XGNPN5CY.js}

@@ -45,14 +45,11 @@ var decodeBytesWithCharset = (input, charset) => {
   const bytes = input.split("").map((char) => charMap[char]);
   return new Uint8Array(convertBase(bytes, charset.length, 256));
 };
-var addPrefix = (input) => {
-  const [, bytes] = /^(?:0x)?([a-f\d]*)$/i.exec(input) || [];
-  assert(bytes, "Invalid hex string");
-  return `0x${bytes}`;
-};
 function reverseBytes(input) {
-  const reversed = bytesToHex(hexToBytes(addPrefix(input)).reverse());
-  return input.startsWith("0x") ? reversed : reversed.slice(2);
+  const bytes = /^(?:0x)?([\da-f]+)$/gi.exec(input)?.[1];
+  assert(bytes && bytes.length % 2 === 0 && bytes.length > 0, "Invalid hex string");
+  const reversed = bytes.match(/.{2}/g).reverse().join("");
+  return input.startsWith("0x") ? `0x${reversed}` : reversed;
 }
 
 export {

package/dist/ss58.js

@@ -1,11 +1,11 @@
 import {
   decode,
   encode
-} from "./chunk-HOUVS5DD.js";
+} from "./chunk-3P6TXYEI.js";
 import {
   bytesToHex,
   hexToBytes
-} from "./chunk-W23CNAUU.js";
+} from "./chunk-XGNPN5CY.js";
 import {
   assert
 } from "./chunk-ZHIKNZLU.js";

package/dist/string.cjs

@@ -22,6 +22,7 @@ var string_exports = {};
 __export(string_exports, {
   abbreviate: () => abbreviate,
   capitalize: () => capitalize,
+  isBytes: () => isBytes,
   isHex: () => isHex,
   isInteger: () => isInteger,
   split: () => split,
@@ -38,6 +39,7 @@ var split = (str, delimiter) => str.split(delimiter);
 var capitalize = (str) => `${str.charAt(0).toUpperCase()}${str.slice(1)}`;
 var uncapitalize = (str) => `${str.charAt(0).toLowerCase()}${str.slice(1)}`;
 var isHex = (str) => /^0x[\da-f]+$/i.test(str);
+var isBytes = (str) => /^(0x)?[\da-f]*$/i.test(str) && str.length % 2 === 0;
 var abbreviate = (text, showLength = 4, space = false) => {
   if (typeof text !== "string") return "";
   const leftPart = text.slice(0, showLength);
@@ -56,6 +58,7 @@ var truncateString = (string, numCharacters = 20, ellipsis = true) => {
 0 && (module.exports = {
   abbreviate,
   capitalize,
+  isBytes,
   isHex,
   isInteger,
   split,

package/dist/string.d.cts

@@ -9,7 +9,8 @@ declare const split: <const T extends string, D extends string>(str: T, delimite
 declare const capitalize: <const T extends string>(str: T) => Capitalize<T>;
 declare const uncapitalize: <const T extends string>(str: T) => Uncapitalize<T>;
 declare const isHex: (str: string) => str is HexString;
+declare const isBytes: (str: string) => boolean;
 declare const abbreviate: (text: string | undefined | null, showLength?: number, space?: boolean) => string;
 declare const truncateString: (string: string, numCharacters?: number, ellipsis?: boolean) => string;
 
-export { abbreviate, capitalize, isHex, isInteger, split, toLowerCase, toUpperCase, truncateString, uncapitalize };
+export { abbreviate, capitalize, isBytes, isHex, isInteger, split, toLowerCase, toUpperCase, truncateString, uncapitalize };

package/dist/string.d.ts

@@ -9,7 +9,8 @@ declare const split: <const T extends string, D extends string>(str: T, delimite
 declare const capitalize: <const T extends string>(str: T) => Capitalize<T>;
 declare const uncapitalize: <const T extends string>(str: T) => Uncapitalize<T>;
 declare const isHex: (str: string) => str is HexString;
+declare const isBytes: (str: string) => boolean;
 declare const abbreviate: (text: string | undefined | null, showLength?: number, space?: boolean) => string;
 declare const truncateString: (string: string, numCharacters?: number, ellipsis?: boolean) => string;
 
-export { abbreviate, capitalize, isHex, isInteger, split, toLowerCase, toUpperCase, truncateString, uncapitalize };
+export { abbreviate, capitalize, isBytes, isHex, isInteger, split, toLowerCase, toUpperCase, truncateString, uncapitalize };

package/dist/string.js

@@ -6,6 +6,7 @@ var split = (str, delimiter) => str.split(delimiter);
 var capitalize = (str) => `${str.charAt(0).toUpperCase()}${str.slice(1)}`;
 var uncapitalize = (str) => `${str.charAt(0).toLowerCase()}${str.slice(1)}`;
 var isHex = (str) => /^0x[\da-f]+$/i.test(str);
+var isBytes = (str) => /^(0x)?[\da-f]*$/i.test(str) && str.length % 2 === 0;
 var abbreviate = (text, showLength = 4, space = false) => {
   if (typeof text !== "string") return "";
   const leftPart = text.slice(0, showLength);
@@ -23,6 +24,7 @@ var truncateString = (string, numCharacters = 20, ellipsis = true) => {
 export {
   abbreviate,
   capitalize,
+  isBytes,
   isHex,
   isInteger,
   split,

package/dist/tickMath.cjs

@@ -1,7 +1,9 @@
 "use strict";
+var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -15,6 +17,14 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/tickMath.ts
@@ -29,7 +39,7 @@ __export(tickMath_exports, {
   tickToRate: () => tickToRate
 });
 module.exports = __toCommonJS(tickMath_exports);
-var import_bignumber = require("bignumber.js");
+var import_bignumber = __toESM(require("bignumber.js"), 1);
 
 // src/chainflip.ts
 var chainflipAssets = [
@@ -200,20 +210,20 @@ var MIN_TICK = -887272;
 var MAX_TICK = -MIN_TICK;
 var FULL_TICK_RANGE = { start: MIN_TICK, end: MAX_TICK };
 var tickToRate = (tick, baseAsset) => {
-  const baseRate = new import_bignumber.BigNumber(1.0001 ** tick);
+  const baseRate = new import_bignumber.default(1.0001 ** tick);
   const rateDecimals = assetConstants.Usdc.decimals - assetConstants[baseAsset].decimals;
   return baseRate.shiftedBy(-rateDecimals).toNumber();
 };
 var rateToTick = (rate, baseAsset) => {
   const rateDecimals = assetConstants.Usdc.decimals - assetConstants[baseAsset].decimals;
-  const rawRate = new import_bignumber.BigNumber(rate).shiftedBy(rateDecimals);
+  const rawRate = new import_bignumber.default(rate).shiftedBy(rateDecimals);
   let tick = Math.log(rawRate.toNumber()) / Math.log(1.0001);
   tick = Math.round(tick * 1e6) / 1e6;
   tick = Math.floor(tick);
   return Math.max(MIN_TICK, Math.min(tick, MAX_TICK));
 };
-var sqrtPriceX96ToPrice = (amount) => new import_bignumber.BigNumber(amount).div(new import_bignumber.BigNumber(2).pow(96)).pow(2);
-var priceX128ToPrice = (amount) => new import_bignumber.BigNumber(amount).div(new import_bignumber.BigNumber(2).pow(128));
+var sqrtPriceX96ToPrice = (amount) => new import_bignumber.default(amount).div(new import_bignumber.default(2).pow(96)).pow(2);
+var priceX128ToPrice = (amount) => new import_bignumber.default(amount).div(new import_bignumber.default(2).pow(128));
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   FULL_TICK_RANGE,

package/dist/tickMath.d.cts

@@ -1,4 +1,4 @@
-import { BigNumber } from 'bignumber.js';
+import BigNumber from 'bignumber.js';
 import { ChainflipAsset } from './chainflip.cjs';
 
 declare const MIN_TICK = -887272;

package/dist/tickMath.d.ts

@@ -1,4 +1,4 @@
-import { BigNumber } from 'bignumber.js';
+import BigNumber from 'bignumber.js';
 import { ChainflipAsset } from './chainflip.js';
 
 declare const MIN_TICK = -887272;

package/dist/tickMath.js

@@ -1,9 +1,9 @@
 import {
   assetConstants
-} from "./chunk-6LZGVCU6.js";
+} from "./chunk-4DFBUXHM.js";
 
 // src/tickMath.ts
-import { BigNumber } from "bignumber.js";
+import BigNumber from "bignumber.js";
 var MIN_TICK = -887272;
 var MAX_TICK = -MIN_TICK;
 var FULL_TICK_RANGE = { start: MIN_TICK, end: MAX_TICK };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chainflip/utils",
-  "version": "0.8.3",
+  "version": "0.8.5",
   "type": "module",
   "files": [
     "dist",
@@ -20,11 +20,11 @@
   },
   "devDependencies": {
     "@noble/hashes": "^1.7.1",
-    "@vitest/ui": "3.0.9"
+    "@vitest/ui": "3.1.1"
   },
   "dependencies": {
     "@date-fns/utc": "^2.1.0",
-    "bignumber.js": "^9.1.2",
+    "bignumber.js": "^9.2.0",
     "date-fns": "4.1.0"
   },
   "repository": "https://github.com/chainflip-io/chainflip-product-toolkit.git",