ethershell 0.1.3-beta.0 → 0.1.5-beta.0

package/bin/cli.js

@@ -37,7 +37,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

package/package.json

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

package/src/services/addContracts.js

@@ -8,12 +8,15 @@
 
 import { ethers } from 'ethers';
 import fs from 'fs';
-import { provider } from './network.js';
-import { allAccounts, accounts, hdAccounts } from './wallet.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 './build.js';
 import { createContractProxy } from '../utils/contractProxy.js';
+import { eventOf } from '../utils/event.js';
 
 /**
  * Local storage instance for persisting contract metadata
@@ -88,16 +91,6 @@ export async function deploy(contractName, args, accIndex, chain, abiLoc, byteco
         }
 
         allAccounts[accIndex].contracts.push(contSpec);
-        
-        const accountsIndex = accounts.findIndex(wallet => wallet.index == accIndex);
-        if(accountsIndex >= 0) {
-            accounts[accountsIndex].contracts.push(contSpec);
-        }
-
-        const hdIndex = hdAccounts.findIndex(wallet => wallet.index == accIndex);
-        if(hdIndex >= 0) {
-            hdAccounts[hdIndex].contracts.push(contSpec);
-        }
 
         // Extend contract object
         deployTx.index = Array.from(contracts.values()).length;
@@ -117,6 +110,13 @@ export async function deploy(contractName, args, accIndex, chain, abiLoc, byteco
         // Wrap the contract instace with proxy
         const proxiedContract = createContractProxy(contractInstance, currentProvider, allAccounts);
 
+        proxiedContract.contract_index = Array.from(contracts.values()).length;
+        proxiedContract.contract_name = contractName;
+        proxiedContract.contract_chain = connectedChain.name;
+        proxiedContract.contract_chainId = connectedChain.chainId;
+        proxiedContract.contract_deployType = 'ethershell-deployed';
+        proxiedContract.contract_provider = currentProvider;
+
         // Add to REPL context with proxy
         r.context[contractName] = proxiedContract;
         contracts.set(contractName, proxiedContract);
@@ -127,14 +127,22 @@ export async function deploy(contractName, args, accIndex, chain, abiLoc, byteco
         const tx = await provider.getTransaction(deployHash);
         delete tx.data;
 
+        // Get event values
+        const tx1 = await provider.getTransactionReceipt(deployHash);
+        const eventValues = eventOf(contractInstance, tx1);
+
         // Extend transaction object
         tx.ethershellIndex = deployTx.index;
         tx.address = deployTx.target;
         tx.name = deployTx.name;
         tx.chain = deployTx.chain;
         tx.deployType = deployTx.deployType;
+
+        if(eventValues) {
+            tx.eventValues = eventValues;
+        }
         
-        console.log(tx);
+        return tx;
     } catch(err) {
         console.error(err);
     }
@@ -185,6 +193,13 @@ export async function add(contractName, contractAddr, accIndex, abiLoc, chain) {
         // Wrap the contract instace with proxy
         const proxiedContract = createContractProxy(newContract, currentProvider, allAccounts);
 
+        proxiedContract.contract_index = Array.from(contracts.values()).length;
+        proxiedContract.contract_name = contractName;
+        proxiedContract.contract_chain = connectedChain.name;
+        proxiedContract.contract_chainId = connectedChain.chainId;
+        proxiedContract.contract_deployType = 'ethershell-deployed';
+        proxiedContract.contract_provider = currentProvider;
+
         // Add to REPL context with proxy
         r.context[contractName] = proxiedContract;
         contracts.set(contractName, proxiedContract);
@@ -197,16 +212,6 @@ export async function add(contractName, contractAddr, accIndex, abiLoc, chain) {
         }
 
         allAccounts[accIndex].contracts.push(contSpec);
-        
-        const accountsIndex = accounts.findIndex(wallet => wallet.index == accIndex);
-        if(accountsIndex >= 0) {
-            accounts[accountsIndex].contracts.push(contSpec);
-        }
-
-        const hdIndex = hdAccounts.findIndex(wallet => wallet.index == accIndex);
-        if(hdIndex >= 0) {
-            hdAccounts[hdIndex].contracts.push(contSpec);
-        }
 
         // Extend contract object
         newContract.index = Array.from(contracts.values()).length;
@@ -227,7 +232,7 @@ export async function add(contractName, contractAddr, accIndex, abiLoc, chain) {
             provider: newContract.provider
         }
 
-        console.log(result);
+        return result;
     } catch(err) {
         console.error(err);
     }

package/src/services/build.js

@@ -6,92 +6,21 @@
  */
 
 import path from 'path';
-import solc from 'solc';
 import { check, collectSolFiles } from '../utils/dir.js';
 import { 
   setVersion,
   build, 
-  loadSolcVersion, 
   extractLoadableVersion 
 } from '../utils/builder.js';
 import fs from 'fs';
 import { 
   generateAllTypes,
 } from '../utils/typeGenerator.js';
