Minor improvement to wallet package

ethernautdao · Mar 15, 2024 · a208891 · a208891
1 parent 459dcdc
commit a208891
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 0 deletions.
diff --git a/packages/ethernaut-wallet/src/tasks/create.js b/packages/ethernaut-wallet/src/tasks/create.js
@@ -47,6 +47,13 @@ const task = require('../scopes/wallet')
         pk,
       }
 
+      if (
+        signers.activeSigner === undefined ||
+        !signers[signers.activeSigner]
+      ) {
+        signers.activeSigner = alias
+      }
+
       if (signers.activeSigner === 'none') {
         signers.activeSigner = alias
       }

diff --git a/packages/ethernaut-wallet/src/tasks/current.js b/packages/ethernaut-wallet/src/tasks/current.js
@@ -6,7 +6,20 @@ require('../scopes/wallet')
   .setAction(async () => {
     try {
       const signers = storage.readSigners()
+      console.log(signers)
+      if (Object.keys(signers).length < 2) {
+        throw new Error(
+          'No wallets found. Please use the create task to add one.',
+        )
+      }
+
       const signer = signers[signers.activeSigner]
+      if (!signer) {
+        throw new Error(
+          'No active wallet found. Please use the activate task to set one.',
+        )
+      }
+
       return output.resultBox(
         `The current wallet is "${signers.activeSigner}" with address ${signer.address}`,
       )