ethershell 0.1.2-beta.0 → 0.1.4-beta.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "ethershell",
   "license": "MIT",
-  "version": "0.1.2-beta.0",
+  "version": "0.1.4-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,13 @@
 
 import { ethers } from 'ethers';
 import fs from 'fs';
-import { provider } from './network.js';
-import { allAccounts, accounts, hdAccounts } from './wallet.js';
+import { provider } from './config.js';
+import { allAccounts } from './wallet.js';
 import { LocalStorage } from 'node-localstorage';
 import { r } from '../../bin/cli.js';
-import { configFile } from './build.js';
+import { configFile } from './config.js';
 import { createContractProxy } from '../utils/contractProxy.js';
+import { eventOf } from '../utils/event.js';
 
 /**
  * Local storage instance for persisting contract metadata
@@ -88,16 +89,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 +108,13 @@ export async function deploy(contractName, args, accIndex, chain, abiLoc, byteco
         // Wrap the contract instace with proxy
         const proxiedContract = createContractProxy(contractInstance, currentProvider, allAccounts);
 
+        proxiedContract.index = Array.from(contracts.values()).length;
+        proxiedContract.name = contractName;
+        proxiedContract.chain = connectedChain.name;
+        proxiedContract.chainId = connectedChain.chainId;
+        proxiedContract.deployType = 'ethershell-deployed';
+        proxiedContract.provider = currentProvider;
+
         // Add to REPL context with proxy
         r.context[contractName] = proxiedContract;
         contracts.set(contractName, proxiedContract);
@@ -127,14 +125,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 +191,13 @@ export async function add(contractName, contractAddr, accIndex, abiLoc, chain) {
         // Wrap the contract instace with proxy
         const proxiedContract = createContractProxy(newContract, currentProvider, allAccounts);
 
+        proxiedContract.index = Array.from(contracts.values()).length;
+        proxiedContract.name = contractName;
+        proxiedContract.chain = connectedChain.name;
+        proxiedContract.chainId = connectedChain.chainId;
+        proxiedContract.deployType = 'ethershell-deployed';
+        proxiedContract.provider = currentProvider;
+
         // Add to REPL context with proxy
         r.context[contractName] = proxiedContract;
         contracts.set(contractName, proxiedContract);
@@ -197,16 +210,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 +230,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 './config.js';
 
 /**
  * Update the Solidity compiler to a specific version

package/src/services/config.js

@@ -1,15 +1,175 @@
-import { configFile } from './build.js';
+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 Memeory:
+// 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() {
-    console.log(configFile); 
+    return configFile; 
 }
 
 /**
  * Gets just default account of config file
  */
 export function getDefaultAccount() {
-    console.log(configFile.defaultWallet);
+    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 './config.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 './config.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;
 }
 
 /**
@@ -267,14 +254,14 @@ export function getHDAccounts() {
  * deleteAccount(); // Delete all accounts
  */
 export function deleteAccount(accPointer) {
-    if(!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,11 +270,12 @@ export function deleteAccount(accPointer) {
         if(index !== -1) {
             deleteByIndex(index);
         }
-        console.log(allAccounts);
+        return allAccounts;
     }
 
     if(Array.isArray(accPointer)) {
         deleteByIndexArr(accPointer);
+        return allAccounts;
     }
 
     if(ethers.Mnemonic.isValidMnemonic(accPointer)) {
@@ -309,7 +297,7 @@ export function deleteAccount(accPointer) {
             deleteByIndex(indicesToDelete[i]);
         }
 
-        console.log(allAccounts);
+        return allAccounts;
         return;
     }
 }
@@ -363,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) {
@@ -402,6 +390,10 @@ export function changeDefaultAccount(accPointer) {
         }
 
         if(ethers.isHexString(accPointer, 32)) {
+            const dupWallet = detectDupWallet(accPointer);
+            if(dupWallet.status) {
+                throw `Wallets may NOT be duplicated! You are adding wallet index ${dupWallet.index} again!`
+            }
             const newAccount = new ethers.Wallet(accPointer, provider);
             const newAccObj = {
                 index: allAccounts.length,

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/config.js';
 import fs from 'fs';
-import { configFile, configPath } from '../services/build.js';
+import { configFile, configPath } from '../services/config.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;
 }
 
 /**
@@ -227,6 +227,11 @@ function _deleteBySingIndex(_index) {
                 _index++;
             }
         }
+
+        // Remove from config file if it is default wallet
+        if(accountIndex == configFile.defaultWallet.index) {
+            deleteDefaultAccount();
+        }
     }
 }
 
@@ -282,6 +287,7 @@ function _deleteAll() {
     allAccounts.splice(0);
     accounts.splice(0);
     hdAccounts.splice(0);
+    deleteDefaultAccount();
     fs.writeFileSync(walletJSONPath, JSON.stringify([], null, 2));
     return;
 }
@@ -294,3 +300,11 @@ export function setDefaultAccount(account) {
     configFile.defaultWallet = serializeBigInts(account);
     fs.writeFileSync(configPath, JSON.stringify(configFile, null, 2));
 }
+
+/**
+ * Deletes default account from config file
+ */
+export function deleteDefaultAccount() {
+    configFile.defaultWallet = {};
+    fs.writeFileSync(configPath, JSON.stringify(configFile, null, 2));
+}

package/src/utils/configFileUpdate.js

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

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,6 +26,10 @@ import { ethers } from 'ethers';
 export function createContractProxy(contract, provider, allAccounts) {
   return new Proxy(contract, {
     get(target, prop) {
+      if (prop === 'provider') {
+        return provider;
+      }
+      
       // Pass through non-function properties
       if (typeof target[prop] !== 'function') {
         return target[prop];
@@ -155,7 +160,27 @@ export function createContractProxy(contract, provider, allAccounts) {
         }
 
         // Call the method with remaining args and tx options
-        return method.apply(method, args);
+        const result = await method.apply(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;
+        }
+
+        // This is a view/pure function result - return as-is
+        return result;
       };
     }
   });

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;        
+}