ConsenSys-archive · michaeljohnbennett · Jul 20, 2022 · Jul 26, 2022 · Aug 1, 2022 · Aug 1, 2022
diff --git a/.eslintignore b/.eslintignore
@@ -37,5 +37,3 @@ resources/drizzle/
 
 ui-test/
 
-### We ignore the config file to stop issues.
-#  .eslintrc.js
diff --git a/package.json b/package.json
@@ -78,16 +78,13 @@
           "default": false,
           "description": "Disable notification on long running tasks."
         },
-        "truffle-vscode.storageAccount.name": {
-          "type": "string",
-          "scope": "Storage Account name"
-        },
         "truffle-vscode.coreSDK": {
           "type": "string",
           "scope": "Core SDK for extensions backend",
           "default": "Truffle",
           "enum": [
-            "Truffle"
+            "Truffle",
+            "Hardhat"
           ]
         }
       }
@@ -421,7 +418,7 @@
         },
         {
           "command": "truffle-vscode.buildContracts",
-          "when": "view == truffle-vscode.views.explorer && viewItem == root",
+          "when": "view == truffle-vscode.views.explorer",
           "group": "truffle-0@1"
         },
         {
@@ -752,6 +749,7 @@
     "@commitlint/cli": "^17.0.3",
     "@commitlint/config-conventional": "^17.0.3",
     "@types/big.js": "^6.1.2",
+    "@types/chai": "^4.3.1",
     "@types/copy-webpack-plugin": "^8.0.1",
     "@types/download": "^6.2.4",
     "@types/estree": "^0.0.52",
@@ -768,7 +766,7 @@
     "@types/rewire": "^2.5.28",
     "@types/rimraf": "^3.0.2",
     "@types/semver": "^6.0.0",
-    "@types/sinon": "^7.0.11",
+    "@types/sinon": "^10.0.13",
     "@types/source-map": "^0.5.2",
     "@types/uuid": "^3.4.4",
     "@types/vscode": "1.66.0",
@@ -777,6 +775,7 @@
     "@vscode/debugadapter": "^1.55.1",
     "@vscode/debugprotocol": "^1.55.1",
     "@vscode/test-electron": "^2.1.3",
+    "chai": "^4.3.6",
     "copy-webpack-plugin": "^10.0.0",
     "copyfiles": "^2.4.1",
     "decache": "^4.5.1",
@@ -785,13 +784,13 @@
     "husky": "^8.0.1",
     "istanbul": "^0.4.5",
     "lint-staged": "^8.2.0",
-    "mocha": "^6.2.3",
+    "mocha": "^10.0.0",
     "mockery": "^2.1.0",
     "prettier": "2.7.1",
     "pretty-quick": "^3.1.3",
     "remap-istanbul": "^0.13.0",
     "rewire": "^4.0.1",
-    "sinon": "^7.3.2",
+    "sinon": "^14.0.2",
     "truffle": "^5.5.30",
     "ts-loader": "9.3.1",
     "ts-node": "^10.8.1",

diff --git a/polyfills/original-require.js b/polyfills/original-require.js
@@ -1 +1,4 @@
+// Copyright (c) 2022. Consensys Software Inc. All rights reserved.
+// Licensed under the MIT license.
+
 module.exports = eval('require');
diff --git a/resources/ganache/assets/icons/account.svg b/resources/ganache/assets/icons/account.svg
diff --git a/resources/ganache/assets/icons/blocks.svg b/resources/ganache/assets/icons/blocks.svg
diff --git a/resources/ganache/assets/icons/contract.svg b/resources/ganache/assets/icons/contract.svg
diff --git a/resources/ganache/assets/icons/events.svg b/resources/ganache/assets/icons/events.svg
diff --git a/resources/ganache/assets/icons/transactions.svg b/resources/ganache/assets/icons/transactions.svg
diff --git a/resources/ganache/index.html b/resources/ganache/index.html
@@ -1,3 +1,6 @@
+<!-- Copyright (c) 2022. Consensys Software Inc. All rights reserved. -->
+<!-- Licensed under the MIT license. -->
+
 <!DOCTYPE html>
 <html lang="en">
   <head>

diff --git a/resources/ganache/main.css b/resources/ganache/main.css
@@ -1,3 +1,6 @@
+/* Copyright (c) 2022. Consensys Software Inc. All rights reserved. */
+/* Licensed under the MIT license. */
+
 :root {
   --primary-color: rgba(235, 182, 126, 1);
   --text-color: rgba(54, 65, 83, 1);

diff --git a/resources/ganache/main.js b/resources/ganache/main.js
@@ -1,3 +1,6 @@
+// Copyright (c) 2022. Consensys Software Inc. All rights reserved.
+// Licensed under the MIT license.
+
 const ganacheDetails = {
   config: {
     vscode: acquireVsCodeApi(),

diff --git a/resources/logPanel/index.html b/resources/logPanel/index.html
@@ -1,3 +1,6 @@
+<!-- Copyright (c) 2022. Consensys Software Inc. All rights reserved. -->
+<!-- Licensed under the MIT license. -->
+
 <!DOCTYPE html>
 <html lang="en">
   <head>

diff --git a/resources/logPanel/main.css b/resources/logPanel/main.css
@@ -1,3 +1,6 @@
+/* Copyright (c) 2022. Consensys Software Inc. All rights reserved. */
+/* Licensed under the MIT license. */
+
 body,
 html {
   width: 100% !important;

diff --git a/resources/logPanel/main.js b/resources/logPanel/main.js
@@ -1,3 +1,6 @@
+// Copyright (c) 2022. Consensys Software Inc. All rights reserved.
+// Licensed under the MIT license.
+
 const logView = {
   config: {
     state: acquireVsCodeApi(),

diff --git a/src/Constants.ts b/src/Constants.ts
@@ -18,6 +18,11 @@ export enum RequiredApps {
   dashboard = 'dashboard',
 }
 
+export enum OptionalApps {
+  hardhat = 'hardhat',
+}
+export type AppTypes = RequiredApps | OptionalApps;
+
 export enum NotificationOptions {
   error = 'error',
   info = 'info',
@@ -120,6 +125,10 @@ export class Constants {
       max: '',
       min: '5.5.0',
     },
+    [OptionalApps.hardhat]: {
+      max: '',
+      min: '2.9.0',
+    },
   };
 
   public static telemetryEvents = {
@@ -606,6 +615,8 @@ export class Constants {
     WorkspaceShouldBeOpened: 'Workspace should be opened',
     DashboardVersionError: 'Please upgrade to the latest version of Truffle to use this feature',
     FetchingBoxesHasFailed: 'An error occurred while fetching boxes',
+    HHNoDefaultDeploy:
+      'Hardhat has no default deploy command. Consider using the HardHat Deploy Plugin: [hardhat-deploy](https://github.com/wighawag/hardhat-deploy)',
   };
 
   public static informationMessage = {
@@ -677,11 +688,11 @@ export class Constants {
   };
   public static userSettings = {
     coreSdkSettingsKey: 'truffle-vscode.coreSDK',
-    storageAccountUserSettingsKey: 'truffle-vscode.storageAccount.name',
   };
 
   public static coreSdk = {
     truffle: 'Truffle',
+    hardhat: 'Hardhat',
   };
 
   public static initialize(context: ExtensionContext) {

diff --git a/src/Models/StatusBarItems/Contract.ts b/src/Models/StatusBarItems/Contract.ts
@@ -1,3 +1,6 @@
+// Copyright (c) 2022. Consensys Software Inc. All rights reserved.
+// Licensed under the MIT license.
+
 import {Constants} from '@/Constants';
 import {Memento, StatusBarAlignment, StatusBarItem, window} from 'vscode';
 

diff --git a/src/Output.ts b/src/Output.ts
@@ -1,4 +1,4 @@
-// Copyright (c) Consensys Software Inc. All rights reserved.
+// Copyright (c) 2022. Consensys Software Inc. All rights reserved.
 // Licensed under the MIT license.
 
 import {commands, ExtensionContext, window} from 'vscode';
@@ -13,6 +13,8 @@ export enum OutputLabel {
   requirements = 'Truffle: Requirements',
   telemetryClient = 'Truffle: Telemetry Client',
   treeManager = 'Truffle: Service Tree Manager',
+  sdkCoreCommands = 'Truffle: SDK Commands',
+  hardhatCommands = 'Truffle: Hardhat Commands',
 }
 
 export class Output {

diff --git a/src/commands/ContractCommands.ts b/src/commands/ContractCommands.ts
@@ -1,4 +1,4 @@
-// Copyright (c) Consensys Software Inc. All rights reserved.
+// Copyright (c) 2022. Consensys Software Inc. All rights reserved.
 // Licensed under the MIT license.
 
 import {StatusBarItems} from '@/Models/StatusBarItems/Contract';

diff --git a/src/commands/DebuggerCommands.ts b/src/commands/DebuggerCommands.ts
@@ -1,23 +1,23 @@
-// Copyright (c) Consensys Software Inc. All rights reserved.
+// Copyright (c) 2022. Consensys Software Inc. All rights reserved.
 // Licensed under the MIT license.
 
-import path from 'path';
-import {debug, DebugConfiguration, QuickPickItem, workspace} from 'vscode';
-
 import {DEBUG_TYPE} from '@/debugAdapter/constants/debugAdapter';
 import {DebugNetwork} from '@/debugAdapter/debugNetwork';
 import {shortenHash} from '@/debugAdapter/functions';
 import {TransactionProvider} from '@/debugAdapter/transaction/transactionProvider';
 import {Web3Wrapper} from '@/debugAdapter/web3Wrapper';
-import {getTruffleWorkspace, getPathByPlatform} from '@/helpers/workspace';
+import {getWorkspaceForUri} from '@/helpers/AbstractWorkspace';
 import {showInputBox, showQuickPick} from '@/helpers/userInteraction';
+import {getPathByPlatform} from '@/helpers/WorkspaceHelpers';
 import {Telemetry} from '@/TelemetryClient';
+import path from 'path';
+import {debug, DebugConfiguration, QuickPickItem, workspace} from 'vscode';
 
 export namespace DebuggerCommands {
   export async function startSolidityDebugger() {
     Telemetry.sendEvent('DebuggerCommands.startSolidityDebugger.commandStarted');
 
-    const workspaceUri = (await getTruffleWorkspace()).workspace;
+    const workspaceUri = (await getWorkspaceForUri()).workspace;
     const workingDirectory = getPathByPlatform(workspaceUri);
     const debugNetwork = new DebugNetwork(workingDirectory);
     await debugNetwork.load();

diff --git a/src/commands/HardhatCommands.ts b/src/commands/HardhatCommands.ts
@@ -0,0 +1,44 @@
+// Copyright (c) 2022. Consensys Software Inc. All rights reserved.
+// Licensed under the MIT license.
+
+import {Constants, NotificationOptions, OptionalApps} from '@/Constants';
+
+import {outputCommandHelper} from '@/helpers';
+import {required} from '@/helpers/required';
+import {showIgnorableNotification, showNotification} from '@/helpers/userInteraction';
+import {AbstractWorkspace} from '@/helpers/AbstractWorkspace';
+import {Output, OutputLabel} from '@/Output';
+import {Telemetry} from '@/TelemetryClient';
+import {commands, Uri} from 'vscode';
+
+export async function buildContracts(ws: AbstractWorkspace, uri?: Uri): Promise<void> {
+  Telemetry.sendEvent('HardhatCommands.buildContracts.commandStarted');
+  if (!(await required.checkAppsSilentForUri(ws.workspace, OptionalApps.hardhat))) {
+    Telemetry.sendEvent('HardhatCommands.buildContracts.hardhatInstallationMissing');
+    await showNotification({
+      message: 'Hardhat is not installed, please install to continue...',
+      type: NotificationOptions.error,
+    });
+    // await required.installHardhat(required.Scope.locally);
+    return;
+  }
+
+  const workspaceDir = ws.workspace.fsPath;
+
+  Output.outputLine(OutputLabel.hardhatCommands, `compiling: ${JSON.stringify(uri)} : ${workspaceDir}`);
+  const args: string[] = [OptionalApps.hardhat, 'compile'];
+
+  // hardhat will compile all contracts, not one specifically.
+  Output.outputLine(
+    OutputLabel.hardhatCommands,
+    `Building: ${args} DIR: ${workspaceDir} Workspace: ${JSON.stringify(ws)} `
+  );
+
+  await showIgnorableNotification(Constants.statusBarMessages.buildingContracts, async () => {
+    Output.show();
+    await outputCommandHelper.executeCommand(workspaceDir, 'npx', args.join(' '));
+    commands.executeCommand('truffle-vscode.views.deployments.refresh');
+
+    Telemetry.sendEvent('HardhatCommands.buildContracts.commandFinished');
+  });
+}
diff --git a/src/commands/ProjectCommands.ts b/src/commands/ProjectCommands.ts
@@ -1,4 +1,4 @@
-// Copyright (c) Consensys Software Inc. All rights reserved.
+// Copyright (c) 2022. Consensys Software Inc. All rights reserved.
 // Licensed under the MIT license.
 
 import {Constants, RequiredApps} from '@/Constants';
Original file line number	Diff line number	Diff line change
Expand Up		@@ -37,5 +37,3 @@ resources/drizzle/

		ui-test/

		### We ignore the config file to stop issues.
		# .eslintrc.js