Merge branch 'master' into multiple-quotes

Author: dglowinski

.env.template

@@ -26,6 +26,10 @@ RPC_URL_31337=""
 RPC_URL_146=""
 # bera
 RPC_URL_80094=""
+# unichain
+RPC_URL_130=""
+# bob
+RPC_URL_60808=""
 
 # Provider API keys
 LIFI_API_KEY=""
@@ -37,4 +41,5 @@ OKX_PASSPHRASE=""
 OKX_SECRET_KEY=""
 ODOS_API_KEY=""
 ODOS_REFERRAL_CODE=""
-OOGABOOGA_API_KEY=""
+OOGABOOGA_API_KEY=""
+OX_API_KEY=""

src/api/routes/swap/swapRouter.ts

@@ -101,7 +101,7 @@ function parseRequest(request: Request): SwapParams {
     // TODO
     // if (!isSupportedChainId(validatedParams.chainId)) {
     //   throw new Error("Unsupported chainId")
-    // }
+    //  }
 
     const chainId = validatedParams.chainId
     const tokenIn = findToken(chainId, validatedParams.tokenIn)

src/common/utils/contractBook.ts

@@ -10,6 +10,8 @@ const contractBook: any = {
       [1923]: "0x05Eb1A647265D974a1B0A57206048312604Ac6C3",
       [146]: "0xbAf5B12c92711a3657DD4adA6b3C7801e83Bb56a",
       [80094]: "0x4A35e6A872cf35623cd3fD07ebECEDFc0170D705",
+      [130]: "0x319E8ecd3BaB57fE684ca1aCfaB60c5603087B3A",
+      [60808]: "0x697Ca30D765c1603890D88AAffBa3BeCCe72059d",
     },
   },
   swapVerifier: {
@@ -21,6 +23,8 @@ const contractBook: any = {
       [1923]: "0x392C1570b3Bf29B113944b759cAa9a9282DA12Fe",
       [146]: "0x003ef4048b45a5A79D4499aaBd52108B3Bc9209f",
       [80094]: "0x6fFf8Ac4AB123B62FF5e92aBb9fF702DCBD6C939",
+      [130]: "0x7eaf8C22480129E5D7426e3A33880D7bE19B50a7",
+      [60808]: "0x296041DbdBC92171293F23c0a31e1574b791060d",
     },
   },
 }

src/common/utils/tokenList.ts

