dash 3.21.7 → 3.22.0-dev.10

package/src/SDK/Client/Platform/Platform.ts

@@ -2,12 +2,14 @@
 import DashPlatformProtocol from "@dashevo/dpp";
 
 import Client from "../Client";
+import { IStateTransitionResult } from './IStateTransitionResult';
 
 import broadcastDocument from "./methods/documents/broadcast";
 import createDocument from "./methods/documents/create";
 import getDocument from "./methods/documents/get";
 
-import broadcastContract from "./methods/contracts/broadcast";
+import publishContract from "./methods/contracts/publish";
+import updateContract from "./methods/contracts/update";
 import createContract from "./methods/contracts/create";
 import getContract from "./methods/contracts/get";
 
@@ -20,7 +22,6 @@ import resolveName from "./methods/names/resolve";
 import resolveNameByRecord from "./methods/names/resolveByRecord";
 import searchName from "./methods/names/search";
 import broadcastStateTransition from "./broadcastStateTransition";
-import { IPlatformStateProof } from "./IPlatformStateProof";
 import StateRepository from './StateRepository';
 import { latestVersion as latestProtocolVersion } from "@dashevo/dpp/lib/version/protocolVersion";
 
@@ -66,6 +67,13 @@ interface Identities {
     topUp: Function,
 }
 
+interface DataContracts {
+    update: Function,
+    publish: Function,
+    create: Function,
+    get: Function,
+}
+
 /**
  * Class for Dash Platform
  *
@@ -93,13 +101,13 @@ export class Platform {
      * @param {Function} create - create contracts which can be broadcasted
      * @param {Function} register - register contracts on the platform
      */
-    public contracts: Records;
+    public contracts: DataContracts;
 
     /**
      * Broadcasts state transition
      * @param {Object} stateTransition
      */
