chore: migrate from dfx to icp-cli

README.md

@@ -19,7 +19,7 @@ vetkd_public_key : (vetkd_public_key_args) -> (vetkd_public_key_result);
 vetkd_derive_key : (vetkd_derive_key_args) -> (vetkd_derive_key_result);
 ```
 
-For more documentation on vetKeys and the management canister API, see the [vetKeys documentation](https://internetcomputer.org/docs/building-apps/network-features/vetkeys/introduction).
+For more documentation on vetKeys and the management canister API, see the [vetKeys documentation](https://docs.internetcomputer.org/building-apps/network-features/vetkeys/introduction).
 
 Please share your feedback on the [developer forum](https://forum.dfinity.org/t/threshold-key-derivation-privacy-on-the-ic/16560/179).
 

backend/mo/canisters/ic_vetkeys_encrypted_maps_canister/Makefile

@@ -3,11 +3,12 @@ PWD:=$(shell pwd)
 .PHONY: compile-wasm
 .SILENT: compile-wasm
 compile-wasm:
-	dfx build --check
+	icp build
 
 # Test the APIs of this canister using the respective Rust canister tests.
 # This has the advantage that the tests are consistent (less room for bugs by having only one implementation of the tests) and the checked expected behavior is consistent across Rust and Motoko.
 .PHONY: test
 .SILENT: test
 test: compile-wasm
-	CUSTOM_WASM_PATH=$(PWD)/.dfx/local/canisters/ic_vetkeys_encrypted_maps_canister/ic_vetkeys_encrypted_maps_canister.wasm cargo test -p ic-vetkeys-encrypted-maps-canister
+	@echo "Testing Motoko canister WASM: $(PWD)/.icp/cache/artifacts/ic_vetkeys_encrypted_maps_canister"
+	CUSTOM_WASM_PATH=$(PWD)/.icp/cache/artifacts/ic_vetkeys_encrypted_maps_canister cargo test -p ic-vetkeys-encrypted-maps-canister

backend/mo/canisters/ic_vetkeys_encrypted_maps_canister/icp.yaml

@@ -0,0 +1,6 @@
+canisters:
+  - name: ic_vetkeys_encrypted_maps_canister
+    recipe:
+      type: "@dfinity/motoko@v4.1.0"
+      configuration:
+        main: src/Main.mo

backend/mo/canisters/ic_vetkeys_encrypted_maps_canister/mops.toml

@@ -1,3 +1,6 @@
+[toolchain]
+moc = "1.5.0"
+
 [package]
 name = "ic-vetkeys-encrypted-maps-canister"
 version = "0.1.0"

backend/mo/canisters/ic_vetkeys_manager_canister/Makefile

@@ -3,11 +3,12 @@ PWD:=$(shell pwd)
 .PHONY: compile-wasm
 .SILENT: compile-wasm
 compile-wasm:
-	dfx build --check
+	icp build
 
 # Test the APIs of this canister using the respective Rust canister tests.
 # This has the advantage that the tests are consistent (less room for bugs by having only one implementation of the tests) and the checked expected behavior is consistent across Rust and Motoko.
 .PHONY: test
 .SILENT: test
 test: compile-wasm
-	CUSTOM_WASM_PATH=$(PWD)/.dfx/local/canisters/ic_vetkeys_manager_canister/ic_vetkeys_manager_canister.wasm cargo test -p ic-vetkeys-manager-canister
+	@echo "Testing Motoko canister WASM: $(PWD)/.icp/cache/artifacts/ic_vetkeys_manager_canister"
+	CUSTOM_WASM_PATH=$(PWD)/.icp/cache/artifacts/ic_vetkeys_manager_canister cargo test -p ic-vetkeys-manager-canister

backend/mo/canisters/ic_vetkeys_manager_canister/icp.yaml

@@ -0,0 +1,6 @@
+canisters:
+  - name: ic_vetkeys_manager_canister
+    recipe:
+      type: "@dfinity/motoko@v4.1.0"
+      configuration:
+        main: src/Main.mo

backend/mo/canisters/ic_vetkeys_manager_canister/mops.toml

@@ -1,3 +1,6 @@
+[toolchain]
+moc = "1.5.0"
+
 [package]
 name = "ic-vetkeys-manager-canister"
 version = "0.1.0"
@@ -10,4 +13,4 @@ license = "Apache-2.0"
 
 [dependencies]
 base = "0.14.6"
-ic-vetkeys = "0.3.0"
+ic-vetkeys = "0.4.0"

backend/mo/canisters/ic_vetkeys_manager_canister/src/Main.mo

@@ -6,8 +6,9 @@ import Blob "mo:base/Blob";
 import Result "mo:base/Result";
 import Array "mo:base/Array";
 
-actor class (keyName : Text) {
-    var keyManager = IcVetkeys.KeyManager.KeyManager<Types.AccessRights>({ curve = #bls12_381_g2; name = keyName }, "key manager", Types.accessRightsOperations());
+persistent actor class (keyName : Text) {
+    let keyManagerState = IcVetkeys.KeyManager.newKeyManagerState<Types.AccessRights>({ curve = #bls12_381_g2; name = keyName }, "key manager");
+    transient let keyManager = IcVetkeys.KeyManager.KeyManager<Types.AccessRights>(keyManagerState, Types.accessRightsOperations());
     /// In this canister, we use the `ByteBuf` type to represent blobs. The reason is that we want to be consistent with the Rust canister implementation.
     /// Unfortunately, the `Blob` type cannot be serialized/deserialized in the current Rust implementation efficiently without nesting it in another type.
     public type ByteBuf = { inner : Blob };

backend/mo/ic_vetkeys/mops.toml

@@ -1,3 +1,6 @@
+[toolchain]
+moc = "1.5.0"
+
 [package]
 name = "ic-vetkeys"
 version = "0.4.0"

backend/rs/canisters/ic_vetkeys_encrypted_maps_canister/Makefile

@@ -5,6 +5,11 @@ ROOT_DIR := $(shell git rev-parse --show-toplevel)
 compile-wasm:
 	cargo build --release --target wasm32-unknown-unknown
 
+.PHONY: test
+.SILENT: test
+test: compile-wasm
+	cargo test -p ic-vetkeys-encrypted-maps-canister
+
 .PHONY: extract-candid
 .SILENT: extract-candid
 extract-candid: compile-wasm
@@ -14,4 +19,4 @@ extract-candid: compile-wasm
 .SILENT: clean
 clean:
 	cargo clean
-	rm -rf .dfx
+	rm -rf .icp/cache

backend/rs/canisters/ic_vetkeys_encrypted_maps_canister/tests/tests.rs

@@ -665,7 +665,7 @@ fn should_access_map_values() {
     let map_name = random_map_name(rng);
 
     let mut authorized_users = vec![(caller, AccessRights::ReadWriteManage)];
-    let mut keyvals = vec![];
+    let mut keyvals: BTreeMap<ByteBuf, ByteBuf> = BTreeMap::new();
 
     for _ in 0..3 {
         let map_key = random_map_key(rng);
@@ -697,7 +697,7 @@ fn should_access_map_values() {
             authorized_users.push((user_to_be_added, access_rights));
         }
 
-        keyvals.push((map_key, encrypted_value));
+        keyvals.insert(map_key, encrypted_value);
     }
 
     for (map_key, encrypted_value) in keyvals.clone() {
@@ -714,7 +714,7 @@ fn should_access_map_values() {
     }
 
     for (user, _access_rights) in authorized_users.clone() {
-        let expected_map = BTreeMap::from_iter(keyvals.clone());
+        let expected_map = keyvals.clone();
         let computed_map_single = BTreeMap::from_iter(
             env.query::<Result<Vec<(ByteBuf, ByteBuf)>, String>>(
                 user,
@@ -984,7 +984,7 @@ impl TestEnvironment {
         pic.install_canister(
             example_canister_id,
             example_wasm_bytes,
-            encode_one("dfx_test_key").unwrap(),
+            encode_one("test_key_1").unwrap(),
             None,
         );
 
@@ -1032,14 +1032,20 @@ impl TestEnvironment {
 
 fn load_encrypted_maps_example_canister_wasm() -> Vec<u8> {
     let wasm_path_string = match std::env::var("CUSTOM_WASM_PATH") {
-        Ok(path) if !path.is_empty() => path,
+        Ok(path) if !path.is_empty() => {
+            assert!(
+                Path::new(&path).exists(),
+                "CUSTOM_WASM_PATH is set to '{}' but the file does not exist; run `make compile-wasm` first",
+                path
+            );
+            path
+        }
         _ => format!(
             "{}/target/wasm32-unknown-unknown/release/ic_vetkeys_encrypted_maps_canister.wasm",
             git_root_dir()
         ),
     };
-    let wasm_path = Path::new(&wasm_path_string);
-    std::fs::read(wasm_path)
+    std::fs::read(&wasm_path_string)
         .expect("wasm does not exist - run `cargo build --release --target wasm32-unknown-unknown`")
 }
 

backend/rs/canisters/ic_vetkeys_manager_canister/Makefile

@@ -5,8 +5,12 @@ ROOT_DIR := $(shell git rev-parse --show-toplevel)
 compile-wasm:
 	cargo build --release --target wasm32-unknown-unknown
 
+.PHONY: test
+.SILENT: test
+test: compile-wasm
+	cargo test -p ic-vetkeys-manager-canister
+
 .PHONY: extract-candid
 .SILENT: extract-candid
 extract-candid: compile-wasm
 	candid-extractor $(ROOT_DIR)/target/wasm32-unknown-unknown/release/ic_vetkeys_manager_canister.wasm > ic_vetkeys_manager_canister.did
-

backend/rs/canisters/ic_vetkeys_manager_canister/tests/tests.rs

@@ -531,7 +531,7 @@ impl TestEnvironment {
         pic.install_canister(
             example_canister_id,
             example_wasm_bytes,
-            encode_one("dfx_test_key").unwrap(),
+            encode_one("test_key_1").unwrap(),
             None,
         );
 
@@ -579,14 +579,20 @@ impl TestEnvironment {
 
 fn load_key_manager_example_canister_wasm() -> Vec<u8> {
     let wasm_path_string = match std::env::var("CUSTOM_WASM_PATH") {
-        Ok(path) if !path.is_empty() => path,
+        Ok(path) if !path.is_empty() => {
+            assert!(
+                Path::new(&path).exists(),
+                "CUSTOM_WASM_PATH is set to '{}' but the file does not exist; run `make compile-wasm` first",
+                path
+            );
+            path
+        }
         _ => format!(
             "{}/target/wasm32-unknown-unknown/release/ic_vetkeys_manager_canister.wasm",
             git_root_dir()
         ),
     };
-    let wasm_path = Path::new(&wasm_path_string);
-    std::fs::read(wasm_path)
+    std::fs::read(&wasm_path_string)
         .expect("wasm does not exist - run `cargo build --release --target wasm32-unknown-unknown`")
 }
 

backend/rs/canisters/icp.yaml

@@ -0,0 +1,19 @@
+canisters:
+  - name: ic_vetkeys_manager_canister
+    recipe:
+      type: "@dfinity/rust@v3.2.0"
+      configuration:
+        package: ic-vetkeys-manager-canister
+        candid: ic_vetkeys_manager_canister/ic_vetkeys_manager_canister.did
+    init_args:
+      type: text
+      value: "(\"test_key_1\")"
+  - name: ic_vetkeys_encrypted_maps_canister
+    recipe:
+      type: "@dfinity/rust@v3.2.0"
+      configuration:
+        package: ic-vetkeys-encrypted-maps-canister
+        candid: ic_vetkeys_encrypted_maps_canister/ic_vetkeys_encrypted_maps_canister.did
+    init_args:
+      type: text
+      value: "(\"test_key_1\")"

backend/rs/canisters/tests/tests/sign_with_bls.rs

@@ -14,7 +14,7 @@ fn bls_signature_should_be_valid_and_equal_to_decrypted_vetkey() {
     let context = random_bytes(rng, 10);
     let key_id = VetKDKeyId {
         curve: VetKDCurve::Bls12_381_G2,
-        name: "dfx_test_key".to_string(),
+        name: "test_key_1".to_string(),
     };
     let transport_secret_key = random_transport_key(rng);
     let transport_public_key = transport_secret_key.public_key();
@@ -56,7 +56,7 @@ fn bls_public_key_should_be_equal_to_verification_key() {
     let context = random_bytes(rng, 10);
     let key_id = VetKDKeyId {
         curve: VetKDCurve::Bls12_381_G2,
-        name: "dfx_test_key".to_string(),
+        name: "test_key_1".to_string(),
     };
     let bls_public_key: Vec<u8> = env.update(
         Principal::anonymous(),
@@ -114,14 +114,20 @@ impl TestEnvironment {
 
 fn load_canister_wasm() -> Vec<u8> {
     let wasm_path_string = match std::env::var("CUSTOM_WASM_PATH") {
-        Ok(path) if !path.is_empty() => path,
+        Ok(path) if !path.is_empty() => {
+            assert!(
+                Path::new(&path).exists(),
+                "CUSTOM_WASM_PATH is set to '{}' but the file does not exist; run `make compile-wasm` first",
+                path
+            );
+            path
+        }
         _ => format!(
             "{}/target/wasm32-unknown-unknown/release/ic_vetkeys_canisters_tests.wasm",
             git_root_dir()
         ),
     };
-    let wasm_path = Path::new(&wasm_path_string);
-    std::fs::read(wasm_path)
+    std::fs::read(&wasm_path_string)
         .expect("wasm does not exist - run `cargo build --release --target wasm32-unknown-unknown`")
 }