@@ -17,8 +17,14 @@ export type TokenListItem = {
 
 const cache: Record<number, TokenListItem[]> = {}
 ;(function buildCache() {
-  const dir = `${__dirname}/../../tokenLists`
-  const files = fs.readdirSync(dir)
+  let dir = `${__dirname}/../tokenLists`
+  let files
+  try {
+    files = fs.readdirSync(dir)
+  } catch {
+    dir = `${__dirname}/../../../tokenLists`
+    files = fs.readdirSync(dir)
+  }
   for (const file of files) {
     const match = file.match(/(\d+)/g)
     if (!match) throw new Error("Invalid tokenlist file")

src/common/utils/viemClients.ts

@@ -32,13 +32,39 @@ export const bartio = defineChain({
   },
 })
 
+const sonicnetwork = defineChain({
+  id: 146,
+  name: "Sonic",
+  nativeCurrency: {
+    decimals: 18,
+    name: "Sonic",
+    symbol: "S",
+  },
+  rpcUrls: {
+    default: {
+      http: ["https://rpc.soniclabs.com"],
+      webSocket: ["wss://sonic-rpc.publicnode.com"],
+    },
+  },
+  blockExplorers: {
+    default: { name: "Explorer", url: "https://sonicscan.org" },
+  },
+  contracts: {
+    multicall3: {
+      address: "0xcA11bde05977b3631167028862bE2a173976CA11",
+      blockCreated: 1,
+    },
+  },
+})
+
 export const RPC_URLS: Record<number, string> = {
   [chains.mainnet.id]: process.env.RPC_URL_1 || "",
   [chains.sepolia.id]: process.env.RPC_URL_11155111 || "",
   [chains.arbitrum.id]: process.env.RPC_URL_42161 || "",
   [chains.base.id]: process.env.RPC_URL_8453 || "",
   [bartio.id]: process.env.RPC_URL_80084 || "",
   [80094]: process.env.RPC_URL_80094 || "",
+  [146]: process.env.RPC_URL_146 || "",
   [chains.foundry.id]: process.env.RPC_URL_31337 || "http://localhost:8545",
 } as const
 
@@ -67,6 +93,10 @@ export const createClients = (): Record<number, Client<Transport, Chain>> => ({
     transport: http(RPC_URLS[chains.foundry.id]),
   }),
   [chains.arbitrum.id]: createChainConfig(chains.arbitrum),
+  [sonicnetwork.id]: createClient({
+    chain: sonicnetwork,
+    transport: http(RPC_URLS[sonicnetwork.id]),
+  }),
 })
 
 export const viemClients = createClients()

src/swapService/config/base.ts

@@ -35,7 +35,7 @@ const baseRoutingConfig: ChainRoutingConfig = [
     strategy: StrategyBalmySDK.name(),
     config: {
       sourcesFilter: {
-        includeSources: ["odos", "open-ocean", "uniswap"],
+        includeSources: ["odos", "uniswap", "open-ocean"],
       },
     },
     match: {
@@ -56,6 +56,7 @@ const baseRoutingConfig: ChainRoutingConfig = [
           "open-ocean",
           // "conveyor",
           "uniswap",
+          "magpie",
         ],
       },
     },

src/swapService/config/bob.ts

@@ -0,0 +1,25 @@
+import { type ChainRoutingConfig, SwapperMode } from "../interface"
+import { StrategyBalmySDK, StrategyRepayWrapper } from "../strategies"
+
+const bobRoutingConfig: ChainRoutingConfig = [
+  // WRAPPERS
+  {
+    strategy: StrategyRepayWrapper.name(),
+    match: {
+      isRepay: true,
+      swapperModes: [SwapperMode.EXACT_IN],
+    },
+  },
+  // DEFAULTS
+  {
+    strategy: StrategyBalmySDK.name(),
+    config: {
+      sourcesFilter: {
+        includeSources: ["oku_bob_icecreamswap", "oku_bob_uniswap"],
+      },
+    },
+    match: {},
+  },
+]
+
+export default bobRoutingConfig

src/swapService/config/default.ts

@@ -23,6 +23,8 @@ const defaultRoutingConfig: ChainRoutingConfig = [
           "li-fi",
           "open-ocean",
           "uniswap",
+          "0x",
+          "oku",
         ],
       },
     },

src/swapService/config/index.ts

@@ -2,15 +2,19 @@ import { base, mainnet } from "viem/chains"
 import type { RoutingConfig } from "../interface"
 import baseRoutingConfig from "./base"
 import beraRoutingConfig from "./bera"
+import bobRoutingConfig from "./bob"
 import defaultRoutingConfig from "./default"
 import mainnetRoutingConfig from "./mainnet"
