@paraswap/dex-lib 3.9.7-fluid-dex.3 → 3.10.1
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/.vscode/launch.json +53 -0
- package/.vscode/settings.json +2 -0
- package/.vscode/tasks.json +15 -0
- package/build/abi/{integral/pool.json → inception/inception-ineth-pool.json} +558 -537
- package/build/abi/inception/inception-ratio-feed.json +329 -0
- package/build/abi/inception/inception-vault.json +991 -0
- package/build/abi/uniswap-v3/AlienBaseV3Router.abi.json +52 -0
- package/build/abi/{integral/relayer.json → wombat/pool.json} +474 -721
- package/build/config.js +28 -0
- package/build/config.js.map +1 -1
- package/build/constants.d.ts +2 -1
- package/build/constants.js +1 -0
- package/build/constants.js.map +1 -1
- package/build/dex/aave-v1/aave-v1.d.ts +2 -1
- package/build/dex/aave-v1/aave-v1.js +23 -0
- package/build/dex/aave-v1/aave-v1.js.map +1 -1
- package/build/dex/aave-v2/tokens-avalanche.json +44 -0
- package/build/dex/aave-v2/tokens-mainnet.json +188 -0
- package/build/dex/aave-v2/tokens-polygon.json +44 -0
- package/build/dex/aave-v3/aave-v3.js +1 -1
- package/build/dex/aave-v3/aave-v3.js.map +1 -1
- package/build/dex/aave-v3/config.js +6 -0
- package/build/dex/aave-v3/config.js.map +1 -1
- package/build/dex/aave-v3-stata/config.js +3 -3
- package/build/dex/aave-v3-stata/config.js.map +1 -1
- package/build/dex/algebra/algebra-pool-v1_9_bidirectional_fee.js +1 -1
- package/build/dex/algebra/algebra-pool-v1_9_bidirectional_fee.js.map +1 -1
- package/build/dex/algebra/config.js +20 -0
- package/build/dex/algebra/config.js.map +1 -1
- package/build/dex/balancer-v2/balancer-v2.js +1 -1
- package/build/dex/balancer-v2/balancer-v2.js.map +1 -1
- package/build/dex/balancer-v2/config.js +4 -0
- package/build/dex/balancer-v2/config.js.map +1 -1
- package/build/dex/curve-v1/config.js +36 -0
- package/build/dex/curve-v1/config.js.map +1 -1
- package/build/dex/curve-v1/curve-v1.js +1 -1
- package/build/dex/curve-v1/curve-v1.js.map +1 -1
- package/build/dex/curve-v1-factory/constants.js +1 -0
- package/build/dex/curve-v1-factory/constants.js.map +1 -1
- package/build/dex/curve-v1-factory/curve-v1-factory.js +1 -1
- package/build/dex/curve-v1-factory/curve-v1-factory.js.map +1 -1
- package/build/dex/curve-v1-stable-ng/config.js +28 -0
- package/build/dex/curve-v1-stable-ng/config.js.map +1 -1
- package/build/dex/fluid-dex/fluid-dex.d.ts +1 -0
- package/build/dex/fluid-dex/fluid-dex.js +19 -17
- package/build/dex/fluid-dex/fluid-dex.js.map +1 -1
- package/build/dex/fluid-dex/utils.d.ts +2 -0
- package/build/dex/fluid-dex/utils.js +18 -0
- package/build/dex/fluid-dex/utils.js.map +1 -0
- package/build/dex/inception/config.d.ts +4 -0
- package/build/dex/inception/config.js +109 -0
- package/build/dex/inception/config.js.map +1 -0
- package/build/dex/inception/inception-event-pool.d.ts +16 -0
- package/build/dex/inception/inception-event-pool.js +49 -0
- package/build/dex/inception/inception-event-pool.js.map +1 -0
- package/build/dex/inception/inception.d.ts +43 -0
- package/build/dex/inception/inception.js +180 -0
- package/build/dex/inception/inception.js.map +1 -0
- package/build/dex/inception/tokens.d.ts +9 -0
- package/build/dex/inception/tokens.js +28 -0
- package/build/dex/inception/tokens.js.map +1 -0
- package/build/dex/inception/types.d.ts +22 -0
- package/build/dex/inception/types.js +3 -0
- package/build/dex/inception/types.js.map +1 -0
- package/build/dex/inception/utils.d.ts +7 -0
- package/build/dex/inception/utils.js +58 -0
- package/build/dex/inception/utils.js.map +1 -0
- package/build/dex/jarvis.d.ts +2 -1
- package/build/dex/jarvis.js +58 -0
- package/build/dex/jarvis.js.map +1 -1
- package/build/dex/maker-psm/scripts/gem.abi.json +136 -0
- package/build/dex/maker-psm/scripts/validate-state.d.ts +0 -0
- package/build/dex/maker-psm/scripts/validate-state.js +185 -0
- package/build/dex/maker-psm/scripts/validate-state.js.map +1 -0
- package/build/dex/maker-psm/scripts/vat.abi.json +243 -0
- package/build/dex/platypus/platypus.d.ts +2 -1
- package/build/dex/platypus/platypus.js +45 -0
- package/build/dex/platypus/platypus.js.map +1 -1
- package/build/dex/solidly-v3/scripts/check-event-pool-event.d.ts +1 -0
- package/build/dex/solidly-v3/scripts/check-event-pool-event.js +53 -0
- package/build/dex/solidly-v3/scripts/check-event-pool-event.js.map +1 -0
- package/build/dex/stable-pool.js +1 -8
- package/build/dex/stable-pool.js.map +1 -1
- package/build/dex/swaap-v1/swaap-v1.d.ts +2 -1
- package/build/dex/swaap-v1/swaap-v1.js +14 -0
- package/build/dex/swaap-v1/swaap-v1.js.map +1 -1
- package/build/dex/uniswap-v2/config.js +14 -0
- package/build/dex/uniswap-v2/config.js.map +1 -1
- package/build/dex/uniswap-v2/nomiswap-v2.js +10 -0
- package/build/dex/uniswap-v2/nomiswap-v2.js.map +1 -1
- package/build/dex/uniswap-v2/uniswap-v2.js +1 -1
- package/build/dex/uniswap-v2/uniswap-v2.js.map +1 -1
- package/build/dex/uniswap-v3/config.js +14 -0
- package/build/dex/uniswap-v3/config.js.map +1 -1
- package/build/dex/uniswap-v3/forks/alien-base-v3/alien-base-v3.d.ts +17 -0
- package/build/dex/uniswap-v3/forks/alien-base-v3/alien-base-v3.js +64 -0
- package/build/dex/uniswap-v3/forks/alien-base-v3/alien-base-v3.js.map +1 -0
- package/build/dex/uniswap-v3/forks/alien-v3/alien-v3.d.ts +17 -0
- package/build/dex/uniswap-v3/forks/alien-v3/alien-v3.js +79 -0
- package/build/dex/uniswap-v3/forks/alien-v3/alien-v3.js.map +1 -0
- package/build/dex/uniswap-v3/uniswap-v3-pricing.d.ts +4 -0
- package/build/dex/uniswap-v3/uniswap-v3-pricing.js +43 -0
- package/build/dex/uniswap-v3/uniswap-v3-pricing.js.map +1 -0
- package/build/dex/uniswap-v3/uniswap-v3-worker.d.ts +1 -0
- package/build/dex/uniswap-v3/uniswap-v3-worker.js +10 -0
- package/build/dex/uniswap-v3/uniswap-v3-worker.js.map +1 -0
- package/build/dex/uniswap-v3/uniswap-v3.js +1 -0
- package/build/dex/uniswap-v3/uniswap-v3.js.map +1 -1
- package/build/dex/weth/config.js +5 -0
- package/build/dex/weth/config.js.map +1 -1
- package/build/dex/wusdm/config.js +8 -0
- package/build/dex/wusdm/config.js.map +1 -1
- package/build/dex/wusdm/wusdm.d.ts +1 -0
- package/build/dex/wusdm/wusdm.js +9 -4
- package/build/dex/wusdm/wusdm.js.map +1 -1
- package/build/dex/zerox/index.d.ts +4 -26
- package/build/dex/zerox/index.js +50 -42
- package/build/dex/zerox/index.js.map +1 -1
- package/build/dex/zerox/types.d.ts +29 -0
- package/build/dex/zerox/types.js +8 -1
- package/build/dex/zerox/types.js.map +1 -1
- package/build/executor/WETHBytecodeBuilder.js +1 -0
- package/build/executor/WETHBytecodeBuilder.js.map +1 -1
- package/package.json +1 -1
- package/src/config.ts +29 -1
- package/src/constants.ts +1 -0
- package/src/dex/aave-v3/aave-v3-e2e.test.ts +69 -0
- package/src/dex/aave-v3/aave-v3.ts +1 -1
- package/src/dex/aave-v3/config.ts +7 -0
- package/src/dex/aave-v3-stata/config.ts +4 -4
- package/src/dex/algebra/algebra-e2e.test.ts +22 -0
- package/src/dex/algebra/algebra-pool-v1_9_bidirectional_fee.ts +1 -1
- package/src/dex/algebra/config.ts +21 -0
- package/src/dex/balancer-v2/balancer-v2-e2e.test.ts +22 -250
- package/src/dex/balancer-v2/balancer-v2.ts +1 -1
- package/src/dex/balancer-v2/config.ts +4 -0
- package/src/dex/curve-v1/config.ts +36 -0
- package/src/dex/curve-v1/curve-v1-e2e.test.ts +69 -0
- package/src/dex/curve-v1/curve-v1.ts +1 -1
- package/src/dex/curve-v1-factory/constants.ts +1 -0
- package/src/dex/curve-v1-factory/curve-v1-factory.ts +2 -1
- package/src/dex/curve-v1-stable-ng/config.ts +28 -0
- package/src/dex/curve-v1-stable-ng/curve-v1-stable-ng-e2e.test.ts +20 -0
- package/src/dex/fluid-dex/fluid-dex-e2e.test.ts +0 -1
- package/src/dex/fluid-dex/fluid-dex-integration.test.ts +62 -23
- package/src/dex/fluid-dex/fluid-dex.ts +26 -18
- package/src/dex/fluid-dex/utils.ts +15 -0
- package/src/dex/uniswap-v2/config.ts +16 -0
- package/src/dex/uniswap-v2/nomiswap-v2.ts +11 -0
- package/src/dex/uniswap-v2/uniswap-v2-e2e-gnosis.test.ts +283 -0
- package/src/dex/uniswap-v2/uniswap-v2.ts +1 -1
- package/src/dex/uniswap-v3/config.ts +14 -0
- package/src/dex/uniswap-v3/uniswap-v3-e2e.test.ts +24 -0
- package/src/dex/uniswap-v3/uniswap-v3.ts +1 -0
- package/src/dex/weth/config.ts +5 -0
- package/src/dex/wusdm/config.ts +8 -0
- package/src/dex/wusdm/wusdm-e2e.test.ts +38 -0
- package/src/dex/wusdm/wusdm.ts +11 -4
- package/src/executor/WETHBytecodeBuilder.ts +3 -2
- package/tests/constants-e2e.ts +75 -0
- package/.idea/aws.xml +0 -17
- package/.idea/codeStyles/Project.xml +0 -19
- package/.idea/codeStyles/codeStyleConfig.xml +0 -5
- package/.idea/misc.xml +0 -6
- package/.idea/modules.xml +0 -8
- package/.idea/paraswap-dex-lib.iml +0 -9
- package/.idea/prettier.xml +0 -7
- package/.idea/vcs.xml +0 -6
- package/build/abi/integral/factory.json +0 -333
- package/build/abi/integral/oracle.json +0 -501
- package/build/dex/fluid-dex/fluid-dex-generate-pool.d.ts +0 -49
- package/build/dex/fluid-dex/fluid-dex-generate-pool.js +0 -104
- package/build/dex/fluid-dex/fluid-dex-generate-pool.js.map +0 -1
- package/build/dex/integral/config.d.ts +0 -4
- package/build/dex/integral/config.js +0 -20
- package/build/dex/integral/config.js.map +0 -1
- package/build/dex/integral/context.d.ts +0 -40
- package/build/dex/integral/context.js +0 -158
- package/build/dex/integral/context.js.map +0 -1
- package/build/dex/integral/integral-factory.d.ts +0 -24
- package/build/dex/integral/integral-factory.js +0 -95
- package/build/dex/integral/integral-factory.js.map +0 -1
- package/build/dex/integral/integral-pool.d.ts +0 -50
- package/build/dex/integral/integral-pool.js +0 -149
- package/build/dex/integral/integral-pool.js.map +0 -1
- package/build/dex/integral/integral-pricing.d.ts +0 -18
- package/build/dex/integral/integral-pricing.js +0 -114
- package/build/dex/integral/integral-pricing.js.map +0 -1
- package/build/dex/integral/integral-relayer.d.ts +0 -42
- package/build/dex/integral/integral-relayer.js +0 -192
- package/build/dex/integral/integral-relayer.js.map +0 -1
- package/build/dex/integral/integral-token.d.ts +0 -27
- package/build/dex/integral/integral-token.js +0 -59
- package/build/dex/integral/integral-token.js.map +0 -1
- package/build/dex/integral/integral.d.ts +0 -41
- package/build/dex/integral/integral.js +0 -376
- package/build/dex/integral/integral.js.map +0 -1
- package/build/dex/integral/types.d.ts +0 -85
- package/build/dex/integral/types.js +0 -9
- package/build/dex/integral/types.js.map +0 -1
- package/build/dex/integral/utils-e2e.d.ts +0 -9
- package/build/dex/integral/utils-e2e.js +0 -131
- package/build/dex/integral/utils-e2e.js.map +0 -1
- package/build/dex/integral/utils.d.ts +0 -17
- package/build/dex/integral/utils.js +0 -94
- package/build/dex/integral/utils.js.map +0 -1
- package/build/dex/trader-joe-v2.1/optimizer.d.ts +0 -2
- package/build/dex/trader-joe-v2.1/optimizer.js +0 -47
- package/build/dex/trader-joe-v2.1/optimizer.js.map +0 -1
package/build/dex/zerox/index.js
CHANGED
|
@@ -13,46 +13,13 @@ const zrx_v4_json_1 = __importDefault(require("../../abi/zrx.v4.json"));
|
|
|
13
13
|
const constants_1 = require("../../constants");
|
|
14
14
|
const simple_exchange_1 = require("../simple-exchange");
|
|
15
15
|
const order_1 = require("./order");
|
|
16
|
-
const
|
|
17
|
-
|
|
18
|
-
2: '0x080bf510fcbf18b91105470639e9561022937712',
|
|
19
|
-
3: '0x61935CbDd02287B511119DDb11Aeb42F1593b7Ef',
|
|
20
|
-
4: '0xdef1c0ded9bec7f1a1670819833240f027b25eff',
|
|
21
|
-
},
|
|
22
|
-
56: {
|
|
23
|
-
2: '0x3F93C3D9304a70c9104642AB8cD37b1E2a7c203A',
|
|
24
|
-
4: '0xdef1c0ded9bec7f1a1670819833240f027b25eff',
|
|
25
|
-
},
|
|
26
|
-
137: {
|
|
27
|
-
4: '0xdef1c0ded9bec7f1a1670819833240f027b25eff',
|
|
28
|
-
},
|
|
29
|
-
};
|
|
16
|
+
const types_1 = require("./types");
|
|
17
|
+
const config_1 = require("./config");
|
|
30
18
|
const ZRX_ABI = {
|
|
31
19
|
2: zrx_v2_json_1.default,
|
|
32
20
|
3: zrx_v3_json_1.default,
|
|
33
21
|
4: zrx_v4_json_1.default,
|
|
34
22
|
};
|
|
35
|
-
const ZRX_EXCHANGE_ERC20PROXY = {
|
|
36
|
-
1: {
|
|
37
|
-
1: '0x95E6F48254609A6ee006F7D493c8e5fB97094ceF',
|
|
38
|
-
2: '0x95E6F48254609A6ee006F7D493c8e5fB97094ceF',
|
|
39
|
-
4: '0xdef1c0ded9bec7f1a1670819833240f027b25eff',
|
|
40
|
-
},
|
|
41
|
-
56: {
|
|
42
|
-
2: '0xCF21d4b7a265FF779accBA55Ace0F56C8cE6e379',
|
|
43
|
-
4: '0xdef1c0ded9bec7f1a1670819833240f027b25eff',
|
|
44
|
-
},
|
|
45
|
-
137: {
|
|
46
|
-
4: '0xdef1c0ded9bec7f1a1670819833240f027b25eff',
|
|
47
|
-
},
|
|
48
|
-
};
|
|
49
|
-
var ZeroXFunctions;
|
|
50
|
-
(function (ZeroXFunctions) {
|
|
51
|
-
ZeroXFunctions["swapOnZeroXv2"] = "swapOnZeroXv2";
|
|
52
|
-
ZeroXFunctions["swapOnZeroXv4"] = "swapOnZeroXv4";
|
|
53
|
-
ZeroXFunctions["swapOnZeroXv2WithPermit"] = "swapOnZeroXv2WithPermit";
|
|
54
|
-
ZeroXFunctions["swapOnZeroXv4WithPermit"] = "swapOnZeroXv4WithPermit";
|
|
55
|
-
})(ZeroXFunctions || (ZeroXFunctions = {}));
|
|
56
23
|
class ZeroX extends simple_exchange_1.SimpleExchange {
|
|
57
24
|
constructor(dexHelper) {
|
|
58
25
|
super(dexHelper, 'zerox');
|
|
@@ -60,7 +27,7 @@ class ZeroX extends simple_exchange_1.SimpleExchange {
|
|
|
60
27
|
this.routerInterface = new abi_1.Interface(IParaswap_json_1.default);
|
|
61
28
|
}
|
|
62
29
|
getExchange(data) {
|
|
63
|
-
return ZRX_EXCHANGE[this.network][data.version];
|
|
30
|
+
return config_1.ZRX_EXCHANGE[this.network][data.version];
|
|
64
31
|
}
|
|
65
32
|
buildSimpleSwapData(data, srcAmount) {
|
|
66
33
|
const zrxABI = ZRX_ABI[data.version];
|
|
@@ -167,7 +134,48 @@ class ZeroX extends simple_exchange_1.SimpleExchange {
|
|
|
167
134
|
}
|
|
168
135
|
const swapData = this.buildSimpleSwapData(data, srcAmount);
|
|
169
136
|
const networkFees = '0';
|
|
170
|
-
return this.buildSimpleParamWithoutWETHConversion(src, srcAmount, dest, destAmount, swapData, this.getExchange(data), ZRX_EXCHANGE_ERC20PROXY[this.network][data.version], networkFees);
|
|
137
|
+
return this.buildSimpleParamWithoutWETHConversion(src, srcAmount, dest, destAmount, swapData, this.getExchange(data), config_1.ZRX_EXCHANGE_ERC20PROXY[this.network][data.version], networkFees);
|
|
138
|
+
}
|
|
139
|
+
getDexParam(_srcToken, _destToken, srcAmount, destAmount, _recipient, data, side) {
|
|
140
|
+
if (side === constants_1.SwapSide.BUY) {
|
|
141
|
+
// Adjust the srcAmount according to the exact order price (rounding up)
|
|
142
|
+
if (data.version === 4) {
|
|
143
|
+
const order = data.order;
|
|
144
|
+
if (BigInt(destAmount) > BigInt(order.makerAmount)) {
|
|
145
|
+
throw new Error(`ZeroX destAmount ${destAmount} > makerAmount ${order.makerAmount}`);
|
|
146
|
+
}
|
|
147
|
+
const calc = (BigInt(destAmount) * BigInt(order.takerAmount) +
|
|
148
|
+
BigInt(order.makerAmount) -
|
|
149
|
+
1n) /
|
|
150
|
+
BigInt(order.makerAmount);
|
|
151
|
+
if (calc > BigInt(srcAmount)) {
|
|
152
|
+
throw new Error(`ZeroX calc ${calc} > srcAmount ${srcAmount}`);
|
|
153
|
+
}
|
|
154
|
+
srcAmount = calc.toString();
|
|
155
|
+
}
|
|
156
|
+
else {
|
|
157
|
+
const order = data.order;
|
|
158
|
+
if (BigInt(destAmount) > BigInt(order.makerAssetAmount)) {
|
|
159
|
+
throw new Error(`ZeroX destAmount ${destAmount} > makerAmount ${order.makerAssetAmount}`);
|
|
160
|
+
}
|
|
161
|
+
const calc = (BigInt(destAmount) * BigInt(order.takerAssetAmount) +
|
|
162
|
+
BigInt(order.makerAssetAmount) -
|
|
163
|
+
1n) /
|
|
164
|
+
BigInt(order.makerAssetAmount);
|
|
165
|
+
if (calc > BigInt(srcAmount)) {
|
|
166
|
+
throw new Error(`ZeroX calc ${calc} > srcAmount ${srcAmount}`);
|
|
167
|
+
}
|
|
168
|
+
srcAmount = calc.toString();
|
|
169
|
+
}
|
|
170
|
+
}
|
|
171
|
+
const swapData = this.buildSimpleSwapData(data, srcAmount);
|
|
172
|
+
return {
|
|
173
|
+
needWrapNative: this.needWrapNative,
|
|
174
|
+
dexFuncHasRecipient: false,
|
|
175
|
+
exchangeData: swapData,
|
|
176
|
+
targetExchange: this.getExchange(data),
|
|
177
|
+
returnAmountPos: undefined,
|
|
178
|
+
};
|
|
171
179
|
}
|
|
172
180
|
getDirectParam(srcToken, destToken, srcAmount, destAmount, expectedAmount, data, side, permit, uuid, feePercent, deadline, partner, beneficiary, contractMethod) {
|
|
173
181
|
const usePermit = permit !== '0x';
|
|
@@ -175,12 +183,12 @@ class ZeroX extends simple_exchange_1.SimpleExchange {
|
|
|
175
183
|
switch (data.version) {
|
|
176
184
|
case 2:
|
|
177
185
|
return this.routerInterface.encodeFunctionData(usePermit
|
|
178
|
-
? ZeroXFunctions.swapOnZeroXv2WithPermit
|
|
179
|
-
: ZeroXFunctions.swapOnZeroXv2, params);
|
|
186
|
+
? types_1.ZeroXFunctions.swapOnZeroXv2WithPermit
|
|
187
|
+
: types_1.ZeroXFunctions.swapOnZeroXv2, params);
|
|
180
188
|
case 4:
|
|
181
189
|
return this.routerInterface.encodeFunctionData(usePermit
|
|
182
|
-
? ZeroXFunctions.swapOnZeroXv4WithPermit
|
|
183
|
-
: ZeroXFunctions.swapOnZeroXv4, params);
|
|
190
|
+
? types_1.ZeroXFunctions.swapOnZeroXv4WithPermit
|
|
191
|
+
: types_1.ZeroXFunctions.swapOnZeroXv4, params);
|
|
184
192
|
default:
|
|
185
193
|
throw new Error(`ZeroX version ${data.version} is not supported!`);
|
|
186
194
|
}
|
|
@@ -209,7 +217,7 @@ class ZeroX extends simple_exchange_1.SimpleExchange {
|
|
|
209
217
|
};
|
|
210
218
|
}
|
|
211
219
|
static getDirectFunctionName() {
|
|
212
|
-
return [ZeroXFunctions.swapOnZeroXv2, ZeroXFunctions.swapOnZeroXv4];
|
|
220
|
+
return [types_1.ZeroXFunctions.swapOnZeroXv2, types_1.ZeroXFunctions.swapOnZeroXv4];
|
|
213
221
|
}
|
|
214
222
|
}
|
|
215
223
|
exports.ZeroX = ZeroX;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/dex/zerox/index.ts"],"names":[],"mappings":";;;;;;AAAA,qCAAuC;AACvC,4CAA+C;AAE/C,8EAAoD;AACpD,wEAA+C;AAC/C,wEAA+C;AAC/C,wEAA+C;AAE/C,+CAA2C;AAC3C,wDAAoD;AACpD,mCAAqC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/dex/zerox/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { Address } from '@paraswap/sdk';
|
|
1
2
|
import { NumberAsString } from '../../types';
|
|
2
3
|
export declare enum OrderStatus {
|
|
3
4
|
INVALID = 0,
|
|
@@ -41,4 +42,32 @@ export interface ZeroXSignedOrderV4 {
|
|
|
41
42
|
signature: any;
|
|
42
43
|
}
|
|
43
44
|
export declare type ZeroXSignedOrder = ZeroXSignedOrderV2 | ZeroXSignedOrderV4;
|
|
45
|
+
export declare enum ZeroXFunctions {
|
|
46
|
+
swapOnZeroXv2 = "swapOnZeroXv2",
|
|
47
|
+
swapOnZeroXv4 = "swapOnZeroXv4",
|
|
48
|
+
swapOnZeroXv2WithPermit = "swapOnZeroXv2WithPermit",
|
|
49
|
+
swapOnZeroXv4WithPermit = "swapOnZeroXv4WithPermit"
|
|
50
|
+
}
|
|
51
|
+
export declare type ZeroXData = {
|
|
52
|
+
version: number;
|
|
53
|
+
order: ZeroXSignedOrder;
|
|
54
|
+
};
|
|
55
|
+
export declare type SwapOnZeroXParam = [
|
|
56
|
+
srcToken: Address,
|
|
57
|
+
destToken: Address,
|
|
58
|
+
srcAmount: NumberAsString,
|
|
59
|
+
destAmount: NumberAsString,
|
|
60
|
+
exchange: Address,
|
|
61
|
+
payload: string
|
|
62
|
+
];
|
|
63
|
+
export declare type SwapOnZeroXWithPermitParam = [
|
|
64
|
+
srcToken: Address,
|
|
65
|
+
destToken: Address,
|
|
66
|
+
srcAmount: NumberAsString,
|
|
67
|
+
destAmount: NumberAsString,
|
|
68
|
+
exchange: Address,
|
|
69
|
+
payload: string,
|
|
70
|
+
permit: string
|
|
71
|
+
];
|
|
72
|
+
export declare type ZeroXParam = SwapOnZeroXParam | SwapOnZeroXWithPermitParam;
|
|
44
73
|
export {};
|
package/build/dex/zerox/types.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.OrderStatus = void 0;
|
|
3
|
+
exports.ZeroXFunctions = exports.OrderStatus = void 0;
|
|
4
4
|
var OrderStatus;
|
|
5
5
|
(function (OrderStatus) {
|
|
6
6
|
OrderStatus[OrderStatus["INVALID"] = 0] = "INVALID";
|
|
@@ -11,4 +11,11 @@ var OrderStatus;
|
|
|
11
11
|
OrderStatus[OrderStatus["FULLY_FILLED"] = 5] = "FULLY_FILLED";
|
|
12
12
|
OrderStatus[OrderStatus["CANCELLED"] = 6] = "CANCELLED";
|
|
13
13
|
})(OrderStatus = exports.OrderStatus || (exports.OrderStatus = {}));
|
|
14
|
+
var ZeroXFunctions;
|
|
15
|
+
(function (ZeroXFunctions) {
|
|
16
|
+
ZeroXFunctions["swapOnZeroXv2"] = "swapOnZeroXv2";
|
|
17
|
+
ZeroXFunctions["swapOnZeroXv4"] = "swapOnZeroXv4";
|
|
18
|
+
ZeroXFunctions["swapOnZeroXv2WithPermit"] = "swapOnZeroXv2WithPermit";
|
|
19
|
+
ZeroXFunctions["swapOnZeroXv4WithPermit"] = "swapOnZeroXv4WithPermit";
|
|
20
|
+
})(ZeroXFunctions = exports.ZeroXFunctions || (exports.ZeroXFunctions = {}));
|
|
14
21
|
//# sourceMappingURL=types.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/dex/zerox/types.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/dex/zerox/types.ts"],"names":[],"mappings":";;;AAGA,IAAY,WAQX;AARD,WAAY,WAAW;IACrB,mDAAO,CAAA;IACP,yFAA0B,CAAA;IAC1B,yFAA0B,CAAA;IAC1B,qDAAQ,CAAA;IACR,mDAAO,CAAA;IACP,6DAAY,CAAA;IACZ,uDAAS,CAAA;AACX,CAAC,EARW,WAAW,GAAX,mBAAW,KAAX,mBAAW,QAQtB;AAuCD,IAAY,cAKX;AALD,WAAY,cAAc;IACxB,iDAA+B,CAAA;IAC/B,iDAA+B,CAAA;IAC/B,qEAAmD,CAAA;IACnD,qEAAmD,CAAA;AACrD,CAAC,EALW,cAAc,GAAd,sBAAc,KAAd,sBAAc,QAKzB"}
|
|
@@ -14,6 +14,7 @@ const SUPPORTED_NETWORKS = [
|
|
|
14
14
|
constants_1.Network.POLYGON,
|
|
15
15
|
constants_1.Network.OPTIMISM,
|
|
16
16
|
constants_1.Network.ZKEVM,
|
|
17
|
+
constants_1.Network.GNOSIS,
|
|
17
18
|
];
|
|
18
19
|
const SUPPORTED_EXCHANGES = Object.keys(config_1.WethConfig);
|
|
19
20
|
const isSingleWrapRoute = (priceRoute) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WETHBytecodeBuilder.js","sourceRoot":"","sources":["../../src/executor/WETHBytecodeBuilder.ts"],"names":[],"mappings":";;;AAEA,oCAAwC;AAExC,+CAAgD;AAChD,
|
|
1
|
+
{"version":3,"file":"WETHBytecodeBuilder.js","sourceRoot":"","sources":["../../src/executor/WETHBytecodeBuilder.ts"],"names":[],"mappings":";;;AAEA,oCAAwC;AAExC,+CAAgD;AAChD,mCAAoC;AACpC,uEAAoE;AACpE,4CAAuC;AAEvC,MAAM,kBAAkB,GAAG;IACzB,mBAAO,CAAC,OAAO;IACf,mBAAO,CAAC,SAAS;IACjB,mBAAO,CAAC,GAAG;IACX,mBAAO,CAAC,IAAI;IACZ,mBAAO,CAAC,OAAO;IACf,mBAAO,CAAC,QAAQ;IAChB,mBAAO,CAAC,KAAK;IACb,mBAAO,CAAC,MAAM;CACf,CAAC;AACF,MAAM,mBAAmB,GAAG,MAAM,CAAC,IAAI,CAAC,mBAAU,CAAC,CAAC;AAE7C,MAAM,iBAAiB,GAAG,CAAC,UAAuB,EAAW,EAAE;IACpE,gEAAgE;IAEhE,MAAM,YAAY,GAChB,UAAU,CAAC,SAAS,CAAC,MAAM,KAAK,CAAC;QACjC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC;QAC1C,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,MAAM,KAAK,CAAC,CAAC;IAE9D,MAAM,EAAE,QAAQ,EAAE,GAAG,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;IAEvE,MAAM,cAAc,GAAG,mBAAmB,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;IAC9D,MAAM,gBAAgB,GAAG,kBAAkB,CAAC,QAAQ,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;IAEzE,MAAM,MAAM,GAAG,IAAA,oBAAY,EAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;IAEjD,OAAO,gBAAgB,IAAI,YAAY,IAAI,cAAc,IAAI,MAAM,CAAC;AACtE,CAAC,CAAC;AAhBW,QAAA,iBAAiB,qBAgB5B;AAEF;;GAEG;AACH,MAAa,mBAAoB,SAAQ,iDAAuB;IAAhE;;QACE,SAAI,GAAG,iBAAS,CAAC,IAAI,CAAC;IAcxB,CAAC;IAZQ,UAAU;QACf,OAAO,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,yBAAyB,CAAC;IAC9D,CAAC;IAEM,aAAa,CAClB,UAAuB,EACvB,cAAuC,EACvC,MAAc,EACd,iBAAyC;QAEzC,OAAO,IAAI,CAAC;IACd,CAAC;CACF;AAfD,kDAeC"}
|
package/package.json
CHANGED
package/src/config.ts
CHANGED
|
@@ -375,7 +375,6 @@ const baseConfigs: { [network: number]: BaseConfig } = {
|
|
|
375
375
|
PolygonZkEvmAdapter01: '0xd63B7691dD98fa89A2ea5e1604700489c585aa7B',
|
|
376
376
|
PolygonZkEvmBuyAdapter: '0xe2137168CdA486a2555E16c597905854C84F9127',
|
|
377
377
|
},
|
|
378
|
-
|
|
379
378
|
rpcPollingMaxAllowedStateDelayInBlocks: 0,
|
|
380
379
|
rpcPollingBlocksBackToTriggerUpdate: 0,
|
|
381
380
|
hashFlowAuthToken: process.env.API_KEY_HASHFLOW_AUTH_TOKEN || '',
|
|
@@ -387,6 +386,35 @@ const baseConfigs: { [network: number]: BaseConfig } = {
|
|
|
387
386
|
// FIXME: Not set properly
|
|
388
387
|
uniswapV2ExchangeRouterAddress: '',
|
|
389
388
|
},
|
|
389
|
+
[Network.GNOSIS]: {
|
|
390
|
+
network: Network.GNOSIS,
|
|
391
|
+
networkName: 'Gnosis',
|
|
392
|
+
isTestnet: false,
|
|
393
|
+
nativeTokenName: 'xDAI',
|
|
394
|
+
nativeTokenSymbol: 'XDAI',
|
|
395
|
+
wrappedNativeTokenAddress: '0xe91d153e0b41518a2ce8dd3d7944fa863463a97d',
|
|
396
|
+
hasEIP1559: false,
|
|
397
|
+
augustusAddress: '0x0000000000000000000000000000000000000000',
|
|
398
|
+
tokenTransferProxyAddress: '0x0000000000000000000000000000000000000000',
|
|
399
|
+
multicallV2Address: '0xca11bde05977b3631167028862be2a173976ca11',
|
|
400
|
+
privateHttpProvider: process.env.HTTP_PROVIDER_100,
|
|
401
|
+
adapterAddresses: {},
|
|
402
|
+
augustusRFQAddress: '0x92EaD5bACf6F0E995FA46Ad8215A9b11f67ca241',
|
|
403
|
+
augustusV6Address: '0x6a000f20005980200259b80c5102003040001068',
|
|
404
|
+
executorsAddresses: {
|
|
405
|
+
Executor01: '0x000010036c0190e009a000d0fc3541100a07380a',
|
|
406
|
+
Executor02: '0x00c600b30fb0400701010f4b080409018b9006e0',
|
|
407
|
+
Executor03: '0xe009f00e200a090090fc70e02d70b232000c0802',
|
|
408
|
+
},
|
|
409
|
+
rpcPollingMaxAllowedStateDelayInBlocks: 0,
|
|
410
|
+
rpcPollingBlocksBackToTriggerUpdate: 0,
|
|
411
|
+
hashFlowDisabledMMs: [],
|
|
412
|
+
uniswapV3EventLoggingSampleRate: 0,
|
|
413
|
+
rfqConfigs: {},
|
|
414
|
+
forceRpcFallbackDexs: [],
|
|
415
|
+
uniswapV2ExchangeRouterAddress:
|
|
416
|
+
'0xfa39c1c670b48956eeF9fd0BbD0E81A290326330',
|
|
417
|
+
},
|
|
390
418
|
[Network.BASE]: {
|
|
391
419
|
network: Network.BASE,
|
|
392
420
|
networkName: 'Base',
|
package/src/constants.ts
CHANGED
|
@@ -506,4 +506,73 @@ describe('AaveV3 E2E', () => {
|
|
|
506
506
|
);
|
|
507
507
|
});
|
|
508
508
|
});
|
|
509
|
+
|
|
510
|
+
describe('AaveV3 GNOSIS', () => {
|
|
511
|
+
const network = Network.GNOSIS;
|
|
512
|
+
const tokens = Tokens[network];
|
|
513
|
+
const holders = Holders[network];
|
|
514
|
+
const provider = new StaticJsonRpcProvider(
|
|
515
|
+
generateConfig(network).privateHttpProvider,
|
|
516
|
+
network,
|
|
517
|
+
);
|
|
518
|
+
|
|
519
|
+
const pairs = [
|
|
520
|
+
{
|
|
521
|
+
tokenSymbol: 'XDAI',
|
|
522
|
+
aTokenSymbol: 'aGnoWXDAI',
|
|
523
|
+
amount: '1000000000000000000',
|
|
524
|
+
},
|
|
525
|
+
{
|
|
526
|
+
tokenSymbol: 'USDC',
|
|
527
|
+
aTokenSymbol: 'aGnoUSDC',
|
|
528
|
+
amount: '10000000',
|
|
529
|
+
},
|
|
530
|
+
{
|
|
531
|
+
tokenSymbol: 'wstETH',
|
|
532
|
+
aTokenSymbol: 'aGnowstETH',
|
|
533
|
+
amount: '1000000000000000000',
|
|
534
|
+
},
|
|
535
|
+
];
|
|
536
|
+
|
|
537
|
+
const sideToContractMethods = new Map([
|
|
538
|
+
[SwapSide.SELL, [ContractMethod.swapExactAmountIn]],
|
|
539
|
+
[SwapSide.BUY, [ContractMethod.swapExactAmountOut]],
|
|
540
|
+
]);
|
|
541
|
+
|
|
542
|
+
pairs.forEach(pair => {
|
|
543
|
+
sideToContractMethods.forEach((contractMethods, side) =>
|
|
544
|
+
contractMethods.forEach((contractMethod: ContractMethod) => {
|
|
545
|
+
describe(`${contractMethod}`, () => {
|
|
546
|
+
it(pair.aTokenSymbol + ' -> ' + pair.tokenSymbol, async () => {
|
|
547
|
+
await testE2E(
|
|
548
|
+
tokens[pair.aTokenSymbol],
|
|
549
|
+
tokens[pair.tokenSymbol],
|
|
550
|
+
holders[pair.aTokenSymbol],
|
|
551
|
+
pair.amount,
|
|
552
|
+
side,
|
|
553
|
+
dexKey,
|
|
554
|
+
contractMethod,
|
|
555
|
+
network,
|
|
556
|
+
provider,
|
|
557
|
+
);
|
|
558
|
+
});
|
|
559
|
+
|
|
560
|
+
it(pair.tokenSymbol + ' -> ' + pair.aTokenSymbol, async () => {
|
|
561
|
+
await testE2E(
|
|
562
|
+
tokens[pair.tokenSymbol],
|
|
563
|
+
tokens[pair.aTokenSymbol],
|
|
564
|
+
holders[pair.tokenSymbol],
|
|
565
|
+
pair.amount,
|
|
566
|
+
side,
|
|
567
|
+
dexKey,
|
|
568
|
+
contractMethod,
|
|
569
|
+
network,
|
|
570
|
+
provider,
|
|
571
|
+
);
|
|
572
|
+
});
|
|
573
|
+
});
|
|
574
|
+
}),
|
|
575
|
+
);
|
|
576
|
+
});
|
|
577
|
+
});
|
|
509
578
|
});
|
|
@@ -60,7 +60,7 @@ export class AaveV3 extends SimpleExchange implements IDex<Data, Param> {
|
|
|
60
60
|
}
|
|
61
61
|
|
|
62
62
|
getAdapters(side: SwapSide): { name: string; index: number }[] | null {
|
|
63
|
-
return this.adapters[side];
|
|
63
|
+
return this.adapters?.[side] ?? null;
|
|
64
64
|
}
|
|
65
65
|
|
|
66
66
|
async initializePricing(blockNumber: number): Promise<void> {
|
|
@@ -11,6 +11,7 @@ import {
|
|
|
11
11
|
AaveV3Optimism,
|
|
12
12
|
AaveV3Polygon,
|
|
13
13
|
AaveV3PolygonZkEvm,
|
|
14
|
+
AaveV3Gnosis,
|
|
14
15
|
} from '@bgd-labs/aave-address-book';
|
|
15
16
|
|
|
16
17
|
// TODO: find vals for V3
|
|
@@ -70,6 +71,12 @@ export const Config: DexConfigMap<DexParam> = {
|
|
|
70
71
|
poolAddress: AaveV3PolygonZkEvm.POOL,
|
|
71
72
|
wethGatewayAddress: AaveV3PolygonZkEvm.WETH_GATEWAY,
|
|
72
73
|
},
|
|
74
|
+
[Network.GNOSIS]: {
|
|
75
|
+
ethGasCost: 246 * 100,
|
|
76
|
+
lendingGasCost: 328 * 1000,
|
|
77
|
+
poolAddress: AaveV3Gnosis.POOL,
|
|
78
|
+
wethGatewayAddress: AaveV3Gnosis.WETH_GATEWAY,
|
|
79
|
+
},
|
|
73
80
|
},
|
|
74
81
|
};
|
|
75
82
|
|
|
@@ -7,7 +7,7 @@ import {
|
|
|
7
7
|
AaveV3BNB,
|
|
8
8
|
AaveV3Base,
|
|
9
9
|
AaveV3Ethereum,
|
|
10
|
-
|
|
10
|
+
AaveV3Gnosis,
|
|
11
11
|
// AaveV3Metis,
|
|
12
12
|
AaveV3Optimism,
|
|
13
13
|
AaveV3Polygon,
|
|
@@ -37,9 +37,9 @@ export const AaveV3StataConfig: DexConfigMap<DexParams> = {
|
|
|
37
37
|
[Network.BSC]: {
|
|
38
38
|
factoryAddress: AaveV3BNB.STATIC_A_TOKEN_FACTORY,
|
|
39
39
|
},
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
40
|
+
[Network.GNOSIS]: {
|
|
41
|
+
factoryAddress: AaveV3Gnosis.STATIC_A_TOKEN_FACTORY,
|
|
42
|
+
},
|
|
43
43
|
// [Network.Scroll]: {
|
|
44
44
|
// factoryAddress: AaveV3Scroll.STATIC_A_TOKEN_FACTORY,
|
|
45
45
|
// },
|
|
@@ -288,4 +288,26 @@ describe('Algebra', () => {
|
|
|
288
288
|
nativeTokenAmount,
|
|
289
289
|
);
|
|
290
290
|
});
|
|
291
|
+
|
|
292
|
+
describe('SwaprV3', () => {
|
|
293
|
+
const dexKey = 'SwaprV3';
|
|
294
|
+
const network = Network.GNOSIS;
|
|
295
|
+
|
|
296
|
+
const tokenASymbol: string = 'WXDAI';
|
|
297
|
+
const tokenBSymbol: string = 'USDC';
|
|
298
|
+
|
|
299
|
+
const tokenAAmount: string = '1000000000000000000';
|
|
300
|
+
const tokenBAmount: string = '100000000';
|
|
301
|
+
const nativeTokenAmount = '1000000000000000000';
|
|
302
|
+
|
|
303
|
+
testForNetwork(
|
|
304
|
+
network,
|
|
305
|
+
dexKey,
|
|
306
|
+
tokenASymbol,
|
|
307
|
+
tokenBSymbol,
|
|
308
|
+
tokenAAmount,
|
|
309
|
+
tokenBAmount,
|
|
310
|
+
nativeTokenAmount,
|
|
311
|
+
);
|
|
312
|
+
});
|
|
291
313
|
});
|
|
@@ -32,7 +32,7 @@ export class AlgebraEventPoolV1_9_bidirectional_fee extends AlgebraEventPoolV1_1
|
|
|
32
32
|
mapKey,
|
|
33
33
|
poolInitCodeHash,
|
|
34
34
|
poolDeployer,
|
|
35
|
-
|
|
35
|
+
true, // forceManualStateGeneration; mainly used for xLayer
|
|
36
36
|
false, // areTicksCompressed
|
|
37
37
|
);
|
|
38
38
|
|
|
@@ -62,6 +62,8 @@ export const AlgebraConfig: DexConfigMap<DexParams> = {
|
|
|
62
62
|
subgraphURL: '3CA9ffebLkS3N2otXaSj8XaDDdspty75upBjKTUS79qY',
|
|
63
63
|
uniswapMulticall: '0x1F98415757620B543A52E61c46B32eB19261F984',
|
|
64
64
|
deployer: '0xc0d4323426c709e8d04b5b130e7f059523464a91',
|
|
65
|
+
// optimism fork uses v1.9-bidirectional-fee (with TickSpacing event and simple `fee` in globalState),
|
|
66
|
+
// not sure why v1.1 is used here
|
|
65
67
|
version: 'v1.1',
|
|
66
68
|
},
|
|
67
69
|
},
|
|
@@ -79,6 +81,25 @@ export const AlgebraConfig: DexConfigMap<DexParams> = {
|
|
|
79
81
|
uniswapMulticall: '0x1F98415757620B543A52E61c46B32eB19261F984',
|
|
80
82
|
deployer: '0x6dd3fb9653b10e806650f107c3b5a0a6ff974f65',
|
|
81
83
|
version: 'v1.9',
|
|
84
|
+
// looks like it isn't used as we override it with dexHelper.config.data.forceRpcFallbackDexs in constructor
|
|
85
|
+
forceRPC: true,
|
|
86
|
+
},
|
|
87
|
+
},
|
|
88
|
+
SwaprV3: {
|
|
89
|
+
[Network.GNOSIS]: {
|
|
90
|
+
factory: '0xA0864cCA6E114013AB0e27cbd5B6f4c8947da766',
|
|
91
|
+
router: '0xfFB643E73f280B97809A8b41f7232AB401a04ee1',
|
|
92
|
+
quoter: '0xcBaD9FDf0D2814659Eb26f600EFDeAF005Eda0F7',
|
|
93
|
+
initHash:
|
|
94
|
+
'0xbce37a54eab2fcd71913a0d40723e04238970e7fc1159bfd58ad5b79531697e7',
|
|
95
|
+
chunksCount: 10,
|
|
96
|
+
initRetryFrequency: 10,
|
|
97
|
+
// AlgebraStateMulticall
|
|
98
|
+
algebraStateMulticall: '0x49C46f7f88110ccA234ef27Cd664510f7bbF5998',
|
|
99
|
+
subgraphURL: 'AAA1vYjxwFHzbt6qKwLHNcDSASyr1J1xVViDH8gTMFMR',
|
|
100
|
+
uniswapMulticall: '0x4dfa9a980efE4802E969AC33968E3d6E59B8a19e',
|
|
101
|
+
deployer: '0xC1b576AC6Ec749d5Ace1787bF9Ec6340908ddB47',
|
|
102
|
+
version: 'v1.9-bidirectional-fee',
|
|
82
103
|
forceRPC: true,
|
|
83
104
|
},
|
|
84
105
|
},
|