fix(hardhat): change workspace package name

Author: igdev0

package.json

@@ -14,7 +14,6 @@
   "scripts": {
     "prepare": "husky",
     "precommit": "lint-staged",
-    "lint": "yarn workspace hardhat lint",
     "dev": "npm-run-all --parallel dapp:dev backend:dev hardhat:chain hardhat:deploy",
     "dapp:start": "yarn workspace dapp start",
     "dapp:dev": "yarn workspace dapp dev",
@@ -34,24 +33,24 @@
     "backend:dev": "yarn workspace backend start:dev",
     "backend:start": "yarn workspace backend start",
     "backend:build": "yarn workspace backend build",
-    "hardhat:account": "yarn workspace hardhat account",
-    "hardhat:account-import": "yarn workspace hardhat account:import",
-    "hardhat:account-reveal": "yarn workspace hardhat account:reveal-pk",
-    "hardhat:chain": "yarn workspace hardhat chain",
-    "hardhat:check-types": "yarn workspace hardhat check-types",
-    "hardhat:clean": "yarn workspace hardhat clean",
-    "hardhat:compile": "yarn workspace hardhat compile",
-    "hardhat:deploy": "yarn workspace hardhat deploy",
-    "hardhat:flatten": "yarn workspace hardhat flatten",
-    "hardhat:fork": "yarn workspace hardhat fork",
-    "hardhat:format": "yarn workspace hardhat format",
-    "hardhat:generate": "yarn workspace hardhat generate",
-    "hardhat:hardhat-verify": "yarn workspace hardhat hardhat-verify",
-    "hardhat:lint": "yarn workspace hardhat lint",
-    "hardhat:lint-fix": "yarn workspace hardhat lint:fix",
-    "hardhat:lint-staged": "yarn workspace hardhat lint-staged",
-    "hardhat:test": "yarn workspace hardhat test",
-    "hardhat:verify": "yarn workspace hardhat verify"
+    "contracts:account": "yarn workspace @bee-funded/contracts account",
+    "contracts:account-import": "yarn workspace @bee-funded/contracts account:import",
+    "contracts:account-reveal": "yarn workspace @bee-funded/contracts account:reveal-pk",
+    "contracts:chain": "yarn workspace @bee-funded/contracts chain",
+    "contracts:check-types": "yarn workspace @bee-funded/contracts check-types",
+    "contracts:clean": "yarn workspace @bee-funded/contracts clean",
+    "contracts:compile": "yarn workspace @bee-funded/contracts compile",
+    "contracts:deploy": "yarn workspace @bee-funded/contracts deploy",
+    "contracts:flatten": "yarn workspace @bee-funded/contracts flatten",
+    "contracts:fork": "yarn workspace @bee-funded/contracts fork",
+    "contracts:format": "yarn workspace @bee-funded/contracts format",
+    "contracts:generate": "yarn workspace @bee-funded/contracts generate",
+    "contracts:hardhat-verify": "yarn workspace @bee-funded/contracts hardhat-verify",
+    "contracts:lint": "yarn workspace @bee-funded/contracts lint",
+    "contracts:lint-fix": "yarn workspace hardhat lint:fix",
+    "contracts:lint-staged": "yarn workspace @bee-funded/contracts lint-staged",
+    "contracts:test": "yarn workspace @bee-funded/contracts test",
+    "contracts:verify": "yarn workspace @bee-funded/contracts verify"
   },
   "author": "Ianos Dorultan",
   "license": "MIT",

packages/hardhat/deploy/01_deploy_mocked_tokens.ts

@@ -1,6 +1,5 @@
 import { HardhatRuntimeEnvironment } from "hardhat/types";
 import { DeployFunction } from "hardhat-deploy/types";
