feat(sdk): entities for Evo SDK

.github/package-filters/rs-packages-direct.yml

@@ -25,6 +25,9 @@ dpp:
 wasm-dpp:
   - packages/wasm-dpp/**
 
+wasm-dpp2:
+  - packages/wasm-dpp2/**
+
 drive:
   - packages/rs-drive/**
 

.github/package-filters/rs-packages-no-workflows.yml

@@ -39,6 +39,10 @@ wasm-dpp:
   - packages/wasm-dpp/**
   - *dpp
 
+wasm-dpp2:
+  - packages/wasm-dpp2/**
+  - *dpp
+
 drive: &drive
   - packages/rs-drive/**
   - *dpp

.github/package-filters/rs-packages.yml

@@ -48,6 +48,11 @@ wasm-dpp:
   - packages/wasm-dpp/**
   - *dpp
 
+wasm-dpp2:
+  - .github/workflows/tests*
+  - packages/wasm-dpp2/**
+  - *dpp
+
 drive: &drive
   - .github/workflows/tests*
   - packages/rs-drive/**

Cargo.toml

@@ -24,6 +24,7 @@ members = [
     "packages/rs-context-provider",
     "packages/rs-sdk-trusted-context-provider",
     "packages/wasm-dpp",
+    "packages/wasm-dpp2",
     "packages/rs-dapi-client",
     "packages/rs-sdk",
     "packages/strategy-tests",

Dockerfile

@@ -393,6 +393,7 @@ COPY --parents \
     packages/rs-sdk-trusted-context-provider \
     packages/rs-platform-wallet \
     packages/wasm-dpp \
+    packages/wasm-dpp2 \
     packages/wasm-drive-verify \
     packages/rs-dapi-client \
     packages/rs-sdk \
@@ -484,6 +485,7 @@ COPY --parents \
     packages/rs-sdk-trusted-context-provider \
     packages/rs-platform-wallet \
     packages/wasm-dpp \
+    packages/wasm-dpp2 \
     packages/wasm-drive-verify \
     packages/rs-dapi-client \
     packages/rs-sdk \
@@ -569,6 +571,7 @@ COPY --parents \
     packages/rs-json-schema-compatibility-validator \
     # Common
     packages/wasm-dpp \
+    packages/wasm-dpp2 \
     packages/dashpay-contract \
     packages/withdrawals-contract \
     packages/wallet-utils-contract \
@@ -604,7 +607,8 @@ RUN --mount=type=cache,sharing=shared,id=cargo_registry_index,target=${CARGO_HOM
     yarn install --inline-builds && \
     cp -R /platform/.yarn/unplugged /tmp/ && \
     export SKIP_GRPC_PROTO_BUILD=1 && \
-    yarn build && \
+    # Build JS Dash SDK and dependencies
+    yarn run ultra -r --filter '+dash' --build && \
     if [[ -x /usr/bin/sccache ]]; then sccache --show-stats; fi && \
     # Remove target directory and rust packages to save space
     rm -rf target packages/rs-*
@@ -844,6 +848,7 @@ COPY --parents \
     packages/rs-context-provider \
     packages/rs-sdk-trusted-context-provider \
     packages/wasm-dpp \
+    packages/wasm-dpp2 \
     packages/wasm-drive-verify \
     packages/rs-dapi-client \
     packages/rs-sdk \

package.json

@@ -66,6 +66,7 @@
     "packages/masternode-reward-shares-contract",
     "packages/dash-spv",
     "packages/wasm-dpp",
+    "packages/wasm-dpp2",
     "packages/withdrawals-contract",
     "packages/token-history-contract",
     "packages/keyword-search-contract",

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

@@ -9,7 +9,7 @@ export class ContractsFacade {
     this.sdk = sdk;
   }
 
-  async fetch(contractId: string): Promise<wasm.DataContract> {
+  async fetch(contractId: string): Promise<wasm.DataContract | undefined> {
     const w = await this.sdk.getWasmSdkConnected();
     return w.getDataContract(contractId);
   }
@@ -22,23 +22,13 @@ export class ContractsFacade {
   async getHistory(args: { contractId: string; limit?: number; startAtMs?: number | bigint }): Promise<any> {
     const { contractId, limit, startAtMs } = args;
     const w = await this.sdk.getWasmSdkConnected();
-    return w.getDataContractHistory(
-      contractId,
-      limit ?? null,
-      null,
-      startAtMs != null ? BigInt(startAtMs) : null,
-    );
+    return w.getDataContractHistory(contractId, limit ?? null, startAtMs != null ? BigInt(startAtMs) : null);
   }
 
   async getHistoryWithProof(args: { contractId: string; limit?: number; startAtMs?: number | bigint }): Promise<any> {
     const { contractId, limit, startAtMs } = args;
     const w = await this.sdk.getWasmSdkConnected();
-    return w.getDataContractHistoryWithProofInfo(
-      contractId,
-      limit ?? null,
-      null,
-      startAtMs != null ? BigInt(startAtMs) : null,
-    );
+    return w.getDataContractHistoryWithProofInfo(contractId, limit ?? null, startAtMs != null ? BigInt(startAtMs) : null);
   }
 
   async getMany(contractIds: string[]): Promise<any> {

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

@@ -1,5 +1,29 @@
 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; }
@@ -93,24 +117,60 @@ export class GroupFacade {
   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;
     const w = await this.sdk.getWasmSdkConnected();
-    return w.getContestedResources(documentTypeName, contractId, indexName, startAtValue ?? null, limit ?? null, null, orderAscending ?? null);
+    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;
     const w = await this.sdk.getWasmSdkConnected();
-    return w.getContestedResourcesWithProofInfo(documentTypeName, contractId, indexName, startAtValue ?? null, limit ?? null, null, orderAscending ?? null);
+    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;
     const w = await this.sdk.getWasmSdkConnected();
-    return w.getContestedResourceVotersForIdentity(contractId, documentTypeName, indexName, indexValues, contestantId, startAtVoterInfo ?? null, limit ?? null, orderAscending ?? null);
+    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;
     const w = await this.sdk.getWasmSdkConnected();
-    return w.getContestedResourceVotersForIdentityWithProofInfo(contractId, documentTypeName, indexName, indexValues, contestantId, startAtIdentifierInfo ?? null, count ?? null, orderAscending ?? null);
+    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);
   }
 }

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

@@ -9,7 +9,7 @@ export class IdentitiesFacade {
     this.sdk = sdk;
   }
 
-  async fetch(identityId: string): Promise<wasm.IdentityWasm> {
+  async fetch(identityId: string): Promise<wasm.Identity | undefined> {
     const w = await this.sdk.getWasmSdkConnected();
     return w.getIdentity(identityId);
   }
@@ -19,7 +19,7 @@ export class IdentitiesFacade {
     return w.getIdentityWithProofInfo(identityId);
   }
 
-  async fetchUnproved(identityId: string): Promise<wasm.IdentityWasm> {
+  async fetchUnproved(identityId: string): Promise<wasm.Identity> {
     const w = await this.sdk.getWasmSdkConnected();
     return w.getIdentityUnproved(identityId);
   }
@@ -100,7 +100,7 @@ export class IdentitiesFacade {
     return w.getIdentityBalanceAndRevisionWithProofInfo(identityId);
   }
 
-  async byPublicKeyHash(publicKeyHash: string): Promise<wasm.IdentityWasm> {
+  async byPublicKeyHash(publicKeyHash: string): Promise<wasm.Identity> {
     const w = await this.sdk.getWasmSdkConnected();
     return w.getIdentityByPublicKeyHash(publicKeyHash);
   }

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

@@ -1,46 +1,45 @@
+import type {
+  ContestedResourceIdentityVotesQuery,
+  ContestedResourceVoteStateQuery,
+  VotePollsByEndDateQuery,
+} from '@dashevo/wasm-sdk';
 import { asJsonString } from '../util.js';
 import type { EvoSDK } from '../sdk.js';
 
 export class VotingFacade {
   private sdk: EvoSDK;
   constructor(sdk: EvoSDK) { this.sdk = sdk; }
 
-  async contestedResourceVoteState(params: { contractId: string; documentTypeName: string; indexName: string; indexValues: any[]; resultType: string; allowIncludeLockedAndAbstainingVoteTally?: boolean; startAtIdentifierInfo?: string; count?: number; orderAscending?: boolean }): Promise<any> {
-    const { contractId, documentTypeName, indexName, indexValues, resultType, allowIncludeLockedAndAbstainingVoteTally, startAtIdentifierInfo, count, orderAscending } = params;
+  async contestedResourceVoteState(query: ContestedResourceVoteStateQuery): Promise<any> {
     const w = await this.sdk.getWasmSdkConnected();
-    return w.getContestedResourceVoteState(contractId, documentTypeName, indexName, indexValues, resultType, allowIncludeLockedAndAbstainingVoteTally ?? null, startAtIdentifierInfo ?? null, count ?? null, orderAscending ?? null);
+    return w.getContestedResourceVoteState(query);
   }
 
-  async contestedResourceVoteStateWithProof(params: { contractId: string; documentTypeName: string; indexName: string; indexValues: any[]; resultType: string; allowIncludeLockedAndAbstainingVoteTally?: boolean; startAtIdentifierInfo?: string; count?: number; orderAscending?: boolean }): Promise<any> {
-    const { contractId, documentTypeName, indexName, indexValues, resultType, allowIncludeLockedAndAbstainingVoteTally, startAtIdentifierInfo, count, orderAscending } = params;
+  async contestedResourceVoteStateWithProof(query: ContestedResourceVoteStateQuery): Promise<any> {
     const w = await this.sdk.getWasmSdkConnected();
-    return w.getContestedResourceVoteStateWithProofInfo(contractId, documentTypeName, indexName, indexValues, resultType, allowIncludeLockedAndAbstainingVoteTally ?? null, startAtIdentifierInfo ?? null, count ?? null, orderAscending ?? null);
+    return w.getContestedResourceVoteStateWithProofInfo(query);
   }
 
-  async contestedResourceIdentityVotes(identityId: string, opts: { limit?: number; startAtVotePollIdInfo?: string; orderAscending?: boolean } = {}): Promise<any> {
-    const { limit, startAtVotePollIdInfo, orderAscending } = opts;
+  async contestedResourceIdentityVotes(query: ContestedResourceIdentityVotesQuery): Promise<any> {
     const w = await this.sdk.getWasmSdkConnected();
-    return w.getContestedResourceIdentityVotes(identityId, limit ?? null, startAtVotePollIdInfo ?? null, orderAscending ?? null);
+    return w.getContestedResourceIdentityVotes(query);
   }
 
-  async contestedResourceIdentityVotesWithProof(identityId: string, opts: { limit?: number; offset?: number; orderAscending?: boolean } = {}): Promise<any> {
-    const { limit, offset, orderAscending } = opts;
+  async contestedResourceIdentityVotesWithProof(query: ContestedResourceIdentityVotesQuery): Promise<any> {
     const w = await this.sdk.getWasmSdkConnected();
-    return w.getContestedResourceIdentityVotesWithProofInfo(identityId, limit ?? null, offset ?? null, orderAscending ?? null);
+    return w.getContestedResourceIdentityVotesWithProofInfo(query);
   }
 
-  async votePollsByEndDate(opts: { startTimeInfo?: string; endTimeInfo?: string; limit?: number; orderAscending?: boolean } = {}): Promise<any> {
-    const { startTimeInfo, endTimeInfo, limit, orderAscending } = opts;
+  async votePollsByEndDate(query?: VotePollsByEndDateQuery): Promise<any> {
     const w = await this.sdk.getWasmSdkConnected();
-    return w.getVotePollsByEndDate(startTimeInfo ?? null, endTimeInfo ?? null, limit ?? null, orderAscending ?? null);
+
+    return w.getVotePollsByEndDate(query ?? null);
   }
 
-  async votePollsByEndDateWithProof(opts: { startTimeMs?: number | bigint | null; endTimeMs?: number | bigint | null; limit?: number; offset?: number; orderAscending?: boolean } = {}): Promise<any> {
-    const { startTimeMs, endTimeMs, limit, offset, orderAscending } = opts;
-    const start = startTimeMs != null ? BigInt(startTimeMs) : null;
-    const end = endTimeMs != null ? BigInt(endTimeMs) : null;
+  async votePollsByEndDateWithProof(query?: VotePollsByEndDateQuery): Promise<any> {
     const w = await this.sdk.getWasmSdkConnected();
-    return w.getVotePollsByEndDateWithProofInfo(start ?? null, end ?? null, limit ?? null, offset ?? null, orderAscending ?? null);
+
+    return w.getVotePollsByEndDateWithProofInfo(query ?? null);
   }
 
   async masternodeVote(args: { masternodeProTxHash: string; contractId: string; documentTypeName: string; indexName: string; indexValues: string | any[]; voteChoice: string; votingKeyWif: string }): Promise<any> {

packages/js-evo-sdk/tests/functional/voting.spec.mjs

@@ -12,7 +12,7 @@ describe('Voting', function votingSuite() {
 
   it('contestedResourceVoteState() returns a vote state (may be empty)', async () => {
     const res = await sdk.voting.contestedResourceVoteState({
-      contractId: TEST_IDS.dataContractId,
+      dataContractId: TEST_IDS.dataContractId,
       documentTypeName: 'domain',
       indexName: 'parentNameAndLabel',
       indexValues: ['dash', TEST_IDS.username],
@@ -22,7 +22,10 @@ describe('Voting', function votingSuite() {
   });
 
   it('contestedResourceIdentityVotes() returns votes for identity (may be empty)', async () => {
-    const res = await sdk.voting.contestedResourceIdentityVotes(TEST_IDS.identityId, { limit: 5 });
+    const res = await sdk.voting.contestedResourceIdentityVotes({
+      identityId: TEST_IDS.identityId,
+      limit: 5,
+    });
     expect(res).to.exist();
   });
 });

packages/js-evo-sdk/tests/unit/facades/contracts.spec.mjs

@@ -46,14 +46,13 @@ describe('ContractsFacade', () => {
     const { args } = wasmSdk.getDataContractHistory.firstCall;
     expect(args[0]).to.equal('c');
     expect(args[1]).to.equal(3);
-    expect(args[2]).to.equal(null);
-    expect(typeof args[3]).to.equal('bigint');
-    expect(args[3]).to.equal(BigInt(5));
+    expect(args[2]).to.be.a('bigint');
+    expect(args[2]).to.equal(BigInt(5));
   });
 
   it('getHistoryWithProof() forwards similarly', async () => {
     await client.contracts.getHistoryWithProof({ contractId: 'c' });
-    expect(wasmSdk.getDataContractHistoryWithProofInfo).to.be.calledOnceWithExactly('c', null, null, null);
+    expect(wasmSdk.getDataContractHistoryWithProofInfo).to.be.calledOnceWithExactly('c', null, null);
   });
 
   it('getMany() and getManyWithProof() forward arrays', async () => {