From 2181ecbacbb54712ff2bc67eaa09a603d5a1b6bd Mon Sep 17 00:00:00 2001 From: Antonio Ventilii Date: Thu, 17 Apr 2025 17:33:59 +0200 Subject: [PATCH 1/4] feat(frontend): add EURC token group data --- .../src/env/networks/networks.icrc.env.ts | 4 +++- .../src/env/tokens/groups/groups.eurc.env.ts | 17 +++++++++++++++++ .../env/tokens/tokens-erc20/tokens.eurc.env.ts | 7 +++++-- .../env/tokens/tokens-spl/tokens.eurc.env.ts | 4 +++- 4 files changed, 28 insertions(+), 4 deletions(-) create mode 100644 src/frontend/src/env/tokens/groups/groups.eurc.env.ts diff --git a/src/frontend/src/env/networks/networks.icrc.env.ts b/src/frontend/src/env/networks/networks.icrc.env.ts index 6d6110cc435..00845d54bb5 100644 --- a/src/frontend/src/env/networks/networks.icrc.env.ts +++ b/src/frontend/src/env/networks/networks.icrc.env.ts @@ -4,6 +4,7 @@ import { CKETH_EXPLORER_URL, CKETH_SEPOLIA_EXPLORER_URL } from '$env/explorers.env'; +import { EURC_TOKEN_GROUP } from '$env/tokens/groups/groups.eurc.env'; import { EURC_TOKEN } from '$env/tokens/tokens-erc20/tokens.eurc.env'; import { LINK_TOKEN, SEPOLIA_LINK_TOKEN } from '$env/tokens/tokens-erc20/tokens.link.env'; import { OCT_TOKEN } from '$env/tokens/tokens-erc20/tokens.oct.env'; @@ -375,7 +376,8 @@ const CKEURC_IC_DATA: IcCkInterface | undefined = nonNullish(CKERC20_PRODUCTION_ ? { ...CKERC20_PRODUCTION_DATA.ckEURC, position: 10, - twinToken: EURC_TOKEN + twinToken: EURC_TOKEN, + groupData: EURC_TOKEN_GROUP } : undefined; diff --git a/src/frontend/src/env/tokens/groups/groups.eurc.env.ts b/src/frontend/src/env/tokens/groups/groups.eurc.env.ts new file mode 100644 index 00000000000..29fe49e0981 --- /dev/null +++ b/src/frontend/src/env/tokens/groups/groups.eurc.env.ts @@ -0,0 +1,17 @@ +import eurc from '$eth/assets/eurc.svg'; + +const EURC_TOKEN_GROUP_SYMBOL = 'EURC'; + +export const EURC_TOKEN_GROUP = { + icon: eurc, + name: 'Euro Coin', + symbol: EURC_TOKEN_GROUP_SYMBOL +}; + +const SEPOLIA_EURC_TOKEN_GROUP_SYMBOL = 'SepoliaEURC'; + +export const SEPOLIA_EURC_TOKEN_GROUP = { + icon: eurc, + name: 'EURC', + symbol: SEPOLIA_EURC_TOKEN_GROUP_SYMBOL +}; diff --git a/src/frontend/src/env/tokens/tokens-erc20/tokens.eurc.env.ts b/src/frontend/src/env/tokens/tokens-erc20/tokens.eurc.env.ts index ba8b031b183..1333102f606 100644 --- a/src/frontend/src/env/tokens/tokens-erc20/tokens.eurc.env.ts +++ b/src/frontend/src/env/tokens/tokens-erc20/tokens.eurc.env.ts @@ -1,4 +1,5 @@ import { ETHEREUM_NETWORK, SEPOLIA_NETWORK } from '$env/networks/networks.eth.env'; +import { EURC_TOKEN_GROUP, SEPOLIA_EURC_TOKEN_GROUP } from '$env/tokens/groups/groups.eurc.env'; import eurc from '$eth/assets/eurc.svg'; import type { RequiredErc20Token } from '$eth/types/erc20'; import type { TokenId } from '$lib/types/token'; @@ -21,7 +22,8 @@ export const EURC_TOKEN: RequiredErc20Token = { icon: eurc, address: '0x1aBaEA1f7C830bD89Acc67eC4af516284b1bC33c', exchange: 'erc20', - twinTokenSymbol: 'ckEURC' + twinTokenSymbol: 'ckEURC', + groupData: EURC_TOKEN_GROUP }; export const SEPOLIA_EURC_SYMBOL = 'SepoliaEURC'; @@ -39,5 +41,6 @@ export const SEPOLIA_EURC_TOKEN: RequiredErc20Token = { icon: eurc, address: '0x08210F9170F89Ab7658F0B5E3fF39b0E03C594D4', exchange: 'erc20', - twinTokenSymbol: 'ckSepoliaEURC' + twinTokenSymbol: 'ckSepoliaEURC', + groupData: SEPOLIA_EURC_TOKEN_GROUP }; diff --git a/src/frontend/src/env/tokens/tokens-spl/tokens.eurc.env.ts b/src/frontend/src/env/tokens/tokens-spl/tokens.eurc.env.ts index 56f2b9830aa..fd17eb108a1 100644 --- a/src/frontend/src/env/tokens/tokens-spl/tokens.eurc.env.ts +++ b/src/frontend/src/env/tokens/tokens-spl/tokens.eurc.env.ts @@ -1,4 +1,5 @@ import { SOLANA_DEVNET_NETWORK, SOLANA_MAINNET_NETWORK } from '$env/networks/networks.sol.env'; +import { EURC_TOKEN_GROUP } from '$env/tokens/groups/groups.eurc.env'; import { EURC_TOKEN as ETH_EURC_TOKEN } from '$env/tokens/tokens-erc20/tokens.eurc.env'; import eurc from '$eth/assets/eurc.svg'; import type { TokenId } from '$lib/types/token'; @@ -23,7 +24,8 @@ export const EURC_TOKEN: RequiredSplToken = { icon: eurc, address: 'HzwqbKZw8HxMN6bF2yFZNrht3c2iXXzpKcFu7uBEDKtr', owner: TOKEN_PROGRAM_ADDRESS, - twinToken: ETH_EURC_TOKEN + twinToken: ETH_EURC_TOKEN, + groupData: EURC_TOKEN_GROUP }; export const DEVNET_EURC_SYMBOL = 'DevnetEURC'; From afd6afd38ef66d65c6fd1cc08db9895cbe2c7557 Mon Sep 17 00:00:00 2001 From: Antonio Ventilii Date: Thu, 17 Apr 2025 17:36:10 +0200 Subject: [PATCH 2/4] todo --- src/frontend/src/env/tokens/groups/groups.eurc.env.ts | 8 -------- .../src/env/tokens/tokens-erc20/tokens.eurc.env.ts | 6 +++--- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/src/frontend/src/env/tokens/groups/groups.eurc.env.ts b/src/frontend/src/env/tokens/groups/groups.eurc.env.ts index 29fe49e0981..4168914563d 100644 --- a/src/frontend/src/env/tokens/groups/groups.eurc.env.ts +++ b/src/frontend/src/env/tokens/groups/groups.eurc.env.ts @@ -7,11 +7,3 @@ export const EURC_TOKEN_GROUP = { name: 'Euro Coin', symbol: EURC_TOKEN_GROUP_SYMBOL }; - -const SEPOLIA_EURC_TOKEN_GROUP_SYMBOL = 'SepoliaEURC'; - -export const SEPOLIA_EURC_TOKEN_GROUP = { - icon: eurc, - name: 'EURC', - symbol: SEPOLIA_EURC_TOKEN_GROUP_SYMBOL -}; diff --git a/src/frontend/src/env/tokens/tokens-erc20/tokens.eurc.env.ts b/src/frontend/src/env/tokens/tokens-erc20/tokens.eurc.env.ts index 1333102f606..e1328720e8c 100644 --- a/src/frontend/src/env/tokens/tokens-erc20/tokens.eurc.env.ts +++ b/src/frontend/src/env/tokens/tokens-erc20/tokens.eurc.env.ts @@ -1,5 +1,5 @@ import { ETHEREUM_NETWORK, SEPOLIA_NETWORK } from '$env/networks/networks.eth.env'; -import { EURC_TOKEN_GROUP, SEPOLIA_EURC_TOKEN_GROUP } from '$env/tokens/groups/groups.eurc.env'; +import { EURC_TOKEN_GROUP } from '$env/tokens/groups/groups.eurc.env'; import eurc from '$eth/assets/eurc.svg'; import type { RequiredErc20Token } from '$eth/types/erc20'; import type { TokenId } from '$lib/types/token'; @@ -41,6 +41,6 @@ export const SEPOLIA_EURC_TOKEN: RequiredErc20Token = { icon: eurc, address: '0x08210F9170F89Ab7658F0B5E3fF39b0E03C594D4', exchange: 'erc20', - twinTokenSymbol: 'ckSepoliaEURC', - groupData: SEPOLIA_EURC_TOKEN_GROUP + // TODO: is there a ckSepoliaEURC ? + twinTokenSymbol: 'ckSepoliaEURC' }; From 73bc40c244def7ed33f442b0e73f0b7e51a2eb4d Mon Sep 17 00:00:00 2001 From: Antonio Ventilii Date: Thu, 17 Apr 2025 17:39:22 +0200 Subject: [PATCH 3/4] todo --- src/frontend/src/env/tokens/tokens-spl/tokens.eurc.env.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/frontend/src/env/tokens/tokens-spl/tokens.eurc.env.ts b/src/frontend/src/env/tokens/tokens-spl/tokens.eurc.env.ts index fd17eb108a1..2a54fbf8018 100644 --- a/src/frontend/src/env/tokens/tokens-spl/tokens.eurc.env.ts +++ b/src/frontend/src/env/tokens/tokens-spl/tokens.eurc.env.ts @@ -24,6 +24,7 @@ export const EURC_TOKEN: RequiredSplToken = { icon: eurc, address: 'HzwqbKZw8HxMN6bF2yFZNrht3c2iXXzpKcFu7uBEDKtr', owner: TOKEN_PROGRAM_ADDRESS, + // TODO: remove this prop when we will use `groupData` for grouping twinToken: ETH_EURC_TOKEN, groupData: EURC_TOKEN_GROUP }; From c789a4719820ccdc2424a6ba16d68565b1556c0a Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 22 Apr 2025 08:49:27 +0000 Subject: [PATCH 4/4] =?UTF-8?q?=F0=9F=A4=96=20Apply=20formatting=20changes?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/frontend/src/env/networks/networks.icrc.env.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/frontend/src/env/networks/networks.icrc.env.ts b/src/frontend/src/env/networks/networks.icrc.env.ts index 1839a20ec30..4e46ef98c24 100644 --- a/src/frontend/src/env/networks/networks.icrc.env.ts +++ b/src/frontend/src/env/networks/networks.icrc.env.ts @@ -4,8 +4,8 @@ import { CKETH_EXPLORER_URL, CKETH_SEPOLIA_EXPLORER_URL } from '$env/explorers.env'; -import { EURC_TOKEN_GROUP } from '$env/tokens/groups/groups.eurc.env'; import { ETH_TOKEN_GROUP } from '$env/tokens/groups/groups.eth.env'; +import { EURC_TOKEN_GROUP } from '$env/tokens/groups/groups.eurc.env'; import { EURC_TOKEN } from '$env/tokens/tokens-erc20/tokens.eurc.env'; import { LINK_TOKEN, SEPOLIA_LINK_TOKEN } from '$env/tokens/tokens-erc20/tokens.link.env'; import { OCT_TOKEN } from '$env/tokens/tokens-erc20/tokens.oct.env';