ethershell 0.1.4-beta.0 → 0.1.6-beta.0

package/bin/cli.js

@@ -17,7 +17,8 @@ import {
     compilerOptions,
     getCompilerOptions,
     compile,
-    changeCompPath
+    changeCompPath,
+    flatten
 } from '../src/services/build.js';
 import { set, get, getDefault } from '../src/services/network.js';
 import { deleteDirectory } from '../src/services/files.js';
@@ -37,7 +38,7 @@ import {
 
 import { deploy, add } from '../src/services/addContracts.js';
 import { getContracts } from '../src/services/contracts.js';
-import { getConfigInfo, getDefaultAccount } from '../src/services/config.js';
+import { getConfigInfo, getDefaultAccount } from '../src/services/configSync.js';
 
 /**
  * REPL instance for EtherShell interactive environment
@@ -66,6 +67,7 @@ r.context.compInfo = getCompilerOptions;
 r.context.compOpts = compilerOptions;
 r.context.compPath = changeCompPath;
 r.context.build = compile;
+r.context.flatten = flatten;
 
 // Config commands
 r.context.configInfo = getConfigInfo;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "ethershell",
   "license": "MIT",
-  "version": "0.1.4-beta.0",
+  "version": "0.1.6-beta.0",
   "description": "Interactive JavaScript console for Ethereum smart contract management",
   "author": "Alireza Kiakojouri (alirezaethdev@gmail.com)",
   "repository": {

package/src/services/addContracts.js

@@ -8,11 +8,13 @@
 
 import { ethers } from 'ethers';
 import fs from 'fs';
-import { provider } from './config.js';
+import { 
+    provider,
+    configFile
+ } from './configSync.js';
 import { allAccounts } from './wallet.js';
 import { LocalStorage } from 'node-localstorage';
 import { r } from '../../bin/cli.js';
-import { configFile } from './config.js';
 import { createContractProxy } from '../utils/contractProxy.js';
 import { eventOf } from '../utils/event.js';
 

package/src/services/build.js

@@ -20,7 +20,7 @@ import {
   configPath,
   configFile,
   compConfig
-} from './config.js';
+} from './configSync.js';
 
 /**
  * Update the Solidity compiler to a specific version
@@ -39,6 +39,7 @@ export async function updateCompiler(version){
     // Update config file
     configFile.compiler.version = extractLoadableVersion(compConfig.currentSolcInstance.version());
     fs.writeFileSync(configPath, JSON.stringify(configFile, null, 2));
+
   } catch(err) {
     console.error(err);
   }
@@ -155,6 +156,37 @@ export function compile(fullPath, selectedContracts, buildPath){
       console.log(`Contract compiled into ${path.resolve(buildPath)}`);
     }
 
+////////////////////
+  // Generate aggregated ABI after compilation
+  const abisDir = path.join(buildPath, 'abis');
+  const aggregatedAbiPath = path.join(buildPath, 'aggregated.abi.json');
+
+  if (fs.existsSync(abisDir)) {
+    const files = fs.readdirSync(abisDir).filter(f => f.endsWith('.abi.json'));
+
+    const aggregated = [];
+    for (const file of files) {
+      const p = path.join(abisDir, file);
+      try {
+        const abi = JSON.parse(fs.readFileSync(p, 'utf8'));
+        if (Array.isArray(abi)) {
+          aggregated.push(...abi);
+        } else {
+          console.warn(`ABI file ${file} is not an array, skipping from aggregation`);
+        }
+      } catch (e) {
+        console.warn(`Failed to read ABI file ${file} for aggregation: ${e.message}`);
+      }
+    }
+
+    fs.writeFileSync(aggregatedAbiPath, JSON.stringify(aggregated, null, 2));
+    console.log('Aggregated ABI generated at', path.resolve(aggregatedAbiPath));
+  } else {
+    console.warn('No ABI directory found, aggregated ABI not generated.');
+  }
+
+////////////////////
+
     // Generate TypeScript types
     const typesOutputPath = path.join(buildPath, 'types');
     generateAllTypes(buildPath, typesOutputPath);
@@ -172,4 +204,114 @@ export function changeCompPath(newPath) {
   compConfig.compilePath = newPath;
   configFile.compiler.compilePath = compConfig.compilePath;
   fs.writeFileSync(configPath, JSON.stringify(configFile, null, 2));
-}
+}
+
+/**
+ * Flatten a Solidity contract and its imports into a single file.
+ *
+ * @param {string} fullPath - Path to the root .sol file.
+ * @param {string} [outFile] - Optional path for the flattened output file.
+ *                             Defaults to `<dir>/<name>.flattened.sol`.
+ */
+export function flatten(fullPath, outFile) {
+  if (!fullPath) {
+    throw new Error('flatten(): fullPath to the root Solidity file is required.');
+  }
+
+  const entryPath = path.resolve(fullPath);
+  if (!fs.existsSync(entryPath)) {
+    throw new Error(`flatten(): entry file does not exist: ${entryPath}`);
+  }
+
+  const visited = new Set();
+  const pieces = [];
+
+  let pragmaLine = null;
+  let hasSpdx = false;
+
+  function processFile(absPath, logicalName) {
+    if (visited.has(absPath)) return;
+    visited.add(absPath);
+
+    const raw = fs.readFileSync(absPath, 'utf8');
+
+    const lines = raw.split(/\r?\n/);
+
+    // Capture pragma and SPDX once from the entry or first file
+    for (const line of lines) {
+      const trimmed = line.trim();
+      if (!pragmaLine && trimmed.startsWith('pragma solidity')) {
+        pragmaLine = trimmed.replace(/[; ]+$/, ';');
+      }
+      if (!hasSpdx && trimmed.startsWith('// SPDX-License-Identifier:')) {
+        hasSpdx = true;
+      }
+    }
+
+    const imports = parseImports(raw);
+    for (const importPath of imports) {
+      const resolved = resolveImportPath(importPath, path.dirname(absPath));
+      processFile(resolved, importPath);
+    }
+
+    // Strip SPDX, pragma, and import lines from the body
+    const body = lines
+      .filter((line) => {
+        const trimmed = line.trim();
+        if (trimmed.startsWith('// SPDX-License-Identifier:')) return false;
+        if (trimmed.startsWith('pragma solidity')) return false;
+        if (trimmed.startsWith('import ')) return false;
+        return true;
+      })
+      .join('\n');
+
+    pieces.push(`\n\n// File: ${logicalName}\n\n${body}\n`);
+  }
+
+  const logicalName = path.basename(entryPath);
+  processFile(entryPath, logicalName);
+
+  let header = '';
+  if (hasSpdx) {
+    // Multiple different licenses may be mixed; explicit about it
+    header += '// SPDX-License-Identifier: MIXED\n';
+  }
+  if (pragmaLine) {
+    header += `${pragmaLine}\n\n`;
+  }
+
+  const flattened = `${header}${pieces.join('')}`;
+
+  const defaultOut =
+    outFile ||
+    path.join(
+      path.dirname(entryPath),
+      `${path.basename(entryPath, '.sol')}.flattened.sol`,
+    );
+
+  fs.writeFileSync(defaultOut, flattened);
+  console.log('Flattened contract written to', path.resolve(defaultOut));
+}
+
+/*============================= HELPER ==============================*/
+// --- FLATTENING UTILITIES ---
+
+function resolveImportPath(importPath, fromDir) {
+  if (importPath.startsWith('./') || importPath.startsWith('../')) {
+    return path.resolve(fromDir, importPath);
+  }
+  // Node-style imports from node_modules
+  return path.resolve(process.cwd(), 'node_modules', importPath);
+}
+
+function parseImports(content) {
+  const imports = [];
+  const importRegex =
+    /import\s+(?:(?:["']([^"']+)["'])|(?:.*?\sfrom\s+["']([^"']+)["']))\s*;/g;
+  let match;
+  while ((match = importRegex.exec(content))) {
+    const importPath = match[1] || match[2];
+    if (importPath) imports.push(importPath);
+  }
+  return imports;
+}

package/src/services/{config.js → configSync.js}

@@ -96,7 +96,7 @@ if(storedUrl) {
     configFile.providerEndpoint = defaultUrl;
 }
 
-// 3) Set Compiler to Memeory:
+// 3) Set Compiler to Memory:
 // Initialize global configuration of compiler
 if(storedCompConfig){
   configFile.compiler = storedCompConfig.compiler;
@@ -122,6 +122,7 @@ if(storedCompConfig){
   configFile.compiler.compilePath = compConfig.compilePath;
 }
 
+
 // 4) Set Default Account:
 // Set the default account from stored wallets
 const defWallet = configObj.defaultWallet;

package/src/services/network.js

@@ -12,7 +12,7 @@ import {
     provider,
     setProvider,
     defaultUrl
-} from './config.js';
+} from './configSync.js';
 
 /**
  * Set a new network provider

package/src/services/wallet.js

@@ -7,7 +7,7 @@
  */
 
 import { ethers } from 'ethers';
-import { provider } from './config.js';
+import { provider } from './configSync.js';
 import { 
     deleteByIndex, 
     deleteByIndexArr, 

package/src/utils/accounter.js

@@ -6,9 +6,9 @@
  */
 
 import { allAccounts, accounts, hdAccounts } from '../services/wallet.js';
-import { provider } from '../services/config.js';
+import { provider } from '../services/configSync.js';
 import fs from 'fs';
-import { configFile, configPath } from '../services/config.js';
+import { configFile, configPath } from '../services/configSync.js';
 import { serializeBigInts } from './serialize.js';
 
 /**

package/src/utils/builder.js

@@ -81,32 +81,32 @@ export function build(fullPath, selectedContracts, buildPath){
   
   // Get the directory containing the contract
   const contractDir = path.dirname(fullPath);
-  const filename = path.basename(fullPath, '.sol');
-  const source = fs.readFileSync(fullPath, 'utf8');
-  
+  const filename = path.basename(fullPath);        // keep extension here
+  const basename = path.basename(fullPath, '.sol');
+
+  // Build full standard JSON input, including all imports
+  const sources = collectSourcesForStandardJson(fullPath, filename);
+
   const input = {
     language: 'Solidity',
-    sources: {
-      [`${filename}`]: {
-        content: source,
-      },
-    },
+    sources,
     settings: {
       outputSelection: {
         '*': {
           '*': ['*'],
         },
       },
-    }
+    },
   };
 
   // Apply global compiler configuration
   if (compilerConfig.optimizer) {
     input.settings.optimizer = {
       enabled: true,
-      runs: compilerConfig.optimizerRuns
+      runs: compilerConfig.optimizerRuns,
     };
   }
+
   if (compilerConfig.viaIR) {
     input.settings.viaIR = true;
   }
@@ -127,16 +127,20 @@ export function build(fullPath, selectedContracts, buildPath){
     }
   }
 
+
+
   // Generate sub-paths of build
-  const artifacts = path.join(buildPath, 'artifacts');
-  const abis = path.join(buildPath, 'abis');
-  const bytecode = path.join(buildPath, 'bytecode');
-  const metadata = path.join(buildPath, 'metadata');
+const artifacts = path.join(buildPath, 'artifacts');
+const abis = path.join(buildPath, 'abis');
+const bytecode = path.join(buildPath, 'bytecode');
+const metadata = path.join(buildPath, 'metadata');
+const standardJsonDir = path.join(buildPath, 'standard-json');
   const subPaths = [
       artifacts,
       abis,
       bytecode,
-      metadata
+      metadata,
+      standardJsonDir
   ];
 
   // Ensure all sub-paths exist
@@ -161,6 +165,9 @@ export function build(fullPath, selectedContracts, buildPath){
     // Save on metadata
     const metadataPath = path.join(metadata, `${contractName}.metadata.json`);
     fs.writeFileSync(metadataPath, JSON.stringify(contractsData.metadata, null, 2));
+    // Save standard JSON input for this entry file
+    const standardJsonPath = path.join(standardJsonDir,`${basename}.standard-input.json`);
+    fs.writeFileSync(standardJsonPath, JSON.stringify(input, null, 2));
     // Store abis and bytecode on local storage
     localStorage.setItem(`${contractName}_abi`, abisPath);
     localStorage.setItem(`${contractName}_bytecode`, bytecodePath);
@@ -182,3 +189,50 @@ export function extractLoadableVersion(fullVersion) {
   }
   return `v${match[1]}+commit.${match[2]}`;
 }
+
+/*=========================== HELPER =============================*/
+function resolveImportPath(importPath, fromDir) {
+  if (importPath.startsWith('./') || importPath.startsWith('../')) {
+    return path.resolve(fromDir, importPath);
+  }
+
+  // Node-style import, resolve from node_modules
+  // e.g. '@openzeppelin/contracts/token/ERC20/ERC20.sol'
+  return path.resolve(process.cwd(), 'node_modules', importPath);
+}
+
+function collectSourcesForStandardJson(entryPath, logicalEntryName) {
+  const visited = new Set();
+  const sources = {};
+
+  function processFile(absPath, logicalName) {
+    if (visited.has(absPath)) return;
+    visited.add(absPath);
+
+    if (!fs.existsSync(absPath)) {
+      console.warn(`Warning: cannot resolve import "${logicalName}" at path "${absPath}"`);
+      return;
+    }
+
+    const content = fs.readFileSync(absPath, 'utf8');
+    sources[logicalName] = { content };
+
+    const importRegex =
+      /import\s+(?:(?:["']([^"']+)["'])|(?:.*?\sfrom\s+["']([^"']+)["']))\s*;/g;
+
+    let match;
+    while ((match = importRegex.exec(content))) {
+      const importPath = match[1] || match[2];
+      if (!importPath) continue;
+
+      const resolved = resolveImportPath(importPath, path.dirname(absPath));
+      // Use the import string itself as the logical source key,
+      // which is what solc/Etherscan expect
+      processFile(resolved, importPath);
+    }
+  }
+
+  processFile(entryPath, logicalEntryName);
+  return sources;
+}
+

package/src/utils/configFileUpdate.js

@@ -1,7 +1,7 @@
 import {
     configFile,
     configPath
-} from '../services/config.js';
+} from '../services/configSync.js';
 import fs from 'fs';
 
 export function changeProvider(url) {