@paraswap/dex-lib 4.2.19-woofi.0 → 4.2.19
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/build/abi/oswap/oswap.abi.json +719 -209
- package/build/abi/woo-fi-v2/WooPPV2.abi.json +1 -8
- package/build/dex/oswap/oswap-pool.d.ts +16 -0
- package/build/dex/oswap/oswap-pool.js +42 -10
- package/build/dex/oswap/oswap-pool.js.map +1 -1
- package/build/dex/oswap/oswap.js +7 -2
- package/build/dex/oswap/oswap.js.map +1 -1
- package/build/dex/oswap/types.d.ts +2 -0
- package/build/dex/woo-fi-v2/decoders.js +1 -4
- package/build/dex/woo-fi-v2/decoders.js.map +1 -1
- package/build/dex/woo-fi-v2/types.d.ts +0 -3
- package/build/dex/woo-fi-v2/woo-fi-v2-math.js +3 -10
- package/build/dex/woo-fi-v2/woo-fi-v2-math.js.map +1 -1
- package/package.json +1 -1
|
@@ -508,14 +508,7 @@
|
|
|
508
508
|
"name": "tokenInfos",
|
|
509
509
|
"outputs": [
|
|
510
510
|
{ "internalType": "uint192", "name": "reserve", "type": "uint192" },
|
|
511
|
-
{ "internalType": "uint16", "name": "feeRate", "type": "uint16" }
|
|
512
|
-
{ "internalType": "uint128", "name": "maxGamma", "type": "uint128" },
|
|
513
|
-
{
|
|
514
|
-
"internalType": "uint128",
|
|
515
|
-
"name": "maxNotionalSwap",
|
|
516
|
-
"type": "uint128"
|
|
517
|
-
},
|
|
518
|
-
{ "internalType": "uint192", "name": "capBal", "type": "uint256" }
|
|
511
|
+
{ "internalType": "uint16", "name": "feeRate", "type": "uint16" }
|
|
519
512
|
],
|
|
520
513
|
"stateMutability": "view",
|
|
521
514
|
"type": "function"
|
|
@@ -48,4 +48,20 @@ export declare class OSwapEventPool extends StatefulEventSubscriber<OSwapPoolSta
|
|
|
48
48
|
* to keep the state's token balances up to date.
|
|
49
49
|
*/
|
|
50
50
|
handleTransfer(event: any, state: DeepReadonly<OSwapPoolState>, log: Readonly<Log>): DeepReadonly<OSwapPoolState> | null;
|
|
51
|
+
handleRedeemRequested(event: any, state: DeepReadonly<OSwapPoolState>, log: Readonly<Log>): {
|
|
52
|
+
withdrawsQueued: any;
|
|
53
|
+
traderate0: string;
|
|
54
|
+
traderate1: string;
|
|
55
|
+
balance0: string;
|
|
56
|
+
balance1: string;
|
|
57
|
+
withdrawsClaimed: string;
|
|
58
|
+
};
|
|
59
|
+
handleRedeemClaimed(event: any, state: DeepReadonly<OSwapPoolState>, log: Readonly<Log>): {
|
|
60
|
+
withdrawsClaimed: string;
|
|
61
|
+
traderate0: string;
|
|
62
|
+
traderate1: string;
|
|
63
|
+
balance0: string;
|
|
64
|
+
balance1: string;
|
|
65
|
+
withdrawsQueued: string;
|
|
66
|
+
};
|
|
51
67
|
}
|
|
@@ -32,6 +32,8 @@ class OSwapEventPool extends stateful_event_subscriber_1.StatefulEventSubscriber
|
|
|
32
32
|
this.addressesSubscribed = [pool.address, pool.token0, pool.token1];
|
|
33
33
|
this.handlers['TraderateChanged'] = this.handleTraderateChanged.bind(this);
|
|
34
34
|
this.handlers['Transfer'] = this.handleTransfer.bind(this);
|
|
35
|
+
this.handlers['RedeemRequested'] = this.handleRedeemRequested.bind(this);
|
|
36
|
+
this.handlers['RedeemClaimed'] = this.handleRedeemClaimed.bind(this);
|
|
35
37
|
}
|
|
36
38
|
parseLog(log) {
|
|
37
39
|
if (log.address.toLowerCase() === this.pool.address) {
|
|
@@ -70,16 +72,19 @@ class OSwapEventPool extends stateful_event_subscriber_1.StatefulEventSubscriber
|
|
|
70
72
|
* @returns state of the event subscriber at blocknumber
|
|
71
73
|
*/
|
|
72
74
|
async generateState(blockNumber) {
|
|
73
|
-
const iERC20 = new abi_1.Interface(ERC20_abi_json_1.default);
|
|
74
75
|
const callData = [
|
|
75
76
|
{
|
|
76
77
|
target: this.pool.token0,
|
|
77
|
-
callData: iERC20.encodeFunctionData('balanceOf', [
|
|
78
|
+
callData: this.iERC20.encodeFunctionData('balanceOf', [
|
|
79
|
+
this.pool.address,
|
|
80
|
+
]),
|
|
78
81
|
decodeFunction: decoders_1.uint256ToBigInt,
|
|
79
82
|
},
|
|
80
83
|
{
|
|
81
84
|
target: this.pool.token1,
|
|
82
|
-
callData: iERC20.encodeFunctionData('balanceOf', [
|
|
85
|
+
callData: this.iERC20.encodeFunctionData('balanceOf', [
|
|
86
|
+
this.pool.address,
|
|
87
|
+
]),
|
|
83
88
|
decodeFunction: decoders_1.uint256ToBigInt,
|
|
84
89
|
},
|
|
85
90
|
{
|
|
@@ -92,13 +97,26 @@ class OSwapEventPool extends stateful_event_subscriber_1.StatefulEventSubscriber
|
|
|
92
97
|
callData: this.iOSwap.encodeFunctionData('traderate1', []),
|
|
93
98
|
decodeFunction: decoders_1.uint256ToBigInt,
|
|
94
99
|
},
|
|
100
|
+
{
|
|
101
|
+
target: this.pool.address,
|
|
102
|
+
callData: this.iOSwap.encodeFunctionData('withdrawsQueued', []),
|
|
103
|
+
decodeFunction: decoders_1.uint256ToBigInt,
|
|
104
|
+
},
|
|
105
|
+
{
|
|
106
|
+
target: this.pool.address,
|
|
107
|
+
callData: this.iOSwap.encodeFunctionData('withdrawsClaimed', []),
|
|
108
|
+
decodeFunction: decoders_1.uint256ToBigInt,
|
|
109
|
+
},
|
|
95
110
|
];
|
|
96
111
|
const results = await this.dexHelper.multiWrapper.aggregate(callData, blockNumber, this.dexHelper.multiWrapper.defaultBatchSize);
|
|
112
|
+
const [balance0, balance1, traderate0, traderate1, withdrawsQueued, withdrawsClaimed,] = results;
|
|
97
113
|
return {
|
|
98
|
-
balance0:
|
|
99
|
-
balance1:
|
|
100
|
-
traderate0:
|
|
101
|
-
traderate1:
|
|
114
|
+
balance0: balance0.toString(),
|
|
115
|
+
balance1: balance1.toString(),
|
|
116
|
+
traderate0: traderate0.toString(),
|
|
117
|
+
traderate1: traderate1.toString(),
|
|
118
|
+
withdrawsQueued: withdrawsQueued.toString(),
|
|
119
|
+
withdrawsClaimed: withdrawsClaimed.toString(),
|
|
102
120
|
};
|
|
103
121
|
}
|
|
104
122
|
async getStateOrGenerate(blockNumber, readonly = true) {
|
|
@@ -116,8 +134,8 @@ class OSwapEventPool extends stateful_event_subscriber_1.StatefulEventSubscriber
|
|
|
116
134
|
handleTraderateChanged(event, state, log) {
|
|
117
135
|
return {
|
|
118
136
|
...state,
|
|
119
|
-
traderate0: event.args.traderate0.
|
|
120
|
-
traderate1: event.args.traderate1.
|
|
137
|
+
traderate0: event.args.traderate0.toString(),
|
|
138
|
+
traderate1: event.args.traderate1.toString(),
|
|
121
139
|
};
|
|
122
140
|
}
|
|
123
141
|
/**
|
|
@@ -139,7 +157,7 @@ class OSwapEventPool extends stateful_event_subscriber_1.StatefulEventSubscriber
|
|
|
139
157
|
balance1 -= amount;
|
|
140
158
|
}
|
|
141
159
|
}
|
|
142
|
-
|
|
160
|
+
if (toAddress == this.pool.address) {
|
|
143
161
|
if (tokenAddress === this.pool.token0) {
|
|
144
162
|
balance0 += amount;
|
|
145
163
|
}
|
|
@@ -153,6 +171,20 @@ class OSwapEventPool extends stateful_event_subscriber_1.StatefulEventSubscriber
|
|
|
153
171
|
balance1: balance1.toString(),
|
|
154
172
|
};
|
|
155
173
|
}
|
|
174
|
+
handleRedeemRequested(event, state, log) {
|
|
175
|
+
return {
|
|
176
|
+
...state,
|
|
177
|
+
withdrawsQueued: event.args.queued.toString(),
|
|
178
|
+
};
|
|
179
|
+
}
|
|
180
|
+
handleRedeemClaimed(event, state, log) {
|
|
181
|
+
const withdrawsClaimed = BigInt(state.withdrawsClaimed);
|
|
182
|
+
const assets = event.args.assets.toBigInt();
|
|
183
|
+
return {
|
|
184
|
+
...state,
|
|
185
|
+
withdrawsClaimed: (withdrawsClaimed + assets).toString(),
|
|
186
|
+
};
|
|
187
|
+
}
|
|
156
188
|
}
|
|
157
189
|
exports.OSwapEventPool = OSwapEventPool;
|
|
158
190
|
//# sourceMappingURL=oswap-pool.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oswap-pool.js","sourceRoot":"","sources":["../../../src/dex/oswap/oswap-pool.ts"],"names":[],"mappings":";;;;;;AAAA,4CAA+C;AAG/C,uCAAiD;AACjD,+EAA0E;AAG1E,iDAAqD;AAErD,oFAAsD;AACtD,8EAAgD;AAEhD,MAAa,cAAe,SAAQ,mDAAuC;IAc9D;IACA;IACC;IACA;IAEA;IACA;IAnBZ,QAAQ,GAMJ,EAAE,CAAC;IAEP,UAAU,CAAoB;IAE9B,mBAAmB,CAAW;IAE9B,YACW,UAAkB,EAClB,IAAe,EACd,OAAe,EACf,SAAqB,EAC/B,MAAc,EACJ,SAAS,IAAI,eAAS,CAAC,wBAAQ,CAAC,EAChC,SAAS,IAAI,eAAS,CAAC,wBAAQ,CAAC;QAE1C,KAAK,CAAC,UAAU,EAAE,IAAI,CAAC,EAAE,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC;QARrC,eAAU,GAAV,UAAU,CAAQ;QAClB,SAAI,GAAJ,IAAI,CAAW;QACd,YAAO,GAAP,OAAO,CAAQ;QACf,cAAS,GAAT,SAAS,CAAY;QAErB,WAAM,GAAN,MAAM,CAA0B;QAChC,WAAM,GAAN,MAAM,CAA0B;QAI1C,IAAI,CAAC,UAAU,GAAG,CAAC,GAAQ,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;QAEnD,IAAI,CAAC,mBAAmB,GAAG,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;QACpE,IAAI,CAAC,QAAQ,CAAC,kBAAkB,CAAC,GAAG,IAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC3E,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,GAAG,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"oswap-pool.js","sourceRoot":"","sources":["../../../src/dex/oswap/oswap-pool.ts"],"names":[],"mappings":"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"}
|
package/build/dex/oswap/oswap.js
CHANGED
|
@@ -134,18 +134,23 @@ class OSwap extends simple_exchange_1.SimpleExchange {
|
|
|
134
134
|
: (amount * (0, utils_1.getBigIntPow)(36)) / rate;
|
|
135
135
|
if (checkLiquidity &&
|
|
136
136
|
!this.hasEnoughLiquidity(pool, state, from, amount, price, side)) {
|
|
137
|
-
|
|
137
|
+
return 0n;
|
|
138
138
|
}
|
|
139
139
|
return price;
|
|
140
140
|
}
|
|
141
141
|
// Returns true if the pool has enough liquidity for the swap. False otherwise.
|
|
142
142
|
hasEnoughLiquidity(pool, state, from, amount, needed, side) {
|
|
143
|
+
const outstandingWithdrawals = BigInt(state.withdrawsQueued) - BigInt(state.withdrawsClaimed);
|
|
144
|
+
if (outstandingWithdrawals > 0n) {
|
|
145
|
+
if (needed + outstandingWithdrawals > BigInt(state.balance0)) {
|
|
146
|
+
return false;
|
|
147
|
+
}
|
|
148
|
+
}
|
|
143
149
|
if (side === constants_1.SwapSide.SELL) {
|
|
144
150
|
return from.address.toLowerCase() === pool.token0
|
|
145
151
|
? needed <= BigInt(state.balance1)
|
|
146
152
|
: needed <= BigInt(state.balance0);
|
|
147
153
|
}
|
|
148
|
-
// SwapSide.BUY
|
|
149
154
|
return from.address.toLowerCase() === pool.token0
|
|
150
155
|
? amount <= BigInt(state.balance1)
|
|
151
156
|
: amount <= BigInt(state.balance0);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oswap.js","sourceRoot":"","sources":["../../../src/dex/oswap/oswap.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,4CAA+C;AAc/C,+CAKyB;AACzB,2EAA6D;AAC7D,uCAAkE;AAIlE,wDAG4B;AAC5B,qCAAiE;AACjE,6CAA8C;AAC9C,oFAAsD;AACtD,gDAAmE;AACnE,qEAAgE;AAEhE,MAAa,KAAM,SAAQ,gCAAc;IAoB5B;IACA;IACA;IACC;IAtBH,UAAU,GAAqC,EAAE,CAAC;IAElD,4BAA4B,GAAG,KAAK,CAAC;IAE9C,kFAAkF;IACzE,cAAc,GAAG,IAAI,CAAC;IAEtB,wBAAwB,GAAG,IAAI,CAAC;IAElC,MAAM,CAAC,kBAAkB,GAC9B,IAAA,6BAAqB,EAAC,oBAAW,CAAC,CAAC;IAErC,MAAM,CAAS;IAEN,MAAM,CAAY;IAElB,KAAK,CAAc;IAE5B,YACW,OAAgB,EAChB,MAAc,EACd,SAAqB,EACpB,WAAW,iBAAQ,CAAC,OAAO,CAAC,IAAI,EAAE;QAE5C,KAAK,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;QALhB,YAAO,GAAP,OAAO,CAAS;QAChB,WAAM,GAAN,MAAM,CAAQ;QACd,cAAS,GAAT,SAAS,CAAY;QACpB,aAAQ,GAAR,QAAQ,CAA0B;QAG5C,IAAI,CAAC,MAAM,GAAG,SAAS,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QAC1C,IAAI,CAAC,MAAM,GAAG,IAAI,eAAS,CAAC,wBAAQ,CAAC,CAAC;QAEtC,IAAI,CAAC,KAAK,GAAG,oBAAW,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC;QAEhD,mGAAmG;QACnG,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;YAC9B,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,IAAI,2BAAc,CAC3C,MAAM,EACN,IAAI,EACJ,OAAO,EACP,SAAS,EACT,IAAI,CAAC,MAAM,CACZ,CAAC;QACJ,CAAC;IACH,CAAC;IAED,yDAAyD;IACzD,wDAAwD;IACxD,WAAW,CAAC,IAAc;QACxB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,4EAA4E;IAC5E,6DAA6D;IAC7D,kBAAkB,CAAC,QAAe,EAAE,SAAgB;QAClD,MAAM,UAAU,GAAG,QAAQ,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC;QAClD,MAAM,WAAW,GAAG,SAAS,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC;QAEpD,uCAAuC;QACvC,IAAI,UAAU,KAAK,WAAW;YAAE,OAAO,IAAI,CAAC;QAE5C,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;YAC9B,IACE,CAAC,UAAU,KAAK,IAAI,CAAC,MAAM,IAAI,WAAW,KAAK,IAAI,CAAC,MAAM,CAAC;gBAC3D,CAAC,UAAU,KAAK,IAAI,CAAC,MAAM,IAAI,WAAW,KAAK,IAAI,CAAC,MAAM,CAAC,EAC3D,CAAC;gBACD,OAAO,IAAI,CAAC;YACd,CAAC;QACH,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,WAAW,CAAC,EAAU;QACpB,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;YAC9B,IAAI,IAAI,CAAC,EAAE,KAAK,EAAE;gBAAE,OAAO,IAAI,CAAC;QAClC,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,0CAA0C;IAC1C,sBAAsB,CAAC,YAAqB;QAC1C,MAAM,OAAO,GAAG,YAAY,CAAC,WAAW,EAAE,CAAC;QAC3C,IAAI,KAAK,GAAgB,EAAE,CAAC;QAC5B,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;YAC9B,IAAI,OAAO,KAAK,IAAI,CAAC,MAAM,IAAI,OAAO,KAAK,IAAI,CAAC,MAAM,EAAE,CAAC;gBACvD,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACnB,CAAC;QACH,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAED,wDAAwD;IACxD,mDAAmD;IACnD,yCAAyC;IACzC,+CAA+C;IAC/C,KAAK,CAAC,kBAAkB,CACtB,QAAe,EACf,SAAgB,EAChB,IAAc,EACd,WAAmB;QAEnB,MAAM,IAAI,GAAG,IAAI,CAAC,kBAAkB,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;QAC1D,OAAO,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IAC/B,CAAC;IAED,+FAA+F;IAC/F,2FAA2F;IAC3F,4CAA4C;IAC5C,SAAS,CACP,IAAe,EACf,KAAqB,EACrB,IAAW,EACX,MAAc,EACd,IAAc,EACd,cAAc,GAAG,IAAI;QAErB,MAAM,IAAI,GACR,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,KAAK,IAAI,CAAC,MAAM;YACxC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC;YAC1B,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;QAE/B,MAAM,KAAK,GACT,IAAI,KAAK,oBAAQ,CAAC,IAAI;YACpB,CAAC,CAAC,CAAC,MAAM,GAAG,IAAI,CAAC,GAAG,IAAA,oBAAY,EAAC,EAAE,CAAC;YACpC,CAAC,CAAC,CAAC,MAAM,GAAG,IAAA,oBAAY,EAAC,EAAE,CAAC,CAAC,GAAG,IAAI,CAAC;QAEzC,IACE,cAAc;YACd,CAAC,IAAI,CAAC,kBAAkB,CAAC,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,CAAC,EAChE,CAAC;YACD,
|
|
1
|
+
{"version":3,"file":"oswap.js","sourceRoot":"","sources":["../../../src/dex/oswap/oswap.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,12 +5,9 @@ exports.decimalInfoDecoder = decimalInfoDecoder;
|
|
|
5
5
|
exports.stateDecoder = stateDecoder;
|
|
6
6
|
const decoders_1 = require("../../lib/decoders");
|
|
7
7
|
function tokenInfoDecoder(result) {
|
|
8
|
-
return (0, decoders_1.generalDecoder)(result, ['uint192', 'uint16'
|
|
8
|
+
return (0, decoders_1.generalDecoder)(result, ['uint192', 'uint16'], undefined, value => ({
|
|
9
9
|
reserve: value[0].toBigInt(),
|
|
10
10
|
feeRate: BigInt(value[1].toString()),
|
|
11
|
-
maxGamma: value[2].toBigInt(),
|
|
12
|
-
maxNotionalSwap: value[3].toBigInt(),
|
|
13
|
-
capBal: value[4].toBigInt(),
|
|
14
11
|
}));
|
|
15
12
|
}
|
|
16
13
|
function decimalInfoDecoder(result) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"decoders.js","sourceRoot":"","sources":["../../../src/dex/woo-fi-v2/decoders.ts"],"names":[],"mappings":";;AAKA,
|
|
1
|
+
{"version":3,"file":"decoders.js","sourceRoot":"","sources":["../../../src/dex/woo-fi-v2/decoders.ts"],"names":[],"mappings":";;AAKA,4CAOC;AAED,gDAaC;AAGD,oCAcC;AA3CD,iDAAoD;AAIpD,SAAgB,gBAAgB,CAC9B,MAA0C;IAE1C,OAAO,IAAA,yBAAc,EAAC,MAAM,EAAE,CAAC,SAAS,EAAE,QAAQ,CAAC,EAAE,SAAS,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;QACxE,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE;QAC5B,OAAO,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;KACrC,CAAC,CAAC,CAAC;AACN,CAAC;AAED,SAAgB,kBAAkB,CAChC,MAA0C;IAE1C,OAAO,IAAA,yBAAc,EACnB,MAAM,EACN,CAAC,yDAAyD,CAAC,EAC3D,SAAS,EACT,KAAK,CAAC,EAAE,CAAC,CAAC;QACR,QAAQ,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,QAAQ,EAAE;QACtC,QAAQ,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,QAAQ,EAAE;QACtC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,EAAE;KACrC,CAAC,CACH,CAAC;AACJ,CAAC;AAED,0CAA0C;AAC1C,SAAgB,YAAY,CAC1B,MAA0C;IAE1C,OAAO,IAAA,yBAAc,EACnB,MAAM,EACN,CAAC,oEAAoE,CAAC,EACtE,SAAS,EACT,KAAK,CAAC,EAAE,CAAC,CAAC;QACR,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,EAAE;QAChC,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,EAAE;QAClC,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,EAAE;QAChC,UAAU,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,UAAU;KAChC,CAAC,CACH,CAAC;AACJ,CAAC"}
|
|
@@ -23,21 +23,14 @@ class WooFiV2Math {
|
|
|
23
23
|
}
|
|
24
24
|
query(fromToken, toToken, fromAmounts) {
|
|
25
25
|
try {
|
|
26
|
-
const { reserve, capBal } = this.state.tokenInfos[fromToken];
|
|
27
|
-
const amounts = fromAmounts.map(amount => {
|
|
28
|
-
if (reserve + amount > capBal)
|
|
29
|
-
return 0n;
|
|
30
|
-
else
|
|
31
|
-
return amount;
|
|
32
|
-
});
|
|
33
26
|
if (fromToken === this._quoteToken) {
|
|
34
|
-
return this._querySellQuote(toToken,
|
|
27
|
+
return this._querySellQuote(toToken, fromAmounts);
|
|
35
28
|
}
|
|
36
29
|
else if (toToken === this._quoteToken) {
|
|
37
|
-
return this._querySellBase(fromToken,
|
|
30
|
+
return this._querySellBase(fromToken, fromAmounts);
|
|
38
31
|
}
|
|
39
32
|
else {
|
|
40
|
-
return this._queryBaseToBase(fromToken, toToken,
|
|
33
|
+
return this._queryBaseToBase(fromToken, toToken, fromAmounts);
|
|
41
34
|
}
|
|
42
35
|
}
|
|
43
36
|
catch (e) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"woo-fi-v2-math.js","sourceRoot":"","sources":["../../../src/dex/woo-fi-v2/woo-fi-v2-math.ts"],"names":[],"mappings":";;;AAEA,6DAAiD;AAEjD,2CAAyC;AAEzC,SAAS,eAAe,CAAC,CAAU,EAAE,MAAc;IACjD,IAAI,CAAC,YAAY,KAAK,IAAI,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,cAAc,CAAC,EAAE,CAAC;QAC/D,MAAM,CAAC,IAAI,CAAC,6BAA6B,EAAE,CAAC,CAAC,CAAC;QAC9C,OAAO;IACT,CAAC;IACD,MAAM,CAAC,KAAK,CAAC,iCAAiC,EAAE,CAAC,CAAC,CAAC;AACrD,CAAC;AAED,SAAS,GAAG,CAAC,CAAS,EAAE,CAAS;IAC/B,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AACvB,CAAC;AAED,MAAa,WAAW;IAIH;IACA;IAJnB,KAAK,GAAc,sBAAU,CAAC;IAE9B,YACmB,MAAc,EACd,WAAoB;QADpB,WAAM,GAAN,MAAM,CAAQ;QACd,gBAAW,GAAX,WAAW,CAAS;IACpC,CAAC;IAEJ,KAAK,CACH,SAAkB,EAClB,OAAgB,EAChB,WAAqB;QAErB,IAAI,CAAC;YACH,
|
|
1
|
+
{"version":3,"file":"woo-fi-v2-math.js","sourceRoot":"","sources":["../../../src/dex/woo-fi-v2/woo-fi-v2-math.ts"],"names":[],"mappings":";;;AAEA,6DAAiD;AAEjD,2CAAyC;AAEzC,SAAS,eAAe,CAAC,CAAU,EAAE,MAAc;IACjD,IAAI,CAAC,YAAY,KAAK,IAAI,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,cAAc,CAAC,EAAE,CAAC;QAC/D,MAAM,CAAC,IAAI,CAAC,6BAA6B,EAAE,CAAC,CAAC,CAAC;QAC9C,OAAO;IACT,CAAC;IACD,MAAM,CAAC,KAAK,CAAC,iCAAiC,EAAE,CAAC,CAAC,CAAC;AACrD,CAAC;AAED,SAAS,GAAG,CAAC,CAAS,EAAE,CAAS;IAC/B,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AACvB,CAAC;AAED,MAAa,WAAW;IAIH;IACA;IAJnB,KAAK,GAAc,sBAAU,CAAC;IAE9B,YACmB,MAAc,EACd,WAAoB;QADpB,WAAM,GAAN,MAAM,CAAQ;QACd,gBAAW,GAAX,WAAW,CAAS;IACpC,CAAC;IAEJ,KAAK,CACH,SAAkB,EAClB,OAAgB,EAChB,WAAqB;QAErB,IAAI,CAAC;YACH,IAAI,SAAS,KAAK,IAAI,CAAC,WAAW,EAAE,CAAC;gBACnC,OAAO,IAAI,CAAC,eAAe,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;YACpD,CAAC;iBAAM,IAAI,OAAO,KAAK,IAAI,CAAC,WAAW,EAAE,CAAC;gBACxC,OAAO,IAAI,CAAC,cAAc,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;YACrD,CAAC;iBAAM,CAAC;gBACN,OAAO,IAAI,CAAC,gBAAgB,CAAC,SAAS,EAAE,OAAO,EAAE,WAAW,CAAC,CAAC;YAChE,CAAC;QACH,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,eAAe,CAAC,CAAC,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;YAChC,OAAO,IAAI,CAAC;QACd,CAAC;IACH,CAAC;IAED,cAAc,CAAC,SAAkB,EAAE,WAAqB;QACtD,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;YAEjD,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC;gBACvB,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,+BAA+B,SAAS,sCAAsC,IAAI,CAAC,KAAK,CAAC,eAAe,EAAE,CAC3G,CAAC;gBACF,OAAO,IAAI,CAAC;YACd,CAAC;YAED,IAAI,YAAY,GAAG,IAAI,CAAC,wBAAwB,CAC9C,SAAS,EACT,WAAW,EACX,MAAM,CACP,CAAC;YAEF,YAAY,GAAG,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE;gBACvC,OAAO,MAAM,IAAI,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,OAAO;oBAC9D,CAAC,CAAC,MAAM;oBACR,CAAC,CAAC,EAAE,CAAC;YACT,CAAC,CAAC,CAAC;YAEH,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC;YACzD,OAAO,IAAI,CAAC,QAAQ,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;QAC9C,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,eAAe,CAAC,CAAC,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;YAChC,OAAO,IAAI,CAAC;QACd,CAAC;IACH,CAAC;IAED,eAAe,CAAC,SAAkB,EAAE,YAAsB;QACxD,IAAI,CAAC;YACH,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC;YACzD,YAAY,GAAG,IAAI,CAAC,QAAQ,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;YAEpD,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;YAEjD,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC;gBACvB,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,+BAA+B,SAAS,sCAAsC,IAAI,CAAC,KAAK,CAAC,eAAe,EAAE,CAC3G,CAAC;gBACF,OAAO,IAAI,CAAC;YACd,CAAC;YAED,IAAI,SAAS,GAAG,IAAI,CAAC,wBAAwB,CAC3C,SAAS,EACT,YAAY,EACZ,MAAM,CACP,CAAC;YAEF,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC;YAC7D,OAAO,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE;gBAC5B,OAAO,MAAM,IAAI,WAAW,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC;YAC7C,CAAC,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,eAAe,CAAC,CAAC,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;YAChC,OAAO,IAAI,CAAC;QACd,CAAC;IACH,CAAC;IAED,gBAAgB,CACd,UAAmB,EACnB,UAAmB,EACnB,YAAsB;QAEtB,IAAI,CAAC;YACH,IAAI,MAAM,GAAe,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;YAC5D,IAAI,MAAM,GAAe,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;YAE5D,IAAI,CAAC,MAAM,CAAC,UAAU,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC;gBAC7C,IAAI,YAAY,GAAG,6CAA6C,CAAC;gBACjE,MAAM,OAAO,GAAG,CAAC,MAAM,CAAC,UAAU,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC;gBAEzD,IAAI,OAAO,EAAE,CAAC;oBACZ,YAAY,IAAI,KAAK,UAAU,QAAQ,UAAU,EAAE,CAAC;gBACtD,CAAC;qBAAM,CAAC;oBACN,MAAM,KAAK,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC;oBAC3D,YAAY,IAAI,IAAI,KAAK,EAAE,CAAC;gBAC9B,CAAC;gBAED,YAAY,IAAI,sBAAsB,IAAI,CAAC,KAAK,CAAC,eAAe,EAAE,CAAC;gBAEnE,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;gBAChC,OAAO,IAAI,CAAC;YACd,CAAC;YAED,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC;YAC3D,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC;YAE3D,MAAM,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC;YACtD,MAAM,OAAO,GAAG,GAAG,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;YAExC,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC;YACvB,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC;YAEvB,IAAI,YAAY,GAAG,IAAI,CAAC,wBAAwB,CAC9C,UAAU,EACV,YAAY,EACZ,MAAM,CACP,CAAC;YACF,YAAY,GAAG,IAAI,CAAC,uBAAuB,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;YAEnE,IAAI,SAAS,GAAG,IAAI,CAAC,wBAAwB,CAC3C,UAAU,EACV,YAAY,EACZ,MAAM,CACP,CAAC;YAEF,OAAO,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE;gBAC9B,OAAO,QAAQ,IAAI,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,OAAO;oBAC1D,CAAC,CAAC,QAAQ;oBACV,CAAC,CAAC,EAAE,CAAC;YACT,CAAC,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,eAAe,CAAC,CAAC,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;YAChC,OAAO,IAAI,CAAC;QACd,CAAC;IACH,CAAC;IAES,uBAAuB,CAC/B,OAAiB,EACjB,OAAe;QAEf,OAAO,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE;YAC1B,IAAI,MAAM,KAAK,EAAE;gBAAE,OAAO,EAAE,CAAC;YAC7B,MAAM,KAAK,GAAG,CAAC,MAAM,GAAG,OAAO,CAAC,GAAG,0BAAO,CAAC,CAAC,CAAC,CAAC;YAC9C,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,OAAO,CAAC;YAChE,OAAO,KAAK,GAAG,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,GAAG,KAAK,CAAC;QAC/C,CAAC,CAAC,CAAC;IACL,CAAC;IAES,QAAQ,CAAC,OAAiB,EAAE,OAAe;QACnD,OAAO,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE;YAC1B,MAAM,KAAK,GAAG,CAAC,MAAM,GAAG,OAAO,CAAC,GAAG,0BAAO,CAAC,CAAC,CAAC,CAAC;YAC9C,OAAO,MAAM,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,GAAG,KAAK,CAAC;QAC7C,CAAC,CAAC,CAAC;IACL,CAAC;IAES,wBAAwB,CAChC,SAAkB,EAClB,WAAqB,EACrB,KAAiB;QAEjB,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;QAErE,OAAO,WAAW,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE;YAClC,IAAI,UAAU,KAAK,EAAE;gBAAE,OAAO,EAAE,CAAC;YAEjC,MAAM,IAAI,GACR,0BAAO,CAAC,EAAE,CAAC;gBACX,CAAC,KAAK,CAAC,KAAK,GAAG,UAAU,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,OAAO,GAAG,QAAQ;gBAC7D,KAAK,CAAC,MAAM,CAAC;YAEf,OAAO,CACL,CAAC,CAAC,CAAC,UAAU,GAAG,QAAQ,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,QAAQ,CAAC,GAAG,IAAI,CAAC;gBAC3D,0BAAO,CAAC,EAAE,CAAC;gBACX,OAAO,CACR,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC;IAES,wBAAwB,CAChC,SAAiB,EACjB,YAAsB,EACtB,KAAiB;QAEjB,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;QAErE,OAAO,YAAY,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE;YACpC,IAAI,WAAW,KAAK,EAAE;gBAAE,OAAO,EAAE,CAAC;YAElC,MAAM,IAAI,GACR,0BAAO,CAAC,EAAE,CAAC,GAAG,CAAC,WAAW,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,QAAQ,GAAG,KAAK,CAAC,MAAM,CAAC;YAEtE,OAAO,CACL,CAAC,CAAC,CAAC,WAAW,GAAG,OAAO,GAAG,QAAQ,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC;gBAC3D,0BAAO,CAAC,EAAE,CAAC;gBACX,QAAQ,CACT,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC;CACF;AAjND,kCAiNC"}
|