From 1c8a294584c346041dc184c1d6a75182db0cb961 Mon Sep 17 00:00:00 2001
From: Tom French <tom@tomfren.ch>
Date: Thu, 9 Apr 2020 15:16:57 +0100
Subject: [PATCH] refactor: move stream creation methods to utils

---
 .../components/modals/CreateStreamModal.tsx   | 23 ++++---
 .../react-app/src/utils/proofs/deposit.ts     | 30 +++++++++
 packages/react-app/src/utils/proofs/index.ts  |  1 +
 .../react-app/src/utils/stream/creation.ts    | 64 +++----------------
 4 files changed, 53 insertions(+), 65 deletions(-)
 create mode 100644 packages/react-app/src/utils/proofs/deposit.ts

diff --git a/packages/react-app/src/components/modals/CreateStreamModal.tsx b/packages/react-app/src/components/modals/CreateStreamModal.tsx
index 936d311..5bc875b 100644
--- a/packages/react-app/src/components/modals/CreateStreamModal.tsx
+++ b/packages/react-app/src/components/modals/CreateStreamModal.tsx
@@ -214,21 +214,26 @@ export default function CreateStreamDialog({
           </Button>
           <Button
             onClick={async (): Promise<void> => {
+              const startTime = parseInt(
+                moment().add(5, 'minutes').format('X'),
+                10,
+              );
+              const stopTime = parseInt(
+                moment()
+                  .add(days, 'days')
+                  .add(hours, 'hours')
+                  .add(minutes + 5, 'minutes')
+                  .format('X'),
+                10,
+              );
               await createStream(
                 parseInt(streamAmount, 10),
                 streamContract,
                 userAddress,
                 recipient,
                 zkAsset,
-                parseInt(moment().add(5, 'minutes').format('X'), 10),
-                parseInt(
-                  moment()
-                    .add(days, 'days')
-                    .add(hours, 'hours')
-                    .add(minutes + 5, 'minutes')
-                    .format('X'),
-                  10,
-                ),
+                startTime,
+                stopTime,
               );
               handleClose();
             }}
diff --git a/packages/react-app/src/utils/proofs/deposit.ts b/packages/react-app/src/utils/proofs/deposit.ts
new file mode 100644
index 0000000..32e08a7
--- /dev/null
+++ b/packages/react-app/src/utils/proofs/deposit.ts
@@ -0,0 +1,30 @@
+import { Address } from '../../types/types';
+
+async function buildDepositProof(
+  streamContractAddress: Address,
+  asset: any,
+  payerAddress: Address,
+  payeeAddress: Address,
+  sendAmount: number,
+): Promise<object> {
+  const { proof } = await asset.send(
+    [
+      {
+        to: streamContractAddress,
+        amount: sendAmount,
+        aztecAccountNotRequired: true, // contract can't have an AZTEC account
+        numberOfOutputNotes: 1, // only want to track a single note per stream
+      },
+    ],
+    {
+      userAccess: [payerAddress, payeeAddress], // Give view access to sender and recipient
+      returnProof: true,
+      sender: streamContractAddress, // proof is being submitted by contract rather than directly
+    },
+  );
+
+  console.log(proof);
+  return proof;
+}
+
+export default buildDepositProof;
diff --git a/packages/react-app/src/utils/proofs/index.ts b/packages/react-app/src/utils/proofs/index.ts
index 5795fb9..868d9bd 100644
--- a/packages/react-app/src/utils/proofs/index.ts
+++ b/packages/react-app/src/utils/proofs/index.ts
@@ -1,6 +1,7 @@
 import buildProofs from './proofs';
 import { Stream, Address } from '../../types/types';
 
+export { default as buildDepositProof } from './deposit';
 // On a withdrawal the change note remains on the contract
 const buildWithdrawalProofs = (
   aztec: any,
diff --git a/packages/react-app/src/utils/stream/creation.ts b/packages/react-app/src/utils/stream/creation.ts
index ed6fe15..c89d41f 100644
--- a/packages/react-app/src/utils/stream/creation.ts
+++ b/packages/react-app/src/utils/stream/creation.ts
@@ -1,54 +1,6 @@
 import { Contract } from 'ethers';
-import { Address, Hash, Note } from '../../types/types';
-
-function initialiseStream(
-  streamContract: Contract,
-  payeeAddress: Address,
-  noteForStreamContract: Note,
-  zkAssetAddress: Address,
-  startTime: number,
-  endTime: number,
-): number {
-  return streamContract
-    .createStream(
-      payeeAddress,
-      noteForStreamContract.noteHash,
-      zkAssetAddress,
-      startTime,
-      endTime,
-    )
-    .then((err: any, txHash: Hash) => {
-      if (err) {
-        console.log(err);
-        return null;
-      }
-      console.log('transaction hash', txHash);
-      return txHash;
-    });
-}
-
-async function fundStream(
-  streamContractAddress: Address,
-  payerAddress: Address,
-  payeeAddress: Address,
-  sendAmount: number,
-  asset: any,
-): Promise<Note> {
-  const { outputNotes } = await asset.send(
-    [
-      {
-        to: streamContractAddress,
-        amount: sendAmount,
-        aztecAccountNotRequired: true,
-        numberOfOutputNotes: 1, // contract has one
-      },
-    ],
-    { userAccess: [payerAddress, payeeAddress] }, // Give view access to sender and recipient
-  );
-  const noteForStreamContract = outputNotes[0];
-  console.log('noteForStreamContract', noteForStreamContract);
-  return noteForStreamContract;
-}
+import { buildDepositProof } from '../proofs';
+import { Address, Hash } from '../../types/types';
 
 async function createStream(
   sendAmount: number,
@@ -58,18 +10,18 @@ async function createStream(
   zkAsset: any,
   startTime: number,
   endTime: number,
-): Promise<number> {
-  const streamNote = await fundStream(
+): Promise<Hash> {
+  const depositProof = await buildDepositProof(
     streamContract.address,
+    zkAsset,
     payerAddress,
     payeeAddress,
     sendAmount,
-    zkAsset,
   );
-  return initialiseStream(
-    streamContract,
+
+  return streamContract.createStream(
     payeeAddress,
-    streamNote,
+    depositProof,
     zkAsset.address,
     startTime,
     endTime,