From 61d10b05bbe0842ae7bd51358e1b387f80fbd63b Mon Sep 17 00:00:00 2001 From: omahs <73983677+omahs@users.noreply.github.com> Date: Thu, 23 Mar 2023 23:54:20 +0100 Subject: [PATCH 1/6] docs: fix typos in readme (#5348) --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 3063045d1..982cf8e87 100644 --- a/README.md +++ b/README.md @@ -80,7 +80,7 @@ This will create a signed `.dmg` file in `./out/make`. #### On Linux: -Bulding on Linux will create a `.AppImage` file, meant to run on many versions of Linux. +Building on Linux will create a `.AppImage` file, meant to run on many versions of Linux. Linux requires no signing keys, so there's no set up. Simply run the following command: @@ -105,11 +105,11 @@ Note from the author: I found managing these assets manually -- especially the a ### Flavored Development -"Extras" aren't stored here in this repository fordue to file size issues, licensing issues, or both. +"Extras" aren't stored here in this repository due to file size issues, licensing issues, or both. Non-ethereum "flavored" Ganache extras are uploaded to releases here: https://github.com/trufflesuite/ganache-flavors/releases -When "extras" change they should be uploaded to a new release, and a corresonding Ganache release that targets the new ganache-flavors release (see `common/extras/index.js` for what you'dd need to update) +When "extras" change they should be uploaded to a new release, and a corresponding Ganache release that targets the new ganache-flavors release (see `common/extras/index.js` for what you'd need to update) ### VS Code Debugging From f4142f99cefa4a990c92a5745c6bbbdfe1c7e813 Mon Sep 17 00:00:00 2001 From: jeffsmale90 <6363749+jeffsmale90@users.noreply.github.com> Date: Wed, 29 Mar 2023 11:00:58 +1300 Subject: [PATCH 2/6] Correctly handle errors from transaction decoder (#5341) We now correctly resolve the promise with undefined, causing the caller to display the raw log object. --- .../ethereum/common/services/TruffleIntegrationService.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/integrations/ethereum/common/services/TruffleIntegrationService.js b/src/integrations/ethereum/common/services/TruffleIntegrationService.js index b2cf5681e..0ea5a2eb3 100644 --- a/src/integrations/ethereum/common/services/TruffleIntegrationService.js +++ b/src/integrations/ethereum/common/services/TruffleIntegrationService.js @@ -185,10 +185,12 @@ class TruffleIntegrationService extends EventEmitter { return new Promise((resolve, reject) => { if (this.child !== null && this.child.connected) { this.once("decode-transaction-response", data => { - if (typeof data === "object") { - resolve(data); + if (data && data.error) { + reject(data.error); } else { - reject(data); + // data may be `undefined`, in which case the raw event will be displayed + // see https://github.com/trufflesuite/ganache-ui/issues/3805 for details + resolve(data); } }); From facc39bc44055796359b83f9b7007b3f8ebd778f Mon Sep 17 00:00:00 2001 From: jeffsmale90 <6363749+jeffsmale90@users.noreply.github.com> Date: Wed, 29 Mar 2023 11:01:45 +1300 Subject: [PATCH 3/6] Correctly handle errors from event decoder (#5332) We now correctly resolve the Promise with undefined, causing the caller to use the raw log object (displaying as "Encoded Event") --- .../ethereum/common/services/TruffleIntegrationService.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/integrations/ethereum/common/services/TruffleIntegrationService.js b/src/integrations/ethereum/common/services/TruffleIntegrationService.js index 0ea5a2eb3..340c88646 100644 --- a/src/integrations/ethereum/common/services/TruffleIntegrationService.js +++ b/src/integrations/ethereum/common/services/TruffleIntegrationService.js @@ -165,10 +165,12 @@ class TruffleIntegrationService extends EventEmitter { return new Promise((resolve, reject) => { if (this.child !== null && this.child.connected) { this.once("decode-event-response", data => { - if (typeof data === "object") { - resolve(data); + if (data && data.error) { + reject(data.error); } else { - reject(data); + // data may be `undefined`, in which case the raw event will be displayed + // see https://github.com/trufflesuite/ganache-ui/issues/5296 for details + resolve(data); } }); this.child.send({ From 23fa12f7541dbfd3b1774f189684dc633d6b31fb Mon Sep 17 00:00:00 2001 From: jeffsmale90 <6363749+jeffsmale90@users.noreply.github.com> Date: Thu, 30 Mar 2023 14:09:52 +1300 Subject: [PATCH 4/6] Bump version 2.7.1 (#5373) --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 3148b705b..537fea6a4 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "@ganache/ui", "productName": "Ganache", - "version": "2.7.0", + "version": "2.7.1", "description": "Personal Blockchain for Ethereum", "repository": { "type": "git", From e913d3cc182ef4a8b4142a8042576c69bbfa3621 Mon Sep 17 00:00:00 2001 From: jeffsmale90 <6363749+jeffsmale90@users.noreply.github.com> Date: Thu, 30 Mar 2023 14:13:50 +1300 Subject: [PATCH 5/6] Add -beta suffix (#5375) --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 537fea6a4..e9278c06a 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "@ganache/ui", "productName": "Ganache", - "version": "2.7.1", + "version": "2.7.1-beta", "description": "Personal Blockchain for Ethereum", "repository": { "type": "git", From 3b787049230fd6320c59b782f08ac672783b971d Mon Sep 17 00:00:00 2001 From: Jeff Smale <6363749+jeffsmale90@users.noreply.github.com> Date: Tue, 11 Apr 2023 12:51:48 +1200 Subject: [PATCH 6/6] Version bump --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e9278c06a..537fea6a4 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "@ganache/ui", "productName": "Ganache", - "version": "2.7.1-beta", + "version": "2.7.1", "description": "Personal Blockchain for Ethereum", "repository": { "type": "git",