fix(stacking): bn.js buffer polyfill hack, closes #369

leather-io · Dec 16, 2020 · 2fa6c49 · 2fa6c49
1 parent 265de02
commit 2fa6c49
Show file tree

Hide file tree

Showing 11 changed files with 74 additions and 3,806 deletions.
diff --git a/app/components/home/stacking-card.tsx b/app/components/home/stacking-card.tsx
@@ -73,12 +73,12 @@ export const StackingCard: FC<StackingCardProps> = () => {
                 </Text>
               </Flex>
             )}
-            <Flex flexDirection="column" mt="tight" mb="base-loose">
+            {/* <Flex flexDirection="column" mt="tight" mb="base-loose">
               <Text textStyle="body.small.medium">Reward to be paid to</Text>
               <Text as="code" fontSize="13px" mt="tight" color="ink.600">
                 {stackerInfo?.pox_address}
               </Text>
-            </Flex>
+            </Flex> */}
           </Box>
         </Box>
       )}

diff --git a/app/modals/stacking/stacking-modal.tsx b/app/modals/stacking/stacking-modal.tsx
@@ -213,7 +213,11 @@ export const StackingModal: FC<StackingModalProps> = props => {
 
       if (error) {
         setIsDecrypting(false);
-        setDecryptionError('Unable to decrypt wallet');
+        setDecryptionError(
+          String(error) === 'OperationError'
+            ? 'Unable to decrypt wallet'
+            : 'Something else went wrong'
+        );
         return;
       }
 

diff --git a/app/modals/stacking/steps/decrypt-wallet-form.tsx b/app/modals/stacking/steps/decrypt-wallet-form.tsx
@@ -26,7 +26,7 @@ export const DecryptWalletForm: Props = props => {
       <Input onChange={handlePasswordInput} type="password" mt="base-loose" />
       {hasSubmitted && decryptionError && (
         <ErrorLabel>
-          <ErrorText>Password entered is incorrect</ErrorText>
+          <ErrorText>{decryptionError}</ErrorText>
         </ErrorLabel>
       )}
       <Text textStyle="body.small" mt="base-tight" mb="base-loose" display="block">

diff --git a/app/polyfill.ts b/app/polyfill.ts
@@ -0,0 +1,3 @@
+(window as any).global = window;
+// eslint-disable-next-line @typescript-eslint/no-var-requires
+(window as any).Buffer = (window as any).Buffer || require('buffer').Buffer;
diff --git a/app/preload.ts b/app/preload.ts
@@ -29,7 +29,7 @@ contextBridge.exposeInMainWorld('electron', {
   __filename,
 });
 
-async function deriveArgon2Key({ pass, salt }: Record<string, 'pass' | 'salt'>) {
+async function deriveArgon2Key({ pass, salt }: Record<'pass' | 'salt', string>) {
   const result = await argon2.hash({
     pass,
     salt,
@@ -54,7 +54,7 @@ const walletApi = {
     initialValue: () => ipcRenderer.sendSync('store-getEntireStore'),
   },
 
-  deriveKey: async (args: any) => deriveArgon2Key(args),
+  deriveKey: async (args: Record<'pass' | 'salt', string>) => deriveArgon2Key(args),
 
   windowEvents: {
     blur(callback: () => void) {

diff --git a/configs/webpack.config.base.js b/configs/webpack.config.base.js
@@ -11,8 +11,6 @@ import { dependencies as externals } from '../app/package.json';
 export default {
   target: 'web',
 
-  // externals: [...Object.keys(externals || {})],
-
   module: {
     noParse: [/\.wasm$/],
     rules: [
@@ -46,6 +44,7 @@ export default {
     fs: 'empty',
     Buffer: false,
     process: false,
+    child_process: 'empty',
   },
 
   output: {

diff --git a/configs/webpack.config.renderer.dev.babel.js b/configs/webpack.config.renderer.dev.babel.js
@@ -45,14 +45,15 @@ export default merge(baseConfig, {
 
   mode: 'development',
 
-  // target: 'electron-renderer',
+  target: 'web',
 
   entry: [
     'core-js',
     'regenerator-runtime/runtime',
     ...(process.env.PLAIN_HMR ? [] : ['react-hot-loader/patch']),
     `webpack-dev-server/client?http://localhost:${port}/`,
     'webpack/hot/only-dev-server',
+    require.resolve('../app/polyfill.ts'),
     require.resolve('../app/index.tsx'),
   ],
 
@@ -106,6 +107,7 @@ export default merge(baseConfig, {
   resolve: {
     alias: {
       'react-dom': '@hot-loader/react-dom',
+      'bn.js': path.join('./node_modules/bn.js'),
     },
   },
   plugins: [
@@ -145,9 +147,9 @@ export default merge(baseConfig, {
       debug: true,
     }),
 
-    new webpack.ProvidePlugin({
-      Buffer: ['buffer', 'Buffer'],
-    }),
+    // 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.dev.dll.babel.js b/configs/webpack.config.renderer.dev.dll.babel.js
@@ -21,7 +21,7 @@ export default merge(baseConfig, {
 
   mode: 'development',
 
-  target: 'electron-renderer',
+  target: 'web',
 
   externals: ['fsevents', 'crypto-browserify'],
 

diff --git a/configs/webpack.config.renderer.prod.babel.js b/configs/webpack.config.renderer.prod.babel.js
@@ -21,10 +21,14 @@ export default merge(baseConfig, {
 
   mode: 'production',
 
-  // target: 'electron-renderer',
   target: 'web',
 
-  entry: ['core-js', 'regenerator-runtime/runtime', path.join(__dirname, '..', 'app/index.tsx')],
+  entry: [
+    'core-js',
+    'regenerator-runtime/runtime',
+    path.join(__dirname, '..', 'app/polyfill.ts'),
+    path.join(__dirname, '..', 'app/index.tsx'),
+  ],
 
   output: {
     path: path.join(__dirname, '..', 'app/dist'),
@@ -33,6 +37,12 @@ export default merge(baseConfig, {
     libraryTarget: 'var',
   },
 
+  resolve: {
+    alias: {
+      'bn.js': path.join('./node_modules/bn.js'),
+    },
+  },
+
   module: {
     rules: [
       // WOFF Font

diff --git a/package.json b/package.json
@@ -302,7 +302,7 @@
     "bignumber.js": "9.0.1",
     "bip39": "3.0.2",
     "bitcoin-address-validation": "1.0.2",
-    "bn.js": "5.1.3",
+    "bn.js": "https://github.com/kyranjamie/bn.js",
     "buffer": "6.0.2",
     "c32check": "1.1.2",
     "connected-react-router": "6.8.0",