feat(sdk): return signature as well as proof with returnproof flag

AztecProtocol · Jul 6, 2020 · c5eedba · c5eedba
1 parent 107084e
commit c5eedba
Show file tree

Hide file tree

Showing 7 changed files with 44 additions and 9 deletions.
diff --git a/packages/extension/src/background/services/ApiService/Prove/index.js b/packages/extension/src/background/services/ApiService/Prove/index.js
@@ -73,14 +73,15 @@ export default async function prove(query, connection) {
         data: {
             args,
         },
+        sender,
     } = query;
     const {
         proofType,
         returnProof,
     } = args;
 
     let returnData = {};
-    if (!returnProof) {
+    if (sender === 'WEB_CLIENT') {
         returnData = await triggerProofUi(query, connection);
     } else {
         switch (proofType) {

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,
@@ -18,16 +23,28 @@ const fetchOutputNotes = ({ proofData }) => {
                 noteHash,
                 value,
             })),
+        proof,
+        signature,
+        signature2,
+
     };
 };
 
+const returnProof = ({ proof, signature, signature2 }) => ({
+    proof,
+    signature,
+    signature2,
+});
+
 export default {
     DEPOSIT_PROOF: [
         fetchOutputNotes,
+        returnProof,
     ],
     WITHDRAW_PROOF: [],
     TRANSFER_PROOF: [
         fetchOutputNotes,
+        returnProof,
     ],
     CREATE_NOTE_FROM_BALANCE_PROOF: [
         (data) => {

diff --git a/packages/extension/src/client/apis/ZkAsset.js b/packages/extension/src/client/apis/ZkAsset.js
@@ -431,6 +431,7 @@ export default class ZkAsset {
             success,
             outputNotes,
             proofData,
+            ...rest
         } = await ConnectionService.query(
             'constructProof',
             {
@@ -447,14 +448,12 @@ export default class ZkAsset {
             },
         );
 
-        let proof;
-        if (proofData) {
-            proof = proofData
-                ? await recoverJoinSplitProof(proofData)
-                : null;
-        }
+        const proof = proofData
+            ? await recoverJoinSplitProof(rest.proof)
+            : null;
 
         return {
+            ...rest,
             success,
             outputNotes,
             proof,

diff --git a/packages/extension/src/ui/pages/Send.jsx b/packages/extension/src/ui/pages/Send.jsx
@@ -21,6 +21,7 @@ const Send = ({
     numberOfOutputNotes,
     inputNoteHashes,
     userAccess,
+    returnProof,
 }) => {
     const fetchInitialData = async () => {
         const gsnConfig = await getGSNConfig();
@@ -31,7 +32,10 @@ const Send = ({
         const {
             address: currentAddress,
         } = currentAccount;
-        const steps = isGSNAvailable ? sendSteps.gsn : sendSteps.metamask;
+        let steps = isGSNAvailable ? sendSteps.gsn : sendSteps.metamask;
+        if (returnProof) {
+            steps = sendSteps.returnProof;
+        }
         const sender = proxyContract;
 
         const asset = await makeAsset(assetAddress);
@@ -77,13 +81,15 @@ Send.propTypes = {
     numberOfOutputNotes: PropTypes.number,
     inputNoteHashes: PropTypes.arrayOf(PropTypes.string),
     userAccess: PropTypes.arrayOf(PropTypes.string),
+    returnProof: PropTypes.bool,
 };
 
 Send.defaultProps = {
     numberOfInputNotes: emptyIntValue,
     numberOfOutputNotes: emptyIntValue,
     inputNoteHashes: [],
     userAccess: [],
+    returnProof: false,
 };
 
 export default Send;
diff --git a/packages/extension/src/ui/steps/createNoteFromBalance.js b/packages/extension/src/ui/steps/createNoteFromBalance.js
@@ -88,6 +88,10 @@ const stepSendViaGSN = {
 };
 
 export default {
+    returnProof: {
+        stepApprove,
+        stepSign,
+    },
     gsn: [
         stepApprove,
         stepSign,

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

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