Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feature: included ERC20 contract address among the data in tokens.ckerc20.json #1505

Merged
merged 3 commits into from
Jun 20, 2024
Merged

feature: included ERC20 contract address among the data in tokens.ckerc20.json #1505

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b0952e4
feature: included ERC20 contract address among the data in tokens.cke…
AntonioVentilii-DFINITY Jun 20, 2024
33a50c9
feat: include custom type for contract address
AntonioVentilii-DFINITY Jun 20, 2024
3e7151b
fix: update JSON file for ERC20 token
AntonioVentilii-DFINITY Jun 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions scripts/build.tokens.ckerc20.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,10 @@ const orchestratorInfo = async ({ orchestratorId: canisterId }) => {
const buildOrchestratorInfo = async (orchestratorId) => {
const { managed_canisters } = await orchestratorInfo({ orchestratorId });

const mapManagedCanisters = (acc, { ledger, index, ckerc20_token_symbol }) => {
const mapManagedCanisters = (
acc,
{ ledger, index, ckerc20_token_symbol, erc20_contract: { address: erc20ContractAddress } }
) => {
const ledgerCanister = fromNullable(ledger);
const indexCanister = fromNullable(index);

Expand All @@ -44,7 +47,8 @@ const buildOrchestratorInfo = async (orchestratorId) => {
...(acc[ckerc20_token_symbol] ?? []),
{
ledgerCanisterId: ledgerCanisterId.toText(),
indexCanisterId: indexCanisterId.toText()
indexCanisterId: indexCanisterId.toText(),
erc20ContractAddress
}
]
};
Expand Down
2 changes: 1 addition & 1 deletion src/frontend/src/env/tokens.ckerc20.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"production":{"ckLINK":{"ledgerCanisterId":"g4tto-rqaaa-aaaar-qageq-cai","indexCanisterId":"gvqys-hyaaa-aaaar-qagfa-cai"},"ckUSDC":{"ledgerCanisterId":"xevnm-gaaaa-aaaar-qafnq-cai","indexCanisterId":"xrs4b-hiaaa-aaaar-qafoa-cai"}},"staging":{"ckSepoliaUSDC":{"ledgerCanisterId":"yfumr-cyaaa-aaaar-qaela-cai","indexCanisterId":"ycvkf-paaaa-aaaar-qaelq-cai"},"ckSepoliaPEPE":{"ledgerCanisterId":"hw4ru-taaaa-aaaar-qagdq-cai","indexCanisterId":"g3sv2-4iaaa-aaaar-qagea-cai"},"ckSepoliaLINK":{"ledgerCanisterId":"r52mc-qaaaa-aaaar-qafzq-cai","indexCanisterId":"ri55p-riaaa-aaaar-qaf2a-cai"}}}
{"production":{"ckLINK":{"ledgerCanisterId":"g4tto-rqaaa-aaaar-qageq-cai","indexCanisterId":"gvqys-hyaaa-aaaar-qagfa-cai","erc20ContractAddress":"0x514910771AF9Ca656af840dff83E8264EcF986CA"},"ckUSDC":{"ledgerCanisterId":"xevnm-gaaaa-aaaar-qafnq-cai","indexCanisterId":"xrs4b-hiaaa-aaaar-qafoa-cai","erc20ContractAddress":"0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48"}},"staging":{"ckSepoliaUSDC":{"ledgerCanisterId":"yfumr-cyaaa-aaaar-qaela-cai","indexCanisterId":"ycvkf-paaaa-aaaar-qaelq-cai","erc20ContractAddress":"0x1c7D4B196Cb0C7B01d743Fbc6116a902379C7238"},"ckSepoliaPEPE":{"ledgerCanisterId":"hw4ru-taaaa-aaaar-qagdq-cai","indexCanisterId":"g3sv2-4iaaa-aaaar-qagea-cai","erc20ContractAddress":"0x560eF9F39E4B08f9693987cad307f6FBfd97B2F6"},"ckSepoliaLINK":{"ledgerCanisterId":"r52mc-qaaaa-aaaar-qafzq-cai","indexCanisterId":"ri55p-riaaa-aaaar-qaf2a-cai","erc20ContractAddress":"0x779877A7B0D9E8603169DdbD7836e478b4624789"}}}
6 changes: 5 additions & 1 deletion src/frontend/src/icp/types/env-token-ckerc20.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
import { isEthAddress } from '$lib/utils/account.utils';
import { z } from 'zod';

const envErc20ContractAddress = z.custom<string>(isEthAddress, 'Invalid ERC20 Contract Address');

const envTokenData = z.object({
ledgerCanisterId: z.string(),
indexCanisterId: z.string()
indexCanisterId: z.string(),
erc20ContractAddress: envErc20ContractAddress
});

const envTokenSymbol = z.string();
Expand Down