Skip to content

Commit 78655ae

Browse files
dglowinskidglowinski
committed
fix tokenlist metadata
1 parent f5460b1 commit 78655ae

21 files changed

+645
-649
lines changed

‎src/common/utils/tokenList.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ export type TokenListItem = {
99
logoURI: string
1010
name: string
1111
symbol: string
12-
meta?: {
12+
metadata?: {
1313
poolId?: string
1414
isPendlePT?: boolean
1515
pendleMarket?: string

‎src/swapService/quoters/quoterPendle.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import {
99

1010
export async function fetchPendleQuote(swapParams: SwapParams) {
1111
const pendleMarket =
12-
swapParams.tokenIn.meta?.pendleMarket ||
13-
swapParams.tokenOut.meta?.pendleMarket
12+
swapParams.tokenIn.metadata?.pendleMarket ||
13+
swapParams.tokenOut.metadata?.pendleMarket
1414

1515
const params = new URLSearchParams({
1616
receiver: swapParams.receiver,

‎src/swapService/strategies/balmySDK/sources/pendleQuoteSource.ts‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -104,13 +104,12 @@ export class CustomPendleQuoteSource
104104
}: QuoteParams<PendleSupport, PendleConfig>) {
105105
const tokenIn = findToken(chainId, getAddress(sellToken))
106106
const tokenOut = findToken(chainId, getAddress(buyToken))
107-
108107
if (!tokenIn || !tokenOut) throw new Error("Missing token in or out")
109108
if (
110-
!tokenIn.meta?.isPendleLP &&
111-
!tokenOut.meta?.isPendleLP &&
112-
!tokenIn.meta?.isPendlePT &&
113-
!tokenOut.meta?.isPendlePT
109+
!tokenIn.metadata?.isPendleLP &&
110+
!tokenOut.metadata?.isPendleLP &&
111+
!tokenIn.metadata?.isPendlePT &&
112+
!tokenOut.metadata?.isPendlePT
114113
) {
115114
failed(
116115
this.getMetadata(),
@@ -132,7 +131,6 @@ export class CustomPendleQuoteSource
132131
"Sold out cool off",
133132
)
134133
}
135-
136134
// swap
137135
const queryParams: any = {
138136
receiver: recipient || takeFrom,
@@ -143,12 +141,10 @@ export class CustomPendleQuoteSource
143141
amountsIn: order.sellAmount.toString(),
144142
aggregators: this.aggregator,
145143
}
146-
147144
const queryString = qs.stringify(queryParams, {
148145
skipNulls: true,
149146
arrayFormat: "comma",
150147
})
151-
152148
const url = `https://api-v2.pendle.finance/core/v2/sdk/${chainId}/convert?${queryString}`
153149

154150
const response = await fetchService.fetch(url, {

‎src/swapService/strategies/balmySDK/sources/spectraQuoteSource.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ export class CustomSpectraQuoteSource
109109
const tokenIn = findToken(chainId, getAddress(sellToken))
110110
const tokenOut = findToken(chainId, getAddress(buyToken))
111111
if (!tokenIn || !tokenOut) throw new Error("Missing token in or out")
112-
if (!tokenIn.meta?.isSpectraPT && !tokenOut.meta?.isSpectraPT) {
112+
if (!tokenIn.metadata?.isSpectraPT && !tokenOut.metadata?.isSpectraPT) {
113113
failed(
114114
SPECTRA_METADATA,
115115
chainId,
@@ -119,11 +119,11 @@ export class CustomSpectraQuoteSource
119119
)
120120
}
121121
let url
122-
if (tokenIn.meta?.isSpectraPT && tokenOut.meta?.isSpectraPT) {
122+
if (tokenIn.metadata?.isSpectraPT && tokenOut.metadata?.isSpectraPT) {
123123
// rollover
124124
failed(SPECTRA_METADATA, chainId, sellToken, buyToken, "Not supported")
125125
} else if (
126-
tokenIn.meta?.isSpectraPT &&
126+
tokenIn.metadata?.isSpectraPT &&
127127
(await this.isExpiredMarket(fetchService, chainId, tokenIn, timeout))
128128
) {
129129
// redeem expired PT
@@ -151,7 +151,7 @@ export class CustomSpectraQuoteSource
151151
const queryString = qs.stringify(queryParams)
152152

153153
const spectraMarket =
154-
tokenIn?.meta?.spectraPool || tokenOut?.meta?.spectraPool
154+
tokenIn?.metadata?.spectraPool || tokenOut?.metadata?.spectraPool
155155

156156
url = `${getUrl(chainId)}/pools/${spectraMarket}/swap?${queryString}`
157157
}
@@ -210,7 +210,7 @@ export class CustomSpectraQuoteSource
210210
}
211211

212212
return !!this.expiredPoolsCache[chainId].pools.find((p) =>
213-
isAddressEqual(p as Address, token.meta?.spectraPool as Address),
213+
isAddressEqual(p as Address, token.metadata?.spectraPool as Address),
214214
)
215215
}
216216

‎src/swapService/strategies/deprecated/strategyPendle.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@
3939
// !isExactInRepay(swapParams) &&
4040
// this.config.chainsSupported.includes(swapParams.chainId) &&
4141
// Boolean(
42-
// swapParams.tokenIn.meta?.isPendlePT ||
43-
// swapParams.tokenOut.meta?.isPendlePT,
42+
// swapParams.tokenIn.metadata?.isPendlePT ||
43+
// swapParams.tokenOut.metadata?.isPendlePT,
4444
// )
4545
// )
4646
// }

‎src/swapService/strategies/strategyPendleCrossChainPT.ts‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ export class StrategyPendleCrossChainPT {
5555
async supports(swapParams: SwapParams) {
5656
return (
5757
!isExactInRepay(swapParams) &&
58-
Boolean(swapParams.tokenIn.meta?.isPendleCrossChainPT)
58+
Boolean(swapParams.tokenIn.metadata?.isPendleCrossChainPT)
5959
)
6060
}
6161

@@ -67,7 +67,7 @@ export class StrategyPendleCrossChainPT {
6767
}
6868

6969
if (!result.supports || !result.match) return result
70-
if (!swapParams.tokenIn.meta?.pendleCrossChainPTPaired)
70+
if (!swapParams.tokenIn.metadata?.pendleCrossChainPTPaired)
7171
throw new Error("Missing token metadata") // type assertion
7272

7373
try {
@@ -76,7 +76,7 @@ export class StrategyPendleCrossChainPT {
7676
if (
7777
isAddressEqual(
7878
swapParams.tokenOut.address,
79-
getAddress(swapParams.tokenIn.meta.pendleCrossChainPTPaired),
79+
getAddress(swapParams.tokenIn.metadata.pendleCrossChainPTPaired),
8080
)
8181
) {
8282
result.quotes = [await this.exactInFromPTToUnderlying(swapParams)]
@@ -89,7 +89,7 @@ export class StrategyPendleCrossChainPT {
8989
if (
9090
isAddressEqual(
9191
swapParams.tokenOut.address,
92-
getAddress(swapParams.tokenIn.meta.pendleCrossChainPTPaired),
92+
getAddress(swapParams.tokenIn.metadata.pendleCrossChainPTPaired),
9393
)
9494
) {
9595
result.quotes = await this.targetDebtFromPTToUnderlying(swapParams)
@@ -163,10 +163,10 @@ export class StrategyPendleCrossChainPT {
163163
swapParams.receiver,
164164
)
165165

166-
if (!swapParams.tokenIn.meta?.pendleCrossChainPTPaired)
166+
if (!swapParams.tokenIn.metadata?.pendleCrossChainPTPaired)
167167
throw new Error("Missing token metadata")
168168
const pairedAsset = getAddress(
169-
swapParams.tokenIn.meta.pendleCrossChainPTPaired,
169+
swapParams.tokenIn.metadata.pendleCrossChainPTPaired,
170170
)
171171
const tokenIn = findToken(swapParams.chainId, pairedAsset)
172172

@@ -264,10 +264,10 @@ export class StrategyPendleCrossChainPT {
264264
async targetDebtFromPTToAny(
265265
swapParams: SwapParams,
266266
): Promise<SwapApiResponse[]> {
267-
if (!swapParams.tokenIn.meta?.pendleCrossChainPTPaired)
267+
if (!swapParams.tokenIn.metadata?.pendleCrossChainPTPaired)
268268
throw new Error("Missing token metadata")
269269
const pairedAsset = getAddress(
270-
swapParams.tokenIn.meta.pendleCrossChainPTPaired,
270+
swapParams.tokenIn.metadata.pendleCrossChainPTPaired,
271271
)
272272
const tokenIn = findToken(swapParams.chainId, pairedAsset)
273273
if (!tokenIn) throw new Error("Inner token not found")
@@ -350,7 +350,7 @@ async function fetchAndEncodePTQuote(
350350
const queryParams = {
351351
receiver,
352352
pt: swapParams.tokenIn.address,
353-
token: swapParams.tokenIn.meta?.pendleCrossChainPTPaired,
353+
token: swapParams.tokenIn.metadata?.pendleCrossChainPTPaired,
354354
exactAmountType,
355355
exactAmount: amount,
356356
}

‎src/swapService/strategies/strategyPendleLP.ts‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ export class StrategyPendleLP {
4545
return (
4646
!isExactInRepay(swapParams) &&
4747
Boolean(
48-
swapParams.tokenIn.meta?.isPendleWrappedLP ||
49-
swapParams.tokenOut.meta?.isPendleWrappedLP,
48+
swapParams.tokenIn.metadata?.isPendleWrappedLP ||
49+
swapParams.tokenOut.metadata?.isPendleWrappedLP,
5050
)
5151
)
5252
}
@@ -66,15 +66,15 @@ export class StrategyPendleLP {
6666

6767
switch (swapParams.swapperMode) {
6868
case SwapperMode.EXACT_IN: {
69-
if (swapParams.tokenIn.meta?.isPendleWrappedLP) {
69+
if (swapParams.tokenIn.metadata?.isPendleWrappedLP) {
7070
result.quotes = await this.exactInFromWrappedLPToAny(swapParams)
7171
} else {
7272
result.quotes = await this.exactInFromAnyToWrappedLP(swapParams)
7373
}
7474
break
7575
}
7676
case SwapperMode.TARGET_DEBT: {
77-
if (swapParams.tokenIn.meta?.isPendleWrappedLP) {
77+
if (swapParams.tokenIn.metadata?.isPendleWrappedLP) {
7878
result.quotes = await this.targetDebtFromWrappedLPToAny(swapParams)
7979
} else {
8080
result.quotes = await this.targetDebtFromAnyToWrappedLP(swapParams)
@@ -103,11 +103,11 @@ export class StrategyPendleLP {
103103
swapParams.from,
104104
)
105105

106-
if (!swapParams.tokenIn.meta?.pendleMarket)
106+
if (!swapParams.tokenIn.metadata?.pendleMarket)
107107
throw new Error("Missing input pendle market")
108108
const tokenIn = findToken(
109109
swapParams.chainId,
110-
getAddress(swapParams.tokenIn.meta.pendleMarket),
110+
getAddress(swapParams.tokenIn.metadata.pendleMarket),
111111
)
112112

113113
if (!tokenIn) throw new Error("Inner token not found")
@@ -149,12 +149,12 @@ export class StrategyPendleLP {
149149
async exactInFromAnyToWrappedLP(
150150
swapParams: SwapParams,
151151
): Promise<SwapApiResponse[]> {
152-
if (!swapParams.tokenOut.meta?.pendleMarket)
152+
if (!swapParams.tokenOut.metadata?.pendleMarket)
153153
throw new Error("Missing output pendle market")
154154

155155
const tokenOut = findToken(
156156
swapParams.chainId,
157-
getAddress(swapParams.tokenOut.meta?.pendleMarket),
157+
getAddress(swapParams.tokenOut.metadata?.pendleMarket),
158158
)
159159
if (!tokenOut) throw new Error("Inner token not found")
160160
const innerSwapParams = {
@@ -211,11 +211,11 @@ export class StrategyPendleLP {
211211
async targetDebtFromWrappedLPToAny(
212212
swapParams: SwapParams,
213213
): Promise<SwapApiResponse[]> {
214-
if (!swapParams.tokenIn.meta?.pendleMarket)
214+
if (!swapParams.tokenIn.metadata?.pendleMarket)
215215
throw new Error("Missing input pendle market")
216216
const tokenIn = findToken(
217217
swapParams.chainId,
218-
getAddress(swapParams.tokenIn.meta.pendleMarket),
218+
getAddress(swapParams.tokenIn.metadata.pendleMarket),
219219
)
220220
if (!tokenIn) throw new Error("Inner token not found")
221221
const innerSwapParams = {
@@ -279,11 +279,11 @@ export class StrategyPendleLP {
279279
async targetDebtFromAnyToWrappedLP(
280280
swapParams: SwapParams,
281281
): Promise<SwapApiResponse[]> {
282-
if (!swapParams.tokenOut.meta?.pendleMarket)
282+
if (!swapParams.tokenOut.metadata?.pendleMarket)
283283
throw new Error("Missing output pendle market")
284284
const lpToken = findToken(
285285
swapParams.chainId,
286-
getAddress(swapParams.tokenOut.meta?.pendleMarket),
286+
getAddress(swapParams.tokenOut.metadata?.pendleMarket),
287287
)
288288
if (!lpToken) throw new Error("LP token in not found")
289289

‎src/swapService/utils.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -86,15 +86,15 @@ export function matchParams(
8686
}
8787
if (match.isPendlePT) {
8888
if (
89-
!swapParams.tokenIn.meta?.isPendlePT &&
90-
!swapParams.tokenOut.meta?.isPendlePT
89+
!swapParams.tokenIn.metadata?.isPendlePT &&
90+
!swapParams.tokenOut.metadata?.isPendlePT
9191
)
9292
return false
9393
}
9494
if (match.notPendlePT) {
9595
if (
96-
swapParams.tokenIn.meta?.isPendlePT ||
97-
swapParams.tokenOut.meta?.isPendlePT
96+
swapParams.tokenIn.metadata?.isPendlePT ||
97+
swapParams.tokenOut.metadata?.isPendlePT
9898
)
9999
return false
100100
}

0 commit comments

Comments
 (0)