dash 3.22.0-dev.2 → 3.22.0-dev.3

package/package.json

@@ -1,21 +1,27 @@
 {
   "name": "dash",
-  "version": "3.22.0-dev.2",
+  "version": "3.22.0-dev.3",
   "description": "Dash library for JavaScript/TypeScript ecosystem (Wallet, DAPI, Primitives, BLS, ...)",
   "main": "build/src/index.js",
   "unpkg": "dist/dash.min.js",
   "types": "dist/src/index.d.ts",
   "scripts": {
-    "start:dev": "nodemon --exec 'npm run build && npm run test:unit'",
-    "build": "npm run build:web",
-    "build:web": "npm run build:ts && webpack --stats-error-details",
+    "start:dev": "nodemon --exec 'yarn run build && yarn run test:unit'",
+    "build": "yarn run build:ts",
+    "build:web": "yarn run build:ts && webpack --stats-error-details",
     "build:ts": "tsc",
-    "test": "npm run test:unit && npm run test:functional && npm run test:browsers",
+    "lint": "",
+    "test": "yarn run test:unit && yarn run test:functional && yarn run test:browsers",
     "test:browsers": "karma start ./karma.conf.js --single-run",
-    "test:unit": "mocha -r ts-node/register \"src/**/*.spec.ts\"",
-    "test:functional": "npm run build && mocha --recursive tests/functional/**/*.js",
-    "prepublishOnly": "npm run build",
-    "prepare": "npm run build"
+    "test:unit": "TS_NODE_COMPILER_OPTIONS={\"target\":\"es6\"} ts-mocha \"src/**/*.spec.ts\"",
+    "test:functional": "yarn run build && mocha --recursive tests/functional/**/*.js",
+    "prepublishOnly": "yarn run build:web",
+    "prepare": "yarn run build"
+  },
+  "ultra": {
+    "concurrent": [
+      "test"
+    ]
   },
   "repository": {
     "type": "git",
@@ -28,13 +34,13 @@
   },
   "homepage": "https://github.com/dashevo/DashJS#readme",
   "dependencies": {
-    "@dashevo/dapi-client": "0.21.2",
-    "@dashevo/dashcore-lib": "~0.19.26",
-    "@dashevo/dpp": "~0.21.0",
-    "@dashevo/grpc-common": "~0.5.4",
-    "@dashevo/wallet-lib": "~7.22.0-dev.2",
+    "@dashevo/dapi-client": "~0.22.0-dev.3",
+    "@dashevo/dashcore-lib": "~0.19.28",
+    "@dashevo/dpp": "~0.22.0-dev.3",
+    "@dashevo/grpc-common": "~0.22.0-dev.3",
+    "@dashevo/wallet-lib": "~7.22.0-dev.3",
     "bs58": "^4.0.1",
-    "node-inspect-extracted": "1.0.7"
+    "node-inspect-extracted": "^1.0.8"
   },
   "devDependencies": {
     "@types/chai": "^4.2.12",
@@ -47,36 +53,39 @@
     "assert": "^2.0.0",
     "browserify-zlib": "^0.2.0",
     "buffer": "^6.0.3",
-    "chai": "^4.2.0",
+    "chai": "^4.3.4",
     "chance": "^1.1.6",
     "crypto-browserify": "^3.12.0",
     "dirty-chai": "^2.0.1",
     "dotenv-safe": "^8.2.0",
+    "events": "^3.3.0",
     "https-browserify": "^1.0.0",
-    "karma": "^5.1.1",
+    "karma": "^6.3.4",
     "karma-chai": "^0.1.0",
     "karma-chrome-launcher": "^3.1.0",
-    "karma-firefox-launcher": "^1.3.0",
+    "karma-firefox-launcher": "^2.1.1",
     "karma-mocha": "^2.0.1",
     "karma-mocha-reporter": "^2.2.5",
     "karma-webpack": "^5.0.0",
-    "mocha": "^8.1.1",
+    "mocha": "^9.1.2",
     "nodemon": "^2.0.4",
     "os-browserify": "^0.3.0",
     "path-browserify": "^1.0.1",
     "process": "^0.11.10",
     "rimraf": "^3.0.2",
-    "sinon": "^9.0.3",
-    "sinon-chai": "^3.5.0",
+    "sinon": "^11.1.2",
+    "sinon-chai": "^3.7.0",
     "stream-browserify": "^3.0.0",
     "stream-http": "^3.2.0",
+    "string_decoder": "^1.3.0",
     "ts-loader": "^8.0.2",
+    "ts-mocha": "^8.0.0",
     "ts-mock-imports": "^1.3.0",
-    "ts-node": "^8.10.2",
+    "ts-node": "^10.4.0",
     "typescript": "^3.9.5",
     "url": "^0.11.0",
     "util": "^0.12.4",
     "webpack": "^5.59.1",
     "webpack-cli": "^4.9.1"
   }
-}
+}

package/src/SDK/Client/Client.spec.ts

@@ -278,7 +278,7 @@ describe('Dash - Client', function suite() {
     });
   });
 
-  describe('#platform.contracts.broadcast', () => {
+  describe('#platform.contracts.publish', () => {
     it('should throw TransitionBroadcastError when transport resolves error', async () => {
       const errorResponse = {
         error: {
@@ -292,7 +292,7 @@ describe('Dash - Client', function suite() {
 
       let error;
       try {
-        await client.platform.contracts.broadcast(dataContractFixture, identityFixture);
+        await client.platform.contracts.publish(dataContractFixture, identityFixture);
       } catch (e) {
         error = e;
       }
@@ -307,7 +307,7 @@ describe('Dash - Client', function suite() {
         proof: {  }
       });
 
-      await client.platform.contracts.broadcast(dataContractFixture, identityFixture);
+      await client.platform.contracts.publish(dataContractFixture, identityFixture);
 
       const serializedSt = dapiClientMock.platform.broadcastStateTransition.getCall(0).args[0];
       const interceptedSt = await client.platform.dpp.stateTransition.createFromBuffer(serializedSt);

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

@@ -7,7 +7,8 @@ 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";
 
@@ -66,6 +67,13 @@ interface Identities {
     topUp: Function,
 }
 
+interface DataContracts {
+    update: Function,
+    publish: Function,
+    create: Function,
+    get: Function,
+}
+
 /**
  * Class for Dash Platform
  *
@@ -93,7 +101,7 @@ 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
@@ -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/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,26 @@
+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 - 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;
+
+    dataContract.incrementVersion();
+
+    const dataContractUpdateTransition = dpp.dataContract.createDataContractUpdateTransition(dataContract);
+
+    await signStateTransition(this, dataContractUpdateTransition, identity);
+    await broadcastStateTransition(this, dataContractUpdateTransition);
+
+    return dataContractUpdateTransition;
+}

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

@@ -40,10 +40,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);
         }
     }
 }

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,7 +25,11 @@ 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

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/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