@diamondslab/diamonds-hardhat-foundry 1.0.0 → 1.0.1

package/dist/index.js

@@ -0,0 +1,113 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.HelperGenerator = exports.ForgeFuzzingFramework = exports.DeploymentManager = void 0;
+const config_1 = require("hardhat/config");
+require("./tasks/deploy");
+require("./tasks/generate-helpers");
+require("./tasks/init");
+require("./tasks/test");
+require("./types/hardhat");
+const fs_1 = require("fs");
+const task_names_1 = require("hardhat/builtin-tasks/task-names");
+const path_1 = __importDefault(require("path"));
+const picocolors_1 = __importDefault(require("picocolors"));
+const foundry_1 = require("./foundry");
+const validation_1 = require("./utils/validation");
+// Export framework classes for programmatic use
+var DeploymentManager_1 = require("./framework/DeploymentManager");
+Object.defineProperty(exports, "DeploymentManager", { enumerable: true, get: function () { return DeploymentManager_1.DeploymentManager; } });
+var ForgeFuzzingFramework_1 = require("./framework/ForgeFuzzingFramework");
+Object.defineProperty(exports, "ForgeFuzzingFramework", { enumerable: true, get: function () { return ForgeFuzzingFramework_1.ForgeFuzzingFramework; } });
+var HelperGenerator_1 = require("./framework/HelperGenerator");
+Object.defineProperty(exports, "HelperGenerator", { enumerable: true, get: function () { return HelperGenerator_1.HelperGenerator; } });
+// Export types
+__exportStar(require("./types/config"), exports);
+const TASK_INIT_FOUNDRY = "init-foundry";
+let pluginActivated = false;
+// Extend config with diamondsFoundry settings
+(0, config_1.extendConfig)((config, userConfig) => {
+    // Validate and set diamondsFoundry config
+    config.diamondsFoundry = (0, validation_1.validateConfig)(userConfig.diamondsFoundry);
+    // Check foundry.toml presence. Don't warn when running foundry initialization task
+    if (!(0, fs_1.existsSync)(path_1.default.join(config.paths.root, "foundry.toml"))) {
+        if (!process.argv.includes(TASK_INIT_FOUNDRY)) {
+            console.log(picocolors_1.default.yellow(`Warning: You are using the diamonds-hardhat-foundry plugin but there isn't a foundry.toml file in your project. Run 'npx hardhat ${TASK_INIT_FOUNDRY}' to create one.`));
+        }
+        return;
+    }
+    // Load foundry config
+    const foundryConfig = (0, foundry_1.getForgeConfig)();
+    // Ensure required keys exist
+    if (foundryConfig?.src === undefined ||
+        foundryConfig?.cache_path === undefined) {
+        throw new foundry_1.HardhatFoundryError("Couldn't find `src` or `cache_path` config keys after running `forge config --json`");
+    }
+    // Ensure foundry src path doesn't mismatch user-configured path
+    const userSourcesPath = userConfig.paths?.sources;
+    const foundrySourcesPath = foundryConfig.src;
+    if (userSourcesPath !== undefined &&
+        path_1.default.resolve(userSourcesPath) !== path_1.default.resolve(foundrySourcesPath)) {
+        throw new foundry_1.HardhatFoundryError(`User-configured sources path (${userSourcesPath}) doesn't match path configured in foundry (${foundrySourcesPath})`);
+    }
+    // Set sources path
+    config.paths.sources = path_1.default.resolve(config.paths.root, foundrySourcesPath);
+    // Change hardhat's cache path if it clashes with foundry's
+    const foundryCachePath = path_1.default.resolve(config.paths.root, foundryConfig.cache_path);
+    if (config.paths.cache === foundryCachePath) {
+        config.paths.cache = "cache_hardhat";
+    }
+    pluginActivated = true;
+});
+// Extend environment to add diamondsFoundry config to HRE
+(0, config_1.extendEnvironment)((hre) => {
+    hre.diamondsFoundry = hre.config.diamondsFoundry;
+});
+// This task is in place to detect old hardhat-core versions
+(0, config_1.internalTask)(task_names_1.TASK_COMPILE_TRANSFORM_IMPORT_NAME).setAction(async ({ importName, deprecationCheck, }, _hre) => {
+    // When the deprecationCheck param is passed, it means a new enough hardhat-core is being used
+    if (deprecationCheck) {
+        return importName;
+    }
+    throw new foundry_1.HardhatFoundryError("This version of diamonds-hardhat-foundry depends on hardhat version >= 2.17.2");
+});
+(0, config_1.internalTask)(task_names_1.TASK_COMPILE_GET_REMAPPINGS).setAction(async () => {
+    if (!pluginActivated) {
+        return {};
+    }
+    return (0, foundry_1.getRemappings)();
+});
+(0, config_1.task)(TASK_INIT_FOUNDRY, "Initialize foundry setup in current hardhat project", async (_, hre) => {
+    const foundryConfigPath = path_1.default.resolve(hre.config.paths.root, "foundry.toml");
+    if ((0, fs_1.existsSync)(foundryConfigPath)) {
+        console.warn(picocolors_1.default.yellow(`File foundry.toml already exists. Aborting.`));
+        process.exit(1);
+    }
+    console.log(`Creating foundry.toml file...`);
+    (0, fs_1.writeFileSync)(foundryConfigPath, [
+        `[profile.default]`,
+        `src = '${path_1.default.relative(hre.config.paths.root, hre.config.paths.sources)}'`,
+        `out = 'out'`,
+        `libs = ['node_modules', 'lib']`,
+        `test = '${path_1.default.relative(hre.config.paths.root, hre.config.paths.tests)}'`,
+        `cache_path  = 'cache_forge'`,
+    ].join("\n"));
+    await (0, foundry_1.installDependency)("foundry-rs/forge-std");
+});
+//# sourceMappingURL=index.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@diamondslab/diamonds-hardhat-foundry",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "Hardhat plugin that integrates Foundry testing with Diamond proxy contracts, providing deployment helpers and fuzzing support",
   "repository": {
     "type": "git",
@@ -10,8 +10,8 @@
   "homepage": "https://github.com/diamondslab/diamonds-hardhat-foundry",
   "author": "Am0rfu5",
   "license": "MIT",
-  "main": "dist/src/index.js",
-  "types": "dist/src/index.d.ts",
+  "main": "dist/index.js",
+  "types": "dist/index.d.ts",
   "keywords": [
     "ethereum",
     "smart-contracts",

package/src/tasks/deploy.ts

@@ -12,14 +12,10 @@ import { validateFoundryInstallation } from "../utils/validation";
  * - Deploys Diamond using LocalDiamondDeployer
  * - Saves deployment record
  * - Optionally reuses existing deployment
+ * 
+ * Use Hardhat's built-in --network flag to specify the network
  */
 task("diamonds-forge:deploy", "Deploy Diamond contract for Forge testing")
-  .addOptionalParam(
-    "network",
-    "Target network for deployment",
-    "hardhat",
-    types.string
-  )
   .addOptionalParam(
     "diamondName",
     "Name of the Diamond to deploy",
@@ -31,7 +27,8 @@ task("diamonds-forge:deploy", "Deploy Diamond contract for Forge testing")
   .setAction(async (taskArgs, hre: HardhatRuntimeEnvironment) => {
     Logger.section("Deploying Diamond for Forge Testing");
 
-    const networkName = taskArgs.network;
+    // Use Hardhat's built-in network name from HRE
+    const networkName = hre.network.name;
     const diamondName = taskArgs.diamondName;
     const reuse = taskArgs.reuse;
     const force = taskArgs.force;

package/src/tasks/generate-helpers.ts

@@ -11,6 +11,8 @@ import { Logger } from "../utils/logger";
  * - Reads deployment record
  * - Generates DiamondDeployment.sol library
  * - Creates constants for addresses and facets
+ * 
+ * Use Hardhat's built-in --network flag to specify the network
  */
 task("diamonds-forge:generate-helpers", "Generate Solidity helpers from Diamond deployment")
   .addOptionalParam(
@@ -19,12 +21,6 @@ task("diamonds-forge:generate-helpers", "Generate Solidity helpers from Diamond
     "ExampleDiamond",
     types.string
   )
-  .addOptionalParam(
-    "network",
-    "Network where Diamond is deployed",
-    "hardhat",
-    types.string
-  )
   .addOptionalParam(
     "outputDir",
     "Directory for generated helper files",
@@ -35,7 +31,8 @@ task("diamonds-forge:generate-helpers", "Generate Solidity helpers from Diamond
     Logger.section("Generating Diamond Deployment Helpers");
 
     const diamondName = taskArgs.diamondName;
-    const networkName = taskArgs.network;
+    // Use Hardhat's built-in network name from HRE
+    const networkName = hre.network.name;
     const outputDir = taskArgs.outputDir || hre.diamondsFoundry.helpersDir;
 
     Logger.info(`Diamond: ${diamondName}`);

package/src/tasks/test.ts

@@ -11,6 +11,8 @@ import { Logger } from "../utils/logger";
  * - Generates Solidity helpers
  * - Compiles Forge contracts
  * - Runs forge test with specified options
+ * 
+ * Use Hardhat's built-in --network flag to specify the network
  */
 task("diamonds-forge:test", "Run Forge tests with Diamond deployment")
   .addOptionalParam(
@@ -19,12 +21,6 @@ task("diamonds-forge:test", "Run Forge tests with Diamond deployment")
     "ExampleDiamond",
     types.string
   )
-  .addOptionalParam(
-    "network",
-    "Network for deployment",
-    "hardhat",
-    types.string
-  )
   .addOptionalParam(
     "matchTest",
     "Run tests matching pattern (--match-test)",
@@ -51,7 +47,8 @@ task("diamonds-forge:test", "Run Forge tests with Diamond deployment")
     Logger.section("Running Forge Tests with Diamond");
 
     const diamondName = taskArgs.diamondName;
-    const networkName = taskArgs.network;
+    // Use Hardhat's built-in network name from HRE
+    const networkName = hre.network.name;
     const matchTest = taskArgs.matchTest;
     const matchContract = taskArgs.matchContract;
     const verbosity = taskArgs.verbosity;