@paraswap/dex-lib 2.28.7-balancer-v2-multihop.3 → 2.28.7-balancer-v2-multihop.5
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.
|
@@ -28,7 +28,6 @@ function balancerV2Merge(or) {
|
|
|
28
28
|
lastExchangeSwap.srcAmount = (BigInt(lastExchangeSwap.srcAmount) + BigInt(currentSwap.srcAmount)).toString();
|
|
29
29
|
lastExchangeSwap.destAmount = (BigInt(lastExchangeSwap.destAmount) + BigInt(currentSwap.destAmount)).toString();
|
|
30
30
|
lastExchangeSwap.percent += currentSwap.percent;
|
|
31
|
-
lastExchangeSwap.data.exchangeProxy = currentSwap.data.exchangeProxy;
|
|
32
31
|
lastExchangeSwap.data.gasUSD = (parseFloat(lastExchangeSwap.data.gasUSD) +
|
|
33
32
|
parseFloat(currentSwap.data.gasUSD)).toFixed(6);
|
|
34
33
|
lastExchangeSwap.data.swaps.push({
|
|
@@ -43,6 +42,19 @@ function balancerV2Merge(or) {
|
|
|
43
42
|
}
|
|
44
43
|
else {
|
|
45
44
|
lastExchange = lodash_1.default.cloneDeep(s);
|
|
45
|
+
lastExchange.swapExchanges[0].data = {};
|
|
46
|
+
lastExchange.swapExchanges[0].data.gasUSD =
|
|
47
|
+
s.swapExchanges[0].data.gasUSD;
|
|
48
|
+
lastExchange.swapExchanges[0].data.swaps = [
|
|
49
|
+
{
|
|
50
|
+
poolId: s.swapExchanges[0].data.poolId,
|
|
51
|
+
amount: side === constants_1.SwapSide.SELL
|
|
52
|
+
? s.swapExchanges[0].srcAmount
|
|
53
|
+
: s.swapExchanges[0].destAmount,
|
|
54
|
+
tokenIn: s.swapExchanges[0].data.tokenIn,
|
|
55
|
+
tokenOut: s.swapExchanges[0].data.tokenOut,
|
|
56
|
+
},
|
|
57
|
+
];
|
|
46
58
|
optimizedRate.push(lastExchange);
|
|
47
59
|
}
|
|
48
60
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"optimizer.js","sourceRoot":"","sources":["../../../src/dex/balancer-v2/optimizer.ts"],"names":[],"mappings":";;;;;;AAAA,oDAAuB;AAEvB,+CAA2C;AAC3C,qCAA0C;AAG1C,SAAgB,eAAe,CAAC,EAAmB;IACjD,MAAM,iBAAiB,GAAG,MAAM,CAAC,IAAI,CAAC,uBAAc,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAC5D,CAAC,CAAC,WAAW,EAAE,CAChB,CAAC;IACF,MAAM,OAAO,GAAG,CAAC,OAAsB,EAAE,IAAc,EAAiB,EAAE;QACxE,IAAI,YAAY,GAAwB,KAAK,CAAC;QAC9C,IAAI,aAAa,GAAG,IAAI,KAAK,EAAe,CAAC;QAC7C,OAAO,CAAC,OAAO,CAAC,CAAC,CAAc,EAAE,EAAE;YACjC,IACE,CAAC,CAAC,aAAa,CAAC,MAAM,KAAK,CAAC;gBAC5B,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,WAAW,EAAE,CAAC,EACtE;gBACA,YAAY,GAAG,KAAK,CAAC;gBACrB,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;aACvB;iBAAM,IACL,YAAY;gBACZ,YAAY,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,WAAW,EAAE;oBAClD,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,WAAW,EAAE;gBAC3C,gBAAC,CAAC,IAAI,CACG,YAAY,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAC/C,CAAC,QAAQ,CAAC,WAAW,EAAE;oBACvB,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,EAC/C;gBACA,MAAM,CAAC,gBAAgB,CAAC,GAAG,YAAY,CAAC,aAAa,CAAC;gBACtD,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,aAAa,CAAC;gBACtC,gBAAgB,CAAC,SAAS,GAAG,CAC3B,MAAM,CAAC,gBAAgB,CAAC,SAAS,CAAC,GAAG,MAAM,CAAC,WAAW,CAAC,SAAS,CAAC,CACnE,CAAC,QAAQ,EAAE,CAAC;gBAEb,gBAAgB,CAAC,UAAU,GAAG,CAC5B,MAAM,CAAC,gBAAgB,CAAC,UAAU,CAAC,GAAG,MAAM,CAAC,WAAW,CAAC,UAAU,CAAC,CACrE,CAAC,QAAQ,EAAE,CAAC;gBAEb,gBAAgB,CAAC,OAAO,IAAI,WAAW,CAAC,OAAO,CAAC;gBAChD,gBAAgB,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"optimizer.js","sourceRoot":"","sources":["../../../src/dex/balancer-v2/optimizer.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -38,7 +38,6 @@ export function balancerV2Merge(or: UnoptimizedRate): UnoptimizedRate {
|
|
|
38
38
|
).toString();
|
|
39
39
|
|
|
40
40
|
lastExchangeSwap.percent += currentSwap.percent;
|
|
41
|
-
lastExchangeSwap.data.exchangeProxy = currentSwap.data.exchangeProxy;
|
|
42
41
|
lastExchangeSwap.data.gasUSD = (
|
|
43
42
|
parseFloat(lastExchangeSwap.data.gasUSD) +
|
|
44
43
|
parseFloat(currentSwap.data.gasUSD)
|
|
@@ -56,6 +55,20 @@ export function balancerV2Merge(or: UnoptimizedRate): UnoptimizedRate {
|
|
|
56
55
|
lastExchangeSwap.poolAddresses!.push(currentSwap.poolAddresses![0]);
|
|
57
56
|
} else {
|
|
58
57
|
lastExchange = _.cloneDeep(s);
|
|
58
|
+
lastExchange.swapExchanges[0].data = {};
|
|
59
|
+
lastExchange.swapExchanges[0].data.gasUSD =
|
|
60
|
+
s.swapExchanges[0].data.gasUSD;
|
|
61
|
+
lastExchange.swapExchanges[0].data.swaps = [
|
|
62
|
+
{
|
|
63
|
+
poolId: s.swapExchanges[0].data.poolId,
|
|
64
|
+
amount:
|
|
65
|
+
side === SwapSide.SELL
|
|
66
|
+
? s.swapExchanges[0].srcAmount
|
|
67
|
+
: s.swapExchanges[0].destAmount,
|
|
68
|
+
tokenIn: s.swapExchanges[0].data.tokenIn,
|
|
69
|
+
tokenOut: s.swapExchanges[0].data.tokenOut,
|
|
70
|
+
},
|
|
71
|
+
];
|
|
59
72
|
optimizedRate.push(lastExchange);
|
|
60
73
|
}
|
|
61
74
|
});
|