-
-/**
- * Stored config path
- * @type {string}
- */
-export const configPath = './ethershell/config.json';
-
-/**
- * Global compiler configuration state
- * @type {Object}
- * @property {Object} currentSolcInstance - Current Solidity compiler instance
- * @property {boolean} optimizer - Whether gas optimizer is enabled
- * @property {number} optimizerRuns - Number of optimizer runs
- * @property {boolean} viaIR - Whether to use IR-based code generation
- */
-let compConfig = {};
-
-/**
- * JSON file fields of compiler configuration
- * @type {Object}
- * @property {string} version - Current Solidity compiler version
- * @property {boolean} optimizer - Whether gas optimizer is enabled
- * @property {number} optimizerRuns - Number of optimizer runs
- * @property {boolean} viaIR - Whether to use IR-based code generation
- */
-export let configFile = { 
-    providerEndpoint: '',
-    defaultWallet: {},
-    compiler: {} 
-  };
-
-/**
- * Global compiler configuration state
- * @type {Object}
- * @property {boolean} optimizer - Whether gas optimizer is enabled
- * @property {number} optimizerRuns - Number of optimizer runs
- * @property {boolean} viaIR - Whether to use IR-based code generation
- */
-let storedCompConfig;
-
-// Load config file
-if(fs.existsSync(configPath)){
-  storedCompConfig = JSON.parse(fs.readFileSync(configPath));
-} else {
-  storedCompConfig = null;
-}
-
-// Initialize global configuration of compiler
-if(storedCompConfig){
-  configFile.compiler = storedCompConfig.compiler;
-  console.info(`Compiler is loading ...`);
-  compConfig.currentSolcInstance = await loadSolcVersion(configFile.compiler.version);
-  console.info(`Loading done!`);
-  compConfig.optimizer = configFile.compiler.optimizer;
-  compConfig.viaIR = configFile.compiler.viaIR;
-  compConfig.optimizerRuns = configFile.compiler.optimizerRuns;
-  compConfig.compilePath = configFile.compiler.compilePath;
-} else {
-  compConfig = {
-    currentSolcInstance: solc, // default local compiler
-    optimizer: false,
-    viaIR: false,
-    optimizerRuns: 200,
-    compilePath: './build'
-  }
-  configFile.compiler.version = extractLoadableVersion(compConfig.currentSolcInstance.version());
-  configFile.compiler.optimizer = compConfig.optimizer;
-  configFile.compiler.viaIR = compConfig.viaIR;
-  configFile.compiler.optimizerRuns = compConfig.optimizerRuns;
-  configFile.compiler.compilePath = compConfig.compilePath;
-
-  // Update config file
-  fs.writeFileSync(configPath, JSON.stringify(configFile, null, 2));
-}
+import { 
+  configPath,
+  configFile,
+  compConfig
+} from './configSync.js';
 
 /**
  * Update the Solidity compiler to a specific version
@@ -110,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);
   }
@@ -203,6 +133,9 @@ export function compile(fullPath, selectedContracts, buildPath){
       [buildPath].forEach(check);
     }
 
+    // Aggregated ABI container: { [contractName]: abiArray }
+    const aggregatedAbis = {};
+
     let fileExt;
     if(!fullPath) {
       fullPath = path.resolve('.', 'contracts');
@@ -211,25 +144,45 @@ export function compile(fullPath, selectedContracts, buildPath){
     }
 
     if(!fileExt){
+      // Directory: collect .sol files and compile each
       const solFiles = collectSolFiles(fullPath);
       
       if(!solFiles.length){
         throw 'There is no smart contract in the directory!';
       } else {
-        for(let i = 0; i < solFiles.length; i++){
-          build(solFiles[i], selectedContracts, buildPath);
-        }
+        solFiles.forEach((solFile) => {
+          const contractAbis = build(solFile, selectedContracts, buildPath);
+          // merge returned ABIs into aggregatedAbis
+          Object.assign(aggregatedAbis, contractAbis);
+        })
         console.log(`Contracts compiled into ${path.resolve(buildPath)}`);
       }
     } else {
-      build(fullPath, selectedContracts, buildPath);
+      // Single file
+      const contractAbis = build(fullPath, selectedContracts, buildPath);
+      // merge returned ABIs into aggregatedAbis
+      Object.assign(aggregatedAbis, contractAbis);
       console.log(`Contract compiled into ${path.resolve(buildPath)}`);
     }
 
+    // Write aggregated ABI file
+    const abisDir = path.join(buildPath, 'abis');
+    check(abisDir); // ensure dir exists (same util as builder.js)
+    const aggregatedAbiPath = path.join(abisDir, 'aggregated.abi.json');
+
+    // aggregatedAbis is { ContractName: abiArray }
+    const flatAbi = Object.values(aggregatedAbis).flat();
+
+    // Format: { "ContractName": [ ...abi... ], ... }
+    fs.writeFileSync(aggregatedAbiPath, JSON.stringify(flatAbi, null, 2));
+    console.log('Aggregated ABI written to', path.resolve(aggregatedAbiPath));
+
     // Generate TypeScript types
     const typesOutputPath = path.join(buildPath, 'types');
     generateAllTypes(buildPath, typesOutputPath);
     console.log(`TypeScript types generated in ${path.resolve(typesOutputPath)}`);
+
+    console.log(`Standard JSON Input generated in ${path.resolve(buildPath, 'standard-json')}`);
   } catch(err){
       console.error(err);
   }

package/src/services/configSync.js

@@ -0,0 +1,176 @@
+import { 
+    loadSolcVersion, 
+    extractLoadableVersion 
+} from '../utils/builder.js';
+import { allAccounts } from './wallet.js';
+import { serializeBigInts } from '../utils/serialize.js';
+import fs from 'fs';
+import { ethers } from 'ethers';
+
+// Sync Config Memory with Storage Config:
+/**
+ * Default JSON-RPC URL for local Ethereum node
+ * @constant {string}
+ */
+export const defaultUrl = 'http://127.0.0.1:8545' ;
+
+/**
+ * Currently active network URL
+ * @type {string}
+ */
+export let currentUrl;
+
+/**
+ * Ethers.js JSON-RPC provider instance
+ * @type {ethers.JsonRpcProvider}
+ */
+export let provider 
+
+/**
+ * Stored config path
+ * @type {string}
+ */
+export const configPath = './ethershell/config.json';
+
+/**
+ * Global compiler configuration state
+ * @type {Object}
+ * @property {Object} currentSolcInstance - Current Solidity compiler instance
+ * @property {boolean} optimizer - Whether gas optimizer is enabled
+ * @property {number} optimizerRuns - Number of optimizer runs
+ * @property {boolean} viaIR - Whether to use IR-based code generation
+ */
+export let compConfig = {};
+
+/**
+ * JSON file fields of compiler configuration
+ * @type {Object}
+ * @property {string} version - Current Solidity compiler version
+ * @property {boolean} optimizer - Whether gas optimizer is enabled
+ * @property {number} optimizerRuns - Number of optimizer runs
+ * @property {boolean} viaIR - Whether to use IR-based code generation
+ */
+export let configFile = { 
+    providerEndpoint: '',
+    defaultWallet: {},
+    compiler: {} 
+  };
+
+/**
+ * Global compiler configuration state
+ * @type {Object}
+ * @property {boolean} optimizer - Whether gas optimizer is enabled
+ * @property {number} optimizerRuns - Number of optimizer runs
+ * @property {boolean} viaIR - Whether to use IR-based code generation
+ */
+let storedCompConfig;
+
+/**
+ * Object containing properties of config file
+ * @type {Object}
+ */
+let configObj;
+
+// 1) Load config file
+if(!fs.existsSync(configPath)){
+  storedCompConfig = null;
+} else {
+    configObj = JSON.parse(fs.readFileSync(configPath));
+    storedCompConfig = configObj;
+}
+
+// 2) Set Provider to Memory:
+// Initialize provider with default URL
+/**
+ * The specific RPC endpoint URL saved on storage before.
+ * @type {string}
+ */
+const storedUrl = configObj.providerEndpoint;
+if(storedUrl) {
+    provider = new ethers.JsonRpcProvider(storedUrl);
+    currentUrl = storedUrl;
+    configFile.providerEndpoint = storedUrl;
+} else {
+    provider = new ethers.JsonRpcProvider(defaultUrl);
+    currentUrl = defaultUrl;
+    configFile.providerEndpoint = defaultUrl;
+}
+
+// 3) Set Compiler to Memory:
+// Initialize global configuration of compiler
+if(storedCompConfig){
+  configFile.compiler = storedCompConfig.compiler;
+  console.info(`Compiler is loading ...`);
+  compConfig.currentSolcInstance = await loadSolcVersion(configFile.compiler.version);
+  console.info(`Loading done!`);
+  compConfig.optimizer = configFile.compiler.optimizer;
+  compConfig.viaIR = configFile.compiler.viaIR;
+  compConfig.optimizerRuns = configFile.compiler.optimizerRuns;
+  compConfig.compilePath = configFile.compiler.compilePath;
+} else {
+  compConfig = {
+    currentSolcInstance: solc, // default local compiler
+    optimizer: false,
+    viaIR: false,
+    optimizerRuns: 200,
+    compilePath: './build'
+  }
+  configFile.compiler.version = extractLoadableVersion(compConfig.currentSolcInstance.version());
+  configFile.compiler.optimizer = compConfig.optimizer;
+  configFile.compiler.viaIR = compConfig.viaIR;
+  configFile.compiler.optimizerRuns = compConfig.optimizerRuns;
+  configFile.compiler.compilePath = compConfig.compilePath;
+}
+
+
+// 4) Set Default Account:
+// Set the default account from stored wallets
+const defWallet = configObj.defaultWallet;
+if(defWallet.address) {
+    configFile.defaultWallet = serializeBigInts(defWallet);
+} else {
+    if(allAccounts && allAccounts.length > 0) {
+        configFile.defaultWallet = serializeBigInts(allAccounts[0]);
+    }
+}
+
+// 5) Update config file
+fs.writeFileSync(configPath, JSON.stringify(configFile, null, 2));
+
+/**
+ * Changes provider just in memory
+ * @param {Object} newProvider 
+ */
+export function setProvider(newProvider) {
+    provider = new ethers.JsonRpcProvider(newProvider);
+}
+
+/**
+ * Changes provider just in memory
+ * @param {String} newUrl 
+ */
+export function setCurrentUrl(newUrl) {
+    currentUrl = newUrl;
+}
+
+/**
+ * Changes configFile in memory
+ * @param {Object} newConfig 
+ */
+export function setConfigFile(newConfig) {
+    configFile = newConfig;
+}
+
+/**
+ * Gets all fields of config file
+ */
+export function getConfigInfo() {
+    return configFile; 
+}
+
+/**
+ * Gets just default account of config file
+ */
+export function getDefaultAccount() {
+    return configFile.defaultWallet;
+}

