From bc95521e34dcd49792065e264a7ad2b5a86f0091 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 16 Jun 2023 20:43:00 +0000 Subject: [PATCH] Transpile e50c24f5 --- .changeset/shy-crews-teach.md | 5 ----- CHANGELOG.md | 4 ++++ contracts/package.json | 2 +- contracts/utils/cryptography/MerkleProofUpgradeable.sol | 2 +- package.json | 2 +- 5 files changed, 7 insertions(+), 8 deletions(-) delete mode 100644 .changeset/shy-crews-teach.md diff --git a/.changeset/shy-crews-teach.md b/.changeset/shy-crews-teach.md deleted file mode 100644 index 8ab929bf8..000000000 --- a/.changeset/shy-crews-teach.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'openzeppelin-solidity': patch ---- - -`MerkleProof`: Fix a bug in `processMultiProof` and `processMultiProofCalldata` that allows proving arbitrary leaves if the tree contains a node with value 0 at depth 1. diff --git a/CHANGELOG.md b/CHANGELOG.md index ca11eb876..0d8863704 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,10 @@ # Changelog +## 4.9.2 (2023-06-16) + +- `MerkleProof`: Fix a bug in `processMultiProof` and `processMultiProofCalldata` that allows proving arbitrary leaves if the tree contains a node with value 0 at depth 1. + ## 4.9.1 (2023-06-07) - `Governor`: Add a mechanism to restrict the address of the proposer using a suffix in the description. diff --git a/contracts/package.json b/contracts/package.json index 65e441cd9..1cf90ad14 100644 --- a/contracts/package.json +++ b/contracts/package.json @@ -1,7 +1,7 @@ { "name": "@openzeppelin/contracts-upgradeable", "description": "Secure Smart Contract library for Solidity", - "version": "4.9.1", + "version": "4.9.2", "files": [ "**/*.sol", "/build/contracts/*.json", diff --git a/contracts/utils/cryptography/MerkleProofUpgradeable.sol b/contracts/utils/cryptography/MerkleProofUpgradeable.sol index 25925c436..e4f6c37af 100644 --- a/contracts/utils/cryptography/MerkleProofUpgradeable.sol +++ b/contracts/utils/cryptography/MerkleProofUpgradeable.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// OpenZeppelin Contracts (last updated v4.9.0) (utils/cryptography/MerkleProof.sol) +// OpenZeppelin Contracts (last updated v4.9.2) (utils/cryptography/MerkleProof.sol) pragma solidity ^0.8.0; diff --git a/package.json b/package.json index f25598dd4..5f067c343 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "openzeppelin-solidity", "description": "Secure Smart Contract library for Solidity", - "version": "4.9.1", + "version": "4.9.2", "files": [ "/contracts/**/*.sol", "/build/contracts/*.json",