dash 3.22.0-dev.1 → 3.22.0-dev.12

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/createAssetLockTransaction.ts

@@ -9,7 +9,7 @@ const ASSET_LOCK_OUTPUT_INDEX = 0;
  * Creates a funding transaction for the platform identity and returns one-time key to sign the state transition
  * @param {Platform} platform
  * @param {number} fundingAmount - amount of dash to fund the identity's credits
- * @return {{transaction: Transaction, privateKey: PrivateKey}} - transaction and one time private key
+ * @return {Promise<{transaction: Transaction, privateKey: PrivateKey}>} - transaction and one time private key
  * that can be used to sign registration/top-up state transition
  */
 export default async function createAssetLockTransaction(platform : Platform, fundingAmount): Promise<{ transaction: Transaction, privateKey: PrivateKey, outputIndex: number }> {

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 = [
@@ -40,10 +41,7 @@ const ensureAppContractFetched = async function (this: Platform, appName) {
         const appDefinition = this.client.getApps().get(appName);
 
         if (!appDefinition.contract) {
-            const contract = await this.contracts.get(appDefinition.contractId);
-            if (!contract) {
-               throw new Error(`Applcation ${appName} contract with ID ${appDefinition.contractId} is not found`);
-            }
+            await this.contracts.get(appDefinition.contractId);
         }
     }
 }
@@ -124,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/register.ts

@@ -1,7 +1,7 @@
 import {Platform} from "../../Platform";
 import Identifier from "@dashevo/dpp/lib/Identifier";
 
-const hash = require('@dashevo/dpp/lib/util/hash');
+const { hash } = require('@dashevo/dpp/lib/util/hash');
 const crypto = require('crypto');
 
 /**

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/src/test/mocks/createAndAttachTransportMocksToClient.ts

@@ -17,26 +17,30 @@ const TxStreamDataResponseMock = require('@dashevo/wallet-lib/src/test/mocks/TxS
 const TransportMock = require('@dashevo/wallet-lib/src/test/mocks/TransportMock');
 
 function makeTxStreamEmitISLocksForTransactions(transportMock, txStreamMock) {
-    transportMock.sendTransaction.callsFake((txString) => {
-        const transaction = new Transaction(txString);
-        const isLock = createFakeInstantLock(transaction.hash);
-
-        // Emit IS lock for the transaction
-        txStreamMock.emit(
-            TxStreamMock.EVENTS.data,
-            new TxStreamDataResponseMock(
-                { instantSendLockMessages: [isLock.toBuffer()] }
-            )
-        );
-
-        // Emit the same transaction back to the client so it will know about the change transaction
-        txStreamMock.emit(
-            TxStreamMock.EVENTS.data,
-            new TxStreamDataResponseMock(
-                { rawTransactions: [transaction.toBuffer()] }
-            )
-        );
-    });
+  transportMock.sendTransaction.callsFake((txString) => {
+    const transaction = new Transaction(txString);
+    const isLock = createFakeInstantLock(transaction.hash);
+
+    setImmediate(() => {
+      // Emit IS lock for the transaction
+      txStreamMock.emit(
+        TxStreamMock.EVENTS.data,
+        new TxStreamDataResponseMock(
+          { instantSendLockMessages: [isLock.toBuffer()] }
+        )
+      );
+    })
+
+    // Emit the same transaction back to the client so it will know about the change transaction
+    txStreamMock.emit(
+      TxStreamMock.EVENTS.data,
+      new TxStreamDataResponseMock(
+        { rawTransactions: [transaction.toBuffer()] }
+      )
+    );
+
+    return transaction.hash;
+  });
 }
 
 /**
@@ -88,4 +92,4 @@ export async function createAndAttachTransportMocksToClient(client, sinon) {
     makeGetIdentityRespondWithIdentity(client, dapiClientMock);
 
     return { txStreamMock, transportMock, dapiClientMock };
-}
+}

package/src/utils/createFakeIntantLock.ts

@@ -2,8 +2,10 @@ import { InstantLock } from "@dashevo/dashcore-lib";
 
 export function createFakeInstantLock(transactionHash: string): InstantLock {
     return new InstantLock({
+        version: 1,
         txid: transactionHash,
         signature: Buffer.alloc(96).toString('hex'),
+        cyclehash: '0dc8d0df62b076a7757ab5ca07dde0f1e2bfaf83f94299fd9a77577e6cc7022e',
         inputs: [
             {
                 outpointHash: '6e200d059fb567ba19e92f5c2dcd3dde522fd4e0a50af223752db16158dabb1d',

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/webpack.base.config.js

@@ -20,18 +20,21 @@ const baseConfig = {
       crypto: require.resolve('crypto-browserify'),
       http: require.resolve('stream-http'),
       https: require.resolve('https-browserify'),
+      buffer: require.resolve('buffer/'),
       url: require.resolve('url/'),
       assert: require.resolve('assert/'),
       stream: require.resolve('stream-browserify'),
       path: require.resolve('path-browserify'),
       os: require.resolve('os-browserify/browser'),
       zlib: require.resolve('browserify-zlib'),
+      events: require.resolve('events/'),
+      string_decoder: require.resolve('string_decoder/'),
     },
   },
   plugins: [
     new webpack.ProvidePlugin({
-      Buffer: ['buffer', 'Buffer'],
-      process: 'process/browser',
+      Buffer: [require.resolve('buffer/'), 'Buffer'],
+      process: require.resolve('process/browser'),
     }),
   ],
   output: {

package/webpack.config.js

@@ -1,31 +1,10 @@
 const path = require('path');
-const webpack = require('webpack');
+const webpackBaseConfig = require("./webpack.base.config");
 
 const webConfig =  {
+  ...webpackBaseConfig,
   entry: './build/src/index.js',
-  mode: "production",
-  resolve: {
-    extensions: ['.js', '.json'],
-    fallback: {
-      fs: false,
-      util: require.resolve('util/'),
-      crypto: require.resolve('crypto-browserify'),
-      http: require.resolve('stream-http'),
-      https: require.resolve('https-browserify'),
-      url: require.resolve('url/'),
-      assert: require.resolve('assert/'),
-      stream: require.resolve('stream-browserify'),
-      path: require.resolve('path-browserify'),
-      os: require.resolve('os-browserify/browser'),
-      zlib: require.resolve('browserify-zlib'),
-    },
-  },
-  plugins: [
-    new webpack.ProvidePlugin({
-      Buffer: ['buffer', 'Buffer'],
-      process: 'process/browser',
-    }),
-  ],
+  mode: 'production',
   output: {
     path: path.resolve(__dirname, 'dist'),
     libraryTarget: 'umd',

package/.editorconfig

@@ -1,2 +0,0 @@
-[*.{md,markdown}]
-trim_trailing_whitespace = false

package/.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,38 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve
-title: ''
-labels: 'bug'
-assignees: ''
-
----
-
-<!--- Provide a general summary of the issue in the Title above -->
-
-## Expected Behavior
-<!--- Tell us what should happen -->
-
-## Current Behavior
-<!--- Tell us what happens instead of the expected behavior -->
-
-## Possible Solution
-<!--- Not obligatory, but suggest a fix/reason for the bug -->
-
-## Steps to Reproduce (for bugs)
-<!--- Provide a link to a live example, or an unambiguous set of steps to -->
-<!--- reproduce this bug. Include code to reproduce, if relevant -->
-1.
-2.
-3.
-4.
-
-## Context
-<!--- How has this issue affected you? What are you trying to accomplish? -->
-<!--- Providing context helps us come up with a solution that is most useful in the real world -->
-
-## Your Environment
-<!--- Include as many relevant details about the environment you experienced the bug in -->
-* Version used:
-* Environment name and version (e.g. Chrome 39, node.js 5.4):
-* Operating System and version (desktop, server, or mobile):
-* Link to your project:

package/.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,27 +0,0 @@
----
-name: Feature request
-about: Suggest an idea for this project
-title: ''
-labels: 'enhancement'
-assignees: ''
-
----
-
-<!--- Provide a general summary of the feature request in the Title above -->
-
-## Expected Behavior
-<!--- A clear and concise description of what you want to happen -->
-
-## Current Behavior
-<!--- Explain the difference from current behavior -->
-
-## Possible Solution
-<!--- Suggest ideas of how to implement the addition or change -->
-
-## Alternatives Considered
-<!--- A clear and concise description of any alternative solutions or features you've considered -->
-
-## Additional Context
-<!--- Add any other context or screenshots about the feature request here. -->
-
-

package/.github/PULL_REQUEST_TEMPLATE.md

@@ -1,32 +0,0 @@
-<!--- Provide a general summary of your changes in the Title above -->
-<!--- Pull request titles must use the [conventional commits](https://www.conventionalcommits.org/en/v1.0.0/#summary) format -->
-
-## Issue being fixed or feature implemented
-<!--- Why is this change required? What problem does it solve? -->
-<!--- If it fixes an open issue, please link to the issue here. -->
-
-
-## What was done?
-<!--- Describe your changes in detail -->
-
-
-## How Has This Been Tested?
-<!--- Please describe in detail how you tested your changes. -->
-<!--- Include details of your testing environment, and the tests you ran to -->
-<!--- see how your change affects other areas of the code, etc. -->
-
-
-## Breaking Changes
-<!--- Please describe any breaking changes your code introduces and verify that -->
-<!--- the title includes "!" following the conventional commit type (e.g. "feat!: ..."-->
-
-
-## Checklist:
-<!--- Go over all the following points, and put an `x` in all the boxes that apply. -->
-- [ ] I have performed a self-review of my own code
-- [ ] I have commented my code, particularly in hard-to-understand areas
-- [ ] I have added or updated relevant unit/integration/functional/e2e tests
-- [ ] I have made corresponding changes to the documentation
-
-**For repository code-owners and collaborators only**
-- [ ] I have assigned this pull request to a milestone

package/.github/workflows/.env

@@ -1,5 +0,0 @@
-#DRIVE_BRANCH=v0.21-dev
-#DAPI_BRANCH=v0.21-dev
-#DASHMATE_BRANCH=update-dependencies
-#TEST_SUITE_BRANCH=update-dependencies
-#LOG_LEVEL=silly