Skip to content
This repository has been archived by the owner on Feb 26, 2024. It is now read-only.

Feat/upgrade electron #2813

Merged
merged 4 commits into from
Nov 3, 2022
Merged

Conversation

KeKo6988
Copy link
Contributor

@KeKo6988 KeKo6988 commented Jun 21, 2021

Upgrade Electron to 12.0.2, which now supports Apple M1! (as of Electron 11).

Brings with it changes to support Corda, which will be reverted in revert/corda once this makes it's way into develop

@jeffsmale90 jeffsmale90 changed the base branch from alpha to beta October 29, 2022 09:38
@@ -219,7 +219,8 @@ app.on('ready', async () => {
icon: getIconPath(),
webPreferences: {
nodeIntegration: true,
enableRemoteModule:true
contextIsolation: false,
enableRemoteModule: true
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In Electron 10, the remote module is now disabled by default.

@@ -219,7 +219,8 @@ app.on('ready', async () => {
icon: getIconPath(),
webPreferences: {
nodeIntegration: true,
enableRemoteModule:true
contextIsolation: false,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In Electron 12, contextIsolation will be enabled by default.

@@ -67,7 +67,7 @@
"node-fetch": "2.6.0",
"node-localstorage": "^2.1.6",
"node-ssh": "7.0.0",
"pg": "7.14.0",
"pg": "8.6.0",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is to support Corda, I'll undo this change in revert/corda branch

@@ -57,7 +57,7 @@

.LoaderProgress {
position: absolute;
margin-top: 7em;
margin-top: 15em;
Copy link
Contributor

@jeffsmale90 jeffsmale90 Oct 29, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is to support Corda, I'll look into this in revert/corda branch

@jeffsmale90 jeffsmale90 linked an issue Oct 29, 2022 that may be closed by this pull request
@jeffsmale90 jeffsmale90 merged commit c6576ad into trufflesuite:beta Nov 3, 2022
jeffsmale90 added a commit that referenced this pull request Nov 7, 2022
* add support for debugging the renderer process in vscode

* get the most basic filecoin integration to bootup

* fix default workspace saving (fixes bug introduced in #1716)

* fix filecoin startup issues

* fix issues with connecting to filecoin and get correct values

* prevent SET_SERVER_STARTED from running twice

* update deals and files topnav icons

* change https to http for ipfs url

* fix filecoin logging

* update dependencies

* update dependencies

* fix issues with connecting to filecoin and get correct values

* implement accounts page for filecoin

* rename tx count to msg count

* initial implementation for filecoin configuration

* implement tipset screen and tipset detail pages

* fix odd orange border

* implement blocks detail page

* revert change to the wrong flavor scss file

* initial implementation of messages pages

* use current block for message card if we have it

* continue to request earlier blocks until we get to genesis or page size

* implement deals screen

* implement file pages

* add ipfs-http-client dependency

* implement search for filecoin

* get new workspace screen to work

* separate IPC handlers in init/Core.js

* add comments about debugging the renderer process in vscode

* add "hack"  to render the IPFS port error under the correct div

* center logo in loader screen

* add margin to prevent msg count touching index

* add margin to the no messages/transactions in only the block card

* add min-width to files screen to add better formatting

* fix deals list updating for new deals

* add polling to periodically update the files screen

* fix page fetching scroll issues

* fix tipset requestNextPage function from copapasta error

* fix tipsetlist loading new tipsets

* set the filename on download to the file.name if it's set

* fix corda loader progress positioning since the logo got taller

* update filecoin initialization based on new core initialize functionality

* update lotus-client-rpc to official repo

* revert loader progress change

* add dependencies to static/node

* update ganache dependencies

* 2.6.0-beta.0

* 2.6.0-beta.1

* temporarily export secrets from travis

* get correct key

* make sure to create a new workspace when we click the save button

* make sure the filecoin seed gets saved when saving quickstart

* make sure we clean quickstart each time

* disable quickstart quick save for non-corda flavors

* Revert "get correct key"

This reverts commit 11c84a2.

* Revert "temporarily export secrets from travis"

This reverts commit dd7b7ea.

* update ganache core versions for filecoin

* 2.6.0-beta.2

* change error message string to match update in core

* remove now-redundant stop/reset

* 2.6.0-beta.3

* feat: upgrade electron to 12.0.2(#2813)

Co-authored-by: Mike Seese <seesemichaelj@gmail.com>
Co-authored-by: Kerim <78958583+KeKo6988@users.noreply.github.com>
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Upgrade electron
6 participants