recon-generate 0.0.36 → 0.0.38

package/dist/index.js

@@ -43,6 +43,7 @@ const coverage_1 = require("./coverage");
 const pathsGenerator_1 = require("./pathsGenerator");
 const info_1 = require("./info");
 const utils_1 = require("./utils");
+const fs = __importStar(require("fs"));
 const link_1 = require("./link");
 const link2_1 = require("./link2");
 const sourcemap_1 = require("./sourcemap");
@@ -133,7 +134,8 @@ async function main() {
         .option('--list', 'List available contracts/functions (after filters) and exit')
         .option('--force', 'Replace existing generated suite output (under --output). Does not rebuild .recon/out.')
         .option('--force-build', 'Delete .recon/out to force a fresh forge build before generating')
-        .option('--foundry-config <path>', 'Path to foundry.toml (defaults to ./foundry.toml)');
+        .option('--foundry-config <path>', 'Path to foundry.toml (defaults to ./foundry.toml)')
+        .option('--scaffold <path>', 'Path to contracts-to-scaffold.json (Scout V2 output)');
     program
         .command('coverage')
         .description('Generate recon-coverage.json from a Crytic tester contract without scaffolding tests')
@@ -354,6 +356,29 @@ async function main() {
         const foundryConfigPath = (0, utils_1.getFoundryConfigPath)(workspaceRoot, opts.foundryConfig);
         const foundryRoot = path.dirname(foundryConfigPath);
         const forgeConfig = await (0, utils_1.getFoundryConfig)(foundryRoot);
+        // Scout V2: load contracts-to-scaffold.json and merge into include/mock filters
+        if (opts.scaffold) {
+            const scaffoldPath = path.isAbsolute(opts.scaffold)
+                ? opts.scaffold
+                : path.resolve(workspaceRoot, opts.scaffold);
+            try {
+                const scaffoldData = JSON.parse(fs.readFileSync(scaffoldPath, 'utf-8'));
+                const sourceContracts = scaffoldData.source_contracts || [];
+                const mockedContracts = scaffoldData.mocked_contracts || [];
+                if (sourceContracts.length) {
+                    const existing = opts.include || '';
+                    opts.include = [existing, sourceContracts.join(',')].filter(Boolean).join(',');
+                }
+                if (mockedContracts.length) {
+                    const existing = opts.mock || '';
+                    opts.mock = [existing, mockedContracts.join(',')].filter(Boolean).join(',');
+                }
+                console.log(`Scout V2: loaded ${sourceContracts.length} source + ${mockedContracts.length} mock contracts from ${opts.scaffold}`);
+            }
+            catch (err) {
+                console.error(`Scout V2: failed to load scaffold file ${opts.scaffold}: ${err.message}`);
+            }
+        }
         const includeFilter = parseFilter(opts.include);
         const excludeFilter = parseFilter(opts.exclude);
         const adminFilter = parseFilter(opts.admin);

package/dist/templates/setup.js

@@ -33,7 +33,7 @@ abstract contract Setup is BaseSetup, ActorManager, AssetManager, Utils {
     address[] {{instanceName this.name}}_s;
     {{/if}}
 {{/each}}
-    
+
     /// === Setup === ///
     /// This contains all calls to be performed in the tester constructor, both for Echidna and Foundry
     function setup() internal virtual override {
@@ -57,15 +57,17 @@ abstract contract Setup is BaseSetup, ActorManager, AssetManager, Utils {
 
     /// === MODIFIERS === ///
     /// Prank admin and actor
-    
+
     modifier asAdmin {
-        vm.prank(address(this));
+        vm.startPrank(address(this));
         _;
+        vm.stopPrank();
     }
 
     modifier asActor {
-        vm.prank(address(_getActor()));
+        vm.startPrank(address(_getActor()));
         _;
+        vm.stopPrank();
     }
 }
 `, { noEscape: true });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "recon-generate",
-  "version": "0.0.36",
+  "version": "0.0.38",
   "description": "CLI to scaffold Recon fuzzing suite inside Foundry projects",
   "main": "dist/index.js",
   "bin": {