lets go

marlowe-lang · Jan 25, 2024 · d1e4623 · d1e4623
1 parent 50a9e1f
commit d1e4623
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 6 deletions.
diff --git a/packages/runtime/client/rest/src/contract/transaction/endpoints/collection.ts b/packages/runtime/client/rest/src/contract/transaction/endpoints/collection.ts
@@ -29,7 +29,12 @@ import { TxHeader, TxHeaderGuard } from "../header.js";
 import { ContractId, ContractIdGuard } from "@marlowe.io/runtime-core";
 import { assertGuardEqual, proxy } from "@marlowe.io/adapter/io-ts";
 import { Input } from "@marlowe.io/language-core-v1";
-import { ItemRange, Page, PageGuard } from "../../../pagination.js";
+import {
+  ItemRange,
+  ItemRangeGuard,
+  Page,
+  PageGuard,
+} from "../../../pagination.js";
 
 export type GETHeadersByRange = (
   contractId: ContractId,
@@ -74,6 +79,23 @@ const GetContractsRawResponse = t.type({
   page: PageGuard,
 });
 
+export interface GetTransactionsForContractRequest {
+  contractId: ContractId;
+  range?: ItemRange;
+}
+
+export const GetTransactionsForContractRequestGuard = assertGuardEqual(
+  proxy<GetTransactionsForContractRequest>(),
+  t.intersection([
+    t.type({
+      contractId: ContractIdGuard,
+    }),
+    t.partial({
+      range: ItemRangeGuard,
+    }),
+  ])
+);
+
 /**
  * Represents the response of the {@link index.RestClient#getTransactionsForContract | Get transactions for contract } endpoint
  * @category GetTransactionsForContractResponse

diff --git a/packages/runtime/client/rest/src/index.ts b/packages/runtime/client/rest/src/index.ts
@@ -174,8 +174,7 @@ export interface RestClient {
   //             with an AxiosError 404, we could return a nullable value or wrap the error into a custom
   //             ContractNotFound error and specify it in the docs.
   getTransactionsForContract(
-    contractId: ContractId,
-    range?: ItemRange
+    request: Transactions.GetTransactionsForContractRequest
   ): Promise<Transactions.GetTransactionsForContractResponse>;
 
   /**
@@ -514,7 +513,20 @@ export function mkRestClient(
       const { contractId, txEnvelope } = request;
       return Contract.submitContract(axiosInstance)(contractId, txEnvelope);
     },
-    getTransactionsForContract(contractId, range) {
+    getTransactionsForContract(request) {
+      if (strict) {
+        const result =
+          Transactions.GetTransactionsForContractRequestGuard.decode(request);
+        if (result._tag === "Left") {
+          throw new InvalidArgumentError(
+            result.left,
+            `Invalid argument to getTransactionsForContract(${request})`
+          );
+        } else {
+          const test: typeof request = result.right;
+        }
+      }
+      const { contractId, range } = request;
       return unsafeTaskEither(
         Transactions.getHeadersByRangeViaAxios(axiosInstance)(contractId, range)
       );

diff --git a/packages/runtime/lifecycle/src/generic/contracts.ts b/packages/runtime/lifecycle/src/generic/contracts.ts
@@ -56,8 +56,9 @@ export function mkContractLifecycle(
 const getInputHistory =
   ({ restClient }: ContractsDI) =>
   async (contractId: ContractId): Promise<SingleInputTx[]> => {
-    const transactionHeaders =
-      await restClient.getTransactionsForContract(contractId);
+    const transactionHeaders = await restClient.getTransactionsForContract({
+      contractId,
+    });
     const transactions = await Promise.all(
       transactionHeaders.transactions.map((txHeader) =>
         restClient.getContractTransactionById(