Merge branch 'staging' into patch

.gitignore

@@ -33,6 +33,10 @@ src/types/*
 !src/types/PRBProxy.d.ts
 !src/types/PRBProxyFactory.d.ts
 !src/types/PRBProxyRegistry.d.ts
+
+# factories
+!src/types/factories
+src/types/factories/*
 !src/types/factories/IPRBProxy__factory.ts
 !src/types/factories/IPRBProxyFactory__factory.ts
 !src/types/factories/IPRBProxyRegistry__factory.ts

.nycrc.yaml

@@ -1,6 +1,5 @@
 check-coverage: false
 exclude:
-  - "src/bytecode.ts"
   - "src/constants.ts"
   - "src/types/**/*.d.ts"
   - "src/types/**/*.ts"

.yarnrc.yml

@@ -1,9 +1,9 @@
 enableTelemetry: false
-enableTransparentWorkspaces: false
+
 nodeLinker: node-modules
 
 plugins:
   - path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
     spec: "@yarnpkg/plugin-interactive-tools"
 
-yarnPath: .yarn/releases/yarn-3.0.2.cjs
+yarnPath: .yarn/releases/yarn-3.2.0.cjs

contracts/PRBProxy.sol

@@ -137,10 +137,11 @@ contract PRBProxy is IPRBProxy {
 
     /// @inheritdoc IPRBProxy
     function transferOwnership(address newOwner) external override {
-        if (owner != msg.sender) {
-            revert PRBProxy__NotOwner(owner, msg.sender);
+        address oldOwner = owner;
+        if (oldOwner != msg.sender) {
+            revert PRBProxy__NotOwner(oldOwner, msg.sender);
         }
         owner = newOwner;
-        emit TransferOwnership(owner, newOwner);
+        emit TransferOwnership(oldOwner, newOwner);
     }
 }

hardhat.config.ts

@@ -5,13 +5,13 @@ import "hardhat-gas-reporter";
 import "hardhat-packager";
 import "solidity-coverage";
 
-import "./tasks/deploy";
+// import "./tasks/deploy";
 
 import { resolve } from "path";
 
 import { config as dotenvConfig } from "dotenv";
-import { HardhatUserConfig } from "hardhat/config";
-import { NetworkUserConfig } from "hardhat/types";
+import type { HardhatUserConfig } from "hardhat/config";
+import type { NetworkUserConfig } from "hardhat/types";
 
 import { getEnvVar } from "./helpers/env";
 

package.json

@@ -10,71 +10,70 @@
     "url": "https://github.com/paulrberg/prb-proxy/issues"
   },
   "dependencies": {
-    "@ethersproject/abi": "^5.4.1",
-    "@ethersproject/abstract-provider": "^5.4.1",
-    "@ethersproject/abstract-signer": "^5.4.1",
-    "@ethersproject/address": "^5.4.0",
-    "@ethersproject/bytes": "^5.4.0",
-    "@ethersproject/keccak256": "^5.4.0",
-    "@ethersproject/providers": "^5.4.5",
-    "ethers": "^5.4.7"
+    "@ethersproject/abi": "^5.5.0",
+    "@ethersproject/abstract-provider": "^5.5.1",
+    "@ethersproject/abstract-signer": "^5.5.0",
+    "@ethersproject/address": "^5.5.0",
+    "@ethersproject/bytes": "^5.5.0",
+    "@ethersproject/keccak256": "^5.5.0",
+    "@ethersproject/providers": "^5.5.3",
+    "ethers": "^5.5.4"
   },
   "devDependencies": {
     "@actions/core": "^1.6.0",
-    "@commitlint/cli": "^13.2.1",
-    "@commitlint/config-conventional": "^13.2.0",
-    "@ethersproject/abi": "^5.4.1",
-    "@ethersproject/abstract-provider": "^5.4.1",
-    "@ethersproject/abstract-signer": "^5.4.1",
-    "@ethersproject/address": "^5.4.0",
-    "@ethersproject/bignumber": "^5.4.2",
-    "@ethersproject/constants": "^5.4.0",
-    "@ethersproject/contracts": "^5.4.1",
-    "@ethersproject/keccak256": "^5.4.0",
-    "@ethersproject/units": "^5.4.0",
-    "@ethersproject/wallet": "^5.4.0",
-    "@istanbuljs/nyc-config-typescript": "^1.0.1",
-    "@nomiclabs/hardhat-ethers": "^2.0.2",
-    "@nomiclabs/hardhat-etherscan": "^2.1.6",
-    "@nomiclabs/hardhat-waffle": "^2.0.1",
-    "@typechain/ethers-v5": "^7.2.0",
-    "@typechain/hardhat": "^2.3.1",
-    "@types/chai": "^4.2.22",
-    "@types/mocha": "^9.0.0",
+    "@commitlint/cli": "^16.2.1",
+    "@commitlint/config-conventional": "^16.2.1",
+    "@ethersproject/abi": "^5.5.0",
+    "@ethersproject/abstract-provider": "^5.5.1",
+    "@ethersproject/abstract-signer": "^5.5.0",
+    "@ethersproject/address": "^5.5.0",
+    "@ethersproject/bignumber": "^5.5.0",
+    "@ethersproject/constants": "^5.5.0",
+    "@ethersproject/contracts": "^5.5.0",
+    "@ethersproject/keccak256": "^5.5.0",
+    "@ethersproject/units": "^5.5.0",
+    "@ethersproject/wallet": "^5.5.0",
+    "@istanbuljs/nyc-config-typescript": "^1.0.2",
+    "@nomiclabs/hardhat-ethers": "^2.0.5",
+    "@nomiclabs/hardhat-etherscan": "^3.0.3",
+    "@nomiclabs/hardhat-waffle": "^2.0.3",
+    "@typechain/ethers-v5": "^9.0.0",
+    "@typechain/hardhat": "^5.0.0",
+    "@types/chai": "^4.3.0",
+    "@types/mocha": "^9.1.0",
     "@types/mocha-each": "^2.0.0",
-    "@types/node": "^16.11.1",
-    "@typescript-eslint/eslint-plugin": "^5.0.0",
-    "@typescript-eslint/parser": "^5.0.0",
-    "chai": "^4.3.4",
+    "@types/node": "^17.0.21",
+    "@typescript-eslint/eslint-plugin": "^5.14.0",
+    "@typescript-eslint/parser": "^5.14.0",
+    "chai": "^4.3.6",
     "commitizen": "^4.2.4",
-    "copyfiles": "^2.4.1",
     "cross-env": "^7.0.3",
-    "dotenv": "^10.0.0",
-    "eslint": "^8.0.1",
-    "eslint-config-prettier": "^8.3.0",
+    "dotenv": "^16.0.0",
+    "eslint": "^8.10.0",
+    "eslint-config-prettier": "^8.5.0",
     "ethereum-waffle": "^3.4.0",
     "from-exponential": "^1.1.1",
-    "hardhat": "^2.6.6",
-    "hardhat-gas-reporter": "^1.0.4",
-    "hardhat-packager": "^1.2.1",
-    "husky": "^7.0.2",
-    "lint-staged": "^11.2.3",
+    "hardhat": "^2.9.1",
+    "hardhat-gas-reporter": "^1.0.8",
+    "hardhat-packager": "^1.3.0",
+    "husky": "^7.0.4",
+    "lint-staged": "^12.3.5",
     "lodash": "^4.17.21",
-    "mocha": "^9.1.3",
+    "mocha": "^9.2.1",
     "mocha-each": "^2.0.1",
     "nyc": "^15.1.0",
-    "pinst": "^2.1.6",
-    "prettier": "^2.4.1",
-    "prettier-plugin-solidity": "^1.0.0-beta.18",
-    "shelljs": "^0.8.4",
-    "shx": "^0.3.3",
-    "solhint": "^3.3.6",
+    "pinst": "^3.0.0",
+    "prettier": "^2.5.1",
+    "prettier-plugin-solidity": "^1.0.0-beta.19",
+    "shelljs": "^0.8.5",
+    "shx": "^0.3.4",
+    "solhint": "^3.3.7",
     "solhint-plugin-prettier": "^0.0.5",
-    "solidity-coverage": "^0.7.17",
-    "source-map-support": "^0.5.20",
-    "ts-node": "^10.3.0",
-    "typechain": "^5.2.0",
-    "typescript": "^4.4.4"
+    "solidity-coverage": "^0.7.20",
+    "source-map-support": "^0.5.21",
+    "ts-node": "^10.7.0",
+    "typechain": "^7.0.1",
+    "typescript": "^4.6.2"
   },
   "files": [
     "/contracts",
@@ -96,8 +95,9 @@
   ],
   "license": "Unlicense",
   "main": "./dist/index.js",
+  "packageManager": "[email protected]",
   "peerDependencies": {
-    "ethers": "^5.4.7"
+    "ethers": "^5.5.4"
   },
   "publishConfig": {
     "access": "public"
@@ -106,8 +106,11 @@
     "type": "git",
     "url": "https://github.com/paulrberg/prb-proxy"
   },
+  "resolutions": {
+    "@ethersproject/wallet": "^5.5.0"
+  },
   "scripts": {
-    "build": "yarn prepare:types && tsc --project ./tsconfig.prod.json && copyfiles --up 1 \"./src/**/*.d.ts\" ./dist",
+    "build": "yarn prepare:types && tsc --project ./tsconfig.prod.json",
     "clean": "shx rm -rf ./.nyc_output ./artifacts ./cache ./coverage-contracts ./coverage-ts ./dist ./coverage.json ./tsconfig.prod.tsbuildinfo",
     "clean:node_modules": "shx rm -rf ./node_modules",
     "compile": "cross-env TS_NODE_TRANSPILE_ONLY=true hardhat compile",