dash 3.23.0-dev.1 → 3.23.0-dev.4

package/src/SDK/Client/Platform/methods/identities/topUp.ts

@@ -1,10 +1,6 @@
-// @ts-ignore
 import Identifier from "@dashevo/dpp/lib/Identifier";
 import {Platform} from "../../Platform";
 
-import createAssetLockTransaction from "../../createAssetLockTransaction";
-import createAssetLockProof from "./internal/createAssetLockProof";
-import createIdentityTopUpTransition from "./internal/createIdnetityTopUpTransition";
 import broadcastStateTransition from "../../broadcastStateTransition";
 
 /**
@@ -28,15 +24,16 @@ export async function topUp(this: Platform, identityId: Identifier | string, amo
         transaction: assetLockTransaction,
         privateKey: assetLockPrivateKey,
         outputIndex: assetLockOutputIndex
-    } = await createAssetLockTransaction(this, amount);
+    } = await this.identities.utils.createAssetLockTransaction(amount);
 
     // Broadcast Asset Lock transaction
     await account.broadcastTransaction(assetLockTransaction);
     // Create a proof for the asset lock transaction
-    const assetLockProof = await createAssetLockProof(this, assetLockTransaction, assetLockOutputIndex);
+    const assetLockProof = await this.identities.utils
+      .createAssetLockProof(assetLockTransaction, assetLockOutputIndex);
 
-    // @ts-ignore
-    const identityTopUpTransition = await createIdentityTopUpTransition(this, assetLockProof, assetLockPrivateKey, identityId);
+    const identityTopUpTransition = await this.identities.utils
+      .createIdentityTopUpTransition(assetLockProof, assetLockPrivateKey, identityId);
 
     // Broadcast ST
     await broadcastStateTransition(this, identityTopUpTransition);

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

@@ -11,6 +11,7 @@ import broadcastStateTransition from "../../broadcastStateTransition";
  * @param {Platform} this - bound instance class
  * @param {Identity} identity - identity to update
  * @param {{add: IdentityPublicKey[]; disable: IdentityPublicKey[]}} publicKeys - public keys to add
+ * @param {Object<string, any>} privateKeys - public keys to add
  *
  * @returns {boolean}
  */
