diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml index 3cad2596..f0a27bbd 100644 --- a/.github/workflows/linter.yml +++ b/.github/workflows/linter.yml @@ -199,8 +199,8 @@ jobs: run: | mv $PROJECT_NAME ${{ runner.temp }}/ sed -i "s/root/Concordium /g" ${{ runner.temp }}/$PROJECT_NAME/Cargo.toml - sed -i "s/{version = \"6.2\", default-features = false}/{path = \"..\/..\/concordium-std\", default-features = false}/g" ${{ runner.temp }}/$PROJECT_NAME/Cargo.toml - sed -i "s/{version = \"3.1\", default-features = false}/{path = \"..\/..\/concordium-cis2\", default-features = false}/g" ${{ runner.temp }}/$PROJECT_NAME/Cargo.toml + sed -i "s/{version = \"7.0\", default-features = false}/{path = \"..\/..\/concordium-std\", default-features = false}/g" ${{ runner.temp }}/$PROJECT_NAME/Cargo.toml + sed -i "s/{version = \"4.0\", default-features = false}/{path = \"..\/..\/concordium-cis2\", default-features = false}/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 diff --git a/concordium-cis2/CHANGELOG.md b/concordium-cis2/CHANGELOG.md index a3ef2953..cd441e72 100644 --- a/concordium-cis2/CHANGELOG.md +++ b/concordium-cis2/CHANGELOG.md @@ -2,6 +2,10 @@ ## Unreleased changes +## concordium-cis2 4.0.0 (2023-06-16) + +- Bump concordium-std to version 7. + ## concordium-cis2 3.1.0 (2023-05-08) - Derive `PartialEq` and `Eq` for the `MetadataUrl` from the CIS2 library. diff --git a/concordium-contracts-common b/concordium-contracts-common index 79f73e24..b87380dd 160000 --- a/concordium-contracts-common +++ b/concordium-contracts-common @@ -1 +1 @@ -Subproject commit 79f73e24a9b0d12a92fb40e4fe006415006582ed +Subproject commit b87380ddb373dd4bfe120f2e51e88be98210f6f3 diff --git a/concordium-std/CHANGELOG.md b/concordium-std/CHANGELOG.md index 0fc467d4..7423c7fd 100644 --- a/concordium-std/CHANGELOG.md +++ b/concordium-std/CHANGELOG.md @@ -2,6 +2,8 @@ ## Unreleased changes +## concordium-std 7.0.0 (2023-06-16) + - Set minimum Rust version to 1.65. - Move `MetadataUrl` from the CIS-2 library to `concordium-std` along with the schema and serialization to make it available to other CIS standards. - Change the `MetadataUrl` schema: use hex string representation for `hash`. diff --git a/concordium-std/Cargo.toml b/concordium-std/Cargo.toml index 394074be..40d27791 100644 --- a/concordium-std/Cargo.toml +++ b/concordium-std/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "concordium-std" -version = "6.2.0" +version = "7.0.0" authors = ["Concordium "] edition = "2021" rust-version = "1.65" @@ -23,7 +23,7 @@ getrandom = { version = "0.2", features = ["custom"], optional = true } [dependencies.concordium-contracts-common] path = "../concordium-contracts-common/concordium-contracts-common" -version = "6.0" +version = "7.0" default-features = false features = ["smart-contract"] diff --git a/examples/credential-registry/Cargo.toml b/examples/credential-registry/Cargo.toml index ef44b35f..32674bd0 100644 --- a/examples/credential-registry/Cargo.toml +++ b/examples/credential-registry/Cargo.toml @@ -15,7 +15,7 @@ wee_alloc = ["concordium-std/wee_alloc"] crypto-primitives = ["concordium-std/crypto-primitives"] [dependencies] -concordium-std = {path = "../../concordium-std", version="6.2", features = ["concordium-quickcheck"], default-features = false} +concordium-std = {path = "../../concordium-std", version="7.0", features = ["concordium-quickcheck"], default-features = false} quickcheck = {version = "1"} [lib] diff --git a/templates/cis2-nft/Cargo.toml b/templates/cis2-nft/Cargo.toml index 16edee48..e92d211b 100644 --- a/templates/cis2-nft/Cargo.toml +++ b/templates/cis2-nft/Cargo.toml @@ -12,8 +12,8 @@ std = ["concordium-std/std", "concordium-cis2/std"] wee_alloc = ["concordium-std/wee_alloc"] [dependencies] -concordium-std = {version = "6.2", default-features = false} -concordium-cis2 = {version = "3.1", default-features = false} +concordium-std = {version = "7.0", default-features = false} +concordium-cis2 = {version = "4.0", default-features = false} [lib] crate-type=["cdylib", "rlib"] diff --git a/templates/default/Cargo.toml b/templates/default/Cargo.toml index abfb7973..271ebd7a 100644 --- a/templates/default/Cargo.toml +++ b/templates/default/Cargo.toml @@ -14,7 +14,7 @@ std = ["concordium-std/std"] wee_alloc = ["concordium-std/wee_alloc"] [dependencies] -concordium-std = {version = "6.2", default-features = false} +concordium-std = {version = "7.0", default-features = false} [lib] crate-type=["cdylib", "rlib"]