Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: OTA and improved update experience #281

Closed
wants to merge 84 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
84 commits
Select commit Hold shift + click to select a range
f65d8da
feat: Add NotifyRewards component for displaying reward notifications
mohandast52 May 28, 2024
89333a8
chore: Update NotifyRewards component to use constant for modal width
mohandast52 May 28, 2024
f82cacd
feat: Add NotifyUpdateInstallation component for displaying update in…
mohandast52 May 28, 2024
6484614
chore: Update NotifyUpdateInstallation component to include image and…
mohandast52 May 28, 2024
aa93123
chore: Update NotifyUpdateInstallation component to include image and…
mohandast52 May 28, 2024
90dff46
chore: Add isUpdateAvailable property to ElectronStore
mohandast52 May 28, 2024
4ebeedc
chore: Add downloadPercentage property to ElectronStore and UpdatePro…
mohandast52 May 28, 2024
bdce578
chore: Update NotifyUpdateInstallation component to use UpdateInstall…
mohandast52 May 28, 2024
75280bc
chore: Update Electron API to start download and install update
mohandast52 May 28, 2024
1dc8181
trying using useInterval
mohandast52 May 28, 2024
c61a401
use ipcRendered on and removeAllListener functions
mohandast52 May 28, 2024
35d872a
chore: Add downloadPercentage property to ElectronStore and UpdatePro…
mohandast52 May 28, 2024
2e7061b
chore: Update NotifyUpdateInstallationModal component to replace Upda…
mohandast52 May 28, 2024
79997e5
chore: Refactor NotifyRewards component to use updated useElectronApi…
mohandast52 May 28, 2024
fa9b6bf
chore: Update Electron API to handle download and installation of upd…
mohandast52 May 28, 2024
77e847b
chore: add removeAllListeners function in preload
mohandast52 May 28, 2024
78e640f
updates
mohandast52 May 28, 2024
a126e99
chore: Update NotifyUpdateInstallationModal to handle update download…
mohandast52 May 28, 2024
ddbb645
update text
mohandast52 May 28, 2024
87dc6f5
merge main
mohandast52 May 29, 2024
31d4fa8
chore: Remove unused message import in NotifyUpdateInstallationModal.tsx
mohandast52 May 29, 2024
dbbe25b
conflict fixes
mohandast52 May 31, 2024
20349ba
merge develop
mohandast52 Jun 3, 2024
90d8aef
(WIP) Fix public OTA
Jun 3, 2024
d39cafb
update dependencies, linting .etc
Jun 4, 2024
ab2a260
chore: Remove mac updater from electron main.js
Jun 4, 2024
6241e1d
chore: Update package version to "0.0.1-ota"
truemiller Jun 5, 2024
a9c3b6f
omit token from macupdater options
truemiller Jun 5, 2024
34a3d98
chore: Update package version to "0.0.1"
truemiller Jun 5, 2024
94bb00b
feat: Update electron-updater options in main.js and publishOptions.js
truemiller Jun 5, 2024
479f87d
chore: Remove unused token from electron-updater options
truemiller Jun 5, 2024
d831baa
chore: Update macUpdater import in electron/main.js
truemiller Jun 5, 2024
669819f
chore: Update publishOptions.js to include GH_TOKEN
truemiller Jun 5, 2024
8c09cdd
chore: Refactor electron/update.js to use updated electron-updater op…
truemiller Jun 5, 2024
3dd615c
Refactor electron/update.js to use updated electron-updater options
truemiller Jun 5, 2024
38ca160
Refactor electron/update.js to use updated electron-updater options
truemiller Jun 5, 2024
e73b566
Refactor electron/update.js to use updated electron-updater options
truemiller Jun 5, 2024
874030c
Refactor electron/update.js to use updated electron-updater options
truemiller Jun 5, 2024
3a72564
chore: Bump package version to "0.1.0-rc34.2"
truemiller Jun 5, 2024
e3afe76
chore: Bump package version to "0.1.0-rc34.3"
truemiller Jun 5, 2024
75202a7
chore: Update import path for githubPublishOptions in build.js
truemiller Jun 5, 2024
cc897b0
chore: Bump package version to "0.1.0-rc34.2"
truemiller Jun 5, 2024
4934a50
chore: Bump package version to "0.1.0-rc34.3"
truemiller Jun 5, 2024
6c97775
Merge remote-tracking branch 'origin/main' into josh/public-ota
truemiller Jun 5, 2024
d779f1b
fix eslint conflicts
truemiller Jun 5, 2024
1743e27
conflict fixes
mohandast52 Jun 6, 2024
9421fc9
chore: Remove code to update automatically
mohandast52 Jun 6, 2024
9f9b6e6
--no-edit
mohandast52 Jun 6, 2024
413e331
chore: Update MainHeader component with new constants and modal width
mohandast52 Jun 7, 2024
635f3f1
merge
truemiller Jun 12, 2024
17fa130
Merge pull request #166 from valory-xyz/josh/public-ota
truemiller Jun 12, 2024
55baa87
chore: Bump package version to 0.1.0-rc45
mohandast52 Jun 12, 2024
7b8b11f
chore: Update package version to 0.1.0-rc40.1
mohandast52 Jun 12, 2024
cd87ef3
chore: Update package version to 0.1.0-rc40.1
mohandast52 Jun 12, 2024
fa851b5
chore: Update package version to 0.1.0-rc40.2
mohandast52 Jun 12, 2024
a8af393
Merge remote-tracking branch 'origin/main' into mohan/improve-update-…
truemiller Jul 10, 2024
f02f18b
chore: Update electron-updater to version 6.3.0-alpha.7
truemiller Jul 10, 2024
9d7af98
chore: remove old shell scripts
truemiller Jul 10, 2024
4f65784
chore: remove old files
truemiller Jul 10, 2024
634c858
chore: convert to module js for ES6 imports
truemiller Jul 10, 2024
10c2091
chore: use item title as key, not index
truemiller Jul 10, 2024
d7dee41
chore: resolve broken imports post merge
truemiller Jul 10, 2024
e58d054
chore: resolve broken import post merge
truemiller Jul 10, 2024
ae791ac
chore: set correct dependencies
truemiller Jul 10, 2024
e5d6709
feat: integrated check-for-updates ipc, seperated configs for OTA and…
truemiller Jul 11, 2024
37b05fe
Merge remote-tracking branch 'origin/main' into mohan/improve-update-…
truemiller Jul 11, 2024
f44b7c7
chore: numerous updates and tests
truemiller Jul 11, 2024
34825dd
chore: refactor tray icons
truemiller Jul 12, 2024
205d7d5
refactor: update main window creation logic
truemiller Jul 14, 2024
59faaa3
chore: Update electronAPI in preload.mjs
truemiller Jul 14, 2024
3744c6a
refactor: Rename NotifyRewards component to RewardsModal
truemiller Jul 14, 2024
fa80817
chore: update check-for-updates function name in SettingsMain component
truemiller Jul 14, 2024
5387281
feat: Add UpdateModal component for displaying update availability an…
truemiller Jul 14, 2024
55f688e
chore: Update checkForUpdates function name in ElectronApiProvider
truemiller Jul 14, 2024
707fd93
chore: Update app height on resize for Electron integration
truemiller Jul 14, 2024
92ef9b0
chore: Update ESLint configuration
truemiller Jul 14, 2024
83c8ed4
chore: Update npm dependencies and ESLint configuration
truemiller Jul 14, 2024
6acd6b2
chore: dock head png
truemiller Jul 14, 2024
5662557
chore: fix dependencies
truemiller Jul 14, 2024
636c544
feat: lots of changes
truemiller Jul 15, 2024
1a3db4b
chore: Update npm dependencies and ESLint configuration
truemiller Jul 15, 2024
173f527
Merge remote-tracking branch 'origin/staging' into josh/improve-updat…
truemiller Aug 14, 2024
26beaaf
chore: update lock and reorder scripts
truemiller Aug 14, 2024
93aa4ba
chore: Update import paths and remove unused imports in install.js an…
truemiller Aug 15, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions .env.example
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
NODE_ENV=development

