Merge remote-tracking branch 'origin/master' into release/v2.1

Author: devhawk

CHANGELOG.md

@@ -9,6 +9,7 @@ Check [Keep a Changelog](http://keepachangelog.com/) for recommendations on how
 ### Added
 
 - A panel that shows a list of all known smart contracts, allowing quick access to contract metadata
+- A panel that shows a list of all known wallets, allowing quick access to balance information
 
 ### Changed
 

package.json

@@ -42,6 +42,7 @@
     "onCommand:neo3-visual-devtracker.neo.walletCreate",
     "onCommand:neo3-visual-devtracker.tracker.openContract",
     "onCommand:neo3-visual-devtracker.tracker.openTracker",
+    "onCommand:neo3-visual-devtracker.tracker.openWallet",
     "onCustomEditor:neo3-visual-devtracker.express.neo-invoke-json",
     "onView:neo3-visual-devtracker.views.blockchains",
     "onView:neo3-visual-devtracker.views.quickStart",
@@ -168,6 +169,11 @@
           "dark": "resources/dark/open.svg"
         }
       },
+      {
+        "command": "neo3-visual-devtracker.tracker.openWallet",
+        "title": "Show wallet",
+        "category": "Neo N3 Visual DevTracker"
+      },
       {
         "command": "neo3-visual-devtracker.connect",
         "title": "Connect to a Neo N3 blockchain",
@@ -278,7 +284,7 @@
         },
         {
           "command": "neo3-visual-devtracker.neo.walletCreate",
-          "when": "view == neo3-visual-devtracker.views.blockchains"
+          "when": "view == neo3-visual-devtracker.views.wallets"
         }
       ]
     },
@@ -288,6 +294,10 @@
           "id": "neo3-visual-devtracker.views.blockchains",
           "name": "Blockchains"
         },
