sushi 6.4.5 → 6.4.7

package/generic/utils/normalize-address.ts

@@ -0,0 +1,64 @@
+import type { EvmChainId } from '../../evm/chain/chains.js'
+import { isEvmChainId } from '../../evm/chain/chains.js'
+import { normalizeEvmAddress } from '../../evm/utils/normalize-address.js'
+import type { KvmChainId } from '../../kvm/chain/chains.js'
+import { isKvmChainId } from '../../kvm/chain/chains.js'
+import { normalizeKvmAddress } from '../../kvm/utils/normalize-address.js'
+import type { MvmChainId } from '../../mvm/chain/chains.js'
+import { isMvmChainId } from '../../mvm/chain/chains.js'
+import { normalizeMvmAddress } from '../../mvm/utils/normalize-address.js'
+import type { StellarChainId } from '../../stellar/chain/chains.js'
+import { isStellarChainId } from '../../stellar/chain/chains.js'
+import { normalizeStellarAddress } from '../../stellar/utils/normalize-address.js'
+import type { SvmChainId } from '../../svm/chain/chains.js'
+import { isSvmChainId } from '../../svm/chain/chains.js'
+import { normalizeSvmAddress } from '../../svm/utils/normalize-address.js'
+import type { TvmChainId } from '../../tvm/chain/chains.js'
+import { isTvmChainId } from '../../tvm/chain/chains.js'
+import { normalizeTvmAddress } from '../../tvm/utils/normalize-address.js'
+import type { ChainId } from '../chain/chains.js'
+import type { AddressFor } from '../types/for-chain.js'
+import { assertNever } from './assert-never.js'
+
+export function normalizeAddress<TChainId extends ChainId>(
+  chainId: TChainId,
+  address: AddressFor<TChainId>,
+): AddressFor<TChainId> {
+  if (isEvmChainId(chainId)) {
+    return normalizeEvmAddress(
+      address as AddressFor<EvmChainId>,
+    ) as AddressFor<TChainId>
+  }
+
+  if (isMvmChainId(chainId)) {
+    return normalizeMvmAddress(
+      address as AddressFor<MvmChainId>,
+    ) as AddressFor<TChainId>
+  }
+
+  if (isTvmChainId(chainId)) {
+    return normalizeTvmAddress(
+      address as AddressFor<TvmChainId>,
+    ) as AddressFor<TChainId>
+  }
+
+  if (isKvmChainId(chainId)) {
+    return normalizeKvmAddress(
+      address as AddressFor<KvmChainId>,
+    ) as AddressFor<TChainId>
+  }
+
+  if (isSvmChainId(chainId)) {
+    return normalizeSvmAddress(
+      address as AddressFor<SvmChainId>,
+    ) as AddressFor<TChainId>
+  }
+
+  if (isStellarChainId(chainId)) {
+    return normalizeStellarAddress(
+      address as AddressFor<StellarChainId>,
+    ) as AddressFor<TChainId>
+  }
+
+  assertNever(chainId, `normalizeAddress, unsupported chainId: ${chainId}`)
+}

package/generic/utils/wrapped-native.ts

@@ -0,0 +1,11 @@
+import { type EvmChainId, isEvmChainId } from '../../evm/chain/chains.js'
+import { isEvmWNativeSupported } from '../../evm/config/tokens/wrapped-native.js'
+import { isSvmChainId, type SvmChainId } from '../../svm/chain/chains.js'
+import { isSvmWNativeSupported } from '../../svm/config/tokens/wrapped-native.js'
+
+export const isWNativeSupported = (chainId: EvmChainId | SvmChainId) => {
+  if (isEvmChainId(chainId)) return isEvmWNativeSupported(chainId)
+  if (isSvmChainId(chainId)) return isSvmWNativeSupported(chainId)
+
+  return false
+}

package/kvm/config/index.ts

@@ -0,0 +1 @@
+export * from './simple-constants.js'

package/kvm/config/simple-constants.ts

@@ -0,0 +1,3 @@
+import type { KvmTokenAddress } from '../currency/token.js'
+
+export const kvmNativeAddress: KvmTokenAddress = 'coin'

package/kvm/index.ts

@@ -1,2 +1,4 @@
 export * from './chain/index.js'
