Merge pull request #8 from stakwork/signer

msg-signing

api/grpc/index.ts

@@ -16,8 +16,6 @@ async function parseAndVerifyPayload(data){
 	try {
 		payload = JSON.parse(msg)
 		if(payload) {
-			if(!sig) return payload // REMOVE THIS LINE (here for backward compat)
-			// also remove pub_key from the newmsg and newkeyexchangemsg of helpers.ts
 			const v = await verifyAscii(msg, sig)
 			if(v && v.valid && v.pubkey) {
 				payload.sender = payload.sender||{}

api/helpers.ts

@@ -229,10 +229,10 @@ function newmsg(type, chat, sender, message){
 			...chat.members && { members: chat.members },
 		},
 		message: message,
-		sender: {
-			pub_key: sender.publicKey,
-			// ...sender.contactKey && {contact_key: sender.contactKey}
-		}
+		// sender: {
+		// 	pub_key: sender.publicKey,
+		// 	// ...sender.contactKey && {contact_key: sender.contactKey}
+		// }
 	}
 }
 
@@ -240,7 +240,7 @@ function newkeyexchangemsg(type, sender){
 	return {
 		type: type,
 		sender: {
-			pub_key: sender.publicKey,
+			// pub_key: sender.publicKey,
 			contact_key: sender.contactKey,
 			...sender.alias && {alias: sender.alias},
 			// ...sender.photoUrl && {photoUrl: sender.photoUrl}

dist/api/grpc/index.js

@@ -26,8 +26,6 @@ function parseAndVerifyPayload(data) {
         try {
             payload = JSON.parse(msg);
             if (payload) {
-                if (!sig)
-                    return payload; // REMOVE THIS LINE (here for backward compat)
                 const v = yield lightning_1.verifyAscii(msg, sig);
                 if (v && v.valid && v.pubkey) {
                     payload.sender = payload.sender || {};

dist/api/helpers.js

@@ -227,15 +227,14 @@ function newmsg(type, chat, sender, message) {
         type: type,
         chat: Object.assign(Object.assign(Object.assign({ uuid: chat.uuid }, chat.name && { name: chat.name }), chat.type && { type: chat.type }), chat.members && { members: chat.members }),
         message: message,
-        sender: {
-            pub_key: sender.publicKey,
-        }
     };
 }
 function newkeyexchangemsg(type, sender) {
     return {
         type: type,
-        sender: Object.assign({ pub_key: sender.publicKey, contact_key: sender.contactKey }, sender.alias && { alias: sender.alias })
+        sender: Object.assign({ 
+            // pub_key: sender.publicKey,
+            contact_key: sender.contactKey }, sender.alias && { alias: sender.alias })
     };
 }
 //# sourceMappingURL=helpers.js.map