Merge pull request #4380 from ethereum-optimism/willc/contracts-periphery-deps

feat(contracts-periphery): Update zeppelin packages in contracts periphery

.changeset/itchy-socks-impress.md

+---
+'@eth-optimism/contracts-periphery': patch
+---
+
+Update zeppelin deps in contracts periphery

packages/contracts-periphery/foundry.toml

@@ -17,6 +17,7 @@ remappings = [
 	'forge-std/=node_modules/forge-std/src',
 	'ds-test/=node_modules/ds-test/src',
   '@openzeppelin/contracts/=node_modules/@openzeppelin/contracts/',
+  '@openzeppelin/contracts-upgradeable/=node_modules/@openzeppelin/contracts-upgradeable/',
   '@eth-optimism/contracts-bedrock/=node_modules/@eth-optimism/contracts-bedrock',
 ]
 # The metadata hash can be removed from the bytecode by setting "none"

packages/contracts-periphery/package.json

@@ -64,7 +64,8 @@
     "@nomiclabs/hardhat-etherscan": "^3.0.3",
     "@nomiclabs/hardhat-waffle": "^2.0.3",
     "@rari-capital/solmate": "7.0.0-alpha.3",
-    "@openzeppelin/contracts": "4.6.0",
+    "@openzeppelin/contracts": "4.7.3",
+    "@openzeppelin/contracts-upgradeable": "4.7.3",
     "@types/chai": "^4.2.18",
     "@types/mocha": "^8.2.2",
     "@types/node": "^17.0.21",

packages/contracts-periphery/test/contracts/L2/L2ERC721Bridge.spec.ts

@@ -137,7 +137,7 @@ describe('L2ERC721Bridge', () => {
 
       // Assert that nobody owns the L2 token initially
       await expect(L2ERC721.ownerOf(TOKEN_ID)).to.be.revertedWith(
-        'ERC721: owner query for nonexistent token'
+        'ERC721: invalid token ID'
       )
 
       // Successfully finalizes the deposit.
@@ -279,7 +279,7 @@ describe('L2ERC721Bridge', () => {
 
       // Assert that the token isn't owned by anyone
       await expect(L2Token.ownerOf(TOKEN_ID)).to.be.revertedWith(
-        'ERC721: owner query for nonexistent token'
+        'ERC721: invalid token ID'
       )
 
       const withdrawalCallToMessenger =
@@ -372,7 +372,7 @@ describe('L2ERC721Bridge', () => {
 
       // Assert that the token isn't owned by anyone
       await expect(L2Token.ownerOf(TOKEN_ID)).to.be.revertedWith(
-        'ERC721: owner query for nonexistent token'
+        'ERC721: invalid token ID'
       )
 
       const withdrawalCallToMessenger =

yarn.lock

@@ -3222,11 +3222,6 @@
   resolved "https://registry.yarnpkg.com/@openzeppelin/contracts/-/contracts-4.5.0.tgz#3fd75d57de172b3743cdfc1206883f56430409cc"
   integrity sha512-fdkzKPYMjrRiPK6K4y64e6GzULR7R7RwxSigHS8DDp7aWDeoReqsQI+cxHV1UuhAqX69L1lAaWDxenfP+xiqzA==
 
-"@openzeppelin/contracts@4.6.0":
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/@openzeppelin/contracts/-/contracts-4.6.0.tgz#c91cf64bc27f573836dba4122758b4743418c1b3"
-  integrity sha512-8vi4d50NNya/bQqCmaVzvHNmwHvS0OBKb7HNtuNwEE3scXWrP31fKQoGxNMT+KbzmrNZzatE3QK5p2gFONI/hg==
-
 "@openzeppelin/contracts@4.7.3":
   version "4.7.3"
   resolved "https://registry.yarnpkg.com/@openzeppelin/contracts/-/contracts-4.7.3.tgz#939534757a81f8d69cc854c7692805684ff3111e"