+export * from './config/index.js'
 export * from './currency/index.js'
+export * from './utils/index.js'

package/kvm/utils/index.ts

@@ -0,0 +1 @@
+export * from './normalize-address.js'

package/kvm/utils/normalize-address.ts

@@ -0,0 +1,5 @@
+import type { KvmTokenAddress } from '../currency/token.js'
+
+export function normalizeKvmAddress(address: KvmTokenAddress): KvmTokenAddress {
+  return address
+}

package/mvm/config/index.ts

@@ -0,0 +1 @@
+export * from './simple-constants.js'

package/mvm/config/simple-constants.ts

@@ -0,0 +1,3 @@
+import type { MvmAddress } from '../currency/token.js'
+
+export const mvmNativeAddress: MvmAddress = '0x1::aptos_coin::AptosCoin'

package/mvm/currency/token.ts

@@ -2,6 +2,7 @@ import * as z from 'zod'
 import type { CurrencyMetadata } from '../../generic/currency/currency.js'
 import { Token } from '../../generic/currency/token.js'
 import { isMvmChainId, type MvmChainId } from '../chain/chains.js'
+import { normalizeMvmAddress } from '../utils/normalize-address.js'
 
 export type MvmAddress = `0x${string}::${string}::${string}`
 
@@ -19,7 +20,7 @@ export class MvmToken<
   }: ConstructorParameters<
     typeof Token<MvmChainId, MvmAddress, TMetadata>
   >[0]) {
-    super({ address: address.toLowerCase() as MvmAddress, ...rest })
+    super({ address: normalizeMvmAddress(address), ...rest })
   }
 
   public override wrap(): MvmToken<TMetadata> {

package/mvm/index.ts

@@ -1,2 +1,4 @@
 export * from './chain/index.js'
+export * from './config/index.js'
 export * from './currency/index.js'
+export * from './utils/index.js'

package/mvm/utils/index.ts

@@ -0,0 +1 @@
+export * from './normalize-address.js'

package/mvm/utils/normalize-address.ts

@@ -0,0 +1,5 @@
+import type { MvmAddress } from '../currency/token.js'
+
+export function normalizeMvmAddress(address: MvmAddress): MvmAddress {
+  return address
+}

package/package.json

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

package/stellar/address.ts

@@ -0,0 +1,7 @@
+export type StellarAddress = `G${string}`
+
+const stellarAddressRegex = /^G[A-Z2-7]{55}$/
+
+export function isStellarAddress(address: string): address is StellarAddress {
+  return stellarAddressRegex.test(address)
+}

package/stellar/config/index.ts

@@ -0,0 +1 @@
+export * from './simple-constants.js'

package/stellar/config/simple-constants.ts

@@ -0,0 +1,2 @@
+export const stellarNativeAddress =
+  'GAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' as const

package/stellar/index.ts

@@ -1 +1,4 @@
+export * from './address.js'
 export * from './chain/index.js'
+export * from './config/index.js'
+export * from './utils/index.js'

package/stellar/utils/index.ts

@@ -0,0 +1 @@
+export * from './normalize-address.js'

package/stellar/utils/normalize-address.ts

@@ -0,0 +1,7 @@
+import type { StellarAddress } from '../address.js'
+
+export function normalizeStellarAddress(
+  address: StellarAddress,
+): StellarAddress {
+  return address.toUpperCase() as StellarAddress
+}

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

@@ -1,10 +1,14 @@
 import { SvmChainId } from '../../../svm/chain/index.js'
+import type { SvmAddress, SvmToken } from '../../currency/token.js'
 import { WSOL, WSOL_ADDRESS } from './tokens/WSOL.js'
 
 export const SVM_WNATIVE_ADDRESS = {
   [SvmChainId.SOLANA]: WSOL_ADDRESS[SvmChainId.SOLANA],
-}
+} as const satisfies Record<SvmChainId, SvmAddress>
 
 export const SVM_WNATIVE = {
   [SvmChainId.SOLANA]: WSOL[SvmChainId.SOLANA],
-}
+} as const satisfies Record<SvmChainId, SvmToken>
+
+export const isSvmWNativeSupported = (chainId: SvmChainId) =>
+  SVM_WNATIVE_ADDRESS[chainId] !== undefined

package/svm/currency/native.ts