@@ -18,6 +19,7 @@ export async function update(
   this: Platform,
   identity: Identity,
   publicKeys: { add?: IdentityPublicKey[]; disable?: IdentityPublicKey[] },
+  privateKeys: { string, any },
   ): Promise<any> {
   await this.initialize();
 
@@ -28,7 +30,39 @@ export async function update(
     publicKeys,
   );
 
-  await signStateTransition(this, identityUpdateTransition, identity);
+  const signerKeyIndex = 0;
+
+  // Create key proofs
+  if (identityUpdateTransition.getPublicKeysToAdd()) {
+    const signerKey = identity.getPublicKeys()[signerKeyIndex];
+
+    // must be run sequentially! will not work with Promise.all!
+    // more info at https://jrsinclair.com/articles/2019/how-to-run-async-js-in-parallel-or-sequential/
+
+    const starterPromise = Promise.resolve(null);
+
+    await identityUpdateTransition.getPublicKeysToAdd().reduce(
+      (previousPromise, publicKey) => previousPromise.then(async () => {
+        const privateKey = privateKeys[publicKey.getId()];
+
+        if (!privateKey) {
+          throw new Error(`Private key for key ${publicKey.getId()} not found`);
+        }
+
+        identityUpdateTransition.setSignaturePublicKeyId(signerKey.getId());
+
+        await identityUpdateTransition.signByPrivateKey(privateKey, publicKey.getType());
+
+        publicKey.setSignature(identityUpdateTransition.getSignature());
+
+        identityUpdateTransition.setSignature(undefined);
+        identityUpdateTransition.setSignaturePublicKeyId(undefined);
+      }),
+      starterPromise,
+    );
+  }
+
+  await signStateTransition(this, identityUpdateTransition, identity, signerKeyIndex);
 
   const result = await dpp.stateTransition.validateBasic(identityUpdateTransition);
 

package/src/SDK/SDK.ts

@@ -3,34 +3,47 @@ import { Core as _Core } from './Core';
 import { Platform as _Platform } from './Platform';
 import { default as _DAPIClient } from '@dashevo/dapi-client';
 
+import { StateTransitionBroadcastError } from '../errors/StateTransitionBroadcastError'
+
 import {
-    Wallet as _Wallet,
-    Account as _Account,
-    DerivableKeyChain as _KeyChain,
-    CONSTANTS as _WalletLibCONSTANTS,
-    EVENTS as _WalletLibEVENTS,
-    utils as _WalletLibUtils,
-    plugins as _WalletLibPlugins
+  Wallet as _Wallet,
+  Account as _Account,
+  DerivableKeyChain as _KeyChain,
+  CONSTANTS as _WalletLibCONSTANTS,
+  EVENTS as _WalletLibEVENTS,
+  utils as _WalletLibUtils,
+  plugins as _WalletLibPlugins
 } from '@dashevo/wallet-lib';
 
 export namespace SDK {
-    export let DAPIClient = _DAPIClient;
-    export let Client = _Client;
+  export let DAPIClient = _DAPIClient;
+  export let Client = _Client;
+
+  export let Core = _Core;
+  // TODO: consider marking as DEPRECATED and use PlatformProtocol below instead
+  export let Platform = _Platform;
+
+  // Wallet-lib primitives
+  export let Wallet = _Wallet;
+  export let Account = _Account;
+  export let KeyChain = _KeyChain;
 
-    export let Core = _Core;
-    export let Platform = _Platform;
+  // TODO: consider merging into Wallet above and mark as DEPRECATED
+  export let WalletLib = {
+    CONSTANTS: _WalletLibCONSTANTS,
+    EVENTS: _WalletLibEVENTS,
+    plugins: _WalletLibPlugins,
+    utils: _WalletLibUtils,
+  }
 
-    // Wallet-lib primitives
-    export let Wallet = _Wallet;
-    export let Account = _Account;
-    export let KeyChain = _KeyChain;
+  export let PlatformProtocol = Platform.DashPlatformProtocol;
 
-    export let WalletLib = {
-        CONSTANTS: _WalletLibCONSTANTS,
-        EVENTS: _WalletLibEVENTS,
-        plugins: _WalletLibPlugins,
-        utils: _WalletLibUtils,
-    }
+  export let Essentials = {
+    Buffer,
+  }
 
+  export let Errors = {
+    StateTransitionBroadcastError
+  }
 }
 export { SDK as default };

package/src/test/fixtures/createIdentityFixtureInAccount.ts

@@ -5,14 +5,25 @@ const getIdentityFixture = require('@dashevo/dpp/lib/test/fixtures/getIdentityFi
 export function createIdentityFixtureInAccount(account) {
     const identityFixture = getIdentityFixture();
     const identityFixtureIndex = 0;
-    const { privateKey: identityPrivateKey } = account.identities.getIdentityHDKeyByIndex(identityFixtureIndex, 0);
+    const { privateKey: identityMasterPrivateKey } = account.identities.getIdentityHDKeyByIndex(identityFixtureIndex, 0);
+    const { privateKey: identitySecondPrivateKey } = account.identities.getIdentityHDKeyByIndex(identityFixtureIndex, 1);
 
     identityFixture.publicKeys[0] = new IdentityPublicKey({
         id: 0,
         type: IdentityPublicKey.TYPES.ECDSA_SECP256K1,
-        data: identityPrivateKey.toPublicKey().toBuffer(),
+        data: identityMasterPrivateKey.toPublicKey().toBuffer(),
         purpose: IdentityPublicKey.PURPOSES.AUTHENTICATION,
-        securityLevel: IdentityPublicKey.SECURITY_LEVELS.MASTER
+        securityLevel: IdentityPublicKey.SECURITY_LEVELS.MASTER,
+        readOnly: false,
+    });
+
+    identityFixture.publicKeys[1] = new IdentityPublicKey({
+      id: 1,
+      type: IdentityPublicKey.TYPES.ECDSA_SECP256K1,
+      data: identitySecondPrivateKey.toPublicKey().toBuffer(),
+      purpose: IdentityPublicKey.PURPOSES.AUTHENTICATION,
+      securityLevel: IdentityPublicKey.SECURITY_LEVELS.HIGH,
+      readOnly: false,
     });
 
     account.storage

package/src/test/fixtures/createTransactionFixtureInAccount.ts

@@ -4,12 +4,12 @@ export async function createTransactionInAccount(account) {
     // add fake tx to the wallet so it will be able to create transactions
     const walletTransaction = new Transaction(undefined)
         .from([{
-            amount: 150000,
+            amount: 1500000,
             script: '76a914f9996443a7d5e2694560f8715e5e8fe602133c6088ac',
             outputIndex: 0,
             txid: new Transaction(undefined).hash,
         }])
-        .to(account.getAddress(10).address, 100000);
+        .to(account.getAddress(10).address, 1000000);
 
     await account.importTransactions([[walletTransaction.serialize(true)]]);
 

package/src/test/mocks/createAndAttachTransportMocksToClient.ts

@@ -58,7 +58,7 @@ function makeGetIdentityRespondWithIdentity(client, dapiClientMock) {
             let identityToResolve = new Identity({
                 protocolVersion: interceptedIdentityStateTransition.getProtocolVersion(),
                 id: interceptedIdentityStateTransition.getIdentityId().toBuffer(),
-                publicKeys: interceptedIdentityStateTransition.getPublicKeys().map((key) => key.toObject()),
+                publicKeys: interceptedIdentityStateTransition.getPublicKeys().map((key) => key.toObject({ skipSignature: true })),
                 balance: interceptedIdentityStateTransition.getAssetLockProof().getOutput().satoshis,
                 revision: 0,
             });
@@ -87,7 +87,7 @@ export async function createAndAttachTransportMocksToClient(client, sinon) {
     await accountPromise;
 
     // Putting data in transport stubs
-    transportMock.getIdentityIdsByPublicKeyHash.resolves([null]);
+    transportMock.getIdentitiesByPublicKeyHashes.resolves([]);
     makeTxStreamEmitISLocksForTransactions(transportMock, txStreamMock);
     makeGetIdentityRespondWithIdentity(client, dapiClientMock);
 

package/tests/fixtures/contracts.json

@@ -17,7 +17,7 @@
             "name": "rating",
             "properties": [
               {
-                "rating": "desc"
+                "rating": "asc"
               }
             ]
           }

package/tests/fixtures/ratePlatform.schema.json

@@ -11,7 +11,7 @@
       "name": "rating",
       "properties": [
         {
-          "rating": "desc"
+          "rating": "asc"
         }
       ]
     }],

package/webpack.base.config.js

@@ -1,8 +1,10 @@
 const path = require('path');
 const webpack = require('webpack');
+const TerserPlugin = require("terser-webpack-plugin");
 
 const baseConfig = {
   entry: './src/index.ts',
+  devtool: 'eval',
   module: {
     rules: [
       {
@@ -12,6 +14,14 @@ const baseConfig = {
       },
     ],
   },
+  optimization: {
+    minimize: true,
+    minimizer: [new TerserPlugin({
+      terserOptions: {
+        keep_classnames: true // fixes empty string in `object.constructor.name`
+      }
+    })],
+  },
   resolve: {
     extensions: ['.ts', '.js', '.json'],
     fallback: {
@@ -29,6 +39,10 @@ const baseConfig = {
       zlib: require.resolve('browserify-zlib'),
       events: require.resolve('events/'),
       string_decoder: require.resolve('string_decoder/'),
+      tls: require.resolve('tls/'),
+      net: require.resolve('net/'),
+      // Browser build have to use native WebSocket
+      ws: require.resolve('./build-utils/ws'),
     },
   },
   plugins: [

package/webpack.config.js

@@ -4,11 +4,15 @@ const webpackBaseConfig = require("./webpack.base.config");
 const webConfig =  {
   ...webpackBaseConfig,
   entry: './build/src/index.js',
+  devtool: 'source-map',
   mode: 'production',
+  target: 'web',
   output: {
     path: path.resolve(__dirname, 'dist'),
-    libraryTarget: 'umd',
-    library: 'Dash',
+    library: {
+      name: 'Dash',
+      type: 'umd'
+    },
     filename: 'dash.min.js',
     // fixes ReferenceError: window is not defined
     globalObject: "(typeof self !== 'undefined' ? self : this)"