update eslint

zkLinkProtocol · Apr 2, 2024 · 560539c · 560539c
1 parent 6a7bea2
commit 560539c
Show file tree

Hide file tree

Showing 10 changed files with 360 additions and 95 deletions.
diff --git a/.eslintrc → .eslintrc.json b/.eslintrc → .eslintrc.json
@@ -2,14 +2,18 @@
   "root": true,
   "extends" : [
     "eslint:recommended",
+    "plugin:@typescript-eslint/recommended",
     "prettier"
   ],
   "env": {
     "es2022": true,
-    "browser": true,
+    "browser": false,
     "node": true,
     "mocha": true
   },
   "globals" : {
+  },
+  "rules": {
+    "@typescript-eslint/no-explicit-any": "off"
   }
 }
diff --git a/hardhat.config.ts b/hardhat.config.ts
@@ -12,6 +12,7 @@ import './script/deploy_portal';
 import './script/deploy_merge_token';
 import './script/deploy_governance';
 import './script/deploy_multicall';
+import { NetworksUserConfig, NetworkUserConfig } from 'hardhat/src/types/config';
 
 dotenv.config();
 
@@ -56,14 +57,12 @@ const config: HardhatUserConfig = {
       ethNetwork: 'goerli',
       verifyURL: 'https://goerli.explorer.zklink.io/contract_verification',
       zksync: true,
-      accounts: [process.env.WALLET_PRIVATE_KEY || ''],
     },
     zklinkNova: {
       url: 'https://rpc.zklink.io',
       ethNetwork: 'mainnet',
       verifyURL: 'https://explorer.zklink.io/contract_verification',
       zksync: true,
-      accounts: [process.env.WALLET_PRIVATE_KEY || ''],
     },
   },
   zksolc: {
@@ -75,4 +74,10 @@ const config: HardhatUserConfig = {
   },
 };
 
+if (!!config.defaultNetwork && config.defaultNetwork !== 'hardhat' && !!process.env.WALLET_PRIVATE_KEY) {
+  const ns = config.networks as NetworksUserConfig;
+  const nu = ns[config.defaultNetwork] as NetworkUserConfig;
+  nu.accounts = [process.env.WALLET_PRIVATE_KEY];
+}
+
 export default config;