Update deps and prepare release of cargo-concordium and vscode ext

cargo-concordium/CHANGELOG.md

@@ -2,12 +2,17 @@
 
 ## Unreleased changes
 
-- Added a `tag` option to `cargo concordium init`
+## 4.0.0
+
+- Use smart contract v1 cost configuration when simulating locally (the reduce execution cost introduced as part of Concordium Protocol Version 7)
+- Added a `--tag <RELEASE-TAG>` option to `cargo concordium init` to allow specifying the release tag of the templates.
+  Defaults to `releases/templates/latest`.
 - When running integration tests the module output path is now exposed to the
   tests via the `CARGO_CONCORDIUM_TEST_MODULE_OUTPUT_PATH` environment variable.
-- Change the default build output path to `concordium-out/module.wasm.v1`.
-- Remove requirement for `--out` flag when using the `--verifiable` flag.
-- Embed the schema in the Wasm module by default. Therefore, the `--schema-embed` flag is now deprecated. This behavior can be disabled with the `--no-schema-embed` flag.
+- Introduce a default build output (`--out <PATH>`) path to `concordium-out/module.wasm.v1`.
+- Remove requirement for `--out` flag when using the `--verifiable` flag, now using the default output path.
+- Embed the schema in the Wasm module by default and can be disabled using the `--no-schema-embed` flag. 
+  The `--schema-embed` flag (short `-e`) is now deprecated.
 - Fixed long error message when the `wasm32-unknown-unknown` target is not installed.
 
 ## 3.3.0

cargo-concordium/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "cargo-concordium"
-version = "3.3.0"
+version = "4.0.0"
 authors = ["Concordium <[email protected]>"]
 edition = "2021"
 license-file = "../LICENSE"
@@ -38,13 +38,13 @@ flate2 = "1.0"
 
 [dependencies.concordium-wasm]
 path = "../concordium-base/smart-contracts/wasm-transform"
-version = "4.0"
+version = "5.0"
 
 [dependencies.concordium-smart-contract-engine]
-version = "5.0"
+version = "6.0"
 path = "../concordium-base/smart-contracts/wasm-chain-integration/"
 features = ["display-state"]
 
 [dependencies.concordium_base]
-version = "5.0"
+version = "6.0"
 path = "../concordium-base/rust-src/concordium_base"

cargo-concordium/src/main.rs

@@ -23,6 +23,7 @@ use concordium_wasm::{
     output::{write_custom_section, Output},
     parse::parse_skeleton,
     validate::ValidationConfig,
+    CostConfigurationV1,
 };
 use ptree::{print_tree_with, PrintConfig, TreeBuilder};
 use sha2::Digest;
@@ -1434,6 +1435,7 @@ fn handle_run_v0(run_cmd: RunCommand, module: &[u8]) -> anyhow::Result<()> {
                 &name,
                 parameter.as_parameter(),
                 false, // Whether number of logs should be limited. Limit removed in PV5.
+                CostConfigurationV1,
                 runner.energy,
             )
             .context("Initialization failed due to a runtime error.")?;
@@ -1533,6 +1535,7 @@ fn handle_run_v0(run_cmd: RunCommand, module: &[u8]) -> anyhow::Result<()> {
                 &init_state,
                 u16::MAX as usize, // Max parameter size in PV5.
                 false,             // Whether to limit number of logs. Limit removed in PV5.
+                CostConfigurationV1,
             )
             .context("Calling receive failed.")?;
             match res {
@@ -1875,6 +1878,7 @@ fn handle_run_v1(run_cmd: RunCommand, module: &[u8]) -> anyhow::Result<()> {
                 &name,
                 loader,
                 ValidationConfig::V1,
+                CostConfigurationV1,
                 false, /* Whether number of logs and size of return values should be limited.
                         * Limits removed in PV5. */
             )
@@ -1983,6 +1987,7 @@ fn handle_run_v1(run_cmd: RunCommand, module: &[u8]) -> anyhow::Result<()> {
 
             let artifact = concordium_wasm::utils::instantiate_with_metering(
                 ValidationConfig::V1,
+                CostConfigurationV1,
                 &v1::ConcordiumAllowedImports {
                     support_upgrade: true,
                     enable_debug:    true, /* we always allow the debug statements in the

vscode-smart-contracts/CHANGELOG.md

@@ -2,6 +2,11 @@
 
 ## Unreleased
 
+## 3.0.0
+
+- Contains `cargo-concordium` version 4.0.0
+- Contains `@concordium/ccd-js-gen` version 1.2.0
+
 ## 2.2.0
 
 - Contains `cargo-concordium` version 3.2.0

vscode-smart-contracts/README.md

@@ -65,6 +65,11 @@ This extension contributes the following settings:
 
 ## Release Notes
 
+## 3.0.0
+
+- Contains `cargo-concordium` version 4.0.0
+- Contains `@concordium/ccd-js-gen` version 1.2.0
+
 ## 2.2.0
 
 - Contains `cargo-concordium` version 3.2.0

vscode-smart-contracts/package.json

@@ -4,7 +4,7 @@
   "displayName": "Concordium Smart Contracts",
   "icon": "icon.png",
   "description": "Develop and build smart contracts on Concordium",
-  "version": "2.2.0",
+  "version": "3.0.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/Concordium/concordium-smart-contract-tools.git",

vscode-smart-contracts/src/commands.ts

@@ -127,16 +127,15 @@ async function buildTask(
 
   const schemaArgs =
     schemaSettings === "skip"
-      ? []
+      ? ["--no-schema-embed"]
       : schemaSettings === "embed-and-outDir"
       ? [
-          "--schema-embed",
           "--schema-json-out",
           outDir,
           "--schema-base64-out",
           path.join(outDir, "module-schema.bs64"),
         ]
-      : ["--schema-json-out", outDir];
+      : ["--no-schema-embed", "--schema-json-out", outDir];
   const additionalArgs = config.getAdditionalBuildArgs();
   const moduleOut = path.join(outDir, "module.wasm.v1");
   const args = ["--out", moduleOut].concat(schemaArgs, additionalArgs);

vscode-smart-contracts/src/extension.ts

@@ -85,7 +85,6 @@ const taskProvider: vscode.TaskProvider = {
               defaultOutDir,
               "--schema-base64-out",
               path.join(defaultOutDir, "module-schema.bs64"),
-              "--schema-embed",
             ];
             const defaultJsGenArgs = [
               "--module",