sushi 6.1.3 → 6.1.5

package/generic/math/percent.ts

@@ -1,7 +1,24 @@
 import { numberToFixed } from '../format/number.js'
+import type { BigintIsh } from '../types/bigintish.js'
 import { Fraction } from './fraction.js'
 
 export class Percent extends Fraction {
+  public override add(other: Fraction | BigintIsh): Percent {
+    return new Percent(super.add(other))
+  }
+
+  public override sub(other: Fraction | BigintIsh): Fraction {
+    return new Percent(super.sub(other))
+  }
+
+  public override mul(other: Fraction | BigintIsh): Percent {
+    return new Percent(super.mul(other))
+  }
+
+  public override div(other: Fraction | BigintIsh): Percent {
+    return new Percent(super.div(other))
+  }
+
   /**
    *
    * @param args.maxFixed - The maximum number of fixed decimal places to display, only if relevant, eg. "0" for 0, "1.23" for 0.0123, etc.

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),

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "sushi",
   "description": "Sushi",
-  "version": "6.1.3",
+  "version": "6.1.5",
   "type": "module",
   "main": "./_cjs/generic/index.js",
   "module": "./_esm/generic/index.js",

package/tvm/abi/factoryAbi/index.ts

@@ -1,3 +1,4 @@
+export * from './factoryAbi.js'
 export * from './factoryAbi_allPairs.js'
 export * from './factoryAbi_allPairsLength.js'
 export * from './factoryAbi_constructor.js'
@@ -9,4 +10,3 @@ export * from './factoryAbi_getPairHash.js'
 export * from './factoryAbi_PairCreated.js'
 export * from './factoryAbi_setFeeTo.js'
 export * from './factoryAbi_setFeeToSetter.js'
-export * from './factoryAbi.js'

package/tvm/abi/pairAbi/index.ts

@@ -1,32 +1,32 @@
 export * from './pairAbi.js'
 export * from './pairAbi_Approval.js'
-export * from './pairAbi_BurnEvent.js'
-export * from './pairAbi_MintEvent.js'
-export * from './pairAbi_SwapEvent.js'
-export * from './pairAbi_SyncEvent.js'
-export * from './pairAbi_TransferEvent.js'
-export * from './pairAbi_DOMAIN_SEPARATOR.js'
-export * from './pairAbi_MINIMUM_LIQUIDITY.js'
-export * from './pairAbi_PERMIT_TYPEHASH.js'
 export * from './pairAbi_allowance.js'
 export * from './pairAbi_approve.js'
+export * from './pairAbi_BurnEvent.js'
 export * from './pairAbi_balanceOf.js'
 export * from './pairAbi_burn.js'
+export * from './pairAbi_DOMAIN_SEPARATOR.js'
 export * from './pairAbi_decimals.js'
 export * from './pairAbi_factory.js'
 export * from './pairAbi_getReserves.js'
 export * from './pairAbi_initialize.js'
 export * from './pairAbi_kLast.js'
+export * from './pairAbi_MINIMUM_LIQUIDITY.js'
+export * from './pairAbi_MintEvent.js'
 export * from './pairAbi_mint.js'
 export * from './pairAbi_name.js'
 export * from './pairAbi_nonces.js'
+export * from './pairAbi_PERMIT_TYPEHASH.js'
 export * from './pairAbi_permit.js'
 export * from './pairAbi_price0CumulativeLast.js'
 export * from './pairAbi_price1CumulativeLast.js'
+export * from './pairAbi_SwapEvent.js'
+export * from './pairAbi_SyncEvent.js'
 export * from './pairAbi_skim.js'
 export * from './pairAbi_swap.js'
 export * from './pairAbi_symbol.js'
 export * from './pairAbi_sync.js'
+export * from './pairAbi_TransferEvent.js'
 export * from './pairAbi_token0.js'
 export * from './pairAbi_token1.js'
 export * from './pairAbi_totalSupply.js'

package/tvm/abi/routerAbi/index.ts

@@ -1,5 +1,4 @@
 export * from './routerAbi.js'
-export * from './routerAbi_WETH.js'
 export * from './routerAbi_addLiquidity.js'
 export * from './routerAbi_addLiquidityETH.js'
 export * from './routerAbi_factory.js'
@@ -21,3 +20,4 @@ export * from './routerAbi_swapExactTokensForETHSupportingFeeOnTransferTokens.js
 export * from './routerAbi_swapExactTokensForTokens.js'
 export * from './routerAbi_swapTokensForExactETH.js'
 export * from './routerAbi_swapTokensForExactTokens.js'
+export * from './routerAbi_WETH.js'

package/tvm/abi/trc20Abi/index.ts

@@ -1,13 +1,13 @@
 export * from './trc20Abi.js'
-export * from './trc20Abi_name.js'
+export * from './trc20Abi_Approval.js'
+export * from './trc20Abi_allowance.js'
 export * from './trc20Abi_approve.js'
-export * from './trc20Abi_totalSupply.js'
-export * from './trc20Abi_transferFrom.js'
-export * from './trc20Abi_decimals.js'
 export * from './trc20Abi_balanceOf.js'
+export * from './trc20Abi_decimals.js'
+export * from './trc20Abi_name.js'
 export * from './trc20Abi_symbol.js'
+export * from './trc20Abi_TransferEvent.js'
+export * from './trc20Abi_totalSupply.js'
 export * from './trc20Abi_transfer.js'
-export * from './trc20Abi_allowance.js'
+export * from './trc20Abi_transferFrom.js'
 export * from './trc20Abi_undefined.js'
-export * from './trc20Abi_Approval.js'
-export * from './trc20Abi_TransferEvent.js'

package/tvm/abi/wtrxAbi/index.ts

@@ -1,17 +1,17 @@
 export * from './wtrxAbi.js'
-export * from './wtrxAbi_name.js'
+export * from './wtrxAbi_Approval.js'
+export * from './wtrxAbi_allowance.js'
+export * from './wtrxAbi_approve.js'
 export * from './wtrxAbi_approve.js'
-export * from './wtrxAbi_totalSupply.js'
-export * from './wtrxAbi_transferFrom.js'
-export * from './wtrxAbi_withdraw.js'
-export * from './wtrxAbi_decimals.js'
 export * from './wtrxAbi_balanceOf.js'
-export * from './wtrxAbi_symbol.js'
-export * from './wtrxAbi_transfer.js'
+export * from './wtrxAbi_DepositEvent.js'
+export * from './wtrxAbi_decimals.js'
 export * from './wtrxAbi_deposit.js'
-export * from './wtrxAbi_approve.js'
-export * from './wtrxAbi_allowance.js'
-export * from './wtrxAbi_Approval.js'
+export * from './wtrxAbi_name.js'
+export * from './wtrxAbi_symbol.js'
 export * from './wtrxAbi_TransferEvent.js'
-export * from './wtrxAbi_DepositEvent.js'
+export * from './wtrxAbi_totalSupply.js'
+export * from './wtrxAbi_transfer.js'
+export * from './wtrxAbi_transferFrom.js'
 export * from './wtrxAbi_Withdrawal.js'
+export * from './wtrxAbi_withdraw.js'

package/tvm/config/tokens/index.ts

@@ -1,3 +1,3 @@
+export * from './native.js'
 export * from './tokens/index.js'
 export * from './wrapped-native.js'
-export * from './native.js'

package/tvm/config/tokens/tokens/index.ts

@@ -1,56 +1,56 @@
-export * from './SUN.js'
-export * from './BTT.js'
-export * from './SUNOLD.js'
-export * from './NFT.js'
+export * from './$Afro.js'
+export * from './BICOIN.js'
+export * from './BOG.js'
 export * from './BTC.js'
-export * from './WBTC.js'
+export * from './BTT.js'
+export * from './BULL.js'
+export * from './CDOG.js'
+export * from './CZ.js'
+export * from './CZC.js'
+export * from './DRGN.js'
+export * from './ETH.js'
 export * from './ETHOLD.js'
-export * from './WETH.js'
-export * from './WBTT.js'
-export * from './WTRX.js'
-export * from './JST.js'
-export * from './WIN.js'
-export * from './TUSD.js'
-export * from './USDT.js'
-export * from './USDJ.js'
-export * from './LTC.js'
+export * from './FOFAR.js'
+export * from './HOTSUN.js'
 export * from './HT.js'
-export * from './USDD.js'
-export * from './sTRX.js'
-export * from './ETH.js'
-export * from './stUSDT.js'
 export * from './HTX.js'
-export * from './SUNDOG.js'
-export * from './FOFAR.js'
 export * from './IVfun.js'
+export * from './JST.js'
+export * from './LABR.js'
+export * from './LTC.js'
+export * from './MEOWKA.js'
+export * from './MOONDOG.js'
 export * from './MUNCAT.js'
-export * from './SUNWUKONG.js'
-export * from './CZ.js'
+export * from './MWD.js'
+export * from './NFT.js'
+export * from './PSYOP.js'
+export * from './PUSS.js'
+export * from './ROCK.js'
+export * from './SUN.js'
 export * from './SUNCAT.js'
-export * from './Tcat.js'
-export * from './DRGN.js'
-export * from './BULL.js'
+export * from './SUNDOG.js'
 export * from './SUNDOGE.js'
-export * from './ROCK.js'
-export * from './TDOG.js'
-export * from './PSYOP.js'
-export * from './MWD.js'
-export * from './TRONKEY.js'
-export * from './HOTSUN.js'
 export * from './SUNKEY.js'
-export * from './CZC.js'
+export * from './SUNOLD.js'
+export * from './SUNWUKONG.js'
+export * from './SunJoker.js'
+export * from './sTRX.js'
+export * from './stUSDT.js'
 export * from './TBEER.js'
-export * from './VIKITA.js'
-export * from './MEOWKA.js'
-export * from './TWX.js'
-export * from './PUSS.js'
-export * from './LABR.js'
-export * from './$Afro.js'
-export * from './CDOG.js'
 export * from './TBULL.js'
+export * from './Tcat.js'
+export * from './TDOG.js'
+export * from './TRONKEY.js'
+export * from './TUSD.js'
+export * from './TWX.js'
 export * from './USDCOLD.js'
-export * from './MOONDOG.js'
-export * from './SunJoker.js'
+export * from './USDD.js'
+export * from './USDJ.js'
+export * from './USDT.js'
+export * from './VIKITA.js'
+export * from './WBTC.js'
+export * from './WBTT.js'
+export * from './WETH.js'
 export * from './WHALE.js'
-export * from './BICOIN.js'
-export * from './BOG.js'
+export * from './WIN.js'
+export * from './WTRX.js'

package/tvm/currency/currency.ts

@@ -2,13 +2,13 @@ import * as z from 'zod'
 import type { CurrencyMetadata } from '../../generic/currency/currency.js'
 import {
   type SerializedTvmNative,
-  type TvmNative,
   serializedTvmNativeSchema,
+  type TvmNative,
 } from './native.js'
 import {
   type SerializedTvmToken,
-  type TvmToken,
   serializedTvmTokenSchema,
+  type TvmToken,
 } from './token.js'
 
 export type TvmCurrency<

package/tvm/currency/native.ts

@@ -1,7 +1,7 @@
 import * as z from 'zod'
 import type { CurrencyMetadata } from '~/generic/currency/currency.js'
 import { Native } from '../../generic/currency/native.js'
-import { type TvmChainId, isTvmChainId } from '../chain/chains.js'
+import { isTvmChainId, type TvmChainId } from '../chain/chains.js'
 import { NATIVE } from '../config/index.js'
 import { WNATIVE } from '../config/tokens/wrapped-native.js'
 import { TvmToken } from './token.js'
@@ -45,7 +45,9 @@ export const serializedTvmNativeSchema = <
   TMetadata extends {} = CurrencyMetadata,
 >({
   metadata,
-}: { metadata?: z.ZodType<TMetadata> } = {}) =>
+}: {
+  metadata?: z.ZodType<TMetadata>
+} = {}) =>
   z.object({
     chainId: z.number().int().refine(isTvmChainId),
     symbol: z.string(),

package/tvm/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 TvmChainId, isTvmChainId } from '../chain/chains.js'
+import { isTvmChainId, type TvmChainId } from '../chain/chains.js'
 
 export type TvmAddress = `T${string}`
 
@@ -18,13 +18,14 @@ export class TvmToken<
 
   constructor({
     origin,
+    address,
     ...rest
   }: {
     origin?: TvmTokenOrigin | undefined
   } & ConstructorParameters<
     typeof Token<TvmChainId, TvmAddress, TMetadata>
   >[0]) {
-    super(rest)
+    super({ address: address.toLowerCase() as TvmAddress, ...rest })
     this.origin = origin
   }
 
@@ -58,7 +59,9 @@ export const serializedTvmTokenSchema = <
   TMetadata extends {} = CurrencyMetadata,
 >({
   metadata,
-}: { metadata?: z.ZodType<TMetadata> } = {}) =>
+}: {
+  metadata?: z.ZodType<TMetadata>
+} = {}) =>
   z.object({
     chainId: z.number().int().refine(isTvmChainId),
     address: z.string().refine(isTvmAddress),