@dhedge/v2-sdk 1.5.1 → 1.5.3

package/dist/services/toros/easySwapper.d.ts

@@ -1,6 +1,6 @@
 import { ethers } from "ethers";
 import { Pool } from "../..";
-export declare function getPoolDepositAsset(pool: Pool, poolAddress: string): Promise<string | undefined>;
+export declare function getPoolDepositAsset(pool: Pool, poolAddress: string, investAsset: string): Promise<string | undefined>;
 export declare function getTorosPoolTokenPrice(pool: Pool, poolAddress: string): Promise<ethers.BigNumber>;
 export declare function getEasySwapperDepositQuote(pool: Pool, torosAsset: string, investAsset: string, depositAsset: string, amountIn: ethers.BigNumber): Promise<ethers.BigNumber>;
 export declare function getEasySwapperWithdrawalQuote(pool: Pool, torosAsset: string, investAsset: string, amountIn: ethers.BigNumber): Promise<ethers.BigNumber>;

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

@@ -10722,13 +10722,13 @@ function _isPool() {
   return _isPool.apply(this, arguments);
 }
 
-function getPoolDepositAsset(_x, _x2) {
+function getPoolDepositAsset(_x, _x2, _x3) {
   return _getPoolDepositAsset.apply(this, arguments);
 }
 
 function _getPoolDepositAsset() {
-  _getPoolDepositAsset = _asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee(pool, poolAddress) {
-    var _composition$find;
+  _getPoolDepositAsset = _asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee(pool, poolAddress, investAsset) {
+    var _composition$find, _composition$find2;
 
     var torosPool, composition;
     return runtime_1.wrap(function _callee$(_context) {
@@ -10745,11 +10745,22 @@ function _getPoolDepositAsset() {
 
           case 5:
             composition = _context.sent;
-            return _context.abrupt("return", (_composition$find = composition.find(function (e) {
+
+            if (!((_composition$find = composition.find(function (e) {
+              return e.asset.toLowerCase() === investAsset.toLowerCase();
+            })) != null && _composition$find.isDeposit)) {
+              _context.next = 8;
+              break;
+            }
+
+            return _context.abrupt("return", investAsset);
+
+          case 8:
+            return _context.abrupt("return", (_composition$find2 = composition.find(function (e) {
               return e.isDeposit;
-            })) == null ? void 0 : _composition$find.asset);
+            })) == null ? void 0 : _composition$find2.asset);
 
-          case 7:
+          case 9:
           case "end":
             return _context.stop();
         }
@@ -10759,7 +10770,7 @@ function _getPoolDepositAsset() {
   return _getPoolDepositAsset.apply(this, arguments);
 }
 
-function getTorosPoolTokenPrice(_x3, _x4) {
+function getTorosPoolTokenPrice(_x4, _x5) {
   return _getTorosPoolTokenPrice.apply(this, arguments);
 }
 
@@ -10791,7 +10802,7 @@ function _getTorosPoolTokenPrice() {
   return _getTorosPoolTokenPrice.apply(this, arguments);
 }
 
-function getEasySwapperDepositQuote(_x5, _x6, _x7, _x8, _x9) {
+function getEasySwapperDepositQuote(_x6, _x7, _x8, _x9, _x10) {
   return _getEasySwapperDepositQuote.apply(this, arguments);
 }
 
@@ -10819,7 +10830,7 @@ function _getEasySwapperDepositQuote() {
   return _getEasySwapperDepositQuote.apply(this, arguments);
 }
 
-function getEasySwapperWithdrawalQuote(_x10, _x11, _x12, _x13) {
+function getEasySwapperWithdrawalQuote(_x11, _x12, _x13, _x14) {
   return _getEasySwapperWithdrawalQuote.apply(this, arguments);
 }
 
@@ -10851,7 +10862,7 @@ function _getEasySwapperWithdrawalQuote() {
   return _getEasySwapperWithdrawalQuote.apply(this, arguments);
 }
 
-function getEasySwapperTxData(_x14, _x15, _x16, _x17, _x18) {
+function getEasySwapperTxData(_x15, _x16, _x17, _x18, _x19) {
   return _getEasySwapperTxData.apply(this, arguments);
 }
 
@@ -10886,7 +10897,7 @@ function _getEasySwapperTxData() {
 
           case 12:
             _context5.next = 14;
-            return getPoolDepositAsset(pool, torosAsset);
+            return getPoolDepositAsset(pool, torosAsset, investAsset);
 
           case 14:
             depositAsset = _context5.sent;
@@ -18691,17 +18702,23 @@ var Utils = /*#__PURE__*/function () {
   _proto.getBalancerJoinPoolTx = /*#__PURE__*/function () {
     var _getBalancerJoinPoolTx = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee7(pool, balancerPoolId, assets, amountsIn // eslint-disable-next-line @typescript-eslint/no-explicit-any
     ) {
-      var iBalancerV2Vault, txData, joinPoolTx;
+      var iBalancerV2Vault, bptAddress, bptIndex, poolAssetsAmounts, txData, joinPoolTx;
       return runtime_1.wrap(function _callee7$(_context7) {
         while (1) {
           switch (_context7.prev = _context7.next) {
             case 0:
               iBalancerV2Vault = new ethers.ethers.utils.Interface(IBalancerV2Vault.abi);
-              txData = [balancerPoolId, pool.address, pool.address, [assets, amountsIn, ethers.ethers.utils.defaultAbiCoder.encode(["uint256", "uint256[]", "uint256"], [1, amountsIn, 0]), false]];
+              bptAddress = ethers.ethers.utils.getAddress(balancerPoolId.slice(0, 42));
+              bptIndex = assets.findIndex(function (e) {
+                return e.toLowerCase() === bptAddress.toLocaleLowerCase();
+              });
+              poolAssetsAmounts = amountsIn.slice();
+              if (bptIndex >= 0) poolAssetsAmounts.splice(bptIndex, 1);
+              txData = [balancerPoolId, pool.address, pool.address, [assets, amountsIn, ethers.ethers.utils.defaultAbiCoder.encode(["uint256", "uint256[]", "uint256"], [1, poolAssetsAmounts, 0]), false]];
               joinPoolTx = iBalancerV2Vault.encodeFunctionData("joinPool", txData);
               return _context7.abrupt("return", joinPoolTx);
 
-            case 4:
+            case 8:
             case "end":
               return _context7.stop();
           }