Merge branch 'main' into fix-counter-notify

Concordium · Apr 4, 2024 · 607c80b · 607c80b
2 parents 9c1b4b6 + d874117
commit 607c80b
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 7 deletions.
diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml
@@ -353,7 +353,7 @@ jobs:
           sed -i "s/root/Concordium <[email protected]>/g" ${{ runner.temp }}/$PROJECT_NAME/Cargo.toml
           sed -i "s/{version = \"10.0\", default-features = false}/{path = \"..\/..\/concordium-std\", default-features = false}/g" ${{ runner.temp }}/$PROJECT_NAME/Cargo.toml
           sed -i "s/{version = \"6.1\", default-features = false}/{path = \"..\/..\/concordium-cis2\", default-features = false}/g" ${{ runner.temp }}/$PROJECT_NAME/Cargo.toml
-          sed -i "s/concordium-smart-contract-testing = \"4.0\"/concordium-smart-contract-testing = {path = \"..\/..\/contract-testing\"}/g" ${{ runner.temp }}/$PROJECT_NAME/Cargo.toml
+          sed -i "s/concordium-smart-contract-testing = \"4.2\"/concordium-smart-contract-testing = {path = \"..\/..\/contract-testing\"}/g" ${{ runner.temp }}/$PROJECT_NAME/Cargo.toml
           sed -i "s/concordium-std-derive = \"6.0\"/concordium-std-derive = {path = \"..\/..\/concordium-std-derive\"}/g" ${{ runner.temp }}/$PROJECT_NAME/Cargo.toml
           diff ${{ runner.temp }}/$PROJECT_NAME/Cargo.toml examples/cis2-nft/Cargo.toml
           diff ${{ runner.temp }}/$PROJECT_NAME/src/lib.rs examples/cis2-nft/src/lib.rs
@@ -402,7 +402,7 @@ jobs:
           sed -i "s/root/Concordium <[email protected]>/g" ${{ runner.temp }}/$PROJECT_NAME/Cargo.toml
           sed -i "s/version = \"10.0\", default-features = false/path = \"..\/..\/concordium-std\", version = \"10.0\", default-features = false/g" ${{ runner.temp }}/$PROJECT_NAME/Cargo.toml
           sed -i "s/version = \"6.1\", default-features = false/path = \"..\/..\/concordium-cis2\", version = \"6.1\", default-features = false/g" ${{ runner.temp }}/$PROJECT_NAME/Cargo.toml
-          sed -i "s/concordium-smart-contract-testing = \"4.0\"/concordium-smart-contract-testing = {path = \"..\/..\/contract-testing\"}/g" ${{ runner.temp }}/$PROJECT_NAME/Cargo.toml
+          sed -i "s/concordium-smart-contract-testing = \"4.2\"/concordium-smart-contract-testing = {path = \"..\/..\/contract-testing\"}/g" ${{ runner.temp }}/$PROJECT_NAME/Cargo.toml
           sed -i "s/concordium-std-derive = \"6.0\"/concordium-std-derive = {path = \"..\/..\/concordium-std-derive\"}/g" ${{ runner.temp }}/$PROJECT_NAME/Cargo.toml
           diff ${{ runner.temp }}/$PROJECT_NAME/Cargo.toml examples/credential-registry/Cargo.toml
           diff ${{ runner.temp }}/$PROJECT_NAME/src/lib.rs examples/credential-registry/src/lib.rs

diff --git a/concordium-rust-sdk b/concordium-rust-sdk
diff --git a/contract-testing/CHANGELOG.md b/contract-testing/CHANGELOG.md
@@ -2,9 +2,11 @@
 
 ## Unreleased changes
 
+## 4.2.0
+
 - Add support for querying the module reference and contract name of an instance.
   This functionality is only available on-chain from protocol version 7.
-- Bump minimum supported Rust version (MSRV) to `1.72`.
+- Bump minimum supported Rust version (MSRV) to `1.73`.
 
 ## 4.1.0
 

diff --git a/templates/cis2-nft/Cargo.toml b/templates/cis2-nft/Cargo.toml
@@ -16,7 +16,7 @@ concordium-std = {version = "10.0", default-features = false}
 concordium-cis2 = {version = "6.1", default-features = false}
 
 [dev-dependencies]
-concordium-smart-contract-testing = "4.0"
+concordium-smart-contract-testing = "4.2"
 concordium-std-derive = "6.0"
 
 [lib]

diff --git a/templates/credential-registry/Cargo.toml b/templates/credential-registry/Cargo.toml
@@ -20,7 +20,7 @@ concordium-cis2 = {version = "6.1", default-features = false}
 quickcheck = {version = "1"}
 
 [dev-dependencies]
-concordium-smart-contract-testing = "4.0"
+concordium-smart-contract-testing = "4.2"
 concordium-std-derive = "6.0"
 
 [lib]

diff --git a/templates/default/Cargo.toml b/templates/default/Cargo.toml
@@ -17,7 +17,7 @@ bump_alloc = ["concordium-std/bump_alloc"]
 concordium-std = {version = "10.0", default-features = false}
 
 [dev-dependencies]
-concordium-smart-contract-testing = "4.0"
+concordium-smart-contract-testing = "4.2"
 
 [lib]
 crate-type=["cdylib", "rlib"]
+3 −0		CHANGELOG.md
+3 −3		Cargo.toml
+1 −1		concordium-base
+2 −2		src/internal.rs
+3 −3		src/v2/conversions.rs
+3 −1		src/v2/mod.rs