From d6b4ac20f7380618a2c677affcac24462b7348c5 Mon Sep 17 00:00:00 2001 From: yuli-ferna Date: Fri, 21 Jun 2024 08:48:07 -0400 Subject: [PATCH 1/9] Advances --- apps/connect/package-lock.json | 8 ++++---- apps/connect/package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/apps/connect/package-lock.json b/apps/connect/package-lock.json index 82852625e..e3ac763ae 100644 --- a/apps/connect/package-lock.json +++ b/apps/connect/package-lock.json @@ -24,7 +24,7 @@ "@opentelemetry/resources": "^1.23.0", "@opentelemetry/sdk-trace-web": "^1.23.0", "@tanstack/react-query": "^5.14.2", - "@wormhole-foundation/wormhole-connect": "0.3.14-beta.0-development", + "@wormhole-foundation/wormhole-connect": "^0.3.14-beta.1-development", "dompurify": "^3.0.6", "mixpanel-browser": "^2.49.0", "react": "^18.2.0", @@ -16280,9 +16280,9 @@ } }, "node_modules/@wormhole-foundation/wormhole-connect": { - "version": "0.3.14-beta.0-development", - "resolved": "https://registry.npmjs.org/@wormhole-foundation/wormhole-connect/-/wormhole-connect-0.3.14-beta.0-development.tgz", - "integrity": "sha512-P9eTZhdALC+i7FkYsPXBAJAQdBdJ6D0X/ohIJcNOChJyz/e0mpQe7bcDy/CvUZZRFx8EvgGO5yLD6epcPjkrHw==", + "version": "0.3.14-beta.1-development", + "resolved": "https://registry.npmjs.org/@wormhole-foundation/wormhole-connect/-/wormhole-connect-0.3.14-beta.1-development.tgz", + "integrity": "sha512-FiczrzRyQu96CqQcRSoO2EQiBRZ5fInZwr2kYjcskb5hoPtY+HS95Vg+XS6cuktKDqAAqPsN6KYjaikvzWDctA==", "dependencies": { "@certusone/wormhole-sdk": "^0.10.10", "@coral-xyz/anchor": "^0.29.0", diff --git a/apps/connect/package.json b/apps/connect/package.json index 250a043ad..8b247a362 100644 --- a/apps/connect/package.json +++ b/apps/connect/package.json @@ -31,7 +31,7 @@ "@opentelemetry/resources": "^1.23.0", "@opentelemetry/sdk-trace-web": "^1.23.0", "@tanstack/react-query": "^5.14.2", - "@wormhole-foundation/wormhole-connect": "0.3.14-beta.0-development", + "@wormhole-foundation/wormhole-connect": "^0.3.14-beta.1-development", "dompurify": "^3.0.6", "mixpanel-browser": "^2.49.0", "react": "^18.2.0", From ba4ffc773b09ac07c3311dee8baf9dc935373e28 Mon Sep 17 00:00:00 2001 From: Sebastian Scatularo Date: Mon, 24 Jun 2024 17:03:39 -0300 Subject: [PATCH 2/9] add ETHFI ntt config --- apps/connect/vite.token-bridge.config.ts | 56 ++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/apps/connect/vite.token-bridge.config.ts b/apps/connect/vite.token-bridge.config.ts index ea1fdbe2e..c3d78d7ea 100644 --- a/apps/connect/vite.token-bridge.config.ts +++ b/apps/connect/vite.token-bridge.config.ts @@ -176,6 +176,36 @@ const TESTNET_TOKEN_CONFIG: WormholeConnectConfig = { const MAINNET_TOKEN_CONFIG: WormholeConnectConfig = { tokensConfig: { + "$ETHFIethereum": { + key: "$ETHFIethereum", + symbol: "$ETHFI", + nativeChain: 'ethereum', + tokenId: { + chain: 'ethereum', + address: '0x7189fb5B6504bbfF6a852B13B7B82a3c118fDc27', + }, + icon: "https://assets.coingecko.com/coins/images/35958/standard/etherfi.jpeg?1710254562", + coinGeckoId: "ether-fi", + decimals: { + default: 8, + Ethereum: 18 + }, + }, + "$ETHFIarbitrum": { + key: "$ETHFIarbitrum", + symbol: "$ETHFI", + nativeChain: 'arbitrum', + tokenId: { + chain: 'ethereum', + address: '0xfe0c30065b384f05761f15d0cc899d4f9f9cc0eb', + }, + icon: "https://assets.coingecko.com/coins/images/35958/standard/etherfi.jpeg?1710254562", + coinGeckoId: "ether-fi", + decimals: { + default: 8, + Ethereum: 18 + }, + }, WOM: { key: "WOM", symbol: "WOM", @@ -526,6 +556,32 @@ const MAINNET_TOKEN_CONFIG: WormholeConnectConfig = { ], } ] + }, + "$ETHFI": { + nttManagers: [ + { + chainName: 'ethereum', + address: '0x344169Cc4abE9459e77bD99D13AA8589b55b6174', + tokenKey: '$ETHFIethereum', + transceivers: [ + { + address: '0x3bf4AebcaD920447c5fdD6529239Ab3922ce2186', + type: 'wormhole', + }, + ], + }, + { + chainName: 'arbitrum', + address: '0x90A82462258F79780498151EF6f663f1D4BE4E3b', + tokenKey: '$ETHFIarbitrum', + transceivers: [ + { + address: '0x4386e36B96D437b0F1C04A35E572C10C6627d88a', + type: 'wormhole', + }, + ], + } + ] } }, From 777c356dfe90a26eebc8bb342254cb6062e66a96 Mon Sep 17 00:00:00 2001 From: Sebastian Scatularo Date: Mon, 24 Jun 2024 19:16:40 -0300 Subject: [PATCH 3/9] fix ETHFI config --- apps/connect/src/App.tsx | 5 ++++- apps/connect/vite.token-bridge.config.ts | 12 ++++++------ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/apps/connect/src/App.tsx b/apps/connect/src/App.tsx index 5f3ea5109..cd1dffb7f 100644 --- a/apps/connect/src/App.tsx +++ b/apps/connect/src/App.tsx @@ -2,7 +2,7 @@ import type { ChainName, WormholeConnectConfig, } from "@wormhole-foundation/wormhole-connect"; -import { useMemo } from "react"; +import { useEffect, useMemo } from "react"; import customTheme from "./theme/connect"; import NavBar from "./components/atoms/NavBar"; import NewsBar from "./components/atoms/NewsBar"; @@ -33,6 +33,9 @@ export default function Root() { [txHash, sourceChain, targetChain] ); const messages = Object.values(messageConfig); + useEffect(() => { + localStorage.setItem('Connect Config', JSON.stringify(config, null, 2)); + }, [config]); return ( <>
diff --git a/apps/connect/vite.token-bridge.config.ts b/apps/connect/vite.token-bridge.config.ts index c3d78d7ea..ee26e0ef4 100644 --- a/apps/connect/vite.token-bridge.config.ts +++ b/apps/connect/vite.token-bridge.config.ts @@ -182,12 +182,12 @@ const MAINNET_TOKEN_CONFIG: WormholeConnectConfig = { nativeChain: 'ethereum', tokenId: { chain: 'ethereum', - address: '0x7189fb5B6504bbfF6a852B13B7B82a3c118fDc27', + address: '0xfe0c30065b384f05761f15d0cc899d4f9f9cc0eb', }, icon: "https://assets.coingecko.com/coins/images/35958/standard/etherfi.jpeg?1710254562", coinGeckoId: "ether-fi", decimals: { - default: 8, + default: 18, Ethereum: 18 }, }, @@ -196,14 +196,14 @@ const MAINNET_TOKEN_CONFIG: WormholeConnectConfig = { symbol: "$ETHFI", nativeChain: 'arbitrum', tokenId: { - chain: 'ethereum', - address: '0xfe0c30065b384f05761f15d0cc899d4f9f9cc0eb', + chain: 'arbitrum', + address: '0x7189fb5B6504bbfF6a852B13B7B82a3c118fDc27', }, icon: "https://assets.coingecko.com/coins/images/35958/standard/etherfi.jpeg?1710254562", coinGeckoId: "ether-fi", decimals: { - default: 8, - Ethereum: 18 + default: 18, + Arbitrum: 18 }, }, WOM: { From 2a07d4b9033156e17992f63df8d226ecc34c96b7 Mon Sep 17 00:00:00 2001 From: Sebastian Scatularo Date: Mon, 24 Jun 2024 19:29:53 -0300 Subject: [PATCH 4/9] update ETHFI token symbol config --- apps/connect/vite.token-bridge.config.ts | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/apps/connect/vite.token-bridge.config.ts b/apps/connect/vite.token-bridge.config.ts index ee26e0ef4..129d6dd9f 100644 --- a/apps/connect/vite.token-bridge.config.ts +++ b/apps/connect/vite.token-bridge.config.ts @@ -176,9 +176,9 @@ const TESTNET_TOKEN_CONFIG: WormholeConnectConfig = { const MAINNET_TOKEN_CONFIG: WormholeConnectConfig = { tokensConfig: { - "$ETHFIethereum": { - key: "$ETHFIethereum", - symbol: "$ETHFI", + "ETHFIethereum": { + key: "ETHFIethereum", + symbol: "ETHFI", nativeChain: 'ethereum', tokenId: { chain: 'ethereum', @@ -191,9 +191,9 @@ const MAINNET_TOKEN_CONFIG: WormholeConnectConfig = { Ethereum: 18 }, }, - "$ETHFIarbitrum": { + "ETHFIarbitrum": { key: "$ETHFIarbitrum", - symbol: "$ETHFI", + symbol: "ETHFI", nativeChain: 'arbitrum', tokenId: { chain: 'arbitrum', @@ -557,12 +557,12 @@ const MAINNET_TOKEN_CONFIG: WormholeConnectConfig = { } ] }, - "$ETHFI": { + "ETHFI": { nttManagers: [ { chainName: 'ethereum', address: '0x344169Cc4abE9459e77bD99D13AA8589b55b6174', - tokenKey: '$ETHFIethereum', + tokenKey: 'ETHFIethereum', transceivers: [ { address: '0x3bf4AebcaD920447c5fdD6529239Ab3922ce2186', @@ -573,7 +573,7 @@ const MAINNET_TOKEN_CONFIG: WormholeConnectConfig = { { chainName: 'arbitrum', address: '0x90A82462258F79780498151EF6f663f1D4BE4E3b', - tokenKey: '$ETHFIarbitrum', + tokenKey: 'ETHFIarbitrum', transceivers: [ { address: '0x4386e36B96D437b0F1C04A35E572C10C6627d88a', From 636446da92f4eacbe685d2125a155ddff01bd7e3 Mon Sep 17 00:00:00 2001 From: yuli-ferna Date: Tue, 25 Jun 2024 15:52:02 -0400 Subject: [PATCH 5/9] New version --- apps/connect/package-lock.json | 8 ++++---- apps/connect/package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/apps/connect/package-lock.json b/apps/connect/package-lock.json index e3ac763ae..f10643ca5 100644 --- a/apps/connect/package-lock.json +++ b/apps/connect/package-lock.json @@ -24,7 +24,7 @@ "@opentelemetry/resources": "^1.23.0", "@opentelemetry/sdk-trace-web": "^1.23.0", "@tanstack/react-query": "^5.14.2", - "@wormhole-foundation/wormhole-connect": "^0.3.14-beta.1-development", + "@wormhole-foundation/wormhole-connect": "^0.3.14", "dompurify": "^3.0.6", "mixpanel-browser": "^2.49.0", "react": "^18.2.0", @@ -16280,9 +16280,9 @@ } }, "node_modules/@wormhole-foundation/wormhole-connect": { - "version": "0.3.14-beta.1-development", - "resolved": "https://registry.npmjs.org/@wormhole-foundation/wormhole-connect/-/wormhole-connect-0.3.14-beta.1-development.tgz", - "integrity": "sha512-FiczrzRyQu96CqQcRSoO2EQiBRZ5fInZwr2kYjcskb5hoPtY+HS95Vg+XS6cuktKDqAAqPsN6KYjaikvzWDctA==", + "version": "0.3.14", + "resolved": "https://registry.npmjs.org/@wormhole-foundation/wormhole-connect/-/wormhole-connect-0.3.14.tgz", + "integrity": "sha512-MJPKg7SgJFwuFQ2sBB5e7k/GMBFihcJIdRd0AdLk9IMMfM7Wm3OTpEDygh+cC7foXrSHfk7CcR//s2KmMdJgIA==", "dependencies": { "@certusone/wormhole-sdk": "^0.10.10", "@coral-xyz/anchor": "^0.29.0", diff --git a/apps/connect/package.json b/apps/connect/package.json index 8b247a362..8ea364441 100644 --- a/apps/connect/package.json +++ b/apps/connect/package.json @@ -31,7 +31,7 @@ "@opentelemetry/resources": "^1.23.0", "@opentelemetry/sdk-trace-web": "^1.23.0", "@tanstack/react-query": "^5.14.2", - "@wormhole-foundation/wormhole-connect": "^0.3.14-beta.1-development", + "@wormhole-foundation/wormhole-connect": "^0.3.14", "dompurify": "^3.0.6", "mixpanel-browser": "^2.49.0", "react": "^18.2.0", From da289623b88ec567165819c6a1b79253c10238b1 Mon Sep 17 00:00:00 2001 From: yuli-ferna Date: Tue, 25 Jun 2024 16:39:32 -0400 Subject: [PATCH 6/9] Update connect --- apps/connect/package-lock.json | 8 ++++---- apps/connect/package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/apps/connect/package-lock.json b/apps/connect/package-lock.json index f10643ca5..e6caa5e9d 100644 --- a/apps/connect/package-lock.json +++ b/apps/connect/package-lock.json @@ -24,7 +24,7 @@ "@opentelemetry/resources": "^1.23.0", "@opentelemetry/sdk-trace-web": "^1.23.0", "@tanstack/react-query": "^5.14.2", - "@wormhole-foundation/wormhole-connect": "^0.3.14", + "@wormhole-foundation/wormhole-connect": "^0.3.15-beta.1-development", "dompurify": "^3.0.6", "mixpanel-browser": "^2.49.0", "react": "^18.2.0", @@ -16280,9 +16280,9 @@ } }, "node_modules/@wormhole-foundation/wormhole-connect": { - "version": "0.3.14", - "resolved": "https://registry.npmjs.org/@wormhole-foundation/wormhole-connect/-/wormhole-connect-0.3.14.tgz", - "integrity": "sha512-MJPKg7SgJFwuFQ2sBB5e7k/GMBFihcJIdRd0AdLk9IMMfM7Wm3OTpEDygh+cC7foXrSHfk7CcR//s2KmMdJgIA==", + "version": "0.3.15-beta.1-development", + "resolved": "https://registry.npmjs.org/@wormhole-foundation/wormhole-connect/-/wormhole-connect-0.3.15-beta.1-development.tgz", + "integrity": "sha512-xA5Xtt+8cvzlgmkikBIBInE9qNLM3AS6mUfm+REST27f/vbyES9ibDjSxOw6cMIoLmW4UzICPYcxQgVfCOzyHA==", "dependencies": { "@certusone/wormhole-sdk": "^0.10.10", "@coral-xyz/anchor": "^0.29.0", diff --git a/apps/connect/package.json b/apps/connect/package.json index 8ea364441..74c3b2283 100644 --- a/apps/connect/package.json +++ b/apps/connect/package.json @@ -31,7 +31,7 @@ "@opentelemetry/resources": "^1.23.0", "@opentelemetry/sdk-trace-web": "^1.23.0", "@tanstack/react-query": "^5.14.2", - "@wormhole-foundation/wormhole-connect": "^0.3.14", + "@wormhole-foundation/wormhole-connect": "^0.3.15-beta.1-development", "dompurify": "^3.0.6", "mixpanel-browser": "^2.49.0", "react": "^18.2.0", From 4cc9c96ab9ee57b9d6b39f858152747136b80868 Mon Sep 17 00:00:00 2001 From: yuli-ferna Date: Wed, 26 Jun 2024 11:46:42 -0400 Subject: [PATCH 7/9] update to 0.3.15 --- apps/connect/package-lock.json | 8 ++++---- apps/connect/package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/apps/connect/package-lock.json b/apps/connect/package-lock.json index e6caa5e9d..96c5ce470 100644 --- a/apps/connect/package-lock.json +++ b/apps/connect/package-lock.json @@ -24,7 +24,7 @@ "@opentelemetry/resources": "^1.23.0", "@opentelemetry/sdk-trace-web": "^1.23.0", "@tanstack/react-query": "^5.14.2", - "@wormhole-foundation/wormhole-connect": "^0.3.15-beta.1-development", + "@wormhole-foundation/wormhole-connect": "^0.3.15", "dompurify": "^3.0.6", "mixpanel-browser": "^2.49.0", "react": "^18.2.0", @@ -16280,9 +16280,9 @@ } }, "node_modules/@wormhole-foundation/wormhole-connect": { - "version": "0.3.15-beta.1-development", - "resolved": "https://registry.npmjs.org/@wormhole-foundation/wormhole-connect/-/wormhole-connect-0.3.15-beta.1-development.tgz", - "integrity": "sha512-xA5Xtt+8cvzlgmkikBIBInE9qNLM3AS6mUfm+REST27f/vbyES9ibDjSxOw6cMIoLmW4UzICPYcxQgVfCOzyHA==", + "version": "0.3.15", + "resolved": "https://registry.npmjs.org/@wormhole-foundation/wormhole-connect/-/wormhole-connect-0.3.15.tgz", + "integrity": "sha512-oMn5AZkS722niE6DX+ufvp7t7XvJXSap4IWnGG+2dxVGlwye69m/euBK1KWp1LkBxpnsvlCWd8yBOtoyFx0qYQ==", "dependencies": { "@certusone/wormhole-sdk": "^0.10.10", "@coral-xyz/anchor": "^0.29.0", diff --git a/apps/connect/package.json b/apps/connect/package.json index 74c3b2283..1be7f6a94 100644 --- a/apps/connect/package.json +++ b/apps/connect/package.json @@ -31,7 +31,7 @@ "@opentelemetry/resources": "^1.23.0", "@opentelemetry/sdk-trace-web": "^1.23.0", "@tanstack/react-query": "^5.14.2", - "@wormhole-foundation/wormhole-connect": "^0.3.15-beta.1-development", + "@wormhole-foundation/wormhole-connect": "^0.3.15", "dompurify": "^3.0.6", "mixpanel-browser": "^2.49.0", "react": "^18.2.0", From 8ddad3fe08de70b9ab77ff206eb9bd9f36c1e93a Mon Sep 17 00:00:00 2001 From: yuli-ferna Date: Wed, 26 Jun 2024 12:09:24 -0400 Subject: [PATCH 8/9] remove ethfi token --- apps/connect/vite.token-bridge.config.ts | 56 ------------------------ 1 file changed, 56 deletions(-) diff --git a/apps/connect/vite.token-bridge.config.ts b/apps/connect/vite.token-bridge.config.ts index a7bc3dcab..539f13c33 100644 --- a/apps/connect/vite.token-bridge.config.ts +++ b/apps/connect/vite.token-bridge.config.ts @@ -176,36 +176,6 @@ const TESTNET_TOKEN_CONFIG: WormholeConnectConfig = { const MAINNET_TOKEN_CONFIG: WormholeConnectConfig = { tokensConfig: { - "ETHFIethereum": { - key: "ETHFIethereum", - symbol: "ETHFI", - nativeChain: 'ethereum', - tokenId: { - chain: 'ethereum', - address: '0xfe0c30065b384f05761f15d0cc899d4f9f9cc0eb', - }, - icon: "https://assets.coingecko.com/coins/images/35958/standard/etherfi.jpeg?1710254562", - coinGeckoId: "ether-fi", - decimals: { - default: 18, - Ethereum: 18 - }, - }, - "ETHFIarbitrum": { - key: "$ETHFIarbitrum", - symbol: "ETHFI", - nativeChain: 'arbitrum', - tokenId: { - chain: 'arbitrum', - address: '0x7189fb5B6504bbfF6a852B13B7B82a3c118fDc27', - }, - icon: "https://assets.coingecko.com/coins/images/35958/standard/etherfi.jpeg?1710254562", - coinGeckoId: "ether-fi", - decimals: { - default: 18, - Arbitrum: 18 - }, - }, WOM: { key: "WOM", symbol: "WOM", @@ -557,32 +527,6 @@ const MAINNET_TOKEN_CONFIG: WormholeConnectConfig = { } ] }, - "ETHFI": { - nttManagers: [ - { - chainName: 'ethereum', - address: '0x344169Cc4abE9459e77bD99D13AA8589b55b6174', - tokenKey: 'ETHFIethereum', - transceivers: [ - { - address: '0x3bf4AebcaD920447c5fdD6529239Ab3922ce2186', - type: 'wormhole', - }, - ], - }, - { - chainName: 'arbitrum', - address: '0x90A82462258F79780498151EF6f663f1D4BE4E3b', - tokenKey: 'ETHFIarbitrum', - transceivers: [ - { - address: '0x4386e36B96D437b0F1C04A35E572C10C6627d88a', - type: 'wormhole', - }, - ], - } - ] - } }, } From a01f637394d58475d9e070c751f0fb1dfcda5ea5 Mon Sep 17 00:00:00 2001 From: yuli-ferna Date: Wed, 26 Jun 2024 12:16:09 -0400 Subject: [PATCH 9/9] fix prettier --- apps/connect/src/App.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/connect/src/App.tsx b/apps/connect/src/App.tsx index 143f52b62..0ea2918d5 100644 --- a/apps/connect/src/App.tsx +++ b/apps/connect/src/App.tsx @@ -45,8 +45,8 @@ export default function Root() { const messages = Object.values(messageConfig); useEffect(() => { - localStorage.setItem('Connect Config', JSON.stringify(config, null, 2)); - }, [config]); + localStorage.setItem("Connect Config", JSON.stringify(config, null, 2)); + }, [config]); return ( <> {versions.map(({ appName, version }, idx) => (