dash-platform-sdk 1.3.2-dev.3 → 1.3.2-dev.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dash-platform-sdk",
-  "version": "1.3.2-dev.3",
+  "version": "1.3.2-dev.5",
   "main": "index.js",
   "description": "Lightweight SDK for accessing Dash Platform blockchain",
   "ts-standard": {

package/src/documents/index.js

@@ -39,7 +39,7 @@ export class DocumentsController {
      * @param startAfter {IdentifierLike=} Same as previous, but with exclusion. Cannot be set if startAt already provided
      */
     async query(dataContractId, documentType, where, orderBy, limit, startAt, startAfter) {
-        if (startAfter != null && startAt !== null) {
+        if (startAfter != null && startAt != null) {
             throw new Error('You may only set either startAfter or startAt at once');
         }
         return await query(this.grpcPool, new IdentifierWASM(dataContractId), documentType, where, orderBy, limit ?? 100, startAt, startAfter);

package/src/documents/query.js

@@ -7,20 +7,17 @@ import verifyTenderdashProof from '../utils/verifyTenderdashProof.js';
 import { encode } from 'cbor-x';
 import getDataContractByIdentifier from '../dataContracts/getDataContractByIdentifier.js';
 export default async function query(grpcPool, dataContractId, documentTypeName, where, orderBy, limit = 100, startAt, startAfter) {
-    if ([startAt, startAfter].filter(e => e != null).length === 2) {
-        throw new Error('Only startAt or startAfter could be specified at one time');
-    }
     let start;
     if (startAt != null) {
         start = {
             oneofKind: 'startAt',
-            startAt: startAt.base58()
+            startAt: startAt.bytes()
         };
     }
     if (startAfter != null) {
         start = {
             oneofKind: 'startAfter',
-            startAt: startAfter.base58()
+            startAfter: startAfter.bytes()
         };
     }
     const getDocumentsRequest = GetDocumentsRequest.create({
@@ -52,7 +49,8 @@ export default async function query(grpcPool, dataContractId, documentTypeName,
         throw new Error('Metadata not found');
     }
     const startAtIncluded = startAt != null;
-    const { rootHash, documents } = verifyDocumentsProof(proof.grovedbProof, dataContract, documentTypeName, where, orderBy, limit, startAt?.bytes(), startAtIncluded, BigInt(metadata?.timeMs), LATEST_PLATFORM_VERSION);
+    const startIdentifier = startAt ?? startAfter;
+    const { rootHash, documents } = verifyDocumentsProof(proof.grovedbProof, dataContract, documentTypeName, where, orderBy, limit, startIdentifier?.bytes(), startAtIncluded, BigInt(metadata?.timeMs), LATEST_PLATFORM_VERSION);
     const quorumPublicKey = await getQuorumPublicKey(grpcPool.network, proof.quorumType, bytesToHex(proof.quorumHash));
     const verify = await verifyTenderdashProof(proof, metadata, rootHash, quorumPublicKey);
     if (!verify) {

package/test/unit/Document.spec.js

@@ -42,6 +42,35 @@ describe('Document', () => {
         expect(document.dataContractId.base58()).toEqual(dataContract);
         expect(document).toEqual(expect.any(DocumentWASM));
     });
+    test('should be able to get document with startAt', async () => {
+        const dataContract = '6hVQW16jyvZyGSQk2YVty4ND6bgFXozizYWnPt753uW5';
+        const documentType = 'torrent';
+        const limit = 5;
+        // @ts-expect-error
+        const [firstQueriedDoc] = (await sdk.documents.query(dataContract, documentType, null, null, limit)).toReversed();
+        // @ts-expect-error
+        const [secondQueriedDoc] = await sdk.documents.query(dataContract, documentType, null, null, limit, firstQueriedDoc.id);
+        expect(secondQueriedDoc.id.base58()).toEqual(firstQueriedDoc.id.base58());
+        expect(secondQueriedDoc.createdAtBlockHeight).toEqual(undefined);
+        expect(secondQueriedDoc.dataContractId.base58()).toEqual(dataContract);
+        expect(secondQueriedDoc).toEqual(expect.any(DocumentWASM));
+    });
+    test('should be able to get document with startAfter', async () => {
+        const dataContract = '6hVQW16jyvZyGSQk2YVty4ND6bgFXozizYWnPt753uW5';
+        const documentType = 'torrent';
+        const limit = 5;
+        const masterQueryLimit = limit * 2;
+        // @ts-expect-error
+        const masterQuery = await sdk.documents.query(dataContract, documentType, null, null, masterQueryLimit);
+        // @ts-expect-error
+        const [firstQueriedDoc] = (await sdk.documents.query(dataContract, documentType, null, null, limit)).toReversed();
+        // @ts-expect-error
+        const [secondQueriedDoc] = await sdk.documents.query(dataContract, documentType, null, null, limit, undefined, firstQueriedDoc.id);
+        expect(masterQuery[5].id.base58()).toEqual(secondQueriedDoc.id.base58());
+        expect(secondQueriedDoc.createdAtBlockHeight).toEqual(undefined);
+        expect(secondQueriedDoc.dataContractId.base58()).toEqual(dataContract);
+        expect(secondQueriedDoc).toEqual(expect.any(DocumentWASM));
+    });
     describe('should be able to create state transition', () => {
         test('should be able to create a create transition', async () => {
             const document = sdk.documents.create(dataContract, documentType, data, identity);