@thesingularitynetwork/darkswap-sdk 0.1.25 → 0.1.27

package/dist/darkswap-sdk.cjs.development.js

@@ -4650,31 +4650,59 @@ function multiGetMerklePathAndRoot(_x3, _x4) {
 }
 function _multiGetMerklePathAndRoot() {
   _multiGetMerklePathAndRoot = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(notes, darkSwap) {
-    var contract, _yield$contract$getMu, root, paths, indexes, results, i;
+    var contract, results, _yield$contract$getMu, root, paths, indexes, i, _yield$contract$getMu2, _root, _paths, _indexes;
     return _regenerator().w(function (_context2) {
       while (1) switch (_context2.n) {
         case 0:
           contract = getContract$1(darkSwap.contracts.merkleTreeOperator, darkSwap);
+          results = [];
           _context2.n = 1;
-          return contract.getMultiMerklePaths(notes.map(function (note) {
-            return hexlify32(note);
-          }));
+          return contract.getMultiMerklePaths([hexlify32(notes[0])]);
         case 1:
           _yield$contract$getMu = _context2.v;
           root = _yield$contract$getMu[0];
           paths = _yield$contract$getMu[1];
           indexes = _yield$contract$getMu[2];
-          results = [];
-          for (i = 0; i < notes.length; i++) {
-            results.push({
-              noteCommitment: notes[i],
-              path: paths[i],
-              index: indexes[i].map(function (x) {
-                return x ? 1 : 0;
-              }),
-              root: root
-            });
+          results.push({
+            noteCommitment: notes[0],
+            path: paths[0],
+            index: indexes[0].map(function (x) {
+              return x ? 1 : 0;
+            }),
+            root: root
+          });
+          i = 1;
+        case 2:
+          if (!(i < notes.length)) {
+            _context2.n = 6;
+            break;
+          }
+          _context2.n = 3;
+          return contract.getMultiMerklePaths([hexlify32(notes[i])]);
+        case 3:
+          _yield$contract$getMu2 = _context2.v;
+          _root = _yield$contract$getMu2[0];
+          _paths = _yield$contract$getMu2[1];
+          _indexes = _yield$contract$getMu2[2];
+          if (!(_root != results[0].root)) {
+            _context2.n = 4;
+            break;
           }
+          throw new DarkSwapError('Merkle root not match for multi notes, please try again');
+        case 4:
+          results.push({
+            noteCommitment: notes[i],
+            path: _paths[0],
+            index: _indexes[0].map(function (x) {
+              return x ? 1 : 0;
+            }),
+            root: _root
+          });
+        case 5:
+          i++;
+          _context2.n = 2;
+          break;
+        case 6:
           return _context2.a(2, results);
       }
     }, _callee2);
@@ -8832,7 +8860,7 @@ var ProSwapService = /*#__PURE__*/function (_BaseContractService) {
   }();
   _proto.execute = /*#__PURE__*/function () {
     var _execute = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee4(context) {
-      var contract, tx;
+      var contract, swapArgs, estimatedGas, tx;
       return _regenerator().w(function (_context4) {
         while (1) switch (_context4.n) {
           case 0:
@@ -8846,13 +8874,20 @@ var ProSwapService = /*#__PURE__*/function (_BaseContractService) {
             throw new DarkSwapError('Invalid context');
           case 2:
             contract = new ethers.ethers.Contract(this._darkSwap.contracts.darkSwapAssetManager, DarkSwapAssetManagerAbi.abi, this._darkSwap.signer);
+            swapArgs = [context.merkleRoot, context.proof.aliceOutNullifier, hexlify32(context.orderNote.feeRatio), hexlify32(context.swapInNote.note), context.proof.aliceInNoteFooter, hexlify32(context.changeNote.note), context.proof.aliceChangeNoteFooter, context.proof.bobOutNullifier, hexlify32(context.bobSwapMessage.orderNote.feeRatio), hexlify32(context.bobSwapMessage.inNote.note), context.proof.bobInNoteFooter];
             _context4.n = 3;
-            return contract.proSwap([context.merkleRoot, context.proof.aliceOutNullifier, hexlify32(context.orderNote.feeRatio), hexlify32(context.swapInNote.note), context.proof.aliceInNoteFooter, hexlify32(context.changeNote.note), context.proof.aliceChangeNoteFooter, context.proof.bobOutNullifier, hexlify32(context.bobSwapMessage.orderNote.feeRatio), hexlify32(context.bobSwapMessage.inNote.note), context.proof.bobInNoteFooter], context.proof.proof);
+            return contract.proSwap.estimateGas(swapArgs, context.proof.proof);
           case 3:
-            tx = _context4.v;
+            estimatedGas = _context4.v;
             _context4.n = 4;
-            return tx.wait();
+            return contract.proSwap(swapArgs, context.proof.proof, {
+              gasLimit: estimatedGas
+            });
           case 4:
+            tx = _context4.v;
+            _context4.n = 5;
+            return tx.wait();
+          case 5:
             return _context4.a(2, tx.hash);
         }
       }, _callee4, this);