package/src/services/contracts.js

@@ -39,5 +39,5 @@ export async function getContracts(contPointer) {
         throw new Error('Input is NOT valid!');
     }
 
-    console.log(result);
+    return result;
 }

package/src/services/files.js

@@ -23,17 +23,17 @@ export function deleteDirectory(dirPath){
     }
     // Check if the directory exists
     if(!fs.existsSync(dirPath)){
-      console.log('Path is not a directory');
+      console.info('Path is not a directory');
       return;    
     }
 
     // For Node.js 14.14.0+ (recommended)
     fs.rmSync(dirPath, { recursive: true, force: true });
 
-    console.log('Directory deleted successfully');
+    console.info('Directory deleted successfully');
   } catch (err) {
     if (err.code === 'ENOENT') {
-      console.log('Directory does not exist');
+      console.info('Directory does not exist');
     } else {
       console.error('Error deleting directory:', err);
     }

package/src/services/network.js

@@ -5,44 +5,14 @@
  * @module network
  */
 
-import { ethers } from 'ethers';
-import { configPath } from './build.js';
-import fs from 'fs';
 import { changeProvider } from '../utils/configFileUpdate.js';
-
-/**
- * Default JSON-RPC URL for local Ethereum node
- * @constant {string}
- */
-const defaultUrl = 'http://127.0.0.1:8545' ;
-
-/**
- * Currently active network URL
- * @type {string}
- */
-export let currentUrl;
-
-/**
- * Ethers.js JSON-RPC provider instance
- * @type {ethers.JsonRpcProvider}
- */
-export let provider 
-
-// Initialize provider with default URL
-/**
- * The specific RPC endpoint URL saved on storage before.
- * @type {string}
- */
-const storedUrl = JSON.parse(fs.readFileSync(configPath)).providerEndpoint;
-if(storedUrl) {
-    provider = new ethers.JsonRpcProvider(storedUrl);
-    currentUrl = storedUrl;
-} else {
-    provider = new ethers.JsonRpcProvider(defaultUrl);
-    currentUrl = defaultUrl;
-    changeProvider(currentUrl);
-}
-
+import { 
+    currentUrl,
+    setCurrentUrl,
+    provider,
+    setProvider,
+    defaultUrl
+} from './configSync.js';
 
 /**
  * Set a new network provider
@@ -55,8 +25,8 @@ if(storedUrl) {
  */
 export async function set(url){
     try{
-        provider = new ethers.JsonRpcProvider(url);
-        currentUrl = url;
+        setProvider(url);
+        setCurrentUrl(url);
         const result = await provider.getNetwork();
         const network = {
             URL: currentUrl,
@@ -64,7 +34,7 @@ export async function set(url){
             chainId: result.chainId
         }    
         changeProvider(currentUrl);
-        console.log(network);
+        return network;
     }catch(err){
         console.error(err);
     }
@@ -86,7 +56,7 @@ export async function get(){
             name: result.name,
             chainId: result.chainId
         }    
-        console.log(network);
+        return network;
     }catch(err){
         console.error(err);
     }
@@ -103,7 +73,7 @@ export function getDefault(){
         const result = {
             URL: defaultUrl
         }
-        console.log(result);
+        return result;
     }catch(err){
         console.error(err);
     }

package/src/services/wallet.js

@@ -7,7 +7,7 @@
  */
 
 import { ethers } from 'ethers';
-import { provider } from './network.js';
+import { provider } from './configSync.js';
 import { 
     deleteByIndex, 
     deleteByIndexArr, 
@@ -18,8 +18,6 @@ import {
     updateAccountMemory,
     setDefaultAccount
  } from '../utils/accounter.js';
- import { configPath } from './build.js';
- import fs from 'fs';
 
 /**
  * Array containing all accounts (imported, generated, HD, and node-managed)
@@ -27,17 +25,6 @@ import {
  */
 export let allAccounts = getWalletJSON();
 
-// Set the default account from stored wallets
-const defWallet = JSON.parse(fs.readFileSync(configPath)).defaultWallet;
-if(defWallet.address) {
-    setDefaultAccount(defWallet);
-} else {
-    if(allAccounts && allAccounts.length > 0) {
-        setDefaultAccount(allAccounts[0]);
-    }
-}
-
-
 /**
  * Array containing only regular accounts (imported and generated)
  * @type {Array<Object>}
@@ -94,7 +81,7 @@ export function addAccounts(privKeyArr) {
         updateWalletJSON(allAccounts);
         newAccObj.index = allAccounts.length - 1;
         accounts.push(newAccObj);
-        console.log(allAccounts[newFrom]);
+        return allAccounts[newFrom];
     }
 
     if(Array.isArray(privKeyArr)){
@@ -112,7 +99,7 @@ export function addAccounts(privKeyArr) {
             accounts.push(newAccObj);
         });
 
-        console.log(allAccounts.slice(newFrom));
+        return allAccounts.slice(newFrom);
     }
     setDefaultAccount(allAccounts[0]);
 }
@@ -157,8 +144,8 @@ export function addHD(phrase, count = 10) {
     }
     updateWalletJSON(allAccounts);
     setDefaultAccount(allAccounts[0]);
-    console.log(`!WARNING!\n The generated accounts are NOT safe. Do NOT use them on main net!`);
-    console.log(allAccounts.slice(newFrom));
+    console.info(`!WARNING!\n The generated accounts are NOT safe. Do NOT use them on main net!`);
+    return allAccounts.slice(newFrom);
 }
 
 /**
@@ -187,8 +174,8 @@ export function createAccounts(count = 1) {
     }
     updateWalletJSON(allAccounts);
     setDefaultAccount(allAccounts[0]);
-    console.log(`!WARNING!\n The generated accounts are NOT safe. Do NOT use them on main net!`);
-    console.log(allAccounts.slice(newFrom));
+    console.info(`!WARNING!\n The generated accounts are NOT safe. Do NOT use them on main net!`);
+    return allAccounts.slice(newFrom);
 }
 
 /**
@@ -222,8 +209,8 @@ export function createHD(count = 10) {
     }
     updateWalletJSON(allAccounts);
     setDefaultAccount(allAccounts[0]);
-    console.log(`!WARNING!\n The generated accounts are NOT safe. Do NOT use them on main net!`);
-    console.log(allAccounts.slice(newFrom));
+    console.info(`!WARNING!\n The generated accounts are NOT safe. Do NOT use them on main net!`);
+    return allAccounts.slice(newFrom);
 }
 
 /**
@@ -232,8 +219,8 @@ export function createHD(count = 10) {
  * getAllAccounts();
  */
 export function getAllAccounts() {
-    console.log(`!WARNING!\n The generated accounts are NOT safe. Do NOT use them on main net!`);
-    console.log(allAccounts);
+    console.info(`!WARNING!\n The generated accounts are NOT safe. Do NOT use them on main net!`);
+    return allAccounts;
 }
 
 /**
@@ -242,8 +229,8 @@ export function getAllAccounts() {
  * getAccounts();
  */
 export function getAccounts() {
-    console.log(`!WARNING!\n The generated accounts are NOT safe. Do NOT use them on main net!`);
-    console.log(accounts);
+    console.info(`!WARNING!\n The generated accounts are NOT safe. Do NOT use them on main net!`);
+    return accounts;
 }
 
 /**
@@ -252,8 +239,8 @@ export function getAccounts() {
  * getHDAccounts();
  */
 export function getHDAccounts() {
-    console.log(`!WARNING!\n The generated accounts are NOT safe. Do NOT use them on main net!`);
-    console.log(hdAccounts);
+    console.info(`!WARNING!\n The generated accounts are NOT safe. Do NOT use them on main net!`);
+    return hdAccounts;
 }
 
 /**
@@ -269,12 +256,12 @@ export function getHDAccounts() {
 export function deleteAccount(accPointer) {
     if(!accPointer && accPointer !== 0) {
         deleteByIndex(null);
-        console.log(allAccounts);
+        return allAccounts;
     }
 
     if(typeof accPointer === 'number') {
         deleteByIndex(accPointer);
-        console.log(allAccounts);
+        return allAccounts;
     }
 
     if(ethers.isAddress(accPointer)) {
@@ -283,12 +270,12 @@ export function deleteAccount(accPointer) {
         if(index !== -1) {
             deleteByIndex(index);
         }
-        console.log(allAccounts);
+        return allAccounts;
     }
 
     if(Array.isArray(accPointer)) {
         deleteByIndexArr(accPointer);
-        console.log(allAccounts);
+        return allAccounts;
     }
 
     if(ethers.Mnemonic.isValidMnemonic(accPointer)) {
@@ -310,7 +297,7 @@ export function deleteAccount(accPointer) {
             deleteByIndex(indicesToDelete[i]);
         }
 
-        console.log(allAccounts);
+        return allAccounts;
         return;
     }
 }
@@ -364,16 +351,16 @@ export async function getWalletInfo(accPointer) {
 
         if(typeof accPointer === 'number') {
             const index = allAccounts.findIndex(wallet => wallet.index == accPointer);
-            await getAccountInfo(index);
+            return await getAccountInfo(index);
         }
 
         if(ethers.isAddress(accPointer)) {
             const index = allAccounts.findIndex(wallet => wallet.address == accPointer);
-            await getAccountInfo(index);
+            return await getAccountInfo(index);
         }
 
         if(Array.isArray(accPointer)) {
-            await getAccountInfo(accPointer);
+            return await getAccountInfo(accPointer);
         }
     
     } catch(err) {

package/src/utils/accounter.js

@@ -6,9 +6,9 @@
  */
 
 import { allAccounts, accounts, hdAccounts } from '../services/wallet.js';
-import { provider } from '../services/network.js';
+import { provider } from '../services/configSync.js';
 import fs from 'fs';
-import { configFile, configPath } from '../services/build.js';
+import { configFile, configPath } from '../services/configSync.js';
 import { serializeBigInts } from './serialize.js';
 
 /**
@@ -69,9 +69,9 @@ export function deleteByIndexArr(indices) {
  */
 export async function getAccountInfo(index) {
     if (Array.isArray(index)) {
-        await _getAccArrInfo(index);
+        return await _getAccArrInfo(index);
     } else if (typeof index === 'number') {
-        await _getAccountInfo(index);
+        return await _getAccountInfo(index);
     }
 }
 
@@ -182,7 +182,7 @@ async function _getAccountInfo(_index) {
     accInfo.nonce = await provider.getTransactionCount(accInfo.address);
     accInfo.balance = await provider.getBalance(accInfo.address);
 
-    console.log(accInfo);
+    return accInfo;
 }
 
 /**

package/src/utils/builder.js

@@ -82,15 +82,15 @@ 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 source = fs.readFileSync(fullPath, 'utf8');
+
+  // Start collecting from the main contract
+  let allSources = {}
+  _collectSources(fullPath, allSources);
   
   const input = {
     language: 'Solidity',
-    sources: {
-      [`${filename}`]: {
-        content: source,
-      },
-    },
+    sources: allSources,
     settings: {
       outputSelection: {
         '*': {
@@ -111,12 +111,9 @@ export function build(fullPath, selectedContracts, buildPath){
     input.settings.viaIR = true;
   }
 
-  // Compile with import callback
+  // Compile without import callback
   const output = JSON.parse(
-    solc.compile(
-      JSON.stringify(input),
-      { import: (importPath) => findImports(importPath, contractDir) }
-    )
+    solc.compile(JSON.stringify(input))
   );
 
   if(output.errors) {
@@ -126,29 +123,45 @@ export function build(fullPath, selectedContracts, buildPath){
       throw errors;
     }
   }
-
+  
   // 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 standardJsonDir = path.join(buildPath, 'standard-json');
   const subPaths = [
       artifacts,
       abis,
       bytecode,
-      metadata
+      metadata,
+      standardJsonDir
   ];
+  subPaths.forEach(check);
+
+  // Save standard JSON input on standard-json
+  const jsonInputPath = path.join(standardJsonDir, `${filename}.standard.json`);
+  fs.writeFileSync(jsonInputPath, JSON.stringify(input, null, 2));
+
+  // Determine the correct key for the main contract in the output
+  const mainContractPath = path.relative(path.resolve('.'), path.resolve(fullPath)).split(path.sep).join('/');;
+  const contractsInFile = output.contracts[mainContractPath];
+
+  if (!contractsInFile) {
+    throw new Error(`Could not find compiled output for ${mainContractPath}`);
+  }
 
   // Ensure all sub-paths exist
   subPaths.forEach(check);
-  const allContracts = Object.keys(output.contracts[`${filename}`]);
+  const allContracts = Object.keys(contractsInFile);
   const contractsToSave = selectedContracts.length > 0 ? allContracts.filter(
     (contractName) => {
       return selectedContracts.includes(contractName);
     }
   ): allContracts;
+  const resultAbis = {}; // Collect ABIs to return
   contractsToSave.forEach((contractName) => {
-    const contractsData = output.contracts[`${filename}`][contractName];
+    const contractsData = contractsInFile[contractName];
     // Save on artifacts
     const artifactsPath = path.join(artifacts, `${contractName}.json`);
     fs.writeFileSync(artifactsPath, JSON.stringify(contractsData, null, 2));
@@ -161,10 +174,19 @@ 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));
+
     // Store abis and bytecode on local storage
     localStorage.setItem(`${contractName}_abi`, abisPath);
     localStorage.setItem(`${contractName}_bytecode`, bytecodePath);
+
+    // Save ABI
+    const abi = contractsData.abi || [];
+    // Collect ABI in memory
+    resultAbis[contractName] = abi;
   });
+
+  // Return map of contractName -> abi
+  return resultAbis;
 }
 
 /**
@@ -182,3 +204,30 @@ export function extractLoadableVersion(fullVersion) {
   }
   return `v${match[1]}+commit.${match[2]}`;
 }
+
+/**
+* Helper to recursively collect all imports into the sources object
+*/
+function _collectSources(filePath, allSourcesObj) {
+  const absolutePath = path.resolve(filePath);
+  
+  // 1. Force POSIX style (forward slashes) for the map key
+  let relativePath = path.relative(path.resolve('.'), absolutePath);
+  relativePath = relativePath.split(path.sep).join('/'); 
+  
+  if (allSourcesObj[relativePath]) return allSourcesObj;
+
+  const content = fs.readFileSync(absolutePath, 'utf8');
+  allSourcesObj[relativePath] = { content };
+
+  // 2. Resolve imports and recurse
+  const importRegex = /import\s+(?:\{[^}]*\}\s+from\s+)?['"]([^'"]+)['"]/g;
+  let match;
+  while ((match = importRegex.exec(content)) !== null) {
+    const importPath = match[1];
+    const resolvedImportPath = path.resolve(path.dirname(absolutePath), importPath);
+    _collectSources(resolvedImportPath, allSourcesObj);
+  }
+
+  return allSourcesObj;
+}

package/src/utils/configFileUpdate.js

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

package/src/utils/contractLister.js

@@ -22,12 +22,12 @@ export async function getContArr() {
 
     for (const x of contracts.values()) {
         let contract = {
-            index: x.index,
-            name: x.name,
+            index: x.contract_index,
+            name: x.contract_name,
             address: x.target,
-            chain: x.chain,
-            chainId: x.chainId,
-            deployType: x.deployType,
+            chain: x.contract_chain,
+            chainId: x.contract_chainId,
+            deployType: x.contract_deployType,
             balance: await x.provider.getBalance(x.target)
         }
         contractsArray.push(contract);

package/src/utils/contractProxy.js

@@ -1,5 +1,6 @@
 // src/utils/contractProxy.js
 import { ethers } from 'ethers';
+import { eventOf } from './event.js';
 
 /**
  * Creates a proxy wrapper for ethers.js Contract objects
@@ -25,8 +26,39 @@ import { ethers } from 'ethers';
 export function createContractProxy(contract, provider, allAccounts) {
   return new Proxy(contract, {
     get(target, prop) {
-      // Pass through non-function properties
-      if (typeof target[prop] !== 'function') {
+      // Explicit passthroughs for known non-ABI properties
+      if (prop === 'provider') {
+        return provider;
+      }
+      if (prop === 'target') {
+        return target.target;
+      }
+      if (prop === 'interface') {
+        return target.interface;
+      }
+      if (prop === 'runner') {
+        return target.runner;
+      }
+      if (prop === 'connect') {
+        return target.connect.bind(target);
+      }
+
+      // Allow internal metadata properties to pass through directly
+      if (typeof prop === 'string' && prop.startsWith('contract_')) {
+        return target[prop];
+      }
+  
+      // Check if this prop is a contract ABI function
+      const isContractMethod =
+        target.interface &&
+        typeof prop === 'string' &&
+        (() => {
+          try { target.interface.getFunction(prop); return true; }
+          catch { return false; }
+        })();
+
+      // Pass through non-ABI, non-function properties (e.g. contract_name, contract_index)
+      if (!isContractMethod && typeof target[prop] !== 'function') {
         return target[prop];
       }
 
@@ -68,8 +100,9 @@ export function createContractProxy(contract, provider, allAccounts) {
 
         const options = hasOptions ? args.pop() : null;
 
-        let method = target[prop];
-        let txOptions = {};
+        // Always resolve ABI methods via getFunction to avoid JS built-in property collisions
+        let contractTarget = target;
+        let method;
 
         // Handle 'from' option - switch signer if specified
         if (options && options.from) {
@@ -91,10 +124,16 @@ export function createContractProxy(contract, provider, allAccounts) {
 
           // Create new signer with the specified account
           const newSigner = new ethers.Wallet(account.privateKey, provider);
-          const connectedContract = target.connect(newSigner);
-          method = connectedContract[prop];
+          contractTarget = target.connect(newSigner);
         }
 
+        // Use getFunction for ABI methods to bypass JS name collisions
+        method = isContractMethod
+          ? contractTarget.getFunction(prop)
+          : contractTarget[prop];
+          
+        let txOptions = {};
+
         // Build transaction options object with all supported ethers.js v6 options
         if (options) {
           // Value (for payable functions)
@@ -155,12 +194,22 @@ export function createContractProxy(contract, provider, allAccounts) {
         }
 
         // Call the method with remaining args and tx options
-        const result = await method.apply(method, args);
+        const result = await method(...args);
 
         // Check if result is a transaction response (has wait method)
         if (result && typeof result.wait === 'function') {
           // This is a transaction - wait for mining
           const receipt = await result.wait();
+
+          // Get event values
+          const tx = await provider.getTransactionReceipt(receipt.hash);
+          const eventValues = eventOf(contract, tx);
+
+          // Extend transaction receipt with event values
+          if(eventValues) {
+            receipt.eventValues = eventValues;
+          }
+          
           return receipt;
         }
 

package/src/utils/etherscan.txt

@@ -0,0 +1,17 @@
+Bytecode (what we are looking for)
+
+608060405234610370576114d58038038061001981610374565b9283398101906060818303126103705780516001600160401b0381116103705782610045918301610399565b60208201519092906001600160401b03811161037057604091610069918401610399565b91015160ff8116809103610370575f80546001600160a01b0319163317905582516001600160401b03811161028157600254600181811c91168015610366575b602082101461026357601f8111610303575b506020601f82116001146102a057819293945f92610295575b50508160011b915f199060031b1c1916176002555b81516001600160401b03811161028157600354600181811c91168015610277575b602082101461026357601f8111610200575b50602092601f821160011461019f57928192935f92610194575b50508160011b915f199060031b1c1916176003555b60ff1960045416176004557f82488d8ab594db2178e4a45b7106aaa804836e608f001b5d7fcb6c3514730b3e60408051308152336020820152a16040516110ea90816103eb8239f35b015190505f80610136565b601f1982169360035f52805f20915f5b8681106101e857508360019596106101d0575b505050811b0160035561014b565b01515f1960f88460031b161c191690555f80806101c2565b919260206001819286850151815501940192016101af565b60035f527fc2575a0e9e593c00f959f8c92f12db2869c3395a3b0502d05e2516446f71f85b601f830160051c81019160208410610259575b601f0160051c01905b81811061024e575061011c565b5f8155600101610241565b9091508190610238565b634e487b7160e01b5f52602260045260245ffd5b90607f169061010a565b634e487b7160e01b5f52604160045260245ffd5b015190505f806100d4565b601f1982169060025f52805f20915f5b8181106102eb575095836001959697106102d3575b505050811b016002556100e9565b01515f1960f88460031b161c191690555f80806102c5565b9192602060018192868b0151815501940192016102b0565b60025f527f405787fa12a823e0f2b7631cc41b3ba8828b3321ca811111fa75cd3aa3bb5ace601f830160051c8101916020841061035c575b601f0160051c01905b81811061035157506100bb565b5f8155600101610344565b909150819061033b565b90607f16906100a9565b5f80fd5b6040519190601f01601f191682016001600160401b0381118382101761028157604052565b81601f82011215610370578051906001600160401b038211610281576103c8601f8301601f1916602001610374565b928284526020838301011161037057815f9260208093018386015e830101529056fe6080806040526004361015610012575f80fd5b5f3560e01c90816301ffc9a714610d765750806306fdde0314610ce4578063095ea7b314610bcd57806316dead1414610b7657806318160ddd14610b5957806323b872dd14610b02578063313ce56714610ae257806340c10f1914610a1c57806342966c68146109635780635353a2d81461074a57806362a09477146106c157806370a08231146106895780638da5cb5b1461066257806395d89b411461059b578063a3895fff1461036e578063a9059cbb14610287578063c112dfa31461021d578063c42069ec14610174578063dd62ed3e146101245763e30c3978146100f8575f80fd5b34610120575f366003190112610120576001546040516001600160a01b039091168152602090f35b5f80fd5b346101205760403660031901126101205761013d610df3565b610145610e09565b6001600160a01b039182165f908152600760209081526040808320949093168252928352819020549051908152f35b346101205760203660031901126101205761018d610df3565b5f546001600160a01b031633810361020757506001600160a01b031680156101f5576020817f7d5f578daab924f3f271d863dd8729e6970e9186812579e22f892146def80f67926bffffffffffffffffffffffff60a01b6001541617600155604051908152a1005b6334d7d10d60e21b5f5260045260245ffd5b63a3ee740f60e01b5f526004523360245260445ffd5b346101205760203660031901126101205760043560ff8116809103610120575f546001600160a01b0316338103610207577fa667a2c7cf0813fa2c1f7a0a0093db4cf6fc7e9c5264f29df1aa880b409a312e6020838060ff196004541617600455604051908152a1005b34610120576040366003190112610120576102a0610df3565b60243590336102bc576313053d9360e21b5f523360045260245ffd5b6001600160a01b031690816102de5750639cfea58360e01b5f5260045260245ffd5b335f908152600660205260409020548181106103555750815f52600660205261030b8160405f2054610ef1565b50335f52600660205260405f20818154039055815f52600660205260405f208181540190556040519081525f5160206110955f395f51905f5260203392a360405160018152602090f35b63db42144d60e01b5f523360045260245260445260645ffd5b346101205761037c36610e41565b5f546001600160a01b03163381036102075750805167ffffffffffffffff8111610587576103ab600354610eb9565b601f811161051f575b50602091601f82116001146104b4579181925f926104a9575b50508160011b915f199060031b1c1916176003555b604051602081525f6003546103f681610eb9565b908160208501526001811690815f14610487575060011461043d575b507fc5109575ebaf6138fc9735faca1c61ff8b7bf4f91870337266cc2bce01a75e15919081900390a1005b60035f9081525f5160206110755f395f51905f52939250905b80821061046c5750909150810160400181610412565b91926001816020925460408588010152019101909291610456565b60ff191660408086019190915291151560051b84019091019150829050610412565b0151905082806103cd565b601f1982169260035f525f5160206110755f395f51905f52915f5b858110610507575083600195106104ef575b505050811b016003556103e2565b01515f1960f88460031b161c191690558280806104e1565b919260206001819286850151815501940192016104cf565b60035f52601f820160051c5f5160206110755f395f51905f52019060208310610572575b601f0160051c5f5160206110755f395f51905f5201905b81811061056757506103b4565b5f815560010161055a565b5f5160206110755f395f51905f529150610543565b634e487b7160e01b5f52604160045260245ffd5b34610120575f366003190112610120576040515f6003546105bb81610eb9565b808452906001811690811561063e57506001146105f3575b6105ef836105e381850382610e1f565b60405191829182610dc9565b0390f35b91905060035f525f5160206110755f395f51905f52915f905b808210610624575090915081016020016105e36105d3565b91926001816020925483858801015201910190929161060c565b60ff191660208086019190915291151560051b840190910191506105e390506105d3565b34610120575f366003190112610120575f546040516001600160a01b039091168152602090f35b34610120576020366003190112610120576001600160a01b036106aa610df3565b165f526006602052602060405f2054604051908152f35b34610120575f366003190112610120576001546001600160a01b03811690338203610733575f80546001600160a01b0319908116841782559091166001556040805192835260208301919091527fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c91a1005b5063176f517960e01b5f526004523360245260445ffd5b346101205761075836610e41565b5f546001600160a01b03163381036102075750805167ffffffffffffffff811161058757610787600254610eb9565b601f81116108fb575b50602091601f8211600114610890579181925f92610885575b50508160011b915f199060031b1c1916176002555b604051602081525f6002546107d281610eb9565b908160208501526001811690815f146108635750600114610819575b507f2ae91ea06611bdd535a7ec999b4730beaa64fdbc044a50645c052153e55c3e2d919081900390a1005b60025f9081525f5160206110555f395f51905f52939250905b80821061084857509091508101604001816107ee565b91926001816020925460408588010152019101909291610832565b60ff191660408086019190915291151560051b840190910191508290506107ee565b0151905082806107a9565b601f1982169260025f525f5160206110555f395f51905f52915f5b8581106108e3575083600195106108cb575b505050811b016002556107be565b01515f1960f88460031b161c191690558280806108bd565b919260206001819286850151815501940192016108ab565b60025f52601f820160051c5f5160206110555f395f51905f5201906020831061094e575b601f0160051c5f5160206110555f395f51905f5201905b8181106109435750610790565b5f8155600101610936565b5f5160206110555f395f51905f52915061091f565b34610120576020366003190112610120576004353361098f576313053d9360e21b5f523360045260245ffd5b335f90815260066020526040902054818110610355575f826109b381600554611047565b6005553382526006602052604082206109cd828254611047565b90557f410c5c259085cde81fedf70c1aa308ec839373c26e9b7ada6560a2aca0254eb660406005548151908482526020820152a16040519081525f5160206110955f395f51905f5260203392a3005b3461012057604036600319011261012057610a35610df3565b5f5460243591906001600160a01b031633810361020757506001600160a01b03169081610a6f5750639cfea58360e01b5f5260045260245ffd5b5f5160206110955f395f51905f52602082610a8d5f94600554610ef1565b6005558484526006825260408420610aa6828254610ef1565b90557fcc9c58b575eabd3f6a1ee653e91fcea3ff546867ffc3782a3bbca1f9b6dbb8df604060055481519084825285820152a1604051908152a3005b34610120575f36600319011261012057602060ff60045416604051908152f35b34610120576060366003190112610120576020610b4f610b20610df3565b610b28610e09565b6044359160018060a01b0382165f5260068552610b498360405f2054610ef1565b50610f12565b6040519015158152f35b34610120575f366003190112610120576020600554604051908152f35b3461012057604036600319011261012057610b8f610df3565b610b97610e09565b9060018060a01b03165f52600860205260405f209060018060a01b03165f52602052602060ff60405f2054166040519015158152f35b3461012057604036600319011261012057610be6610df3565b6024359033610c02576322f051b160e21b5f523360045260245ffd5b6001600160a01b0316903382141580610cd0575b80610cc7575b15610cb457335f908152600660205260409020548181106103555750335f52600860205260405f20825f5260205260405f20600160ff19825416179055335f52600760205260405f20825f5260205260405f20610c7a828254610ef1565b90556040519081527f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b92560203392a360405160018152602090f35b5063270af7ed60e11b5f5260045260245ffd5b50811515610c1c565b505f546001600160a01b0316821415610c16565b34610120575f366003190112610120576040515f600254610d0481610eb9565b808452906001811690811561063e5750600114610d2b576105ef836105e381850382610e1f565b91905060025f525f5160206110555f395f51905f52915f905b808210610d5c575090915081016020016105e36105d3565b919260018160209254838588010152019101909291610d44565b34610120576020366003190112610120576004359063ffffffff60e01b8216809203610120576020916301ffc9a760e01b8114908115610db8575b5015158152f35b6336372b0760e01b14905083610db1565b602060409281835280519182918282860152018484015e5f828201840152601f01601f1916010190565b600435906001600160a01b038216820361012057565b602435906001600160a01b038216820361012057565b90601f8019910116810190811067ffffffffffffffff82111761058757604052565b60206003198201126101205760043567ffffffffffffffff811161012057816023820112156101205780600401359067ffffffffffffffff82116105875760405192610e97601f8401601f191660200185610e1f565b8284526024838301011161012057815f92602460209301838601378301015290565b90600182811c92168015610ee7575b6020831014610ed357565b634e487b7160e01b5f52602260045260245ffd5b91607f1691610ec8565b91908201809211610efe57565b634e487b7160e01b5f52601160045260245ffd5b6001600160a01b0316908115611034576001600160a01b0316918215611021575f828152600660205260409020548181106103555750338203610f8f575b60205f5160206110955f395f51905f5291835f526006825260405f20818154039055845f526006825260405f20818154019055604051908152a3600190565b5f82815260086020908152604080832033845290915290205460ff161561100e575f828152600760209081526040808320338452909152902054818110610ff557505f828152600760209081526040808320338452909152902080548290039055610f50565b630c95cf2760e11b5f523360045260245260445260645ffd5b6313053d9360e21b5f523360045260245ffd5b82639cfea58360e01b5f5260045260245ffd5b506313053d9360e21b5f5260045260245ffd5b91908203918211610efe5756fe405787fa12a823e0f2b7631cc41b3ba8828b3321ca811111fa75cd3aa3bb5acec2575a0e9e593c00f959f8c92f12db2869c3395a3b0502d05e2516446f71f85bddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3efa26469706673582212200a75d1a4c912be5dc2d821991e5c0ea3009115e80fb66c939e1f3ac47c98f47964736f6c634300081d0033000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000120000000000000000000000000000000000000000000000000000000000000007506f6c79676f6e000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003504f4c0000000000000000000000000000000000000000000000000000000000
+
+
+
+- vs what we got -
+
+
+
+We tried looking for a match from the list of compiled contract bytecode outputs (as listed below), but was unable to find an exact match.
+
+
+
+1) contracts/ERC20.sol:ERC20
+
+608060405234610370576113eb8038038061001981610374565b9283398101906060818303126103705780516001600160401b0381116103705782610045918301610399565b60208201519092906001600160401b03811161037057604091610069918401610399565b91015160ff8116809103610370575f80546001600160a01b0319163317905582516001600160401b03811161028157600254600181811c91168015610366575b602082101461026357601f8111610303575b506020601f82116001146102a057819293945f92610295575b50508160011b915f199060031b1c1916176002555b81516001600160401b03811161028157600354600181811c91168015610277575b602082101461026357601f8111610200575b50602092601f821160011461019f57928192935f92610194575b50508160011b915f199060031b1c1916176003555b60ff1960045416176004557f82488d8ab594db2178e4a45b7106aaa804836e608f001b5d7fcb6c3514730b3e60408051308152336020820152a1604051610fe890816104038239f35b015190505f80610136565b601f1982169360035f52805f20915f5b8681106101e857508360019596106101d0575b505050811b0160035561014b565b01515f1960f88460031b161c191690555f80806101c2565b919260206001819286850151815501940192016101af565b60035f527fc2575a0e9e593c00f959f8c92f12db2869c3395a3b0502d05e2516446f71f85b601f830160051c81019160208410610259575b601f0160051c01905b81811061024e575061011c565b5f8155600101610241565b9091508190610238565b634e487b7160e01b5f52602260045260245ffd5b90607f169061010a565b634e487b7160e01b5f52604160045260245ffd5b015190505f806100d4565b601f1982169060025f52805f20915f5b8181106102eb575095836001959697106102d3575b505050811b016002556100e9565b01515f1960f88460031b161c191690555f80806102c5565b9192602060018192868b0151815501940192016102b0565b60025f527f405787fa12a823e0f2b7631cc41b3ba8828b3321ca811111fa75cd3aa3bb5ace601f830160051c8101916020841061035c575b601f0160051c01905b81811061035157506100bb565b5f8155600101610344565b909150819061033b565b90607f16906100a9565b5f80fd5b6040519190601f01601f191682016001600160401b0381118382101761028157604052565b81601f82011215610370578051906001600160401b038211610281576103c8601f8301601f1916602001610374565b9282845260208383010111610370575f5b8281106103ed57505060205f918301015290565b806020809284010151828287010152016103d956fe6080806040526004361015610012575f80fd5b5f3560e01c90816301ffc9a714610b5b5750806306fdde0314610b38578063095ea7b314610a2157806316dead14146109ca57806318160ddd146109ad57806323b872dd14610956578063313ce5671461093657806340c10f191461087057806342966c68146107b75780635353a2d81461063057806362a09477146105a757806370a082311461056f5780638da5cb5b1461054857806395d89b411461050e578063a3895fff1461036e578063a9059cbb14610287578063c112dfa31461021d578063c42069ec14610174578063dd62ed3e146101245763e30c3978146100f8575f80fd5b34610120575f366003190112610120576001546040516001600160a01b039091168152602090f35b5f80fd5b346101205760403660031901126101205761013d610bf5565b610145610c0b565b6001600160a01b039182165f908152600760209081526040808320949093168252928352819020549051908152f35b346101205760203660031901126101205761018d610bf5565b5f546001600160a01b031633810361020757506001600160a01b031680156101f5576020817f7d5f578daab924f3f271d863dd8729e6970e9186812579e22f892146def80f67926bffffffffffffffffffffffff60a01b6001541617600155604051908152a1005b6334d7d10d60e21b5f5260045260245ffd5b63a3ee740f60e01b5f526004523360245260445ffd5b346101205760203660031901126101205760043560ff8116809103610120575f546001600160a01b0316338103610207577fa667a2c7cf0813fa2c1f7a0a0093db4cf6fc7e9c5264f29df1aa880b409a312e6020838060ff196004541617600455604051908152a1005b34610120576040366003190112610120576102a0610bf5565b60243590336102bc576313053d9360e21b5f523360045260245ffd5b6001600160a01b031690816102de5750639cfea58360e01b5f5260045260245ffd5b335f908152600660205260409020548181106103555750815f52600660205261030b8160405f2054610def565b50335f52600660205260405f20818154039055815f52600660205260405f208181540190556040519081525f516020610f935f395f51905f5260203392a360405160018152602090f35b63db42144d60e01b5f523360045260245260445260645ffd5b346101205761037c36610c43565b5f546001600160a01b03163381036102075750805167ffffffffffffffff81116104fa576103ab600354610cbb565b601f8111610492575b50602091601f8211600114610427579181925f9261041c575b50508160011b915f199060031b1c1916176003555b7fc5109575ebaf6138fc9735faca1c61ff8b7bf4f91870337266cc2bce01a75e15604051602081528061041760208201610d7f565b0390a1005b0151905082806103cd565b601f1982169260035f525f516020610f735f395f51905f52915f5b85811061047a57508360019510610462575b505050811b016003556103e2565b01515f1960f88460031b161c19169055828080610454565b91926020600181928685015181550194019201610442565b60035f52601f820160051c5f516020610f735f395f51905f520190602083106104e5575b601f0160051c5f516020610f735f395f51905f5201905b8181106104da57506103b4565b5f81556001016104cd565b5f516020610f735f395f51905f5291506104b6565b634e487b7160e01b5f52604160045260245ffd5b34610120575f366003190112610120576105446040516105388161053181610d7f565b0382610c21565b60405191829182610bae565b0390f35b34610120575f366003190112610120575f546040516001600160a01b039091168152602090f35b34610120576020366003190112610120576001600160a01b03610590610bf5565b165f526006602052602060405f2054604051908152f35b34610120575f366003190112610120576001546001600160a01b03811690338203610619575f80546001600160a01b0319908116841782559091166001556040805192835260208301919091527fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c91a1005b5063176f517960e01b5f526004523360245260445ffd5b346101205761063e36610c43565b5f546001600160a01b03163381036102075750805167ffffffffffffffff81116104fa5761066d600254610cbb565b601f811161074f575b50602091601f82116001146106e4579181925f926106d9575b50508160011b915f199060031b1c1916176002555b7f2ae91ea06611bdd535a7ec999b4730beaa64fdbc044a50645c052153e55c3e2d604051602081528061041760208201610cf3565b01519050828061068f565b601f1982169260025f525f516020610f535f395f51905f52915f5b8581106107375750836001951061071f575b505050811b016002556106a4565b01515f1960f88460031b161c19169055828080610711565b919260206001819286850151815501940192016106ff565b60025f52601f820160051c5f516020610f535f395f51905f520190602083106107a2575b601f0160051c5f516020610f535f395f51905f5201905b8181106107975750610676565b5f815560010161078a565b5f516020610f535f395f51905f529150610773565b3461012057602036600319011261012057600435336107e3576313053d9360e21b5f523360045260245ffd5b335f90815260066020526040902054818110610355575f8261080781600554610f45565b600555338252600660205260408220610821828254610f45565b90557f410c5c259085cde81fedf70c1aa308ec839373c26e9b7ada6560a2aca0254eb660406005548151908482526020820152a16040519081525f516020610f935f395f51905f5260203392a3005b3461012057604036600319011261012057610889610bf5565b5f5460243591906001600160a01b031633810361020757506001600160a01b031690816108c35750639cfea58360e01b5f5260045260245ffd5b5f516020610f935f395f51905f526020826108e15f94600554610def565b60055584845260068252604084206108fa828254610def565b90557fcc9c58b575eabd3f6a1ee653e91fcea3ff546867ffc3782a3bbca1f9b6dbb8df604060055481519084825285820152a1604051908152a3005b34610120575f36600319011261012057602060ff60045416604051908152f35b346101205760603660031901126101205760206109a3610974610bf5565b61097c610c0b565b6044359160018060a01b0382165f526006855261099d8360405f2054610def565b50610e10565b6040519015158152f35b34610120575f366003190112610120576020600554604051908152f35b34610120576040366003190112610120576109e3610bf5565b6109eb610c0b565b9060018060a01b03165f52600860205260405f209060018060a01b03165f52602052602060ff60405f2054166040519015158152f35b3461012057604036600319011261012057610a3a610bf5565b6024359033610a56576322f051b160e21b5f523360045260245ffd5b6001600160a01b0316903382141580610b24575b80610b1b575b15610b0857335f908152600660205260409020548181106103555750335f52600860205260405f20825f5260205260405f20600160ff19825416179055335f52600760205260405f20825f5260205260405f20610ace828254610def565b90556040519081527f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b92560203392a360405160018152602090f35b5063270af7ed60e11b5f5260045260245ffd5b50811515610a70565b505f546001600160a01b0316821415610a6a565b34610120575f366003190112610120576105446040516105388161053181610cf3565b34610120576020366003190112610120576004359063ffffffff60e01b8216809203610120576020916301ffc9a760e01b8114908115610b9d575b5015158152f35b6336372b0760e01b14905083610b96565b9190916020815282518060208301525f5b818110610bdf575060409293505f838284010152601f8019910116010190565b8060208092870101516040828601015201610bbf565b600435906001600160a01b038216820361012057565b602435906001600160a01b038216820361012057565b90601f8019910116810190811067ffffffffffffffff8211176104fa57604052565b60206003198201126101205760043567ffffffffffffffff811161012057816023820112156101205780600401359067ffffffffffffffff82116104fa5760405192610c99601f8401601f191660200185610c21565b8284526024838301011161012057815f92602460209301838601378301015290565b90600182811c92168015610ce9575b6020831014610cd557565b634e487b7160e01b5f52602260045260245ffd5b91607f1691610cca565b6002545f9291610d0282610cbb565b8082529160018116908115610d635750600114610d1d575050565b60025f9081529293509091905f516020610f535f395f51905f525b838310610d49575060209250010190565b600181602092949394548385870101520191019190610d38565b9050602093945060ff929192191683830152151560051b010190565b6003545f9291610d8e82610cbb565b8082529160018116908115610d635750600114610da9575050565b60035f9081529293509091905f516020610f735f395f51905f525b838310610dd5575060209250010190565b600181602092949394548385870101520191019190610dc4565b91908201809211610dfc57565b634e487b7160e01b5f52601160045260245ffd5b6001600160a01b0316908115610f32576001600160a01b0316918215610f1f575f828152600660205260409020548181106103555750338203610e8d575b60205f516020610f935f395f51905f5291835f526006825260405f20818154039055845f526006825260405f20818154019055604051908152a3600190565b5f82815260086020908152604080832033845290915290205460ff1615610f0c575f828152600760209081526040808320338452909152902054818110610ef357505f828152600760209081526040808320338452909152902080548290039055610e4e565b630c95cf2760e11b5f523360045260245260445260645ffd5b6313053d9360e21b5f523360045260245ffd5b82639cfea58360e01b5f5260045260245ffd5b506313053d9360e21b5f5260045260245ffd5b91908203918211610dfc5756fe405787fa12a823e0f2b7631cc41b3ba8828b3321ca811111fa75cd3aa3bb5acec2575a0e9e593c00f959f8c92f12db2869c3395a3b0502d05e2516446f71f85bddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef{ipfs}64736f6c634300081b0033000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000120000000000000000000000000000000000000000000000000000000000000007506f6c79676f6e000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003504f4c0000000000000000000000000000000000000000000000000000000000

package/src/utils/event.js

@@ -0,0 +1,22 @@
+/**
+ * Returns event values
+ * @param {Object} contract 
+ * @param {Object} tx 
+ * @returns {Array<Object>}
+ */
+
+export function eventOf(contract, tx){
+    const events = tx.logs.map(log => {
+        try {
+            return contract.interface.parseLog(log);
+        } catch (e) {
+        return null;
+        }
+    }).filter(log => log !== null);
+
+    const parsedEvents = events.map(e => ({
+        name: e.name,
+        values: e.args,
+    }));
+    return parsedEvents;        
+}

package/src/utils/typeGenerator.js

@@ -49,7 +49,7 @@ export function generateAllTypes(buildPath, typesOutputPath = './src/types') {
       throw new Error(`ABIs directory not found at ${abisPath}`);
     }
 
-    const abiFiles = fs.readdirSync(abisPath).filter(f => f.endsWith('.abi.json'));
+    const abiFiles = fs.readdirSync(abisPath).filter(f => f.endsWith('.abi.json') && f !== 'aggregated.abi.json');
     const generatedFiles = [];
 
     abiFiles.forEach(file => {

package/src/services/config.js

@@ -1,15 +0,0 @@
-import { configFile } from './build.js';
-
-/**
- * Gets all fields of config file
- */
-export function getConfigInfo() {
-    console.log(configFile); 
-}
-
-/**
- * Gets just default account of config file
- */
-export function getDefaultAccount() {
-    console.log(configFile.defaultWallet);
-}