sushi 6.1.3 → 6.1.4

package/evm/config/index.ts

@@ -1,4 +1,4 @@
-export * from './subgraphs/index.js'
 export * from './features/index.js'
-export * from './tokens/index.js'
 export * from './simple-constants.js'
+export * from './subgraphs/index.js'
+export * from './tokens/index.js'

package/evm/config/subgraphs/subgraph-url.test.ts

@@ -1,8 +1,7 @@
 import { describe, expect, expectTypeOf, it } from 'vitest'
-import { getSushiSwapV3SubgraphUrl } from './subgraphs/sushiswap-v3.js'
-
 import { EvmChainId } from '../../chain/index.js'
 import { getBlocksSubgraphUrl } from './subgraphs/blocks.js'
+import { getSushiSwapV3SubgraphUrl } from './subgraphs/sushiswap-v3.js'
 
 describe('subgraph urls', () => {
   it('with subgraph id matches', () => {

package/evm/config/subgraphs/subgraphs/blade.ts

@@ -27,19 +27,3 @@ export const getBladeSubgraphUrl = getSubgraphUrlWrapper({
   },
   otherUrls: BLADE_OTHER_URLS,
 })<BladeChainId, 'COMPLETE'>()
-
-export const BladeSubgraphTemplateMap: Record<BladeChainId, string> =
-  Object.fromEntries(
-    Object.entries({
-      ...BLADE_DECENTRALIZED_DEPLOYMENT_IDS,
-      ...BLADE_DECENTRALIZED_SUBGRAPH_IDS,
-      ...BLADE_OTHER_URLS,
-    })
-      .map(([chainId]) => {
-        const url = getBladeSubgraphUrl(Number(chainId) as BladeChainId, {
-          decentralizedKey: '${GRAPH_KEY}',
-        })
-        return [Number(chainId), url ? `https://${url}` : undefined]
-      })
-      .filter(([, url]) => !!url),
-  ) as Record<BladeChainId, string>

package/evm/config/subgraphs/subgraphs/blocks.ts

@@ -54,18 +54,3 @@ export const getBlocksSubgraphUrl = getSubgraphUrlWrapper({
   decentralizedIds: wrapAsIdType(BLOCKS_DECENTRALIZED_IDS, 'deploymentId'),
   otherUrls: BLOCKS_OTHER_URLS,
 })<EvmChainId, 'PARTIAL'>()
-
-export const BlocksSubgraphTemplateMap: Record<EvmChainId, string> =
-  Object.fromEntries(
-    Object.entries({
-      ...BLOCKS_DECENTRALIZED_IDS,
-      ...BLOCKS_OTHER_URLS,
-    })
-      .map(([chainId]) => {
-        const url = getBlocksSubgraphUrl(Number(chainId) as EvmChainId, {
-          decentralizedKey: '${GRAPH_KEY}',
-        })
-        return [Number(chainId), url ? `https://${url}` : undefined]
-      })
-      .filter(([, url]) => !!url),
-  ) as Record<EvmChainId, string>

package/evm/config/subgraphs/subgraphs/index.ts

@@ -1,9 +1,9 @@
+export * from './blade.js'
 export * from './blocks.js'
+export * from './data-api.js'
 export * from './master-chef-v1.js'
 export * from './master-chef-v2.js'
 export * from './mini-chef.js'
 export * from './sushi-bar.js'
 export * from './sushiswap-v2.js'
 export * from './sushiswap-v3.js'
-export * from './blade.js'
-export * from './data-api.js'

package/evm/config/subgraphs/subgraphs/sushiswap-v2.ts

@@ -1,4 +1,3 @@
-import type { TestnetChainId } from '../../../../generic/chain/chains.js'
 import { EvmChainId } from '../../../chain/index.js'
 import type { SushiSwapV2ChainId } from '../../features/sushiswap-v2.js'
 import { getSubgraphUrlWrapper, wrapAsIdType } from '../get-subgraph-url.js'
@@ -57,22 +56,3 @@ export const getSushiSwapV2SubgraphUrl = getSubgraphUrlWrapper({
   },
   otherUrls: SUSHISWAP_V2_OTHER_URLS,
 })<SushiSwapV2ChainId, 'PARTIAL'>()
-
-export const V2SubgraphTemplateMap: Record<
-  Exclude<SushiSwapV2ChainId, TestnetChainId>,
-  string
-> = Object.fromEntries(
-  Object.entries({
-    ...SUSHISWAP_V2_DECENTRALIZED_DEPLOYMENT_IDS,
-    ...SUSHISWAP_V2_DECENTRALIZED_SUBGRAPH_IDS,
-    ...SUSHISWAP_V2_OTHER_URLS,
-  })
-    .map(([chainId]) => {
-      const url = getSushiSwapV2SubgraphUrl(
-        Number(chainId) as SushiSwapV2ChainId,
-        { decentralizedKey: '${GRAPH_KEY}' },
-      )
-      return [Number(chainId), url ? `https://${url}` : undefined]
-    })
-    .filter(([, url]) => !!url),
-)

package/evm/config/subgraphs/subgraphs/sushiswap-v3.ts

@@ -1,4 +1,3 @@
-import type { TestnetChainId } from '../../../../generic/chain/chains.js'
 import { EvmChainId } from '../../../chain/index.js'
 import type { SushiSwapV3ChainId } from '../../features/sushiswap-v3.js'
 import { getSubgraphUrlWrapper, wrapAsIdType } from '../get-subgraph-url.js'
@@ -54,22 +53,3 @@ export const getSushiSwapV3SubgraphUrl = getSubgraphUrlWrapper({
   },
   otherUrls: SUSHISWAP_V3_OTHER_URLS,
 })<SushiSwapV3ChainId, 'PARTIAL'>()
-
-export const V3SubgraphTemplateMap: Record<
-  Exclude<SushiSwapV3ChainId, TestnetChainId>,
-  string
-> = Object.fromEntries(
-  Object.entries({
-    ...SUSHISWAP_V3_DECENTRALIZED_DEPLOYMENT_IDS,
-    ...SUSHISWAP_V3_DECENTRALIZED_SUBGRAPH_IDS,
-    ...SUSHISWAP_V3_OTHER_URLS,
-  })
-    .map(([chainId]) => {
-      const url = getSushiSwapV3SubgraphUrl(
-        Number(chainId) as SushiSwapV3ChainId,
-        { decentralizedKey: '${GRAPH_KEY}' },
-      )
-      return [Number(chainId), url ? `https://${url}` : undefined]
-    })
-    .filter(([, url]) => !!url),
-) as Record<SushiSwapV3ChainId, string>

package/evm/config/tokens/token-maps/default-bases.ts

@@ -1,10 +1,14 @@
-import { getAddress as _getAddress } from 'viem/utils'
 import type { EvmCurrency } from '../../../../evm/currency/currency.js'
 import { EvmChainId } from '../../../chain/index.js'
 import {
   APE_USD,
   ARB,
   AUSD,
+  axlDAI,
+  axlETH,
+  axlUSDC,
+  axlUSDT,
+  axlWBTC,
   DAI,
   FRAX,
   GNO,
@@ -12,8 +16,8 @@ import {
   MIM,
   RBTC,
   SKL,
-  SUSHI,
   SolvBTC,
+  SUSHI,
   USDB,
   USDC,
   USDT,
@@ -22,11 +26,6 @@ import {
   WETH9,
   ZETA_USDC_ETH,
   ZETA_USDT_ETH,
-  axlDAI,
-  axlETH,
-  axlUSDC,
-  axlUSDT,
-  axlWBTC,
 } from '../../../config/tokens/tokens/index.js'
 import { EvmNative } from '../../../currency/native.js'
 import { EvmToken } from '../../../currency/token.js'

package/evm/config/tokens/token-maps/default-quote.ts

@@ -3,6 +3,7 @@ import {
   APE_USD,
   ARB,
   AUSD,
+  axlUSDC,
   BUSD,
   GNO,
   OP,
@@ -12,7 +13,6 @@ import {
   USDT,
   USDT0,
   WETH9,
-  axlUSDC,
 } from '../../../config/tokens/tokens/index.js'
 import type { EvmCurrency } from '../../../currency/currency.js'
 import { EvmNative } from '../../../currency/native.js'

package/evm/config/tokens/token-maps/lsds.ts

@@ -2,9 +2,9 @@ import type { EvmCurrency } from '../../../../evm/currency/currency.js'
 import { EvmChainId } from '../../../chain/chains.js'
 import {
   METH,
+  rETH,
   STONE,
   WstETH,
-  rETH,
 } from '../../../config/tokens/tokens/index.js'
 import { EvmToken } from '../../../currency/token.js'
 

package/evm/config/tokens/token-maps/stables.ts

@@ -2,6 +2,7 @@ import type { EvmCurrency } from '../../../../evm/currency/currency.js'
 import { EvmChainId } from '../../../chain/chains.js'
 import {
   APE_USD,
+  axlUSDC,
   BASE_USDbC,
   BTTC_USDC_BSC,
   BTTC_USDC_ETHEREUM,
@@ -23,23 +24,22 @@ import {
   THUNDERCORE_ANY_BUSD,
   THUNDERCORE_ANY_USDC,
   THUNDERCORE_ANY_USDT,
+  USD_PLUS,
   USDB,
   USDC,
+  USDe,
   USDP,
   USDPLUS,
   USDT,
-  USD_PLUS,
-  USDe,
   ZETA_USDC_BSC,
   ZETA_USDC_ETH,
   ZETA_USDT_BSC,
   ZETA_USDT_ETH,
-  axlUSDC,
 } from '../../../config/tokens/tokens/index.js'
 import { EvmToken } from '../../../currency/token.js'
 import { AUSD } from '../tokens/AUSD.js'
-import { USDT0 } from '../tokens/USDT0.js'
 import { HONEY } from '../tokens/berachain/HONEY.js'
+import { USDT0 } from '../tokens/USDT0.js'
 
 export const STABLES = {
   [EvmChainId.ARBITRUM]: [

package/evm/config/tokens/tokens/index.ts

@@ -1,12 +1,3 @@
-export * from './ape/index.js'
-export * from './base/index.js'
-export * from './berachain/index.js'
-export * from './bttc/index.js'
-export * from './ethereum/index.js'
-export * from './filecoin/index.js'
-export * from './thundercore/index.js'
-export * from './zeta/index.js'
-
 export * from './AAVE.js'
 export * from './AERO.js'
 export * from './AGEUR.js'
@@ -15,6 +6,7 @@ export * from './ANKR.js'
 export * from './APE.js'
 export * from './ARB.js'
 export * from './AUSD.js'
+export * from './ape/index.js'
 export * from './axlDAI.js'
 export * from './axlETH.js'
 export * from './axlUSDC.js'
@@ -23,14 +15,19 @@ export * from './axlWBTC.js'
 export * from './BAL.js'
 export * from './BCT.js'
 export * from './BUSD.js'
+export * from './base/index.js'
+export * from './berachain/index.js'
+export * from './bttc/index.js'
 export * from './COMP.js'
 export * from './CRV.js'
 export * from './DAI.js'
 export * from './DOC.js'
 export * from './ENJ.js'
+export * from './ethereum/index.js'
 export * from './FEI.js'
 export * from './FRAX.js'
 export * from './FXS.js'
+export * from './filecoin/index.js'
 export * from './GALA.js'
 export * from './GNO.js'
 export * from './GNS.js'
@@ -57,13 +54,12 @@ export * from './OP.js'
 export * from './OPTICS_USDC.js'
 export * from './PRIMATE.js'
 export * from './QUICK.js'
-export * from './renBTC.js'
-export * from './rETH.js'
-export * from './rETH2.js'
 export * from './RBTC.js'
 export * from './RNDR.js'
+export * from './rETH.js'
+export * from './rETH2.js'
+export * from './renBTC.js'
 export * from './SAND.js'
-export * from './sETH2.js'
 export * from './SGETH.js'
 export * from './SKL.js'
 export * from './SNX.js'
@@ -72,9 +68,11 @@ export * from './STG.js'
 export * from './STONE.js'
 export * from './SUSHI.js'
 export * from './SWISE.js'
+export * from './sETH2.js'
 export * from './TEL.js'
 export * from './TRIBE.js'
 export * from './TUSD.js'
+export * from './thundercore/index.js'
 export * from './UNI.js'
 export * from './USD_PLUS.js'
 export * from './USDB.js'
@@ -89,6 +87,7 @@ export * from './WBTC.js'
 export * from './WETH9.js'
 export * from './WRBTC.js'
 export * from './WstETH.js'
-export * from './xSolvBTC.js'
 export * from './XSUSHI.js'
+export * from './xSolvBTC.js'
 export * from './YFI.js'
+export * from './zeta/index.js'

package/evm/config/tokens/wrapped-native.ts

@@ -1,5 +1,5 @@
-import { zeroAddress } from 'viem'
 import type { Address } from 'viem'
+import { zeroAddress } from 'viem'
 import type { EvmCurrency } from '../../../evm/currency/currency.js'
 import { EvmChainId } from '../../chain/index.js'
 import { EvmToken } from '../../currency/token.js'
@@ -249,7 +249,10 @@ export const isWNativeSupported = (chainId: EvmChainId) =>
 export function isWrapOrUnwrap({
   from,
   to,
-}: { from: EvmCurrency; to: EvmCurrency }): boolean {
+}: {
+  from: EvmCurrency
+  to: EvmCurrency
+}): boolean {
   if (from.type === 'native' && from.wrap().isSame(to)) {
     return true
   }

package/evm/currency/native.ts

@@ -55,7 +55,9 @@ export const serializedEvmNativeSchema = <
   TMetadata extends {} = CurrencyMetadata,
 >({
   metadata,
-}: { metadata?: z.ZodType<TMetadata> } = {}) =>
+}: {
+  metadata?: z.ZodType<TMetadata>
+} = {}) =>
   z.object({
     chainId: z.number().int().refine(isEvmChainId),
     symbol: z.string(),

package/evm/currency/token.ts

@@ -25,13 +25,14 @@ export class EvmToken<
 
   constructor({
     origin,
+    address,
     ...rest
   }: {
     origin?: EvmTokenOrigin | undefined
   } & ConstructorParameters<
     typeof Token<EvmChainId, EvmAddress, TMetadata>
   >[0]) {
-    super(rest)
+    super({ address: address.toLowerCase() as EvmAddress, ...rest })
     this.origin = origin
   }
 
@@ -77,7 +78,9 @@ export const serializedEvmTokenSchema = <
   TMetadata extends {} = CurrencyMetadata,
 >({
   metadata,
-}: { metadata?: z.ZodType<TMetadata> } = {}) =>
+}: {
+  metadata?: z.ZodType<TMetadata>
+} = {}) =>
   z.object({
     chainId: z.number().int().refine(isEvmChainId),
     address: z.string().refine(isEvmAddress),

package/evm/pool/sushiswap-v2/sushiswap-v2-pool.test.ts

@@ -7,6 +7,7 @@ import { EvmToken } from '../../currency/token.js'
 import { InsufficientInputAmountError } from '../../dex/errors.js'
 import { computeSushiSwapV2PoolAddress } from './compute-sushiswap-v2-pool-address.js'
 import { SushiSwapV2Pool } from './sushiswap-v2-pool.js'
+
 // import { EvmChainId, CurrencyAmount, Price, Token, V2_FACTORY_ADDRESSES, WETH9 } from '@uniswap/sdk-core'
 
 describe('computePairAddress', () => {

package/evm/pool/sushiswap-v2/sushiswap-v2-pool.ts

@@ -3,18 +3,18 @@ import type { Address } from 'viem'
 import { Amount } from '../../../generic/currency/amount.js'
 import { Price } from '../../../generic/currency/price.js'
 import {
+  _997,
+  _1000,
   FIVE,
   ONE,
   ZERO,
-  _997,
-  _1000,
 } from '../../../generic/math/constants.js'
 import { sqrt } from '../../../generic/math/sqrt.js'
 import type { BigintIsh } from '../../../generic/types/bigintish.js'
 import { getEvmChainById } from '../../chain/index.js'
 import {
-  SUSHISWAP_V2_FACTORY_ADDRESS,
   isSushiSwapV2ChainId,
+  SUSHISWAP_V2_FACTORY_ADDRESS,
 } from '../../config/features/sushiswap-v2.js'
 import { EvmToken } from '../../currency/index.js'
 import {

package/evm/pool/sushiswap-v3/entities/Multicall.ts

@@ -1,4 +1,4 @@
-import { type Hex, encodeFunctionData } from 'viem'
+import { encodeFunctionData, type Hex } from 'viem'
 import { multicallAbi_multicall } from '../../../abi/multicallAbi/multicallAbi_multicall.js'
 
 export abstract class Multicall {

package/evm/pool/sushiswap-v3/entities/NonfungiblePositionManager.test.ts

@@ -1,7 +1,7 @@
 import invariant from 'tiny-invariant'
 import {
-  type Hex,
   decodeAbiParameters,
+  type Hex,
   isHex,
   maxUint128,
   zeroAddress,

package/evm/pool/sushiswap-v3/entities/NonfungiblePositionManager.ts

@@ -1,7 +1,7 @@
 import invariant from 'tiny-invariant'
 import {
-  type Hex,
   encodeFunctionData,
+  type Hex,
   maxUint128,
   toHex,
   zeroAddress,

package/evm/pool/sushiswap-v3/entities/SelfPermit.ts

@@ -1,4 +1,4 @@
-import { type Hex, encodeFunctionData } from 'viem'
+import { encodeFunctionData, type Hex } from 'viem'
 import type { BigintIsh } from '../../../../generic/index.js'
 import {
   selfPermitAbi_selfPermit,

package/evm/token-list/index.ts

@@ -1,2 +1,2 @@
-export * from './constants.js'
 export * from '@uniswap/token-lists'
+export * from './constants.js'

package/evm/types/index.ts

@@ -1,4 +1,4 @@
+export type * from './contract.js'
+export type * from './id.js'
 export * from './sushi-pool/index.js'
 export * from './sushi-position/index.js'
-export type * from './id.js'
-export type * from './contract.js'

package/evm/types/sushi-pool/index.ts

@@ -1,4 +1,3 @@
-export * from './protocol.js'
 export * from './maybe-nested-pool.js'
 export * from './pool-base.js'
 export * from './pool-history.js'
@@ -10,3 +9,4 @@ export * from './pool-v3.js'
 export * from './pool-with-aprs.js'
 export * from './pool-with-buckets.js'
 export * from './pool-with-incentives.js'
+export * from './protocol.js'

package/evm/types/sushi-position/index.ts

@@ -1,3 +1,3 @@
+export * from './sushi-position-base.js'
 export * from './sushi-position-staked.js'
 export * from './sushi-position-with-pool.js'
-export * from './sushi-position-base.js'

package/generic/chain/index.ts

@@ -1,2 +1,2 @@
-export type * from './interface.js'
 export * from './chains.js'
+export type * from './interface.js'

package/generic/currency/currency.test-d.ts

@@ -1,5 +1,5 @@
 import { it } from 'node:test'
-import { describe, expectTypeOf } from 'vitest'
+import { describe, expect, expectTypeOf } from 'vitest'
 import * as z from 'zod'
 import type { EvmChainId } from '~/evm/chain/chains.js'
 import type { EvmCurrency } from '~/evm/currency/currency.js'
@@ -14,7 +14,7 @@ import {
 } from '../../evm/currency/token.js'
 import { MvmToken } from '../../mvm/currency/token.js'
 import { TvmNative } from '../../tvm/currency/native.js'
-import type { TvmToken } from '../../tvm/currency/token.js'
+import { TvmToken } from '../../tvm/currency/token.js'
 import { getChainIdAddressFromId } from '../utils/id.js'
 import {
   BaseCurrency,
@@ -64,6 +64,54 @@ describe('generic/currency/currency.ts types', () => {
       expectTypeOf(evmMockNative.wrap()).toEqualTypeOf<EvmToken>()
     })
 
+    it('should lowercase the address - Evm / Mvm / Tvm', () => {
+      const evmMockToken = new EvmToken({
+        chainId: 1,
+        address: '0x1234567890ABCDEF1234567890ABCDEF12345678',
+        symbol: 'USDT',
+        name: 'Tether USD',
+        decimals: 6,
+      })
+
+      expect(evmMockToken.address).toBe(
+        '0x1234567890abcdef1234567890abcdef12345678',
+      )
+
+      const mvmMockToken = new MvmToken({
+        chainId: -1,
+        address: '0x1234567890ABCDEF1234567890ABCDEF12345678::mvm::token',
+        symbol: 'MVM',
+        name: 'MVM Token',
+        decimals: 18,
+      })
+
+      expect(mvmMockToken.address).toBe(
+        '0x1234567890abcdef1234567890abcdef12345678::mvm::token',
+      )
+
+      const tvmMockToken = new TvmToken({
+        chainId: -2,
+        address: 'T1234567890ABCDEF1234567890ABCDEF1',
+        symbol: 'TVM',
+        name: 'Tvm Token',
+        decimals: 18,
+      })
+
+      expect(tvmMockToken.address).toBe('t1234567890abcdef1234567890abcdef1')
+    })
+
+    it('should not lowercase the address - Kvm', () => {
+      const kvmMockToken = new KvmToken({
+        chainId: -3,
+        symbol: 'KVM',
+        name: 'Kvm Token',
+        decimals: 12,
+        address: 'My-Namespace.My-Token',
+      })
+
+      expect(kvmMockToken.address).toBe('My-Namespace.My-Token')
+    })
+
     it('should return the same chaintype - Mvm', () => {
       const mvmMockToken = new MvmToken({
         chainId: -1,

package/generic/currency/token.ts

@@ -20,8 +20,7 @@ export abstract class Token<
     address: TAddress
   } & ConstructorParameters<typeof BaseCurrency<TChainId, TMetadata>>[0]) {
     super(rest)
-
-    this.address = address.toLowerCase() as TAddress
+    this.address = address
   }
 
   override get id(): ID<TChainId, TAddress> {

package/generic/format/number.ts

@@ -78,7 +78,7 @@ export function withoutScientificNotation(value: string): string | undefined {
   const [integer, fraction] = m.split('.')
 
   const mantissa = (integer + (fraction ?? '')).replace(/^0+/, '')
-  const exponent = Number.parseInt(n ?? 0) - (fraction ?? '').length
+  const exponent = Number.parseInt(n ?? 0, 10) - (fraction ?? '').length
 
   if (exponent >= 0) {
     return sign + mantissa + '0'.repeat(exponent)

package/generic/math/index.ts

@@ -1,9 +1,9 @@
-export * from './constants.js'
-export * from './percent.js'
-export * from './fraction.js'
 export { abs } from './abs.js'
+export * from './constants.js'
 export { difference } from './difference.js'
+export * from './fraction.js'
 export { maximum } from './maximum.js'
 export { minimum } from './minimum.js'
-export { sqrt } from './sqrt.js'
 export { numberToBigInt } from './number-to-bigint.js'
+export * from './percent.js'
+export { sqrt } from './sqrt.js'

package/generic/utils/id.ts

@@ -1,4 +1,5 @@
 import { nativeAddress } from '../../evm/config/simple-constants.js'
+import { isKvmTokenAddress } from '../../kvm/currency/token.js'
 import type { ChainId } from '../chain/chains.js'
 import type { ID } from '../types/id.js'
 
@@ -43,7 +44,10 @@ export function getIdFromChainIdAddress<
     )
   }
 
-  address = address.toLowerCase() as TAddress
+  // Kvm addresses are case-sensitive
+  if (!isKvmTokenAddress(address)) {
+    address = address.toLowerCase() as TAddress
+  }
 
   if (address === nativeAddress && options.translateNative) {
     address = 'NATIVE' as TAddress

package/kvm/chain/define-chain.ts

@@ -9,7 +9,7 @@ export type KvmChainType = 'kvm'
 
 type KvmChainBase<TChainId extends number, TChainKey extends string> = Chain<
   KvmChainType,
-  // @ts-ignore infinite loop
+  // @ts-expect-error infinite loop
   TChainId,
   TChainKey,
   Readonly<string>,

package/kvm/currency/token.ts

@@ -2,7 +2,7 @@ import * as z from 'zod'
 import type { CurrencyMetadata } from '../../generic/currency/currency.js'
 import { Token } from '../../generic/currency/token.js'
 
-import { type KvmChainId, isKvmChainId } from '../chain/chains.js'
+import { isKvmChainId, type KvmChainId } from '../chain/chains.js'
 
 export type KvmTokenAddress = `${string}.${string}` | 'coin'
 
@@ -61,7 +61,9 @@ export const serializedKvmTokenSchema = <
   TMetadata extends {} = CurrencyMetadata,
 >({
   metadata,
-}: { metadata?: z.ZodType<TMetadata> } = {}) =>
+}: {
+  metadata?: z.ZodType<TMetadata>
+} = {}) =>
   z.object({
     chainId: z.number().int().refine(isKvmChainId),
     address: z.string().refine(isKvmTokenAddress),

package/mvm/currency/token.ts

@@ -1,7 +1,7 @@
 import * as z from 'zod'
 import type { CurrencyMetadata } from '../../generic/currency/currency.js'
 import { Token } from '../../generic/currency/token.js'
-import { type MvmChainId, isMvmChainId } from '../chain/chains.js'
+import { isMvmChainId, type MvmChainId } from '../chain/chains.js'
 
 export type MvmAddress = `0x${string}::${string}::${string}`
 
@@ -13,6 +13,15 @@ export function isMvmAddress(address: string): address is MvmAddress {
 export class MvmToken<
   TMetadata extends CurrencyMetadata = Record<string, unknown>,
 > extends Token<MvmChainId, MvmAddress, TMetadata> {
+  constructor({
+    address,
+    ...rest
+  }: ConstructorParameters<
+    typeof Token<MvmChainId, MvmAddress, TMetadata>
+  >[0]) {
+    super({ address: address.toLowerCase() as MvmAddress, ...rest })
+  }
+
   public override wrap(): MvmToken<TMetadata> {
     return this
   }
@@ -43,7 +52,9 @@ export const serializedMvmTokenSchema = <
   TMetadata extends {} = CurrencyMetadata,
 >({
   metadata,
-}: { metadata?: z.ZodType<TMetadata> } = {}) =>
+}: {
+  metadata?: z.ZodType<TMetadata>
+} = {}) =>
   z.object({
     chainId: z.number().int().refine(isMvmChainId),
     address: z.string().refine(isMvmAddress),