Merge pull request #539 from AztecProtocol/fix/include-wasm-in-node-b…

…uild fix(aztec.js): fix node build
AztecProtocol · Jul 20, 2020 · ab1ad09 · ab1ad09
2 parents fed09a1 + 2d36421
commit ab1ad09
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 6 deletions.
diff --git a/packages/aztec.js/src/note/index.js b/packages/aztec.js/src/note/index.js
@@ -307,10 +307,12 @@ export function encodeMetadata(noteArray) {
  * @returns {Note} created note instance
  */
 export async function fromEventLog(logNoteData, spendingKey = null) {
-    const publicKey = noteCoder.decodeNoteFromEventLog(logNoteData);
-    const newNote = new Note(publicKey, null);
+    const notePublicKey = noteCoder.decodeNoteFromEventLog(logNoteData);
+    const newNote = new Note(notePublicKey, null);
     if (spendingKey) {
         await newNote.derive(spendingKey);
+        const { address } = secp256k1.accountFromPrivateKey(spendingKey);
+        newNote.owner = address;
     }
     return newNote;
 }

diff --git a/packages/aztec.js/webpack.common.js b/packages/aztec.js/webpack.common.js
@@ -37,7 +37,4 @@ module.exports = {
         maxAssetSize: 200000,
         maxEntrypointSize: 400000,
     },
-    resolve: {
-        extensions: ['.js', '.json'],
-    },
 };
diff --git a/packages/aztec.js/webpack.dev.js b/packages/aztec.js/webpack.dev.js
@@ -1,4 +1,6 @@
 const merge = require('webpack-merge');
+const CopyWebpackPlugin = require('copy-webpack-plugin');
+
 const common = require('./webpack.common.js');
 
 const config = {
@@ -14,13 +16,27 @@ const nodeConfig = merge(common, {
     },
     output: { filename: 'bundle.node.js' },
     target: 'node',
+    plugins: [
+        new CopyWebpackPlugin([
+            {
+                from: 'node_modules/@aztec/bn128/**/*.wasm',
+                to: '[name].[ext]',
+            },
+        ]),
+    ],
+    resolve: {
+        extensions: ['.js', '.json', '.wasm'],
+    },
 });
 
 const webConfig = merge(common, {
     ...config,
     node: { crypto: true, fs: 'empty' },
     output: { filename: 'bundle.web.js' },
     target: 'web',
+    resolve: {
+        extensions: ['.js', '.json'],
+    },
 });
 
 module.exports = [nodeConfig, webConfig];
diff --git a/packages/aztec.js/webpack.prod.js b/packages/aztec.js/webpack.prod.js
@@ -1,9 +1,10 @@
 const merge = require('webpack-merge');
+const CopyWebpackPlugin = require('copy-webpack-plugin');
 const common = require('./webpack.common.js');
 
 const config = {
     mode: 'production',
-    devtool: '',
+    devtool: 'inline-source-map',
 };
 
 const nodeConfig = merge(common, {
@@ -14,13 +15,27 @@ const nodeConfig = merge(common, {
     },
     output: { filename: 'bundle.node.js' },
     target: 'node',
+    plugins: [
+        new CopyWebpackPlugin([
+            {
+                from: 'node_modules/@aztec/bn128/**/*.wasm',
+                to: '[name].[ext]',
+            },
+        ]),
+    ],
+    resolve: {
+        extensions: ['.js', '.json', '.wasm'],
+    },
 });
 
 const webConfig = merge(common, {
     ...config,
     node: { crypto: true, fs: 'empty' },
     output: { filename: 'bundle.web.js' },
     target: 'web',
+    resolve: {
+        extensions: ['.js', '.json'],
+    },
 });
 
 module.exports = [nodeConfig, webConfig];