fixes query param validator to accept multiple contract IDs, tweaks h…

…istory transformer to skip over host fn invocations that are not invokeHostFn
stellar · Jan 31, 2024 · 6d23446 · 6d23446
1 parent 1d81064
commit 6d23446
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 34 deletions.
diff --git a/src/route/index.ts b/src/route/index.ts
@@ -162,8 +162,9 @@ export async function initApiServer(
           },
           querystring: {
             ["contract_ids"]: {
-              type: "string",
-              validator: (qStr: string) => qStr.split(",").every(isContractId),
+              type: "array",
+              validator: (qStr: Array<unknown>) =>
+                qStr.map((q) => String(q)).every(isContractId),
             },
             ["network"]: {
               type: "string",
@@ -181,7 +182,7 @@ export async function initApiServer(
           request: FastifyRequest<{
             Params: { ["pubKey"]: string };
             Querystring: {
-              ["contract_ids"]: string;
+              ["contract_ids"]: string[];
               ["network"]: NetworkNames;
               ["horizon_url"]?: string;
               ["soroban_url"]?: string;
@@ -191,9 +192,7 @@ export async function initApiServer(
         ) => {
           const pubKey = request.params["pubKey"];
           const { network, horizon_url, soroban_url } = request.query;
-          const contractIds = request.query["contract_ids"]
-            ? request.query["contract_ids"].split(",")
-            : [];
+          const contractIds = request.query["contract_ids"] || ([] as string[]);
           const { data, error } = await mercuryClient.getAccountBalances(
             pubKey,
             contractIds,

diff --git a/src/service/mercury/helpers/transformers.ts b/src/service/mercury/helpers/transformers.ts
@@ -866,34 +866,44 @@ const transformAccountHistory = async (
 ): Promise<Partial<Horizon.ServerApi.OperationRecord>[]> => {
   const invokeHostFnEdges =
     rawResponse.data?.invokeHostFnByPublicKey.edges || [];
-  const invokeHostFn = invokeHostFnEdges.map((edge) => {
-    const hostFn = xdr.HostFunction.fromXDR(
-      Buffer.from(edge.node.hostFunction, "base64")
-    );
-    const invocation = hostFn.invokeContract();
-    const fnName = invocation.functionName().toString();
-    return {
-      auth: edge.node.auth,
-      created_at: new Date(
-        edge.node.txInfoByTx.ledgerByLedger.closeTime * 1000
-      ).toISOString(),
-      sorobanMeta: edge.node.sorobanMeta,
-      source_account: edge.node.accountBySource.publickey,
-      tx: edge.node.tx,
-      type: "invoke_host_function",
-      type_i: 24,
-      id: edge.node.opId,
-      transaction_attr: {
-        contractId: StrKey.encodeContract(
-          invocation.contractAddress().contractId()
-        ),
-        fnName,
-        args: getOpArgs(fnName, invocation.args()),
-        operation_count: edge.node.txInfoByTx.opCount,
-        fee_charged: edge.node.txInfoByTx.fee,
-      },
-    } as Partial<Horizon.ServerApi.InvokeHostFunctionOperationRecord>;
-  });
+  const invokeHostFn = invokeHostFnEdges
+    .map((edge) => {
+      const hostFn = xdr.HostFunction.fromXDR(
+        Buffer.from(edge.node.hostFunction, "base64")
+      );
+
+      // we only want to keep these history entries if the Host Fn is
+      // for invoking a contract, we dont show contract create or wasm upload in wallet history right now.
+      try {
+        const invocation = hostFn.invokeContract();
+        const fnName = invocation.functionName().toString();
+        return {
+          auth: edge.node.auth,
+          created_at: new Date(
+            edge.node.txInfoByTx.ledgerByLedger.closeTime * 1000
+          ).toISOString(),
+          sorobanMeta: edge.node.sorobanMeta,
+          source_account: edge.node.accountBySource.publickey,
+          tx: edge.node.tx,
+          type: "invoke_host_function",
+          type_i: 24,
+          id: edge.node.opId,
+          transaction_attr: {
+            contractId: StrKey.encodeContract(
+              invocation.contractAddress().contractId()
+            ),
+            fnName,
+            args: getOpArgs(fnName, invocation.args()),
+            operation_count: edge.node.txInfoByTx.opCount,
+            fee_charged: edge.node.txInfoByTx.fee,
+          },
+        } as Partial<Horizon.ServerApi.InvokeHostFunctionOperationRecord>;
+      } catch (error) {
+        return null;
+      }
+    })
+    // filters out cases where the Host fn is not a contract invocation
+    .filter(Boolean);
 
   const createAccountEdges =
     rawResponse.data?.createAccountByPublicKey.edges || [];