From 4627b158f620d40fb04b35820988a48c38821000 Mon Sep 17 00:00:00 2001 From: sakulstra Date: Wed, 4 Sep 2024 13:02:07 +0200 Subject: [PATCH] fix: add viem to ui --- scripts/generateSafeCSV.ts | 2 +- scripts/verifyVerified.ts | 2 +- ui/package-lock.json | 111 ++++++++++-------- ui/package.json | 5 +- ui/src/app/page.tsx | 2 +- .../src/utils}/getAddresses.ts | 6 +- 6 files changed, 68 insertions(+), 60 deletions(-) rename {scripts/generator => ui/src/utils}/getAddresses.ts (86%) diff --git a/scripts/generateSafeCSV.ts b/scripts/generateSafeCSV.ts index 1ad064fa..8359ea0b 100644 --- a/scripts/generateSafeCSV.ts +++ b/scripts/generateSafeCSV.ts @@ -1,6 +1,6 @@ import {CHAIN_ID_CLIENT_MAP} from '@bgd-labs/js-utils'; import {writeFileSync} from 'fs'; -import {flattenedAddresses} from './generator/getAddresses'; +import {flattenedAddresses} from '../ui/src/utils/getAddresses'; const addresses = flattenedAddresses.filter( (item) => !CHAIN_ID_CLIENT_MAP[item.chainId].chain?.testnet, diff --git a/scripts/verifyVerified.ts b/scripts/verifyVerified.ts index 9bfe42aa..47d2672a 100644 --- a/scripts/verifyVerified.ts +++ b/scripts/verifyVerified.ts @@ -1,5 +1,5 @@ import {CHAIN_ID_CLIENT_MAP, ChainId} from '@bgd-labs/js-utils'; -import {ListItem, flattenedAddresses} from './generator/getAddresses'; +import {ListItem, flattenedAddresses} from '../ui/src/utils/getAddresses'; import {writeFileSync, readFileSync, existsSync, mkdirSync} from 'fs'; import {Address, zeroAddress} from 'viem'; diff --git a/ui/package-lock.json b/ui/package-lock.json index ffa2e0e9..ce5aab9d 100644 --- a/ui/package-lock.json +++ b/ui/package-lock.json @@ -15,7 +15,8 @@ "next": "14.2.7", "react": "^18", "react-dom": "^18", - "tailwind-merge": "^2.5.2" + "tailwind-merge": "^2.5.2", + "viem": "^2.21.1" }, "devDependencies": { "@types/node": "^22.5.1", @@ -42,8 +43,7 @@ "node_modules/@adraffy/ens-normalize": { "version": "1.10.0", "resolved": "https://registry.npmjs.org/@adraffy/ens-normalize/-/ens-normalize-1.10.0.tgz", - "integrity": "sha512-nA9XHtlAkYfJxY7bce8DcN7eKxWWCWkU+1GR9d+U6MbNpfwQp8TI7vqOsBsMcHoT4mBu2kypKoSKnghEzOOq5Q==", - "peer": true + "integrity": "sha512-nA9XHtlAkYfJxY7bce8DcN7eKxWWCWkU+1GR9d+U6MbNpfwQp8TI7vqOsBsMcHoT4mBu2kypKoSKnghEzOOq5Q==" }, "node_modules/@alloc/quick-lru": { "version": "5.2.0", @@ -815,22 +815,20 @@ } }, "node_modules/@noble/curves": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/@noble/curves/-/curves-1.2.0.tgz", - "integrity": "sha512-oYclrNgRaM9SsBUBVbb8M6DTV7ZHRTKugureoYEncY5c65HOmRzvSiTE3y5CYaPYJA/GVkrhXEoF0M3Ya9PMnw==", - "peer": true, + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/@noble/curves/-/curves-1.4.0.tgz", + "integrity": "sha512-p+4cb332SFCrReJkCYe8Xzm0OWi4Jji5jVdIZRL/PmacmDkFNw6MrrV+gGpiPxLHbV+zKFRywUWbaseT+tZRXg==", "dependencies": { - "@noble/hashes": "1.3.2" + "@noble/hashes": "1.4.0" }, "funding": { "url": "https://paulmillr.com/funding/" } }, "node_modules/@noble/hashes": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.3.2.tgz", - "integrity": "sha512-MVC8EAQp7MvEcm30KWENFjgR+Mkmf+D189XJTkFIlwohU5hcBbn1ZkKq7KVTi2Hme3PMGF390DaL52beVrIihQ==", - "peer": true, + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.4.0.tgz", + "integrity": "sha512-V1JJ1WTRUqHHrOSh597hURcMqVKVGL/ea3kv0gSnEdsEZ0/+VyPghM1lMNGc00z7CIQorSvbKpuJkxvuHbvdbg==", "engines": { "node": ">= 16" }, @@ -890,36 +888,33 @@ "dev": true }, "node_modules/@scure/base": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/@scure/base/-/base-1.1.5.tgz", - "integrity": "sha512-Brj9FiG2W1MRQSTB212YVPRrcbjkv48FoZi/u4l/zds/ieRrqsh7aUf6CLwkAq61oKXr/ZlTzlY66gLIj3TFTQ==", - "peer": true, + "version": "1.1.8", + "resolved": "https://registry.npmjs.org/@scure/base/-/base-1.1.8.tgz", + "integrity": "sha512-6CyAclxj3Nb0XT7GHK6K4zK6k2xJm6E4Ft0Ohjt4WgegiFUHEtFb2CGzmPmGBwoIhrLsqNLYfLr04Y1GePrzZg==", "funding": { "url": "https://paulmillr.com/funding/" } }, "node_modules/@scure/bip32": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/@scure/bip32/-/bip32-1.3.2.tgz", - "integrity": "sha512-N1ZhksgwD3OBlwTv3R6KFEcPojl/W4ElJOeCZdi+vuI5QmTFwLq3OFf2zd2ROpKvxFdgZ6hUpb0dx9bVNEwYCA==", - "peer": true, + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/@scure/bip32/-/bip32-1.4.0.tgz", + "integrity": "sha512-sVUpc0Vq3tXCkDGYVWGIZTRfnvu8LoTDaev7vbwh0omSvVORONr960MQWdKqJDCReIEmTj3PAr73O3aoxz7OPg==", "dependencies": { - "@noble/curves": "~1.2.0", - "@noble/hashes": "~1.3.2", - "@scure/base": "~1.1.2" + "@noble/curves": "~1.4.0", + "@noble/hashes": "~1.4.0", + "@scure/base": "~1.1.6" }, "funding": { "url": "https://paulmillr.com/funding/" } }, "node_modules/@scure/bip39": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/@scure/bip39/-/bip39-1.2.1.tgz", - "integrity": "sha512-Z3/Fsz1yr904dduJD0NpiyRHhRYHdcnyh73FZWiV+/qhWi83wNJ3NWolYqCEN+ZWsUz2TWwajJggcRE9r1zUYg==", - "peer": true, + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/@scure/bip39/-/bip39-1.3.0.tgz", + "integrity": "sha512-disdg7gHuTDZtY+ZdkmLpPCk7fxZSu3gBiEGuoC1XYxv9cGx3Z6cpTggCgW6odSOOIXCiDjuGejW+aJKCY/pIQ==", "dependencies": { - "@noble/hashes": "~1.3.0", - "@scure/base": "~1.1.0" + "@noble/hashes": "~1.4.0", + "@scure/base": "~1.1.6" }, "funding": { "url": "https://paulmillr.com/funding/" @@ -1121,10 +1116,9 @@ "dev": true }, "node_modules/abitype": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/abitype/-/abitype-1.0.0.tgz", - "integrity": "sha512-NMeMah//6bJ56H5XRj8QCV4AwuW6hB6zqz2LnhhLdcWVQOsXki6/Pn3APeqxCma62nXIcmZWdu1DlHWS74umVQ==", - "peer": true, + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/abitype/-/abitype-1.0.5.tgz", + "integrity": "sha512-YzDhti7cjlfaBhHutMaboYB21Ha3rXR9QTkNJFzYC4kC8YclaiwPBBBJY8ejFdu2wnJeZCVZSMlQJ7fi8S6hsw==", "funding": { "url": "https://github.com/sponsors/wevm" }, @@ -3445,16 +3439,15 @@ "dev": true }, "node_modules/isows": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/isows/-/isows-1.0.3.tgz", - "integrity": "sha512-2cKei4vlmg2cxEjm3wVSqn8pcoRF/LX/wpifuuNquFO4SQmPwarClT+SUCA2lt+l581tTeZIPIZuIDo2jWN1fg==", + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/isows/-/isows-1.0.4.tgz", + "integrity": "sha512-hEzjY+x9u9hPmBom9IIAqdJCwNLax+xrPb51vEPpERoFlIxgmZcHzsT5jKG06nvInKOBGvReAVz80Umed5CczQ==", "funding": [ { "type": "github", "url": "https://github.com/sponsors/wagmi-dev" } ], - "peer": true, "peerDependencies": { "ws": "*" } @@ -5331,25 +5324,25 @@ "dev": true }, "node_modules/viem": { - "version": "2.7.6", - "resolved": "https://registry.npmjs.org/viem/-/viem-2.7.6.tgz", - "integrity": "sha512-43TF0VYcTeNef9dax1/BhqlRLXpAo6HAiQ68hrJ8XRhDOou73nHZEjeFl8Eai4UFFodKhu+PbRUFzuuoixOUfg==", + "version": "2.21.1", + "resolved": "https://registry.npmjs.org/viem/-/viem-2.21.1.tgz", + "integrity": "sha512-nlIc2LLS6aqkngULS9UJ2Sg3nHKAgF9bbpDUwjUoAUBijd69mrCWPBXQ8jmbzcx12uZUfd9Nc//CHgSVZiMwyg==", "funding": [ { "type": "github", "url": "https://github.com/sponsors/wevm" } ], - "peer": true, "dependencies": { "@adraffy/ens-normalize": "1.10.0", - "@noble/curves": "1.2.0", - "@noble/hashes": "1.3.2", - "@scure/bip32": "1.3.2", - "@scure/bip39": "1.2.1", - "abitype": "1.0.0", - "isows": "1.0.3", - "ws": "8.13.0" + "@noble/curves": "1.4.0", + "@noble/hashes": "1.4.0", + "@scure/bip32": "1.4.0", + "@scure/bip39": "1.3.0", + "abitype": "1.0.5", + "isows": "1.0.4", + "webauthn-p256": "0.0.5", + "ws": "8.17.1" }, "peerDependencies": { "typescript": ">=5.0.4" @@ -5360,6 +5353,21 @@ } } }, + "node_modules/webauthn-p256": { + "version": "0.0.5", + "resolved": "https://registry.npmjs.org/webauthn-p256/-/webauthn-p256-0.0.5.tgz", + "integrity": "sha512-drMGNWKdaixZNobeORVIqq7k5DsRC9FnG201K2QjeOoQLmtSDaSsVZdkg6n5jUALJKcAG++zBPJXmv6hy0nWFg==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/wevm" + } + ], + "dependencies": { + "@noble/curves": "^1.4.0", + "@noble/hashes": "^1.4.0" + } + }, "node_modules/which": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", @@ -5552,10 +5560,9 @@ "dev": true }, "node_modules/ws": { - "version": "8.13.0", - "resolved": "https://registry.npmjs.org/ws/-/ws-8.13.0.tgz", - "integrity": "sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==", - "peer": true, + "version": "8.17.1", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.17.1.tgz", + "integrity": "sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ==", "engines": { "node": ">=10.0.0" }, diff --git a/ui/package.json b/ui/package.json index 3f8ce7a4..6b9d420a 100644 --- a/ui/package.json +++ b/ui/package.json @@ -9,14 +9,15 @@ "lint": "next lint" }, "dependencies": { - "@bgd-labs/react-web3-icons": "^1.4.7", "@bgd-labs/js-utils": "^1.4.2", + "@bgd-labs/react-web3-icons": "^1.4.7", "@leeoniya/ufuzzy": "^1.0.14", "clsx": "^2.1.1", "next": "14.2.7", "react": "^18", "react-dom": "^18", - "tailwind-merge": "^2.5.2" + "tailwind-merge": "^2.5.2", + "viem": "^2.21.1" }, "devDependencies": { "@types/node": "^22.5.1", diff --git a/ui/src/app/page.tsx b/ui/src/app/page.tsx index 2ec5b84d..e3945d3f 100644 --- a/ui/src/app/page.tsx +++ b/ui/src/app/page.tsx @@ -1,5 +1,5 @@ import { Suspense } from 'react'; -import { flattenedAddresses } from '../../../scripts/generator/getAddresses'; +import { flattenedAddresses } from '../utils/getAddresses'; import { CHAIN_ID_CLIENT_MAP } from '@bgd-labs/js-utils'; import Image from 'next/image'; import { Search } from '@/components/Search'; diff --git a/scripts/generator/getAddresses.ts b/ui/src/utils/getAddresses.ts similarity index 86% rename from scripts/generator/getAddresses.ts rename to ui/src/utils/getAddresses.ts index 530ea081..c7acfd0a 100644 --- a/scripts/generator/getAddresses.ts +++ b/ui/src/utils/getAddresses.ts @@ -1,6 +1,6 @@ -import * as addressBook from '../../src/ts/AaveAddressBook'; -import {Address, isAddress} from 'viem'; -import {CHAIN_ID_CLIENT_MAP} from '@bgd-labs/js-utils'; +import * as addressBook from '../../../src/ts/AaveAddressBook'; +import { isAddress } from 'viem'; +import { CHAIN_ID_CLIENT_MAP } from '@bgd-labs/js-utils'; export type ListItem = { path: string[];