@@ -1,5 +1,5 @@
 import * as z from 'zod'
-import type { CurrencyMetadata } from '~/generic/currency/currency.js'
+import type { CurrencyMetadata } from '../../generic/currency/currency.js'
 import { Native } from '../../generic/currency/native.js'
 import {
   getSvmChainById,

package/svm/currency/token.ts

@@ -7,6 +7,7 @@ import * as z from 'zod'
 import type { CurrencyMetadata } from '../../generic/currency/currency.js'
 import { Token } from '../../generic/currency/token.js'
 import { isSvmChainId, type SvmChainId } from '../chain/chains.js'
+import { normalizeSvmAddress } from '../utils/normalize-address.js'
 
 export { type SvmAddress, svmAddress, isSvmAddress }
 
@@ -19,13 +20,14 @@ export class SvmToken<
 
   constructor({
     origin,
+    address,
     ...rest
   }: {
     origin?: SvmTokenOrigin | undefined
   } & ConstructorParameters<
     typeof Token<SvmChainId, SvmAddress, TMetadata>
   >[0]) {
-    super({ ...rest })
+    super({ address: normalizeSvmAddress(address), ...rest })
     this.origin = origin
   }
 

package/svm/index.ts

@@ -1,3 +1,4 @@
 export * from './chain/index.js'
 export * from './config/index.js'
 export * from './currency/index.js'
+export * from './utils/index.js'

package/svm/types/id.ts

@@ -0,0 +1,9 @@
+import type { ID } from '../../generic/types/id.js'
+import type { SvmChainId } from '../chain/chains.js'
+import type { SvmAddress } from '../currency/token.js'
+
+export type SvmID<TIncludeNative extends boolean = false> = ID<
+  SvmChainId,
+  SvmAddress,
+  TIncludeNative
+>

package/svm/utils/index.ts

@@ -0,0 +1 @@
+export * from './normalize-address.js'

package/svm/utils/normalize-address.ts

@@ -0,0 +1,5 @@
+import type { SvmAddress } from '../currency/token.js'
+
+export function normalizeSvmAddress(address: SvmAddress): SvmAddress {
+  return address
+}

package/tvm/config/index.ts

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

package/tvm/config/simple-constants.ts

@@ -0,0 +1,3 @@
+import type { TvmAddress } from '../currency/token.js'
+
+export const tvmNativeAddress: TvmAddress = 'T9yD14Nj9j7xAB4dbGeiX9h8unkKHxuWwb'

package/tvm/currency/native.ts

@@ -1,5 +1,5 @@
 import * as z from 'zod'
-import type { CurrencyMetadata } from '~/generic/currency/currency.js'
+import type { CurrencyMetadata } from '../../generic/currency/currency.js'
 import { Native } from '../../generic/currency/native.js'
 import { isTvmChainId, type TvmChainId } from '../chain/chains.js'
 import { NATIVE } from '../config/index.js'

package/tvm/currency/token.ts

@@ -2,6 +2,7 @@ import * as z from 'zod'
 import type { CurrencyMetadata } from '../../generic/currency/currency.js'
 import { Token } from '../../generic/currency/token.js'
 import { isTvmChainId, type TvmChainId } from '../chain/chains.js'
+import { normalizeTvmAddress } from '../utils/normalize-address.js'
 
 export type TvmAddress = `T${string}`
 
@@ -25,7 +26,7 @@ export class TvmToken<
   } & ConstructorParameters<
     typeof Token<TvmChainId, TvmAddress, TMetadata>
   >[0]) {
-    super({ address: address.toLowerCase() as TvmAddress, ...rest })
+    super({ address: normalizeTvmAddress(address), ...rest })
     this.origin = origin
   }
 

package/tvm/index.ts

@@ -2,3 +2,4 @@ export * from './abi/index.js'
 export * from './chain/index.js'
 export * from './config/index.js'
 export * from './currency/index.js'
+export * from './utils/index.js'

package/tvm/utils/index.ts

@@ -0,0 +1 @@
+export * from './normalize-address.js'

package/tvm/utils/normalize-address.ts

@@ -0,0 +1,5 @@
+import type { TvmAddress } from '../currency/token.js'
+
+export function normalizeTvmAddress(address: TvmAddress): TvmAddress {
+  return address
+}