fix: compilation

AngleProtocol · Mar 12, 2024 · b0c8f47 · b0c8f47
1 parent 6f6e535
commit b0c8f47
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 18 deletions.
diff --git a/hardhat.config.ts b/hardhat.config.ts
@@ -15,7 +15,6 @@ import '@nomiclabs/hardhat-solhint';
 import '@tenderly/hardhat-tenderly';
 import '@typechain/hardhat';
 
-import { parseEther } from 'ethers/lib/utils';
 import { TASK_COMPILE_SOLIDITY_GET_SOURCE_PATHS } from 'hardhat/builtin-tasks/task-names';
 import { HardhatUserConfig, subtask } from 'hardhat/config';
 import { HardhatNetworkAccountsUserConfig } from 'hardhat/types';
@@ -29,7 +28,7 @@ subtask(TASK_COMPILE_SOLIDITY_GET_SOURCE_PATHS).setAction(async (_, __, runSuper
   return paths.filter((p: string) => !p.includes('/test/foundry/'));
 });
 
-const accountsOldDeployer: HardhatNetworkAccountsUserConfig = accounts('old_deployer');
+const accountsPkey = [getPkey()];
 const accountsMerklDeployer: HardhatNetworkAccountsUserConfig = accounts('merkl_deployer');
 
 const argv = yargs
@@ -96,7 +95,6 @@ const config: HardhatUserConfig = {
   // For the lists of Chain ID: https://chainlist.org
   networks: {
     hardhat: {
-      accounts: accountsPkey,
       live: false,
       blockGasLimit: 125e5,
       initialBaseFeePerGas: 0,
@@ -355,7 +353,7 @@ const config: HardhatUserConfig = {
     blast: {
       live: true,
       url: nodeUrl('blast'),
-      accounts: accountsMerklDeployer,
+      accounts: [getPkey()],
       gas: 'auto',
       gasMultiplier: 1.3,
       chainId: 81457,
@@ -391,19 +389,6 @@ const config: HardhatUserConfig = {
         },
       },
     },
-    blast: {
-      live: true,
-      url: nodeUrl('blast'),
-      accounts: [getPkey()],
-      gas: 'auto',
-      gasMultiplier: 1.3,
-      chainId: 81457,
-      verify: {
-        etherscan: {
-          apiKey: etherscanKey('blast'),
-        },
-      },
-    },
     immutablezkevm: {
       live: true,
       url: nodeUrl('immutablezkevm'),
@@ -414,6 +399,9 @@ const config: HardhatUserConfig = {
       verify: {
         etherscan: {
           apiKey: etherscanKey('immutablezkevm'),
+        },
+      },
+    },
     immutable: {
       live: true,
       url: nodeUrl('immutable'),

diff --git a/package.json b/package.json
@@ -6,7 +6,7 @@
     "ci:coverage": "forge coverage --ir-minimum --report lcov && yarn lcov:clean",
     "lcov:clean": "lcov --remove lcov.info -o lcov.info 'test/**' 'scripts/**' 'contracts/mock/**' 'contracts/deprecated/**' 'contracts/external/**'",
     "lcov:generate-html": "genhtml lcov.info --output=coverage",
-    "deploy": "hardhat deploy --tags aglaMerkl --network",
+    "deploy": "hardhat deploy --tags blast --network",
     "etherscan": "hardhat etherscan-verify --network",
     "foundry:compile": "forge build --optimize --optimizer-runs 1000",
     "foundry:coverage": "forge coverage --ir-minimum --report lcov && yarn lcov:clean && yarn lcov:generate-html",