Skip to content

Commit

Permalink
Include ckUSDC canisters in env config (#4878)
Browse files Browse the repository at this point in the history
This PR is modeled after #3876

# Motivation

The NNS dapp needs to be aware of the ckUSDC ledger and index canister
IDs.

# Changes

1. Include entries for `ckusdc_ledger` and `ckusdc_index` in `dfx.json`.
The don't have mainnet IDs yet.
2. Update `./config.sh` to include entries for ckUSDC similar as for
ckETH.

# Tests

Ran `scripts/nns-dapp/test-config --update` to update golden files.

# Todos

- [x] Add entry to changelog (if necessary).
  • Loading branch information
dskloetd authored May 16, 2024
1 parent 58ac721 commit c96d253
Show file tree
Hide file tree
Showing 5 changed files with 47 additions and 1 deletion.
1 change: 1 addition & 0 deletions CHANGELOG-Nns-Dapp-unreleased.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ proposal is successful, the changes it released will be moved from this file to
#### Added

* Added workflow to update IC cargo dependencies.
* Include `ckUSDC` when generating `args.did` and `.env`.

#### Changed

Expand Down
21 changes: 20 additions & 1 deletion config.sh
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,14 @@ local_deployment_data="$(
export CKETH_INDEX_CANISTER_ID
test -n "${CKETH_INDEX_CANISTER_ID:-}" || unset CKETH_INDEX_CANISTER_ID
: "Try to find the ckUSDC canister IDs"
CKUSDC_LEDGER_CANISTER_ID="$(dfx canister --network "$DFX_NETWORK" id ckusdc_ledger 2>/dev/null || true)"
export CKUSDC_LEDGER_CANISTER_ID
test -n "${CKUSDC_LEDGER_CANISTER_ID:-}" || unset CKUSDC_LEDGER_CANISTER_ID
CKUSDC_INDEX_CANISTER_ID="$(dfx canister --network "$DFX_NETWORK" id ckusdc_index 2>/dev/null || true)"
export CKUSDC_INDEX_CANISTER_ID
test -n "${CKUSDC_INDEX_CANISTER_ID:-}" || unset CKUSDC_INDEX_CANISTER_ID
: "Get the governance canister ID - it should be defined"
GOVERNANCE_CANISTER_ID="$(dfx canister --network "$DFX_NETWORK" id nns-governance)"
export GOVERNANCE_CANISTER_ID
Expand Down Expand Up @@ -135,6 +143,8 @@ local_deployment_data="$(
CKBTC_INDEX_CANISTER_ID: env.CKBTC_INDEX_CANISTER_ID,
CKETH_LEDGER_CANISTER_ID: env.CKETH_LEDGER_CANISTER_ID,
CKETH_INDEX_CANISTER_ID: env.CKETH_INDEX_CANISTER_ID,
CKUSDC_LEDGER_CANISTER_ID: env.CKUSDC_LEDGER_CANISTER_ID,
CKUSDC_INDEX_CANISTER_ID: env.CKUSDC_INDEX_CANISTER_ID,
CYCLES_MINTING_CANISTER_ID: env.CYCLES_MINTING_CANISTER_ID,
ROBOTS: env.ROBOTS,
STATIC_HOST: env.STATIC_HOST,
Expand Down Expand Up @@ -180,6 +190,8 @@ ckbtcMinterCanisterId=$(echo "$json" | jq -r '.CKBTC_MINTER_CANISTER_ID // ""')
ckbtcIndexCanisterId=$(echo "$json" | jq -r '.CKBTC_INDEX_CANISTER_ID // ""')
ckethLedgerCanisterId=$(echo "$json" | jq -r '.CKETH_LEDGER_CANISTER_ID // ""')
ckethIndexCanisterId=$(echo "$json" | jq -r '.CKETH_INDEX_CANISTER_ID // ""')
ckusdcLedgerCanisterId=$(echo "$json" | jq -r '.CKUSDC_LEDGER_CANISTER_ID // ""')
ckusdcIndexCanisterId=$(echo "$json" | jq -r '.CKUSDC_INDEX_CANISTER_ID // ""')

echo "VITE_DFX_NETWORK=$dfxNetwork
VITE_CYCLES_MINTING_CANISTER_ID=$cmcCanisterId
Expand All @@ -198,7 +210,9 @@ VITE_CKBTC_LEDGER_CANISTER_ID=${ckbtcLedgerCanisterId:-}
VITE_CKBTC_MINTER_CANISTER_ID=${ckbtcMinterCanisterId:-}
VITE_CKBTC_INDEX_CANISTER_ID=${ckbtcIndexCanisterId:-}
VITE_CKETH_LEDGER_CANISTER_ID=${ckethLedgerCanisterId:-}
VITE_CKETH_INDEX_CANISTER_ID=${ckethIndexCanisterId:-}" | tee "$ENV_FILE"
VITE_CKETH_INDEX_CANISTER_ID=${ckethIndexCanisterId:-}
VITE_CKUSDC_LEDGER_CANISTER_ID=${ckusdcLedgerCanisterId:-}
VITE_CKUSDC_INDEX_CANISTER_ID=${ckusdcIndexCanisterId:-}" | tee "$ENV_FILE"

echo "$json" >"$JSON_OUT"
{
Expand Down Expand Up @@ -236,6 +250,11 @@ export CKETH_LEDGER_CANISTER_ID
CKETH_INDEX_CANISTER_ID="${ckethIndexCanisterId:-}"
export CKETH_INDEX_CANISTER_ID

CKUSDC_LEDGER_CANISTER_ID="${ckusdcLedgerCanisterId:-}"
export CKUSDC_LEDGER_CANISTER_ID
CKUSDC_INDEX_CANISTER_ID="${ckusdcIndexCanisterId:-}"
export CKUSDC_INDEX_CANISTER_ID

GOVERNANCE_CANISTER_ID="$governanceCanisterId"
export GOVERNANCE_CANISTER_ID

Expand Down
22 changes: 22 additions & 0 deletions dfx.json
Original file line number Diff line number Diff line change
Expand Up @@ -232,6 +232,28 @@
}
}
},
"ckusdc_ledger": {
"build": [
"true"
],
"candid": "target/ic/ckusdc_ledger.did",
"wasm": "target/ic/ckusdc_ledger.wasm",
"type": "custom",
"remote": {
"id": {}
}
},
"ckusdc_index": {
"build": [
"true"
],
"candid": "target/ic/ckusdc_index.did",
"wasm": "target/ic/ckusdc_index.wasm",
"type": "custom",
"remote": {
"id": {}
}
},
"tvl": {
"build": [
"true"
Expand Down
2 changes: 2 additions & 0 deletions scripts/nns-dapp/test-config-assets/app/env
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,5 @@ VITE_CKBTC_MINTER_CANISTER_ID=mqygn-kiaaa-aaaar-qaadq-cai
VITE_CKBTC_INDEX_CANISTER_ID=n5wcd-faaaa-aaaar-qaaea-cai
VITE_CKETH_LEDGER_CANISTER_ID=
VITE_CKETH_INDEX_CANISTER_ID=
VITE_CKUSDC_LEDGER_CANISTER_ID=
VITE_CKUSDC_INDEX_CANISTER_ID=
2 changes: 2 additions & 0 deletions scripts/nns-dapp/test-config-assets/mainnet/env
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,5 @@ VITE_CKBTC_MINTER_CANISTER_ID=mqygn-kiaaa-aaaar-qaadq-cai
VITE_CKBTC_INDEX_CANISTER_ID=n5wcd-faaaa-aaaar-qaaea-cai
VITE_CKETH_LEDGER_CANISTER_ID=ss2fx-dyaaa-aaaar-qacoq-cai
VITE_CKETH_INDEX_CANISTER_ID=s3zol-vqaaa-aaaar-qacpa-cai
VITE_CKUSDC_LEDGER_CANISTER_ID=
VITE_CKUSDC_INDEX_CANISTER_ID=

0 comments on commit c96d253

Please sign in to comment.