# RPCs
FORK_URL=
NODE_ENV=
DEV_RPC=
STAKING_TEST_KEYS_PATH=

IS_STAGING=
STAKING_TEST_KEYS_PATH=

# For testing updater
TEST_GITHUB_TOKEN=
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,8 @@ jobs:
env:
NODE_ENV: production
DEV_RPC: https://rpc-gate.autonolas.tech/gnosis-rpc/
IS_STAGING: ${{ github.ref != 'refs/heads/main' && 'true' || 'false' }}
FORK_URL: https://rpc-gate.autonolas.tech/gnosis-rpc/
IS_STAGING: ${{ github.ref != 'refs/heads/main' && 'true' || 'false' }}
- run: rm -rf /dist
- name: "Build, notarize, publish"
env:
Expand Down
22 changes: 10 additions & 12 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,19 +1,18 @@
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.

# dependencies
/node_modules
/.pnp
node_modules/
.pnp
.pnp.js
.yarn/install-state.gz
frontend/node_modules
.yarn

# next.js
frontend/.next/
frontend/out/
frontend/.swc/
.next
out
.swc

# production
frontend/build
build

# local env files
.env
Expand All @@ -33,17 +32,16 @@ tmp/
temp/

!operate/data
electron/.next

dist/
build/
dist
build

