@diamondslab/diamonds-hardhat-foundry 1.0.2 → 2.1.0

package/src/templates/ExampleIntegrationTest.t.sol.template

@@ -3,7 +3,9 @@ pragma solidity ^0.8.0;
 
 import "forge-std/Test.sol";
 import "forge-std/console.sol";
-import "../../helpers/DiamondDeployment.sol";
+import "@diamondslab/diamonds-hardhat-foundry/contracts/DiamondForgeHelpers.sol";
+import "@diamondslab/diamonds-hardhat-foundry/contracts/DiamondABILoader.sol";
+import "../helpers/DiamondDeployment.sol";
 
 /**
  * @title ExampleIntegrationTest
@@ -11,6 +13,9 @@ import "../../helpers/DiamondDeployment.sol";
  * @dev Tests interactions between multiple facets and Diamond functionality
  */
 contract ExampleIntegrationTest is Test {
+    using DiamondForgeHelpers for address;
+    using DiamondABILoader for string;
+
     address diamond;
     address deployer;
     
@@ -23,6 +28,9 @@ contract ExampleIntegrationTest is Test {
         diamond = DiamondDeployment.diamond();
         deployer = DiamondDeployment.deployer();
 
+        // Validate Diamond
+        DiamondForgeHelpers.assertValidDiamond(diamond);
+
         // Set up test users
         user1 = makeAddr("user1");
         user2 = makeAddr("user2");

package/src/templates/ExampleUnitTest.t.sol.template

@@ -3,7 +3,8 @@ pragma solidity ^0.8.0;
 
 import "forge-std/Test.sol";
 import "forge-std/console.sol";
-import "../../helpers/DiamondDeployment.sol";
+import "@diamondslab/diamonds-hardhat-foundry/contracts/DiamondForgeHelpers.sol";
+import "../helpers/DiamondDeployment.sol";
 
 /**
  * @title ExampleUnitTest
@@ -11,6 +12,8 @@ import "../../helpers/DiamondDeployment.sol";
  * @dev This is a template - customize for your specific Diamond implementation
  */
 contract ExampleUnitTest is Test {
+    using DiamondForgeHelpers for address;
+
     address diamond;
     address deployer;
 
@@ -21,6 +24,9 @@ contract ExampleUnitTest is Test {
 
         console.log("Diamond deployed at:", diamond);
         console.log("Deployed by:", deployer);
+        
+        // Validate Diamond deployment
+        DiamondForgeHelpers.assertValidDiamond(diamond);
     }
 
     /**

package/src/types/hardhat.ts

@@ -2,6 +2,7 @@
  * Type extensions for Hardhat Runtime Environment
  */
 
+import "@nomicfoundation/hardhat-ethers";
 import "hardhat/types/config";
 import "hardhat/types/runtime";
 import { DiamondsFoundryConfig } from "../types/config";
@@ -19,6 +20,5 @@ declare module "hardhat/types/config" {
 declare module "hardhat/types/runtime" {
   export interface HardhatRuntimeEnvironment {
     diamondsFoundry: Required<DiamondsFoundryConfig>;
-    ethers: any; // Will be provided by @nomicfoundation/hardhat-ethers
   }
 }

package/src/utils/foundry.ts

@@ -89,6 +89,7 @@ export async function runForgeTest(options: {
   matchContract?: string;
   verbosity?: number;
   gasReport?: boolean;
+  forkUrl?: string;
   cwd?: string;
   env?: Record<string, string>;
 }): Promise<{ success: boolean; output: string }> {
@@ -110,6 +111,10 @@ export async function runForgeTest(options: {
     args.push("--gas-report");
   }
 
+  if (options.forkUrl) {
+    args.push("--fork-url", options.forkUrl);
+  }
+
   try {
     const result = await execForgeAsync("forge", args, {
       cwd: options.cwd,