-    public broadcastStateTransition(stateTransition: any): Promise<IPlatformStateProof|void> {
+    public broadcastStateTransition(stateTransition: any): Promise<IStateTransitionResult|void> {
         return broadcastStateTransition(this, stateTransition);
     };
 
@@ -121,7 +129,8 @@ export class Platform {
             get: getDocument.bind(this),
         };
         this.contracts = {
-            broadcast: broadcastContract.bind(this),
+            publish: publishContract.bind(this),
+            update: updateContract.bind(this),
             create: createContract.bind(this),
             get: getContract.bind(this),
         };

package/src/SDK/Client/Platform/broadcastStateTransition.ts

@@ -2,7 +2,6 @@ import crypto from "crypto";
 import { Platform } from "./Platform";
 import { StateTransitionBroadcastError } from "../../../errors/StateTransitionBroadcastError";
 import { IStateTransitionResult } from "./IStateTransitionResult";
-import { IPlatformStateProof } from "./IPlatformStateProof";
 
 const ResponseError = require('@dashevo/dapi-client/lib/transport/errors/response/ResponseError');
 const InvalidRequestDPPError = require('@dashevo/dapi-client/lib/transport/errors/response/InvalidRequestDPPError');
@@ -15,7 +14,7 @@ const GrpcError = require('@dashevo/grpc-common/lib/server/error/GrpcError');
  * @param {Platform} platform
  * @param stateTransition
  */
-export default async function broadcastStateTransition(platform: Platform, stateTransition: any): Promise<IPlatformStateProof|void> {
+export default async function broadcastStateTransition(platform: Platform, stateTransition: any): Promise<IStateTransitionResult|void> {
     const { client, dpp } = platform;
 
     const result = await dpp.stateTransition.validateBasic(stateTransition);
@@ -83,5 +82,5 @@ export default async function broadcastStateTransition(platform: Platform, state
         );
     }
 
-    return stateTransitionResult.proof;
+    return stateTransitionResult;
 }

package/src/SDK/Client/Platform/methods/contracts/{broadcast.ts → publish.ts}

@@ -3,19 +3,19 @@ import broadcastStateTransition from "../../broadcastStateTransition";
 import { signStateTransition } from "../../signStateTransition";
 
 /**
- * Broadcast contract onto the platform
+ * Publish contract onto the platform
  *
  * @param {Platform} this - bound instance class
  * @param dataContract - contract
  * @param identity - identity
- * @return dataContract
+ * @return {DataContractCreateTransition}
  */
-export default async function broadcast(this: Platform, dataContract: any, identity: any): Promise<any> {
+export default async function publish(this: Platform, dataContract: any, identity: any): Promise<any> {
     await this.initialize();
 
     const { dpp } = this;
 
-    const dataContractCreateTransition = dpp.dataContract.createStateTransition(dataContract);
+    const dataContractCreateTransition = dpp.dataContract.createDataContractCreateTransition(dataContract);
 
     await signStateTransition(this, dataContractCreateTransition, identity);
     await broadcastStateTransition(this, dataContractCreateTransition);

package/src/SDK/Client/Platform/methods/contracts/update.ts

@@ -0,0 +1,39 @@
+import { Platform } from "../../Platform";
+import broadcastStateTransition from "../../broadcastStateTransition";
+import { signStateTransition } from "../../signStateTransition";
+
+/**
+ * Publish contract onto the platform
+ *
+ * @param {Platform} this - bound instance class
+ * @param {DataContract} dataContract - contract
+ * @param identity - identity
+ * @return {DataContractUpdateTransition}
+ */
+export default async function update(this: Platform, dataContract: any, identity: any): Promise<any> {
+  await this.initialize();
+
+  const { dpp } = this;
+
+  // Clone contract
+  const updatedDataContract = await this.dpp.dataContract.createFromObject(
+    dataContract.toObject(),
+  );
+
+  updatedDataContract.incrementVersion();
+
+  const dataContractUpdateTransition = dpp.dataContract.createDataContractUpdateTransition(updatedDataContract);
+
+  await signStateTransition(this, dataContractUpdateTransition, identity);
+  await broadcastStateTransition(this, dataContractUpdateTransition);
+
+  // Update app with updated data contract if available
+  for (const appName of this.client.getApps().getNames()) {
+    const appDefinition = this.client.getApps().get(appName);
+    if (appDefinition.contractId.equals(updatedDataContract.getId()) && appDefinition.contract) {
+      appDefinition.contract = updatedDataContract;
+    }
+  }
+
+  return dataContractUpdateTransition;
+}

package/src/SDK/Client/Platform/methods/documents/get.spec.ts

@@ -1,6 +1,7 @@
 import getDataContractFixture from '@dashevo/dpp/lib/test/fixtures/getDataContractFixture';
 import generateRandomIdentifier from '@dashevo/dpp/lib/test/utils/generateRandomIdentifier';
 import createDPPMock from '@dashevo/dpp/lib/test/mocks/createDPPMock';
+import getDocumentsFixture from '@dashevo/dpp/lib/test/fixtures/getDocumentsFixture';
 import getResponseMetadataFixture from '../../../../../test/fixtures/getResponseMetadataFixture';
 const GetDocumentsResponse = require("@dashevo/dapi-client/lib/methods/platform/getDocuments/GetDocumentsResponse");
 
@@ -84,6 +85,42 @@ describe('Client - Platform - Documents - .get()', () => {
     ]);
   });
 
+  it('should convert Document to identifiers inside where condition for "startAt" and "startAfter"', async () => {
+    const [docA, docB] = getDocumentsFixture();
+
+    await get.call(platform, 'app.withByteArrays', {
+      startAt: docA,
+      startAfter: docB,
+    });
+
+    expect(getDocumentsMock.getCall(0).args).to.have.deep.members([
+      appDefinition.contractId,
+      'withByteArrays',
+      {
+        startAt: docA.getId(),
+        startAfter: docB.getId(),
+      },
+    ]);
+  });
+
+  it('should convert string to identifiers inside where condition for "startAt" and "startAfter"', async () => {
+    const [docA, docB] = getDocumentsFixture();
+
+    await get.call(platform, 'app.withByteArrays', {
+      startAt: docA.getId().toString('base58'),
+      startAfter: docB.getId().toString('base58'),
+    });
+
+    expect(getDocumentsMock.getCall(0).args).to.have.deep.members([
+      appDefinition.contractId,
+      'withByteArrays',
+      {
+        startAt: docA.getId(),
+        startAfter: docB.getId(),
+      },
+    ]);
+  });
+
   it('should convert nested identifier properties inside where condition if `elementMatch` is used', async () => {
     const id = generateRandomIdentifier();
 

package/src/SDK/Client/Platform/methods/documents/get.ts

@@ -1,5 +1,6 @@
 import Identifier from '@dashevo/dpp/lib/Identifier';
 import Metadata from "@dashevo/dpp/lib/Metadata";
+import Document from '@dashevo/dpp/lib/document/Document';
 
 import {Platform} from "../../Platform";
 
@@ -7,15 +8,15 @@ import {Platform} from "../../Platform";
  * @param {WhereCondition[]} [where] - where
  * @param {OrderByCondition[]} [orderBy] - order by
  * @param {number} [limit] - limit
- * @param {number} [startAt] - start value (included)
- * @param {number} [startAfter] - start value (not included)
+ * @param {string|Buffer|Document|Identifier} [startAt] - start value (included)
+ * @param {string|Buffer|Document|Identifier} [startAfter] - start value (not included)
  */
 declare interface fetchOpts {
     where?: WhereCondition[];
     orderBy?: OrderByCondition[];
     limit?: number;
-    startAt?: number;
-    startAfter?: number;
+    startAt?: string|Buffer|Document|Identifier;
+    startAfter?: string|Buffer|Document|Identifier;
 }
 
 type OrderByCondition = [
@@ -121,6 +122,18 @@ export async function get(this: Platform, typeLocator: string, opts: fetchOpts):
         opts.where = opts.where.map((whereCondition) => convertIdentifierProperties(whereCondition, binaryProperties));
     }
 
+    if (opts.startAt instanceof Document) {
+      opts.startAt = opts.startAt.getId();
+    } else if (typeof opts.startAt === 'string') {
+      opts.startAt = Identifier.from(opts.startAt);
+    }
+
+    if (opts.startAfter instanceof Document) {
+      opts.startAfter = opts.startAfter.getId();
+    } else if (typeof opts.startAfter === 'string') {
+      opts.startAfter = Identifier.from(opts.startAfter);
+    }
+
     // @ts-ignore
     const documentsResponse = await this.client.getDAPIClient().platform.getDocuments(
         appDefinition.contractId,

package/src/SDK/Client/Platform/methods/identities/internal/createIdentityCreateTransition.ts

@@ -1,5 +1,6 @@
 import { PrivateKey } from "@dashevo/dashcore-lib";
 import { Platform } from "../../../Platform";
+import IdentityPublicKey from "@dashevo/dpp/lib/identity/IdentityPublicKey"
 
 /**
  * Creates a funding transaction for the platform identity and returns one-time key to sign the state transition
@@ -24,13 +25,17 @@ export default async function createIdentityCreateTransition(platform : Platform
     // Create Identity
     // @ts-ignore
     const identity = dpp.identity.create(
-        assetLockProof, [identityPublicKey]
+        assetLockProof, [{
+          key: identityPublicKey,
+          purpose: IdentityPublicKey.PURPOSES.AUTHENTICATION,
+          securityLevel: IdentityPublicKey.SECURITY_LEVELS.MASTER
+        }]
     );
 
     // Create ST
     const identityCreateTransition = dpp.identity.createIdentityCreateTransition(identity);
 
-    identityCreateTransition.signByPrivateKey(assetLockPrivateKey);
+    await identityCreateTransition.signByPrivateKey(assetLockPrivateKey, IdentityPublicKey.TYPES.ECDSA_SECP256K1);
 
     const result = await dpp.stateTransition.validateBasic(identityCreateTransition);
 

package/src/SDK/Client/Platform/methods/identities/internal/createIdnetityTopUpTransition.ts

@@ -1,5 +1,6 @@
 import { PrivateKey } from "@dashevo/dashcore-lib";
 import { Platform } from "../../../Platform";
+import IdentityPublicKey from "@dashevo/dpp/lib/identity/IdentityPublicKey"
 
 /**
  * Creates a funding transaction for the platform identity and returns one-time key to sign the state transition
@@ -20,7 +21,7 @@ export default async function createIdentityTopUpTransition(platform : Platform,
         identityId,  assetLockProof
     );
 
-    identityTopUpTransition.signByPrivateKey(assetLockPrivateKey);
+    await identityTopUpTransition.signByPrivateKey(assetLockPrivateKey, IdentityPublicKey.TYPES.ECDSA_SECP256K1);
 
     const result = await dpp.stateTransition.validateBasic(identityTopUpTransition);
 

package/src/SDK/Client/Platform/methods/names/search.spec.ts

@@ -36,6 +36,7 @@ describe('Platform', () => {
                             ["normalizedParentDomainName", "==", "dash"],
                             ["normalizedLabel", "startsWith", "prefix"]
                         ],
+                        orderBy: [['normalizedLabel', 'asc']],
                     },
                 ]);
 
@@ -57,6 +58,7 @@ describe('Platform', () => {
                             ["normalizedParentDomainName", "==", "dash"],
                             ["normalizedLabel", "startsWith", "prefix"]
                         ],
+                      orderBy: [['normalizedLabel', 'asc']]
                     },
                 ]);
 

package/src/SDK/Client/Platform/methods/names/search.ts

@@ -17,6 +17,9 @@ export async function search(this: Platform, labelPrefix: string, parentDomainNa
             ['normalizedParentDomainName', '==', normalizedParentDomainName],
             ['normalizedLabel', 'startsWith', normalizedLabelPrefix],
         ],
+        orderBy: [
+          ['normalizedLabel', 'asc']
+        ]
     });
 
     return documents;

package/src/SDK/Client/Platform/signStateTransition.ts

@@ -19,10 +19,10 @@ export async function signStateTransition(platform: Platform, stateTransition: a
         keyIndex,
     );
 
-    stateTransition.sign(
+    await stateTransition.sign(
         identity.getPublicKeyById(keyIndex),
         privateKey,
     );
 
     return stateTransition;
-}
+}

package/src/test/bootstrap.js

@@ -13,6 +13,19 @@ dotenvSafe.config({
 use(dirtyChai);
 use(sinonChai);
 
+before(function before() {
+  if (!this.sinon) {
+    this.sinon = sinon.createSandbox();
+  } else {
+    this.sinon.restore();
+  }
+});
+
+
+after(function after() {
+  this.sinon.restore();
+});
+
 beforeEach(function beforeEach() {
   if (!this.sinon) {
     this.sinon = sinon.createSandbox();

package/src/test/fixtures/createIdentityFixtureInAccount.ts

@@ -11,6 +11,8 @@ export function createIdentityFixtureInAccount(account) {
         id: 0,
         type: IdentityPublicKey.TYPES.ECDSA_SECP256K1,
         data: identityPrivateKey.toPublicKey().toBuffer(),
+        purpose: IdentityPublicKey.PURPOSES.AUTHENTICATION,
+        securityLevel: IdentityPublicKey.SECURITY_LEVELS.MASTER
     });
 
     account.storage.insertIdentityIdAtIndex(
@@ -20,4 +22,4 @@ export function createIdentityFixtureInAccount(account) {
     );
 
     return identityFixture;
-}
+}

package/tests/fixtures/contracts.json

@@ -14,6 +14,7 @@
         },
         "indices": [
           {
+            "name": "rating",
             "properties": [
               {
                 "rating": "desc"
@@ -24,6 +25,7 @@
         "additionalProperties": false
       }
     },
-    "protocolVersion": 0
+    "protocolVersion": 0,
+    "version": 1
   }
 }

package/tests/fixtures/dp1.schema.json

@@ -2,6 +2,7 @@
   "contact": {
     "indices": [
       {
+        "name": "userIdToUserId",
         "unique": true,
         "properties": [
           {
@@ -30,6 +31,7 @@
   "profile": {
     "indices": [
       {
+        "name": "userId",
         "unique": true,
         "properties": [
           {

package/tests/fixtures/ratePlatform.schema.json

@@ -8,6 +8,7 @@
       }
     },
     "indices": [{
+      "name": "rating",
       "properties": [
         {
           "rating": "desc"

package/build/src/SDK/Client/Platform/methods/contracts/broadcast.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"broadcast.js","sourceRoot":"","sources":["../../../../../../../src/SDK/Client/Platform/methods/contracts/broadcast.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,4FAAsE;AACtE,iEAAgE;AAEhE;;;;;;;GAOG;AACH,SAA8B,SAAS,CAAiB,YAAiB,EAAE,QAAa;;;;;wBACpF,qBAAM,IAAI,CAAC,UAAU,EAAE,EAAA;;oBAAvB,SAAuB,CAAC;oBAEhB,GAAG,GAAK,IAAI,IAAT,CAAU;oBAEf,4BAA4B,GAAG,GAAG,CAAC,YAAY,CAAC,qBAAqB,CAAC,YAAY,CAAC,CAAC;oBAE1F,qBAAM,yCAAmB,CAAC,IAAI,EAAE,4BAA4B,EAAE,QAAQ,CAAC,EAAA;;oBAAvE,SAAuE,CAAC;oBACxE,qBAAM,kCAAwB,CAAC,IAAI,EAAE,4BAA4B,CAAC,EAAA;;oBAAlE,SAAkE,CAAC;oBAEnE,sBAAO,4BAA4B,EAAC;;;;CACvC;AAXD,4BAWC"}

package/dist/src/SDK/Client/Platform/methods/contracts/broadcast.d.ts

@@ -1,10 +0,0 @@
-import { Platform } from "../../Platform";
-/**
- * Broadcast contract onto the platform
- *
- * @param {Platform} this - bound instance class
- * @param dataContract - contract
- * @param identity - identity
- * @return dataContract
- */
-export default function broadcast(this: Platform, dataContract: any, identity: any): Promise<any>;