Merge pull request #142 from stakwork/fix-key-x

Fix key x
stakwork · Jan 5, 2021 · 5fc7eff · 5fc7eff
2 parents bec235c + 18df4c5
commit 5fc7eff
Show file tree

Hide file tree

Showing 9 changed files with 41 additions and 9 deletions.
diff --git a/dist/public/favicon.ico b/dist/public/favicon.ico
diff --git a/dist/src/controllers/contacts.js b/dist/src/controllers/contacts.js
diff --git a/dist/src/controllers/contacts.js.map b/dist/src/controllers/contacts.js.map
diff --git a/dist/src/controllers/queries.js.map b/dist/src/controllers/queries.js.map
diff --git a/dist/src/helpers.js b/dist/src/helpers.js
diff --git a/dist/src/helpers.js.map b/dist/src/helpers.js.map
diff --git a/src/controllers/contacts.ts b/src/controllers/contacts.ts
@@ -253,9 +253,10 @@ export const receiveContactKey = async (payload) => {
 		console.log("DID NOT FIND SENDER")
 	}
 
-	if (msgIncludedContactKey && sender) {
+	if (msgIncludedContactKey) {
 		helpers.sendContactKeys({
-			contactIds: [sender.id],
+			contactPubKey: sender_contact_key,
+			contactIds: sender ? [sender.id] : [],
 			sender: owner,
 			type: constants.message_types.contact_key_confirmation,
 		})

diff --git a/src/controllers/queries.ts b/src/controllers/queries.ts
@@ -10,6 +10,13 @@ import { Op } from 'sequelize'
 import fetch from 'node-fetch'
 import * as helpers from '../helpers'
 
+/*
+  make the keysend go over the just-created channel
+  add columns: txid for the onchain payment
+    commit_fee, local_reserve, remote_reserve, hardcoded AMT
+*/
+
+
 type QueryType = 'onchain_address'
 export interface Query {
   type: QueryType

diff --git a/src/helpers.ts b/src/helpers.ts
@@ -34,9 +34,21 @@ export const findOrCreateChat = async (params) => {
 	return chat
 }
 
-export const sendContactKeys = async ({ type, contactIds, sender, success, failure, dontActuallySendContactKey }:{type:number,contactIds:number[],sender:any,success?:Function,failure?:Function,dontActuallySendContactKey?:boolean}) => {
+export const sendContactKeys = async ({ type, contactIds, sender, success, failure, dontActuallySendContactKey, contactPubKey }:{type:number,contactIds:number[],sender:any,success?:Function,failure?:Function,dontActuallySendContactKey?:boolean,contactPubKey?:string}) => {
 	const msg = newkeyexchangemsg(type, sender, dontActuallySendContactKey||false)
 
+	if(contactPubKey) { // dont use ids here
+		performKeysendMessage({
+			sender,
+			destination_key: contactPubKey,
+			amount: 3,
+			msg,
+			success,
+			failure
+		})
+		return
+	}
+
 	let yes: any = null
 	let no: any = null
 	let cids = contactIds || []