From 278439df828bd61baf27bce4ca48a02ee1f6e38a Mon Sep 17 00:00:00 2001
From: Franck Royer <franck@status.im>
Date: Thu, 12 Aug 2021 14:52:08 +1000
Subject: [PATCH] Store encryption public key as byte array

---
 examples/eth-dm/src/App.tsx                   |  4 +++-
 examples/eth-dm/src/messaging/Messaging.tsx   |  2 +-
 examples/eth-dm/src/messaging/SendMessage.tsx |  6 +++---
 examples/eth-dm/src/waku.ts                   | 11 ++++++-----
 4 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/examples/eth-dm/src/App.tsx b/examples/eth-dm/src/App.tsx
index e8d0f8b704..b684bea712 100644
--- a/examples/eth-dm/src/App.tsx
+++ b/examples/eth-dm/src/App.tsx
@@ -71,7 +71,9 @@ function App() {
   const [EncryptionKeyPair, setEncryptionKeyPair] = useState<
     KeyPair | undefined
   >();
-  const [publicKeys, setPublicKeys] = useState<Map<string, string>>(new Map());
+  const [publicKeys, setPublicKeys] = useState<Map<string, Uint8Array>>(
+    new Map()
+  );
   const [messages, setMessages] = useState<Message[]>([]);
   const [address, setAddress] = useState<string>();
 
diff --git a/examples/eth-dm/src/messaging/Messaging.tsx b/examples/eth-dm/src/messaging/Messaging.tsx
index 60d07ff98b..c17d61e9ce 100644
--- a/examples/eth-dm/src/messaging/Messaging.tsx
+++ b/examples/eth-dm/src/messaging/Messaging.tsx
@@ -14,7 +14,7 @@ const useStyles = makeStyles({
 
 interface Props {
   waku: Waku | undefined;
-  recipients: Map<string, string>;
+  recipients: Map<string, Uint8Array>;
   messages: Message[];
 }
 
diff --git a/examples/eth-dm/src/messaging/SendMessage.tsx b/examples/eth-dm/src/messaging/SendMessage.tsx
index 464828479f..650597e8b2 100644
--- a/examples/eth-dm/src/messaging/SendMessage.tsx
+++ b/examples/eth-dm/src/messaging/SendMessage.tsx
@@ -25,7 +25,7 @@ const useStyles = makeStyles((theme) => ({
 export interface Props {
   waku: Waku | undefined;
   // address, public key
-  recipients: Map<string, string>;
+  recipients: Map<string, Uint8Array>;
 }
 
 export default function SendMessage({ waku, recipients }: Props) {
@@ -106,7 +106,7 @@ export default function SendMessage({ waku, recipients }: Props) {
 
 async function encodeEncryptedWakuMessage(
   message: string,
-  publicKey: string,
+  publicKey: Uint8Array,
   address: string
 ): Promise<WakuMessage> {
   const directMsg = new DirectMessage({
@@ -123,7 +123,7 @@ async function encodeEncryptedWakuMessage(
 function sendMessage(
   waku: Waku,
   recipientAddress: string,
-  recipientPublicKey: string,
+  recipientPublicKey: Uint8Array,
   message: string,
   callback: (res: boolean) => void
 ) {
diff --git a/examples/eth-dm/src/waku.ts b/examples/eth-dm/src/waku.ts
index ce0ceab93f..befe3a9a43 100644
--- a/examples/eth-dm/src/waku.ts
+++ b/examples/eth-dm/src/waku.ts
@@ -34,23 +34,24 @@ export async function initWaku(): Promise<Waku> {
 
 export function handlePublicKeyMessage(
   myAddress: string,
-  setter: Dispatch<SetStateAction<Map<string, string>>>,
+  setter: Dispatch<SetStateAction<Map<string, Uint8Array>>>,
   msg: WakuMessage
 ) {
   console.log('Public Key Message received:', msg);
   if (!msg.payload) return;
   const publicKeyMsg = PublicKeyMessage.decode(msg.payload);
   if (!publicKeyMsg) return;
-  const encryptionPublicKey = bufToHex(publicKeyMsg.encryptionPublicKey);
-  console.log(encryptionPublicKey, myAddress);
   if (myAddress && equalByteArrays(publicKeyMsg.ethAddress, myAddress)) return;
 
   const res = validatePublicKeyMessage(publicKeyMsg);
   console.log('Is Public Key Message valid?', res);
 
   if (res) {
-    setter((prevPks: Map<string, string>) => {
-      prevPks.set(bufToHex(publicKeyMsg.ethAddress), encryptionPublicKey);
+    setter((prevPks: Map<string, Uint8Array>) => {
+      prevPks.set(
+        bufToHex(publicKeyMsg.ethAddress),
+        publicKeyMsg.encryptionPublicKey
+      );
       return new Map(prevPks);
     });
   }