+        {
+          "id": "neo3-visual-devtracker.views.wallets",
+          "name": "Wallets"
+        },
         {
           "id": "neo3-visual-devtracker.views.contracts",
           "name": "Smart contracts"

src/extension/autoComplete.ts

@@ -180,11 +180,14 @@ export default class AutoComplete {
 
     const wallets = [...this.walletDetector.wallets];
     for (const wallet of wallets) {
-      for (const address of wallet.accounts.map((_) => _.address)) {
-        newData.addressNames[address] = newData.addressNames[address] || [];
-        newData.addressNames[address].push(wallet.path);
-        newData.addressNames[address] = dedupeAndSort(
-          newData.addressNames[address]
+      for (const account of wallet.accounts) {
+        newData.addressNames[account.address] =
+          newData.addressNames[account.address] || [];
+        newData.addressNames[account.address].push(
+          account.label || wallet.path
+        );
+        newData.addressNames[account.address] = dedupeAndSort(
+          newData.addressNames[account.address]
         );
       }
     }

src/extension/commandArguments.ts renamed to src/extension/commands/commandArguments.ts

@@ -1,4 +1,4 @@
-import BlockchainIdentifier from "./blockchainIdentifier";
+import BlockchainIdentifier from "../blockchainIdentifier";
 
 //
 // Represents all possible arguments to any command explosed by
@@ -16,6 +16,7 @@ import BlockchainIdentifier from "./blockchainIdentifier";
 //   );
 //
 type CommandArguments = {
+  address?: string;
   amount?: number;
   asset?: string;
   blockchainIdentifier?: BlockchainIdentifier;
@@ -28,6 +29,9 @@ type CommandArguments = {
 
 async function sanitizeCommandArguments(input: any): Promise<CommandArguments> {
   return {
+    address: input.address
+      ? `${input.address}`.replace(/[^a-z0-9]/gi, "")
+      : undefined,
     amount: parseFloat(input.amount) || undefined,
     asset: input.asset
       ? `${input.asset}`.replace(/[^a-z0-9]/gi, "")

src/extension/commands/neoCommands.ts

@@ -6,7 +6,7 @@ import * as vscode from "vscode";
 
 import ActiveConnection from "../activeConnection";
 import BlockchainsTreeDataProvider from "../vscodeProviders/blockchainsTreeDataProvider";
-import { CommandArguments } from "../commandArguments";
+import { CommandArguments } from "./commandArguments";
 import ContractDetector from "../fileDetectors/contractDetector";
 import IoHelpers from "../util/ioHelpers";
 import JSONC from "../util/JSONC";

src/extension/commands/neoExpressCommands.ts

@@ -6,7 +6,7 @@ import BlockchainIdentifier from "../blockchainIdentifier";
 import BlockchainMonitorPool from "../blockchainMonitor/blockchainMonitorPool";
 import BlockchainsTreeDataProvider from "../vscodeProviders/blockchainsTreeDataProvider";
 import CheckpointDetector from "../fileDetectors/checkpointDetector";
-import { CommandArguments } from "../commandArguments";
+import { CommandArguments } from "./commandArguments";
 import ContractDetector from "../fileDetectors/contractDetector";
 import IoHelpers from "../util/ioHelpers";
 import NeoExpress from "../neoExpress/neoExpress";

src/extension/commands/trackerCommands.ts

@@ -1,22 +1,24 @@
 import * as vscode from "vscode";
 
+import ActiveConnection from "../activeConnection";
 import AutoComplete from "../autoComplete";
 import BlockchainMonitorPool from "../blockchainMonitor/blockchainMonitorPool";
 import BlockchainsTreeDataProvider from "../vscodeProviders/blockchainsTreeDataProvider";
-import { CommandArguments } from "../commandArguments";
+import { CommandArguments } from "./commandArguments";
 import ContractPanelController from "../panelControllers/contractPanelController";
 import IoHelpers from "../util/ioHelpers";
 import TrackerPanelController from "../panelControllers/trackerPanelController";
+import WalletPanelController from "../panelControllers/walletPanelController";
 
 export default class TrackerCommands {
   static async openContract(
     context: vscode.ExtensionContext,
     autoComplete: AutoComplete,
     commandArguments: CommandArguments
   ) {
-    const autoCompleteData = autoComplete.data;
     let hash = commandArguments.hash;
     if (!hash) {
+      const autoCompleteData = autoComplete.data;
       if (!!Object.keys(autoCompleteData.contractNames).length) {
         const selection = await IoHelpers.multipleChoice(
           "Select a contract",
@@ -61,4 +63,39 @@ export default class TrackerCommands {
       );
     }
   }
+
+  static async openWallet(
+    context: vscode.ExtensionContext,
+    autoComplete: AutoComplete,
+    commandArguments: CommandArguments,
+    activeConnection: ActiveConnection
+  ) {
+    let address = commandArguments.address;
+    if (!address) {
+      const autoCompleteData = autoComplete.data;
+      if (!!Object.keys(autoCompleteData.addressNames).length) {
+        const selection = await IoHelpers.multipleChoice(
+          "Select a wallet",
+          ...Object.keys(autoCompleteData.addressNames).map(
+            (_) => `${_} - ${autoCompleteData.addressNames[_].join(", ")}`
+          )
+        );
+        if (selection) {
+          address = selection.split(" ")[0];
+        }
+      } else {
+        vscode.window.showInformationMessage(
+          "No wallets found in current workspace"
+        );
+      }
+    }
+    if (address) {
+      new WalletPanelController(
+        context,
+        address,
+        autoComplete,
+        activeConnection
+      );
+    }
+  }
 }

src/extension/index.ts

@@ -6,7 +6,10 @@ import BlockchainIdentifier from "./blockchainIdentifier";
 import BlockchainMonitorPool from "./blockchainMonitor/blockchainMonitorPool";
 import BlockchainsTreeDataProvider from "./vscodeProviders/blockchainsTreeDataProvider";
 import CheckpointDetector from "./fileDetectors/checkpointDetector";
-import { CommandArguments, sanitizeCommandArguments } from "./commandArguments";
+import {
+  CommandArguments,
+  sanitizeCommandArguments,
+} from "./commands/commandArguments";
 import ContractDetector from "./fileDetectors/contractDetector";
 import ContractsTreeDataProvider from "./vscodeProviders/contractsTreeDataProvider";
 import Log from "../shared/log";
@@ -21,6 +24,7 @@ import ServerListDetector from "./fileDetectors/serverListDetector";
 import Templates from "./templates/templates";
 import TrackerCommands from "./commands/trackerCommands";
 import WalletDetector from "./fileDetectors/walletDetector";
+import WalletsTreeDataProvider from "./vscodeProviders/walletsTreeDataProvider";
 
 const LOG_PREFIX = "index";
 
@@ -65,6 +69,11 @@ export async function activate(context: vscode.ExtensionContext) {
     blockchainsTreeDataProvider,
     blockchainMonitorPool
   );
+  const walletsTreeDataProvider = new WalletsTreeDataProvider(
+    context.extensionPath,
+    activeConnection,
+    walletDetector
+  );
   const contractDetector = new ContractDetector(activeConnection);
   const neoExpressInstanceManager = new NeoExpressInstanceManager(
     neoExpress,
@@ -113,6 +122,13 @@ export async function activate(context: vscode.ExtensionContext) {
     )
   );
 
+  context.subscriptions.push(
+    vscode.window.registerTreeDataProvider(
+      "neo3-visual-devtracker.views.wallets",
+      walletsTreeDataProvider
+    )
+  );
+
   context.subscriptions.push(
     vscode.window.registerCustomEditorProvider(
       "neo3-visual-devtracker.neo.neo-invoke-json",
@@ -331,6 +347,18 @@ export async function activate(context: vscode.ExtensionContext) {
     (commandArguments) =>
       TrackerCommands.openContract(context, autoComplete, commandArguments)
   );
+
+  registerCommand(
+    context,
+    "neo3-visual-devtracker.tracker.openWallet",
+    (commandArguments) =>
+      TrackerCommands.openWallet(
+        context,
+        autoComplete,
+        commandArguments,
+        activeConnection
+      )
+  );
 }
 
 export function deactivate() {

src/extension/neoExpress/neoExpressInstanceManager.ts

@@ -3,7 +3,7 @@ import * as vscode from "vscode";
 import ActiveConnection from "../activeConnection";
 import BlockchainIdentifier from "../blockchainIdentifier";
 import BlockchainsTreeDataProvider from "../vscodeProviders/blockchainsTreeDataProvider";
-import { CommandArguments } from "../commandArguments";
+import { CommandArguments } from "../commands/commandArguments";
 import Log from "../../shared/log";
 import NeoExpress from "./neoExpress";
 import IoHelpers from "../util/ioHelpers";

src/extension/panelControllers/contractPanelController.ts

@@ -29,7 +29,7 @@ export default class ContractPanelController extends PanelControllerBase<
     );
     autoComplete.onChange((autoCompleteData) => {
       const name = autoCompleteData.contractNames[contractHash] || contractHash;
-      this.updateViewState({ panelTitle: name, ...autoCompleteData });
+      this.updateViewState({ panelTitle: name, autoCompleteData });
     });
   }