refactor: cleanup

Author: ahmedali8

biome.jsonc

@@ -23,8 +23,7 @@
     "enabled": true,
     "rules": {
       "correctness": {
-        "noConstantCondition": "off",
-        "noUnusedImports": "off",
+        "noUnusedImports": "warn",
         "noUnusedVariables": "warn"
       },
       "nursery": {

hardhat.config.ts

@@ -1,4 +1,3 @@
-import "@nomicfoundation/hardhat-foundry";
 import "@nomicfoundation/hardhat-toolbox";
 import "@primitivefi/hardhat-dodoc";
 import { config as dotenvConfig } from "dotenv";

package.json

@@ -10,34 +10,31 @@
     "biome:check": "biome check .",
     "biome:write": "biome check --write . && bun run biome:write:imports",
     "biome:write:imports": "biome lint --write --only correctness/noUnusedImports .",
-    "chain": "hardhat node --no-deploy --export-all ./generated/chain.json --network hardhat",
+    "chain": "bun hardhat node --no-deploy --export-all ./generated/chain.json --network hardhat",
     "clean": "shx rm -rf ./artifacts ./cache ./cache_hardhat ./coverage ./coverage.json ./types && bun typechain",
-    "compile": "cross-env TS_NODE_TRANSPILE_ONLY=true hardhat compile",
-    "coverage": "hardhat coverage --solcoverjs ./.solcover.js --temp artifacts --testfiles \"test/**/*.ts\" && bun typechain",
-    "deploy:hardhat-deploy": "hardhat deploy --export-all ./deployments/hardhat_contracts.json",
+    "compile": "cross-env TS_NODE_TRANSPILE_ONLY=true bun hardhat compile",
+    "coverage": "bun hardhat coverage --solcoverjs ./.solcover.js --temp artifacts --testfiles \"test/**/*.ts\" && bun typechain",
+    "deploy:hardhat-deploy": "bun hardhat deploy --export-all ./deployments/hardhat_contracts.json",
     "deploy": "bun deploy:hardhat-deploy --network hardhat",
     "deploy:network": "bun deploy:hardhat-deploy --network",
-    "fork": "hardhat node --network hardhat --fork https://mainnet.infura.io/v3/460f40a260564ac4a4f4b3fffb032dad",
+    "fork": "bun hardhat node --network hardhat --fork https://mainnet.infura.io/v3/460f40a260564ac4a4f4b3fffb032dad",
     "lint": "bun lint:sol && bun lint:ts && bun prettier:check",
     "lint:sol": "forge fmt --check && bun solhint \"{script,contracts,test}/**/*.sol\"",
     "lint:ts": "bun run biome:check",
-    "networks": "hardhat networks",
+    "networks": "bun hardhat networks",
     "postinstall": "DOTENV_CONFIG_PATH=./.env.example bun typechain",
     "prettier:write": "prettier --cache --write \"**/*.{md,yml}\"",
     "prettier:check": "prettier --cache --check \"**/*.{md,yml}\"",
-    "test": "hardhat test",
-    "test:gas": "REPORT_GAS=true CONTRACT_SIZER=true hardhat test",
-    "test:trace": "hardhat test --trace",
-    "test:fulltrace": "hardhat test --fulltrace",
-    "typechain": "cross-env TS_NODE_TRANSPILE_ONLY=true hardhat typechain",
-    "verify": "hardhat run scripts/verify.ts --network"
+    "test": "bun hardhat test",
+    "test:gas": "REPORT_GAS=true CONTRACT_SIZER=true bun hardhat test",
+    "typechain": "cross-env TS_NODE_TRANSPILE_ONLY=true bun hardhat typechain",
+    "verify": "bun hardhat run scripts/verify.ts --network"
   },
   "devDependencies": {
     "@biomejs/biome": "2.2.5",
     "@ethersproject/bignumber": "^5.8.0",
     "@nomicfoundation/hardhat-chai-matchers": "^2.1.0",
     "@nomicfoundation/hardhat-ethers": "^3.1.0",
-    "@nomicfoundation/hardhat-foundry": "^1.2.0",
     "@nomicfoundation/hardhat-ignition": "^0.15.13",
     "@nomicfoundation/hardhat-ignition-ethers": "^0.15.14",
     "@nomicfoundation/hardhat-network-helpers": "^1.1.0",
@@ -53,7 +50,6 @@
     "@types/mocha": "^10.0.10",
     "@types/node": "^24.1.0",
     "chai": "5.2.1",
-    "chalk": "4.1.2",
     "cross-env": "^10.0.0",
     "dotenv": "^17.2.1",
     "ds-test": "github:dapphub/ds-test#e282159d5170298eb2455a6c05280ab5a73a4ef0",

utils/constants.ts

@@ -1,13 +1,10 @@
 // biome-ignore-all lint/suspicious/noExplicitAny: no-reason
 
-import chalk from "chalk";
-import { type BaseContract, type Contract, type Signer } from "ethers";
+import { type Contract, type Signer } from "ethers";
 import { ethers } from "hardhat";
 
 import { fromWei } from "./format";
 
-import { getExtraGasInfo } from "./misc";
-
 /**
  * Gets a contract instance for the given contract name or ABI, address, and signer.
  *
@@ -66,35 +63,6 @@ export async function preDeploy(signerAddress: string, contractName: string): Pr
   const { chainId, name } = await ethers.provider.getNetwork();
   const ethBalance = await ethers.provider.getBalance(signerAddress);
 
-  console.log(` 🛰  Deploying: ${chalk.cyan(contractName)} to Network: ${name} & ChainId: ${chainId}`);
-  console.log(` 🎭 Deployer: ${chalk.cyan(signerAddress)}, Balance: ${chalk.grey(fromWei(ethBalance ?? 0))} ETH`);
-}
-
-/**
- * Logs information about the deployment of a contract.
- *
- * @param contractName - The name of the deployed contract.
- * @param contract - The contract instance.
- * @returns A promise that resolves to the contract instance that has been deployed.
- */
-export async function postDeploy<T extends BaseContract = BaseContract>(contractName: string, contract: T): Promise<T> {
-  // Wait for the contract to be deployed
-  await contract.waitForDeployment();
-
-  // Get extra gas information of the deployment transaction
-  let extraGasInfo = "";
-  const deploymentTransaction = contract.deploymentTransaction();
-
-  if (deploymentTransaction) {
-    extraGasInfo = (await getExtraGasInfo(deploymentTransaction)) ?? "";
-  }
-
-  const contractAddress = await contract.getAddress();
-
-  // Log the deployment information
-  console.log(" 📄", chalk.cyan(contractName), "deployed to:", chalk.magenta(contractAddress));
-  console.log(" ⛽", chalk.grey(extraGasInfo));
-
-  // Return the contract instance
-  return contract;
+  console.log(` 🛰  Deploying: ${contractName} to Network: ${name} & ChainId: ${chainId}`);
+  console.log(` 🎭 Deployer: ${signerAddress}, Balance: ${fromWei(ethBalance ?? 0)} ETH`);
 }

utils/contracts.ts

@@ -1,6 +1,4 @@
-import { computeAddress, getAddress, solidityPackedKeccak256, type TransactionResponse } from "ethers";
-
-import { fromWei, toGwei } from "./format";
+import { computeAddress, getAddress, solidityPackedKeccak256 } from "ethers";
 
 /**
  * Asynchronously sleeps for the specified number of milliseconds.
@@ -22,21 +20,6 @@ export async function delayLog(ms: number): Promise<void> {
   await sleep(ms);
 }
 
-/**
- * Checks if the provided address is valid and returns the checksummed address if valid.
- * Otherwise, returns false.
- *
- * @param value - The address to be checked.
- * @returns The checksummed address if valid, or false.
- */
-export function isAddress(value: string): string | false {
-  try {
-    return getAddress(value);
-  } catch {
-    return false;
-  }
-}
-
 /**
  * Creates a random checksummed address using the provided salt.
  *
@@ -48,28 +31,3 @@ export function createRandomChecksumAddress(salt: string): string {
   const checkSummedSignerAddress: string = getAddress(signerAddress);
   return checkSummedSignerAddress;
 }
-
-/**
- * Retrieves necessary gas information of a transaction.
- *
- * @param tx - The transaction response (e.g., contract deployment or executed transaction).
- * @returns A string containing gas information or null if the transaction is falsy or unsuccessful.
- */
-export async function getExtraGasInfo(tx: TransactionResponse): Promise<string | null> {
-  if (!tx) {
-    return null;
-  }
-
-  const gasPrice = tx.gasPrice;
-  const gasUsed = tx.gasLimit * gasPrice;
-  const txReceipt = await tx.wait();
-
-  if (!txReceipt) {
-    return null;
-  }
-
-  const gas = txReceipt.gasUsed;
-  const extraGasInfo = `${toGwei(gasPrice)} gwei, ${fromWei(gasUsed)} ETH, ${gas} gas, txHash: ${tx.hash}`;
-
-  return extraGasInfo;
-}