bump openzeppelin/contracts (#10887)

* bump openzeppelin/contracts * bump to 4.9.3 * bump OZ 4.7.0 deps to 4.8.0 and rm 4.7.0 from repo * normalize contracts-upgradeable import * rm foundry OZ ref * bump OZ upgradable to 4.9.3 * rm old vendor version * fix failing automation tests * prettier --------- Co-authored-by: Ryan Hall <[email protected]>
smartcontractkit · Oct 13, 2023 · eb3cb9e · eb3cb9e
1 parent 30c6b4b
commit eb3cb9e
Show file tree

Hide file tree

Showing 42 changed files with 54 additions and 1,305 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,6 +1,3 @@
 [submodule "contracts/foundry-lib/forge-std"]
 	path = contracts/foundry-lib/forge-std
 	url = https://github.com/foundry-rs/forge-std
-[submodule "contracts/foundry-lib/openzeppelin-contracts"]
-	path = contracts/foundry-lib/openzeppelin-contracts
-	url = https://github.com/OpenZeppelin/openzeppelin-contracts
diff --git a/contracts/foundry-lib/openzeppelin-contracts b/contracts/foundry-lib/openzeppelin-contracts
diff --git a/contracts/package.json b/contracts/package.json
@@ -84,8 +84,7 @@
   },
   "dependencies": {
     "@eth-optimism/contracts": "^0.5.21",
-    "@openzeppelin/contracts": "~4.3.3",
-    "@openzeppelin/contracts-upgradeable-4.7.3": "npm:@openzeppelin/[email protected]",
-    "@openzeppelin/contracts-v0.7": "npm:@openzeppelin/[email protected]"
+    "@openzeppelin/contracts": "~4.9.3",
+    "@openzeppelin/contracts-upgradeable": "~4.9.3"
   }
 }
diff --git a/contracts/pnpm-lock.yaml b/contracts/pnpm-lock.yaml
diff --git a/contracts/remappings.txt b/contracts/remappings.txt
@@ -1,6 +1,5 @@
 ds-test/=foundry-lib/forge-std/lib/ds-test/src
 forge-std/=foundry-lib/forge-std/src
-openzeppelin-contracts/=foundry-lib/openzeppelin-contracts/contracts/
 
 @openzeppelin/=node_modules/@openzeppelin/
 hardhat/=node_modules/hardhat/

diff --git a/contracts/scripts/native_solc_compile_all_functions b/contracts/scripts/native_solc_compile_all_functions
@@ -11,7 +11,7 @@ OPTIMIZE_RUNS=1000000
 
 
 SCRIPTPATH="$( cd "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )"
-ROOT="$( cd "$(dirname "$0")" >/dev/null 2>&1 ; cd ../../ && pwd -P )"
+ROOT="$( cd "$(dirname "$0")" >/dev/null 2>&1 ; cd ../ && pwd -P )"
 python3 -m pip install --require-hashes -r $SCRIPTPATH/requirements.txt
 
 solc-select install $SOLC_VERSION
@@ -20,11 +20,12 @@ export SOLC_VERSION=$SOLC_VERSION
 
 
 compileContract () {
-  solc --overwrite --optimize --optimize-runs $OPTIMIZE_RUNS --metadata-hash none \
-      -o $ROOT/contracts/solc/v$SOLC_VERSION/functions/$1 \
+  solc @openzeppelin/=$ROOT/node_modules/@openzeppelin/ \
+      --overwrite --optimize --optimize-runs $OPTIMIZE_RUNS --metadata-hash none \
+      -o $ROOT/solc/v$SOLC_VERSION/functions/$1 \
       --abi --bin \
-      --allow-paths $ROOT/contracts/src/v0.8,$ROOT/contracts/src/v0.8/functions \
-      $ROOT/contracts/src/v0.8/functions/$2
+      --allow-paths $ROOT/src/v0.8,$ROOT/node_modules \
+      $ROOT/src/v0.8/functions/$2
 }
 
 ##########################

diff --git a/contracts/src/v0.8/automation/upkeeps/ERC20BalanceMonitor.sol b/contracts/src/v0.8/automation/upkeeps/ERC20BalanceMonitor.sol
@@ -4,8 +4,8 @@ pragma solidity ^0.8.4;
 
 import "../../shared/access/ConfirmedOwner.sol";
 import "../interfaces/KeeperCompatibleInterface.sol";
