Bump @openzeppelin/contracts-upgradeable from 4.9.3 to 4.9.6 (#920)

* Bump @openzeppelin/contracts-upgradeable from 4.9.3 to 4.9.6

Bumps [@openzeppelin/contracts-upgradeable](https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable) from 4.9.3 to 4.9.6.
- [Release notes](https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable/releases)
- [Changelog](https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable/blob/master/CHANGELOG.md)
- [Commits](OpenZeppelin/openzeppelin-contracts-upgradeable@v4.9.3...v4.9.6)

---
updated-dependencies:
- dependency-name: "@openzeppelin/contracts-upgradeable"
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

* Override

* Handle OZ version in detect contract change

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Klemen <64400885+zajck@users.noreply.github.com>
Co-authored-by: zajck <klemen@impressieve.com>

Author: dependabot[bot]

contracts/protocol/clients/voucher/BosonVoucher.sol

@@ -838,4 +838,12 @@ contract BosonVoucher is BosonVoucherBase, ERC2771ContextUpgradeable {
     {
         return ERC2771ContextUpgradeable._msgSender();
     }
+
+    /**
+     * @notice This function specifies the context as being a single address (20 bytes).
+     * @dev It is an override of the ERC2771ContextUpgradeable._contextSuffixLength() function which allows meta transactions.
+     */
+    function _contextSuffixLength() internal view override(ContextUpgradeable, ERC2771ContextUpgradeable) returns (uint256) {
+        return ERC2771ContextUpgradeable._contextSuffixLength();
+    }
 }

package-lock.json

@@ -43,7 +43,7 @@
   },
   "dependencies": {
     "@openzeppelin/contracts": "^4.9.6",
-    "@openzeppelin/contracts-upgradeable": "4.9.3"
+    "@openzeppelin/contracts-upgradeable": "4.9.6"
   },
   "devDependencies": {
     "@bosonprotocol/solidoc": "3.0.3",

package.json

@@ -53,11 +53,17 @@ async function detectChangedContract(referenceCommit, targetCommit = "HEAD") {
   shell.exec(`git checkout ${referenceCommit} contracts`);
 
   // Temporary target install reference version dependencies
-  // - Protocol versions < 2.3.0 use different OZ contracts
-  const isOldOZVersion = ["v2.0", "v2.1", "v2.2"].some((v) => referenceCommit.startsWith(v));
-  if (isOldOZVersion) {
+  // Old protocol versions use different OpenZeppelin contracts version, so we need to install them
+  let oldOZVersion;
+  if (["v2.0", "v2.1", "v2.2"].some((v) => referenceCommit.startsWith(v))) {
+    oldOZVersion = "4.7.1";
+  } else if (["v2.3", "v2.4"].some((v) => referenceCommit.startsWith(v))) {
+    oldOZVersion = "4.9.3";
+  }
+
+  if (oldOZVersion) {
     // Temporary install old OZ contracts
-    shell.exec("npm i @openzeppelin/contracts-upgradeable@4.7.1");
+    shell.exec(`npm i @openzeppelin/contracts-upgradeable@${oldOZVersion}`);
   }
 
   // Compile old version
@@ -77,7 +83,7 @@ async function detectChangedContract(referenceCommit, targetCommit = "HEAD") {
   shell.exec(`git checkout ${targetCommit} contracts`);
 
   // If reference commit is old version, we need to revert to target version dependencies
-  if (isOldOZVersion) {
+  if (oldOZVersion) {
     installDependencies(targetCommit);
   }
 
@@ -140,7 +146,7 @@ async function detectChangedContract(referenceCommit, targetCommit = "HEAD") {
 
 function installDependencies(commit) {
   shell.exec(`git checkout ${commit} package.json package-lock.json`);
-  shell.exec("npm i");
+  shell.exec("npm ci");
 }
 
 async function getBytecodes() {