@clober/v2-sdk 1.0.0-rc.50 → 1.0.0-rc.51
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/pool/mint.js +35 -4
- package/dist/cjs/calls/pool/mint.js.map +1 -1
- package/dist/esm/calls/pool/mint.js +35 -4
- package/dist/esm/calls/pool/mint.js.map +1 -1
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/dist/types/calls/pool/mint.d.ts +14 -0
- package/dist/types/calls/pool/mint.d.ts.map +1 -1
- package/package.json +1 -1
|
@@ -30,6 +30,7 @@ const getBestQuote = async ({ quotes, tokenIn, tokenOut, amountIn, slippageLimit
|
|
|
30
30
|
return {
|
|
31
31
|
amountOut: results[0].amountOut,
|
|
32
32
|
transaction: results[0].transaction,
|
|
33
|
+
aggregator: results[0].aggregator.name,
|
|
33
34
|
};
|
|
34
35
|
};
|
|
35
36
|
const addLiquidity = async ({ chainId, userAddress, token0, token1, salt, amount0, amount1, quotes, options, }) => {
|
|
@@ -79,6 +80,8 @@ const addLiquidity = async ({ chainId, userAddress, token0, token1, salt, amount
|
|
|
79
80
|
amount: 0n,
|
|
80
81
|
data: '0x',
|
|
81
82
|
};
|
|
83
|
+
let quoteRequest = undefined;
|
|
84
|
+
let quoteResponse = undefined;
|
|
82
85
|
if (!disableSwap) {
|
|
83
86
|
if (!((0, viem_1.isAddressEqual)(pool.currencyA.address, pool.market.quote.address) &&
|
|
84
87
|
(0, viem_1.isAddressEqual)(pool.currencyB.address, pool.market.base.address))) {
|
|
@@ -110,8 +113,7 @@ const addLiquidity = async ({ chainId, userAddress, token0, token1, salt, amount
|
|
|
110
113
|
if (deltaA < 0n) {
|
|
111
114
|
swapParams.inCurrency = pool.currencyA.address;
|
|
112
115
|
swapParams.amount = -deltaA;
|
|
113
|
-
|
|
114
|
-
quotes: quotes ?? [],
|
|
116
|
+
quoteRequest = {
|
|
115
117
|
tokenIn: pool.currencyA,
|
|
116
118
|
tokenOut: pool.currencyB,
|
|
117
119
|
amountIn: swapParams.amount,
|
|
@@ -119,7 +121,20 @@ const addLiquidity = async ({ chainId, userAddress, token0, token1, salt, amount
|
|
|
119
121
|
gasPrice,
|
|
120
122
|
userAddress,
|
|
121
123
|
timeout: timeoutForQuotes,
|
|
124
|
+
};
|
|
125
|
+
const { amountOut: actualDeltaB, transaction, aggregator, } = await getBestQuote({
|
|
126
|
+
quotes: quotes ?? [],
|
|
127
|
+
...quoteRequest,
|
|
122
128
|
});
|
|
129
|
+
const exchangeRate = Number((0, viem_1.formatUnits)(actualDeltaB, quoteRequest.tokenOut.decimals)) /
|
|
130
|
+
Number((0, viem_1.formatUnits)(quoteRequest.amountIn, quoteRequest.tokenIn.decimals));
|
|
131
|
+
quoteResponse = {
|
|
132
|
+
amountOut: actualDeltaB,
|
|
133
|
+
aggregator: aggregator,
|
|
134
|
+
exchangeRate: (0, viem_1.isAddressEqual)(quoteRequest.tokenIn.address, pool.market.quote.address)
|
|
135
|
+
? 1 / exchangeRate
|
|
136
|
+
: exchangeRate,
|
|
137
|
+
};
|
|
123
138
|
swapParams.data = transaction.data;
|
|
124
139
|
amountA += deltaA;
|
|
125
140
|
amountB += actualDeltaB;
|
|
@@ -127,8 +142,7 @@ const addLiquidity = async ({ chainId, userAddress, token0, token1, salt, amount
|
|
|
127
142
|
else if (deltaB < 0n) {
|
|
128
143
|
swapParams.inCurrency = pool.currencyB.address;
|
|
129
144
|
swapParams.amount = -deltaB;
|
|
130
|
-
|
|
131
|
-
quotes: quotes ?? [],
|
|
145
|
+
quoteRequest = {
|
|
132
146
|
tokenIn: pool.currencyB,
|
|
133
147
|
tokenOut: pool.currencyA,
|
|
134
148
|
amountIn: swapParams.amount,
|
|
@@ -136,7 +150,20 @@ const addLiquidity = async ({ chainId, userAddress, token0, token1, salt, amount
|
|
|
136
150
|
gasPrice,
|
|
137
151
|
userAddress,
|
|
138
152
|
timeout: timeoutForQuotes,
|
|
153
|
+
};
|
|
154
|
+
const { amountOut: actualDeltaA, transaction, aggregator, } = await getBestQuote({
|
|
155
|
+
quotes: quotes ?? [],
|
|
156
|
+
...quoteRequest,
|
|
139
157
|
});
|
|
158
|
+
const exchangeRate = Number((0, viem_1.formatUnits)(actualDeltaA, quoteRequest.tokenOut.decimals)) /
|
|
159
|
+
Number((0, viem_1.formatUnits)(quoteRequest.amountIn, quoteRequest.tokenIn.decimals));
|
|
160
|
+
quoteResponse = {
|
|
161
|
+
amountOut: actualDeltaA,
|
|
162
|
+
aggregator: aggregator,
|
|
163
|
+
exchangeRate: (0, viem_1.isAddressEqual)(quoteRequest.tokenIn.address, pool.market.quote.address)
|
|
164
|
+
? 1 / exchangeRate
|
|
165
|
+
: exchangeRate,
|
|
166
|
+
};
|
|
140
167
|
swapParams.data = transaction.data;
|
|
141
168
|
amountA += actualDeltaA;
|
|
142
169
|
amountB += deltaB;
|
|
@@ -162,6 +189,8 @@ const addLiquidity = async ({ chainId, userAddress, token0, token1, salt, amount
|
|
|
162
189
|
amount: '0',
|
|
163
190
|
direction: 'out',
|
|
164
191
|
},
|
|
192
|
+
quoteRequest,
|
|
193
|
+
quoteResponse,
|
|
165
194
|
},
|
|
166
195
|
};
|
|
167
196
|
}
|
|
@@ -215,6 +244,8 @@ const addLiquidity = async ({ chainId, userAddress, token0, token1, salt, amount
|
|
|
215
244
|
amount: (0, viem_1.formatUnits)(mintAmount, pool.lpCurrency.decimals),
|
|
216
245
|
direction: 'out',
|
|
217
246
|
},
|
|
247
|
+
quoteRequest,
|
|
248
|
+
quoteResponse,
|
|
218
249
|
},
|
|
219
250
|
};
|
|
220
251
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mint.js","sourceRoot":"","sources":["../../../../src/calls/pool/mint.ts"],"names":[],"mappings":";;;AAAA,+BAQa;AAEb,+DAA0E;AAS1E,mDAAoD;AACpD,mDAAkE;AAClE,yDAIuC;AACvC,+CAAiD;AACjD,qEAAgE;AAChE,uEAA4E;AAC5E,2EAAuE;AACvE,2CAAsC;AACtC,uEAAsE;AACtE,uCAA8D;AAE9D,MAAM,YAAY,GAAG,KAAK,EAAE,EAC1B,MAAM,EACN,OAAO,EACP,QAAQ,EACR,QAAQ,EACR,oBAAoB,EACpB,QAAQ,EACR,WAAW,EACX,OAAO,GAAG,IAAI,GAqBf,
|
|
1
|
+
{"version":3,"file":"mint.js","sourceRoot":"","sources":["../../../../src/calls/pool/mint.ts"],"names":[],"mappings":"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"}
|
|
@@ -28,6 +28,7 @@ const getBestQuote = async ({ quotes, tokenIn, tokenOut, amountIn, slippageLimit
|
|
|
28
28
|
return {
|
|
29
29
|
amountOut: results[0].amountOut,
|
|
30
30
|
transaction: results[0].transaction,
|
|
31
|
+
aggregator: results[0].aggregator.name,
|
|
31
32
|
};
|
|
32
33
|
};
|
|
33
34
|
export const addLiquidity = async ({ chainId, userAddress, token0, token1, salt, amount0, amount1, quotes, options, }) => {
|
|
@@ -77,6 +78,8 @@ export const addLiquidity = async ({ chainId, userAddress, token0, token1, salt,
|
|
|
77
78
|
amount: 0n,
|
|
78
79
|
data: '0x',
|
|
79
80
|
};
|
|
81
|
+
let quoteRequest = undefined;
|
|
82
|
+
let quoteResponse = undefined;
|
|
80
83
|
if (!disableSwap) {
|
|
81
84
|
if (!(isAddressEqual(pool.currencyA.address, pool.market.quote.address) &&
|
|
82
85
|
isAddressEqual(pool.currencyB.address, pool.market.base.address))) {
|
|
@@ -108,8 +111,7 @@ export const addLiquidity = async ({ chainId, userAddress, token0, token1, salt,
|
|
|
108
111
|
if (deltaA < 0n) {
|
|
109
112
|
swapParams.inCurrency = pool.currencyA.address;
|
|
110
113
|
swapParams.amount = -deltaA;
|
|
111
|
-
|
|
112
|
-
quotes: quotes ?? [],
|
|
114
|
+
quoteRequest = {
|
|
113
115
|
tokenIn: pool.currencyA,
|
|
114
116
|
tokenOut: pool.currencyB,
|
|
115
117
|
amountIn: swapParams.amount,
|
|
@@ -117,7 +119,20 @@ export const addLiquidity = async ({ chainId, userAddress, token0, token1, salt,
|
|
|
117
119
|
gasPrice,
|
|
118
120
|
userAddress,
|
|
119
121
|
timeout: timeoutForQuotes,
|
|
122
|
+
};
|
|
123
|
+
const { amountOut: actualDeltaB, transaction, aggregator, } = await getBestQuote({
|
|
124
|
+
quotes: quotes ?? [],
|
|
125
|
+
...quoteRequest,
|
|
120
126
|
});
|
|
127
|
+
const exchangeRate = Number(formatUnits(actualDeltaB, quoteRequest.tokenOut.decimals)) /
|
|
128
|
+
Number(formatUnits(quoteRequest.amountIn, quoteRequest.tokenIn.decimals));
|
|
129
|
+
quoteResponse = {
|
|
130
|
+
amountOut: actualDeltaB,
|
|
131
|
+
aggregator: aggregator,
|
|
132
|
+
exchangeRate: isAddressEqual(quoteRequest.tokenIn.address, pool.market.quote.address)
|
|
133
|
+
? 1 / exchangeRate
|
|
134
|
+
: exchangeRate,
|
|
135
|
+
};
|
|
121
136
|
swapParams.data = transaction.data;
|
|
122
137
|
amountA += deltaA;
|
|
123
138
|
amountB += actualDeltaB;
|
|
@@ -125,8 +140,7 @@ export const addLiquidity = async ({ chainId, userAddress, token0, token1, salt,
|
|
|
125
140
|
else if (deltaB < 0n) {
|
|
126
141
|
swapParams.inCurrency = pool.currencyB.address;
|
|
127
142
|
swapParams.amount = -deltaB;
|
|
128
|
-
|
|
129
|
-
quotes: quotes ?? [],
|
|
143
|
+
quoteRequest = {
|
|
130
144
|
tokenIn: pool.currencyB,
|
|
131
145
|
tokenOut: pool.currencyA,
|
|
132
146
|
amountIn: swapParams.amount,
|
|
@@ -134,7 +148,20 @@ export const addLiquidity = async ({ chainId, userAddress, token0, token1, salt,
|
|
|
134
148
|
gasPrice,
|
|
135
149
|
userAddress,
|
|
136
150
|
timeout: timeoutForQuotes,
|
|
151
|
+
};
|
|
152
|
+
const { amountOut: actualDeltaA, transaction, aggregator, } = await getBestQuote({
|
|
153
|
+
quotes: quotes ?? [],
|
|
154
|
+
...quoteRequest,
|
|
137
155
|
});
|
|
156
|
+
const exchangeRate = Number(formatUnits(actualDeltaA, quoteRequest.tokenOut.decimals)) /
|
|
157
|
+
Number(formatUnits(quoteRequest.amountIn, quoteRequest.tokenIn.decimals));
|
|
158
|
+
quoteResponse = {
|
|
159
|
+
amountOut: actualDeltaA,
|
|
160
|
+
aggregator: aggregator,
|
|
161
|
+
exchangeRate: isAddressEqual(quoteRequest.tokenIn.address, pool.market.quote.address)
|
|
162
|
+
? 1 / exchangeRate
|
|
163
|
+
: exchangeRate,
|
|
164
|
+
};
|
|
138
165
|
swapParams.data = transaction.data;
|
|
139
166
|
amountA += actualDeltaA;
|
|
140
167
|
amountB += deltaB;
|
|
@@ -160,6 +187,8 @@ export const addLiquidity = async ({ chainId, userAddress, token0, token1, salt,
|
|
|
160
187
|
amount: '0',
|
|
161
188
|
direction: 'out',
|
|
162
189
|
},
|
|
190
|
+
quoteRequest,
|
|
191
|
+
quoteResponse,
|
|
163
192
|
},
|
|
164
193
|
};
|
|
165
194
|
}
|
|
@@ -213,6 +242,8 @@ export const addLiquidity = async ({ chainId, userAddress, token0, token1, salt,
|
|
|
213
242
|
amount: formatUnits(mintAmount, pool.lpCurrency.decimals),
|
|
214
243
|
direction: 'out',
|
|
215
244
|
},
|
|
245
|
+
quoteRequest,
|
|
246
|
+
quoteResponse,
|
|
216
247
|
},
|
|
217
248
|
};
|
|
218
249
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mint.js","sourceRoot":"","sources":["../../../../src/calls/pool/mint.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,EAClB,WAAW,EACX,UAAU,EACV,IAAI,EACJ,cAAc,EACd,UAAU,EACV,WAAW,GACZ,MAAM,MAAM,CAAA;AAEb,OAAO,EAAa,SAAS,EAAE,MAAM,qCAAqC,CAAA;AAS1E,OAAO,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAA;AACpD,OAAO,EAAE,yBAAyB,EAAE,MAAM,wBAAwB,CAAA;AAClE,OAAO,EACL,qBAAqB,EACrB,aAAa,EACb,wBAAwB,GACzB,MAAM,gCAAgC,CAAA;AACvC,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AACjD,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAA;AAChE,OAAO,EAAE,kBAAkB,EAAE,MAAM,yCAAyC,CAAA;AAC5E,OAAO,EAAE,UAAU,EAAE,MAAM,4CAA4C,CAAA;AACvE,OAAO,EAAE,GAAG,EAAE,MAAM,kBAAkB,CAAA;AACtC,OAAO,EAAE,WAAW,EAAE,MAAM,0CAA0C,CAAA;AACtE,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,aAAa,CAAA;AAE9D,MAAM,YAAY,GAAG,KAAK,EAAE,EAC1B,MAAM,EACN,OAAO,EACP,QAAQ,EACR,QAAQ,EACR,oBAAoB,EACpB,QAAQ,EACR,WAAW,EACX,OAAO,GAAG,IAAI,EAAE,+BAA+B;EAqBhD,
|
|
1
|
+
{"version":3,"file":"mint.js","sourceRoot":"","sources":["../../../../src/calls/pool/mint.ts"],"names":[],"mappings":"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"}
|