+import sonicRoutingConfig from "./sonic"
 import swellRoutingConfig from "./swell"
 
 const routingConfig: RoutingConfig = {
   [mainnet.id]: mainnetRoutingConfig,
   [base.id]: baseRoutingConfig,
   [1923]: swellRoutingConfig,
   [80094]: beraRoutingConfig,
+  [60808]: bobRoutingConfig,
+  [146]: sonicRoutingConfig,
 }
 
 export const getRoutingConfig = (chainId: number) => {

src/swapService/config/mainnet.ts

@@ -6,6 +6,7 @@ import {
   StrategyERC4626Wrapper,
   StrategyIdleCDOTranche,
   StrategyMidas,
+  StrategyRedirectDepositWrapper,
   StrategyRepayWrapper,
 } from "../strategies"
 
@@ -16,11 +17,14 @@ const WUSDL_MAINNET = "0x7751E2F4b8ae93EF6B79d86419d42FE3295A4559"
 const PT_WSTUSR1740182579 = "0xd0097149aa4cc0d0e1fc99b8bd73fc17dc32c1e9"
 const PT_WSTUSR_27MAR2025_MAINNET = "0xA8c8861b5ccF8CCe0ade6811CD2A7A7d3222B0B8"
 const USD0PLUSPLUS_MAINNET = "0x35d8949372d46b7a3d5a56006ae77b215fc69bc0"
+const YNETH_MAINNET = "0x09db87A538BD693E9d08544577d5cCfAA6373A48"
 const YNETHX_MAINNET = "0x657d9aba1dbb59e53f9f3ecaa878447dcfc96dcb"
 const IDLEAATRANCHEFASANARA_MAINNET =
   "0x45054c6753b4Bce40C5d54418DabC20b070F85bE"
 const CUSDOUSDC_CURVELP_MAINNET = "0x90455bd11Ce8a67C57d467e634Dc142b8e4105Aa"
 
+const USUAL_USD0_VAULT_MAINNET = "0xd001f0a15D272542687b2677BA627f48A4333b5d"
+
 const mainnetRoutingConfig: ChainRoutingConfig = [
   // WRAPPERS
   {
@@ -46,7 +50,12 @@ const mainnetRoutingConfig: ChainRoutingConfig = [
   {
     strategy: StrategyERC4626Wrapper.name(),
     match: {
-      tokensInOrOut: [WSTUSR_MAINNET, PT_WSTUSR1740182579, YNETHX_MAINNET],
+      tokensInOrOut: [
+        WSTUSR_MAINNET,
+        PT_WSTUSR1740182579,
+        YNETH_MAINNET,
+        YNETHX_MAINNET,
+      ],
       excludeTokensInOrOut: [PT_WSTUSR_27MAR2025_MAINNET],
     },
   },
@@ -59,44 +68,37 @@ const mainnetRoutingConfig: ChainRoutingConfig = [
     },
     match: { isPendlePT: true },
   },
-  // USD0++ route without open-ocean and combined
+  // WUSDL with paraswap
   {
     strategy: StrategyBalmySDK.name(),
     config: {
       sourcesFilter: {
         includeSources: [
           "kyberswap",
-          // "paraswap",
+          "paraswap",
           "odos",
           "1inch",
           "li-fi",
-          // "open-ocean",
+          "open-ocean",
           "uniswap",
+          "magpie",
         ],
       },
     },
     match: {
-      tokensInOrOut: [USD0PLUSPLUS_MAINNET],
+      tokensInOrOut: [WUSDL_MAINNET],
     },
   },
-  // WUSDL with paraswap
   {
     strategy: StrategyBalmySDK.name(),
     config: {
       sourcesFilter: {
-        includeSources: [
-          "kyberswap",
-          "paraswap",
-          "odos",
-          "1inch",
-          "li-fi",
-          // "open-ocean",
-          "uniswap",
-        ],
+        includeSources: ["1inch"],
       },
     },
     match: {
-      tokensInOrOut: [WUSDL_MAINNET],
+      swapperModes: [SwapperMode.EXACT_IN],
+      tokensInOrOut: [USD0PLUSPLUS_MAINNET],
     },
   },
   // DEFAULTS
@@ -112,6 +114,7 @@ const mainnetRoutingConfig: ChainRoutingConfig = [
           "li-fi",
           "open-ocean",
           "uniswap",
+          "magpie",
         ],
       },
     },
@@ -123,17 +126,18 @@ const mainnetRoutingConfig: ChainRoutingConfig = [
     strategy: StrategyCombinedUniswap.name(),
     match: {
       swapperModes: [SwapperMode.TARGET_DEBT],
-      excludeTokensInOrOut: [
-        RLP_MAINNET,
-        SUSDS_MAINNET,
-        USD0PLUSPLUS_MAINNET,
-        WUSDL_MAINNET,
-      ],
+      excludeTokensInOrOut: [RLP_MAINNET, SUSDS_MAINNET, WUSDL_MAINNET],
     },
   },
   // FALLBACKS
-
-  // Binary search overswap for target debt
+  // If exact out for Usual's USD0 repay doesn't work, over swap with deposit to escrow
+  {
+    strategy: StrategyRedirectDepositWrapper.name(),
+    match: {
+      repayVaults: [USUAL_USD0_VAULT_MAINNET],
+    },
+  },
+  // Binary search overswap for target  debt
   {
     strategy: StrategyBalmySDK.name(),
     config: {
@@ -146,6 +150,7 @@ const mainnetRoutingConfig: ChainRoutingConfig = [
           "li-fi",
           "open-ocean",
           "uniswap",
+          "magpie",
         ],
       },
     },