From a5780fca36446b004398084a90718a00791d97ba Mon Sep 17 00:00:00 2001 From: JD Date: Mon, 7 Oct 2024 14:51:18 +0100 Subject: [PATCH 1/5] build: update new tokenlists --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 614be26..724d35b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,7 +9,7 @@ "version": "0.18.0", "license": "MIT", "dependencies": { - "@nsorcell/exp-tokenlist": "1.24.0", + "@nsorcell/exp-tokenlist": "1.25.0", "ethers": "5.7.2" }, "devDependencies": { @@ -3356,9 +3356,9 @@ } }, "node_modules/@nsorcell/exp-tokenlist": { - "version": "1.24.0", - "resolved": "https://registry.npmjs.org/@nsorcell/exp-tokenlist/-/exp-tokenlist-1.24.0.tgz", - "integrity": "sha512-Uvk02kp9l0FanDDSGYW3i8RfxwZrGjcymdVGonuR6YOyElBKZOVfdwQ+8wa/9AW6WDVw1tbyU2VBzd/L7Pgh7w==", + "version": "1.25.0", + "resolved": "https://registry.npmjs.org/@nsorcell/exp-tokenlist/-/exp-tokenlist-1.25.0.tgz", + "integrity": "sha512-IvnnGMyDRZojUZHOhn4l13HhOm5B4BNRBKxHHUWwBkzZvWG0JckaNKqLf9Nu/VGqIKNIPkDBXdYI0djWpZw97g==", "peerDependencies": { "typescript": "^5.0.0" } @@ -19264,9 +19264,9 @@ } }, "@nsorcell/exp-tokenlist": { - "version": "1.24.0", - "resolved": "https://registry.npmjs.org/@nsorcell/exp-tokenlist/-/exp-tokenlist-1.24.0.tgz", - "integrity": "sha512-Uvk02kp9l0FanDDSGYW3i8RfxwZrGjcymdVGonuR6YOyElBKZOVfdwQ+8wa/9AW6WDVw1tbyU2VBzd/L7Pgh7w==", + "version": "1.25.0", + "resolved": "https://registry.npmjs.org/@nsorcell/exp-tokenlist/-/exp-tokenlist-1.25.0.tgz", + "integrity": "sha512-IvnnGMyDRZojUZHOhn4l13HhOm5B4BNRBKxHHUWwBkzZvWG0JckaNKqLf9Nu/VGqIKNIPkDBXdYI0djWpZw97g==", "requires": {} }, "@octokit/auth-token": { diff --git a/package.json b/package.json index bd2ccbb..2c4e7c9 100644 --- a/package.json +++ b/package.json @@ -62,7 +62,7 @@ "access": "public" }, "dependencies": { - "@nsorcell/exp-tokenlist": "1.24.0", + "@nsorcell/exp-tokenlist": "1.25.0", "ethers": "5.7.2" } } From 1a9ae94ec382083eeae3c0e81e0c94707b950d01 Mon Sep 17 00:00:00 2001 From: JD Date: Mon, 7 Oct 2024 14:56:41 +0100 Subject: [PATCH 2/5] feat: add pendle component for hyeth --- src/providers/nav/hyeth.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/providers/nav/hyeth.ts b/src/providers/nav/hyeth.ts index 216b412..875f93a 100644 --- a/src/providers/nav/hyeth.ts +++ b/src/providers/nav/hyeth.ts @@ -44,6 +44,7 @@ export class HyEthNavProvider { "0x1c085195437738d73d75DC64bC5A3E098b7f93b1", "0x6ee2b5E19ECBa773a352E5B21415Dc419A700d1d", "0xf7906F274c174A52d444175729E3fa98f9bde285", + "0x7aa68E84bCD8d1B4C9e10B1e565DB993f68a3E09", ] return pendleTokens.some((pendleToken) => isSameAddress(pendleToken, token)) } From e1eb3fe2d10bf521f8e860f45228690aa37113e5 Mon Sep 17 00:00:00 2001 From: JD Date: Wed, 16 Oct 2024 10:51:16 +0100 Subject: [PATCH 3/5] feat: update flash mint hyeth v3 contract --- src/providers/nav/hyeth.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/providers/nav/hyeth.ts b/src/providers/nav/hyeth.ts index 875f93a..549e214 100644 --- a/src/providers/nav/hyeth.ts +++ b/src/providers/nav/hyeth.ts @@ -91,7 +91,7 @@ export class HyEthNavProvider { "function getPtToAssetRate(address market) public view returns (uint256)", ] const fmHyEth = new Contract( - "0xC290c371F5a36970AfF00bbffDBFADd81820109a", + "0xCb1eEA349f25288627f008C5e2a69b684bddDf49", abi, this.provider, ) From 0ad0d4bc5b92ee297ad4852c1e42c8e179f3c3d8 Mon Sep 17 00:00:00 2001 From: JD Date: Wed, 16 Oct 2024 10:54:26 +0100 Subject: [PATCH 4/5] build: add tokenlists --- package-lock.json | 30 +++++++++++++++--------------- package.json | 2 +- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/package-lock.json b/package-lock.json index 724d35b..0133abb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,7 +9,7 @@ "version": "0.18.0", "license": "MIT", "dependencies": { - "@nsorcell/exp-tokenlist": "1.25.0", + "@indexcoop/tokenlists": "3.1.0", "ethers": "5.7.2" }, "devDependencies": { @@ -2963,6 +2963,14 @@ "integrity": "sha512-trnsAYxU3xnS1gPHPyU961coFyLkh4gAD/0zQ5mymY4yOZ+CYvsPqUbOFSw0aDM4y0tV7tiFxL/1XfXPNC6IPg==", "dev": true }, + "node_modules/@indexcoop/tokenlists": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/@indexcoop/tokenlists/-/tokenlists-3.1.0.tgz", + "integrity": "sha512-0y1v2oDAygxOnabFGC3PJY1qyiX/Wu37DgGfzJ1RRUL5HucC76W4TTGM/wpWThfXvabscqFjUaLKf+Fy3WU+Xg==", + "peerDependencies": { + "typescript": "^5.0.0" + } + }, "node_modules/@istanbuljs/load-nyc-config": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz", @@ -3355,14 +3363,6 @@ "node": ">= 8" } }, - "node_modules/@nsorcell/exp-tokenlist": { - "version": "1.25.0", - "resolved": "https://registry.npmjs.org/@nsorcell/exp-tokenlist/-/exp-tokenlist-1.25.0.tgz", - "integrity": "sha512-IvnnGMyDRZojUZHOhn4l13HhOm5B4BNRBKxHHUWwBkzZvWG0JckaNKqLf9Nu/VGqIKNIPkDBXdYI0djWpZw97g==", - "peerDependencies": { - "typescript": "^5.0.0" - } - }, "node_modules/@octokit/auth-token": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-3.0.3.tgz", @@ -18951,6 +18951,12 @@ "integrity": "sha512-trnsAYxU3xnS1gPHPyU961coFyLkh4gAD/0zQ5mymY4yOZ+CYvsPqUbOFSw0aDM4y0tV7tiFxL/1XfXPNC6IPg==", "dev": true }, + "@indexcoop/tokenlists": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/@indexcoop/tokenlists/-/tokenlists-3.1.0.tgz", + "integrity": "sha512-0y1v2oDAygxOnabFGC3PJY1qyiX/Wu37DgGfzJ1RRUL5HucC76W4TTGM/wpWThfXvabscqFjUaLKf+Fy3WU+Xg==", + "requires": {} + }, "@istanbuljs/load-nyc-config": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz", @@ -19263,12 +19269,6 @@ "fastq": "^1.6.0" } }, - "@nsorcell/exp-tokenlist": { - "version": "1.25.0", - "resolved": "https://registry.npmjs.org/@nsorcell/exp-tokenlist/-/exp-tokenlist-1.25.0.tgz", - "integrity": "sha512-IvnnGMyDRZojUZHOhn4l13HhOm5B4BNRBKxHHUWwBkzZvWG0JckaNKqLf9Nu/VGqIKNIPkDBXdYI0djWpZw97g==", - "requires": {} - }, "@octokit/auth-token": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-3.0.3.tgz", diff --git a/package.json b/package.json index 2c4e7c9..2a941d8 100644 --- a/package.json +++ b/package.json @@ -62,7 +62,7 @@ "access": "public" }, "dependencies": { - "@nsorcell/exp-tokenlist": "1.25.0", + "@indexcoop/tokenlists": "3.1.0", "ethers": "5.7.2" } } From 21836fc1ade38f933a0351f2f1ec61d23278c1dc Mon Sep 17 00:00:00 2001 From: JD Date: Wed, 16 Oct 2024 10:56:16 +0100 Subject: [PATCH 5/5] update imports --- src/providers/analytics/provider.ts | 5 +---- src/providers/nav/fli-nav-provider.test.ts | 2 +- src/providers/nav/fli-nav-provider.ts | 2 +- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/providers/analytics/provider.ts b/src/providers/analytics/provider.ts index ec34d62..6d1ee45 100644 --- a/src/providers/analytics/provider.ts +++ b/src/providers/analytics/provider.ts @@ -1,8 +1,5 @@ import { utils } from "ethers" -import { - getChainProductTokenList, - isAddressEqual, -} from "@nsorcell/exp-tokenlist" +import { getChainProductTokenList, isAddressEqual } from "@indexcoop/tokenlists" import { CoinGeckoService, diff --git a/src/providers/nav/fli-nav-provider.test.ts b/src/providers/nav/fli-nav-provider.test.ts index 1b2c23d..e92963e 100644 --- a/src/providers/nav/fli-nav-provider.test.ts +++ b/src/providers/nav/fli-nav-provider.test.ts @@ -1,4 +1,4 @@ -import { getTokenByChainAndSymbol } from "@nsorcell/exp-tokenlist" +import { getTokenByChainAndSymbol } from "@indexcoop/tokenlists" import { buildAlchemyProvider, CoinGeckoService } from "../../utils" import { FliNavProvider } from "./fli-nav-provider" diff --git a/src/providers/nav/fli-nav-provider.ts b/src/providers/nav/fli-nav-provider.ts index dfacc58..0a5ffce 100644 --- a/src/providers/nav/fli-nav-provider.ts +++ b/src/providers/nav/fli-nav-provider.ts @@ -3,7 +3,7 @@ import { providers, utils } from "ethers" import { getTokenByChainAndAddress, getTokenByChainAndSymbol, -} from "@nsorcell/exp-tokenlist" +} from "@indexcoop/tokenlists" import { CoinGeckoService } from "utils/coingecko" import { getPositions } from "../../utils/positions"