@across-protocol/sdk 4.3.90 → 4.3.92

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@across-protocol/sdk",
   "author": "UMA Team",
-  "version": "4.3.90",
+  "version": "4.3.92",
   "license": "AGPL-3.0",
   "homepage": "https://docs.across.to/reference/sdk",
   "files": [
@@ -106,8 +106,8 @@
   },
   "dependencies": {
     "@across-protocol/across-token": "^1.0.0",
-    "@across-protocol/constants": "^3.1.86",
-    "@across-protocol/contracts": "^4.1.12",
+    "@across-protocol/constants": "^3.1.87",
+    "@across-protocol/contracts": "^4.1.13",
     "@coral-xyz/anchor": "^0.30.1",
     "@eth-optimism/sdk": "^3.3.1",
     "@ethersproject/bignumber": "^5.7.0",

package/src/constants.ts

@@ -1,5 +1,6 @@
 import { constants as ethersConstants } from "ethers";
-import { CHAIN_IDs, TOKEN_SYMBOLS_MAP } from "@across-protocol/constants";
+import { CHAIN_IDs, PUBLIC_NETWORKS, TOKEN_SYMBOLS_MAP } from "@across-protocol/constants";
+import { chainIsEvm } from "./utils/NetworkUtils";
 
 export {
   CCTP_NO_DOMAIN,
@@ -87,16 +88,24 @@ export const STABLE_COIN_SYMBOLS = [
   TOKEN_SYMBOLS_MAP.WGHO.symbol,
 ];
 
-export const CUSTOM_GAS_TOKENS = {
-  [CHAIN_IDs.BSC]: "BNB",
-  [CHAIN_IDs.HYPEREVM]: "HYPE",
-  [CHAIN_IDs.PLASMA]: "XPL",
-  [CHAIN_IDs.PLASMA_TESTNET]: "XPL",
-  [CHAIN_IDs.POLYGON]: "MATIC",
-  [CHAIN_IDs.POLYGON_AMOY]: "MATIC",
-  [CHAIN_IDs.LENS]: "GHO",
-  [CHAIN_IDs.LENS_SEPOLIA]: "GHO",
+const resolveCustomGasTokens = () => {
+  // Lens & Lens Sepolia are exceptional; every other EVM
+  // custom gas token can be inferred from the chain defs.
+  const overrides = {
+    [CHAIN_IDs.LENS]: "GHO",
+    [CHAIN_IDs.LENS_SEPOLIA]: "GHO",
+  };
+
+  return Object.keys(PUBLIC_NETWORKS)
+    .map(Number)
+    .filter(chainIsEvm)
+    .map((chainId) => {
+      const { nativeToken } = PUBLIC_NETWORKS[chainId];
+      return overrides[chainId] ?? nativeToken;
+    })
+    .filter((nativeToken) => nativeToken !== "ETH");
 };
+export const CUSTOM_GAS_TOKENS = resolveCustomGasTokens();
 
 // Blocks where SpokePools were upgraded from v2 to v2.5. This is where the fillStatus mapping
 // was introduced. This mapping should only be updated on subsequent upgrades where there are

package/src/gasPriceOracle/oracle.ts

@@ -108,6 +108,7 @@ function _getEthersGasPriceEstimate(
     [CHAIN_IDs.ARBITRUM]: arbitrum.eip1559,
     [CHAIN_IDs.BSC]: ethereum.legacy,
     [CHAIN_IDs.MAINNET]: ethereum.eip1559,
+    [CHAIN_IDs.MONAD]: ethereum.eip1559,
     [CHAIN_IDs.PLASMA]: ethereum.eip1559,
     [CHAIN_IDs.POLYGON]: polygon.gasStation,
     [CHAIN_IDs.SCROLL]: ethereum.legacy,

package/src/priceClient/adapters/default.ts

@@ -1,26 +1,32 @@
 import { PriceFeedAdapter, TokenPrice } from "../priceClient";
 import { BaseHTTPAdapter } from "./baseAdapter";
 
+type DefaultPrice = { [currency: string]: { [address: string]: number } };
+
 /**
  * Fallback price adapter to unconditionally return 0 on all input addresses.
  * This adapter can be used as a last-resort to default to a token price of 0
  * in case all other adapters fail to resolve a token price.
- *
- * Note: This adapter could be augmented to permit returning a custom price on a per-token bsis.
- * This would allow the caller to peg token prices, which has been a use cases in the Across API.
- * That's left as an open possibility for now.
  */
 export class PriceFeed extends BaseHTTPAdapter implements PriceFeedAdapter {
-  constructor() {
+  constructor(private readonly prices: DefaultPrice = {}) {
     super("Default Adapter", "127.0.0.1", {});
   }
 
   async getPriceByAddress(address: string, currency: string): Promise<TokenPrice> {
-    const price = await this.getPricesByAddress([address], currency);
-    return price[0];
+    const [price] = await this.getPricesByAddress([address], currency);
+    return price;
   }
 
-  getPricesByAddress(addresses: string[], _currency: string): Promise<TokenPrice[]> {
-    return Promise.resolve(addresses.map((address) => ({ address, price: 0, timestamp: 0 })));
+  getPricesByAddress(addresses: string[], currency: string): Promise<TokenPrice[]> {
+    return Promise.resolve(
+      addresses.map((address) => {
+        return {
+          address,
+          price: this.prices[currency]?.[address] ?? 0,
+          timestamp: 0,
+        };
+      })
+    );
   }
 }

package/src/priceClient/priceClient.ts

@@ -164,7 +164,7 @@ export class PriceClient implements PriceFeedAdapter {
     const skipped: { [token: string]: string } = {}; // Includes reason for skipping
     const now = msToS(Date.now());
 
-    expected.forEach((address: string) => {
+    expected.forEach((address) => {
       const addr = address.toLowerCase(); // for internal priceCache lookup.
       const tokenPrice: TokenPrice | undefined = prices.find((price) => price?.address?.toLowerCase() === addr);
 

package/src/relayFeeCalculator/chain-queries/factory.ts

@@ -4,7 +4,7 @@ import { getDeployedAddress } from "@across-protocol/contracts";
 import { asL2Provider } from "@eth-optimism/sdk";
 import { providers } from "ethers";
 import { CUSTOM_GAS_TOKENS } from "../../constants";
-import { chainIsOPStack, isDefined, chainIsSvm, SvmAddress } from "../../utils";
+import { chainIsEvm, chainIsOPStack, isDefined, chainIsSvm, SvmAddress } from "../../utils";
 import { QueryBase } from "./baseQuery";
 import { SVMProvider as svmProvider } from "../../arch/svm";
 import { DEFAULT_LOGGER, getDefaultRelayer, Logger } from "../relayFeeCalculator";
@@ -33,7 +33,7 @@ export class QueryBase__factory {
     assert(isDefined(spokePoolAddress));
 
     const customGasTokenSymbol = CUSTOM_GAS_TOKENS[chainId];
-    if (customGasTokenSymbol) {
+    if (chainIsEvm(chainId) && isDefined(customGasTokenSymbol)) {
       assert(relayerAddress.isEVM());
       return new CustomGasTokenQueries({
         queryBaseArgs: [

package/src/typechain.ts

@@ -10,7 +10,7 @@ export { AcrossMerkleDistributor__factory } from "@across-protocol/contracts/dis
 export { AcrossConfigStore__factory } from "@across-protocol/contracts/dist/typechain/factories/contracts/AcrossConfigStore__factory";
 export { HubPool__factory } from "@across-protocol/contracts/dist/typechain/factories/contracts/HubPool__factory";
 export { SpokePool__factory } from "@across-protocol/contracts/dist/typechain/factories/contracts/SpokePool__factory";
-export { ERC20__factory } from "@across-protocol/contracts/dist/typechain/factories/@openzeppelin/contracts/token/ERC20/ERC20__factory";
+export { ERC20__factory } from "@across-protocol/contracts/dist/typechain/factories/@openzeppelin/contracts-v4/token/ERC20/ERC20__factory";
 
 export { AcceleratingDistributor__factory } from "@across-protocol/across-token/dist/typechain/factories/AcceleratingDistributor__factory";
 export { ClaimAndStake__factory } from "@across-protocol/across-token/dist/typechain/factories/ClaimAndStake__factory";

package/src/utils/Multicall.ts

@@ -32,6 +32,7 @@ const DETERMINISTIC_MULTICALL_CHAINS = [
   CHAIN_IDs.HYPEREVM,
   CHAIN_IDs.LINEA,
   CHAIN_IDs.MAINNET,
+  CHAIN_IDs.MONAD,
   CHAIN_IDs.PLASMA,
   CHAIN_IDs.POLYGON,
   CHAIN_IDs.SCROLL,

package/src/utils/NetworkUtils.ts

@@ -155,7 +155,7 @@ export function chainIsCCTPEnabled(chainId: number): boolean {
 export function chainIsOFTEnabled(chainId: number): boolean {
   // Add chainIds to oftEnabled as they are supported by the protocol.
   // This is backwards vs. CCTP logic because Across support for OFTs is limited vs. OFT deployments.
-  const oftEnabled = [CHAIN_IDs.ARBITRUM, CHAIN_IDs.POLYGON, CHAIN_IDs.HYPEREVM, CHAIN_IDs.PLASMA];
+  const oftEnabled = [CHAIN_IDs.ARBITRUM, CHAIN_IDs.POLYGON, CHAIN_IDs.HYPEREVM, CHAIN_IDs.MONAD, CHAIN_IDs.PLASMA];
   return oftEnabled.includes(chainId) && PRODUCTION_NETWORKS[chainId]?.oftEid !== OFT_NO_EID;
 }