Graduate to yarn 4 🧶

.gitignore

@@ -22,6 +22,7 @@ solidity/artifacts
 
 .yarn/install-state.gz
 .yarn/cache
+.yarn/releases
 yarn-error.log
 
 .idea

.yarnrc.yml

@@ -1,11 +1,11 @@
+compressionLevel: mixed
+
+enableGlobalCache: false
+
 nodeLinker: node-modules
 
 plugins:
-  - path: .yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs
-    spec: "@yarnpkg/plugin-workspace-tools"
   - path: .yarn/plugins/@yarnpkg/plugin-outdated.cjs
     spec: "https://mskelton.dev/yarn-outdated/v3"
-  - path: .yarn/plugins/@yarnpkg/plugin-version.cjs
-    spec: "@yarnpkg/plugin-version"
 
-yarnPath: .yarn/releases/yarn-3.2.0.cjs
+yarnPath: .yarn/releases/yarn-4.0.1.cjs

package.json

@@ -12,19 +12,19 @@
     "lint-staged": "^12.4.3",
     "prettier": "^2.4.1"
   },
-  "packageManager": "yarn@3.2.0",
+  "packageManager": "yarn@4.0.1",
   "private": true,
   "scripts": {
-    "build": "yarn workspaces foreach --verbose --parallel --topological run build",
-    "clean": "yarn workspaces foreach --verbose --parallel run clean",
+    "build": "yarn workspaces foreach --all --verbose --parallel --topological run build",
+    "clean": "yarn workspaces foreach --all --verbose --parallel run clean",
+    "prettier": "yarn workspaces foreach --all --verbose --parallel run prettier",
+    "lint": "yarn workspaces foreach --all --verbose --parallel run lint",
+    "test": "yarn workspaces foreach --all --verbose --parallel run test",
+    "coverage": "yarn workspaces foreach --all --verbose --parallel run coverage",
+    "version:prepare": "yarn workspaces foreach --all --no-private --verbose --topological version --immediate",
+    "publish:all": "yarn workspaces foreach --all --no-private --verbose --topological npm publish --access public",
     "postinstall": "husky install",
-    "prettier": "yarn workspaces foreach --verbose --parallel run prettier",
-    "lint": "yarn workspaces foreach --verbose --parallel run lint",
-    "test": "yarn workspaces foreach --verbose --parallel run test",
-    "coverage": "yarn workspaces foreach --verbose --parallel run coverage",
-    "version:check": "yarn version check --interactive",
-    "version:prepare": "yarn workspaces foreach --no-private --verbose --topological version --immediate",
-    "publish:all": "yarn workspaces foreach --no-private --verbose --topological npm publish --access public"
+    "version:check": "yarn version check --interactive"
   },
   "workspaces": [
     "solidity",

solidity/contracts/token/extensions/HypERC721URIStorage.sol

@@ -6,6 +6,7 @@ import {HypERC721} from "../HypERC721.sol";
 import {ERC721URIStorageUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/extensions/ERC721URIStorageUpgradeable.sol";
 import {ERC721EnumerableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/extensions/ERC721EnumerableUpgradeable.sol";
 import {ERC721Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/ERC721Upgradeable.sol";
+import {IERC721Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/IERC721Upgradeable.sol";
 
 /**
  * @title Hyperlane ERC721 Token that extends ERC721URIStorage with remote transfer and URI relay functionality.
@@ -17,7 +18,7 @@ contract HypERC721URIStorage is HypERC721, ERC721URIStorageUpgradeable {
     function balanceOf(address account)
         public
         view
-        override(HypERC721, ERC721Upgradeable)
+        override(HypERC721, ERC721Upgradeable, IERC721Upgradeable)
         returns (uint256)
     {
         return HypERC721.balanceOf(account);
@@ -75,7 +76,7 @@ contract HypERC721URIStorage is HypERC721, ERC721URIStorageUpgradeable {
     function supportsInterface(bytes4 interfaceId)
         public
         view
-        override(ERC721EnumerableUpgradeable, ERC721Upgradeable)
+        override(ERC721EnumerableUpgradeable, ERC721URIStorageUpgradeable)
         returns (bool)
     {
         return ERC721EnumerableUpgradeable.supportsInterface(interfaceId);

solidity/package.json

@@ -5,8 +5,8 @@
   "dependencies": {
     "@eth-optimism/contracts": "^0.6.0",
     "@hyperlane-xyz/utils": "3.1.0-beta0",
-    "@openzeppelin/contracts": "^4.8.0",
-    "@openzeppelin/contracts-upgradeable": "^4.8.0"
+    "@openzeppelin/contracts": "^4.9.3",
+    "@openzeppelin/contracts-upgradeable": "^v4.9.3"
   },
   "devDependencies": {
     "@nomiclabs/hardhat-ethers": "^2.2.1",

typescript/helloworld/package.json

@@ -5,7 +5,7 @@
   "dependencies": {
     "@hyperlane-xyz/core": "3.1.0-beta0",
     "@hyperlane-xyz/sdk": "3.1.0-beta0",
-    "@openzeppelin/contracts-upgradeable": "^4.8.0",
+    "@openzeppelin/contracts-upgradeable": "^4.9.3",
     "ethers": "^5.7.2"
   },
   "devDependencies": {