@paraswap/dex-lib 3.8.37 → 3.8.38
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/cables/CablesMainnetRFQ.json +1073 -0
- package/build/dex/cables/cables.d.ts +64 -0
- package/build/dex/cables/cables.js +445 -0
- package/build/dex/cables/cables.js.map +1 -0
- package/build/dex/cables/config.d.ts +4 -0
- package/build/dex/cables/config.js +15 -0
- package/build/dex/cables/config.js.map +1 -0
- package/build/dex/cables/constants.d.ts +19 -0
- package/build/dex/cables/constants.js +26 -0
- package/build/dex/cables/constants.js.map +1 -0
- package/build/dex/cables/rate-fetcher.d.ts +34 -0
- package/build/dex/cables/rate-fetcher.js +117 -0
- package/build/dex/cables/rate-fetcher.js.map +1 -0
- package/build/dex/cables/types.d.ts +106 -0
- package/build/dex/cables/types.js +12 -0
- package/build/dex/cables/types.js.map +1 -0
- package/build/dex/cables/validators.d.ts +5 -0
- package/build/dex/cables/validators.js +49 -0
- package/build/dex/cables/validators.js.map +1 -0
- package/build/dex/spark/config.js +25 -0
- package/build/dex/spark/config.js.map +1 -1
- package/build/dex/spark/scripts/validate-state.js +1 -1
- package/build/dex/spark/scripts/validate-state.js.map +1 -1
- package/build/dex/spark/spark-sdai-pool.d.ts +7 -3
- package/build/dex/spark/spark-sdai-pool.js +24 -28
- package/build/dex/spark/spark-sdai-pool.js.map +1 -1
- package/build/dex/spark/spark.d.ts +10 -5
- package/build/dex/spark/spark.js +46 -31
- package/build/dex/spark/spark.js.map +1 -1
- package/build/dex/spark/types.d.ts +6 -0
- package/build/dex/spark/types.js.map +1 -1
- package/build/dex/spark/utils.d.ts +3 -1
- package/build/dex/spark/utils.js +43 -7
- package/build/dex/spark/utils.js.map +1 -1
- package/package.json +1 -1
- package/src/abi/sdai/SavingsUSDS.abi.json +720 -0
- package/src/dex/spark/config.ts +24 -0
- package/src/dex/spark/scripts/validate-state.ts +1 -0
- package/src/dex/spark/spark-e2e.test.ts +25 -21
- package/src/dex/spark/spark-events.test.ts +77 -62
- package/src/dex/spark/spark-integration.test.ts +290 -7
- package/src/dex/spark/spark-sdai-pool.ts +22 -19
- package/src/dex/spark/spark.ts +62 -36
- package/src/dex/spark/types.ts +6 -0
- package/src/dex/spark/utils.ts +83 -19
- package/tests/constants-e2e.ts +5 -0
package/build/dex/spark/spark.js
CHANGED
|
@@ -33,7 +33,6 @@ const constants_1 = require("../../constants");
|
|
|
33
33
|
const utils_1 = require("../../utils");
|
|
34
34
|
const config_1 = require("./config");
|
|
35
35
|
const CALLDATA_GAS_COST = __importStar(require("../../calldata-gas-cost"));
|
|
36
|
-
const pot_json_1 = __importDefault(require("../../abi/maker-psm/pot.json"));
|
|
37
36
|
const SavingsDai_abi_json_1 = __importDefault(require("../../abi/sdai/SavingsDai.abi.json"));
|
|
38
37
|
const utils_2 = require("ethers/lib/utils");
|
|
39
38
|
const spark_sdai_pool_1 = require("./spark-sdai-pool");
|
|
@@ -41,20 +40,21 @@ const bigint_constants_1 = require("../../bigint-constants");
|
|
|
41
40
|
const constants_2 = require("./constants");
|
|
42
41
|
const utils_3 = require("../../executor/utils");
|
|
43
42
|
class Spark extends simple_exchange_1.SimpleExchange {
|
|
44
|
-
constructor(network, dexKey, dexHelper, daiAddress = config_1.SDaiConfig[dexKey][network].daiAddress, sdaiAddress = config_1.SDaiConfig[dexKey][network].sdaiAddress, potAddress = config_1.SDaiConfig[dexKey][network].potAddress,
|
|
43
|
+
constructor(network, dexKey, dexHelper, daiAddress = config_1.SDaiConfig[dexKey][network].daiAddress, sdaiAddress = config_1.SDaiConfig[dexKey][network].sdaiAddress, potAddress = config_1.SDaiConfig[dexKey][network].potAddress, abiInterface = config_1.SDaiConfig[dexKey][network]
|
|
44
|
+
.poolInterface, adapters = config_1.Adapters[network] || {}, sdaiInterface = new utils_2.Interface(SavingsDai_abi_json_1.default)) {
|
|
45
45
|
super(dexHelper, dexKey);
|
|
46
46
|
this.network = network;
|
|
47
47
|
this.dexHelper = dexHelper;
|
|
48
48
|
this.daiAddress = daiAddress;
|
|
49
49
|
this.sdaiAddress = sdaiAddress;
|
|
50
50
|
this.potAddress = potAddress;
|
|
51
|
+
this.abiInterface = abiInterface;
|
|
51
52
|
this.adapters = adapters;
|
|
52
53
|
this.sdaiInterface = sdaiInterface;
|
|
53
|
-
this.potInterface = potInterface;
|
|
54
54
|
this.hasConstantPriceLargeAmounts = true;
|
|
55
55
|
this.isFeeOnTransferSupported = false;
|
|
56
56
|
this.logger = dexHelper.getLogger(dexKey);
|
|
57
|
-
this.eventPool = new spark_sdai_pool_1.SparkSDaiEventPool(this.dexKey, `${this.daiAddress}_${this.sdaiAddress}`, dexHelper, this.potAddress, this.
|
|
57
|
+
this.eventPool = new spark_sdai_pool_1.SparkSDaiEventPool(this.dexKey, this.network, `${this.daiAddress}_${this.sdaiAddress}`, dexHelper, this.potAddress, this.abiInterface, this.logger, config_1.SDaiConfig[dexKey][network].savingsRate.topic, config_1.SDaiConfig[dexKey][network].savingsRate.symbol);
|
|
58
58
|
}
|
|
59
59
|
getAdapters(side) {
|
|
60
60
|
return this.adapters[side] || null;
|
|
@@ -80,38 +80,38 @@ class Spark extends simple_exchange_1.SimpleExchange {
|
|
|
80
80
|
async getPricesVolume(srcToken, destToken, amounts, side, blockNumber, limitPools) {
|
|
81
81
|
if (!this.isAppropriatePair(srcToken, destToken))
|
|
82
82
|
return null;
|
|
83
|
-
|
|
83
|
+
const state = this.eventPool.getState(blockNumber);
|
|
84
|
+
if (!state)
|
|
84
85
|
return null;
|
|
86
|
+
const isSrcAsset = this.isDai(srcToken.address);
|
|
87
|
+
let calcFunction;
|
|
85
88
|
if (side === constants_1.SwapSide.SELL) {
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
unit: calcSellFn(blockNumber, bigint_constants_1.BI_POWS[18]),
|
|
93
|
-
gasCost: constants_2.SDAI_DEPOSIT_GAS_COST,
|
|
94
|
-
exchange: this.dexKey,
|
|
95
|
-
data: { exchange: `${this.sdaiAddress}` },
|
|
96
|
-
poolAddresses: [`${this.sdaiAddress}`],
|
|
97
|
-
},
|
|
98
|
-
];
|
|
89
|
+
if (isSrcAsset) {
|
|
90
|
+
calcFunction = this.previewDeposit.bind(this);
|
|
91
|
+
}
|
|
92
|
+
else {
|
|
93
|
+
calcFunction = this.previewRedeem.bind(this);
|
|
94
|
+
}
|
|
99
95
|
}
|
|
100
96
|
else {
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
unit: calcBuyFn(blockNumber, bigint_constants_1.BI_POWS[18]),
|
|
108
|
-
gasCost: constants_2.SDAI_REDEEM_GAS_COST,
|
|
109
|
-
exchange: this.dexKey,
|
|
110
|
-
data: { exchange: `${this.sdaiAddress}` },
|
|
111
|
-
poolAddresses: [`${this.sdaiAddress}`],
|
|
112
|
-
},
|
|
113
|
-
];
|
|
97
|
+
if (isSrcAsset) {
|
|
98
|
+
calcFunction = this.previewMint.bind(this);
|
|
99
|
+
}
|
|
100
|
+
else {
|
|
101
|
+
calcFunction = this.previewWithdraw.bind(this);
|
|
102
|
+
}
|
|
114
103
|
}
|
|
104
|
+
return [
|
|
105
|
+
{
|
|
106
|
+
// cannot produce 1:1 price without making an rpc call for block.timestamp and using it for price calculation in `calcChi` function
|
|
107
|
+
prices: amounts.map(amount => calcFunction(amount, state)),
|
|
108
|
+
unit: bigint_constants_1.BI_POWS[18],
|
|
109
|
+
gasCost: constants_2.SDAI_DEPOSIT_GAS_COST,
|
|
110
|
+
exchange: this.dexKey,
|
|
111
|
+
data: { exchange: `${this.sdaiAddress}` },
|
|
112
|
+
poolAddresses: [`${this.sdaiAddress}`],
|
|
113
|
+
},
|
|
114
|
+
];
|
|
115
115
|
}
|
|
116
116
|
// Returns estimated gas cost of calldata for this DEX in multiSwap
|
|
117
117
|
getCalldataGasCost(poolPrices) {
|
|
@@ -190,6 +190,21 @@ class Spark extends simple_exchange_1.SimpleExchange {
|
|
|
190
190
|
networkFee: '0',
|
|
191
191
|
};
|
|
192
192
|
}
|
|
193
|
+
previewRedeem(shares, state) {
|
|
194
|
+
return (shares * (0, spark_sdai_pool_1.calcChi)(state)) / spark_sdai_pool_1.RAY;
|
|
195
|
+
}
|
|
196
|
+
previewMint(shares, state) {
|
|
197
|
+
return this.divUp(shares * (0, spark_sdai_pool_1.calcChi)(state), spark_sdai_pool_1.RAY);
|
|
198
|
+
}
|
|
199
|
+
previewWithdraw(assets, state) {
|
|
200
|
+
return this.divUp(assets * spark_sdai_pool_1.RAY, (0, spark_sdai_pool_1.calcChi)(state));
|
|
201
|
+
}
|
|
202
|
+
previewDeposit(assets, state) {
|
|
203
|
+
return (assets * spark_sdai_pool_1.RAY) / (0, spark_sdai_pool_1.calcChi)(state);
|
|
204
|
+
}
|
|
205
|
+
divUp(x, y) {
|
|
206
|
+
return x !== 0n ? (x - 1n) / y + 1n : 0n;
|
|
207
|
+
}
|
|
193
208
|
}
|
|
194
209
|
exports.Spark = Spark;
|
|
195
210
|
Spark.dexKeysWithNetwork = (0, utils_1.getDexKeysWithNetwork)(config_1.SDaiConfig);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"spark.js","sourceRoot":"","sources":["../../../src/dex/spark/spark.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,wDAAoD;AAEpD,
|
|
1
|
+
{"version":3,"file":"spark.js","sourceRoot":"","sources":["../../../src/dex/spark/spark.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { Interface } from '@ethersproject/abi';
|
|
1
2
|
import { Address } from '../../types';
|
|
2
3
|
export declare type SparkData = {
|
|
3
4
|
exchange: Address;
|
|
@@ -6,6 +7,11 @@ export declare type SparkParams = {
|
|
|
6
7
|
sdaiAddress: Address;
|
|
7
8
|
daiAddress: Address;
|
|
8
9
|
potAddress: Address;
|
|
10
|
+
savingsRate: {
|
|
11
|
+
symbol: 'dsr' | 'ssr';
|
|
12
|
+
topic: string;
|
|
13
|
+
};
|
|
14
|
+
poolInterface: Interface;
|
|
9
15
|
};
|
|
10
16
|
export declare enum SparkSDaiFunctions {
|
|
11
17
|
deposit = "deposit",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/dex/spark/types.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/dex/spark/types.ts"],"names":[],"mappings":";;;AAgBA,IAAY,kBAKX;AALD,WAAY,kBAAkB;IAC5B,yCAAmB,CAAA;IACnB,uCAAiB,CAAA;IACjB,2CAAqB,CAAA;IACrB,mCAAa,CAAA;AACf,CAAC,EALW,kBAAkB,GAAlB,0BAAkB,KAAlB,0BAAkB,QAK7B"}
|
|
@@ -1,4 +1,6 @@
|
|
|
1
1
|
import { Contract } from 'web3-eth-contract';
|
|
2
2
|
import { SparkSDaiPoolState } from './types';
|
|
3
3
|
import { Interface } from '@ethersproject/abi';
|
|
4
|
-
export declare function getOnChainState(multiContract: Contract, potAddress: string, potInterface: Interface, blockNumber: number | 'latest'): Promise<SparkSDaiPoolState>;
|
|
4
|
+
export declare function getOnChainState(multiContract: Contract, potAddress: string, potInterface: Interface, savingsRateSymbol: 'dsr' | 'ssr', blockNumber: number | 'latest'): Promise<SparkSDaiPoolState>;
|
|
5
|
+
export declare function getOnChainStateSDAI(multiContract: Contract, potAddress: string, potInterface: Interface, blockNumber: number | 'latest'): Promise<SparkSDaiPoolState>;
|
|
6
|
+
export declare function getOnChainStateUSDS(multiContract: Contract, potAddress: string, potInterface: Interface, blockNumber: number | 'latest'): Promise<SparkSDaiPoolState>;
|
package/build/dex/spark/utils.js
CHANGED
|
@@ -1,14 +1,20 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.getOnChainState = void 0;
|
|
3
|
+
exports.getOnChainStateUSDS = exports.getOnChainStateSDAI = exports.getOnChainState = void 0;
|
|
4
4
|
const abi_1 = require("@ethersproject/abi");
|
|
5
5
|
const coder = new abi_1.AbiCoder();
|
|
6
|
-
// - `dsr`: the Dai Savings Rate
|
|
6
|
+
// - `dsr` || `ssr`: the Dai Savings Rate or USDS savings rate
|
|
7
7
|
// - `chi`: the Rate Accumulator
|
|
8
8
|
// - `rho`: time of last drip
|
|
9
|
-
async function getOnChainState(multiContract, potAddress, potInterface, blockNumber) {
|
|
10
|
-
|
|
11
|
-
|
|
9
|
+
async function getOnChainState(multiContract, potAddress, potInterface, savingsRateSymbol, blockNumber) {
|
|
10
|
+
if (savingsRateSymbol === 'dsr') {
|
|
11
|
+
return getOnChainStateSDAI(multiContract, potAddress, potInterface, blockNumber);
|
|
12
|
+
}
|
|
13
|
+
return getOnChainStateUSDS(multiContract, potAddress, potInterface, blockNumber);
|
|
14
|
+
}
|
|
15
|
+
exports.getOnChainState = getOnChainState;
|
|
16
|
+
async function getOnChainStateSDAI(multiContract, potAddress, potInterface, blockNumber) {
|
|
17
|
+
const calls = [
|
|
12
18
|
{
|
|
13
19
|
target: potAddress,
|
|
14
20
|
callData: potInterface.encodeFunctionData('dsr', []),
|
|
@@ -25,7 +31,9 @@ async function getOnChainState(multiContract, potAddress, potInterface, blockNum
|
|
|
25
31
|
target: potAddress,
|
|
26
32
|
callData: potInterface.encodeFunctionData('live', []),
|
|
27
33
|
},
|
|
28
|
-
]
|
|
34
|
+
];
|
|
35
|
+
const data = await multiContract.methods
|
|
36
|
+
.aggregate(calls)
|
|
29
37
|
.call({}, blockNumber);
|
|
30
38
|
const [dsr, chi, rho, live] = data.returnData.map(item => coder.decode(['uint256'], item)[0].toString());
|
|
31
39
|
return {
|
|
@@ -35,5 +43,33 @@ async function getOnChainState(multiContract, potAddress, potInterface, blockNum
|
|
|
35
43
|
rho,
|
|
36
44
|
};
|
|
37
45
|
}
|
|
38
|
-
exports.
|
|
46
|
+
exports.getOnChainStateSDAI = getOnChainStateSDAI;
|
|
47
|
+
async function getOnChainStateUSDS(multiContract, potAddress, potInterface, blockNumber) {
|
|
48
|
+
const calls = [
|
|
49
|
+
{
|
|
50
|
+
target: potAddress,
|
|
51
|
+
callData: potInterface.encodeFunctionData('ssr', []),
|
|
52
|
+
},
|
|
53
|
+
{
|
|
54
|
+
target: potAddress,
|
|
55
|
+
callData: potInterface.encodeFunctionData('chi', []),
|
|
56
|
+
},
|
|
57
|
+
{
|
|
58
|
+
target: potAddress,
|
|
59
|
+
callData: potInterface.encodeFunctionData('rho', []),
|
|
60
|
+
},
|
|
61
|
+
];
|
|
62
|
+
const data = await multiContract.methods
|
|
63
|
+
.aggregate(calls)
|
|
64
|
+
.call({}, blockNumber);
|
|
65
|
+
const [dsr, chi, rho] = data.returnData.map(item => coder.decode(['uint256'], item)[0].toString());
|
|
66
|
+
return {
|
|
67
|
+
// 'hack' - sUSDS doesn't have global shutdown and no notion of `live`, so it's always `live`
|
|
68
|
+
live: true,
|
|
69
|
+
dsr,
|
|
70
|
+
chi,
|
|
71
|
+
rho,
|
|
72
|
+
};
|
|
73
|
+
}
|
|
74
|
+
exports.getOnChainStateUSDS = getOnChainStateUSDS;
|
|
39
75
|
//# sourceMappingURL=utils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/dex/spark/utils.ts"],"names":[],"mappings":";;;AAEA,4CAAyD;AAEzD,MAAM,KAAK,GAAG,IAAI,cAAQ,EAAE,CAAC;AAE7B,
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/dex/spark/utils.ts"],"names":[],"mappings":"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"}
|