Skip to content

Commit c44fb3b

Browse files
committed
Merge branch 'master' into curve_lp
2 parents 74d9c65 + 9e0225a commit c44fb3b

File tree

12 files changed

+154
-14
lines changed

12 files changed

+154
-14
lines changed

.env.template

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ RPC_URL_42161=""
2222
RPC_URL_80084=""
2323
# foundry
2424
RPC_URL_31337=""
25+
# sonic
26+
RPC_URL_146 s=""
2527

2628
# Provider API keys
2729
LIFI_API_KEY=""

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Base image with corepack and pnpm enabled
2-
FROM 310118226683.dkr.ecr.eu-west-1.amazonaws.com/node:23.3.0-slim
2+
FROM 310118226683.dkr.ecr.eu-west-1.amazonaws.com/node:23.7.0-slim
33

44
RUN apt-get update && apt-get install -y curl && rm -rf /var/lib/apt/lists/*
55
# Setup doppler

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"packageManager": "[email protected]",
2626
"dependencies": {
2727
"@asteasolutions/zod-to-openapi": "7.2.0",
28-
"@balmy/sdk": "0.4.8",
28+
"@balmy/sdk": "0.6.8",
2929
"@uniswap/router-sdk": "1.15.0",
3030
"@uniswap/sdk-core": "6.1.1",
3131
"@uniswap/smart-order-router": "4.9.2",

pnpm-lock.yaml

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/common/utils/contractBook.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ const contractBook: any = {
88
[chains.base.id]: "0x0D3d0F97eD816Ca3350D627AD8e57B6AD41774df",
99
[chains.polygon.id]: "0x3e43F3CE1C364722df6470381Fa1F15ffbFB37E3",
1010
[1923]: "0x05Eb1A647265D974a1B0A57206048312604Ac6C3",
11+
[146]: "0xbAf5B12c92711a3657DD4adA6b3C7801e83Bb56a",
1112
},
1213
},
1314
swapVerifier: {
@@ -17,6 +18,7 @@ const contractBook: any = {
1718
[chains.base.id]: "0x30660764A7a05B84608812C8AFC0Cb4845439EEe",
1819
[chains.polygon.id]: "0x50C5ca05E916459F32c517932f1b4D78fb11018F",
1920
[1923]: "0x392C1570b3Bf29B113944b759cAa9a9282DA12Fe",
21+
[146]: "0x003ef4048b45a5A79D4499aaBd52108B3Bc9209f",
2022
},
2123
},
2224
}

src/common/utils/tokenList.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import type { Address } from "viem"
22
import tokenList1 from "../../tokenLists/tokenList_1"
3+
import tokenList146 from "../../tokenLists/tokenList_146"
34
import tokenList1923 from "../../tokenLists/tokenList_1923"
45
import tokenList8453 from "../../tokenLists/tokenList_8543"
56

@@ -21,10 +22,11 @@ const cache: Record<number, TokenListItem[]> = {
2122
1: tokenList1 as TokenListItem[],
2223
8453: tokenList8453 as TokenListItem[],
2324
1923: tokenList1923 as TokenListItem[],
25+
146: tokenList146 as TokenListItem[],
2426
}
2527

2628
export default function getTokenList(chainId: number): TokenListItem[] {
27-
return cache[chainId]
29+
return cache[chainId] || []
2830
}
2931

3032
export function getAllTokenLists() {

src/swapService/config/default.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ const defaultRoutingConfig: ChainRoutingConfig = [
2222
"1inch",
2323
"li-fi",
2424
"open-ocean",
25-
"conveyor",
2625
"uniswap",
2726
],
2827
},

src/swapService/runner.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,9 @@ export async function runPipeline(
6161
return finalResult.response
6262
}
6363

64-
//
6564
// TODO timeouts on balmy
6665
// TODO review and add sources
6766
// TODO tokenlist, interfaces
6867
// TODO price impact
6968
// TODO logging - detect when fallback kicks
70-
// TODO pendle rollover
7169
// In wreapper strategy return dust to the original wrapper asset - deposit for EOA owner

src/swapService/strategies/balmySDK/odosQuoteSource.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ const ODOS_METADATA: QuoteSourceMetadata<OdosSupport> = {
3838
Chains.LINEA.chainId,
3939
Chains.MANTLE.chainId,
4040
Chains.SCROLL.chainId,
41+
Chains.SONIC.chainId,
4142
],
4243
swapAndTransfer: true,
4344
buyOrders: false,

src/swapService/strategies/balmySDK/oneInchQuoteSource.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
import { Chains } from "@balmy/sdk"
2-
import { isSameAddress } from "@balmy/sdk"
1+
import { Chains, isSameAddress } from "@balmy/sdk"
32
import type {
43
BuildTxParams,
54
IQuoteSource,
@@ -29,7 +28,7 @@ export const ONE_INCH_METADATA: QuoteSourceMetadata<OneInchSupport> = {
2928
Chains.GNOSIS.chainId,
3029
Chains.AVALANCHE.chainId,
3130
Chains.FANTOM.chainId,
32-
Chains.KLAYTN.chainId,
31+
Chains.KAIA.chainId,
3332
Chains.AURORA.chainId,
3433
Chains.BASE.chainId,
3534
],

0 commit comments

Comments
 (0)