Merge branch 'master' into chore-update-replica-3d6a76efba59d6f03026d…

…6b7c1c9a1dfce96ee93-master

CHANGELOG.md

@@ -75,6 +75,10 @@ Updated dependencies.
 - https://github.com/dfinity/sdk/pull/3898
 - https://github.com/dfinity/sdk/pull/3889
 
+### Motoko
+
+Updated Motoko to [0.12.1](https://github.com/dfinity/motoko/releases/tag/0.12.1)
+
 # 0.23.0
 
 ### fix: relax content security policy for sveltekit starter

README.md

@@ -36,6 +36,24 @@ but typically are used as part of the whole `IC SDK`.
 
 ## Getting Started
 
+### Prerequisites 
+
+#### Install Rust
+
+To develop Rust projects, you will need to install Rust in your environment with the command:
+
+```
+curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh
+```
+
+#### Install `wasm32-unknown-unknown` target
+
+ICP smart contracts are compiled into WebAssembly modules. To support this compilation, install the `wasm32-unknown-unknown` target:
+
+```
+rustup target add wasm32-unknown-unknown
+```
+
 ### Installing
 
 You can install the `IC SDK` a few different ways.

nix/sources.json

@@ -130,27 +130,27 @@
         "builtin": false,
         "description": "The Motoko base library",
         "owner": "dfinity",
-        "sha256": "0bhha1sjwxdbbvksww5jpibb1ls0xv70kkpignj2zwky9bmb6isz",
+        "sha256": "1ilqh5f8y5dwf7vx9g627bw6vprg42z9qm8cl24kdcaakqvb7p8l",
         "type": "tarball",
-        "url": "https://github.com/dfinity/motoko/releases/download/0.11.3/motoko-base-library.tar.gz",
+        "url": "https://github.com/dfinity/motoko/releases/download/0.12.1/motoko-base-library.tar.gz",
         "url_template": "https://github.com/dfinity/motoko/releases/download/<version>/motoko-base-library.tar.gz",
-        "version": "0.11.3"
+        "version": "0.12.1"
     },
     "motoko-x86_64-darwin": {
         "builtin": false,
-        "sha256": "1wix5f75qfkrq1jq298jf4d0xqjcn85yr9c6s52zvghhnqx2nawq",
+        "sha256": "0yjzfavxfllmg1dnrbmm1aw3l9kk10dxsa8jy5c284iwz6ka3ks1",
         "type": "file",
-        "url": "https://github.com/dfinity/motoko/releases/download/0.11.3/motoko-Darwin-x86_64-0.11.3.tar.gz",
+        "url": "https://github.com/dfinity/motoko/releases/download/0.12.1/motoko-Darwin-x86_64-0.12.1.tar.gz",
         "url_template": "https://github.com/dfinity/motoko/releases/download/<version>/motoko-Darwin-x86_64-<version>.tar.gz",
-        "version": "0.11.3"
+        "version": "0.12.1"
     },
     "motoko-x86_64-linux": {
         "builtin": false,
-        "sha256": "0h99sb6sfi1ym6qys9cj1r40hjx0ph849s7w0ldx62xi41b8rl1n",
+        "sha256": "1qmyrnirwgrafgqdwv4bw5803gzinvqa7mfk7qnlmmhgm5csjp8y",
         "type": "file",
-        "url": "https://github.com/dfinity/motoko/releases/download/0.11.3/motoko-Linux-x86_64-0.11.3.tar.gz",
+        "url": "https://github.com/dfinity/motoko/releases/download/0.12.1/motoko-Linux-x86_64-0.12.1.tar.gz",
         "url_template": "https://github.com/dfinity/motoko/releases/download/<version>/motoko-Linux-x86_64-<version>.tar.gz",
-        "version": "0.11.3"
+        "version": "0.12.1"
     },
     "pocket-ic-x86_64-darwin": {
         "rev": "179973553248415fc85679d853b48b0e0ec231c6",

scripts/workflows/provision-darwin.sh

@@ -24,8 +24,8 @@ if [ "$E2E_TEST" = "tests-dfx/build_rust.bash" ]; then
     cargo uninstall cargo-audit
 fi
 if [ "$E2E_TEST" = "tests-dfx/certificate.bash" ]; then
-     brew fetch --retry mitmproxy
-     brew install mitmproxy
+     brew fetch --retry --cask mitmproxy
+     brew install --cask mitmproxy --no-quarantine
 fi
 if [ "$E2E_TEST" = "tests-dfx/deps.bash" ]; then
      cargo install [email protected] --locked

src/dfx/assets/dfx-asset-sources.toml

@@ -22,8 +22,8 @@ url = 'https://download.dfinity.systems/ic/179973553248415fc85679d853b48b0e0ec23
 sha256 = 'c46651590e9b4b01403d7620856b9c7ea2aa8f60ec5eed0cb6a4113bed01ad5c'
 
 [x86_64-darwin.motoko]
-url = 'https://github.com/dfinity/motoko/releases/download/0.11.3/motoko-Darwin-x86_64-0.11.3.tar.gz'
-sha256 = '982b2b3ab610befd45d186a5ec0bb24ce20e1a7112258165c0793a5c8e2b3df2'
+url = 'https://github.com/dfinity/motoko/releases/download/0.12.1/motoko-Darwin-x86_64-0.12.1.tar.gz'
+sha256 = '41cfa1a6f93c122458f11229dd1b0873263ab80ab5ae6c5b789552d7b7725f7a'
 # The replica, canister_sandbox and compiler_sandbox binaries must have the same revision.
 
 [x86_64-darwin.replica]
@@ -53,8 +53,8 @@ url = 'https://download.dfinity.systems/ic/179973553248415fc85679d853b48b0e0ec23
 sha256 = '65a73e56616b65e55ab526f4c03235a82604ff902e086473953fa038c940020a'
 
 [x86_64-darwin.motoko-base]
-url = 'https://github.com/dfinity/motoko/releases/download/0.11.3/motoko-base-library.tar.gz'
-sha256 = 'bb3df5e7a8a84fc5cc78b83bee54cf536ff8c01152e7745333214a9cd2fd0e2b'
+url = 'https://github.com/dfinity/motoko/releases/download/0.12.1/motoko-base-library.tar.gz'
+sha256 = '21a9c67658033a9cfafae2b9b1a601b5536e460621ede835f879a1c76eaa0a45'
 
 [x86_64-darwin.ic-btc-canister]
 url = 'https://github.com/dfinity/bitcoin-canister/releases/download/release%2F2023-10-13/ic-btc-canister.wasm.gz'
@@ -81,8 +81,8 @@ url = 'https://download.dfinity.systems/ic/179973553248415fc85679d853b48b0e0ec23
 sha256 = 'd03ab6254f5a90917a06e60c5c848db18dc9abadb940ecd6f5d71caabd76774d'
 
 [x86_64-linux.motoko]
-url = 'https://github.com/dfinity/motoko/releases/download/0.11.3/motoko-Linux-x86_64-0.11.3.tar.gz'
-sha256 = '36d08c5620b10bd31b05fce84410bca04b08480e9225edb1a93e44a7cdd22941'
+url = 'https://github.com/dfinity/motoko/releases/download/0.12.1/motoko-Linux-x86_64-0.12.1.tar.gz'
+sha256 = '1e5da959a90fd64a2d3ed3d5a3f0b6f1bf0150e18b6cdef0732a3f9ea3cdbee2'
 # The replica, canister_sandbox and compiler_sandbox binaries must have the same revision.
 
 [x86_64-linux.replica]
@@ -112,8 +112,8 @@ url = 'https://download.dfinity.systems/ic/179973553248415fc85679d853b48b0e0ec23
 sha256 = 'a0f883537a23a14df3b1f21987e089a0884dbc226f818bc2cc2e3df028042ad8'
 
 [x86_64-linux.motoko-base]
-url = 'https://github.com/dfinity/motoko/releases/download/0.11.3/motoko-base-library.tar.gz'
-sha256 = 'bb3df5e7a8a84fc5cc78b83bee54cf536ff8c01152e7745333214a9cd2fd0e2b'
+url = 'https://github.com/dfinity/motoko/releases/download/0.12.1/motoko-base-library.tar.gz'
+sha256 = '21a9c67658033a9cfafae2b9b1a601b5536e460621ede835f879a1c76eaa0a45'
 
 [x86_64-linux.ic-btc-canister]
 url = 'https://github.com/dfinity/bitcoin-canister/releases/download/release%2F2023-10-13/ic-btc-canister.wasm.gz'

src/dfx/src/commands/new.rs

@@ -8,7 +8,7 @@ use crate::util::assets;
 use crate::util::clap::parsers::project_name_parser;
 use anyhow::{anyhow, bail, ensure, Context};
 use clap::builder::PossibleValuesParser;
-use clap::{Parser, ValueEnum};
+use clap::Parser;
 use console::{style, Style};
 use dfx_core::config::project_templates::{
     find_project_template, get_project_template, get_sorted_templates, project_template_cli_names,
@@ -22,7 +22,6 @@ use indicatif::HumanBytes;
 use semver::Version;
 use slog::{info, warn, Logger};
 use std::collections::BTreeMap;
-use std::fmt::{self, Display, Formatter};
 use std::io::{self, IsTerminal, Read};
 use std::path::{Path, PathBuf};
 use std::process::{Command, Stdio};
@@ -93,24 +92,6 @@ fn extras_project_template_name_parser() -> PossibleValuesParser {
     PossibleValuesParser::new(options)
 }
 
-#[derive(ValueEnum, Debug, Copy, Clone, PartialEq, Eq)]
-enum Extra {
-    InternetIdentity,
-    Bitcoin,
-    FrontendTests,
-}
-
-impl Display for Extra {
-    fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
-        match self {
-            Self::InternetIdentity => "Internet Identity",
-            Self::Bitcoin => "Bitcoin (Regtest)",
-            Self::FrontendTests => "Frontend tests",
-        }
-        .fmt(f)
-    }
-}
-
 enum Status<'a> {
     Create(&'a Path, usize),
     CreateDir(&'a Path),