-import { Contract, ethers } from "ethers";
 
 /**
  * Deploys a hardhat named "BeeFunded" using the deployer account and

packages/hardhat/hardhat.config.ts

@@ -36,6 +36,12 @@ const config: HardhatUserConfig = {
       },
     },
   },
+  typechain: {
+    outDir: "typechain-types",
+    target: "ethers-v6",
+    alwaysGenerateOverloads: false, // should overloads with full signatures like deposit(uint256) be generated always, even if there are no overloads?
+    dontOverrideCompile: false, // defaults to false
+  },
   defaultNetwork: "localhost",
   namedAccounts: {
     deployer: {

packages/hardhat/package.json

@@ -1,6 +1,11 @@
 {
-  "name": "hardhat",
+  "name": "@bee-funded/contracts",
   "version": "0.0.1",
+  "main": "typechain-types/index.ts",
+  "types": "typechain-types/index.ts",
+  "files": [
+    "typechain-types"
+  ],
   "scripts": {
     "account": "hardhat run scripts/listAccount.ts",
     "account:generate": "hardhat run scripts/generateAccount.ts",
@@ -38,7 +43,6 @@
     "@nomicfoundation/hardhat-ethers": "~3.0.8",
     "@nomicfoundation/hardhat-network-helpers": "~1.0.11",
     "@nomicfoundation/hardhat-verify": "~2.0.10",
-    "@typechain/ethers-v5": "~11.1.2",
     "@typechain/hardhat": "~9.1.0",
     "@types/eslint": "~9.6.1",
     "@types/mocha": "~10.0.10",

packages/hardhat/test/BeeFunded.ts

@@ -5,14 +5,14 @@ import {
   DonationManager,
   MockERC1155,
   MockERC20,
+  MockERC721,
   MockUSDC,
   SubscriptionManager,
   TreasureManager,
 } from "../typechain-types";
 import { expect } from "chai";
 import { AbiCoder, HDNodeWallet, parseUnits, Signer } from "ethers";
 import { time } from "@nomicfoundation/hardhat-network-helpers";
-import { MockERC721 } from "../typechain-types/contracts/mocks/MockERC721.sol";
 
 const AUTOMATION_UP_KEEP_ADDRESS = "0x86EFBD0b6736Bed994962f9797049422A3A8E8Ad";
 

yarn.lock

@@ -657,6 +657,49 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@bee-funded/contracts@workspace:^, @bee-funded/contracts@workspace:packages/hardhat":
+  version: 0.0.0-use.local
+  resolution: "@bee-funded/contracts@workspace:packages/hardhat"
+  dependencies:
+    "@chainlink/contracts": ^1.4.0
+    "@chainlink/contracts-ccip": ^1.6.0
+    "@ethersproject/abi": ~5.7.0
+    "@ethersproject/providers": ~5.7.2
+    "@inquirer/password": ^4.0.2
+    "@nomicfoundation/hardhat-chai-matchers": ~2.0.7
+    "@nomicfoundation/hardhat-ethers": ~3.0.8
+    "@nomicfoundation/hardhat-network-helpers": ~1.0.11
+    "@nomicfoundation/hardhat-verify": ~2.0.10
+    "@openzeppelin/contracts": ~5.0.2
+    "@typechain/ethers-v6": ~0.5.1
+    "@typechain/hardhat": ~9.1.0
+    "@types/eslint": ~9.6.1
+    "@types/mocha": ~10.0.10
+    "@types/prettier": ~3.0.0
+    "@types/qrcode": ~1.5.5
+    "@typescript-eslint/eslint-plugin": ~8.27.0
+    "@typescript-eslint/parser": ~8.27.0
+    chai: ~4.5.0
+    dotenv: ~16.4.5
+    envfile: ~7.1.0
+    eslint: ~9.23.0
+    eslint-config-prettier: ~10.1.1
+    eslint-plugin-prettier: ~5.2.4
+    ethers: ~6.13.2
+    hardhat: ~2.22.10
+    hardhat-deploy: ~0.12.4
+    hardhat-deploy-ethers: ~0.4.2
+    hardhat-gas-reporter: ~2.2.1
+    prettier: ^3.5.3
+    prettier-plugin-solidity: ~1.4.1
+    qrcode: ~1.5.4
+    solidity-coverage: ~0.8.13
+    ts-node: ~10.9.1
+    typechain: ~8.3.2
+    typescript: ^5.8.2
+  languageName: unknown
+  linkType: soft
+
 "@chainlink/contracts-ccip@npm:^1.6.0":
   version: 1.6.0
   resolution: "@chainlink/contracts-ccip@npm:1.6.0"
@@ -6380,22 +6423,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typechain/ethers-v5@npm:~11.1.2":
-  version: 11.1.2
-  resolution: "@typechain/ethers-v5@npm:11.1.2"
-  dependencies:
-    lodash: ^4.17.15
-    ts-essentials: ^7.0.1
-  peerDependencies:
-    "@ethersproject/abi": ^5.0.0
-    "@ethersproject/providers": ^5.0.0
-    ethers: ^5.1.3
-    typechain: ^8.3.2
-    typescript: ">=4.3.0"
-  checksum: 4f2d458306094c8e57bc0e05c86c1def210bd8b2cadd1062218cbc35fe3f6ac98aca08646c935a6fa5e57599be9fc0ddd2d4f7cf960fe28e27bf3ed58906c71f
-  languageName: node
-  linkType: hard
-
 "@typechain/ethers-v6@npm:~0.5.1":
   version: 0.5.1
   resolution: "@typechain/ethers-v6@npm:0.5.1"
@@ -9109,6 +9136,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "backend@workspace:packages/backend"
   dependencies:
+    "@bee-funded/contracts": "workspace:^"
     "@eslint/eslintrc": ^3.2.0
     "@eslint/js": ^9.18.0
     "@faker-js/faker": ^9.9.0
@@ -9145,7 +9173,7 @@ __metadata:
     eslint: ^9.18.0
     eslint-config-prettier: ^10.0.1
     eslint-plugin-prettier: ^5.2.2
-    ethers: ^6.15.0
+    ethers: ^6.13.2
     globals: ^16.0.0
     jest: ^29.7.0
     jest-mock: ^30.0.2
@@ -12647,7 +12675,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ethers@npm:^6.15.0":
+"ethers@npm:^6.13.2":
   version: 6.15.0
   resolution: "ethers@npm:6.15.0"
   dependencies:
@@ -14075,50 +14103,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"hardhat@workspace:packages/hardhat":
-  version: 0.0.0-use.local
-  resolution: "hardhat@workspace:packages/hardhat"
-  dependencies:
-    "@chainlink/contracts": ^1.4.0
-    "@chainlink/contracts-ccip": ^1.6.0
-    "@ethersproject/abi": ~5.7.0
-    "@ethersproject/providers": ~5.7.2
-    "@inquirer/password": ^4.0.2
-    "@nomicfoundation/hardhat-chai-matchers": ~2.0.7
-    "@nomicfoundation/hardhat-ethers": ~3.0.8
-    "@nomicfoundation/hardhat-network-helpers": ~1.0.11
-    "@nomicfoundation/hardhat-verify": ~2.0.10
-    "@openzeppelin/contracts": ~5.0.2
-    "@typechain/ethers-v5": ~11.1.2
-    "@typechain/ethers-v6": ~0.5.1
-    "@typechain/hardhat": ~9.1.0
-    "@types/eslint": ~9.6.1
-    "@types/mocha": ~10.0.10
-    "@types/prettier": ~3.0.0
-    "@types/qrcode": ~1.5.5
-    "@typescript-eslint/eslint-plugin": ~8.27.0
-    "@typescript-eslint/parser": ~8.27.0
-    chai: ~4.5.0
-    dotenv: ~16.4.5
-    envfile: ~7.1.0
-    eslint: ~9.23.0
-    eslint-config-prettier: ~10.1.1
-    eslint-plugin-prettier: ~5.2.4
-    ethers: ~6.13.2
-    hardhat: ~2.22.10
-    hardhat-deploy: ~0.12.4
-    hardhat-deploy-ethers: ~0.4.2
-    hardhat-gas-reporter: ~2.2.1
-    prettier: ^3.5.3
-    prettier-plugin-solidity: ~1.4.1
-    qrcode: ~1.5.4
-    solidity-coverage: ~0.8.13
-    ts-node: ~10.9.1
-    typechain: ~8.3.2
-    typescript: ^5.8.2
-  languageName: unknown
-  linkType: soft
-
 "has-ansi@npm:^2.0.0":
   version: 2.0.0
   resolution: "has-ansi@npm:2.0.0"