Merge pull request #1130 from Concordium/update-base · Concordium/concordium-node@dddd486

Commit

Merge pull request #1130 from Concordium/update-base

Update base to main branch after merge.

td202 authored Mar 4, 2024

2 parents ca442eb + 5e044a2 commit dddd486

+1 −0		rust-src/Cargo.lock
+8 −2		rust-src/wallet_library/CHANGELOG.md
+2 −1		rust-src/wallet_library/Cargo.toml
+1 −0		rust-src/wallet_library/resources/web3_id_request.json
+1 −0		rust-src/wallet_library/src/lib.rs
+62 −0		rust-src/wallet_library/src/proofs.rs
+8 −0		rust-src/wallet_library/src/test_helpers.rs
+4 −0		smart-contracts/contracts-common/concordium-contracts-common-derive/CHANGELOG.md
+19 −5		smart-contracts/contracts-common/concordium-contracts-common-derive/src/attribute.rs
+2 −0		smart-contracts/contracts-common/concordium-contracts-common/CHANGELOG.md
+2 −2		smart-contracts/contracts-common/concordium-contracts-common/src/hashes.rs