fix: messaging server url picked dynamically (#255)

fetchai · Apr 25, 2023 · 34f5276 · 34f5276
1 parent fad3c68
commit 34f5276
Show file tree

Hide file tree

Showing 12 changed files with 93 additions and 15 deletions.
diff --git a/packages/background/src/messaging/handler.ts b/packages/background/src/messaging/handler.ts
@@ -49,6 +49,7 @@ const handleGetMessagingPublicKey: (
   return async (env, msg) => {
     const pubKey = await service.getPublicKey(
       env,
+      msg.memorendumUrl,
       msg.chainId,
       msg.targetAddress,
       msg.accessToken
@@ -63,6 +64,7 @@ const handleRegisterPublicKey: (
   return async (env, msg) => {
     return await service.registerPublicKey(
       env,
+      msg.memorendumUrl,
       msg.chainId,
       msg.address,
       msg.accessToken,
@@ -80,6 +82,7 @@ const handleEncryptMessagingMessage: (
 
     return await service.encryptMessage(
       env,
+      msg.memorendumUrl,
       msg.chainId,
       msg.targetAddress,
       msg.message,

diff --git a/packages/background/src/messaging/memorandum-client.ts b/packages/background/src/messaging/memorandum-client.ts
@@ -18,15 +18,21 @@ const defaultOptions: DefaultOptions = {
 };
 // export const MESSAGING_SERVER =
 //   "https://messaging-server.sandbox-london-b.fetch-ai.com/graphql";
-export const MESSAGING_SERVER = "https://messaging.fetch-ai.network/graphql";
+// export const MESSAGING_SERVER = "https://messaging.fetch-ai.network/graphql";
 // export const MESSAGING_SERVER = "http://localhost:4000/graphql";
-const client = new ApolloClient({
-  uri: MESSAGING_SERVER,
-  cache: new InMemoryCache(),
-  defaultOptions,
-});
+
+const inMemCache = new InMemoryCache();
+
+const getClient = (memorandumUrl: string) => {
+  return new ApolloClient({
+    uri: memorandumUrl,
+    cache: inMemCache,
+    defaultOptions,
+  });
+};
 
 export const registerPubKey = async (
+  memorandumURl: string,
   accessToken: string,
   messagingPubKey: string,
   walletAddress: string,
@@ -39,6 +45,7 @@ export const registerPubKey = async (
   signedObjBase64?: string
 ): Promise<void> => {
   try {
+    const client = getClient(memorandumURl);
     await client.mutate({
       mutation: gql(`mutation Mutation($publicKeyDetails: InputPublicKey!) {
         updatePublicKey(publicKeyDetails: $publicKeyDetails) {
@@ -73,12 +80,14 @@ export const registerPubKey = async (
 };
 
 export const getPubKey = async (
+  memorandumURl: string,
   accessToken: string,
   targetAddress: string,
   channelId: string,
   chainId: string
 ): Promise<PubKey> => {
   try {
+    const client = getClient(memorandumURl);
     const { data } = await client.query({
       query: gql(`query Query($address: String!, $chainId: String!  $channelId: ChannelId!) {
         publicKey(address: $address, chainId: $chainId, channelId: $channelId) {

diff --git a/packages/background/src/messaging/messages.ts b/packages/background/src/messaging/messages.ts
@@ -8,6 +8,7 @@ export class GetMessagingPublicKey extends Message<PubKey> {
   }
 
   constructor(
+    public readonly memorendumUrl: string,
     public readonly chainId: string,
     public readonly accessToken: string,
     public readonly targetAddress: string | null
@@ -36,6 +37,7 @@ export class RegisterPublicKey extends Message<PubKey> {
   }
 
   constructor(
+    public readonly memorendumUrl: string,
     public readonly chainId: string,
     public readonly accessToken: string,
     public readonly address: string,
@@ -66,6 +68,7 @@ export class EncryptMessagingMessage extends Message<string> {
   }
 
   constructor(
+    public readonly memorendumUrl: string,
     public readonly chainId: string,
     public readonly targetAddress: string,
     public readonly message: string,

diff --git a/packages/background/src/messaging/service.ts b/packages/background/src/messaging/service.ts
@@ -31,6 +31,7 @@ export class MessagingService {
    */
   public async getPublicKey(
     env: Env,
+    memorandumUrl: string,
     chainId: string,
     targetAddress: string | null,
     accessToken: string
@@ -44,7 +45,12 @@ export class MessagingService {
         chatReadReceiptSetting: true,
       };
     } else {
-      return await this.lookupPublicKey(accessToken, targetAddress, chainId);
+      return await this.lookupPublicKey(
+        memorandumUrl,
+        accessToken,
+        targetAddress,
+        chainId
+      );
     }
   }
 
@@ -59,6 +65,7 @@ export class MessagingService {
    */
   public async registerPublicKey(
     env: Env,
+    memorandumUrl: string,
     chainId: string,
     address: string,
     accessToken: string,
@@ -69,7 +76,12 @@ export class MessagingService {
     const privateKey = new PrivateKey(Buffer.from(sk));
     const pubKey = toHex(privateKey.publicKey.compressed);
 
-    const regPubKey = await this.lookupPublicKey(accessToken, address, chainId);
+    const regPubKey = await this.lookupPublicKey(
+      memorandumUrl,
+      accessToken,
+      address,
+      chainId
+    );
     if (
       !regPubKey.privacySetting ||
       !regPubKey.publicKey ||
@@ -117,6 +129,7 @@ export class MessagingService {
       }
 
       await registerPubKey(
+        memorandumUrl,
         accessToken,
         pubKey,
         address,
@@ -177,6 +190,7 @@ export class MessagingService {
    */
   async encryptMessage(
     _env: Env,
+    memorandumUrl: string,
     _chainId: string,
     targetAddress: string,
     message: string,
@@ -185,6 +199,7 @@ export class MessagingService {
     const rawMessage = Buffer.from(fromBase64(message));
 
     const targetPublicKey = await this.lookupPublicKey(
+      memorandumUrl,
       accessToken,
       targetAddress,
       _chainId
@@ -231,6 +246,7 @@ export class MessagingService {
    * @protected
    */
   protected async lookupPublicKey(
+    memorandumUrl: string,
     accessToken: string,
     targetAddress: string,
     chainId: string
@@ -247,6 +263,7 @@ export class MessagingService {
     // Step 2. Cache miss, fetch the public key from the memorandum service and
     //         update the cache
     targetPublicKey = await getPubKey(
+      memorandumUrl,
       accessToken,
       targetAddress,
       MESSAGE_CHANNEL_ID,

diff --git a/packages/extension/src/components/chat/chat-init-popup.tsx b/packages/extension/src/components/chat/chat-init-popup.tsx
@@ -15,6 +15,7 @@ import {
 import privacyIcon from "@assets/hello.png";
 import { useStore } from "../../stores";
 import style from "./style.module.scss";
+import { GRAPHQL_URL } from "../../config.ui.var";
 
 export const ChatInitPopup = ({
   openDialog,
@@ -52,6 +53,7 @@ export const ChatInitPopup = ({
       const messagingPubKey = await requester.sendMessage(
         BACKGROUND_PORT,
         new RegisterPublicKey(
+          GRAPHQL_URL.MESSAGING_SERVER,
           current.chainId,
           userState.accessToken,
           walletAddress,

diff --git a/packages/extension/src/pages/setting/chat/privacy/index.tsx b/packages/extension/src/pages/setting/chat/privacy/index.tsx
@@ -15,6 +15,7 @@ import { HeaderLayout } from "@layouts/index";
 import { useStore } from "../../../../stores";
 import { PageButton } from "../../page-button";
 import style from "./style.module.scss";
+import { GRAPHQL_URL } from "../../../../config.ui.var";
 
 export const Privacy: FunctionComponent = observer(() => {
   // const language = useLanguage();
@@ -46,6 +47,7 @@ export const Privacy: FunctionComponent = observer(() => {
       const messagingPubKey = await requester.sendMessage(
         BACKGROUND_PORT,
         new RegisterPublicKey(
+          GRAPHQL_URL.MESSAGING_SERVER,
           chainStore.current.chainId,
           userState.accessToken,
           walletAddress,

diff --git a/packages/extension/src/pages/setting/chat/readRecipt/index.tsx b/packages/extension/src/pages/setting/chat/readRecipt/index.tsx
@@ -15,6 +15,7 @@ import { PageButton } from "../../page-button";
 import { useStore } from "../../../../stores";
 import style from "./style.module.scss";
 import amplitude from "amplitude-js";
+import { GRAPHQL_URL } from "../../../../config.ui.var";
 
 export const ReadRecipt: FunctionComponent = observer(() => {
   const history = useHistory();
@@ -45,6 +46,7 @@ export const ReadRecipt: FunctionComponent = observer(() => {
       const messagingPubKey = await requester.sendMessage(
         BACKGROUND_PORT,
         new RegisterPublicKey(
+          GRAPHQL_URL.MESSAGING_SERVER,
           chainStore.current.chainId,
           userState.accessToken,
           walletAddress,

diff --git a/packages/extension/src/utils/auth.ts b/packages/extension/src/utils/auth.ts
@@ -10,6 +10,7 @@ import { InExtensionMessageRequester } from "@keplr-wallet/router-extension";
 import { rawSecp256k1PubkeyToRawAddress } from "@cosmjs/amino";
 import { toBase64, Bech32, fromHex } from "@cosmjs/encoding";
 import { serializeSignDoc } from "@cosmjs/launchpad";
+import { GRAPHQL_URL } from "../config.ui.var";
 
 declare let window: Window;
 
@@ -86,7 +87,7 @@ export const getJWT = async (chainId: string, url: string) => {
 
   const pubKey = await requester.sendMessage(
     BACKGROUND_PORT,
-    new GetMessagingPublicKey(chainId, "", null)
+    new GetMessagingPublicKey(GRAPHQL_URL.MESSAGING_SERVER, chainId, "", null)
   );
 
   if (!pubKey.publicKey) throw new Error("public key not found");

diff --git a/packages/extension/src/utils/encrypt-group.ts b/packages/extension/src/utils/encrypt-group.ts
@@ -11,6 +11,7 @@ import {
   decryptEncryptedSymmetricKey,
   encryptGroupData,
 } from "./symmetric-key";
+import { GRAPHQL_URL } from "../config.ui.var";
 
 export interface GroupTimestampUpdateEnvelope {
   data: string; // base64 encoded
@@ -78,12 +79,22 @@ export async function encryptGroupTimestampToEnvelope(
   // lookup both our (sender) and target public keys
   const senderPublicKey = await requester.sendMessage(
     BACKGROUND_PORT,
-    new GetMessagingPublicKey(chainId, accessToken, senderAddress)
+    new GetMessagingPublicKey(
+      GRAPHQL_URL.MESSAGING_SERVER,
+      chainId,
+      accessToken,
+      senderAddress
+    )
   );
 
   const targetPublicKey = await requester.sendMessage(
     BACKGROUND_PORT,
-    new GetMessagingPublicKey(chainId, accessToken, targetAddress)
+    new GetMessagingPublicKey(
+      GRAPHQL_URL.MESSAGING_SERVER,
+      chainId,
+      accessToken,
+      targetAddress
+    )
   );
 
   if (!senderPublicKey.publicKey || !targetPublicKey.publicKey) {
@@ -100,6 +111,7 @@ export async function encryptGroupTimestampToEnvelope(
   const senderCipher = await requester.sendMessage(
     BACKGROUND_PORT,
     new EncryptMessagingMessage(
+      GRAPHQL_URL.MESSAGING_SERVER,
       chainId,
       senderAddress,
       toBase64(toUtf8(JSON.stringify(message))),
@@ -111,6 +123,7 @@ export async function encryptGroupTimestampToEnvelope(
   const targetCipher = await requester.sendMessage(
     BACKGROUND_PORT,
     new EncryptMessagingMessage(
+      GRAPHQL_URL.MESSAGING_SERVER,
       chainId,
       targetAddress,
       toBase64(toUtf8(JSON.stringify(message))),
@@ -175,7 +188,12 @@ export async function encryptGroupMessageToEnvelope(
   // lookup both our (sender) and target public keys
   const senderPublicKey = await requester.sendMessage(
     BACKGROUND_PORT,
-    new GetMessagingPublicKey(chainId, accessToken, senderAddress)
+    new GetMessagingPublicKey(
+      GRAPHQL_URL.MESSAGING_SERVER,
+      chainId,
+      accessToken,
+      senderAddress
+    )
   );
 
   if (!senderPublicKey.publicKey) {

diff --git a/packages/extension/src/utils/encrypt-message.ts b/packages/extension/src/utils/encrypt-message.ts
@@ -7,6 +7,7 @@ import {
   SignMessagingPayload,
 } from "@keplr-wallet/background/build/messaging";
 import { MESSAGE_CHANNEL_ID } from "@keplr-wallet/background/build/messaging/constants";
+import { GRAPHQL_URL } from "../config.ui.var";
 
 export interface MessageEnvelope {
   data: string; // base64 encoded
@@ -70,12 +71,22 @@ export async function encryptToEnvelope(
   // lookup both our (sender) and target public keys
   const senderPublicKey = await requester.sendMessage(
     BACKGROUND_PORT,
-    new GetMessagingPublicKey(chainId, accessToken, senderAddress)
+    new GetMessagingPublicKey(
+      GRAPHQL_URL.MESSAGING_SERVER,
+      chainId,
+      accessToken,
+      senderAddress
+    )
   );
 
   const targetPublicKey = await requester.sendMessage(
     BACKGROUND_PORT,
-    new GetMessagingPublicKey(chainId, accessToken, targetAddress)
+    new GetMessagingPublicKey(
+      GRAPHQL_URL.MESSAGING_SERVER,
+      chainId,
+      accessToken,
+      targetAddress
+    )
   );
 
   if (!senderPublicKey.publicKey || !targetPublicKey.publicKey) {
@@ -99,6 +110,7 @@ export async function encryptToEnvelope(
   const senderCipher = await requester.sendMessage(
     BACKGROUND_PORT,
     new EncryptMessagingMessage(
+      GRAPHQL_URL.MESSAGING_SERVER,
       chainId,
       senderAddress,
       toBase64(toUtf8(JSON.stringify(message))),
@@ -110,6 +122,7 @@ export async function encryptToEnvelope(
   const targetCipher = await requester.sendMessage(
     BACKGROUND_PORT,
     new EncryptMessagingMessage(
+      GRAPHQL_URL.MESSAGING_SERVER,
       chainId,
       targetAddress,
       toBase64(toUtf8(JSON.stringify(message))),

diff --git a/packages/extension/src/utils/fetch-public-key.ts b/packages/extension/src/utils/fetch-public-key.ts
@@ -1,6 +1,7 @@
 import { BACKGROUND_PORT } from "@keplr-wallet/router";
 import { InExtensionMessageRequester } from "@keplr-wallet/router-extension";
 import { GetMessagingPublicKey } from "@keplr-wallet/background/build/messaging";
+import { GRAPHQL_URL } from "../config.ui.var";
 
 export const fetchPublicKey = async (
   accessToken: string,
@@ -11,7 +12,12 @@ export const fetchPublicKey = async (
     const requester = new InExtensionMessageRequester();
     return await requester.sendMessage(
       BACKGROUND_PORT,
-      new GetMessagingPublicKey(chainId, accessToken, targetAddress)
+      new GetMessagingPublicKey(
+        GRAPHQL_URL.MESSAGING_SERVER,
+        chainId,
+        accessToken,
+        targetAddress
+      )
     );
   } catch (error: any) {
     console.log(error);

diff --git a/packages/extension/src/utils/symmetric-key.ts b/packages/extension/src/utils/symmetric-key.ts
@@ -5,6 +5,7 @@ import { InExtensionMessageRequester } from "@keplr-wallet/router-extension";
 import crypto from "crypto";
 import { GroupMembers } from "@chatTypes";
 import { decryptMessageContent } from "./decrypt-message";
+import { GRAPHQL_URL } from "../config.ui.var";
 
 function generateSymmetricKey() {
   const secret = "fetchwallet";
@@ -34,6 +35,7 @@ export async function encryptSymmetricKey(
 ) {
   const requester = new InExtensionMessageRequester();
   const encryptMsg = new EncryptMessagingMessage(
+    GRAPHQL_URL.MESSAGING_SERVER,
     chainId,
     address,
     toBase64(toUtf8(JSON.stringify(symmetricKey))),