ESR Process Handler experimental changes

README.md

@@ -33,12 +33,12 @@ When downloading from either location, check the URL bar of your browser to ensu
 
 ### Current Release
 
-The most recent (v1.3.12) release can downloaded using these links:
+The most recent (v1.3.13-test1) release can downloaded using these links:
 
-- [Windows Installer](https://github.com/greymass/anchor/releases/download/v1.3.12/win-anchor-wallet-1.3.12.exe)
-- [macOS Package](https://github.com/greymass/anchor/releases/download/v1.3.12/mac-anchor-wallet-1.3.12-x64.dmg)
-- [Linux (deb)](https://github.com/greymass/anchor/releases/download/v1.3.12/linux-anchor-wallet-1.3.12-amd64.deb)
-- [Linux (AppImage)](https://github.com/greymass/anchor/releases/download/v1.3.12/linux-anchor-wallet-1.3.12-x86_64.AppImage)
+- [Windows Installer](https://github.com/greymass/anchor/releases/download/v1.3.13-test1/win-anchor-wallet-1.3.13-test1.exe)
+- [macOS Package](https://github.com/greymass/anchor/releases/download/v1.3.13-test1/mac-anchor-wallet-1.3.13-test1-x64.dmg)
+- [Linux (deb)](https://github.com/greymass/anchor/releases/download/v1.3.13-test1/linux-anchor-wallet-1.3.13-test1-amd64.deb)
+- [Linux (AppImage)](https://github.com/greymass/anchor/releases/download/v1.3.13-test1/linux-anchor-wallet-1.3.13-test1-x86_64.AppImage)
 
 The latest release will always be available on the releases page of this repository:
 

app/main/main.dev.js

@@ -85,7 +85,7 @@ if (!lock) {
         uri.startsWith('esr-anchor:') ||
         uri.startsWith('anchorcreate:')
       ) {
-        handleUri(resourcePath, store, mainWindow, pHandler, uri);
+        handleUri(mainWindow, pHandler, uri);
       }
     } else {
       showManager();
@@ -122,7 +122,7 @@ app.on('ready', async () => {
   if (uri) {
     if (uri.startsWith('esr') || uri.startsWith('anchorcreate')) {
       setTimeout(() => {
-        handleUri(resourcePath, store, mainWindow, pHandler, uri);
+        handleUri(mainWindow, pHandler, uri);
       }, 2000);
     }
   }
@@ -134,7 +134,7 @@ app.on('activate', (e, hasVisibleWindows) => {
 app.on('open-url', (e, url) => {
   if (pHandler) {
     if (url.startsWith('esr') || url.startsWith('anchorcreate')) {
-      handleUri(resourcePath, store, mainWindow, pHandler, url);
+      handleUri(mainWindow, pHandler, url);
     }
   } else {
     uri = url;
@@ -222,7 +222,8 @@ const initSessionManager = async () => {
       sHandler.manager.disconnect();
     }
     // Create new Session Manager
-    sHandler = new SessionManager(store, pHandler);
+    const { sessions, settings } = store.getState();
+    sHandler = new SessionManager(sessions, settings);
     // Connect the session manager
     sHandler.manager.connect();
     // Release the lock
@@ -322,7 +323,7 @@ function showHandler() {
 
 // Allow ESR Requests from the UI
 ipcMain.on('openUri', (event, data) => {
-  handleUri(resourcePath, store, mainWindow, pHandler, data);
+  handleUri(mainWindow, pHandler, data);
 });
 
 // Session management IPC handlers
@@ -430,3 +431,5 @@ global.setAlternativePayment = setAlternativePayment;
 global.initSessionManager = initSessionManager;
 global.initHardwareLedger = initHardwareLedger;
 global.showManager = showManager;
+global.handleUri = data => handleUri(mainWindow, pHandler, data);
+global.storeDispatch = data => store.dispatch(data);

app/modules/main/electron/index.js

@@ -11,7 +11,14 @@ const path = require('path');
 
 let ui;
 
-const createInterface = (resourcePath, route = '/', closable = true, store, uri = false, pHandler = false) => {
+const createInterface = (
+  resourcePath,
+  route = '/',
+  closable = true,
+  store,
+  uri = false,
+  pHandler = false
+) => {
   log.info('wallet ui: creating');
 
   const uiStateKeeper = windowStateKeeper(store);
@@ -32,14 +39,14 @@ const createInterface = (resourcePath, route = '/', closable = true, store, uri
       nodeIntegration: true,
       contextIsolation: false,
       enableRemoteModule: true,
-    }
+    },
   });
 
   uiStateKeeper.track(ui);
 
   ui.loadURL(`file://${path.join(resourcePath, 'renderer/main/index.html')}#${route}`);
 
-  ui.on('page-title-updated', (e) => {
+  ui.on('page-title-updated', e => {
     e.preventDefault();
   });
 
@@ -62,7 +69,7 @@ const createInterface = (resourcePath, route = '/', closable = true, store, uri
     }
     // Launch + Load URI, if exists
     if (uri && pHandler) {
-      handleUri(resourcePath, store, ui, pHandler, uri);
+      handleUri(ui, pHandler, uri);
     }
   });
 

app/package.json

@@ -1,7 +1,7 @@
 {
   "name": "anchor-wallet",
   "productName": "Anchor Wallet",
-  "version": "1.3.12",
+  "version": "1.3.13-test1",
   "description": "An Antelope Light Wallet with simple tools for basic activities and advanced tools for power users.",
   "main": "./main.prod.js",
   "author": {

app/renderer/assets/locales/de-DE/common.json

@@ -1,7 +1,7 @@
 {
   "account_authority": "Account/Authority",
   "application_name": "Anchor",
-  "application_version": "v1.3.12",
+  "application_version": "v1.3.13-test1",
   "back": "Back",
   "block_height": "Block Height",
   "blockchain": "Blockchain",

app/renderer/assets/locales/el-GR/common.json

@@ -1,7 +1,7 @@
 {
   "account_authority": "Account/Authority",
   "application_name": "Anchor",
-  "application_version": "v1.3.12",
+  "application_version": "v1.3.13-test1",
   "back": "Back",
   "block_height": "Block Height",
   "blockchain": "Blockchain",

app/renderer/assets/locales/en-US/common.json

@@ -1,7 +1,7 @@
 {
   "account_authority": "Account/Authority",
   "application_name": "Anchor",
-  "application_version": "v1.3.12",
+  "application_version": "v1.3.13-test1",
   "back": "Back",
   "block_height": "Block Height",
   "blockchain": "Blockchain",

app/renderer/assets/locales/en-US/global.json

@@ -93,7 +93,7 @@
   "global_account_import_private_cold_wallet_header": "Cold Wallet",
   "global_account_import_private_cold_wallet_subheader": "A wallet designed to work on an offline computer acting as a cold storage device.",
   "global_account_import_private_description": "To import additional accounts, simply enter the private key. The app will convert it to a public key and lookup all accounts with relevant permissions.",
-  "global_account_import_private_key": "Private Key (51 characters and starts with the number 5)",
+  "global_account_import_private_key": "Private Key (starts with the number 5 or PVT_)",
   "global_account_import_private_requires_hash_button": "Setup Password",
   "global_account_import_private_requires_hash_description": "Please enter a password of your choosing and keep it safe. This password cannot be recovered and is not stored anywhere within the app.",
   "global_account_import_private_requires_hash_header": "No wallet password established.",
@@ -306,7 +306,7 @@
   "global_account_import_welcome_subheader_one": "Anchor will automatically query the {{connectionChain}} blockchains for accounts matching your known public keys.",
   "global_account_import_welcome_paragraph": "Scanning will be enabled after one key pair is saved.",
   "global_account_import_welcome_button_one": "Scan for Accounts",
-  "global_account_import_welcome_header_two":"Import an existing account",
+  "global_account_import_welcome_header_two": "Import an existing account",
   "global_account_import_welcome_subheader_two": "Configure Anchor to use existing accounts on this blockchain.",
   "global_account_import_welcome_button_two": "Import an existing Account",
   "global_account_import_welcome_header_three": "Create a new account",

app/renderer/assets/locales/en-US/welcome.json

@@ -41,15 +41,15 @@
   "welcome_key_coldwallet": "Import Private Key",
   "welcome_key_coldwallet_content": "A cold wallet cannot verify if the private key provided is matching the account.",
   "welcome_key_coldwallet_title": "Cold Wallet - Key Import",
-  "welcome_key_compare_content_text": "All EOSIO keys start with the number 5 and are 51 characters long.",
+  "welcome_key_compare_content_text": "All EOSIO keys start with the number 5 or PVT_.",
   "welcome_key_compare_expecting_match_to": "Expecting a private key that matches one of the below keys.",
   "welcome_key_compare_fail_invalid_content": "The private key you entered cannot be converted to a public key.",
   "welcome_key_compare_fail_invalid_title": "Private key invalid",
   "welcome_key_compare_fail_match_content": "The private key you entered yields the following public key which does not match the expected key above.",
   "welcome_key_compare_fail_match_title": "Private key does not match",
   "welcome_key_compare_matches_content": "Key Match",
   "welcome_key_compare_matches_title": "The private key entered matches the public key on the accounts permissions.",
-  "welcome_key_compare_placeholder": "Begins with the number 5 and is 51 characters long",
+  "welcome_key_compare_placeholder": "Begins with the number 5 or PVT_",
   "welcome_key_compare_title": "Hint: Private Keys",
   "welcome_key_compare_visible": "Show private key",
   "welcome_key_sign_tx": "Enable wallet signing operations?",

app/renderer/assets/locales/es-ES/common.json

@@ -1,7 +1,7 @@
 {
   "account_authority": "Account/Authority",
   "application_name": "Anchor",
-  "application_version": "v1.3.12",
+  "application_version": "v1.3.13-test1",
   "back": "Atrás",
   "block_height": "Altura del bloque",
   "blockchain": "Blockchain",

app/renderer/assets/locales/et-EE/common.json

@@ -1,7 +1,7 @@
 {
   "account_authority": "Account/Authority",
   "application_name": "Anchor",
-  "application_version": "v1.3.12",
+  "application_version": "v1.3.13-test1",
   "back": "Tagasi",
   "block_height": "Ploki kõrgus",
   "blockchain": "Blockchain",

app/renderer/assets/locales/fr-FR/common.json

@@ -1,7 +1,7 @@
 {
   "account_authority": "Account/Authority",
   "application_name": "Anchor",
-  "application_version": "v1.3.12",
+  "application_version": "v1.3.13-test1",
   "back": "Back",
   "block_height": "Hauteur du Bloc",
   "blockchain": "Blockchain",

app/renderer/assets/locales/id-ID/common.json

@@ -1,7 +1,7 @@
 {
   "account_authority": "Account/Authority",
   "application_name": "Anchor",
-  "application_version": "v1.3.12",
+  "application_version": "v1.3.13-test1",
   "back": "Kembali",
   "block_height": "Tinggi Block",
   "blockchain": "Blockchain",

app/renderer/assets/locales/it-IT/common.json

@@ -1,7 +1,7 @@
 {
   "account_authority": "Account/Authority",
   "application_name": "Anchor",
-  "application_version": "v1.3.12",
+  "application_version": "v1.3.13-test1",
   "back": "Back",
   "block_height": "Numero di Blocco",
   "blockchain": "Blockchain",

app/renderer/assets/locales/ja-JP/common.json

@@ -1,7 +1,7 @@
 {
   "account_authority": "Account/Authority",
   "application_name": "Anchor",
-  "application_version": "v1.3.12",
+  "application_version": "v1.3.13-test1",
   "back": "戻る",
   "block_height": "ブロック高",
   "blockchain": "Blockchain",

app/renderer/assets/locales/ko-KR/common.json

@@ -1,7 +1,7 @@
 {
   "account_authority": "Account/Authority",
   "application_name": "Anchor",
-  "application_version": "v1.3.12",
+  "application_version": "v1.3.13-test1",
   "back": "뒤로",
   "block_height": "블록 높이",
   "blockchain": "Blockchain",

app/renderer/assets/locales/ru-RU/common.json

@@ -1,7 +1,7 @@
 {
   "account_authority": "Account/Authority",
   "application_name": "Настольное приложение для блокцепи EOS (Anchor)",
-  "application_version": "v1.3.12",
+  "application_version": "v1.3.13-test1",
   "back": "Back",
   "block_height": "Номер Блока",
   "blockchain": "Blockchain",

app/renderer/assets/locales/zh-CN/common.json

@@ -1,7 +1,7 @@
 {
   "account_authority": "Account/Authority",
   "application_name": "Anchor",
-  "application_version": "v1.3.12",
+  "application_version": "v1.3.13-test1",
   "back": "Back",
   "block_height": "区块高度",
   "blockchain": "Blockchain",