adds newly supported classic ops, tweaks route and query for history

stellar · Nov 20, 2023 · a8f793d · a8f793d
1 parent e14c2d4
commit a8f793d
Show file tree

Hide file tree

Showing 3 changed files with 76 additions and 6 deletions.
diff --git a/src/route/index.ts b/src/route/index.ts
@@ -91,7 +91,9 @@ export function initApiServer(
           reply
         ) => {
           const pubKey = request.params["pubKey"];
-          const contractIds = request.query["contract_ids"].split(",");
+          const contractIds = request.query["contract_ids"]
+            ? request.query["contract_ids"].split(",")
+            : [];
           const { data, error } = await mercuryClient.getAccountBalances(
             pubKey,
             contractIds,

diff --git a/src/service/mercury/index.ts b/src/service/mercury/index.ts
@@ -337,9 +337,11 @@ export class MercuryClient {
 
   getAccountHistory = async (pubKey: string) => {
     try {
+      const xdrPubKey = new Address(pubKey).toScVal().toXDR("base64");
       const getData = async () => {
         const data = await this.urqlClient.query(query.getAccountHistory, {
           pubKey,
+          xdrPubKey,
         });
         const errorMessage = getGraphQlError(data.error);
         if (errorMessage) {
@@ -369,6 +371,12 @@ export class MercuryClient {
     contractIds: string[],
     network: NetworkNames
   ) => {
+    if (contractIds.length < 1) {
+      return {
+        data: [],
+        error: null,
+      };
+    }
     // TODO: once classic subs include balance, add query
     try {
       const getData = async () => {

diff --git a/src/service/mercury/queries.ts b/src/service/mercury/queries.ts
@@ -51,7 +51,7 @@ export const query = {
     }
   `,
   getAccountHistory: `
-    query GetAccountHistory($pubKey: String!) {
+    query GetAccountHistory($pubKey: String!, $xdrPubKey: String!) {
       mintEvent: eventByTopic(t1: "AAAADgAAAARtaW50") {
         edges {
           node {
@@ -66,7 +66,7 @@ export const query = {
           }
         }
       }
-      transferToEvent: eventByTopic(t1: "AAAADgAAAAh0cmFuc2Zlcg==", t2: $pubKey) {
+      transferToEvent: eventByTopic(t1: "AAAADgAAAAh0cmFuc2Zlcg==", t2: $xdrPubKey) {
         edges {
           node {
             contractId
@@ -80,7 +80,7 @@ export const query = {
           }
         }
       }
-      transferFromEvent: eventByTopic(t1: "AAAADgAAAAh0cmFuc2Zlcg==", t3: $pubKey) {
+      transferFromEvent: eventByTopic(t1: "AAAADgAAAAh0cmFuc2Zlcg==", t3: $xdrPubKey) {
         edges {
           node {
             contractId
@@ -464,13 +464,73 @@ export const query = {
           limit
           lineNative
           poolshareByLinePoolShare {
-            assetA
-            assetB
+            assetByA {
+              code
+            }
+            assetByB {
+              code
+            }
             fee
           }
         }
       }
 
+      changeTrustByPublicKey(publicKeyText: $pubKey) {
+        edges {
+          node {
+            limit
+            lineAsset
+            lineNative
+            linePoolShare
+            source
+            sourceMuxed
+          }
+        }
+      }
+
+      accountMergeByPublicKey(publicKeyText: $pubKey) {
+        edges {
+          node {
+            destination
+            destinationMuxed
+            source
+            sourceMuxed
+          }
+        }
+      }
+
+      bumpSequenceByPublicKey(publicKeyText: $pubKey) {
+        edges {
+          node {
+            source
+            sourceMuxed
+            bumpTo
+          }
+        }
+      }
+
+      claimClaimableBalanceByPublicKey(publicKeyText: $pubKey) {
+        edges {
+          node {
+            source
+            sourceMuxed
+            balanceId
+          }
+        }
+      }
+
+      createClaimableBalanceByPublicKey(publicKeyText: $pubKey) {
+        edges {
+          node {
+            amount
+            asset
+            assetNative
+            source
+            sourceMuxed
+          }
+        }
+      }
+
     }
   `,
 };