sushi 7.1.0 → 7.2.0

package/generic/currency/price.ts

@@ -1,11 +1,11 @@
 import { Fraction } from '../math/fraction.js'
 import type { BigintIsh } from '../types/bigintish.js'
 import { Amount } from './amount.js'
-import type { Currency } from './currency.js'
+import type { AnyCurrency } from './currency.js'
 
 export class Price<
-  TBase extends Currency,
-  TQuote extends Currency,
+  TBase extends AnyCurrency,
+  TQuote extends AnyCurrency,
 > extends Fraction {
   public readonly base: TBase
   public readonly quote: TQuote
@@ -13,11 +13,10 @@ export class Price<
   /**
    * Creates a Price from a human-readable quote-per-base value, e.g. "1.5".
    */
-  public static fromHuman<TBase extends Currency, TQuote extends Currency>(
-    base: TBase,
-    quote: TQuote,
-    value: string,
-  ): Price<TBase, TQuote> {
+  public static fromHuman<
+    TBase extends AnyCurrency,
+    TQuote extends AnyCurrency,
+  >(base: TBase, quote: TQuote, value: string): Price<TBase, TQuote> {
     if (!value.match(/^\d*\.?\d+$/)) {
       throw new Error(`Invalid price: ${value}`)
     }
@@ -37,7 +36,10 @@ export class Price<
   /**
    * Tries to create a Price from a human-readable quote-per-base value.
    */
-  public static tryFromHuman<TBase extends Currency, TQuote extends Currency>(
+  public static tryFromHuman<
+    TBase extends AnyCurrency,
+    TQuote extends AnyCurrency,
+  >(
     base: TBase,
     quote: TQuote,
     value: string,

package/generic/currency/token.ts

@@ -28,7 +28,7 @@ export abstract class Token<
   }
 
   public override isSame(
-    other: BaseCurrency<ChainId, CurrencyMetadata, string, object>,
+    other: BaseCurrency<string | number, CurrencyMetadata, string, object>,
   ): boolean {
     return (
       super.isSame(other) &&

package/generic/types/id.ts

@@ -1,7 +1,7 @@
 import type { ChainId } from '../chain/chains.js'
 
 export type ID<
-  TChainId extends ChainId = ChainId,
+  TChainId extends string | number = ChainId,
   TAddress extends string = string,
   TIncludeNative extends boolean = false,
 > =

package/generic/utils/subtract-slippage.ts

@@ -1,5 +1,5 @@
 import type { Amount } from '../currency/amount.js'
-import type { Currency } from '../currency/currency.js'
+import type { AnyCurrency } from '../currency/currency.js'
 
 /**
  *
@@ -8,7 +8,7 @@ import type { Currency } from '../currency/currency.js'
  *
  * @returns The amount after subtracting the slippage, eg. amount * 0.9 if slippage is 10% (0.1).
  */
-export function subtractSlippage<TCurrency extends Currency>(
+export function subtractSlippage<TCurrency extends AnyCurrency>(
   amount: Amount<TCurrency>,
   slippage: number,
 ) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "sushi",
   "description": "Sushi",
-  "version": "7.1.0",
+  "version": "7.2.0",
   "main": "./_cjs/generic/index.js",
   "module": "./_esm/generic/index.js",
   "types": "./_types/generic/index.d.ts",