@clober/v2-sdk 1.0.0-rc.5 → 1.0.0-rc.50
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cjs/calls/index.js +4 -3
- package/dist/cjs/calls/index.js.map +1 -1
- package/dist/cjs/calls/market/limit.js +5 -0
- package/dist/cjs/calls/market/limit.js.map +1 -1
- package/dist/cjs/calls/pool/burn.js +5 -5
- package/dist/cjs/calls/pool/market-making/adjust.js +2 -2
- package/dist/cjs/calls/pool/market-making/pause.js +2 -2
- package/dist/cjs/calls/pool/market-making/refill.js +2 -2
- package/dist/cjs/calls/pool/market-making/resume.js +2 -2
- package/dist/cjs/calls/pool/mint.js +80 -21
- package/dist/cjs/calls/pool/mint.js.map +1 -1
- package/dist/cjs/calls/pool/open.js +2 -2
- package/dist/cjs/calls/pool/open.js.map +1 -1
- package/dist/cjs/calls/pool/wrap.js +97 -0
- package/dist/cjs/calls/pool/wrap.js.map +1 -0
- package/dist/cjs/constants/abis/core/controller-abi.js +24 -1
- package/dist/cjs/constants/abis/core/controller-abi.js.map +1 -1
- package/dist/cjs/constants/abis/rebalancer/wrapped-6909-factory-abi.js +107 -0
- package/dist/cjs/constants/abis/rebalancer/wrapped-6909-factory-abi.js.map +1 -0
- package/dist/cjs/constants/chain-configs/addresses.js +27 -22
- package/dist/cjs/constants/chain-configs/addresses.js.map +1 -1
- package/dist/cjs/constants/chain-configs/chain.js +2 -2
- package/dist/cjs/constants/chain-configs/chain.js.map +1 -1
- package/dist/cjs/constants/chain-configs/currency.js +94 -24
- package/dist/cjs/constants/chain-configs/currency.js.map +1 -1
- package/dist/cjs/constants/chain-configs/fee.js +2 -2
- package/dist/cjs/constants/chain-configs/fee.js.map +1 -1
- package/dist/cjs/constants/chain-configs/subgraph.js +2 -2
- package/dist/cjs/constants/chain-configs/subgraph.js.map +1 -1
- package/dist/cjs/constants/networks/test-chain.js +1 -24
- package/dist/cjs/constants/networks/test-chain.js.map +1 -1
- package/dist/cjs/entities/analytics/apis/index.js +89 -21
- package/dist/cjs/entities/analytics/apis/index.js.map +1 -1
- package/dist/cjs/entities/book/apis/index.js +46 -15
- package/dist/cjs/entities/book/apis/index.js.map +1 -1
- package/dist/cjs/entities/currency/apis/total-supply.js +3 -6
- package/dist/cjs/entities/currency/apis/total-supply.js.map +1 -1
- package/dist/cjs/entities/market/apis/index.js +3 -3
- package/dist/cjs/entities/market/apis/index.js.map +1 -1
- package/dist/cjs/entities/market/apis/snapshot.js +234 -80
- package/dist/cjs/entities/market/apis/snapshot.js.map +1 -1
- package/dist/cjs/entities/market/utils/market-id.js +1 -1
- package/dist/cjs/entities/market/utils/market-id.js.map +1 -1
- package/dist/cjs/entities/pool/apis/index.js +11 -1
- package/dist/cjs/entities/pool/apis/index.js.map +1 -1
- package/dist/cjs/entities/pool/apis/snapshot.js +28 -23
- package/dist/cjs/entities/pool/apis/snapshot.js.map +1 -1
- package/dist/cjs/entities/pool/model.js +28 -7
- package/dist/cjs/entities/pool/model.js.map +1 -1
- package/dist/cjs/types/index.js.map +1 -1
- package/dist/cjs/utils/bigint.js +4 -1
- package/dist/cjs/utils/bigint.js.map +1 -1
- package/dist/cjs/views/analytics.js +9 -1
- package/dist/cjs/views/analytics.js.map +1 -1
- package/dist/cjs/views/currency.js +5 -1
- package/dist/cjs/views/currency.js.map +1 -1
- package/dist/cjs/views/index.js +6 -1
- package/dist/cjs/views/index.js.map +1 -1
- package/dist/cjs/views/market/chart-log.js +2 -2
- package/dist/cjs/views/market/index.js +1 -1
- package/dist/cjs/views/market/index.js.map +1 -1
- package/dist/cjs/views/market/snapshot.js.map +1 -1
- package/dist/cjs/views/pool/index.js +16 -1
- package/dist/cjs/views/pool/index.js.map +1 -1
- package/dist/cjs/views/subgraph.js +12 -2
- package/dist/cjs/views/subgraph.js.map +1 -1
- package/dist/esm/calls/index.js +1 -1
- package/dist/esm/calls/index.js.map +1 -1
- package/dist/esm/calls/market/limit.js +6 -1
- package/dist/esm/calls/market/limit.js.map +1 -1
- package/dist/esm/calls/pool/burn.js +5 -5
- package/dist/esm/calls/pool/market-making/adjust.js +2 -2
- package/dist/esm/calls/pool/market-making/pause.js +2 -2
- package/dist/esm/calls/pool/market-making/refill.js +2 -2
- package/dist/esm/calls/pool/market-making/resume.js +2 -2
- package/dist/esm/calls/pool/mint.js +81 -74
- package/dist/esm/calls/pool/mint.js.map +1 -1
- package/dist/esm/calls/pool/open.js +7 -6
- package/dist/esm/calls/pool/open.js.map +1 -1
- package/dist/esm/calls/pool/wrap.js +138 -0
- package/dist/esm/calls/pool/wrap.js.map +1 -0
- package/dist/esm/constants/abis/core/controller-abi.js +24 -1
- package/dist/esm/constants/abis/core/controller-abi.js.map +1 -1
- package/dist/esm/constants/abis/rebalancer/wrapped-6909-factory-abi.js +104 -0
- package/dist/esm/constants/abis/rebalancer/wrapped-6909-factory-abi.js.map +1 -0
- package/dist/esm/constants/chain-configs/addresses.js +30 -34
- package/dist/esm/constants/chain-configs/addresses.js.map +1 -1
- package/dist/esm/constants/chain-configs/chain.js +4 -6
- package/dist/esm/constants/chain-configs/chain.js.map +1 -1
- package/dist/esm/constants/chain-configs/currency.js +96 -38
- package/dist/esm/constants/chain-configs/currency.js.map +1 -1
- package/dist/esm/constants/chain-configs/fee.js +2 -4
- package/dist/esm/constants/chain-configs/fee.js.map +1 -1
- package/dist/esm/constants/chain-configs/subgraph.js +2 -4
- package/dist/esm/constants/chain-configs/subgraph.js.map +1 -1
- package/dist/esm/constants/networks/test-chain.js +0 -23
- package/dist/esm/constants/networks/test-chain.js.map +1 -1
- package/dist/esm/entities/analytics/apis/index.js +86 -20
- package/dist/esm/entities/analytics/apis/index.js.map +1 -1
- package/dist/esm/entities/book/apis/index.js +46 -15
- package/dist/esm/entities/book/apis/index.js.map +1 -1
- package/dist/esm/entities/currency/apis/total-supply.js +4 -7
- package/dist/esm/entities/currency/apis/total-supply.js.map +1 -1
- package/dist/esm/entities/market/apis/index.js +3 -3
- package/dist/esm/entities/market/apis/index.js.map +1 -1
- package/dist/esm/entities/market/apis/snapshot.js +236 -81
- package/dist/esm/entities/market/apis/snapshot.js.map +1 -1
- package/dist/esm/entities/market/utils/market-id.js +2 -2
- package/dist/esm/entities/market/utils/market-id.js.map +1 -1
- package/dist/esm/entities/pool/apis/index.js +11 -1
- package/dist/esm/entities/pool/apis/index.js.map +1 -1
- package/dist/esm/entities/pool/apis/snapshot.js +29 -24
- package/dist/esm/entities/pool/apis/snapshot.js.map +1 -1
- package/dist/esm/entities/pool/model.js +28 -7
- package/dist/esm/entities/pool/model.js.map +1 -1
- package/dist/esm/types/index.js.map +1 -1
- package/dist/esm/utils/bigint.js +2 -0
- package/dist/esm/utils/bigint.js.map +1 -1
- package/dist/esm/views/analytics.js +7 -1
- package/dist/esm/views/analytics.js.map +1 -1
- package/dist/esm/views/currency.js +4 -1
- package/dist/esm/views/currency.js.map +1 -1
- package/dist/esm/views/index.js +4 -4
- package/dist/esm/views/index.js.map +1 -1
- package/dist/esm/views/market/chart-log.js +2 -2
- package/dist/esm/views/market/index.js +1 -2
- package/dist/esm/views/market/index.js.map +1 -1
- package/dist/esm/views/market/snapshot.js.map +1 -1
- package/dist/esm/views/pool/index.js +14 -0
- package/dist/esm/views/pool/index.js.map +1 -1
- package/dist/esm/views/subgraph.js +22 -1
- package/dist/esm/views/subgraph.js.map +1 -1
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/dist/types/calls/index.d.ts +1 -1
- package/dist/types/calls/index.d.ts.map +1 -1
- package/dist/types/calls/market/limit.d.ts +1 -0
- package/dist/types/calls/market/limit.d.ts.map +1 -1
- package/dist/types/calls/pool/mint.d.ts +7 -5
- package/dist/types/calls/pool/mint.d.ts.map +1 -1
- package/dist/types/calls/pool/open.d.ts +8 -7
- package/dist/types/calls/pool/open.d.ts.map +1 -1
- package/dist/types/calls/pool/wrap.d.ts +79 -0
- package/dist/types/calls/pool/wrap.d.ts.map +1 -0
- package/dist/types/constants/abis/core/controller-abi.d.ts +19 -1
- package/dist/types/constants/abis/core/controller-abi.d.ts.map +1 -1
- package/dist/types/constants/abis/rebalancer/wrapped-6909-factory-abi.d.ts +80 -0
- package/dist/types/constants/abis/rebalancer/wrapped-6909-factory-abi.d.ts.map +1 -0
- package/dist/types/constants/chain-configs/addresses.d.ts +1 -0
- package/dist/types/constants/chain-configs/addresses.d.ts.map +1 -1
- package/dist/types/constants/chain-configs/chain.d.ts +1 -1
- package/dist/types/constants/chain-configs/chain.d.ts.map +1 -1
- package/dist/types/constants/chain-configs/currency.d.ts +8 -11
- package/dist/types/constants/chain-configs/currency.d.ts.map +1 -1
- package/dist/types/constants/chain-configs/fee.d.ts.map +1 -1
- package/dist/types/constants/chain-configs/subgraph.d.ts.map +1 -1
- package/dist/types/constants/networks/test-chain.d.ts +0 -1
- package/dist/types/constants/networks/test-chain.d.ts.map +1 -1
- package/dist/types/entities/analytics/apis/index.d.ts +3 -1
- package/dist/types/entities/analytics/apis/index.d.ts.map +1 -1
- package/dist/types/entities/analytics/types.d.ts +12 -1
- package/dist/types/entities/analytics/types.d.ts.map +1 -1
- package/dist/types/entities/book/apis/index.d.ts +1 -1
- package/dist/types/entities/book/apis/index.d.ts.map +1 -1
- package/dist/types/entities/currency/apis/total-supply.d.ts.map +1 -1
- package/dist/types/entities/market/apis/index.d.ts +1 -1
- package/dist/types/entities/market/apis/index.d.ts.map +1 -1
- package/dist/types/entities/market/apis/snapshot.d.ts +1 -1
- package/dist/types/entities/market/apis/snapshot.d.ts.map +1 -1
- package/dist/types/entities/market/types.d.ts +2 -0
- package/dist/types/entities/market/types.d.ts.map +1 -1
- package/dist/types/entities/pool/apis/index.d.ts.map +1 -1
- package/dist/types/entities/pool/apis/snapshot.d.ts.map +1 -1
- package/dist/types/entities/pool/model.d.ts +6 -2
- package/dist/types/entities/pool/model.d.ts.map +1 -1
- package/dist/types/entities/pool/types.d.ts +9 -4
- package/dist/types/entities/pool/types.d.ts.map +1 -1
- package/dist/types/types/index.d.ts +1 -0
- package/dist/types/types/index.d.ts.map +1 -1
- package/dist/types/utils/bigint.d.ts +1 -0
- package/dist/types/utils/bigint.d.ts.map +1 -1
- package/dist/types/views/address.d.ts +1 -0
- package/dist/types/views/address.d.ts.map +1 -1
- package/dist/types/views/analytics.d.ts +8 -1
- package/dist/types/views/analytics.d.ts.map +1 -1
- package/dist/types/views/currency.d.ts +5 -6
- package/dist/types/views/currency.d.ts.map +1 -1
- package/dist/types/views/index.d.ts +4 -4
- package/dist/types/views/index.d.ts.map +1 -1
- package/dist/types/views/market/index.d.ts +0 -2
- package/dist/types/views/market/index.d.ts.map +1 -1
- package/dist/types/views/market/snapshot.d.ts +1 -1
- package/dist/types/views/market/snapshot.d.ts.map +1 -1
- package/dist/types/views/pool/index.d.ts +8 -1
- package/dist/types/views/pool/index.d.ts.map +1 -1
- package/dist/types/views/subgraph.d.ts +20 -0
- package/dist/types/views/subgraph.d.ts.map +1 -1
- package/package.json +1 -1
- package/dist/cjs/calls/pool/market-making/strategy.js +0 -78
- package/dist/cjs/calls/pool/market-making/strategy.js.map +0 -1
- package/dist/cjs/entities/book/apis/open.js +0 -46
- package/dist/cjs/entities/book/apis/open.js.map +0 -1
- package/dist/esm/calls/pool/market-making/strategy.js +0 -75
- package/dist/esm/calls/pool/market-making/strategy.js.map +0 -1
- package/dist/esm/entities/book/apis/open.js +0 -42
- package/dist/esm/entities/book/apis/open.js.map +0 -1
- package/dist/types/calls/pool/market-making/strategy.d.ts +0 -23
- package/dist/types/calls/pool/market-making/strategy.d.ts.map +0 -1
- package/dist/types/entities/book/apis/open.d.ts +0 -4
- package/dist/types/entities/book/apis/open.d.ts.map +0 -1
package/dist/cjs/calls/index.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.approveERC20 = exports.setApprovalOfOpenOrdersForAll = exports.
|
|
3
|
+
exports.approveERC20 = exports.setApprovalOfOpenOrdersForAll = exports.resumePool = exports.pausePool = exports.refillOrder = exports.adjustOrderPrice = exports.unwrapFromERC20 = exports.wrapToERC20 = exports.removeLiquidity = exports.addLiquidity = exports.openPool = exports.cancelOrders = exports.cancelOrder = exports.claimOrders = exports.claimOrder = exports.marketOrder = exports.limitOrder = exports.openMarket = void 0;
|
|
4
4
|
var open_1 = require("./market/open");
|
|
5
5
|
Object.defineProperty(exports, "openMarket", { enumerable: true, get: function () { return open_1.openMarket; } });
|
|
6
6
|
var limit_1 = require("./market/limit");
|
|
@@ -19,6 +19,9 @@ var mint_1 = require("./pool/mint");
|
|
|
19
19
|
Object.defineProperty(exports, "addLiquidity", { enumerable: true, get: function () { return mint_1.addLiquidity; } });
|
|
20
20
|
var burn_1 = require("./pool/burn");
|
|
21
21
|
Object.defineProperty(exports, "removeLiquidity", { enumerable: true, get: function () { return burn_1.removeLiquidity; } });
|
|
22
|
+
var wrap_1 = require("./pool/wrap");
|
|
23
|
+
Object.defineProperty(exports, "wrapToERC20", { enumerable: true, get: function () { return wrap_1.wrapToERC20; } });
|
|
24
|
+
Object.defineProperty(exports, "unwrapFromERC20", { enumerable: true, get: function () { return wrap_1.unwrapFromERC20; } });
|
|
22
25
|
var adjust_1 = require("./pool/market-making/adjust");
|
|
23
26
|
Object.defineProperty(exports, "adjustOrderPrice", { enumerable: true, get: function () { return adjust_1.adjustOrderPrice; } });
|
|
24
27
|
var refill_1 = require("./pool/market-making/refill");
|
|
@@ -27,8 +30,6 @@ var pause_1 = require("./pool/market-making/pause");
|
|
|
27
30
|
Object.defineProperty(exports, "pausePool", { enumerable: true, get: function () { return pause_1.pausePool; } });
|
|
28
31
|
var resume_1 = require("./pool/market-making/resume");
|
|
29
32
|
Object.defineProperty(exports, "resumePool", { enumerable: true, get: function () { return resume_1.resumePool; } });
|
|
30
|
-
var strategy_1 = require("./pool/market-making/strategy");
|
|
31
|
-
Object.defineProperty(exports, "setStrategyConfig", { enumerable: true, get: function () { return strategy_1.setStrategyConfig; } });
|
|
32
33
|
var open_order_1 = require("./approval/open-order");
|
|
33
34
|
Object.defineProperty(exports, "setApprovalOfOpenOrdersForAll", { enumerable: true, get: function () { return open_order_1.setApprovalOfOpenOrdersForAll; } });
|
|
34
35
|
var token_1 = require("./approval/token");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/calls/index.ts"],"names":[],"mappings":";;;AAAA,sCAA0C;AAAjC,kGAAA,UAAU,OAAA;AACnB,wCAA2C;AAAlC,mGAAA,UAAU,OAAA;AACnB,0CAA6C;AAApC,qGAAA,WAAW,OAAA;AACpB,wCAAwD;AAA/C,mGAAA,UAAU,OAAA;AAAE,oGAAA,WAAW,OAAA;AAChC,0CAA2D;AAAlD,qGAAA,WAAW,OAAA;AAAE,sGAAA,YAAY,OAAA;AAClC,oCAAsC;AAA7B,gGAAA,QAAQ,OAAA;AACjB,oCAA0C;AAAjC,oGAAA,YAAY,OAAA;AACrB,oCAA6C;AAApC,uGAAA,eAAe,OAAA;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/calls/index.ts"],"names":[],"mappings":";;;AAAA,sCAA0C;AAAjC,kGAAA,UAAU,OAAA;AACnB,wCAA2C;AAAlC,mGAAA,UAAU,OAAA;AACnB,0CAA6C;AAApC,qGAAA,WAAW,OAAA;AACpB,wCAAwD;AAA/C,mGAAA,UAAU,OAAA;AAAE,oGAAA,WAAW,OAAA;AAChC,0CAA2D;AAAlD,qGAAA,WAAW,OAAA;AAAE,sGAAA,YAAY,OAAA;AAClC,oCAAsC;AAA7B,gGAAA,QAAQ,OAAA;AACjB,oCAA0C;AAAjC,oGAAA,YAAY,OAAA;AACrB,oCAA6C;AAApC,uGAAA,eAAe,OAAA;AACxB,oCAA0D;AAAjD,mGAAA,WAAW,OAAA;AAAE,uGAAA,eAAe,OAAA;AAErC,sDAA8D;AAArD,0GAAA,gBAAgB,OAAA;AACzB,sDAAyD;AAAhD,qGAAA,WAAW,OAAA;AACpB,oDAAsD;AAA7C,kGAAA,SAAS,OAAA;AAClB,sDAAwD;AAA/C,oGAAA,UAAU,OAAA;AAEnB,oDAAqE;AAA5D,2HAAA,6BAA6B,OAAA;AACtC,0CAA+C;AAAtC,qGAAA,YAAY,OAAA"}
|
|
@@ -41,6 +41,9 @@ const limitOrder = async ({ chainId, userAddress, inputToken, outputToken, amoun
|
|
|
41
41
|
})
|
|
42
42
|
`);
|
|
43
43
|
}
|
|
44
|
+
const provider = options && options.provider && (0, viem_1.isAddress)(options.provider)
|
|
45
|
+
? (0, viem_1.getAddress)(options.provider)
|
|
46
|
+
: viem_1.zeroAddress;
|
|
44
47
|
const { roundingDownTick, roundingUpTick } = (0, utils_1.parsePrice)(Number(price), market.quote.decimals, market.base.decimals);
|
|
45
48
|
const tokensToSettle = [inputToken, outputToken].filter((address) => !(0, viem_1.isAddressEqual)(address, viem_1.zeroAddress));
|
|
46
49
|
const quoteAmount = (0, viem_1.parseUnits)(amount, inputCurrency.decimals);
|
|
@@ -66,6 +69,7 @@ const limitOrder = async ({ chainId, userAddress, inputToken, outputToken, amoun
|
|
|
66
69
|
: roundingDownTick
|
|
67
70
|
: (0, utils_1.invertTick)(roundingDownMakeAsk ? roundingDownTick : roundingUpTick)),
|
|
68
71
|
quoteAmount,
|
|
72
|
+
provider,
|
|
69
73
|
hookData: viem_1.zeroHash,
|
|
70
74
|
};
|
|
71
75
|
if (options?.postOnly === true || spentAmount === '0') {
|
|
@@ -132,6 +136,7 @@ const limitOrder = async ({ chainId, userAddress, inputToken, outputToken, amoun
|
|
|
132
136
|
: roundingUpTick),
|
|
133
137
|
tick: makeParam.tick,
|
|
134
138
|
quoteAmount,
|
|
139
|
+
provider,
|
|
135
140
|
takeHookData: viem_1.zeroHash,
|
|
136
141
|
makeHookData: makeParam.hookData,
|
|
137
142
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"limit.js","sourceRoot":"","sources":["../../../../src/calls/market/limit.ts"],"names":[],"mappings":";;;AAAA,+
|
|
1
|
+
{"version":3,"file":"limit.js","sourceRoot":"","sources":["../../../../src/calls/market/limit.ts"],"names":[],"mappings":"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"}
|
|
@@ -21,13 +21,13 @@ const removeLiquidity = async ({ chainId, userAddress, token0, token1, salt, amo
|
|
|
21
21
|
|
|
22
22
|
const transaction = await openPool({
|
|
23
23
|
chainId: ${chainId},
|
|
24
|
-
|
|
25
|
-
|
|
24
|
+
token0: '${token0}',
|
|
25
|
+
token1: '${token1}',
|
|
26
26
|
salt: '0x0000000000000000000000000000000000000000000000000000000000000000',
|
|
27
27
|
})
|
|
28
28
|
`);
|
|
29
29
|
}
|
|
30
|
-
const burnAmount = (0, viem_1.parseUnits)(amount, pool.
|
|
30
|
+
const burnAmount = (0, viem_1.parseUnits)(amount, pool.lpCurrency.decimals);
|
|
31
31
|
const slippageLimitPercent = options?.slippage ?? 2;
|
|
32
32
|
const withdrawAmountA = (burnAmount * pool.liquidityA) / pool.totalSupply;
|
|
33
33
|
const withdrawAmountB = (burnAmount * pool.liquidityB) / pool.totalSupply;
|
|
@@ -48,7 +48,7 @@ const removeLiquidity = async ({ chainId, userAddress, token0, token1, salt, amo
|
|
|
48
48
|
direction: 'out',
|
|
49
49
|
},
|
|
50
50
|
lpCurrency: {
|
|
51
|
-
currency: pool.
|
|
51
|
+
currency: pool.lpCurrency,
|
|
52
52
|
amount: '0',
|
|
53
53
|
direction: 'in',
|
|
54
54
|
},
|
|
@@ -77,7 +77,7 @@ const removeLiquidity = async ({ chainId, userAddress, token0, token1, salt, amo
|
|
|
77
77
|
direction: 'out',
|
|
78
78
|
},
|
|
79
79
|
lpCurrency: {
|
|
80
|
-
currency: pool.
|
|
80
|
+
currency: pool.lpCurrency,
|
|
81
81
|
amount: amount,
|
|
82
82
|
direction: 'in',
|
|
83
83
|
},
|
|
@@ -33,8 +33,8 @@ const adjustOrderPrice = async ({ chainId, userAddress, token0, token1, salt, or
|
|
|
33
33
|
|
|
34
34
|
const transaction = await openPool({
|
|
35
35
|
chainId: ${chainId},
|
|
36
|
-
|
|
37
|
-
|
|
36
|
+
token0: '${token0}',
|
|
37
|
+
token1: '${token1}',
|
|
38
38
|
salt: '0x0000000000000000000000000000000000000000000000000000000000000000',
|
|
39
39
|
})
|
|
40
40
|
`);
|
|
@@ -22,8 +22,8 @@ const pausePool = async ({ chainId, userAddress, token0, token1, salt, options,
|
|
|
22
22
|
|
|
23
23
|
const transaction = await openPool({
|
|
24
24
|
chainId: ${chainId},
|
|
25
|
-
|
|
26
|
-
|
|
25
|
+
token0: '${token0}',
|
|
26
|
+
token1: '${token1}',
|
|
27
27
|
salt: '0x0000000000000000000000000000000000000000000000000000000000000000',
|
|
28
28
|
})
|
|
29
29
|
`);
|
|
@@ -22,8 +22,8 @@ const refillOrder = async ({ chainId, userAddress, token0, token1, salt, options
|
|
|
22
22
|
|
|
23
23
|
const transaction = await openPool({
|
|
24
24
|
chainId: ${chainId},
|
|
25
|
-
|
|
26
|
-
|
|
25
|
+
token0: '${token0}',
|
|
26
|
+
token1: '${token1}',
|
|
27
27
|
salt: '0x0000000000000000000000000000000000000000000000000000000000000000',
|
|
28
28
|
})
|
|
29
29
|
`);
|
|
@@ -22,8 +22,8 @@ const resumePool = async ({ chainId, userAddress, token0, token1, salt, options,
|
|
|
22
22
|
|
|
23
23
|
const transaction = await openPool({
|
|
24
24
|
chainId: ${chainId},
|
|
25
|
-
|
|
26
|
-
|
|
25
|
+
token0: '${token0}',
|
|
26
|
+
token1: '${token1}',
|
|
27
27
|
salt: '0x0000000000000000000000000000000000000000000000000000000000000000',
|
|
28
28
|
})
|
|
29
29
|
`);
|
|
@@ -11,7 +11,28 @@ const build_transaction_1 = require("../../utils/build-transaction");
|
|
|
11
11
|
const addresses_1 = require("../../constants/chain-configs/addresses");
|
|
12
12
|
const minter_abi_1 = require("../../constants/abis/rebalancer/minter-abi");
|
|
13
13
|
const math_1 = require("../../utils/math");
|
|
14
|
-
const
|
|
14
|
+
const order_id_1 = require("../../entities/open-order/utils/order-id");
|
|
15
|
+
const utils_1 = require("../../utils");
|
|
16
|
+
const getBestQuote = async ({ quotes, tokenIn, tokenOut, amountIn, slippageLimitPercent, gasPrice, userAddress, timeout = 4000, }) => {
|
|
17
|
+
const results = (await Promise.allSettled((quotes ?? []).map(async (quote) => quote(tokenIn, amountIn, tokenOut, slippageLimitPercent, gasPrice, userAddress, timeout))))
|
|
18
|
+
.map((result) => (result.status === 'fulfilled' ? result.value : undefined))
|
|
19
|
+
.filter((quote) => quote !== undefined && quote.amountOut > 0n)
|
|
20
|
+
.sort((a, b) => Number(b.amountOut - a.amountOut));
|
|
21
|
+
if (results.length === 0) {
|
|
22
|
+
throw new Error('No quotes available');
|
|
23
|
+
}
|
|
24
|
+
if (results[0].amountOut <= 0n) {
|
|
25
|
+
throw new Error('No valid quotes found');
|
|
26
|
+
}
|
|
27
|
+
if (results[0].transaction === undefined) {
|
|
28
|
+
throw new Error('No transaction found for the best quote');
|
|
29
|
+
}
|
|
30
|
+
return {
|
|
31
|
+
amountOut: results[0].amountOut,
|
|
32
|
+
transaction: results[0].transaction,
|
|
33
|
+
};
|
|
34
|
+
};
|
|
35
|
+
const addLiquidity = async ({ chainId, userAddress, token0, token1, salt, amount0, amount1, quotes, options, }) => {
|
|
15
36
|
const publicClient = (0, viem_1.createPublicClient)({
|
|
16
37
|
chain: chain_1.CHAIN_MAP[chainId],
|
|
17
38
|
transport: options?.rpcUrl ? (0, viem_1.http)(options.rpcUrl) : (0, viem_1.http)(),
|
|
@@ -24,8 +45,8 @@ const addLiquidity = async ({ chainId, userAddress, token0, token1, salt, amount
|
|
|
24
45
|
|
|
25
46
|
const transaction = await openPool({
|
|
26
47
|
chainId: ${chainId},
|
|
27
|
-
|
|
28
|
-
|
|
48
|
+
token0: '${token0}',
|
|
49
|
+
token1: '${token1}',
|
|
29
50
|
salt: '0x0000000000000000000000000000000000000000000000000000000000000000',
|
|
30
51
|
})
|
|
31
52
|
`);
|
|
@@ -39,7 +60,7 @@ const addLiquidity = async ({ chainId, userAddress, token0, token1, salt, amount
|
|
|
39
60
|
(0, viem_1.parseUnits)(amount1 ?? '0', pool.currencyA.decimals),
|
|
40
61
|
(0, viem_1.parseUnits)(amount0 ?? '0', pool.currencyB.decimals),
|
|
41
62
|
];
|
|
42
|
-
|
|
63
|
+
let [amountA, amountB] = [amountAOrigin, amountBOrigin];
|
|
43
64
|
const tokenAPermitParams = (0, viem_1.isAddressEqual)(pool.currencyA.address, (0, viem_1.getAddress)(token0))
|
|
44
65
|
? options?.token0PermitParams ?? permit_1.EMPTY_ERC20_PERMIT_PARAMS
|
|
45
66
|
: options?.token1PermitParams ?? permit_1.EMPTY_ERC20_PERMIT_PARAMS;
|
|
@@ -52,35 +73,73 @@ const addLiquidity = async ({ chainId, userAddress, token0, token1, salt, amount
|
|
|
52
73
|
disableSwap = true;
|
|
53
74
|
}
|
|
54
75
|
const slippageLimitPercent = options?.slippage ?? 1.0;
|
|
76
|
+
const timeoutForQuotes = options?.timeoutForQuotes ?? 4000;
|
|
55
77
|
const swapParams = {
|
|
56
78
|
inCurrency: viem_1.zeroAddress,
|
|
57
79
|
amount: 0n,
|
|
58
80
|
data: '0x',
|
|
59
81
|
};
|
|
60
82
|
if (!disableSwap) {
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
83
|
+
if (!((0, viem_1.isAddressEqual)(pool.currencyA.address, pool.market.quote.address) &&
|
|
84
|
+
(0, viem_1.isAddressEqual)(pool.currencyB.address, pool.market.base.address))) {
|
|
85
|
+
throw new Error('Cannot add liquidity to a pool with the same quote and base currencies');
|
|
86
|
+
}
|
|
87
|
+
let tokenAPrice = pool.orderListA.length > 0
|
|
88
|
+
? Number((0, utils_1.formatPrice)((0, utils_1.toPrice)((0, order_id_1.fromOrderId)(BigInt(pool.orderListA[0])).tick), pool.market.quote.decimals, pool.market.base.decimals))
|
|
89
|
+
: 0;
|
|
90
|
+
let tokenBPrice = pool.orderListB.length > 0
|
|
91
|
+
? Number((0, utils_1.formatPrice)((0, utils_1.toPrice)((0, utils_1.invertTick)((0, order_id_1.fromOrderId)(BigInt(pool.orderListB[0])).tick)), pool.market.quote.decimals, pool.market.base.decimals))
|
|
92
|
+
: 0;
|
|
93
|
+
if (tokenAPrice === 0 && tokenBPrice === 0) {
|
|
94
|
+
throw new Error('No orders in the pool, cannot add liquidity');
|
|
71
95
|
}
|
|
72
|
-
else {
|
|
73
|
-
|
|
96
|
+
else if (tokenAPrice === 0 && tokenBPrice > 0) {
|
|
97
|
+
tokenAPrice = tokenBPrice;
|
|
74
98
|
}
|
|
99
|
+
else if (tokenAPrice > 0 && tokenBPrice === 0) {
|
|
100
|
+
tokenBPrice = tokenAPrice;
|
|
101
|
+
}
|
|
102
|
+
const price = (tokenAPrice + tokenBPrice) / 2;
|
|
103
|
+
const swapAmountA = (0, viem_1.parseUnits)('1', pool.currencyA.decimals);
|
|
104
|
+
const swapAmountB = (0, mint_1.getQuoteAmountFromPrices)(swapAmountA, 1, price, pool.currencyA.decimals, pool.currencyB.decimals);
|
|
75
105
|
if (swapAmountB === -1n) {
|
|
76
106
|
throw new Error('Failed to fetch quote');
|
|
77
107
|
}
|
|
78
108
|
const { deltaA, deltaB } = (0, mint_1.getIdealDelta)(amountA, amountB, pool.liquidityA, pool.liquidityB, swapAmountA, swapAmountB);
|
|
109
|
+
const gasPrice = await publicClient.getGasPrice();
|
|
79
110
|
if (deltaA < 0n) {
|
|
80
|
-
|
|
111
|
+
swapParams.inCurrency = pool.currencyA.address;
|
|
112
|
+
swapParams.amount = -deltaA;
|
|
113
|
+
const { amountOut: actualDeltaB, transaction } = await getBestQuote({
|
|
114
|
+
quotes: quotes ?? [],
|
|
115
|
+
tokenIn: pool.currencyA,
|
|
116
|
+
tokenOut: pool.currencyB,
|
|
117
|
+
amountIn: swapParams.amount,
|
|
118
|
+
slippageLimitPercent,
|
|
119
|
+
gasPrice,
|
|
120
|
+
userAddress,
|
|
121
|
+
timeout: timeoutForQuotes,
|
|
122
|
+
});
|
|
123
|
+
swapParams.data = transaction.data;
|
|
124
|
+
amountA += deltaA;
|
|
125
|
+
amountB += actualDeltaB;
|
|
81
126
|
}
|
|
82
127
|
else if (deltaB < 0n) {
|
|
83
|
-
|
|
128
|
+
swapParams.inCurrency = pool.currencyB.address;
|
|
129
|
+
swapParams.amount = -deltaB;
|
|
130
|
+
const { amountOut: actualDeltaA, transaction } = await getBestQuote({
|
|
131
|
+
quotes: quotes ?? [],
|
|
132
|
+
tokenIn: pool.currencyB,
|
|
133
|
+
tokenOut: pool.currencyA,
|
|
134
|
+
amountIn: swapParams.amount,
|
|
135
|
+
slippageLimitPercent,
|
|
136
|
+
gasPrice,
|
|
137
|
+
userAddress,
|
|
138
|
+
timeout: timeoutForQuotes,
|
|
139
|
+
});
|
|
140
|
+
swapParams.data = transaction.data;
|
|
141
|
+
amountA += actualDeltaA;
|
|
142
|
+
amountB += deltaB;
|
|
84
143
|
}
|
|
85
144
|
}
|
|
86
145
|
const { mintAmount, inAmountA, inAmountB } = (0, mint_1.getExpectedMintResult)(pool.totalSupply, pool.liquidityA, pool.liquidityB, amountA, amountB, pool.currencyA, pool.currencyB);
|
|
@@ -99,7 +158,7 @@ const addLiquidity = async ({ chainId, userAddress, token0, token1, salt, amount
|
|
|
99
158
|
direction: 'in',
|
|
100
159
|
},
|
|
101
160
|
lpCurrency: {
|
|
102
|
-
currency: pool.
|
|
161
|
+
currency: pool.lpCurrency,
|
|
103
162
|
amount: '0',
|
|
104
163
|
direction: 'out',
|
|
105
164
|
},
|
|
@@ -152,8 +211,8 @@ const addLiquidity = async ({ chainId, userAddress, token0, token1, salt, amount
|
|
|
152
211
|
direction: currencyBResultAmount >= 0 ? 'in' : 'out',
|
|
153
212
|
},
|
|
154
213
|
lpCurrency: {
|
|
155
|
-
currency: pool.
|
|
156
|
-
amount: (0, viem_1.formatUnits)(mintAmount, pool.
|
|
214
|
+
currency: pool.lpCurrency,
|
|
215
|
+
amount: (0, viem_1.formatUnits)(mintAmount, pool.lpCurrency.decimals),
|
|
157
216
|
direction: 'out',
|
|
158
217
|
},
|
|
159
218
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mint.js","sourceRoot":"","sources":["../../../../src/calls/pool/mint.ts"],"names":[],"mappings":";;;AAAA,+BAQa;AAEb,+DAA0E;
|
|
1
|
+
{"version":3,"file":"mint.js","sourceRoot":"","sources":["../../../../src/calls/pool/mint.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,12 +9,12 @@ const addresses_1 = require("../../constants/chain-configs/addresses");
|
|
|
9
9
|
const rebalancer_abi_1 = require("../../constants/abis/rebalancer/rebalancer-abi");
|
|
10
10
|
const fee_1 = require("../../constants/chain-configs/fee");
|
|
11
11
|
const mint_1 = require("../../entities/pool/utils/mint");
|
|
12
|
-
const openPool = async ({ chainId, userAddress,
|
|
12
|
+
const openPool = async ({ chainId, userAddress, token0, token1, salt, options, }) => {
|
|
13
13
|
const publicClient = (0, viem_1.createPublicClient)({
|
|
14
14
|
chain: chain_1.CHAIN_MAP[chainId],
|
|
15
15
|
transport: options?.rpcUrl ? (0, viem_1.http)(options.rpcUrl) : (0, viem_1.http)(),
|
|
16
16
|
});
|
|
17
|
-
const pool = await (0, apis_1.fetchPool)(publicClient, chainId, [
|
|
17
|
+
const pool = await (0, apis_1.fetchPool)(publicClient, chainId, [token0, token1], salt, !!(options && options.useSubgraph));
|
|
18
18
|
if (!pool.isOpened) {
|
|
19
19
|
return (0, build_transaction_1.buildTransaction)(publicClient, {
|
|
20
20
|
chain: chain_1.CHAIN_MAP[chainId],
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"open.js","sourceRoot":"","sources":["../../../../src/calls/pool/open.ts"],"names":[],"mappings":";;;AAAA,+BAA4D;AAE5D,+DAA0E;AAE1E,mDAAoD;AACpD,qEAAgE;AAChE,uEAA4E;AAC5E,mFAA+E;AAC/E,2DAG0C;AAC1C,yDAA0D;
|
|
1
|
+
{"version":3,"file":"open.js","sourceRoot":"","sources":["../../../../src/calls/pool/open.ts"],"names":[],"mappings":";;;AAAA,+BAA4D;AAE5D,+DAA0E;AAE1E,mDAAoD;AACpD,qEAAgE;AAChE,uEAA4E;AAC5E,mFAA+E;AAC/E,2DAG0C;AAC1C,yDAA0D;AAuBnD,MAAM,QAAQ,GAAG,KAAK,EAAE,EAC7B,OAAO,EACP,WAAW,EACX,MAAM,EACN,MAAM,EACN,IAAI,EACJ,OAAO,GAUR,EAAoC,EAAE;IACrC,MAAM,YAAY,GAAG,IAAA,yBAAkB,EAAC;QACtC,KAAK,EAAE,iBAAS,CAAC,OAAO,CAAC;QACzB,SAAS,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC,IAAA,WAAI,EAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAA,WAAI,GAAE;KAC3D,CAAC,CAAA;IACF,MAAM,IAAI,GAAG,MAAM,IAAA,gBAAS,EAC1B,YAAY,EACZ,OAAO,EACP,CAAC,MAAM,EAAE,MAAM,CAAC,EAChB,IAAI,EACJ,CAAC,CAAC,CAAC,OAAO,IAAI,OAAO,CAAC,WAAW,CAAC,CACnC,CAAA;IACD,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;QACnB,OAAO,IAAA,oCAAgB,EACrB,YAAY,EACZ;YACE,KAAK,EAAE,iBAAS,CAAC,OAAO,CAAC;YACzB,OAAO,EAAE,8BAAkB,CAAC,OAAO,CAAE,CAAC,UAAU;YAChD,OAAO,EAAE,WAAW;YACpB,GAAG,EAAE,+BAAc;YACnB,YAAY,EAAE,MAAM;YACpB,IAAI,EAAE;gBACJ;oBACE,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO;oBACtC,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ;oBACtC,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO;oBACxC,WAAW,EAAE,0BAAoB,CAAC,OAAO,CAAC,CAAC,KAAK;oBAChD,KAAK,EAAE,kBAAW;oBAClB,WAAW,EAAE,0BAAoB,CAAC,OAAO,CAAC,CAAC,KAAK;iBACjD;gBACD;oBACE,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO;oBACtC,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ;oBACtC,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO;oBACxC,WAAW,EAAE,0BAAoB,CAAC,OAAO,CAAC,CAAC,KAAK;oBAChD,KAAK,EAAE,kBAAW;oBAClB,WAAW,EAAE,0BAAoB,CAAC,OAAO,CAAC,CAAC,KAAK;iBACjD;gBACD,IAAA,gBAAS,EAAC,IAAI,CAAC;gBACf,8BAAkB,CAAC,OAAO,CAAE,CAAC,QAAQ;aACtC;SACF,EACD,OAAO,EAAE,QAAQ,CAClB,CAAA;IACH,CAAC;IACD,OAAO,SAAS,CAAA;AAClB,CAAC,CAAA;AA9DY,QAAA,QAAQ,YA8DpB"}
|
|
@@ -0,0 +1,97 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.unwrapFromERC20 = exports.wrapToERC20 = void 0;
|
|
4
|
+
const viem_1 = require("viem");
|
|
5
|
+
const chain_1 = require("../../constants/chain-configs/chain");
|
|
6
|
+
const apis_1 = require("../../entities/pool/apis");
|
|
7
|
+
const build_transaction_1 = require("../../utils/build-transaction");
|
|
8
|
+
const addresses_1 = require("../../constants/chain-configs/addresses");
|
|
9
|
+
const wrapped_6909_factory_abi_1 = require("../../constants/abis/rebalancer/wrapped-6909-factory-abi");
|
|
10
|
+
const wrapToERC20 = async ({ chainId, userAddress, token0, token1, salt, amount, options, }) => {
|
|
11
|
+
const publicClient = (0, viem_1.createPublicClient)({
|
|
12
|
+
chain: chain_1.CHAIN_MAP[chainId],
|
|
13
|
+
transport: options?.rpcUrl ? (0, viem_1.http)(options.rpcUrl) : (0, viem_1.http)(),
|
|
14
|
+
});
|
|
15
|
+
const pool = options?.pool
|
|
16
|
+
? options.pool
|
|
17
|
+
: (await (0, apis_1.fetchPool)(publicClient, chainId, [token0, token1], salt, !!(options && options.useSubgraph))).toJson();
|
|
18
|
+
if (pool.isOpened) {
|
|
19
|
+
return {
|
|
20
|
+
result: {
|
|
21
|
+
currency: {
|
|
22
|
+
name: `Wrapped Clober Liquidity Vault ${pool.currencyB.symbol}-${pool.currencyA.symbol}`,
|
|
23
|
+
symbol: `wCLV-${pool.currencyB.symbol}-${pool.currencyA.symbol}`,
|
|
24
|
+
decimals: pool.lpCurrency.decimals,
|
|
25
|
+
address: pool.wrappedLpCurrency.address,
|
|
26
|
+
},
|
|
27
|
+
amount,
|
|
28
|
+
direction: 'out',
|
|
29
|
+
},
|
|
30
|
+
transaction: await (0, build_transaction_1.buildTransaction)(publicClient, {
|
|
31
|
+
chain: chain_1.CHAIN_MAP[chainId],
|
|
32
|
+
address: addresses_1.CONTRACT_ADDRESSES[chainId].Wrapped6909Factory,
|
|
33
|
+
account: userAddress,
|
|
34
|
+
abi: wrapped_6909_factory_abi_1.WRAPPED_6909_FACTORY_ABI,
|
|
35
|
+
functionName: 'wrap6909',
|
|
36
|
+
args: [
|
|
37
|
+
addresses_1.CONTRACT_ADDRESSES[chainId].Rebalancer,
|
|
38
|
+
BigInt(pool.key),
|
|
39
|
+
(0, viem_1.parseUnits)(amount, pool.lpCurrency.decimals),
|
|
40
|
+
],
|
|
41
|
+
}, options?.gasLimit),
|
|
42
|
+
};
|
|
43
|
+
}
|
|
44
|
+
return {
|
|
45
|
+
result: undefined,
|
|
46
|
+
transaction: undefined,
|
|
47
|
+
};
|
|
48
|
+
};
|
|
49
|
+
exports.wrapToERC20 = wrapToERC20;
|
|
50
|
+
const unwrapFromERC20 = async ({ chainId, userAddress, token0, token1, salt, amount, options, }) => {
|
|
51
|
+
const publicClient = (0, viem_1.createPublicClient)({
|
|
52
|
+
chain: chain_1.CHAIN_MAP[chainId],
|
|
53
|
+
transport: options?.rpcUrl ? (0, viem_1.http)(options.rpcUrl) : (0, viem_1.http)(),
|
|
54
|
+
});
|
|
55
|
+
const pool = options?.pool
|
|
56
|
+
? options.pool
|
|
57
|
+
: (await (0, apis_1.fetchPool)(publicClient, chainId, [token0, token1], salt, !!(options && options.useSubgraph))).toJson();
|
|
58
|
+
if (pool.isOpened) {
|
|
59
|
+
return {
|
|
60
|
+
result: {
|
|
61
|
+
currency: {
|
|
62
|
+
name: `Wrapped Clober Liquidity Vault ${pool.currencyB.symbol}-${pool.currencyA.symbol}`,
|
|
63
|
+
symbol: `wCLV-${pool.currencyB.symbol}-${pool.currencyA.symbol}`,
|
|
64
|
+
decimals: pool.lpCurrency.decimals,
|
|
65
|
+
address: pool.wrappedLpCurrency.address,
|
|
66
|
+
},
|
|
67
|
+
amount,
|
|
68
|
+
direction: 'in',
|
|
69
|
+
},
|
|
70
|
+
transaction: await (0, build_transaction_1.buildTransaction)(publicClient, {
|
|
71
|
+
chain: chain_1.CHAIN_MAP[chainId],
|
|
72
|
+
address: pool.wrappedLpCurrency.address,
|
|
73
|
+
account: userAddress,
|
|
74
|
+
abi: [
|
|
75
|
+
{
|
|
76
|
+
type: 'function',
|
|
77
|
+
name: 'withdrawTo',
|
|
78
|
+
inputs: [
|
|
79
|
+
{ name: 'account', type: 'address', internalType: 'address' },
|
|
80
|
+
{ name: 'amount', type: 'uint256', internalType: 'uint256' },
|
|
81
|
+
],
|
|
82
|
+
outputs: [],
|
|
83
|
+
stateMutability: 'nonpayable',
|
|
84
|
+
},
|
|
85
|
+
],
|
|
86
|
+
functionName: 'withdrawTo',
|
|
87
|
+
args: [userAddress, (0, viem_1.parseUnits)(amount, pool.lpCurrency.decimals)],
|
|
88
|
+
}, options?.gasLimit),
|
|
89
|
+
};
|
|
90
|
+
}
|
|
91
|
+
return {
|
|
92
|
+
result: undefined,
|
|
93
|
+
transaction: undefined,
|
|
94
|
+
};
|
|
95
|
+
};
|
|
96
|
+
exports.unwrapFromERC20 = unwrapFromERC20;
|
|
97
|
+
//# sourceMappingURL=wrap.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"wrap.js","sourceRoot":"","sources":["../../../../src/calls/pool/wrap.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,7 +6,7 @@ exports.CONTROLLER_ABI = [
|
|
|
6
6
|
inputs: [
|
|
7
7
|
{
|
|
8
8
|
internalType: 'address',
|
|
9
|
-
name: '
|
|
9
|
+
name: 'bookManager_',
|
|
10
10
|
type: 'address',
|
|
11
11
|
},
|
|
12
12
|
],
|
|
@@ -122,6 +122,19 @@ exports.CONTROLLER_ABI = [
|
|
|
122
122
|
name: 'SafeERC20FailedOperation',
|
|
123
123
|
type: 'error',
|
|
124
124
|
},
|
|
125
|
+
{
|
|
126
|
+
inputs: [],
|
|
127
|
+
name: 'bookManager',
|
|
128
|
+
outputs: [
|
|
129
|
+
{
|
|
130
|
+
internalType: 'contract IBookManager',
|
|
131
|
+
name: '',
|
|
132
|
+
type: 'address',
|
|
133
|
+
},
|
|
134
|
+
],
|
|
135
|
+
stateMutability: 'view',
|
|
136
|
+
type: 'function',
|
|
137
|
+
},
|
|
125
138
|
{
|
|
126
139
|
inputs: [
|
|
127
140
|
{
|
|
@@ -517,6 +530,11 @@ exports.CONTROLLER_ABI = [
|
|
|
517
530
|
name: 'quoteAmount',
|
|
518
531
|
type: 'uint256',
|
|
519
532
|
},
|
|
533
|
+
{
|
|
534
|
+
internalType: 'address',
|
|
535
|
+
name: 'provider',
|
|
536
|
+
type: 'address',
|
|
537
|
+
},
|
|
520
538
|
{
|
|
521
539
|
internalType: 'bytes',
|
|
522
540
|
name: 'takeHookData',
|
|
@@ -641,6 +659,11 @@ exports.CONTROLLER_ABI = [
|
|
|
641
659
|
name: 'quoteAmount',
|
|
642
660
|
type: 'uint256',
|
|
643
661
|
},
|
|
662
|
+
{
|
|
663
|
+
internalType: 'address',
|
|
664
|
+
name: 'provider',
|
|
665
|
+
type: 'address',
|
|
666
|
+
},
|
|
644
667
|
{
|
|
645
668
|
internalType: 'bytes',
|
|
646
669
|
name: 'hookData',
|