cache
leak_report

*.dist
*.build
/electron/bins/
bins

# logs
*.log
52 changes: 0 additions & 52 deletions build.tester.js

This file was deleted.

4 changes: 4 additions & 0 deletions electron/.eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
.next
bins
*.yml
*.plist
53 changes: 40 additions & 13 deletions electron/.eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,23 @@
{
"extends": ["eslint:recommended", "plugin:prettier/recommended"],
"plugins": ["prettier"],
"ignorePatterns": [".next/"],
"env": {
"es6": true,
"node": true
},
"extends": [
"eslint:recommended"
],
"parserOptions": {
"ecmaVersion": "latest",
"sourceType": "module"
},
"plugins": [
"prettier",
"unused-imports",
"simple-import-sort",
"paths"
],
"rules": {
"no-unused-vars": "off", // Turn off the default no-unused-vars rule
"prettier/prettier": [
"error",
{
Expand All @@ -11,14 +26,26 @@
"singleQuote": true
}
],
"no-unused-vars": ["warn", { "argsIgnorePattern": "^_" }]
},
"parserOptions": {
"ecmaVersion": "latest",
"commonjs": true
},
"env": {
"node": true,
"es6": true
"simple-import-sort/exports": "error",
"simple-import-sort/imports": "error",
"unused-imports/no-unused-imports": "error",
"unused-imports/no-unused-vars": [
"warn",
{
"args": "after-used",
"argsIgnorePattern": "^_",
"ignoreRestSiblings": true,
"vars": "all",
"varsIgnorePattern": "^_"
}
],
"paths/alias": [
"error",
{
"config": {
"jsconfig": "./jsconfig.json"
}
}
]
}
}
}
25 changes: 0 additions & 25 deletions electron/afterPack.js

This file was deleted.

5 changes: 5 additions & 0 deletions electron/app-update.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
provider: github
owner: valory-xyz
repo: olas-operate-app
channel: latest
releaseType: release
55 changes: 0 additions & 55 deletions electron/constants/index.js

This file was deleted.

30 changes: 0 additions & 30 deletions electron/icons.js

This file was deleted.

14 changes: 14 additions & 0 deletions electron/jsconfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"compilerOptions": {
"target": "ESNext",
"baseUrl": ".",
"module": "NodeNext",
"moduleResolution": "NodeNext"
},
"exclude": [
"node_modules",
".next",
"bins",
"dist"
]
}
42 changes: 42 additions & 0 deletions electron/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
{
"author": "josh miller <[email protected]>",
"dependencies": {
"adm-zip": "^0.5.12",
"axios": "^1.7.2",
"child_process": "^1.0.2",
"dotenv": "^16.4.5",
"electron-log": "^5.1.5",
"electron-store": "^9.0.0",
"electron-updater": "^6.3.0-alpha.4",
"net": "^1.0.2",
"next": "^14.2.3",
"ps-tree": "^1.2.0",
"sudo-prompt": "9.2.1",
"winston": "^3.13.0"
},
"description": "Electron app for operating Olas Pearl.",
"devDependencies": {
"@electron/notarize": "^2.3.0",
"dotenv-cli": "^7.4.2",
"electron": "30.0.6",
"electron-builder": "^24.12.0",
"eslint": "^8.56.0",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-import": "^2.29.1",
"eslint-plugin-paths": "^1.0.8",
"eslint-plugin-prettier": "^5.1.3",
"eslint-plugin-simple-import-sort": "^12.0.0",
"eslint-plugin-unused-imports": "^3.0.0",
"prettier": "^3.2.5"
},
"license": "MIT",
"main": "src/main.js",
"name": "olas-operate-app",
"productName": "Pearl",
"scripts": {
"lint": "eslint .",
"start": "electron ."
},
"type": "module",
"version": "0.1.0-rc72"
}
Loading
Loading