dash 3.22.0-dev.12 → 3.22.0-dev.15

package/build/src/SDK/Client/Platform/methods/identities/internal/createAssetLockProof.js

@@ -36,6 +36,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     }
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+var createFakeIntantLock_1 = require("../../../../../../utils/createFakeIntantLock");
 /**
  * Creates a funding transaction for the platform identity and returns one-time key to sign the state transition
  * @param {Platform} platform
@@ -46,7 +47,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
  */
 function createAssetLockProof(platform, assetLockTransaction, outputIndex) {
     return __awaiter(this, void 0, void 0, function () {
-        var account, dpp, instantLock;
+        var account, dpp, instantLock, e_1;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0: return [4 /*yield*/, platform.initialize()];
@@ -56,10 +57,23 @@ function createAssetLockProof(platform, assetLockTransaction, outputIndex) {
                 case 2:
                     account = _a.sent();
                     dpp = platform.dpp;
-                    return [4 /*yield*/, account.waitForInstantLock(assetLockTransaction.hash)];
+                    _a.label = 3;
                 case 3:
+                    _a.trys.push([3, 5, , 6]);
+                    return [4 /*yield*/, account.waitForInstantLock(assetLockTransaction.hash)];
+                case 4:
                     instantLock = _a.sent();
-                    // Create poof that the transaction won't be double spend
+                    return [3 /*break*/, 6];
+                case 5:
+                    e_1 = _a.sent();
+                    // if block is mined before the transaction is instant locked instant lock won't be sent
+                    if (!e_1.message || !e_1.message.startsWith('InstantLock waiting period for transaction')) {
+                        throw e_1;
+                    }
+                    return [3 /*break*/, 6];
+                case 6:
+                    // TODO: We should fallback to chainlock proofs instead
+                    instantLock = createFakeIntantLock_1.createFakeInstantLock(assetLockTransaction.hash);
                     // @ts-ignore
                     return [2 /*return*/, dpp.identity.createInstantAssetLockProof(instantLock, assetLockTransaction, outputIndex)];
             }

package/build/src/SDK/Client/Platform/methods/identities/internal/createAssetLockProof.js.map

@@ -1 +1 @@
-{"version":3,"file":"createAssetLockProof.js","sourceRoot":"","sources":["../../../../../../../../src/SDK/Client/Platform/methods/identities/internal/createAssetLockProof.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAGA;;;;;;;GAOG;AACH,SAA8B,oBAAoB,CAAC,QAAmB,EAAE,oBAAiC,EAAE,WAAmB;;;;;wBAC1H,qBAAM,QAAQ,CAAC,UAAU,EAAE,EAAA;;oBAA3B,SAA2B,CAAC;oBAEZ,qBAAM,QAAQ,CAAC,MAAM,CAAC,gBAAgB,EAAE,EAAA;;oBAAlD,OAAO,GAAG,SAAwC;oBAChD,GAAG,GAAK,QAAQ,IAAb,CAAc;oBAEP,qBAAM,OAAO,CAAC,kBAAkB,CAAC,oBAAoB,CAAC,IAAI,CAAC,EAAA;;oBAAzE,WAAW,GAAG,SAA2D;oBAC7E,yDAAyD;oBAEzD,aAAa;oBACb,sBAAO,GAAG,CAAC,QAAQ,CAAC,2BAA2B,CAAC,WAAW,EAAE,oBAAoB,EAAE,WAAW,CAAC,EAAC;;;;CACnG;AAXD,uCAWC"}
+{"version":3,"file":"createAssetLockProof.js","sourceRoot":"","sources":["../../../../../../../../src/SDK/Client/Platform/methods/identities/internal/createAssetLockProof.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAGA,qFAAqF;AAErF;;;;;;;GAOG;AACH,SAA8B,oBAAoB,CAAC,QAAmB,EAAE,oBAAiC,EAAE,WAAmB;;;;;wBAC1H,qBAAM,QAAQ,CAAC,UAAU,EAAE,EAAA;;oBAA3B,SAA2B,CAAC;oBAEZ,qBAAM,QAAQ,CAAC,MAAM,CAAC,gBAAgB,EAAE,EAAA;;oBAAlD,OAAO,GAAG,SAAwC;oBAChD,GAAG,GAAK,QAAQ,IAAb,CAAc;;;;oBAOP,qBAAM,OAAO,CAAC,kBAAkB,CAAC,oBAAoB,CAAC,IAAI,CAAC,EAAA;;oBAAzE,WAAW,GAAG,SAA2D,CAAC;;;;oBAE1E,wFAAwF;oBACxF,IAAI,CAAC,GAAC,CAAC,OAAO,IAAI,CAAC,GAAC,CAAC,OAAO,CAAC,UAAU,CAAC,4CAA4C,CAAC,EAAE;wBACrF,MAAM,GAAC,CAAC;qBACT;;;oBAGL,uDAAuD;oBACvD,WAAW,GAAG,4CAAqB,CAAC,oBAAoB,CAAC,IAAI,CAAC,CAAA;oBAE9D,aAAa;oBACb,sBAAO,GAAG,CAAC,QAAQ,CAAC,2BAA2B,CAAC,WAAW,EAAE,oBAAoB,EAAE,WAAW,CAAC,EAAC;;;;CACnG;AAxBD,uCAwBC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dash",
-  "version": "3.22.0-dev.12",
+  "version": "3.22.0-dev.15",
   "description": "Dash library for JavaScript/TypeScript ecosystem (Wallet, DAPI, Primitives, BLS, ...)",
   "main": "build/src/index.js",
   "unpkg": "dist/dash.min.js",
@@ -34,14 +34,14 @@
   },
   "homepage": "https://github.com/dashevo/DashJS#readme",
   "dependencies": {
-    "@dashevo/dapi-client": "~0.22.0-dev.12",
+    "@dashevo/dapi-client": "~0.22.0-dev.15",
     "@dashevo/dashcore-lib": "~0.19.30",
-    "@dashevo/dashpay-contract": "~0.22.0-dev.12",
-    "@dashevo/dpns-contract": "~0.22.0-dev.12",
-    "@dashevo/dpp": "~0.22.0-dev.12",
-    "@dashevo/grpc-common": "~0.22.0-dev.12",
-    "@dashevo/masternode-reward-shares-contract": "~0.22.0-dev.12",
-    "@dashevo/wallet-lib": "~7.22.0-dev.12",
+    "@dashevo/dashpay-contract": "~0.22.0-dev.15",
+    "@dashevo/dpns-contract": "~0.22.0-dev.15",
+    "@dashevo/dpp": "~0.22.0-dev.15",
+    "@dashevo/grpc-common": "~0.22.0-dev.15",
+    "@dashevo/masternode-reward-shares-contract": "~0.22.0-dev.15",
+    "@dashevo/wallet-lib": "~7.22.0-dev.15",
     "bs58": "^4.0.1",
     "node-inspect-extracted": "^1.0.8"
   },

package/src/SDK/Client/Platform/methods/identities/internal/createAssetLockProof.ts

@@ -1,6 +1,8 @@
 import { Transaction } from "@dashevo/dashcore-lib";
 import { Platform } from "../../../Platform";
 
+import { createFakeInstantLock } from "../../../../../../utils/createFakeIntantLock";
+
 /**
  * Creates a funding transaction for the platform identity and returns one-time key to sign the state transition
  * @param {Platform} platform
@@ -15,9 +17,22 @@ export default async function createAssetLockProof(platform : Platform, assetLoc
     const account = await platform.client.getWalletAccount();
     const { dpp } = platform;
 
-    let instantLock = await account.waitForInstantLock(assetLockTransaction.hash);
     // Create poof that the transaction won't be double spend
 
+    let instantLock;
+
+    try {
+        instantLock = await account.waitForInstantLock(assetLockTransaction.hash);
+    } catch (e) {
+        // if block is mined before the transaction is instant locked instant lock won't be sent
+        if (!e.message || !e.message.startsWith('InstantLock waiting period for transaction')) {
+          throw e;
+        }
+    }
+
+    // TODO: We should fallback to chainlock proofs instead
+    instantLock = createFakeInstantLock(assetLockTransaction.hash)
+
     // @ts-ignore
     return dpp.identity.createInstantAssetLockProof(instantLock, assetLockTransaction, outputIndex);
 }