feat(sdk): rebase develop

AztecProtocol · Jul 6, 2020 · 841bcdc · 841bcdc
1 parent 2248b4b
commit 841bcdc
Show file tree

Hide file tree

Showing 4 changed files with 63 additions and 8 deletions.
diff --git a/packages/extension/:w b/packages/extension/:w
@@ -0,0 +1,48 @@
+const fetchOutputNotes = ({
+    proofData,
+    proof,
+    signature,
+    signature2,
+}) => {
+    const {
+        outputNotes,
+        remainderNote,
+    } = proofData || {};
+    if (!outputNotes) return null;
+
+    return {
+        outputNotes: outputNotes
+            .filter((note) => {
+                if (!remainderNote) return true;
+                return note.decryptedViewingKey !== remainderNote.decryptedViewingKey;
+            })
+            .map(({
+                noteHash,
+                value,
+            }) => ({
+                noteHash,
+                value,
+            })),
+    };
+};
+
+export default {
+    DEPOSIT_PROOF: [
+        fetchOutputNotes,
+    ],
+    WITHDRAW_PROOF: [],
+    TRANSFER_PROOF: [
+        fetchOutputNotes,
+    ],
+    CREATE_NOTE_FROM_BALANCE_PROOF: [
+        (data) => {
+            const {
+                outputNotes,
+            } = fetchOutputNotes(data) || {};
+
+            return {
+                notes: outputNotes || [],
+            };
+        },
+    ],
+};
diff --git a/packages/extension/src/background/services/ApiService/Prove/responseDataKeys.js b/packages/extension/src/background/services/ApiService/Prove/responseDataKeys.js
@@ -1,4 +1,9 @@
-const fetchOutputNotes = ({ proofData }) => {
+const fetchOutputNotes = ({
+    proofData,
+    proof,
+    signature,
+    signature2,
+}) => {
     const {
         outputNotes,
         remainderNote,

diff --git a/packages/extension/src/client/apis/ZkAsset.js b/packages/extension/src/client/apis/ZkAsset.js
@@ -255,6 +255,7 @@ export default class ZkAsset {
         returnProof,
         sender,
         publicOwner,
+        ...rest,
     } = {}) => {
         if (!this.linkedTokenAddress) {
             throw new ApiError('zkAsset.private', {
@@ -288,6 +289,7 @@ export default class ZkAsset {
         }
 
         return {
+            ...rest,
             success,
             outputNotes,
             proof,
@@ -330,6 +332,7 @@ export default class ZkAsset {
         inputNoteHashes,
         returnProof,
         sender,
+        ...rest,
     } = {}) => {
         if (!this.linkedTokenAddress) {
             throw new ApiError('zkAsset.private', {
@@ -367,6 +370,7 @@ export default class ZkAsset {
         }
 
         return {
+            ...rest,
             success,
             proof,
         };
@@ -447,17 +451,10 @@ export default class ZkAsset {
             },
         );
 
-        let proof;
-        if (proofData) {
-            proof = proofData
-                ? await recoverJoinSplitProof(proofData)
-                : null;
-        }
 
         return {
             success,
             outputNotes,
-            proof,
         };
     };
 

diff --git a/packages/extension/src/ui/steps/send.js b/packages/extension/src/ui/steps/send.js
@@ -88,6 +88,11 @@ const stepSendViaGSN = {
 };
 
 export default {
+
+    returnProof: [
+        stepApprove,
+        stepSignNotes,
+    ],
     gsn: [
         stepApprove,
         stepSignNotes,