chore: CRP-2834 use dfx deploy to simplify setup (#134)

altkdf · web-flow · commit 7e7075acf58e · 2025-06-06T11:14:49.000+02:00
diff --git a/backend/rs/canisters/ic_vetkeys_manager_canister/Makefile b/backend/rs/canisters/ic_vetkeys_manager_canister/Makefile
@@ -10,9 +10,3 @@ compile-wasm:
 extract-candid: compile-wasm
 	candid-extractor $(ROOT_DIR)/target/wasm32-unknown-unknown/release/ic_vetkeys_manager_canister.wasm > ic_vetkeys_manager_canister.did
 
-.PHONY: export-cmd
-.SILENT: export-cmd
-export-cmd:
-	CANISTER_ID_IC_VETKEYS_MANAGER_CANISTER=$(shell dfx canister id ic_vetkeys_manager_canister); \
-	CMD="export CANISTER_ID_IC_VETKEYS_MANAGER_CANISTER=$${CANISTER_ID_IC_VETKEYS_MANAGER_CANISTER}"; \
-	echo "$${CMD}"
diff --git a/examples/basic_ibe/deploy_locally.sh b/examples/basic_ibe/deploy_locally.sh
@@ -8,24 +8,11 @@ dfx --version >> /dev/null
 # Run `dfx` if it is not already running.
 dfx ping &> /dev/null || dfx start --background --clean >> /dev/null
 
-# Deploy the Internet Identity canister and export the environment variable of
-# the canister ID.
-dfx deps pull && dfx deps init && dfx deps deploy &&
-    export CANISTER_ID_INTERNET_IDENTITY=rdmx6-jaaaa-aaaaa-aaadq-cai
+# Deploy the Internet Identity canister.
+dfx deps pull && dfx deps init && dfx deps deploy
 
-dfx canister create basic_ibe
+# Deploy backend canister.
 dfx deploy --argument '("dfx_test_key")' basic_ibe
 
-# Store environment variables for the frontend.
-echo "DFX_NETWORK=$DFX_NETWORK" > frontend/.env
-echo "CANISTER_ID_BASIC_IBE=$(dfx canister id basic_ibe)" >> frontend/.env
-echo "CANISTER_ID_INTERNET_IDENTITY=$CANISTER_ID_INTERNET_IDENTITY" >> frontend/.env
-
-# Build frontend.
-pushd frontend
-    npm i
-    npm run build
-popd
-
-# Deploy canisters.
-dfx deploy
+# Deploy frontend canister.
+dfx deploy www
diff --git a/examples/basic_ibe/dfx.json b/examples/basic_ibe/dfx.json
@@ -16,11 +16,14 @@
       "id": "rdmx6-jaaaa-aaaaa-aaadq-cai"
     },
     "www": {
+      "dependencies": ["basic_ibe"],
+      "build": ["npm i && cd frontend && npm run build"],
       "frontend": {
         "entrypoint": "frontend/dist/index.html"
       },
       "source": ["frontend/dist/"],
-      "type": "assets"
+      "type": "assets",
+      "output_env_file": "frontend/.env"
     }
   },
   "networks": {
diff --git a/examples/basic_ibe/frontend/src/main.ts b/examples/basic_ibe/frontend/src/main.ts
@@ -270,7 +270,7 @@ export function login(client: AuthClient) {
         identityProvider:
             process.env.DFX_NETWORK === "ic"
                 ? "https://identity.ic0.app/#authorize"
-                : `http://${process.env.CANISTER_ID_INTERNET_IDENTITY}.localhost:8000/#authorize`,
+                : `http://rdmx6-jaaaa-aaaaa-aaadq-cai.localhost:8000/#authorize`,
         onSuccess: () => {
             myPrincipal = client.getIdentity().getPrincipal();
             updateUI(true);
diff --git a/examples/basic_timelock_ibe/deploy_locally.sh b/examples/basic_timelock_ibe/deploy_locally.sh
@@ -8,27 +8,11 @@ dfx --version >> /dev/null
 # Run `dfx` if it is not already running.
 dfx ping &> /dev/null || dfx start --background --clean >> /dev/null
 
-# Deploy the Internet Identity canister and export the environment variable of
-# the canister ID.
-dfx deps pull && dfx deps init && dfx deps deploy &&
-    export CANISTER_ID_INTERNET_IDENTITY=rdmx6-jaaaa-aaaaa-aaadq-cai
+# Deploy the Internet Identity canister.
+dfx deps pull && dfx deps init && dfx deps deploy
 
-dfx canister create basic_timelock_ibe
+# Deploy backend canister.
 dfx deploy --argument '("dfx_test_key")' basic_timelock_ibe
 
-# Store environment variables for the frontend.
-echo "DFX_NETWORK=$DFX_NETWORK" > frontend/.env
-echo "CANISTER_ID_BASIC_TIMELOCK_IBE=$(dfx canister id basic_timelock_ibe)" >> frontend/.env
-echo "CANISTER_ID_INTERNET_IDENTITY=$CANISTER_ID_INTERNET_IDENTITY" >> frontend/.env
-
-npm i
-
-# Build frontend.
-pushd frontend
-    npm run build
-popd
-
-# Deploy canisters.
-pushd backend
-    dfx deploy
-popd
+# Deploy frontend canister.
+dfx deploy www
diff --git a/examples/basic_timelock_ibe/dfx.json b/examples/basic_timelock_ibe/dfx.json
@@ -16,11 +16,14 @@
       "id": "rdmx6-jaaaa-aaaaa-aaadq-cai"
     },
     "www": {
+      "dependencies": ["basic_timelock_ibe"],
+      "build": ["npm i && cd frontend && npm run build"],
       "frontend": {
         "entrypoint": "frontend/dist/index.html"
       },
       "source": ["frontend/dist/"],
-      "type": "assets"
+      "type": "assets",
+      "output_env_file": "frontend/.env"
     }
   },
   "networks": {
diff --git a/examples/basic_timelock_ibe/frontend/src/main.ts b/examples/basic_timelock_ibe/frontend/src/main.ts
@@ -56,7 +56,7 @@ export function login(client: AuthClient) {
         identityProvider:
             process.env.DFX_NETWORK === "ic"
                 ? "https://identity.ic0.app/#authorize"
-                : `http://${process.env.CANISTER_ID_INTERNET_IDENTITY}.localhost:8000/#authorize`,
+                : `http://rdmx6-jaaaa-aaaaa-aaadq-cai.localhost:8000/#authorize`,
         onSuccess: () => {
             myPrincipal = client.getIdentity().getPrincipal();
             updateUI(true);
diff --git a/examples/password_manager/deploy_locally.sh b/examples/password_manager/deploy_locally.sh
@@ -8,27 +8,11 @@ dfx --version >> /dev/null
 # Run `dfx` if it is not already running.
 dfx ping &> /dev/null || dfx start --background --clean >> /dev/null
 
-# Deploy the Internet Identity canister and export the environment variable of
-# the canister ID.
-dfx deps pull && dfx deps init && dfx deps deploy &&
-    export CANISTER_ID_INTERNET_IDENTITY=rdmx6-jaaaa-aaaaa-aaadq-cai
+# Deploy the Internet Identity canister.
+dfx deps pull && dfx deps init && dfx deps deploy
 
 # Deploy the backend canister.
-pushd ../../backend/rs/canisters/ic_vetkeys_encrypted_maps_canister
-    dfx deploy --argument '("dfx_test_key")' ic_vetkeys_encrypted_maps_canister
-    export CANISTER_ID_IC_VETKEYS_ENCRYPTED_MAPS_CANISTER=$(dfx canister id ic_vetkeys_encrypted_maps_canister)
-popd
-
-# Store environment variables for the frontend.
-echo "DFX_NETWORK=$DFX_NETWORK" > frontend/.env
-echo "CANISTER_ID_IC_VETKEYS_ENCRYPTED_MAPS_CANISTER=$CANISTER_ID_IC_VETKEYS_ENCRYPTED_MAPS_CANISTER" >> frontend/.env
-echo "CANISTER_ID_INTERNET_IDENTITY=$CANISTER_ID_INTERNET_IDENTITY" >> frontend/.env
-
-# Build frontend.
-pushd frontend
-    npm i
-    npm run build
-popd
+dfx deploy --argument '("dfx_test_key")' ic_vetkeys_encrypted_maps_canister
 
 # Deploy the frontend canister.
 dfx deploy www
diff --git a/examples/password_manager/dfx.json b/examples/password_manager/dfx.json
@@ -1,22 +1,23 @@
 {
-    "canisters": {
-      "ic_vetkeys_encrypted_maps_canister": {
-        "candid": "ic_vetkeys_encrypted_maps_canister.did",
-        "package": "ic-vetkeys-encrypted-maps-canister",
-        "type": "rust"
+  "canisters": {
+    "ic_vetkeys_encrypted_maps_canister": {
+      "candid": "../../backend/rs/canisters/ic_vetkeys_encrypted_maps_canister/ic_vetkeys_encrypted_maps_canister.did",
+      "package": "ic-vetkeys-encrypted-maps-canister",
+      "type": "rust"
+    },
+    "internet-identity": {
+      "type": "pull",
+      "id": "rdmx6-jaaaa-aaaaa-aaadq-cai"
+    },
+    "www": {
+      "dependencies": ["ic_vetkeys_encrypted_maps_canister"],
+      "build": ["npm i && cd frontend && npm run build"],
+      "frontend": {
+        "entrypoint": "frontend/dist/index.html"
       },
-      "internet-identity": {
-        "type": "pull",
-        "id": "rdmx6-jaaaa-aaaaa-aaadq-cai"
-      },
-      "www": {
-        "frontend": {
-          "entrypoint": "frontend/dist/index.html"
-        },
-        "source": [
-          "frontend/dist/"
-        ],
-        "type": "assets"
-      }
+      "source": ["frontend/dist/"],
+      "type": "assets",
+      "output_env_file": "frontend/.env"
     }
-  }
+  }
+}
diff --git a/examples/password_manager/frontend/README.md b/examples/password_manager/frontend/README.md
@@ -7,7 +7,6 @@ frontend implementation that uses all defaults from the SDK.
 ## Step 1: Deploy `encrypted_maps_example` canister and the internet identity canister.
 
 ## Step 2: Tell `frontend` what canisters to communicate with, so the following environment variables must be defined. For a local deployment, one can run `deploy_locally.sh` from that folder.
-* `CANISTER_ID_INTERNET_IDENTITY`
 * `CANISTER_ID_IC_VETKEYS_ENCRYPTED_MAPS_CANISTER`
 
 ## Step 3: Deploy frontend. This returns a link that can be used to access the frontend from the asset canister.
diff --git a/examples/password_manager/frontend/src/store/auth.ts b/examples/password_manager/frontend/src/store/auth.ts
@@ -51,7 +51,7 @@ export function login() {
             identityProvider:
                 process.env.DFX_NETWORK === "ic"
                     ? "https://identity.ic0.app/#authorize"
-                    : `http://${process.env.CANISTER_ID_INTERNET_IDENTITY}.localhost:4943/#authorize`,
+                    : `http://rdmx6-jaaaa-aaaaa-aaadq-cai.localhost:4943/#authorize`,
             onSuccess: () => authenticate(currentAuth.client),
         });
     }
diff --git a/examples/password_manager_with_metadata/deploy_locally.sh b/examples/password_manager_with_metadata/deploy_locally.sh
@@ -8,24 +8,11 @@ dfx --version >> /dev/null
 # Run `dfx` if it is not already running.
 dfx ping &> /dev/null || dfx start --background --clean >> /dev/null
 
-# Deploy the Internet Identity canister and export the environment variable of
-# the canister ID.
-dfx deps pull && dfx deps init && dfx deps deploy &&
-    export CANISTER_ID_INTERNET_IDENTITY=rdmx6-jaaaa-aaaaa-aaadq-cai
+# Deploy the Internet Identity canister.
+dfx deps pull && dfx deps init && dfx deps deploy
 
-dfx canister create password_manager_with_metadata
+# Deploy backend canister.
 dfx deploy --argument '("dfx_test_key")' password_manager_with_metadata
 
-# Store environment variables for the frontend.
-echo "DFX_NETWORK=$DFX_NETWORK" > frontend/.env
-echo "CANISTER_ID_PASSWORD_MANAGER_WITH_METADATA=$(dfx canister id password_manager_with_metadata)" >> frontend/.env
-echo "CANISTER_ID_INTERNET_IDENTITY=$CANISTER_ID_INTERNET_IDENTITY" >> frontend/.env
-
-# Build frontend.
-pushd frontend
-    npm i
-    npm run build
-popd
-
-# Deploy canisters.
-dfx deploy
+# Deploy frontend canister.
+dfx deploy www
diff --git a/examples/password_manager_with_metadata/dfx.json b/examples/password_manager_with_metadata/dfx.json
@@ -16,13 +16,14 @@
       "id": "rdmx6-jaaaa-aaaaa-aaadq-cai"
     },
     "www": {
+      "dependencies": ["password_manager_with_metadata"],
+      "build": ["npm i && cd frontend && npm run build"],
       "frontend": {
         "entrypoint": "frontend/dist/index.html"
       },
-      "source": [
-        "frontend/dist/"
-      ],
-      "type": "assets"
+      "source": ["frontend/dist/"],
+      "type": "assets",
+      "output_env_file": "frontend/.env"
     }
   },
   "networks": {
@@ -31,4 +32,4 @@
       "type": "ephemeral"
     }
   }
-}
+}
diff --git a/examples/password_manager_with_metadata/frontend/src/store/auth.ts b/examples/password_manager_with_metadata/frontend/src/store/auth.ts
@@ -53,7 +53,7 @@ export async function login() {
             identityProvider:
                 process.env.DFX_NETWORK === "ic"
                     ? "https://identity.ic0.app/#authorize"
-                    : `http://${process.env.CANISTER_ID_INTERNET_IDENTITY}.localhost:8000/#authorize`,
+                    : `http://rdmx6-jaaaa-aaaaa-aaadq-cai.localhost:8000/#authorize`,
             onSuccess: async () => {
                 await authenticate(currentAuth.client);
             },
