@paraswap/dex-lib 4.6.20 → 4.6.21
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/pendle/pendle-deployer.abi.json +520 -0
- package/build/abi/pendle/pendle-oracle.abi.json +413 -0
- package/build/abi/sky-converter/MkrSkyConverter.json +122 -17
- package/build/dex/aave-pt-to-underlying/aave-pt-to-underlying-factory.d.ts +29 -0
- package/build/dex/aave-pt-to-underlying/aave-pt-to-underlying-factory.js +153 -0
- package/build/dex/aave-pt-to-underlying/aave-pt-to-underlying-factory.js.map +1 -0
- package/build/dex/aave-pt-to-underlying/aave-pt-to-underlying.d.ts +3 -1
- package/build/dex/aave-pt-to-underlying/aave-pt-to-underlying.js +64 -12
- package/build/dex/aave-pt-to-underlying/aave-pt-to-underlying.js.map +1 -1
- package/build/dex/aave-pt-to-underlying/config.js +4 -30
- package/build/dex/aave-pt-to-underlying/config.js.map +1 -1
- package/build/dex/aave-pt-to-underlying/types.d.ts +12 -11
- package/build/dex/sky-converter/config.js +1 -0
- package/build/dex/sky-converter/config.js.map +1 -1
- package/build/dex/sky-converter/sky-converter-pool.d.ts +24 -0
- package/build/dex/sky-converter/sky-converter-pool.js +68 -0
- package/build/dex/sky-converter/sky-converter-pool.js.map +1 -0
- package/build/dex/sky-converter/sky-converter.d.ts +3 -2
- package/build/dex/sky-converter/sky-converter.js +31 -9
- package/build/dex/sky-converter/sky-converter.js.map +1 -1
- package/build/dex/sky-converter/types.d.ts +4 -0
- package/package.json +1 -1
|
@@ -40,6 +40,7 @@ const utils_1 = require("../../utils");
|
|
|
40
40
|
const simple_exchange_1 = require("../simple-exchange");
|
|
41
41
|
const config_1 = require("./config");
|
|
42
42
|
const bigint_constants_1 = require("../../bigint-constants");
|
|
43
|
+
const sky_converter_pool_1 = require("./sky-converter-pool");
|
|
43
44
|
class SkyConverter extends simple_exchange_1.SimpleExchange {
|
|
44
45
|
network;
|
|
45
46
|
dexKey;
|
|
@@ -51,6 +52,7 @@ class SkyConverter extends simple_exchange_1.SimpleExchange {
|
|
|
51
52
|
logger;
|
|
52
53
|
oldToken;
|
|
53
54
|
newToken;
|
|
55
|
+
eventPool;
|
|
54
56
|
constructor(network, dexKey, dexHelper, config = config_1.SkyConverterConfig[dexKey][network]) {
|
|
55
57
|
super(dexHelper, dexKey);
|
|
56
58
|
this.network = network;
|
|
@@ -60,8 +62,15 @@ class SkyConverter extends simple_exchange_1.SimpleExchange {
|
|
|
60
62
|
this.logger = dexHelper.getLogger(dexKey);
|
|
61
63
|
this.oldToken = this.config.oldTokenAddress.toLowerCase();
|
|
62
64
|
this.newToken = this.config.newTokenAddress.toLowerCase();
|
|
65
|
+
if (this.config.converterFee) {
|
|
66
|
+
this.eventPool = new sky_converter_pool_1.SkyConverterEventPool(this.dexKey, this.network, this.dexHelper, this.logger, this.config.converterAddress, this.config.converterIface);
|
|
67
|
+
}
|
|
68
|
+
}
|
|
69
|
+
async initializePricing(blockNumber) {
|
|
70
|
+
if (this.eventPool) {
|
|
71
|
+
await this.eventPool.initialize(blockNumber);
|
|
72
|
+
}
|
|
63
73
|
}
|
|
64
|
-
async initializePricing(blockNumber) { }
|
|
65
74
|
getAdapters(side) {
|
|
66
75
|
return null;
|
|
67
76
|
}
|
|
@@ -78,11 +87,19 @@ class SkyConverter extends simple_exchange_1.SimpleExchange {
|
|
|
78
87
|
}
|
|
79
88
|
return [];
|
|
80
89
|
}
|
|
81
|
-
oldAmountToNewAmount(amount) {
|
|
82
|
-
|
|
90
|
+
oldAmountToNewAmount(amount, fee) {
|
|
91
|
+
if (fee <= 0n) {
|
|
92
|
+
return amount * this.config.newTokenRateMultiplier;
|
|
93
|
+
}
|
|
94
|
+
return ((amount * this.config.newTokenRateMultiplier * (bigint_constants_1.BI_POWS[18] - fee)) /
|
|
95
|
+
bigint_constants_1.BI_POWS[18]);
|
|
83
96
|
}
|
|
84
|
-
newAmountToOldAmount(amount) {
|
|
85
|
-
|
|
97
|
+
newAmountToOldAmount(amount, fee) {
|
|
98
|
+
if (fee <= 0n) {
|
|
99
|
+
return amount / this.config.newTokenRateMultiplier;
|
|
100
|
+
}
|
|
101
|
+
return ((amount * bigint_constants_1.BI_POWS[18]) /
|
|
102
|
+
(this.config.newTokenRateMultiplier * (bigint_constants_1.BI_POWS[18] - fee)));
|
|
86
103
|
}
|
|
87
104
|
async getPricesVolume(srcToken, destToken, amounts, side, blockNumber, limitPools) {
|
|
88
105
|
const isKnown = (srcToken.address.toLowerCase() === this.oldToken &&
|
|
@@ -97,21 +114,26 @@ class SkyConverter extends simple_exchange_1.SimpleExchange {
|
|
|
97
114
|
(!isOldToNew && !this.config.newToOldFunctionName)) {
|
|
98
115
|
return null;
|
|
99
116
|
}
|
|
117
|
+
let fee = 0n;
|
|
118
|
+
if (this.eventPool) {
|
|
119
|
+
const state = await this.eventPool.getOrGenerateState(blockNumber);
|
|
120
|
+
fee = state.fee;
|
|
121
|
+
}
|
|
100
122
|
let mappingFunction;
|
|
101
123
|
if (side === constants_1.SwapSide.SELL) {
|
|
102
124
|
if (isOldToNew) {
|
|
103
|
-
mappingFunction = this.oldAmountToNewAmount
|
|
125
|
+
mappingFunction = amount => this.oldAmountToNewAmount(amount, fee);
|
|
104
126
|
}
|
|
105
127
|
else {
|
|
106
|
-
mappingFunction = this.newAmountToOldAmount
|
|
128
|
+
mappingFunction = amount => this.newAmountToOldAmount(amount, fee);
|
|
107
129
|
}
|
|
108
130
|
}
|
|
109
131
|
else {
|
|
110
132
|
if (isOldToNew) {
|
|
111
|
-
mappingFunction = this.newAmountToOldAmount
|
|
133
|
+
mappingFunction = amount => this.newAmountToOldAmount(amount, fee);
|
|
112
134
|
}
|
|
113
135
|
else {
|
|
114
|
-
mappingFunction = this.oldAmountToNewAmount
|
|
136
|
+
mappingFunction = amount => this.oldAmountToNewAmount(amount, fee);
|
|
115
137
|
}
|
|
116
138
|
}
|
|
117
139
|
return [
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sky-converter.js","sourceRoot":"","sources":["../../../src/dex/sky-converter/sky-converter.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAWA,+CAKyB;AACzB,2EAA6D;AAC7D,uCAAoD;AAIpD,wDAAoD;AACpD,qCAA8C;AAC9C,6DAAiD;
|
|
1
|
+
{"version":3,"file":"sky-converter.js","sourceRoot":"","sources":["../../../src/dex/sky-converter/sky-converter.ts"],"names":[],"mappings":"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"}
|