dash 3.21.5 → 3.22.0-dev.3

package/karma.conf.js

@@ -4,13 +4,20 @@ const dotenvResult = require('dotenv-safe').config();
 
 const webpackBaseConfig = require("./webpack.base.config");
 
+const karmaMocha = require('karma-mocha');
+const karmaMochaReporter = require('karma-mocha-reporter');
+const karmaChai = require('karma-chai');
+const karmaChromeLauncher = require('karma-chrome-launcher');
+const karmaFirefoxLauncher = require('karma-firefox-launcher');
+const karmaWebpack = require('karma-webpack');
+
 if (dotenvResult.error) {
   throw dotenvResult.error;
 }
 
 module.exports = (config) => {
   config.set({
-    frameworks: ['mocha', 'chai'],
+    frameworks: ['mocha', 'chai', 'webpack'],
     files: [
       'src/**/*.spec.ts',
       'src/test/karma/bootstrap.ts',
@@ -43,12 +50,12 @@ module.exports = (config) => {
     browserDisconnectTimeout: 3 * 2000, // 2000 default
     pingTimeout: 3 * 5000, // 5000 default
     plugins: [
-      'karma-mocha',
-      'karma-mocha-reporter',
-      'karma-chai',
-      'karma-chrome-launcher',
-      'karma-firefox-launcher',
-      'karma-webpack',
+      karmaMocha,
+      karmaMochaReporter,
+      karmaChai,
+      karmaChromeLauncher,
+      karmaFirefoxLauncher,
+      karmaWebpack,
     ],
     customLaunchers: {
       FirefoxHeadless: {

package/package.json

@@ -1,22 +1,22 @@
 {
   "name": "dash",
-  "version": "3.21.5",
+  "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:ts",
-    "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",
     "lint": "",
-    "test": "npm run test:unit && npm run test:functional && npm run test:browsers",
+    "test": "yarn run test:unit && yarn run test:functional && yarn run test:browsers",
     "test:browsers": "karma start ./karma.conf.js --single-run",
-    "test:unit": "TS_NODE_COMPILER_OPTIONS={\"target\":\"es6\"} mocha -r ts-node/register/transpile-only \"src/**/*.spec.ts\"",
-    "test:functional": "npm run build && mocha --recursive tests/functional/**/*.js",
-    "prepublishOnly": "npm run build:web",
-    "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": [
@@ -34,11 +34,11 @@
   },
   "homepage": "https://github.com/dashevo/DashJS#readme",
   "dependencies": {
-    "@dashevo/dapi-client": "~0.21.5",
+    "@dashevo/dapi-client": "~0.22.0-dev.3",
     "@dashevo/dashcore-lib": "~0.19.28",
-    "@dashevo/dpp": "~0.21.5",
-    "@dashevo/grpc-common": "~0.21.5",
-    "@dashevo/wallet-lib": "~7.21.5",
+    "@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.8"
   },
@@ -58,6 +58,7 @@
     "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": "^6.3.4",
     "karma-chai": "^0.1.0",
@@ -76,7 +77,9 @@
     "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": "^10.4.0",
     "typescript": "^3.9.5",
@@ -85,4 +88,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/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/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/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/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/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"}