Merge remote-tracking branch 'origin/v0.20-dev' into v0.20-dev

.github/workflows/.env

@@ -1,4 +1,4 @@
 #DRIVE_BRANCH=update-dpp
 #DAPI_BRANCH=update-dpp
-#DASHMATE_BRANCH=update-dpp
-#SDK_BRANCH=update-dpp
+#DASHMATE_BRANCH=update-sdk
+#SDK_BRANCH=

lib/test/createClientWithFundedWallet.js

@@ -27,7 +27,9 @@ async function createClientWithFundedWallet(HDPrivateKey = undefined) {
 
   const faucetClient = createFaucetClient();
 
-  const walletOptions = {};
+  const walletOptions = {
+    waitForInstantLockTimeout: 120000,
+  };
 
   if (HDPrivateKey) {
     walletOptions.HDPrivateKey = HDPrivateKey;

package.json

@@ -21,12 +21,12 @@
   "dependencies": {
     "@dashevo/dashcore-lib": "~0.19.25",
     "@dashevo/dpns-contract": "github:dashevo/dpns-contract#update-dpp",
-    "@dashevo/dpp": "~0.20.0-dev.2",
+    "@dashevo/dpp": "~0.20.0-dev.3",
     "@dashevo/grpc-common": "~0.3.4",
-    "@dashevo/wallet-lib": "~7.20.0-dev.2",
+    "@dashevo/wallet-lib": "~7.20.0-dev.4",
     "chai": "^4.2.0",
     "chai-as-promised": "^7.1.1",
-    "dash": "~3.20.0-dev.2",
+    "dash": "~3.20.0-dev.4",
     "dirty-chai": "^2.0.1",
     "dotenv-safe": "^8.2.0",
     "github-api": "^3.3.0",

test/e2e/wallet.spec.js

@@ -34,6 +34,7 @@ describe('e2e', () => {
         network: process.env.NETWORK,
         wallet: {
           mnemonic,
+          waitForInstantLockTimeout: 120000,
         },
       });
     });
@@ -96,6 +97,7 @@ describe('e2e', () => {
         restoredWallet = new Dash.Client({
           wallet: {
             mnemonic,
+            waitForInstantLockTimeout: 120000,
           },
           seeds: getDAPISeeds(),
           network: process.env.NETWORK,

test/functional/core/getTransaction.spec.js

@@ -3,6 +3,8 @@ const {
   PrivateKey,
 } = require('@dashevo/dashcore-lib');
 
+const NotFoundError = require('@dashevo/dapi-client/lib/methods/errors/NotFoundError');
+
 const createFaucetClient = require('../../../lib/test/createFaucetClient');
 const wait = require('../../../lib/wait');
 
@@ -27,17 +29,19 @@ describe('Core', () => {
       await faucetWalletAccount.broadcastTransaction(transaction);
 
       const result = await faucetClient.getDAPIClient().core.getTransaction(transaction.id);
-      const receivedTx = new Transaction(Buffer.from(result));
+      const receivedTx = new Transaction(result.getTransaction());
 
       expect(receivedTx.hash).to.deep.equal(transaction.id);
     });
 
     it('should respond with null if transaction was not found', async () => {
       const nonExistentId = Buffer.alloc(32).toString('hex');
 
-      const result = await faucetClient.getDAPIClient().core.getTransaction(nonExistentId);
-
-      expect(result).to.equal(null);
+      try {
+        await faucetClient.getDAPIClient().core.getTransaction(nonExistentId);
+      } catch (e) {
+        expect(e).to.be.an.instanceOf(NotFoundError);
+      }
     });
   });
 });

test/functional/platform/Identity.spec.js

@@ -202,11 +202,13 @@ describe('Platform', () => {
     });
 
     it('should be able to get newly created identity by it\'s first public key', async () => {
-      const [serializedIdentity] = await client.getDAPIClient().platform
+      const response = await client.getDAPIClient().platform
         .getIdentitiesByPublicKeyHashes(
           [identity.getPublicKeyById(0).hash()],
         );
 
+      const [serializedIdentity] = response.getIdentities();
+
       expect(serializedIdentity).to.be.not.null();
 
       const receivedIdentity = dpp.identity.createFromBuffer(
@@ -225,10 +227,12 @@ describe('Platform', () => {
     });
 
     it('should be able to get newly created identity id by it\'s first public key', async () => {
-      const [identityId] = await client.getDAPIClient().platform.getIdentityIdsByPublicKeyHashes(
+      const response = await client.getDAPIClient().platform.getIdentityIdsByPublicKeyHashes(
         [identity.getPublicKeyById(0).hash()],
       );
 
+      const [identityId] = response.getIdentityIds();
+
       expect(identityId).to.be.not.null();
       expect(identityId).to.deep.equal(identity.getId());
     });