fix: update core dependencies and rebuild

thesandboxgame · Sep 28, 2023 · 3b8188b · 3b8188b
1 parent 3ca5d55
commit 3b8188b
Show file tree

Hide file tree

Showing 13 changed files with 956 additions and 545 deletions.
diff --git a/.yarnrc.yml b/.yarnrc.yml
@@ -1,5 +1,7 @@
 enableGlobalCache: true
 
+checksumBehavior: update
+
 nmHoistingLimits: dependencies
 
 nodeLinker: node-modules

diff --git a/packages/asset/package.json b/packages/asset/package.json
@@ -18,7 +18,7 @@
     "@manifoldxyz/libraries-solidity": "^1.0.4",
     "@manifoldxyz/royalty-registry-solidity": "^2.0.3",
     "@nomicfoundation/hardhat-chai-matchers": "^1.0.6",
-    "@nomicfoundation/hardhat-network-helpers": "^1.0.0",
+    "@nomicfoundation/hardhat-network-helpers": "^1.0.9",
     "@nomicfoundation/hardhat-toolbox": "^2.0.2",
     "@nomiclabs/hardhat-ethers": "^2.2.3",
     "@nomiclabs/hardhat-etherscan": "^3.1.7",

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -16,22 +16,28 @@
     "websocket": "1.0.32"
   },
   "devDependencies": {
-    "@codechecks/client": "^0.1.10",
     "@ethereumjs/block": "^3.5.1",
     "@ethereumjs/common": "^2.5.0",
     "@ethereumjs/tx": "^3.3.2",
+    "@ethersproject/abstract-provider": "^5.7.0",
+    "@ethersproject/abstract-signer": "^5.7.0",
+    "@ethersproject/hardware-wallets": "^5.7.0",
+    "@ethersproject/hash": "^5.7.0",
+    "@ethersproject/providers": "^5.7.0",
+    "@ethersproject/transactions": "^5.7.0",
     "@ethersproject/units": "^5.7.0",
     "@ethersproject/wallet": "^5.0.5",
     "@maticnetwork/fx-portal": "^1.0.5",
     "@nomicfoundation/hardhat-chai-matchers": "^1.0.6",
-    "@nomiclabs/hardhat-ethers": "npm:[email protected]",
+    "@nomiclabs/hardhat-ethers": "^2.0.2",
     "@nomiclabs/hardhat-etherscan": "^3.0.3",
     "@openzeppelin/contracts": "^3.2.1-solc-0.7",
     "@openzeppelin/contracts-0.6": "npm:@openzeppelin/[email protected]",
     "@openzeppelin/contracts-0.8": "npm:@openzeppelin/[email protected]",
     "@openzeppelin/contracts-0.8.13": "npm:@openzeppelin/[email protected]",
     "@openzeppelin/contracts-upgradeable": "4.4.2",
     "@openzeppelin/contracts-upgradeable-0.8.13": "npm:@openzeppelin/[email protected]",
+    "@openzeppelin/defender-relay-client": "^1.48.0",
     "@types/chai": "^4.2.11",
     "@types/fs-extra": "^9.0.6",
     "@types/inquirer": "^7.3.1",
@@ -45,7 +51,6 @@
     "chai": "^4.2.0",
     "cross-env": "^7.0.2",
     "csv-parser": "^3.0.0",
-    "defender-relay-client": "^1.44.0",
     "dotenv": "^8.2.0",
     "dotenv-cli": "^4.0.0",
     "eslint": "^7.7.0",
@@ -76,7 +81,9 @@
     "solhint-plugin-prettier": "^0.0.5",
     "solidity-coverage": "0.8.2",
     "ts-node": "^10.9.1",
-    "typescript": "^4.0.5"
+    "typescript": "^4.0.5",
+    "web3-core": "^1.8.2",
+    "web3-core-helpers": "^1.8.2"
   },
   "scripts": {
     "postinstall": "node ./.setup.js",

diff --git a/packages/core/scripts/landTunnelMigration/migrateAndWithdrawTunnelLandOnL2.ts b/packages/core/scripts/landTunnelMigration/migrateAndWithdrawTunnelLandOnL2.ts
@@ -12,7 +12,7 @@ import {ethers} from 'hardhat';
 import {
   DefenderRelayProvider,
   DefenderRelaySigner,
-} from 'defender-relay-client/lib/ethers';
+} from '@openzeppelin/defender-relay-client/lib/ethers';
 
 const credentials = {
   apiKey: process.env.MUMBAI_RELAYER_API_KEY || '',

diff --git a/packages/core/scripts/landTunnelMigration/migrateTunnelLandOnL1.ts b/packages/core/scripts/landTunnelMigration/migrateTunnelLandOnL1.ts
@@ -6,7 +6,7 @@ import fs from 'fs-extra';
 import {
   DefenderRelayProvider,
   DefenderRelaySigner,
-} from 'defender-relay-client/lib/ethers';
+} from '@openzeppelin/defender-relay-client/lib/ethers';
 
 const credentials = {
   apiKey: process.env.GOERLI_RELAYER_API_KEY || '',

diff --git a/packages/core/scripts/landTunnelMigration/migrateTunnelLandOnL2.ts b/packages/core/scripts/landTunnelMigration/migrateTunnelLandOnL2.ts
@@ -6,7 +6,7 @@ import fs from 'fs-extra';
 import {
   DefenderRelayProvider,
   DefenderRelaySigner,
-} from 'defender-relay-client/lib/ethers';
+} from '@openzeppelin/defender-relay-client/lib/ethers';
 const credentials = {
   apiKey: process.env.MUMBAI_RELAYER_API_KEY || '',
   apiSecret: process.env.MUMBAI_RELAYER_API_SECRET || '',

diff --git a/packages/dependency-metatx/package.json b/packages/dependency-metatx/package.json
@@ -36,7 +36,7 @@
     "@ethersproject/abi": "^5.7.0",
     "@ethersproject/providers": "^5.7.2",
     "@nomicfoundation/hardhat-chai-matchers": "1",
-    "@nomicfoundation/hardhat-network-helpers": "^1.0.8",
+    "@nomicfoundation/hardhat-network-helpers": "^1.0.9",
     "@nomicfoundation/hardhat-toolbox": "^2.0.2",
     "@nomiclabs/hardhat-ethers": "^2.2.3",
     "@nomiclabs/hardhat-etherscan": "^3.1.7",

diff --git a/packages/dependency-operator-filter/package.json b/packages/dependency-operator-filter/package.json
@@ -26,7 +26,7 @@
     "@ethersproject/abi": "^5.7.0",
     "@ethersproject/providers": "^5.7.2",
     "@nomicfoundation/hardhat-chai-matchers": "^1.0.6",
-    "@nomicfoundation/hardhat-network-helpers": "^1.0.0",
+    "@nomicfoundation/hardhat-network-helpers": "^1.0.9",
     "@nomicfoundation/hardhat-toolbox": "^2.0.2",
     "@nomiclabs/hardhat-ethers": "^2.2.3",
     "@nomiclabs/hardhat-etherscan": "^3.1.7",

diff --git a/packages/dependency-royalty-management/package.json b/packages/dependency-royalty-management/package.json
@@ -28,7 +28,7 @@
     "@manifoldxyz/libraries-solidity": "^1.0.4",
     "@manifoldxyz/royalty-registry-solidity": "^2.0.3",
     "@nomicfoundation/hardhat-chai-matchers": "^1.0.6",
-    "@nomicfoundation/hardhat-network-helpers": "^1.0.0",
+    "@nomicfoundation/hardhat-network-helpers": "^1.0.9",
     "@nomicfoundation/hardhat-toolbox": "^2.0.2",
     "@nomiclabs/hardhat-ethers": "^2.2.3",
     "@nomiclabs/hardhat-etherscan": "^3.1.7",

diff --git a/packages/deploy/package.json b/packages/deploy/package.json
@@ -42,7 +42,7 @@
         "@ethersproject/abi": "^5.7.0",
         "@ethersproject/providers": "^5.7.2",
         "@nomicfoundation/hardhat-chai-matchers": "1",
-        "@nomicfoundation/hardhat-network-helpers": "^1.0.8",
+        "@nomicfoundation/hardhat-network-helpers": "^1.0.9",
         "@nomiclabs/hardhat-ethers": "^2.2.3",
         "@typechain/ethers-v5": "^11.0.0",
         "@typechain/hardhat": "^7.0.0",

diff --git a/packages/example-hardhat/package.json b/packages/example-hardhat/package.json
@@ -27,7 +27,7 @@
     "@ethersproject/providers": "^5.7.2",
     "@nomicfoundation/hardhat-chai-matchers": "^2.0.1",
     "@nomicfoundation/hardhat-ethers": "^3.0.3",
-    "@nomicfoundation/hardhat-network-helpers": "^1.0.8",
+    "@nomicfoundation/hardhat-network-helpers": "^1.0.9",
     "@nomicfoundation/hardhat-toolbox": "^3.0.0",
     "@nomicfoundation/hardhat-verify": "^1.0.0",
     "@nomiclabs/hardhat-etherscan": "^3.1.7",

diff --git a/packages/giveaway/package.json b/packages/giveaway/package.json
@@ -58,11 +58,10 @@
         "@openzeppelin/contracts-upgradeable": "^4.9.0"
     },
     "devDependencies": {
-        "@dlsl/hardhat-markup": "^1.0.0-rc.11",
         "@ethersproject/abi": "^5.7.0",
         "@ethersproject/providers": "^5.7.2",
         "@nomicfoundation/hardhat-chai-matchers": "1",
-        "@nomicfoundation/hardhat-network-helpers": "^1.0.8",
+        "@nomicfoundation/hardhat-network-helpers": "^1.0.9",
         "@nomicfoundation/hardhat-toolbox": "^2.0.2",
         "@nomiclabs/hardhat-ethers": "^2.2.3",
         "@nomiclabs/hardhat-etherscan": "^3.1.7",