From b63f78ad97104653c1ca49406c76408124869455 Mon Sep 17 00:00:00 2001 From: bunsenstraat Date: Mon, 20 Sep 2021 09:07:46 +0200 Subject: [PATCH 1/6] Update LocalPluginForm.tsx --- .../plugin-manager/src/lib/components/LocalPluginForm.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/remix-ui/plugin-manager/src/lib/components/LocalPluginForm.tsx b/libs/remix-ui/plugin-manager/src/lib/components/LocalPluginForm.tsx index c8b4f8fbcd..fcf10ce9df 100644 --- a/libs/remix-ui/plugin-manager/src/lib/components/LocalPluginForm.tsx +++ b/libs/remix-ui/plugin-manager/src/lib/components/LocalPluginForm.tsx @@ -52,7 +52,7 @@ function LocalPluginForm ({ closeModal, visible, pluginManager }: LocalPluginFor setMethods(Array.isArray(storagePlugin.methods) ? storagePlugin.methods.join(',') : storagePlugin.methods) setType(storagePlugin.type) setDisplayName(storagePlugin.displayName) - setCanactivate(Array.isArray(storagePlugin.canActivate) ? storagePlugin.canActivate.join(',') : storagePlugin.canActivate) + setCanactivate(Array.isArray(storagePlugin.canActivate) ? storagePlugin.canActivate.join(',') : storagePlugin.canActivate || '') }, []) const handleModalOkClick = async () => { From bfc8ea720ee1190d644ad7b342a278e8a3d7230b Mon Sep 17 00:00:00 2001 From: bunsenstraat Date: Wed, 29 Sep 2021 10:39:51 +0200 Subject: [PATCH 2/6] Update compile-tab.js --- apps/remix-ide/src/app/tabs/compile-tab.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/apps/remix-ide/src/app/tabs/compile-tab.js b/apps/remix-ide/src/app/tabs/compile-tab.js index baecfc8e6e..c3c3ccc608 100644 --- a/apps/remix-ide/src/app/tabs/compile-tab.js +++ b/apps/remix-ide/src/app/tabs/compile-tab.js @@ -124,7 +124,9 @@ class CompileTab extends CompilerApiMixin(ViewPlugin) { // implements ICompilerA path: [], pattern: [] }) - this.currentFile = await this.call('fileManager', 'file') + try { + this.currentFile = await this.call('fileManager', 'file') + } catch (error) {} } getCompilerParameters () { From 8e34d6665fc7f79d182b7480137beed16c8129f1 Mon Sep 17 00:00:00 2001 From: bunsenstraat Date: Wed, 6 Oct 2021 11:06:11 +0200 Subject: [PATCH 3/6] Update compile-tab.js --- apps/remix-ide/src/app/tabs/compile-tab.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/apps/remix-ide/src/app/tabs/compile-tab.js b/apps/remix-ide/src/app/tabs/compile-tab.js index c3c3ccc608..44760baf31 100644 --- a/apps/remix-ide/src/app/tabs/compile-tab.js +++ b/apps/remix-ide/src/app/tabs/compile-tab.js @@ -126,7 +126,9 @@ class CompileTab extends CompilerApiMixin(ViewPlugin) { // implements ICompilerA }) try { this.currentFile = await this.call('fileManager', 'file') - } catch (error) {} + } catch (error) { + if (error.message !== 'Error: No such file or directory No file selected') throw new Error(error.message) + } } getCompilerParameters () { From 730994ec75065777300cebd1c8252bb25c10329f Mon Sep 17 00:00:00 2001 From: bunsenstraat Date: Wed, 6 Oct 2021 12:21:09 +0200 Subject: [PATCH 4/6] Update compile-tab.js --- apps/remix-ide/src/app/tabs/compile-tab.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/remix-ide/src/app/tabs/compile-tab.js b/apps/remix-ide/src/app/tabs/compile-tab.js index 44760baf31..19d2b72597 100644 --- a/apps/remix-ide/src/app/tabs/compile-tab.js +++ b/apps/remix-ide/src/app/tabs/compile-tab.js @@ -127,7 +127,7 @@ class CompileTab extends CompilerApiMixin(ViewPlugin) { // implements ICompilerA try { this.currentFile = await this.call('fileManager', 'file') } catch (error) { - if (error.message !== 'Error: No such file or directory No file selected') throw new Error(error.message) + if (error.message !== 'Error: No such file or directory No file selected') throw error } } From 72293af367b570e84a7d62c587bce091a0f6b008 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 6 Oct 2021 06:45:59 +0000 Subject: [PATCH 5/6] Bump merge from 1.2.1 to 2.1.1 Bumps [merge](https://github.com/yeikos/js.merge) from 1.2.1 to 2.1.1. - [Release notes](https://github.com/yeikos/js.merge/releases) - [Commits](https://github.com/yeikos/js.merge/compare/v1.2.1...v2.1.1) Signed-off-by: dependabot[bot] --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index cfe4438483..e1bbaadea1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -31110,9 +31110,9 @@ } }, "merge": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/merge/-/merge-1.2.1.tgz", - "integrity": "sha512-VjFo4P5Whtj4vsLzsYBu5ayHhoHJ0UqNm7ibvShmbmoz7tGi0vXaoJbGdB+GmDMLUdg8DpQXEIeVDAe8MaABvQ==" + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/merge/-/merge-2.1.1.tgz", + "integrity": "sha512-jz+Cfrg9GWOZbQAnDQ4hlVnQky+341Yk5ru8bZSe6sIDTCIg8n9i/u7hSQGSVOF3C7lH6mGtqjkiT9G4wFLL0w==" }, "merge-descriptors": { "version": "1.0.1", diff --git a/package.json b/package.json index e9657a347e..1ec51a58e7 100644 --- a/package.json +++ b/package.json @@ -170,7 +170,7 @@ "jquery": "^3.3.1", "jszip": "^3.6.0", "latest-version": "^5.1.0", - "merge": "^1.2.0", + "merge": "^2.1.1", "npm-install-version": "^6.0.2", "react": "^17.0.2", "react-beautiful-dnd": "^13.1.0", From 53fd224a76089a3b7d47042676c6702f65c58a62 Mon Sep 17 00:00:00 2001 From: Admin Date: Wed, 6 Oct 2021 18:52:05 +0530 Subject: [PATCH 6/6] fixed empty hhLogs array in result --- libs/remix-tests/src/testRunner.ts | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/libs/remix-tests/src/testRunner.ts b/libs/remix-tests/src/testRunner.ts index c3b59480d0..102dae0bf5 100644 --- a/libs/remix-tests/src/testRunner.ts +++ b/libs/remix-tests/src/testRunner.ts @@ -251,7 +251,6 @@ export function runTest (testName: string, testObject: any, contractDetails: Com method.call(sendParams).then(async (result) => { const time = (Date.now() - startTime) / 1000.0 let tagTxHash - let hhLogs if (web3.eth && web3.eth.getHashFromTagBySimulator) tagTxHash = await web3.eth.getHashFromTagBySimulator(tagTimestamp) if (web3.eth && web3.eth.getHHLogsForTx) hhLogs = await web3.eth.getHHLogsForTx(tagTxHash) if (result) { @@ -262,7 +261,7 @@ export function runTest (testName: string, testObject: any, contractDetails: Com time: time, context: testName } - if (hhLogs) resp.hhLogs = hhLogs + if (hhLogs && hhLogs.length) resp.hhLogs = hhLogs testCallback(undefined, resp) passingNum += 1 timePassed += time @@ -275,7 +274,7 @@ export function runTest (testName: string, testObject: any, contractDetails: Com errMsg: 'function returned false', context: testName } - if (hhLogs) resp.hhLogs = hhLogs + if (hhLogs && hhLogs.length) resp.hhLogs = hhLogs testCallback(undefined, resp) failureNum += 1 timePassed += time @@ -325,7 +324,7 @@ export function runTest (testName: string, testObject: any, contractDetails: Com location, web3 } - if (hhLogs) resp.hhLogs = hhLogs + if (hhLogs && hhLogs.length) resp.hhLogs = hhLogs testCallback(undefined, resp) failureNum += 1 timePassed += time @@ -344,11 +343,11 @@ export function runTest (testName: string, testObject: any, contractDetails: Com time: time, context: testName } - if (hhLogs) resp.hhLogs = hhLogs + if (hhLogs && hhLogs.length) resp.hhLogs = hhLogs testCallback(undefined, resp) passingNum += 1 timePassed += time - } else if (hhLogs) { + } else if (hhLogs && hhLogs.length) { const resp: TestResultInterface = { type: 'logOnly', value: changeCase.sentenceCase(func.name), @@ -380,7 +379,7 @@ export function runTest (testName: string, testObject: any, contractDetails: Com if (err.message.includes('Transaction has been reverted by the EVM')) { const txHash = JSON.parse(err.message.replace('Transaction has been reverted by the EVM:', '')).transactionHash if (web3.eth && web3.eth.getHHLogsForTx) hhLogs = await web3.eth.getHHLogsForTx(txHash) - if (hhLogs) resp.hhLogs = hhLogs + if (hhLogs && hhLogs.length) resp.hhLogs = hhLogs } testCallback(undefined, resp) failureNum += 1