-import "../../vendor/openzeppelin-solidity/v4.7.0/contracts/security/Pausable.sol";
-import "../../vendor/openzeppelin-solidity/v4.7.0/contracts/token/ERC20/utils/SafeERC20.sol";
+import "../../vendor/openzeppelin-solidity/v4.8.0/contracts/security/Pausable.sol";
+import "../../vendor/openzeppelin-solidity/v4.8.0/contracts/token/ERC20/utils/SafeERC20.sol";
 
 /**
  * @title The ERC20BalanceMonitor contract.

diff --git a/contracts/src/v0.8/automation/upkeeps/LinkAvailableBalanceMonitor.sol b/contracts/src/v0.8/automation/upkeeps/LinkAvailableBalanceMonitor.sol
@@ -4,8 +4,8 @@ pragma solidity 0.8.6;
 
 import "../../shared/access/ConfirmedOwner.sol";
 import "../interfaces/KeeperCompatibleInterface.sol";
-import "../../vendor/openzeppelin-solidity/v4.7.0/contracts/security/Pausable.sol";
-import "../../vendor/openzeppelin-solidity/v4.7.0/contracts/token/ERC20/IERC20.sol";
+import "../../vendor/openzeppelin-solidity/v4.8.0/contracts/security/Pausable.sol";
+import "../../vendor/openzeppelin-solidity/v4.8.0/contracts/token/ERC20/IERC20.sol";
 import "../../vendor/openzeppelin-solidity/v4.7.3/contracts/utils/structs/EnumerableMap.sol";
 
 interface IAggregatorProxy {

diff --git a/contracts/src/v0.8/functions/dev/v0_0_0/FunctionsBillingRegistry.sol b/contracts/src/v0.8/functions/dev/v0_0_0/FunctionsBillingRegistry.sol
@@ -11,8 +11,8 @@ import {IAuthorizedOriginReceiver} from "./accessControl/interfaces/IAuthorizedO
 import {ConfirmedOwnerUpgradeable} from "./accessControl/ConfirmedOwnerUpgradeable.sol";
 import {AuthorizedReceiver} from "./accessControl/AuthorizedReceiver.sol";
 import {SafeCast} from "../../../vendor/openzeppelin-solidity/v4.8.0/contracts/utils/math/SafeCast.sol";
-import {PausableUpgradeable} from "../../../vendor/openzeppelin-contracts-upgradeable/v4.8.1/security/PausableUpgradeable.sol";
-import {Initializable} from "../../../vendor/openzeppelin-contracts-upgradeable/v4.8.1/proxy/utils/Initializable.sol";
+import {PausableUpgradeable} from "@openzeppelin/contracts-upgradeable/security/PausableUpgradeable.sol";
+import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
 
 /**
  * @title Functions Billing Registry contract

diff --git a/contracts/src/v0.8/functions/dev/v0_0_0/FunctionsOracle.sol b/contracts/src/v0.8/functions/dev/v0_0_0/FunctionsOracle.sol
@@ -4,7 +4,7 @@ pragma solidity ^0.8.6;
 import {IFunctionsOracle, IFunctionsBillingRegistry} from "./interfaces/IFunctionsOracle.sol";
 import {OCR2BaseUpgradeable} from "./ocr/OCR2BaseUpgradeable.sol";
 import {AuthorizedOriginReceiverUpgradeable} from "./accessControl/AuthorizedOriginReceiverUpgradeable.sol";
-import {Initializable} from "../../../vendor/openzeppelin-contracts-upgradeable/v4.8.1/proxy/utils/Initializable.sol";
+import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
 
 /**
  * @title Functions Oracle contract

diff --git a/...racts/src/v0.8/functions/dev/v0_0_0/accessControl/AuthorizedOriginReceiverUpgradeable.sol b/...racts/src/v0.8/functions/dev/v0_0_0/accessControl/AuthorizedOriginReceiverUpgradeable.sol
@@ -2,7 +2,7 @@
 pragma solidity ^0.8.6;
 
 import {EnumerableSet} from "../../../../vendor/openzeppelin-solidity/v4.8.0/contracts/utils/structs/EnumerableSet.sol";
-import {Initializable} from "../../../../vendor/openzeppelin-contracts-upgradeable/v4.8.1/proxy/utils/Initializable.sol";
+import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
 import {IAuthorizedOriginReceiver} from "./interfaces/IAuthorizedOriginReceiver.sol";
 
 /**

diff --git a/contracts/src/v0.8/functions/dev/v0_0_0/accessControl/ConfirmedOwnerUpgradeable.sol b/contracts/src/v0.8/functions/dev/v0_0_0/accessControl/ConfirmedOwnerUpgradeable.sol
@@ -2,7 +2,7 @@
 pragma solidity ^0.8.6;
 
 import {IOwnable} from "../../../../shared/interfaces/IOwnable.sol";
-import {Initializable} from "../../../../vendor/openzeppelin-contracts-upgradeable/v4.8.1/proxy/utils/Initializable.sol";
+import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
 
 /**
  * @title The ConfirmedOwnerUpgradeable contract

diff --git a/contracts/src/v0.8/functions/dev/v0_0_0/ocr/OCR2BaseUpgradeable.sol b/contracts/src/v0.8/functions/dev/v0_0_0/ocr/OCR2BaseUpgradeable.sol
@@ -3,7 +3,7 @@ pragma solidity ^0.8.0;
 
 import {ConfirmedOwnerUpgradeable} from "../accessControl/ConfirmedOwnerUpgradeable.sol";
 import {OCR2Abstract} from "./OCR2Abstract.sol";
-import {Initializable} from "../../../../vendor/openzeppelin-contracts-upgradeable/v4.8.1/proxy/utils/Initializable.sol";
+import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
 
 /**
  * @notice Onchain verification of reports from the offchain reporting protocol

diff --git a/...src/v0.8/functions/tests/v0_0_0/testhelpers/mocks/AuthorizedOriginReceiverUpgradeable.sol b/...src/v0.8/functions/tests/v0_0_0/testhelpers/mocks/AuthorizedOriginReceiverUpgradeable.sol
@@ -2,7 +2,7 @@
 pragma solidity ^0.8.6;
 
 import {EnumerableSet} from "../../../../../vendor/openzeppelin-solidity/v4.8.0/contracts/utils/structs/EnumerableSet.sol";
-import {Initializable} from "../../../../../vendor/openzeppelin-contracts-upgradeable/v4.8.1/proxy/utils/Initializable.sol";
+import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
 import {AuthorizedOriginReceiverInterface} from "./AuthorizedOriginReceiverInterface.sol";
 
 /**

diff --git a/contracts/src/v0.8/functions/tests/v0_0_0/testhelpers/mocks/ConfirmedOwnerUpgradeable.sol b/contracts/src/v0.8/functions/tests/v0_0_0/testhelpers/mocks/ConfirmedOwnerUpgradeable.sol
@@ -2,7 +2,7 @@
 pragma solidity ^0.8.6;
 
 import {IOwnable} from "../../../../../shared/interfaces/IOwnable.sol";
-import {Initializable} from "../../../../../vendor/openzeppelin-contracts-upgradeable/v4.8.1/proxy/utils/Initializable.sol";
+import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
 
 /**
  * @title The ConfirmedOwnerUpgradeable contract

diff --git a/...s/src/v0.8/functions/tests/v0_0_0/testhelpers/mocks/FunctionsBillingRegistryMigration.sol b/...s/src/v0.8/functions/tests/v0_0_0/testhelpers/mocks/FunctionsBillingRegistryMigration.sol
@@ -11,8 +11,8 @@ import {AuthorizedOriginReceiverInterface} from "./AuthorizedOriginReceiverInter
 import {ConfirmedOwnerUpgradeable} from "./ConfirmedOwnerUpgradeable.sol";
 import {AuthorizedReceiver} from "./AuthorizedReceiver.sol";
 import {SafeCast} from "../../../../../vendor/openzeppelin-solidity/v4.8.0/contracts/utils/math/SafeCast.sol";
-import {PausableUpgradeable} from "../../../../../vendor/openzeppelin-contracts-upgradeable/v4.8.1/security/PausableUpgradeable.sol";
-import {Initializable} from "../../../../../vendor/openzeppelin-contracts-upgradeable/v4.8.1/proxy/utils/Initializable.sol";
+import {PausableUpgradeable} from "@openzeppelin/contracts-upgradeable/security/PausableUpgradeable.sol";
+import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
 
 /**
  * @title Functions Billing Registry contract

diff --git a/...ts/src/v0.8/functions/tests/v0_0_0/testhelpers/mocks/FunctionsBillingRegistryOriginal.sol b/...ts/src/v0.8/functions/tests/v0_0_0/testhelpers/mocks/FunctionsBillingRegistryOriginal.sol
@@ -11,8 +11,8 @@ import {AuthorizedOriginReceiverInterface} from "./AuthorizedOriginReceiverInter
 import {ConfirmedOwnerUpgradeable} from "./ConfirmedOwnerUpgradeable.sol";
 import {AuthorizedReceiver} from "./AuthorizedReceiver.sol";
 import {SafeCast} from "../../../../../vendor/openzeppelin-solidity/v4.8.0/contracts/utils/math/SafeCast.sol";
-import {PausableUpgradeable} from "../../../../../vendor/openzeppelin-contracts-upgradeable/v4.8.1/security/PausableUpgradeable.sol";
-import {Initializable} from "../../../../../vendor/openzeppelin-contracts-upgradeable/v4.8.1/proxy/utils/Initializable.sol";
+import {PausableUpgradeable} from "@openzeppelin/contracts-upgradeable/security/PausableUpgradeable.sol";
+import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
 
 /**
  * @title Functions Billing Registry contract

diff --git a/contracts/src/v0.8/functions/tests/v0_0_0/testhelpers/mocks/FunctionsOracleMigration.sol b/contracts/src/v0.8/functions/tests/v0_0_0/testhelpers/mocks/FunctionsOracleMigration.sol
@@ -5,7 +5,7 @@ import {FunctionsOracleInterface} from "./FunctionsOracleInterface.sol";
 import {FunctionsBillingRegistryInterface} from "./FunctionsBillingRegistryInterface.sol";
 import {OCR2BaseUpgradeable} from "./OCR2BaseUpgradeable.sol";
 import {AuthorizedOriginReceiverUpgradeable} from "./AuthorizedOriginReceiverUpgradeable.sol";
-import {Initializable} from "../../../../../vendor/openzeppelin-contracts-upgradeable/v4.8.1/proxy/utils/Initializable.sol";
+import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
 
 /**
  * @title Functions Oracle contract

diff --git a/contracts/src/v0.8/functions/tests/v0_0_0/testhelpers/mocks/FunctionsOracleOriginal.sol b/contracts/src/v0.8/functions/tests/v0_0_0/testhelpers/mocks/FunctionsOracleOriginal.sol
@@ -5,7 +5,7 @@ import {FunctionsOracleInterface} from "./FunctionsOracleInterface.sol";
 import {FunctionsBillingRegistryInterface} from "./FunctionsBillingRegistryInterface.sol";
 import {OCR2BaseUpgradeable} from "./OCR2BaseUpgradeable.sol";
 import {AuthorizedOriginReceiverUpgradeable} from "./AuthorizedOriginReceiverUpgradeable.sol";
-import {Initializable} from "../../../../../vendor/openzeppelin-contracts-upgradeable/v4.8.1/proxy/utils/Initializable.sol";
+import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
 
 /**
  * @title Functions Oracle contract

diff --git a/contracts/src/v0.8/functions/tests/v0_0_0/testhelpers/mocks/OCR2BaseUpgradeable.sol b/contracts/src/v0.8/functions/tests/v0_0_0/testhelpers/mocks/OCR2BaseUpgradeable.sol
@@ -3,7 +3,7 @@ pragma solidity ^0.8.0;
 
 import {ConfirmedOwnerUpgradeable} from "./ConfirmedOwnerUpgradeable.sol";
 import {OCR2Abstract} from "./OCR2Abstract.sol";
-import {Initializable} from "../../../../../vendor/openzeppelin-contracts-upgradeable/v4.8.1/proxy/utils/Initializable.sol";
+import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
 
 /**
  * @notice Onchain verification of reports from the offchain reporting protocol

diff --git a/contracts/src/v0.8/vendor/MockOVMCrossDomainMessenger.sol b/contracts/src/v0.8/vendor/MockOVMCrossDomainMessenger.sol
@@ -2,7 +2,7 @@
 
 pragma solidity >=0.7.6 <0.9.0;
 
-import "./openzeppelin-solidity/v4.7.0/contracts/utils/Address.sol";
+import "./openzeppelin-solidity/v4.8.0/contracts/utils/Address.sol";
 
 /**
  * @title iOVM_CrossDomainMessenger