Merge branch 'master' into dependabot/npm_and_yarn/motoko/encrypted-n…

…otes-dapp/word-wrap-1.2.5

motoko/basic_bitcoin/src/basic_bitcoin/basic_bitcoin.did

@@ -1,9 +1,11 @@
 type satoshi = nat64;
 
-type millisatoshi_per_byte = nat64;
+type millisatoshi_per_vbyte = nat64;
 
 type bitcoin_address = text;
 
+type transaction_id = text;
+
 type block_hash = blob;
 
 type network = variant {
@@ -37,10 +39,10 @@ service : (network) -> {
 
     "get_utxos": (bitcoin_address) -> (get_utxos_response);
 
-    "get_current_fee_percentiles": () -> (vec millisatoshi_per_byte);
+    "get_current_fee_percentiles": () -> (vec millisatoshi_per_vbyte);
 
     "send": (record {
       destination_address: bitcoin_address;
       amount_in_satoshi: satoshi;
-    }) -> (text);
+    }) -> (transaction_id);
 }

motoko/basic_bitcoin/src/basic_bitcoin/src/BitcoinApi.mo

@@ -8,7 +8,7 @@ module {
   type Network = Types.Network;
   type BitcoinAddress = Types.BitcoinAddress;
   type GetUtxosResponse = Types.GetUtxosResponse;
-  type MillisatoshiPerByte = Types.MillisatoshiPerByte;
+  type MillisatoshiPerVByte = Types.MillisatoshiPerVByte;
   type GetBalanceRequest = Types.GetBalanceRequest;
   type GetUtxosRequest = Types.GetUtxosRequest;
   type GetCurrentFeePercentilesRequest = Types.GetCurrentFeePercentilesRequest;
@@ -25,7 +25,7 @@ module {
   type ManagementCanisterActor = actor {
       bitcoin_get_balance : GetBalanceRequest -> async Satoshi;
       bitcoin_get_utxos : GetUtxosRequest -> async GetUtxosResponse;
-      bitcoin_get_current_fee_percentiles : GetCurrentFeePercentilesRequest -> async [MillisatoshiPerByte];
+      bitcoin_get_current_fee_percentiles : GetCurrentFeePercentilesRequest -> async [MillisatoshiPerVByte];
       bitcoin_send_transaction : SendTransactionRequest -> async ();
   };
 
@@ -46,9 +46,7 @@ module {
 
   /// Returns the UTXOs of the given Bitcoin address.
   ///
-  /// NOTE: Pagination is ignored in this example. If an address has many thousands
-  /// of UTXOs, then subsequent calls to `bitcoin_get_utxos` are required.
-  ///
+  /// NOTE: Relies on the `bitcoin_get_utxos` endpoint.
   /// See https://internetcomputer.org/docs/current/references/ic-interface-spec/#ic-bitcoin_get_utxos
   public func get_utxos(network : Network, address : BitcoinAddress) : async GetUtxosResponse {
     ExperimentalCycles.add(GET_UTXOS_COST_CYCLES);
@@ -59,12 +57,12 @@ module {
     })
   };
 
-  /// Returns the 100 fee percentiles measured in millisatoshi/byte.
+  /// Returns the 100 fee percentiles measured in millisatoshi/vbyte.
   /// Percentiles are computed from the last 10,000 transactions (if available).
   ///
   /// Relies on the `bitcoin_get_current_fee_percentiles` endpoint.
   /// See https://internetcomputer.org/docs/current/references/ic-interface-spec/#ic-bitcoin_get_current_fee_percentiles
-  public func get_current_fee_percentiles(network : Network) : async [MillisatoshiPerByte] {
+  public func get_current_fee_percentiles(network : Network) : async [MillisatoshiPerVByte] {
     ExperimentalCycles.add(GET_CURRENT_FEE_PERCENTILES_COST_CYCLES);
     await management_canister_actor.bitcoin_get_current_fee_percentiles({
         network;

motoko/basic_bitcoin/src/basic_bitcoin/src/BitcoinWallet.mo

@@ -36,7 +36,7 @@ module {
   type BitcoinAddress = Types.BitcoinAddress;
   type Satoshi = Types.Satoshi;
   type Utxo = Types.Utxo;
-  type MillisatoshiPerByte = Types.MillisatoshiPerByte;
+  type MillisatoshiPerVByte = Types.MillisatoshiPerVByte;
   let CURVE = Types.CURVE;
   type PublicKey = EcdsaTypes.PublicKey;
   type Transaction = Transaction.Transaction;
@@ -61,25 +61,28 @@ module {
     // Get fee percentiles from previous transactions to estimate our own fee.
     let fee_percentiles = await BitcoinApi.get_current_fee_percentiles(network);
 
-    let fee_per_byte : MillisatoshiPerByte = if(fee_percentiles.size() == 0) {
+    let fee_per_vbyte : MillisatoshiPerVByte = if(fee_percentiles.size() == 0) {
         // There are no fee percentiles. This case can only happen on a regtest
         // network where there are no non-coinbase transactions. In this case,
-        // we use a default of 1000 millisatoshis/byte (i.e. 2 satoshi/byte)
+        // we use a default of 1000 millisatoshis/vbyte (i.e. 2 satoshi/byte)
         2000
     } else {
         // Choose the 50th percentile for sending fees.
-        fee_percentiles[49]
+        fee_percentiles[50]
     };
 
     // Fetch our public key, P2PKH address, and UTXOs.
     let own_public_key = Blob.toArray(await EcdsaApi.ecdsa_public_key(key_name, Array.map(derivation_path, Blob.fromArray)));
     let own_address = public_key_to_p2pkh_address(network, own_public_key);
 
     Debug.print("Fetching UTXOs...");
+    // Note that pagination may have to be used to get all UTXOs for the given address.
+    // For the sake of simplicity, it is assumed here that the `utxo` field in the response
+    // contains all UTXOs.
     let own_utxos = (await BitcoinApi.get_utxos(network, own_address)).utxos;
 
     // Build the transaction that sends `amount` to the destination address.
-    let tx_bytes = await build_transaction(own_public_key, own_address, own_utxos, dst_address, amount, fee_per_byte);
+    let tx_bytes = await build_transaction(own_public_key, own_address, own_utxos, dst_address, amount, fee_per_vbyte);
     let transaction =
         Utils.get_ok(Transaction.fromBytes(Iter.fromArray(tx_bytes)));
 
@@ -107,7 +110,7 @@ public func build_transaction(
     own_utxos : [Utxo],
     dst_address : BitcoinAddress,
     amount : Satoshi,
-    fee_per_byte : MillisatoshiPerByte,
+    fee_per_vbyte : MillisatoshiPerVByte,
 ) : async [Nat8] {
     // We have a chicken-and-egg problem where we need to know the length
     // of the transaction in order to compute its proper fee, but we need
@@ -117,7 +120,7 @@ public func build_transaction(
     // We solve this problem iteratively. We start with a fee of zero, build
     // and sign a transaction, see what its size is, and then update the fee,
     // rebuild the transaction, until the fee is set to the correct amount.
-    let fee_per_byte_nat = Nat64.toNat(fee_per_byte);
+    let fee_per_vbyte_nat = Nat64.toNat(fee_per_vbyte);
     Debug.print("Building transaction...");
     var total_fee : Nat = 0;
     loop {
@@ -137,11 +140,11 @@ public func build_transaction(
 
         let signed_tx_bytes_len : Nat = signed_transaction_bytes.size();
 
-        if((signed_tx_bytes_len * fee_per_byte_nat) / 1000 == total_fee) {
+        if((signed_tx_bytes_len * fee_per_vbyte_nat) / 1000 == total_fee) {
             Debug.print("Transaction built with fee " # debug_show(total_fee));
             return transaction.toBytes();
         } else {
-            total_fee := (signed_tx_bytes_len * fee_per_byte_nat) / 1000;
+            total_fee := (signed_tx_bytes_len * fee_per_vbyte_nat) / 1000;
         }
     }
   };

motoko/basic_bitcoin/src/basic_bitcoin/src/EcdsaApi.mo

@@ -7,13 +7,17 @@ module {
   type ECDSAPublicKeyReply = Types.ECDSAPublicKeyReply;
   type SignWithECDSA = Types.SignWithECDSA;
   type SignWithECDSAReply = Types.SignWithECDSAReply;
+  type Cycles = Types.Cycles;
 
   /// Actor definition to handle interactions with the ECDSA canister.
   type EcdsaCanisterActor = actor {
       ecdsa_public_key : ECDSAPublicKey -> async ECDSAPublicKeyReply;
       sign_with_ecdsa : SignWithECDSA -> async SignWithECDSAReply;
   };
 
+  // The fee for the `sign_with_ecdsa` endpoint using the test key.
+  let SIGN_WITH_ECDSA_COST_CYCLES : Cycles = 10_000_000_000;
+
   let ecdsa_canister_actor : EcdsaCanisterActor = actor("aaaaa-aa");
 
   /// Returns the ECDSA public key of this canister at the given derivation path.
@@ -33,7 +37,7 @@ module {
   };
 
   public func sign_with_ecdsa(key_name : Text, derivation_path : [Blob], message_hash : Blob) : async Blob {
-    ExperimentalCycles.add(10_000_000_000);
+    ExperimentalCycles.add(SIGN_WITH_ECDSA_COST_CYCLES);
     let res = await ecdsa_canister_actor.sign_with_ecdsa({
         message_hash;
         derivation_path;

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

@@ -7,7 +7,7 @@ import Utils "Utils";
 
 actor class BasicBitcoin(_network : Types.Network) {
   type GetUtxosResponse = Types.GetUtxosResponse;
-  type MillisatoshiPerByte = Types.MillisatoshiPerByte;
+  type MillisatoshiPerVByte = Types.MillisatoshiPerVByte;
   type SendRequest = Types.SendRequest;
   type Network = Types.Network;
   type BitcoinAddress = Types.BitcoinAddress;
@@ -41,9 +41,9 @@ actor class BasicBitcoin(_network : Types.Network) {
     await BitcoinApi.get_utxos(NETWORK, address)
   };
 
-  /// Returns the 100 fee percentiles measured in millisatoshi/byte.
+  /// Returns the 100 fee percentiles measured in millisatoshi/vbyte.
   /// Percentiles are computed from the last 10,000 transactions (if available).
-  public func get_current_fee_percentiles() : async [MillisatoshiPerByte] {
+  public func get_current_fee_percentiles() : async [MillisatoshiPerVByte] {
     await BitcoinApi.get_current_fee_percentiles(NETWORK)
   };
 

motoko/basic_bitcoin/src/basic_bitcoin/src/Types.mo

@@ -37,7 +37,7 @@ module Types {
     };
 
     public type Satoshi = Nat64;
-    public type MillisatoshiPerByte = Nat64;
+    public type MillisatoshiPerVByte = Nat64;
     public type Cycles = Nat;
     public type BitcoinAddress = Text;
     public type BlockHash = [Nat8];

motoko/encrypted-notes-dapp-vetkd/README.md

@@ -15,10 +15,16 @@ Please also see the [README of the original encrypted-notes-dapp](../encrypted-n
 This example uses an [**insecure** implementation](../../rust/vetkd/src/system_api) of [the proposed vetKD system API](https://github.com/dfinity/interface-spec/pull/158) in a pre-compiled form via the [vetkd_system_api.wasm](./vetkd_system_api.wasm). **Do not use this in production or for sensitive data**! This example is solely provided **for demonstration purposes** to collect feedback on the mentioned vetKD system API.
 
 ## Manual local deployment
-1. For **Motoko** deployment set environmental variable:
+1. Choose which implementation to use by setting a respective environment variable. You can choose Motoko or Rust.
+
+   For **Motoko** deployment use
    ```sh
    export BUILD_ENV=motoko
    ```
+   For **Rust** deployment use
+   ```sh
+   export BUILD_ENV=rust
+   ```
 2. To generate `$BUILD_ENV`-specific files (i.e., Motoko or Rust) run:
    ```sh
    sh ./pre_deploy.sh

motoko/encrypted-notes-dapp/README.md

@@ -121,11 +121,7 @@ Follow the steps below to deploy this sample project.
 cd examples/motoko/encrypted-notes-dapp
 ```
 
-or
-
-```
-cd examples/rust/encrypted-notes-dapp
-```
+This project folder contains the files for both Motoko and Rust development.
 
 ### Step 2: Set an environmental variable reflecting which backend canister you'll be using:
 For Motoko deployment run:

motoko/ic-pos/.eslintrc.cjs

@@ -0,0 +1,17 @@
+module.exports = {
+  env: { browser: true, es2020: true },
+  extends: [
+    'eslint:recommended',
+    'plugin:@typescript-eslint/recommended',
+    'plugin:react-hooks/recommended',
+  ],
+  parser: '@typescript-eslint/parser',
+  parserOptions: { ecmaVersion: 'latest', sourceType: 'module' },
+  plugins: ['react-refresh'],
+  rules: {
+    'react-refresh/only-export-components': 'warn',
+  },
+  globals: {
+    process: "readonly"
+  },
+}

motoko/ic-pos/.gitignore

@@ -0,0 +1,34 @@
+# Various IDEs and Editors
+.vscode/
+.idea/
+**/*~
+
+# Mac OSX temporary files
+.DS_Store
+**/.DS_Store
+
+# dfx temporary files
+.dfx/
+
+# rust
+target/
+
+# frontend code
+node_modules/
+dist/
+
+# environment variables
+.env
+
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+
+# yarn cache
+.yarn/cache
+
+# misc
+scratch/

motoko/ic-pos/CHANGELOG.md

@@ -0,0 +1,29 @@
+# Changelog
+
+## [0.3.0] - 2022-09-10
+
+### Added
+
+- Now you can charge a set amount, similar to Sumup and the likes. Enter the amount to charge and click the "Charge" button. The generated QR code will contain information about the token and amount to charge. The customer can then scan and pay with any wallet that supports the QR format, NNS for instance. Raad more about ICRC-22 payment requests: https://github.com/dfinity/ICRC/issues/22
+
+### Fixed
+
+- Improved printing styles, QR code now fills more of the page.
+
+## [0.2.0] - 2022-09-06
+
+### Added
+
+- Principal pills are now clickable. Click to copy the principal id to the clipboard.
+
+### Changed
+
+- The `icpos` canister continuoulsy monitors the ckBTC ledger and sends notifications to merchants that choosen to receive email or sms. The ledger id used to be hardcode, now there is a function `setLedgerId` that can be called at runtime.
+- `dfx.json`: settings now included to run an ICRC-1 ledger and index locally.
+- Upgraded to latest versions of `@dfinity/xxx` packages.
+- Removed reliance on the HTTP ckBTC transaction API. Instead, IC-POS now uses the ledger canister directly to monitor transactions.
+- ckBTC balances are now updated in the UI after received transfers.
+
+## [0.1.0]
+
+Initial release.

motoko/ic-pos/LICENSE

@@ -0,0 +1,7 @@
+Copyright 2023 Kristofer Lund <[email protected]>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.