fix: windows install issues

chore(release): 4.0.0-beta.18 [skip ci] * linux icons ([6622e80](6622e80)) * show error step on Ledger error, closes [#296](#296) ([a2fca81](a2fca81)) * windows install issues ([73ea00a](73ea00a))
leather-io · Jan 14, 2021 · 1469915 · 1469915
1 parent 8781dfe
commit 1469915
Show file tree

Hide file tree

Showing 27 changed files with 118 additions and 88 deletions.
diff --git a/.github/workflows/debug-build.yml b/.github/workflows/debug-build.yml
@@ -39,7 +39,7 @@ jobs:
 
           - os: windows-latest
             NPM_COMMAND: win
-            UPLOAD_ASSETS: release/**/*.msi
+            UPLOAD_ASSETS: release/**/*.exe
             CSC_LINK_SECRET_NAME: CODE_SIGNING_CERTIFICATE_WINDOWS
             CSC_KEY_PASSWORD_SECRET_NAME: CODE_SIGNING_PASSWORD_WINDOWS
 
@@ -56,7 +56,7 @@ jobs:
         id: cache-node-modules
         with:
           path: '**/node_modules'
-          key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}
+          key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}-${{ hashFiles('**/package.json') }}
 
       - name: Variables
         id: vars

diff --git a/.github/workflows/publish-version.yml b/.github/workflows/publish-version.yml
@@ -31,7 +31,7 @@ jobs:
 
           - os: windows-latest
             NPM_COMMAND: win
-            UPLOAD_ASSETS: release/**/*.msi
+            UPLOAD_ASSETS: release/**/*.exe
             CSC_LINK_SECRET_NAME: CODE_SIGNING_CERTIFICATE_WINDOWS
             CSC_KEY_PASSWORD_SECRET_NAME: CODE_SIGNING_PASSWORD_WINDOWS
 
@@ -144,11 +144,11 @@ jobs:
       max-parallel: 2
       matrix:
         stx_network: [testnet, mainnet]
-        ext: [dmg, msi, deb, rpm]
+        ext: [dmg, exe, deb, rpm]
         include:
           - ext: dmg
             os: mac
