chore(crypto): CRP-2664 remove mock canister from basic_bitcoin examples (#1103)

Author: altkdf

motoko/basic_bitcoin/README.md

@@ -195,6 +195,11 @@ This example is extensively documented in the following tutorials:
 * [Deploying your first Bitcoin dapp](https://internetcomputer.org/docs/current/samples/deploying-your-first-bitcoin-dapp).
 * [Developing Bitcoin dapps locally](https://internetcomputer.org/docs/current/developer-docs/integrations/bitcoin/local-development).
 
+Note that for *testing* on mainnet, the [chain-key testing
+canister](https://github.com/dfinity/chainkey-testing-canister) can be used to
+save on costs for calling the threshold signing APIs for signing the BTC
+transactions.
+
 ## Security considerations and best practices
 
 If you base your application on this example, we recommend you familiarize yourself with and adhere to the [security best practices](https://internetcomputer.org/docs/current/references/security/) for developing on the Internet Computer. This example may not implement all the best practices.

motoko/basic_bitcoin/dfx.json

@@ -4,11 +4,6 @@
     "basic_bitcoin": {
       "main": "src/basic_bitcoin/src/Main.mo",
       "type": "motoko"
-    },
-    "chainkey_testing_canister": {
-      "type": "custom",
-      "candid": "https://github.com/dfinity/chainkey-testing-canister/releases/download/v0.1.0/chainkey_testing_canister.did",
-      "wasm": "https://github.com/dfinity/chainkey-testing-canister/releases/download/v0.1.0/chainkey_testing_canister.wasm.gz"
     }
   },
   "defaults": {

motoko/basic_bitcoin/src/basic_bitcoin/src/Main.mo

@@ -36,19 +36,16 @@ actor class BasicBitcoin(network : Types.Network) {
   // The ECDSA key name.
   let KEY_NAME : Text = switch NETWORK {
     // For local development, we use a special test key with dfx.
-    case (#regtest) "insecure_test_key_1";
+    case (#regtest) "dfx_test_key";
     // On the IC we're using a test ECDSA key.
     case _ "test_key_1";
   };
 
+  // Threshold signing APIs instantiated with the management canister ID. Can be
+  // replaced for cheaper testing.
   var ecdsa_canister_actor : EcdsaCanisterActor = actor ("aaaaa-aa");
   var schnorr_canister_actor : SchnorrCanisterActor = actor ("aaaaa-aa");
 
-  public func for_test_only_change_management_canister_id(p : Principal) {
-    ecdsa_canister_actor := actor (Principal.toText(p));
-    schnorr_canister_actor := actor (Principal.toText(p));
-  };
-
   /// Returns the balance of the given Bitcoin address.
   public func get_balance(address : BitcoinAddress) : async Satoshi {
     await BitcoinApi.get_balance(NETWORK, address);

rust/basic_bitcoin/Makefile

@@ -4,18 +4,8 @@ all: deploy
 .PHONY: deploy
 .SILENT: deploy
 deploy:
-	dfx deploy chainkey_testing_canister
 	dfx deploy basic_bitcoin --argument '(variant { regtest })'
 
-.PHONY: mock
-.SILENT: mock
-mock: deploy
-	SCHNORR_MOCK_CANISTER_ID=$(shell dfx canister id chainkey_testing_canister); \
-	BASIC_BITCOIN_CANISTER_ID=$(shell dfx canister id basic_bitcoin); \
-	echo "Changing to using mock canister instead of management canister"; \
-	CMD="dfx canister call "$${BASIC_BITCOIN_CANISTER_ID}" for_test_only_change_management_canister_id '("\"$${SCHNORR_MOCK_CANISTER_ID}\"")'"; \
-	eval "$${CMD}"
-
 .PHONY: regtest_topup
 .SILENT: regtest_topup
 regtest_topup:

rust/basic_bitcoin/README.md

@@ -227,6 +227,11 @@ This example is extensively documented in the following tutorials:
 * [Deploying your first Bitcoin dapp](https://internetcomputer.org/docs/current/samples/deploying-your-first-bitcoin-dapp).
 * [Developing Bitcoin dapps locally](https://internetcomputer.org/docs/current/developer-docs/integrations/bitcoin/local-development).
 
+Note that for *testing* on mainnet, the [chain-key testing
+canister](https://github.com/dfinity/chainkey-testing-canister) can be used to
+save on costs for calling the threshold signing APIs for signing the BTC
+transactions.
+
 ## Security considerations and best practices
 
 If you base your application on this example, we recommend you familiarize yourself with and adhere to the [security best practices](https://internetcomputer.org/docs/current/references/security/) for developing on the Internet Computer. This example may not implement all the best practices.

rust/basic_bitcoin/dfx.json

@@ -12,11 +12,6 @@
           "name": "candid:service"
         }
       ]
-    },
-    "chainkey_testing_canister": {
-      "type": "custom",
-      "candid": "https://github.com/dfinity/chainkey-testing-canister/releases/download/v0.1.0/chainkey_testing_canister.did",
-      "wasm": "https://github.com/dfinity/chainkey-testing-canister/releases/download/v0.1.0/chainkey_testing_canister.wasm.gz"
     }
   },
   "defaults": {

rust/basic_bitcoin/src/basic_bitcoin/basic_bitcoin.did

@@ -41,8 +41,6 @@ type get_block_headers_response = record {
 };
 
 service : (network) -> {
-  "for_test_only_change_management_canister_id" : (text) -> (variant { Ok: null; Err: text });
-
   "get_p2pkh_address" : () -> (bitcoin_address);
 
   "get_p2tr_address" : () -> (bitcoin_address);

rust/basic_bitcoin/src/basic_bitcoin/src/lib.rs

@@ -28,9 +28,6 @@ thread_local! {
 
     // The ECDSA key name.
     static KEY_NAME: RefCell<String> = RefCell::new(String::from(""));
-
-    // Management canister ID. Can be replaced for testing.
-    static MGMT_CANISTER_ID: RefCell<String> = RefCell::new("aaaaa-aa".to_string());
 }
 
 #[init]
@@ -81,19 +78,6 @@ pub struct GetBlockHeadersResponse {
     pub block_headers: Vec<BlockHeader>,
 }
 
-#[update]
-async fn for_test_only_change_management_canister_id(id: String) -> Result<(), String> {
-    let _ = CanisterId::from_text(&id).map_err(|e| panic!("invalid canister id: {}: {}", id, e));
-    MGMT_CANISTER_ID.with_borrow_mut(move |current_id| {
-        println!(
-            "Changing management canister id from {} to {id}",
-            *current_id
-        );
-        *current_id = id;
-    });
-    Ok(())
-}
-
 /// Returns the block headers in the given height range.
 #[update]
 pub async fn get_block_headers(
@@ -237,11 +221,7 @@ pub struct SendRequest {
     pub amount_in_satoshi: u64,
 }
 
-/// The current management canister Schnorr API in Pocket IC / `dfx` is not yet
-/// fully supported. Therefore, we install the `chainkey_testing_canister` via
-/// `dfx` and use that instead of the management canister for local testing.
 fn mgmt_canister_id() -> CanisterId {
-    MGMT_CANISTER_ID
-        .with_borrow(|id| CanisterId::from_text(id))
-        .expect("invalid management canister principal string")
+    // Management canister ID. Can be replaced for cheaper testing.
+    candid::Principal::management_canister()
 }