refactor(sdk): typed wasm-sdk params

packages/js-evo-sdk/src/contracts/facade.ts

@@ -1,6 +1,7 @@
 import * as wasm from '../wasm.js';
 import { asJsonString } from '../util.js';
 import type { EvoSDK } from '../sdk.js';
+import type { DataContractHistoryQuery } from '../wasm.js';
 
 export class ContractsFacade {
   private sdk: EvoSDK;
@@ -19,16 +20,14 @@ export class ContractsFacade {
     return w.getDataContractWithProofInfo(contractId);
   }
 
-  async getHistory(args: { contractId: string; limit?: number; startAtMs?: number | bigint }): Promise<any> {
-    const { contractId, limit, startAtMs } = args;
+  async getHistory(query: DataContractHistoryQuery): Promise<any> {
     const w = await this.sdk.getWasmSdkConnected();
-    return w.getDataContractHistory(contractId, limit ?? null, startAtMs != null ? BigInt(startAtMs) : null);
+    return w.getDataContractHistory(query);
   }
 
-  async getHistoryWithProof(args: { contractId: string; limit?: number; startAtMs?: number | bigint }): Promise<any> {
-    const { contractId, limit, startAtMs } = args;
+  async getHistoryWithProof(query: DataContractHistoryQuery): Promise<any> {
     const w = await this.sdk.getWasmSdkConnected();
-    return w.getDataContractHistoryWithProofInfo(contractId, limit ?? null, startAtMs != null ? BigInt(startAtMs) : null);
+    return w.getDataContractHistoryWithProofInfo(query);
   }
 
   async getMany(contractIds: string[]): Promise<any> {

packages/js-evo-sdk/src/documents/facade.ts

@@ -1,5 +1,6 @@
 import { asJsonString } from '../util.js';
 import type { EvoSDK } from '../sdk.js';
+import type { DocumentsQuery } from '../wasm.js';
 
 export class DocumentsFacade {
   private sdk: EvoSDK;
@@ -9,52 +10,14 @@ export class DocumentsFacade {
   }
 
   // Query many documents
-  async query(params: {
-    contractId: string;
-    type: string;
-    where?: unknown;
-    orderBy?: unknown;
-    limit?: number;
-    startAfter?: string;
-    startAt?: string;
-  }): Promise<any> {
-    const { contractId, type, where, orderBy, limit, startAfter, startAt } = params;
-    const whereJson = asJsonString(where);
-    const orderJson = asJsonString(orderBy);
+  async query(query: DocumentsQuery): Promise<any> {
     const w = await this.sdk.getWasmSdkConnected();
-    return w.getDocuments(
-      contractId,
-      type,
-      whereJson ?? null,
-      orderJson ?? null,
-      limit ?? null,
-      startAfter ?? null,
-      startAt ?? null,
-    );
+    return w.getDocuments(query);
   }
 
-  async queryWithProof(params: {
-    contractId: string;
-    type: string;
-    where?: unknown;
-    orderBy?: unknown;
-    limit?: number;
-    startAfter?: string;
-    startAt?: string;
-  }): Promise<any> {
-    const { contractId, type, where, orderBy, limit, startAfter, startAt } = params;
-    const whereJson = asJsonString(where);
-    const orderJson = asJsonString(orderBy);
+  async queryWithProof(query: DocumentsQuery): Promise<any> {
     const w = await this.sdk.getWasmSdkConnected();
-    return w.getDocumentsWithProofInfo(
-      contractId,
-      type,
-      whereJson ?? null,
-      orderJson ?? null,
-      limit ?? null,
-      startAfter ?? null,
-      startAt ?? null,
-    );
+    return w.getDocumentsWithProofInfo(query);
   }
 
   async get(contractId: string, type: string, documentId: string): Promise<any> {

packages/js-evo-sdk/src/epoch/facade.ts

@@ -1,31 +1,32 @@
 import type { EvoSDK } from '../sdk.js';
+import type {
+  EpochsQuery,
+  FinalizedEpochsQuery,
+  EvonodeProposedBlocksRangeQuery,
+} from '../wasm.js';
 
 export class EpochFacade {
   private sdk: EvoSDK;
   constructor(sdk: EvoSDK) { this.sdk = sdk; }
 
-  async epochsInfo(params: { startEpoch?: number; count?: number; ascending?: boolean } = {}): Promise<any> {
-    const { startEpoch, count, ascending } = params;
+  async epochsInfo(query: EpochsQuery = {}): Promise<any> {
     const w = await this.sdk.getWasmSdkConnected();
-    return w.getEpochsInfo(startEpoch ?? null, count ?? null, ascending ?? null);
+    return w.getEpochsInfo(query);
   }
 
-  async epochsInfoWithProof(params: { startEpoch?: number; count?: number; ascending?: boolean } = {}): Promise<any> {
-    const { startEpoch, count, ascending } = params;
+  async epochsInfoWithProof(query: EpochsQuery = {}): Promise<any> {
     const w = await this.sdk.getWasmSdkConnected();
-    return w.getEpochsInfoWithProofInfo(startEpoch ?? null, count ?? null, ascending ?? null);
+    return w.getEpochsInfoWithProofInfo(query);
   }
 
-  async finalizedInfos(params: { startEpoch?: number; count?: number; ascending?: boolean } = {}): Promise<any> {
-    const { startEpoch, count, ascending } = params;
+  async finalizedInfos(query: FinalizedEpochsQuery): Promise<any> {
     const w = await this.sdk.getWasmSdkConnected();
-    return w.getFinalizedEpochInfos(startEpoch ?? null, count ?? null, ascending ?? null);
+    return w.getFinalizedEpochInfos(query);
   }
 
-  async finalizedInfosWithProof(params: { startEpoch?: number; count?: number; ascending?: boolean } = {}): Promise<any> {
-    const { startEpoch, count, ascending } = params;
+  async finalizedInfosWithProof(query: FinalizedEpochsQuery): Promise<any> {
     const w = await this.sdk.getWasmSdkConnected();
-    return w.getFinalizedEpochInfosWithProofInfo(startEpoch ?? null, count ?? null, ascending ?? null);
+    return w.getFinalizedEpochInfosWithProofInfo(query);
   }
 
   async current(): Promise<any> { const w = await this.sdk.getWasmSdkConnected(); return w.getCurrentEpoch(); }
@@ -41,15 +42,13 @@ export class EpochFacade {
     return w.getEvonodesProposedEpochBlocksByIdsWithProofInfo(epoch, ids);
   }
 
-  async evonodesProposedBlocksByRange(epoch: number, opts: { limit?: number; startAfter?: string; orderAscending?: boolean } = {}): Promise<any> {
-    const { limit, startAfter, orderAscending } = opts;
+  async evonodesProposedBlocksByRange(query: EvonodeProposedBlocksRangeQuery): Promise<any> {
     const w = await this.sdk.getWasmSdkConnected();
-    return w.getEvonodesProposedEpochBlocksByRange(epoch, limit ?? null, startAfter ?? null, orderAscending ?? null);
+    return w.getEvonodesProposedEpochBlocksByRange(query);
   }
 
-  async evonodesProposedBlocksByRangeWithProof(epoch: number, opts: { limit?: number; startAfter?: string; orderAscending?: boolean } = {}): Promise<any> {
-    const { limit, startAfter, orderAscending } = opts;
+  async evonodesProposedBlocksByRangeWithProof(query: EvonodeProposedBlocksRangeQuery): Promise<any> {
     const w = await this.sdk.getWasmSdkConnected();
-    return w.getEvonodesProposedEpochBlocksByRangeWithProofInfo(epoch, limit ?? null, startAfter ?? null, orderAscending ?? null);
+    return w.getEvonodesProposedEpochBlocksByRangeWithProofInfo(query);
   }
 }

packages/js-evo-sdk/src/group/facade.ts

@@ -1,29 +1,13 @@
+import type {
+  ContestedResourceVotersForIdentityQuery,
+  GroupActionsQuery,
+  GroupInfosQuery,
+  GroupMembersQuery,
+  IdentityGroupsQuery,
+  VotePollsByDocumentTypeQuery,
+} from '../wasm.js';
 import type { EvoSDK } from '../sdk.js';
 
-interface VotePollsByDocumentTypeQueryInput {
-  dataContractId: string;
-  documentTypeName: string;
-  indexName: string;
-  startIndexValues?: unknown[];
-  endIndexValues?: unknown[];
-  startAtValue?: unknown;
-  startAtValueIncluded?: boolean;
-  limit?: number;
-  orderAscending?: boolean;
-}
-
-interface ContestedResourceVotersForIdentityQueryInput {
-  dataContractId: string;
-  documentTypeName: string;
-  indexName: string;
-  indexValues?: unknown[];
-  contestantId: string;
-  limit?: number;
-  startAtVoterId?: string;
-  startAtIncluded?: boolean;
-  orderAscending?: boolean;
-}
-
 export class GroupFacade {
   private sdk: EvoSDK;
   constructor(sdk: EvoSDK) { this.sdk = sdk; }
@@ -38,60 +22,44 @@ export class GroupFacade {
     return w.getGroupInfoWithProofInfo(contractId, groupContractPosition);
   }
 
-  async infos(contractId: string, startAtInfo?: unknown, count?: number): Promise<any> {
+  async infos(query: GroupInfosQuery): Promise<any> {
     const w = await this.sdk.getWasmSdkConnected();
-    return w.getGroupInfos(contractId, startAtInfo ?? null, count ?? null);
+    return w.getGroupInfos(query);
   }
 
-  async infosWithProof(contractId: string, startAtInfo?: unknown, count?: number): Promise<any> {
+  async infosWithProof(query: GroupInfosQuery): Promise<any> {
     const w = await this.sdk.getWasmSdkConnected();
-    return w.getGroupInfosWithProofInfo(contractId, startAtInfo ?? null, count ?? null);
+    return w.getGroupInfosWithProofInfo(query);
   }
 
-  async members(contractId: string, groupContractPosition: number, opts: { memberIds?: string[]; startAt?: string; limit?: number } = {}): Promise<any> {
-    const { memberIds, startAt, limit } = opts;
+  async members(query: GroupMembersQuery): Promise<any> {
     const w = await this.sdk.getWasmSdkConnected();
-    return w.getGroupMembers(contractId, groupContractPosition, memberIds ?? null, startAt ?? null, limit ?? null);
+    return w.getGroupMembers(query);
   }
 
-  async membersWithProof(contractId: string, groupContractPosition: number, opts: { memberIds?: string[]; startAt?: string; limit?: number } = {}): Promise<any> {
-    const { memberIds, startAt, limit } = opts;
+  async membersWithProof(query: GroupMembersQuery): Promise<any> {
     const w = await this.sdk.getWasmSdkConnected();
-    return w.getGroupMembersWithProofInfo(contractId, groupContractPosition, memberIds ?? null, startAt ?? null, limit ?? null);
+    return w.getGroupMembersWithProofInfo(query);
   }
 
-  async identityGroups(identityId: string, opts: { memberDataContracts?: string[]; ownerDataContracts?: string[]; moderatorDataContracts?: string[] } = {}): Promise<any> {
-    const { memberDataContracts, ownerDataContracts, moderatorDataContracts } = opts;
+  async identityGroups(query: IdentityGroupsQuery): Promise<any> {
     const w = await this.sdk.getWasmSdkConnected();
-    return w.getIdentityGroups(
-      identityId,
-      memberDataContracts ?? null,
-      ownerDataContracts ?? null,
-      moderatorDataContracts ?? null,
-    );
+    return w.getIdentityGroups(query);
   }
 
-  async identityGroupsWithProof(identityId: string, opts: { memberDataContracts?: string[]; ownerDataContracts?: string[]; moderatorDataContracts?: string[] } = {}): Promise<any> {
-    const { memberDataContracts, ownerDataContracts, moderatorDataContracts } = opts;
+  async identityGroupsWithProof(query: IdentityGroupsQuery): Promise<any> {
     const w = await this.sdk.getWasmSdkConnected();
-    return w.getIdentityGroupsWithProofInfo(
-      identityId,
-      memberDataContracts ?? null,
-      ownerDataContracts ?? null,
-      moderatorDataContracts ?? null,
-    );
+    return w.getIdentityGroupsWithProofInfo(query);
   }
 
-  async actions(contractId: string, groupContractPosition: number, status: string, opts: { startAtInfo?: unknown; count?: number } = {}): Promise<any> {
-    const { startAtInfo, count } = opts;
+  async actions(query: GroupActionsQuery): Promise<any> {
     const w = await this.sdk.getWasmSdkConnected();
-    return w.getGroupActions(contractId, groupContractPosition, status, startAtInfo ?? null, count ?? null);
+    return w.getGroupActions(query);
   }
 
-  async actionsWithProof(contractId: string, groupContractPosition: number, status: string, opts: { startAtInfo?: unknown; count?: number } = {}): Promise<any> {
-    const { startAtInfo, count } = opts;
+  async actionsWithProof(query: GroupActionsQuery): Promise<any> {
     const w = await this.sdk.getWasmSdkConnected();
-    return w.getGroupActionsWithProofInfo(contractId, groupContractPosition, status, startAtInfo ?? null, count ?? null);
+    return w.getGroupActionsWithProofInfo(query);
   }
 
   async actionSigners(contractId: string, groupContractPosition: number, status: string, actionId: string): Promise<any> {
@@ -114,63 +82,23 @@ export class GroupFacade {
     return w.getGroupsDataContractsWithProofInfo(dataContractIds);
   }
 
-  async contestedResources(params: { documentTypeName: string; contractId: string; indexName: string; startAtValue?: Uint8Array; limit?: number; orderAscending?: boolean }): Promise<any> {
-    const { documentTypeName, contractId, indexName, startAtValue, limit, orderAscending } = params;
+  async contestedResources(query: VotePollsByDocumentTypeQuery): Promise<any> {
     const w = await this.sdk.getWasmSdkConnected();
-    const query: VotePollsByDocumentTypeQueryInput = {
-      dataContractId: contractId,
-      documentTypeName,
-      indexName,
-    };
-    if (startAtValue !== undefined) query.startAtValue = startAtValue;
-    if (limit !== undefined) query.limit = limit;
-    if (orderAscending !== undefined) query.orderAscending = orderAscending;
     return w.getContestedResources(query);
   }
 
-  async contestedResourcesWithProof(params: { documentTypeName: string; contractId: string; indexName: string; startAtValue?: Uint8Array; limit?: number; orderAscending?: boolean }): Promise<any> {
-    const { documentTypeName, contractId, indexName, startAtValue, limit, orderAscending } = params;
+  async contestedResourcesWithProof(query: VotePollsByDocumentTypeQuery): Promise<any> {
     const w = await this.sdk.getWasmSdkConnected();
-    const query: VotePollsByDocumentTypeQueryInput = {
-      dataContractId: contractId,
-      documentTypeName,
-      indexName,
-    };
-    if (startAtValue !== undefined) query.startAtValue = startAtValue;
-    if (limit !== undefined) query.limit = limit;
-    if (orderAscending !== undefined) query.orderAscending = orderAscending;
     return w.getContestedResourcesWithProofInfo(query);
   }
 
-  async contestedResourceVotersForIdentity(params: { contractId: string; documentTypeName: string; indexName: string; indexValues: any[]; contestantId: string; startAtVoterInfo?: string; limit?: number; orderAscending?: boolean }): Promise<any> {
-    const { contractId, documentTypeName, indexName, indexValues, contestantId, startAtVoterInfo, limit, orderAscending } = params;
+  async contestedResourceVotersForIdentity(query: ContestedResourceVotersForIdentityQuery): Promise<any> {
     const w = await this.sdk.getWasmSdkConnected();
-    const query: ContestedResourceVotersForIdentityQueryInput = {
-      dataContractId: contractId,
-      documentTypeName,
-      indexName,
-      indexValues,
-      contestantId,
-    };
-    if (startAtVoterInfo !== undefined) query.startAtVoterId = startAtVoterInfo;
-    if (limit !== undefined) query.limit = limit;
-    if (orderAscending !== undefined) query.orderAscending = orderAscending;
     return w.getContestedResourceVotersForIdentity(query);
   }
 
-  async contestedResourceVotersForIdentityWithProof(params: { contractId: string; documentTypeName: string; indexName: string; indexValues: any[]; contestantId: string; startAtIdentifierInfo?: string; count?: number; orderAscending?: boolean }): Promise<any> {
-    const { contractId, documentTypeName, indexName, indexValues, contestantId, startAtIdentifierInfo, count, orderAscending } = params;
+  async contestedResourceVotersForIdentityWithProof(query: ContestedResourceVotersForIdentityQuery): Promise<any> {
     const w = await this.sdk.getWasmSdkConnected();
-    const query: ContestedResourceVotersForIdentityQueryInput = {
-      dataContractId: contractId,
-      documentTypeName,
-      indexName,
-      indexValues,
-      contestantId,
-    };
-    if (startAtIdentifierInfo !== undefined) query.startAtVoterId = startAtIdentifierInfo;
-    if (count !== undefined) query.limit = count;
-    if (orderAscending !== undefined) query.orderAscending = orderAscending;
     return w.getContestedResourceVotersForIdentityWithProofInfo(query);
   }
 }