-          - ext: msi
+          - ext: exe
             os: win
           - ext: rpm
             os: linux

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,12 @@
+# [4.0.0-beta.18](https://github.com/blockstack/stacks-wallet/compare/v4.0.0-beta.17...v4.0.0-beta.18) (2021-01-11)
+
+
+### Bug Fixes
+
+* linux icons ([6622e80](https://github.com/blockstack/stacks-wallet/commit/6622e80f4e3d32c6696f71de2ca54b59053e70dc))
+* show error step on Ledger error, closes [#296](https://github.com/blockstack/stacks-wallet/issues/296) ([a2fca81](https://github.com/blockstack/stacks-wallet/commit/a2fca8128ddb16efba720c5d2a0febb81ebb2d6e))
+* windows install issues ([73ea00a](https://github.com/blockstack/stacks-wallet/commit/73ea00a32dc70bf5b4d937809eb62794bdc7c435))
+
 # [4.0.0-beta.17](https://github.com/blockstack/stacks-wallet/compare/v4.0.0-beta.16...v4.0.0-beta.17) (2021-01-11)
 
 

diff --git a/app/app-dev.html b/app/app-dev.html
@@ -2,7 +2,6 @@
 <html>
   <head>
     <meta charset="utf-8" />
-    <title>Stacks Wallet</title>
   </head>
 
   <body>

diff --git a/app/app.html b/app/app.html
@@ -2,7 +2,6 @@
 <html>
   <head>
     <meta charset="utf-8" />
-    <title>Stacks Wallet</title>
     <meta
       http-equiv="Content-Security-Policy"
       content="default-src 'none'; font-src 'self'; img-src data:; style-src 'unsafe-inline'; script-src 'self' 'unsafe-eval' 'nonce-6ca3c3e1fcd34bbc8cfaeceaa8106e36' 'nonce-6ca3c3e1fcd34bbc8cfaeceaa8106e37'; connect-src *;"

diff --git a/app/components/beta-notice.tsx b/app/components/beta-notice.tsx
@@ -5,10 +5,10 @@ import { openExternalLink } from '@utils/external-links';
 import { NETWORK } from '@constants/index';
 import packageJson from '../../package.json';
 
-const sha = process.env.SHA;
+const sha = CONFIG.SHA;
 const shaShort = sha && sha.substr(0, 7);
-const pullRequest = process.env.PULL_REQUEST;
-const branchName = process.env.BRANCH_NAME;
+const pullRequest = CONFIG.PULL_REQUEST;
+const branchName = CONFIG.BRANCH_NAME;
 const version = packageJson.version;
 
 const issueParams = new URLSearchParams();

diff --git a/app/components/home/transaction-list/transaction-list-error.tsx b/app/components/home/transaction-list/transaction-list-error.tsx
@@ -30,7 +30,7 @@ export const TransactionListError: FC<TransactionListErrorProps> = ({ node, erro
       <Text textStyle="caption" color="ink.600" textAlign="center" mx="base" lineHeight="20px">
         {usingPbcHostedNode && (
           <>
-            Unable to connect to the Blockstack PBC hosted node.
+            Unable to connect to the Hiro Systems PBC hosted node.
             <br />
             <Text {...linkProps} onClick={() => void openExternalLink(STATUS_PAGE_URL)}>
               Check the status page

diff --git a/app/components/title-bar/title-bar.tsx b/app/components/title-bar/title-bar.tsx
@@ -36,7 +36,7 @@ export const TitleBar: FC = () => {
   const content = (
     <Flex
       justifyContent="space-between"
-      pl="90px"
+      pl={process.platform === 'darwin' ? '90px' : 'tight'}
       height="100%"
       backgroundColor={winState === 'focused' ? 'white' : '#FAFAFC'}
     >

diff --git a/app/constants/index.ts b/app/constants/index.ts
@@ -2,9 +2,9 @@ import packageJson from '../../package.json';
 
 type Environments = 'development' | 'testing' | 'production';
 
-export const NETWORK = process.env.STX_NETWORK as 'mainnet' | 'testnet';
+export const NETWORK = CONFIG.STX_NETWORK;
 
-export const ENV = (process.env.NODE_ENV ?? 'production') as Environments;
+export const ENV = (CONFIG.NODE_ENV ?? 'production') as Environments;
 
 export const MNEMONIC_ENTROPY = 256;
 

diff --git a/app/crypto/key-generation.spec.ts b/app/crypto/key-generation.spec.ts
@@ -15,7 +15,6 @@ describe(deriveKey.name, () => {
     const pass = 'f255cadb0af84854819c63f26c53e1a9';
     const { derivedKeyHash } = await deriveKey({ salt, pass });
     const hash = Buffer.from(derivedKeyHash).toString('hex');
-    console.log(hash);
     expect(hash).toEqual(
       'd941c6ec3f04fa67c68b497169986588436b1697aa6b3a93218152658e5c494d2e3da9ea93522f0e4cb14b414b57b463'
     );

diff --git a/app/index.tsx b/app/index.tsx
@@ -7,7 +7,7 @@ import { configureStore, history } from './store/configureStore';
 
 const { store, persistor } = configureStore();
 
-const AppContainer = process.env.PLAIN_HMR ? Fragment : ReactHotAppContainer;
+const AppContainer = CONFIG.PLAIN_HMR ? Fragment : ReactHotAppContainer;
 
 document.addEventListener('DOMContentLoaded', () => {
   // eslint-disable-next-line @typescript-eslint/no-var-requires

diff --git a/app/main.dev.ts b/app/main.dev.ts
@@ -18,15 +18,16 @@ import 'regenerator-runtime/runtime';
 import path from 'path';
 import { app, BrowserWindow, clipboard, ipcMain, Menu, session } from 'electron';
 import { autoUpdater } from 'electron-updater';
+import Store from 'electron-store';
 import log from 'electron-log';
 import windowState from 'electron-window-state';
 import contextMenu from 'electron-context-menu';
-import Store from 'electron-store';
 
 import MenuBuilder from './menu';
 import { deriveKey } from './crypto/key-generation';
 import { NETWORK } from './constants/index';
 import { validateConfig } from './main/validate-config';
+import { getUserDataPath } from './main/get-user-data-path';
 
 // CSP enabled in production mode, don't warn in development
 delete process.env.ELECTRON_ENABLE_SECURITY_WARNINGS;
@@ -54,6 +55,9 @@ if (process.env.NODE_ENV === 'development' || process.env.DEBUG_PROD === 'true')
   require('electron-debug')();
 }
 
+app.setPath('userData', getUserDataPath(app));
+app.setPath('logs', path.join(getUserDataPath(app), 'logs'));
+
 const installExtensions = () => {
   const installer = require('electron-devtools-installer');
   const forceDownload = !!process.env.UPGRADE_EXTENSIONS;
@@ -69,6 +73,10 @@ const createWindow = async () => {
     await installExtensions();
   }
 
+  // https://github.com/electron/electron/issues/22995
+  session.defaultSession.setSpellCheckerDictionaryDownloadURL('https://00.00/');
+  session.fromPartition('some-partition').setSpellCheckerDictionaryDownloadURL('https://00.00/');
+
   const mainWindowState = windowState({
     defaultWidth: 1024,
     defaultHeight: 728,
@@ -88,8 +96,10 @@ const createWindow = async () => {
     frame: process.platform !== 'darwin',
     titleBarStyle: process.platform === 'darwin' ? 'hidden' : 'default',
     icon: iconPath,
+    title: `Stacks Wallet` + (NETWORK === 'testnet' ? ' Testnet' : ''),
     webPreferences: {
       disableBlinkFeatures: 'Auxclick',
+      spellcheck: false,
       webSecurity: true,
       nodeIntegration: false,
       nodeIntegrationInWorker: false,
@@ -148,11 +158,9 @@ const createWindow = async () => {
   // eslint-disable-next-line
   new AppUpdater();
 
-  session
-    .fromPartition('some-partition')
-    .setPermissionRequestHandler((_webContents, _permission, callback) => {
-      callback(false);
-    });
+  session.defaultSession.setPermissionRequestHandler((_webContents, _permission, callback) => {
+    callback(false);
+  });
 };
 
 app.on('web-contents-created', (_event, contents) => {
@@ -191,7 +199,6 @@ ipcMain.handle('store-get', (_e, { key }: any) => store.get(key));
 ipcMain.handle('store-delete', (_e, { key }: any) => store.delete(key));
 // ipcMain.handle('store-getEntireStore', () => store.store);
 ipcMain.handle('store-clear', () => store.clear());
-
 ipcMain.on('store-getEntireStore', event => {
   event.returnValue = store.store;
 });

diff --git a/app/main/get-user-data-path.ts b/app/main/get-user-data-path.ts
@@ -0,0 +1,14 @@
+import { App } from 'electron';
+import path from 'path';
+
+export function getUserDataPath(app: App) {
+  const appId = 'so.hiro.StacksWallet';
+  const appData = app.getPath('appData');
+  const network = process.env.STX_NETWORK === 'mainnet' ? '' : 'Testnet';
+  if (CONFIG.NODE_ENV === 'development') {
+    const devName = `${appId}${network}Dev`;
+    return path.join(appData, devName);
+  }
+  const prodName = `${appId}${network}`;
+  return path.join(appData, prodName);
+}
diff --git a/app/package.json b/app/package.json
@@ -1,11 +1,10 @@
 {
-  "name": "stacks-wallet",
-  "version": "4.0.0-beta.8",
+  "name": "stacks-wallet-inner-package",
   "description": "Stacks Wallet v4 — Participate in Stacking to earn bitcoin rewards",
   "main": "./main.prod.js",
   "author": {
     "email": "info@blockstack.com",
-    "name": "Blockstack PBC"
+    "name": "Hiro Systems PBC"
   },
   "scripts": {
     "electron-rebuild": "node -r ../internals/scripts/BabelRegister.js ../internals/scripts/ElectronRebuild.js",

diff --git a/app/pages/home/home.tsx b/app/pages/home/home.tsx
@@ -50,7 +50,6 @@ import { HomeLayout } from './home-layout';
 
 export const Home: FC = () => {
   const dispatch = useDispatch();
-
   const {
     address,
     balance,

diff --git a/app/preload.ts b/app/preload.ts
@@ -17,7 +17,7 @@ if (process.env.NODE_ENV === 'development') {
 
 if (process.env.START_HOT) {
   // Dynamically insert the bundled app script in the renderer process
-  const port = process.env.PORT || 1212;
+  const port = 1212;
   scriptsToLoad.push(`http://localhost:${port}/dist/renderer.dev.js`);
 } else {
   scriptsToLoad.push('./dist/renderer.prod.js');
@@ -91,6 +91,8 @@ const walletApi = {
   },
 
   contextMenu: (menuItems: any) => ipcRenderer.send('context-menu-open', { menuItems }),
+
+  installPath: () => ipcRenderer.sendSync('installPath'),
 };
 
 declare global {

diff --git a/app/store/configureStore.ts b/app/store/configureStore.ts
@@ -2,7 +2,7 @@ import * as configureStoreDev from './configureStore.dev';
 import * as configureStoreProd from './configureStore.prod';
 
 const selectedConfigureStore =
-  process.env.NODE_ENV === 'production' ? configureStoreProd : configureStoreDev;
+  CONFIG.NODE_ENV === 'production' ? configureStoreProd : configureStoreDev;
 
 export const { configureStore } = selectedConfigureStore;
 

diff --git a/app/types/index.ts b/app/types/index.ts
@@ -1 +1,15 @@
 export type WindowActiveState = 'focused' | 'blurred';
+
+declare global {
+  const CONFIG: {
+    NODE_ENV: 'development' | 'production';
+    DEBUG_PROD: string;
+    STX_NETWORK: 'testnet' | 'mainnet';
+    PLAIN_HMR?: string;
+    START_HOT: boolean;
+    PORT?: number;
+    PULL_REQUEST?: string;
+    BRANCH_NAME?: string;
+    SHA?: string;
+  };
+}
diff --git a/app/utils/stacking.ts b/app/utils/stacking.ts
@@ -22,7 +22,6 @@ interface ConvertToPoxAddressBtc {
 export function convertPoxAddressToBtc(network: 'mainnet' | 'testnet') {
   return ({ version, hashbytes }: ConvertToPoxAddressBtc) => {
     const ver = new BN(version).toNumber() as AddressHashMode;
-    console.log({ ver });
     if (ver === AddressHashMode.SerializeP2WPKH || ver === AddressHashMode.SerializeP2WSH)
       return null;
     return address.toBase58Check(hashbytes, poxKeyToVersionBytesMap[network][ver]);

diff --git a/configs/webpack.config.base.js b/configs/webpack.config.base.js
@@ -5,6 +5,8 @@
 import path from 'path';
 import webpack from 'webpack';
 import TsconfigPathsPlugin from 'tsconfig-paths-webpack-plugin';
+import ExtendedDefinePlugin from 'extended-define-webpack-plugin';
+
 import { dependencies as externals } from '../app/package.json';
 
 // eslint-disable-next-line import/no-default-export
@@ -67,9 +69,19 @@ export default {
   },
 
   plugins: [
-    new webpack.EnvironmentPlugin({
-      NODE_ENV: 'production',
-      SHA: '',
+    new ExtendedDefinePlugin({
+      CONFIG: {
+        NODE_ENV: process.env.NODE_ENV,
+        PLAIN_HMR: process.env.PLAIN_HMR,
+        STX_NETWORK: process.env.STX_NETWORK || 'testnet',
+        DEBUG_PROD: process.env.DEBUG_PROD,
+        START_HOT: process.env.START_HOT,
+        PORT: process.env.PORT,
+        PULL_REQUEST: process.env.PULL_REQUEST,
+        BRANCH_NAME: process.env.BRANCH_NAME,
+        SHA: process.env.SHA,
+        PULL_REQUEST: process.env.PULL_REQUEST,
+      },
     }),
   ],
 };
diff --git a/configs/webpack.config.main.prod.babel.js b/configs/webpack.config.main.prod.babel.js
@@ -31,18 +31,12 @@ export default merge(baseConfig, {
     filename: './app/main.prod.js',
   },
 
-  // optimization: {
-  // minimizer: process.env.E2E_BUILD
-  // ? []
-  // : [
-  // eslint-disable-next-line @typescript-eslint/no-unsafe-call
-  //   new TerserPlugin({
-  //     parallel: true,
-  //     sourceMap: true,
-  //     cache: true,
-  //   }),
-  // ],
-  // },
+  optimization: {
+    minimizer: [
+      // eslint-disable-next-line @typescript-eslint/no-unsafe-call
+      // new TerserPlugin({}),
+    ],
+  },
 
   plugins: [
     // eslint-disable-next-line @typescript-eslint/no-unsafe-call
@@ -65,6 +59,7 @@ export default merge(baseConfig, {
       DEBUG_PROD: false,
       START_MINIMIZED: false,
       E2E_BUILD: false,
+      STX_NETWORK: process.env.STX_NETWORK,
     }),
   ],
 

diff --git a/configs/webpack.config.renderer.dev.babel.js b/configs/webpack.config.renderer.dev.babel.js
@@ -125,32 +125,10 @@ export default merge(baseConfig, {
 
     new webpack.NoEmitOnErrorsPlugin(),
 
-    /**
-     * Create global constants which can be configured at compile time.
-     *
-     * Useful for allowing different behaviour between development builds and
-     * release builds
-     *
-     * NODE_ENV should be production so that modules do not perform certain
-     * development checks
-     *
-     * By default, use 'development' as NODE_ENV. This can be overriden with
-     * 'staging', for example, by changing the ENV variables in the npm scripts
-     */
-    new webpack.EnvironmentPlugin({
-      NODE_ENV: 'development',
-      STX_NETWORK: 'testnet',
-      SHA: '',
-    }),
-
     new webpack.LoaderOptionsPlugin({
       debug: true,
     }),
 
-    // new webpack.ProvidePlugin({
-    //   Buffer: ['buffer', 'Buffer'],
-    // }),
-
     new CopyPlugin({
       patterns: [{ from: 'node_modules/argon2-browser/dist/argon2.wasm', to: '.' }],
     }),

diff --git a/configs/webpack.config.renderer.prod.babel.js b/configs/webpack.config.renderer.prod.babel.js
@@ -127,7 +127,7 @@ export default merge(baseConfig, {
     new webpack.EnvironmentPlugin({
       NODE_ENV: 'production',
       DEBUG_PROD: false,
-      STX_NETWORK: 'testnet',
+      STX_NETWORK: process.env.STX_NETWORK,
       E2E_BUILD: false,
     }),
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,7 +2,6 @@ @@
     <html>
       <head>
         <meta charset="utf-8" />
-        <title>Stacks Wallet</title>
       </head>
       <body>
@@ Expand Down @@