Merge remote-tracking branch 'origin/main' into check-candid-compatibility

Author: bitdivine

dfx.json

@@ -283,8 +283,10 @@
 		},
 		"ckbtc_index": {
 			"type": "custom",
+			"build": "scripts/build.ckbtc_index.sh",
 			"candid": "target/ic/ckbtc_index.did",
 			"wasm": "target/ic/ckbtc_index.wasm",
+			"init_arg_file": "target/ic/ckbtc_index.args.did",
 			"specified_id": "mm444-5iaaa-aaaar-qaabq-cai",
 			"remote": {
 				"id": {

scripts/build.ckbtc_index.args.sh

@@ -0,0 +1,27 @@
+#!/usr/bin/env bash
+[[ "${1:-}" != "--help" ]] || {
+  cat <<-EOF
+
+	Populates the ckbtc_index init args file.
+
+	# Prerequisites
+	This is expected to be run via dfx, and in particular that
+	environment variables provided by dfx are set.
+
+	EOF
+  exit 0
+}
+set -euxo pipefail
+
+: START populating the ckbtc_index install args file...
+ARGS_FILE="$(jq -re .canisters.ckbtc_index.init_arg_file dfx.json)"
+mkdir -p "$(dirname "$ARGS_FILE")"
+
+cat <<EOF >"$ARGS_FILE"
+(opt variant {
+  Init = record {
+    ledger_id = principal \"$CANISTER_ID_CKBTC_LEDGER\";
+   }
+})
+EOF
+: FINISH populating the ckbtc_index install args file.

scripts/build.ckbtc_index.sh

@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+[[ "${1:-}" != "--help" ]] || {
+  cat <<-EOF
+
+	Assembles the ckbtc_index canister deploy artefacts.
+
+	# Prerequisites
+	This is expected to be run by dfx.  In particular,
+	the code that creates the arguments uses environment
+	variables set by dfx.
+
+	EOF
+  exit 0
+}
+
+set -euo pipefail
+
+scripts/download.ckbtc.sh
+scripts/build.ckbtc_index.args.sh

scripts/deploy.ckbtc.sh

@@ -64,11 +64,7 @@ dfx deploy ckbtc_kyt --specified-id pvm5g-xaaaa-aaaar-qaaia-cai --network "$DFX_
 })"
 
 echo "Step 5: deploy index canister..."
-dfx deploy ckbtc_index --specified-id mm444-5iaaa-aaaar-qaabq-cai --network "$DFX_NETWORK" --argument "(opt variant {
-  Init = record {
-    ledger_id = principal \"$LEDGERID\";
-   }
-})"
+dfx deploy ckbtc_index --network "$DFX_NETWORK"
 
 # Example to mint ckBTC
 

scripts/deploy.sh

@@ -4,10 +4,6 @@ set -euxo pipefail
 dfx canister create --all
 dfx deploy backend
 dfx deploy signer
-
-mkdir -p ./target/ic
-
-./scripts/download.icp.sh
 dfx deploy icp_ledger
 dfx deploy icp_index