@thesingularitynetwork/darkswap-sdk 0.1.30 → 0.1.33

package/dist/config/contractConfig.d.ts

@@ -5,7 +5,6 @@ export declare type ContractConfiguartion = {
     merkleTreeOperator: string;
     darkSwapAssetManager: string;
     darkSwapFeeAssetManager: string;
-    drakSwapSubgraphUrl: string;
 };
 export declare const contractConfig: {
     [chainId: number]: ContractConfiguartion;

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

@@ -4718,48 +4718,42 @@ var contractConfig = (_contractConfig = {}, _contractConfig[exports.ChainId.MAIN
   nativeWrapper: '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
   merkleTreeOperator: '0x0',
   darkSwapAssetManager: '0x0',
-  darkSwapFeeAssetManager: '0x0',
-  drakSwapSubgraphUrl: 'https://subgraph.satsuma-prod.com/1c6a44a9ed6e/pgs-team--611591/singularity-subgraph/version/v0.0.1/api'
+  darkSwapFeeAssetManager: '0x0'
 }, _contractConfig[exports.ChainId.ARBITRUM_ONE] = {
   priceOracle: '0x0AdDd25a91563696D8567Df78D5A01C9a991F9B8',
   ethAddress: '0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE',
   nativeWrapper: '0x82af49447d8a07e3bd95bd0d56f35241523fbab1',
   merkleTreeOperator: '0x0',
   darkSwapAssetManager: '0x0',
-  darkSwapFeeAssetManager: '0x0',
-  drakSwapSubgraphUrl: 'https://subgraph.satsuma-prod.com/1c6a44a9ed6e/pgs-team--611591/singularity-arb-subgraph/api'
+  darkSwapFeeAssetManager: '0x0'
 }, _contractConfig[exports.ChainId.BASE] = {
   priceOracle: '0xf224a25453D76A41c4427DD1C05369BC9f498444',
   ethAddress: '0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE',
   nativeWrapper: '0x4200000000000000000000000000000000000006',
-  merkleTreeOperator: '0x0',
-  darkSwapAssetManager: '0x0',
-  darkSwapFeeAssetManager: '0x0',
-  drakSwapSubgraphUrl: 'https://subgraph.satsuma-prod.com/1c6a44a9ed6e/pgs-team--611591/singularity-base-subgraph/api'
+  merkleTreeOperator: '0x918B4F76CAE5F67A3818D8eD3d0e11D9888684E9',
+  darkSwapAssetManager: '0x6fbA1F1aAb8449b7ba576E41F4617d918391b7cF',
+  darkSwapFeeAssetManager: '0xfde341e63EB2f25A32D353d58C2DAd7f91c8Bd57'
 }, _contractConfig[exports.ChainId.SEPOLIA] = {
   priceOracle: '0x4Fe44a9aC8Ef059Be2dB97f9e3bcA32Ab698C2f2',
   ethAddress: '0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE',
   nativeWrapper: '0xfFf9976782d46CC05630D1f6eBAb18b2324d6B14',
   merkleTreeOperator: '0x0',
   darkSwapAssetManager: '0x0',
-  darkSwapFeeAssetManager: '0x0',
-  drakSwapSubgraphUrl: ''
+  darkSwapFeeAssetManager: '0x0'
 }, _contractConfig[exports.ChainId.HORIZEN_TESTNET] = {
   priceOracle: '0x54c375f28ce4B0c2B986D6256E4Bc75d242A8793',
   ethAddress: '0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE',
   nativeWrapper: '0xfFf9976782d46CC05630D1f6eBAb18b2324d6B14',
   merkleTreeOperator: '0x8Cd4061C8b3743810B811E1F4A0B597D79225f4E',
   darkSwapAssetManager: '0xEBeD6c7C2189bf8ad6687D3A4cf4b83fB4D1a3D2',
-  darkSwapFeeAssetManager: '0x8CF86856Bd7dE95b4ba33DCae4cd5Ec02542Bf5b',
-  drakSwapSubgraphUrl: ''
+  darkSwapFeeAssetManager: '0x8CF86856Bd7dE95b4ba33DCae4cd5Ec02542Bf5b'
 }, _contractConfig[exports.ChainId.HARDHAT] = {
   priceOracle: '0x0AdDd25a91563696D8567Df78D5A01C9a991F9B8',
   ethAddress: '0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE',
   nativeWrapper: '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
   merkleTreeOperator: '0xEd8D7d3A98CB4ea6C91a80dcd2220719c264531f',
   darkSwapAssetManager: '0x6D39d71fF4ab56a4873febd34e1a3BDefc01b41e',
-  darkSwapFeeAssetManager: '0xb9b0c96e4E7181926D2A7ed331C9C346dfa59b4D',
-  drakSwapSubgraphUrl: 'https://34.142.142.240:8080/subgraphs/name/singularity/'
+  darkSwapFeeAssetManager: '0xb9b0c96e4E7181926D2A7ed331C9C346dfa59b4D'
 }, _contractConfig);
 
 function refineGasLimit(estimatedGas) {
@@ -9328,9 +9322,9 @@ var RetailCreateOrderService = /*#__PURE__*/function (_BaseContractService) {
   }
   _inheritsLoose(RetailCreateOrderService, _BaseContractService);
   var _proto = RetailCreateOrderService.prototype;
-  _proto.prepare = /*#__PURE__*/function () {
-    var _prepare = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(address, depositAsset, depositAmount, swapInAsset, swapInAmount, signature) {
-      var _yield$generateKeyPai, pubKey, privKey, feeRatio, orderNote, feeAmount, realSwapInAmount, swapInNote, context, swapMessage, _t, _t2;
+  _proto.rebuildContextFromSwapMessage = /*#__PURE__*/function () {
+    var _rebuildContextFromSwapMessage = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(swapMessage, signature) {
+      var _yield$generateKeyPai, pubKey, context;
       return _regenerator().w(function (_context) {
         while (1) switch (_context.n) {
           case 0:
@@ -9339,12 +9333,46 @@ var RetailCreateOrderService = /*#__PURE__*/function (_BaseContractService) {
           case 1:
             _yield$generateKeyPai = _context.v;
             pubKey = _yield$generateKeyPai[0];
-            privKey = _yield$generateKeyPai[1];
+            if (validateOrderNoteWithPubKey(swapMessage.orderNote, pubKey)) {
+              _context.n = 2;
+              break;
+            }
+            throw new DarkSwapError('SwapMessage does not belong to this wallet');
+          case 2:
+            context = new RetailCreateOrderContext(signature);
+            context.orderNote = swapMessage.orderNote;
+            context.swapInNote = swapMessage.inNote;
+            context.feeAmount = swapMessage.feeAmount;
+            context.address = swapMessage.address;
+            _context.n = 3;
+            return this.generateProof(context);
+          case 3:
+            return _context.a(2, context);
+        }
+      }, _callee, this);
+    }));
+    function rebuildContextFromSwapMessage(_x, _x2) {
+      return _rebuildContextFromSwapMessage.apply(this, arguments);
+    }
+    return rebuildContextFromSwapMessage;
+  }();
+  _proto.prepare = /*#__PURE__*/function () {
+    var _prepare = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(address, depositAsset, depositAmount, swapInAsset, swapInAmount, signature) {
+      var _yield$generateKeyPai2, pubKey, privKey, feeRatio, orderNote, feeAmount, realSwapInAmount, swapInNote, context, swapMessage, _t, _t2;
+      return _regenerator().w(function (_context2) {
+        while (1) switch (_context2.n) {
+          case 0:
+            _context2.n = 1;
+            return generateKeyPair(signature);
+          case 1:
+            _yield$generateKeyPai2 = _context2.v;
+            pubKey = _yield$generateKeyPai2[0];
+            privKey = _yield$generateKeyPai2[1];
             _t = BigInt;
-            _context.n = 2;
+            _context2.n = 2;
             return getFeeRatio(address, this._darkSwap);
           case 2:
-            _t2 = _context.v;
+            _t2 = _context2.v;
             feeRatio = _t(_t2);
             orderNote = createOrderNoteExt(address, depositAsset, depositAmount, feeRatio, pubKey);
             feeAmount = calcFeeAmount(swapInAmount, feeRatio);
@@ -9355,36 +9383,36 @@ var RetailCreateOrderService = /*#__PURE__*/function (_BaseContractService) {
             context.swapInNote = swapInNote;
             context.feeAmount = feeAmount;
             context.address = address;
-            _context.n = 3;
+            _context2.n = 3;
             return generateRetailSwapMessage(address, orderNote, swapInNote, feeAmount, pubKey, privKey);
           case 3:
-            swapMessage = _context.v;
+            swapMessage = _context2.v;
             context.swapMessage = swapMessage;
-            return _context.a(2, {
+            return _context2.a(2, {
               context: context,
               swapMessage: swapMessage
             });
         }
-      }, _callee, this);
+      }, _callee2, this);
     }));
-    function prepare(_x, _x2, _x3, _x4, _x5, _x6) {
+    function prepare(_x3, _x4, _x5, _x6, _x7, _x8) {
       return _prepare.apply(this, arguments);
     }
     return prepare;
   }();
   _proto.generateProof = /*#__PURE__*/function () {
-    var _generateProof = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(context) {
+    var _generateProof = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee3(context) {
       var proof;
-      return _regenerator().w(function (_context2) {
-        while (1) switch (_context2.n) {
+      return _regenerator().w(function (_context3) {
+        while (1) switch (_context3.n) {
           case 0:
             if (!(!context || !context.orderNote || !context.swapInNote || !context.address || !context.feeAmount || !context.signature)) {
-              _context2.n = 1;
+              _context3.n = 1;
               break;
             }
             throw new DarkSwapError('Invalid context');
           case 1:
-            _context2.n = 2;
+            _context3.n = 2;
             return generateRetailCreateOrderProof({
               depositNote: context.orderNote,
               swapInNote: context.swapInNote,
@@ -9393,26 +9421,26 @@ var RetailCreateOrderService = /*#__PURE__*/function (_BaseContractService) {
               feeAmount: context.feeAmount
             });
           case 2:
-            proof = _context2.v;
+            proof = _context3.v;
             context.proof = proof;
           case 3:
-            return _context2.a(2);
+            return _context3.a(2);
         }
-      }, _callee2);
+      }, _callee3);
     }));
-    function generateProof(_x7) {
+    function generateProof(_x9) {
       return _generateProof.apply(this, arguments);
     }
     return generateProof;
   }();
   _proto.allowance = /*#__PURE__*/function () {
-    var _allowance = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee3(context) {
+    var _allowance = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee4(context) {
       var signer, asset, amount, allowanceContract, allowance, isLegacy, contract, tx;
-      return _regenerator().w(function (_context3) {
-        while (1) switch (_context3.n) {
+      return _regenerator().w(function (_context4) {
+        while (1) switch (_context4.n) {
           case 0:
             if (!(!context || !context.orderNote || !context.address || !context.signature || !context.proof)) {
-              _context3.n = 1;
+              _context4.n = 1;
               break;
             }
             throw new DarkSwapError('Invalid context');
@@ -9421,43 +9449,43 @@ var RetailCreateOrderService = /*#__PURE__*/function (_BaseContractService) {
             asset = context.orderNote.asset;
             amount = context.orderNote.amount;
             allowanceContract = new ethers.ethers.Contract(asset, ERC20Abi.abi, this._darkSwap);
-            _context3.n = 2;
+            _context4.n = 2;
             return allowanceContract.allowance(signer.getAddress(), this._darkSwap.contracts.darkSwapAssetManager);
           case 2:
-            allowance = _context3.v;
+            allowance = _context4.v;
             if (!(BigInt(allowance) < amount)) {
-              _context3.n = 4;
+              _context4.n = 4;
               break;
             }
             isLegacy = legacyTokenConfig.hasOwnProperty(this._darkSwap.chainId) && legacyTokenConfig[this._darkSwap.chainId].includes(asset.toLowerCase());
             contract = new ethers.ethers.Contract(asset, isLegacy ? ERC20_USDT.abi : ERC20Abi.abi, signer);
-            _context3.n = 3;
+            _context4.n = 3;
             return contract.approve(this._darkSwap.contracts.darkSwapAssetManager, hexlify32(MAX_ALLOWANCE));
           case 3:
-            tx = _context3.v;
-            _context3.n = 4;
-            return tx.wait();
+            tx = _context4.v;
+            _context4.n = 4;
+            return this._darkSwap.provider.waitForTransaction(tx.hash, 2);
           case 4:
-            return _context3.a(2);
+            return _context4.a(2);
         }
-      }, _callee3, this);
+      }, _callee4, this);
     }));
-    function allowance(_x8) {
+    function allowance(_x0) {
       return _allowance.apply(this, arguments);
     }
     return allowance;
   }();
   _proto.execute = /*#__PURE__*/function () {
-    var _execute = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee4(context) {
+    var _execute = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee5(context) {
       var contract, ethAmount, tx;
-      return _regenerator().w(function (_context4) {
-        while (1) switch (_context4.n) {
+      return _regenerator().w(function (_context5) {
+        while (1) switch (_context5.n) {
           case 0:
-            _context4.n = 1;
+            _context5.n = 1;
             return this.generateProof(context);
           case 1:
             if (!(!context || !context.orderNote || !context.swapInNote || !context.proof)) {
-              _context4.n = 2;
+              _context5.n = 2;
               break;
             }
             throw new DarkSwapError('Invalid context');
@@ -9465,30 +9493,30 @@ var RetailCreateOrderService = /*#__PURE__*/function (_BaseContractService) {
             contract = new ethers.ethers.Contract(this._darkSwap.contracts.darkSwapAssetManager, DarkSwapAssetManagerAbi.abi, this._darkSwap.signer);
             ethAmount = 0n;
             if (!isNativeAsset(context.orderNote.asset)) {
-              _context4.n = 3;
+              _context5.n = 3;
               break;
             }
             ethAmount = context.orderNote.amount;
-            _context4.n = 4;
+            _context5.n = 4;
             break;
           case 3:
-            _context4.n = 4;
+            _context5.n = 4;
             return this.allowance(context);
           case 4:
-            _context4.n = 5;
+            _context5.n = 5;
             return contract.retailDepositCreateOrder([hexlify32(context.orderNote.note), context.proof.depositFooter, context.orderNote.asset, bn_to_0xhex(context.orderNote.amount), hexlify32(context.swapInNote.note), context.proof.swapInNoteFooter], context.proof.proof, {
               value: bn_to_0xhex(ethAmount)
             });
           case 5:
-            tx = _context4.v;
-            _context4.n = 6;
+            tx = _context5.v;
+            _context5.n = 6;
             return tx.wait();
           case 6:
-            return _context4.a(2, tx.hash);
+            return _context5.a(2, tx.hash);
         }
-      }, _callee4, this);
+      }, _callee5, this);
     }));
-    function execute(_x9) {
+    function execute(_x1) {
       return _execute.apply(this, arguments);
     }
     return execute;