getting transfer info from blockchain for specail link transfers

Author: mikhaildobs

server.js

@@ -1,7 +1,7 @@
 'use strict';
 
 // set up ========================
-require('newrelic');
+//require('newrelic');
 const express  = require('express');
 const app      = express();                               // create our app w/ express
 const log = require('./src/libs/log')(module);

src/controllers/SenderController.js

@@ -44,7 +44,8 @@ const registerTransfer = async (req, res) => {
 	transitAddress: transitAddress.toLowerCase(),
 	senderAddress: senderAddress.toLowerCase(),
 	transitKeystore,	
-	amount
+	amount,
+	transferType: 'phone'
     };
 
     log.info({transferParams});

src/controllers/TransferEventsController.js

@@ -20,19 +20,17 @@ const addEvent = async (req, res) => {
 	throw new Error("Wrong api key");
     }
 
-    const transferFilterParams = {
-	senderAddress,
-	transitAddress,
-    };
 
     const event = {
 	txStatus,
 	txHash,
 	eventName,
 	gasPrice
     };
+
+    console.log({event, senderAddress, transitAddress});
 
-    await TransferService.addEvent({transferStatus, event, transferFilterParams });
+    await TransferService.addEvent({transferStatus, event, senderAddress, transitAddress });
     res.json({success: true });    
 }
 

src/models/transfer.js

@@ -6,21 +6,21 @@ const TransferEventSchema = require('./TransferEvent').Schema;
 const TransferSchema = new Schema({
     transferId: { // is calculated with sha3(phone, verificationCode)
 	type: String,
-	required: true,
-	unique: true,
+	// required: true,
+	// unique: true,
 	index: true
     },    
     phoneHash: { // is calculated with sha3(phone, transferId, salt)
 	type: String,
-	required: true,	
+	// required: true,	
     },
     transitAddress: { // transit address assigned to smart-contract deposit
 	type: String,
 	required: true,	
     },
     transitKeystore: {	// encrypted transit private key with secret code,
 	type: String,
-	required: true,
+	// required: true,
     },
     verified: { // if sms verification succeeded
 	type: Boolean,
@@ -47,6 +47,14 @@ const TransferSchema = new Schema({
 	    "cancelled" // deposit was cancelled by sender
 	],
 	default: "inited"
+    },
+    transferType: {
+	type: String,
+	enum: [
+	    "phone",
+	    "link",
+	    "email"
+	]
     }
 }, {timeStamps: true});
 

src/services/EventsParserService.js

@@ -10,24 +10,26 @@ const subscribeForMinedDepositEvents = () => {
     log.debug("Subscribing for mined deposit events.");
 
     const depositEvent = escrowContract.LogDeposit();
-
+    
+    
     depositEvent.watch(async (error, result) => {
 	try {
 	    log.debug("Got mined deposit event");
 	    console.log(result);
 
-	    const transferFilterParams = {
-		senderAddress: result.args.sender,
-		transitAddress: result.args.transitAddress
-	    };
+	    const senderAddress = result.args.sender;
+	    const transitAddress = result.args.transitAddress;
+	    const amount = web3.fromWei(result.args.amount, 'ether') ;
 
 	    const transferStatus = 'deposited';
 	    const eventTxStatus = 'success';
 	    await TransferService.updateTransferEvent({
 		transferStatus,
 		eventTxHash: result.transactionHash,
-		transferFilterParams,
-		eventTxStatus
+		senderAddress,
+		transitAddress,
+		eventTxStatus,
+		amount
 	    });
 	} catch(err) {
 	    log.debug(err);
@@ -51,16 +53,14 @@ const subscribeForMinedCancelEvents = () => {
 		txHash: result.transactionHash,
 		eventName: 'cancel',
 	    };
-	    const transferFilterParams = {
-		senderAddress: result.args.sender,
-		transitAddress: result.args.transitAddress
-	    };
-	    
+	    const senderAddress = result.args.sender;
+	    const transitAddress = result.args.transitAddress;	    
 
 	    await TransferService.addEvent({
 		transferStatus: 'cancelled',
 		event,
-		transferFilterParams
+		senderAddress,
+		transitAddress,
 	    });
 
 	} catch(err) {
@@ -85,15 +85,15 @@ const subscribeForMinedWithdrawEvents = () => {
 		txHash: result.transactionHash,
 		eventName: 'withdraw',
 	    };
-	    const transferFilterParams = {
-		senderAddress: result.args.sender,
-		transitAddress: result.args.transitAddress
-	    };
+
+	    const senderAddress = result.args.sender;
+	    const transitAddress = result.args.transitAddress;
 
 	    await TransferService.addEvent({
 		transferStatus: 'completed',
 		event,
-		transferFilterParams
+		senderAddress,
+		transitAddress,
 	    });
 
 	} catch(err) {

src/services/TransferService.js

@@ -17,25 +17,46 @@ const getByTransferId = (transferId) => {
 
 const findOne = (params={}) => {
     return Transfer.findOne(params);
+    
 }
 
 
-const addEvent = async ({transferStatus, event, transferFilterParams }) => {
+const findOrCreate = async ({ senderAddress, transitAddress }) => {
 
-    // find transfer in db
-    const transfer = await findOne(transferFilterParams);
+   // find transfer in db
+    let transfer = await findOne({senderAddress, transitAddress});
+
+    // create transfer from pending tx, when transfer is sent using special link
+    if (!transfer) {
+	console.log("creating transfer from pending tx...");
+	transfer = await create({
+	    senderAddress,
+	    transitAddress,
+	    transferId: `link-${transitAddress}`,
+	    transferType: "link"
+	});
+    }
+
+    console.log({transfer});
+    return transfer;
+}
 
+const addEvent = async ({transferStatus, event, senderAddress, transitAddress }) => {
+
+    const transfer = await findOrCreate({senderAddress, transitAddress}); 
+    
     // update transfer status in db and add event
     transfer.events.push(event);
     transfer.status = transferStatus;
     await transfer.save();
 }
 
 
-const updateTransferEvent = async ({ transferStatus, eventTxHash, eventTxStatus, transferFilterParams }) => {
+const updateTransferEvent = async ({ transferStatus, eventTxHash, eventTxStatus, senderAddress, transitAddress, amount=null }) => {
 
     // find transfer in db
-    const transfer = await findOne(transferFilterParams);
+    const transfer = await findOrCreate({senderAddress, transitAddress}); 
+
     // update event status 
     transfer.events = transfer.events.map(event => {
 	if (event.txHash === eventTxHash) {
@@ -44,6 +65,11 @@ const updateTransferEvent = async ({ transferStatus, eventTxHash, eventTxStatus,
 	return event;
     });
     transfer.status = transferStatus;
+
+    if (amount) {
+	transfer.amount = amount;
+    }
+    
     await transfer.save();
 }