diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml index 0eea80c8..f41678e3 100644 --- a/.github/workflows/linter.yml +++ b/.github/workflows/linter.yml @@ -331,8 +331,8 @@ jobs: run: | mv $PROJECT_NAME ${{ runner.temp }}/ sed -i "s/root/Concordium /g" ${{ runner.temp }}/$PROJECT_NAME/Cargo.toml - sed -i "s/{version = \"8.0\", default-features = false}/{path = \"..\/..\/concordium-std\", default-features = false}/g" ${{ runner.temp }}/$PROJECT_NAME/Cargo.toml - sed -i "s/{version = \"5.0\", default-features = false}/{path = \"..\/..\/concordium-cis2\", default-features = false}/g" ${{ runner.temp }}/$PROJECT_NAME/Cargo.toml + sed -i "s/{version = \"8.1\", default-features = false}/{path = \"..\/..\/concordium-std\", default-features = false}/g" ${{ runner.temp }}/$PROJECT_NAME/Cargo.toml + sed -i "s/{version = \"5.1\", default-features = false}/{path = \"..\/..\/concordium-cis2\", default-features = false}/g" ${{ runner.temp }}/$PROJECT_NAME/Cargo.toml sed -i "s/concordium-smart-contract-testing = \"3.0\"/concordium-smart-contract-testing = {path = \"..\/..\/contract-testing\"}/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 @@ -379,9 +379,9 @@ jobs: run: | mv $PROJECT_NAME ${{ runner.temp }}/ sed -i "s/root/Concordium /g" ${{ runner.temp }}/$PROJECT_NAME/Cargo.toml - sed -i "s/version = \"8.0\", default-features = false/path = \"..\/..\/concordium-std\", version = \"8.0\", default-features = false/g" ${{ runner.temp }}/$PROJECT_NAME/Cargo.toml - sed -i "s/version = \"5.0\", default-features = false/path = \"..\/..\/concordium-cis2\", version = \"5.0\", default-features = false/g" ${{ runner.temp }}/$PROJECT_NAME/Cargo.toml - sed -i "s/concordium-smart-contract-testing = \"3.0\"/concordium-smart-contract-testing = {path = \"..\/..\/contract-testing\"}/g" ${{ runner.temp }}/$PROJECT_NAME/Cargo.toml + sed -i "s/version = \"8.1\", default-features = false/path = \"..\/..\/concordium-std\", version = \"8.1\", default-features = false/g" ${{ runner.temp }}/$PROJECT_NAME/Cargo.toml + sed -i "s/version = \"5.1\", default-features = false/path = \"..\/..\/concordium-cis2\", version = \"5.1\", default-features = false/g" ${{ runner.temp }}/$PROJECT_NAME/Cargo.toml + sed -i "s/concordium-smart-contract-testing = \"3.1\"/concordium-smart-contract-testing = {path = \"..\/..\/contract-testing\"}/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 ${{ runner.temp }}/$PROJECT_NAME/tests/tests.rs examples/credential-registry/tests/tests.rs diff --git a/concordium-cis2/CHANGELOG.md b/concordium-cis2/CHANGELOG.md index 06ac096b..a3866a8f 100644 --- a/concordium-cis2/CHANGELOG.md +++ b/concordium-cis2/CHANGELOG.md @@ -1,6 +1,9 @@ # Changelog ## Unreleased changes + +## concordium-cis2 5.1.0 (2023-10-18) + - Derive `PartialEq` and `Eq` for `Cis2Event`, `BalanceOfQueryResponse`, and `OperatorOfQueryResponse`. ## concordium-cis2 5.0.0 (2023-08-21) diff --git a/concordium-cis2/Cargo.toml b/concordium-cis2/Cargo.toml index 2be06c7c..3d001501 100644 --- a/concordium-cis2/Cargo.toml +++ b/concordium-cis2/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "concordium-cis2" -version = "5.0.0" +version = "5.1.0" authors = ["Concordium "] edition = "2021" license = "MPL-2.0" diff --git a/concordium-rust-sdk b/concordium-rust-sdk index 73a159cb..c2bcf2b2 160000 --- a/concordium-rust-sdk +++ b/concordium-rust-sdk @@ -1 +1 @@ -Subproject commit 73a159cb4bbd8c5bb81b69e453ba2ae8f5bf1197 +Subproject commit c2bcf2b2cb048b3d19072cbd1bb19e2829328e1f diff --git a/concordium-std/CHANGELOG.md b/concordium-std/CHANGELOG.md index 3da0d600..d5d7f40f 100644 --- a/concordium-std/CHANGELOG.md +++ b/concordium-std/CHANGELOG.md @@ -2,6 +2,8 @@ ## Unreleased changes +## concordium-std 8.1.0 (2023-10-18) + - Set minimum Rust version to 1.66. - Fix bug in `StateMap::get_mut`, which allowed multiple mutable references to the state to coexist. - The signature has changed using `&self` to using `&mut self`. diff --git a/concordium-std/Cargo.toml b/concordium-std/Cargo.toml index b40020b3..c8aa53bc 100644 --- a/concordium-std/Cargo.toml +++ b/concordium-std/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "concordium-std" -version = "8.0.0" +version = "8.1.0" authors = ["Concordium "] edition = "2021" rust-version = "1.66" @@ -23,7 +23,7 @@ getrandom = { version = "0.2", features = ["custom"], optional = true } [dependencies.concordium-contracts-common] path = "../concordium-rust-sdk/concordium-base/smart-contracts/contracts-common/concordium-contracts-common" -version = "8.0" +version = "8.1" default-features = false features = ["smart-contract"] diff --git a/contract-testing/CHANGELOG.md b/contract-testing/CHANGELOG.md index 46224f0d..e0585af7 100644 --- a/contract-testing/CHANGELOG.md +++ b/contract-testing/CHANGELOG.md @@ -2,6 +2,8 @@ ## Unreleased changes +## 3.1.0 + - Add functionality for setting the exchange rates and block time of the chain based on queries from an external node. - Configured via a builder pattern, see `Chain::builder`. - Add methods to `Chain`: @@ -15,8 +17,8 @@ - `Endpoint` - Add methods to the `Chain` for adding external accounts and contracts and for invoking contracts on an external node. - See the `Chain` method `contract_invoke_external` for more details. -- Bump minimum supported Rust version to `1.66`. - Add helper method `parse_return_value` to `ContractInvokeError` and `ContractInvokeSuccess`. +- Bump minimum supported Rust version to `1.66`. ## 3.0.0 diff --git a/contract-testing/Cargo.toml b/contract-testing/Cargo.toml index 1d39ca72..7c5952af 100644 --- a/contract-testing/Cargo.toml +++ b/contract-testing/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "concordium-smart-contract-testing" -version = "3.0.0" +version = "3.1.0" edition = "2021" rust-version = "1.66" license = "MPL-2.0" @@ -13,10 +13,10 @@ exclude = ["tests"] # Do not publish tests. # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -concordium_base = {version = "3.0", path = "../concordium-rust-sdk/concordium-base/rust-src/concordium_base"} +concordium_base = {version = "3.1", path = "../concordium-rust-sdk/concordium-base/rust-src/concordium_base"} concordium-smart-contract-engine = {version = "3.0", path = "../concordium-rust-sdk/concordium-base/smart-contracts/wasm-chain-integration"} concordium-wasm = {version = "3.0", path = "../concordium-rust-sdk/concordium-base/smart-contracts/wasm-transform"} -concordium-rust-sdk = {version = "3.0", path = "../concordium-rust-sdk"} +concordium-rust-sdk = {version = "3.1", path = "../concordium-rust-sdk"} tokio = { version = "1.28", features = ["rt-multi-thread", "time"] } sha2 = "0.10" anyhow = "1" diff --git a/examples/credential-registry/Cargo.toml b/examples/credential-registry/Cargo.toml index 9a28a8c8..c290c00d 100644 --- a/examples/credential-registry/Cargo.toml +++ b/examples/credential-registry/Cargo.toml @@ -15,8 +15,8 @@ wee_alloc = ["concordium-std/wee_alloc"] crypto-primitives = ["concordium-std/crypto-primitives"] [dependencies] -concordium-std = {path = "../../concordium-std", version = "8.0", default-features = false, features = ["concordium-quickcheck"]} -concordium-cis2 = {path = "../../concordium-cis2", version = "5.0", default-features = false} +concordium-std = {path = "../../concordium-std", version = "8.1", default-features = false, features = ["concordium-quickcheck"]} +concordium-cis2 = {path = "../../concordium-cis2", version = "5.1", default-features = false} quickcheck = {version = "1"} [dev-dependencies] diff --git a/templates/cis2-nft/Cargo.toml b/templates/cis2-nft/Cargo.toml index b2475296..e5a4fa83 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 = "8.0", default-features = false} -concordium-cis2 = {version = "5.0", default-features = false} +concordium-std = {version = "8.1", default-features = false} +concordium-cis2 = {version = "5.1", default-features = false} [dev-dependencies] concordium-smart-contract-testing = "3.0" diff --git a/templates/credential-registry/Cargo.toml b/templates/credential-registry/Cargo.toml index eb2cf41f..f3e790ef 100644 --- a/templates/credential-registry/Cargo.toml +++ b/templates/credential-registry/Cargo.toml @@ -15,12 +15,12 @@ wee_alloc = ["concordium-std/wee_alloc"] crypto-primitives = ["concordium-std/crypto-primitives"] [dependencies] -concordium-std = {version = "8.0", default-features = false, features = ["concordium-quickcheck"]} -concordium-cis2 = {version = "5.0", default-features = false} +concordium-std = {version = "8.1", default-features = false, features = ["concordium-quickcheck"]} +concordium-cis2 = {version = "5.1", default-features = false} quickcheck = {version = "1"} [dev-dependencies] -concordium-smart-contract-testing = "3.0" +concordium-smart-contract-testing = "3.1" [lib] crate-type=["cdylib", "rlib"] diff --git a/templates/default/Cargo.toml b/templates/default/Cargo.toml index 5b5f353b..906f148f 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 = "8.0", default-features = false} +concordium-std = {version = "8.1", default-features = false} [dev-dependencies] concordium-smart-contract-testing = "3"