ethershell 0.1.2-beta.0 → 0.1.3-beta.0

package/package.json

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

package/src/services/wallet.js

@@ -267,7 +267,7 @@ export function getHDAccounts() {
  * deleteAccount(); // Delete all accounts
  */
 export function deleteAccount(accPointer) {
-    if(!accPointer) {
+    if(!accPointer && accPointer !== 0) {
         deleteByIndex(null);
         console.log(allAccounts);
     }
@@ -288,6 +288,7 @@ export function deleteAccount(accPointer) {
 
     if(Array.isArray(accPointer)) {
         deleteByIndexArr(accPointer);
+        console.log(allAccounts);
     }
 
     if(ethers.Mnemonic.isValidMnemonic(accPointer)) {
@@ -402,6 +403,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

@@ -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/contractProxy.js

@@ -155,7 +155,17 @@ 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();
+          return receipt;
+        }
+
+        // This is a view/pure function result - return as-is
+        return result;
       };
     }
   });