@paraswap/dex-lib 3.8.37 → 3.8.38

package/build/dex/cables/rate-fetcher.js

@@ -0,0 +1,117 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CablesRateFetcher = void 0;
+const fetcher_1 = require("../../lib/fetcher/fetcher");
+const validators_1 = require("../../lib/validators");
+const validators_2 = require("./validators");
+class CablesRateFetcher {
+    constructor(dexHelper, dexKey, network, logger, config) {
+        this.dexHelper = dexHelper;
+        this.dexKey = dexKey;
+        this.network = network;
+        this.logger = logger;
+        // Convert addresses to lowercase
+        this.normalizeAddressesToLowerCase = (jsonData) => {
+            Object.keys(jsonData).forEach(key => {
+                jsonData[key].address = jsonData[key].address.toLowerCase();
+            });
+            return jsonData;
+        };
+        this.tokensCacheKey = config.rateConfig.tokensCacheKey;
+        this.tokensCacheTTL = config.rateConfig.tokensCacheTTLSecs;
+        this.pairsCacheKey = config.rateConfig.pairsCacheKey;
+        this.pairsCacheTTL = config.rateConfig.pairsCacheTTLSecs;
+        this.pricesCacheKey = config.rateConfig.pricesCacheKey;
+        this.pricesCacheTTL = config.rateConfig.pricesCacheTTLSecs;
+        this.blacklistCacheKey = config.rateConfig.blacklistCacheKey;
+        this.blacklistCacheTTL = config.rateConfig.blacklistCacheTTLSecs;
+        this.pairsFetcher = new fetcher_1.Fetcher(dexHelper.httpRequest, {
+            info: {
+                requestOptions: config.rateConfig.pairsReqParams,
+                caster: (data) => {
+                    return (0, validators_1.validateAndCast)(data, validators_2.pairsResponseValidator);
+                },
+            },
+            handler: this.handlePairsResponse.bind(this),
+        }, config.rateConfig.pairsIntervalMs, logger);
+        this.pricesFetcher = new fetcher_1.Fetcher(dexHelper.httpRequest, {
+            info: {
+                requestOptions: config.rateConfig.pricesReqParams,
+                caster: (data) => {
+                    return (0, validators_1.validateAndCast)(data, validators_2.pricesResponseValidator);
+                },
+            },
+            handler: this.handlePricesResponse.bind(this),
+        }, config.rateConfig.pricesIntervalMs, logger);
+        this.blacklistFetcher = new fetcher_1.Fetcher(dexHelper.httpRequest, {
+            info: {
+                requestOptions: config.rateConfig.blacklistReqParams,
+                caster: (data) => {
+                    return (0, validators_1.validateAndCast)(data, validators_2.blacklistResponseValidator);
+                },
+            },
+            handler: this.handleBlacklistResponse.bind(this),
+        }, config.rateConfig.blacklistIntervalMs, logger);
+        this.tokensFetcher = new fetcher_1.Fetcher(dexHelper.httpRequest, {
+            info: {
+                requestOptions: config.rateConfig.tokensReqParams,
+                caster: (data) => {
+                    return (0, validators_1.validateAndCast)(data, validators_2.tokensResponseValidator);
+                },
+            },
+            handler: this.handleTokensResponse.bind(this),
+        }, config.rateConfig.tokensIntervalMs, logger);
+    }
+    /**
+     * Utils
+     */
+    start() {
+        this.pairsFetcher.startPolling();
+        this.pricesFetcher.startPolling();
+        this.blacklistFetcher.startPolling();
+        this.tokensFetcher.startPolling();
+    }
+    stop() {
+        this.pairsFetcher.stopPolling();
+        this.pricesFetcher.stopPolling();
+        this.blacklistFetcher.stopPolling();
+        this.tokensFetcher.stopPolling();
+    }
+    handlePairsResponse(res) {
+        const networkId = String(this.network);
+        const pairs = res.pairs[networkId];
+        // console.log("===> pairs DEBUG:", pairs);
+        // process.exit(0);
+        let normalized_pairs = {};
+        Object.keys(pairs).forEach(key => {
+            normalized_pairs[key.toLowerCase()] = pairs[key];
+        });
+        this.dexHelper.cache.setex(this.dexKey, this.network, this.pairsCacheKey, this.pairsCacheTTL, JSON.stringify(normalized_pairs));
+    }
+    handlePricesResponse(res) {
+        // console.log('PRICES RESPONSE', res);
+        // console.log(JSON.stringify(res))
+        // console.log('Network:', this.network);
+        // process.exit(0);
+        const networkId = String(this.network);
+        const prices = res.prices[networkId];
+        // console.log("===> prices DEBUG:", prices);
+        // process.exit(0);
+        this.dexHelper.cache.setex(this.dexKey, this.network, this.pricesCacheKey, this.pricesCacheTTL, JSON.stringify(prices));
+    }
+    handleBlacklistResponse(res) {
+        const { blacklist } = res;
+        this.dexHelper.cache.setex(this.dexKey, this.network, this.blacklistCacheKey, this.blacklistCacheTTL, JSON.stringify(blacklist.map(item => item.toLowerCase())));
+    }
+    handleTokensResponse(res) {
+        const networkId = String(this.network);
+        const tokens = res.tokens[networkId];
+        // console.log("===> tokens DEBUG:", tokens);
+        const normalized_tokens = this.normalizeAddressesToLowerCase(tokens);
+        // console.log("===> tokens DEBUG:", normalized_tokens);
+        // process.exit(0);
+        this.dexHelper.cache.setex(this.dexKey, this.network, this.tokensCacheKey, this.tokensCacheTTL, JSON.stringify(normalized_tokens));
+    }
+}
+exports.CablesRateFetcher = CablesRateFetcher;
+//# sourceMappingURL=rate-fetcher.js.map

package/build/dex/cables/rate-fetcher.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"rate-fetcher.js","sourceRoot":"","sources":["../../../src/dex/cables/rate-fetcher.ts"],"names":[],"mappings":"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"}

package/build/dex/cables/types.d.ts

@@ -0,0 +1,106 @@
+import { RequestHeaders } from '../../dex-helper';
+import { Token } from '../../types';
+import { Method } from '../../dex-helper/irequest-wrapper';
+import { AugustusRFQOrderData } from '../augustus-rfq';
+export declare type CablesRFQResponse = {
+    order: AugustusRFQOrderData;
+    signature: string;
+};
+export declare type CablesData = {
+    quoteData?: AugustusRFQOrderData;
+};
+export declare enum OrderbookSide {
+    bids = "bids",
+    asks = "asks"
+}
+/**
+ * Utils
+ */
+export declare type CablesAPIParameters = {
+    url: string;
+    method: Method;
+};
+export declare class CablesRfqError extends Error {
+}
+/**
+ * Types
+ */
+export declare type PairData = {
+    base: string;
+    quote: string;
+    liquidityUSD: number;
+};
+export declare type PriceAndAmount = [string, string];
+export declare type PriceData = {
+    bids: PriceAndAmount[];
+    asks: PriceAndAmount[];
+};
+export declare type PriceDataMap = {
+    [network: string]: {
+        [pair: string]: PriceData;
+    };
+};
+export declare type TokenDataMap = {
+    [network: string]: {
+        [token: string]: Token;
+    };
+};
+export declare type PairsDataMap = {
+    [network: string]: {
+        [token: string]: PairData;
+    };
+};
+/**
+ * Responses
+ */
+export declare type CablesPricesResponse = {
+    prices: PriceDataMap;
+};
+export declare type CablesBlacklistResponse = {
+    blacklist: string[];
+};
+export declare type CablesTokensResponse = {
+    tokens: TokenDataMap;
+};
+export declare type CablesPairsResponse = {
+    pairs: PairsDataMap;
+};
+/**
+ * Rate Fetcher
+ */
+export declare type CablesRateFetcherConfig = {
+    rateConfig: {
+        pairsReqParams: {
+            url: string;
+            headers?: RequestHeaders;
+            params?: any;
+        };
+        pricesReqParams: {
+            url: string;
+            headers?: RequestHeaders;
+            params?: any;
+        };
+        blacklistReqParams: {
+            url: string;
+            headers?: RequestHeaders;
+            params?: any;
+        };
+        tokensReqParams: {
+            url: string;
+            headers?: RequestHeaders;
+            params?: any;
+        };
+        pairsIntervalMs: number;
+        pricesIntervalMs: number;
+        blacklistIntervalMs: number;
+        tokensIntervalMs: number;
+        pairsCacheKey: string;
+        pricesCacheKey: string;
+        blacklistCacheKey: string;
+        tokensCacheKey: string;
+        blacklistCacheTTLSecs: number;
+        pairsCacheTTLSecs: number;
+        pricesCacheTTLSecs: number;
+        tokensCacheTTLSecs: number;
+    };
+};

package/build/dex/cables/types.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CablesRfqError = exports.OrderbookSide = void 0;
+var OrderbookSide;
+(function (OrderbookSide) {
+    OrderbookSide["bids"] = "bids";
+    OrderbookSide["asks"] = "asks";
+})(OrderbookSide = exports.OrderbookSide || (exports.OrderbookSide = {}));
+class CablesRfqError extends Error {
+}
+exports.CablesRfqError = CablesRfqError;
+//# sourceMappingURL=types.js.map

package/build/dex/cables/types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/dex/cables/types.ts"],"names":[],"mappings":";;;AAcA,IAAY,aAGX;AAHD,WAAY,aAAa;IACvB,8BAAa,CAAA;IACb,8BAAa,CAAA;AACf,CAAC,EAHW,aAAa,GAAb,qBAAa,KAAb,qBAAa,QAGxB;AASD,MAAa,cAAe,SAAQ,KAAK;CAAG;AAA5C,wCAA4C"}

package/build/dex/cables/validators.d.ts

@@ -0,0 +1,5 @@
+import joi from 'joi';
+export declare const pairsResponseValidator: joi.ObjectSchema<any>;
+export declare const pricesResponseValidator: joi.ObjectSchema<any>;
+export declare const tokensResponseValidator: joi.ObjectSchema<any>;
+export declare const blacklistResponseValidator: joi.ObjectSchema<any>;

package/build/dex/cables/validators.js

@@ -0,0 +1,49 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.blacklistResponseValidator = exports.tokensResponseValidator = exports.pricesResponseValidator = exports.pairsResponseValidator = void 0;
+const joi_1 = __importDefault(require("joi"));
+const pairValidator = joi_1.default.object({
+    base: joi_1.default.string().min(1),
+    quote: joi_1.default.string().min(1),
+    liquidityUSD: joi_1.default.number().min(0),
+    baseAddress: joi_1.default.string().min(1),
+    quoteAddress: joi_1.default.string().min(1),
+    baseDecimals: joi_1.default.number().min(0),
+    quoteDecimals: joi_1.default.number().min(0),
+});
+const pairMap = joi_1.default.object().pattern(joi_1.default.string(), // Pair name ETH/USDT
+pairValidator);
+exports.pairsResponseValidator = joi_1.default.object({
+    pairs: joi_1.default.object().pattern(joi_1.default.string(), // chain id
+    pairMap),
+});
+const orderbookEntry = joi_1.default.array().items(joi_1.default.string().min(1)).length(2);
+const orderbookValidator = joi_1.default.object({
+    bids: joi_1.default.array().items(orderbookEntry),
+    asks: joi_1.default.array().items(orderbookEntry),
+});
+const chainDataSchema = joi_1.default.object().pattern(joi_1.default.string(), // pair name USDC/USDT
+orderbookValidator);
+exports.pricesResponseValidator = joi_1.default.object({
+    prices: joi_1.default.object().pattern(joi_1.default.string(), // chain id
+    chainDataSchema),
+});
+const tokenValidator = joi_1.default.object({
+    symbol: joi_1.default.string().min(1),
+    name: joi_1.default.string().min(1),
+    description: joi_1.default.string().min(1),
+    address: joi_1.default.string().min(1),
+    decimals: joi_1.default.number().min(0),
+    type: joi_1.default.string().min(1),
+});
+const chainTokens = joi_1.default.object().pattern(joi_1.default.string(), tokenValidator);
+exports.tokensResponseValidator = joi_1.default.object({
+    tokens: joi_1.default.object().pattern(joi_1.default.string(), chainTokens),
+});
+exports.blacklistResponseValidator = joi_1.default.object({
+    blacklist: joi_1.default.array().items(joi_1.default.string().min(1)),
+});
+//# sourceMappingURL=validators.js.map

package/build/dex/cables/validators.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"validators.js","sourceRoot":"","sources":["../../../src/dex/cables/validators.ts"],"names":[],"mappings":";;;;;;AAAA,8CAAsB;AAEtB,MAAM,aAAa,GAAG,aAAG,CAAC,MAAM,CAAC;IAC/B,IAAI,EAAE,aAAG,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;IACzB,KAAK,EAAE,aAAG,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;IAC1B,YAAY,EAAE,aAAG,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;IACjC,WAAW,EAAE,aAAG,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;IAChC,YAAY,EAAE,aAAG,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;IACjC,YAAY,EAAE,aAAG,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;IACjC,aAAa,EAAE,aAAG,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;CACnC,CAAC,CAAC;AAEH,MAAM,OAAO,GAAG,aAAG,CAAC,MAAM,EAAE,CAAC,OAAO,CAClC,aAAG,CAAC,MAAM,EAAE,EAAE,qBAAqB;AACnC,aAAa,CACd,CAAC;AAEW,QAAA,sBAAsB,GAAG,aAAG,CAAC,MAAM,CAAC;IAC/C,KAAK,EAAE,aAAG,CAAC,MAAM,EAAE,CAAC,OAAO,CACzB,aAAG,CAAC,MAAM,EAAE,EAAE,WAAW;IACzB,OAAO,CACR;CACF,CAAC,CAAC;AAEH,MAAM,cAAc,GAAG,aAAG,CAAC,KAAK,EAAE,CAAC,KAAK,CAAC,aAAG,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;AAExE,MAAM,kBAAkB,GAAG,aAAG,CAAC,MAAM,CAAC;IACpC,IAAI,EAAE,aAAG,CAAC,KAAK,EAAE,CAAC,KAAK,CAAC,cAAc,CAAC;IACvC,IAAI,EAAE,aAAG,CAAC,KAAK,EAAE,CAAC,KAAK,CAAC,cAAc,CAAC;CACxC,CAAC,CAAC;AAEH,MAAM,eAAe,GAAG,aAAG,CAAC,MAAM,EAAE,CAAC,OAAO,CAC1C,aAAG,CAAC,MAAM,EAAE,EAAE,sBAAsB;AACpC,kBAAkB,CACnB,CAAC;AAEW,QAAA,uBAAuB,GAAG,aAAG,CAAC,MAAM,CAAC;IAChD,MAAM,EAAE,aAAG,CAAC,MAAM,EAAE,CAAC,OAAO,CAC1B,aAAG,CAAC,MAAM,EAAE,EAAE,WAAW;IACzB,eAAe,CAChB;CACF,CAAC,CAAC;AAEH,MAAM,cAAc,GAAG,aAAG,CAAC,MAAM,CAAC;IAChC,MAAM,EAAE,aAAG,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;IAC3B,IAAI,EAAE,aAAG,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;IACzB,WAAW,EAAE,aAAG,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;IAChC,OAAO,EAAE,aAAG,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;IAC5B,QAAQ,EAAE,aAAG,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;IAC7B,IAAI,EAAE,aAAG,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;CAC1B,CAAC,CAAC;AAEH,MAAM,WAAW,GAAG,aAAG,CAAC,MAAM,EAAE,CAAC,OAAO,CAAC,aAAG,CAAC,MAAM,EAAE,EAAE,cAAc,CAAC,CAAC;AAE1D,QAAA,uBAAuB,GAAG,aAAG,CAAC,MAAM,CAAC;IAChD,MAAM,EAAE,aAAG,CAAC,MAAM,EAAE,CAAC,OAAO,CAAC,aAAG,CAAC,MAAM,EAAE,EAAE,WAAW,CAAC;CACxD,CAAC,CAAC;AAEU,QAAA,0BAA0B,GAAG,aAAG,CAAC,MAAM,CAAC;IACnD,SAAS,EAAE,aAAG,CAAC,KAAK,EAAE,CAAC,KAAK,CAAC,aAAG,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;CAClD,CAAC,CAAC"}

package/build/dex/spark/config.js

@@ -1,14 +1,39 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Adapters = exports.SDaiConfig = void 0;
 const constants_1 = require("../../constants");
 const core_1 = require("@paraswap/core");
+const pot_json_1 = __importDefault(require("../../abi/maker-psm/pot.json"));
+const SavingsUSDS_abi_json_1 = __importDefault(require("../../abi/sdai/SavingsUSDS.abi.json"));
+const abi_1 = require("@ethersproject/abi");
 exports.SDaiConfig = {
     Spark: {
         [constants_1.Network.MAINNET]: {
             sdaiAddress: '0x83F20F44975D03b1b09e64809B757c47f942BEeA',
             daiAddress: '0x6B175474E89094C44Da98b954EedeAC495271d0F',
             potAddress: '0x197E90f9FAD81970bA7976f33CbD77088E5D7cf7',
+            savingsRate: {
+                symbol: 'dsr',
+                // bytes32 repr of "dsr" string
+                topic: '0x6473720000000000000000000000000000000000000000000000000000000000',
+            },
+            poolInterface: new abi_1.Interface(pot_json_1.default),
+        },
+    },
+    sUSDS: {
+        [constants_1.Network.MAINNET]: {
+            sdaiAddress: '0xa3931d71877C0E7a3148CB7Eb4463524FEc27fbD',
+            daiAddress: '0xdC035D45d973E3EC169d2276DDab16f1e407384F',
+            potAddress: '0xa3931d71877C0E7a3148CB7Eb4463524FEc27fbD',
+            savingsRate: {
+                symbol: 'ssr',
+                // bytes32 repr of "ssr" string
+                topic: '0x7373720000000000000000000000000000000000000000000000000000000000',
+            },
+            poolInterface: new abi_1.Interface(SavingsUSDS_abi_json_1.default),
         },
     },
 };

package/build/dex/spark/config.js.map

@@ -1 +1 @@
-{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/dex/spark/config.ts"],"names":[],"mappings":";;;AAEA,+CAA0C;AAC1C,yCAA0C;AAE7B,QAAA,UAAU,GAA8B;IACnD,KAAK,EAAE;QACL,CAAC,mBAAO,CAAC,OAAO,CAAC,EAAE;YACjB,WAAW,EAAE,4CAA4C;YACzD,UAAU,EAAE,4CAA4C;YACxD,UAAU,EAAE,4CAA4C;SACzD;KACF;CACF,CAAC;AAEW,QAAA,QAAQ,GAIjB;IACF,CAAC,mBAAO,CAAC,OAAO,CAAC,EAAE;QACjB,CAAC,eAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC;QAClD,CAAC,eAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,cAAc,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC;KACrD;CACF,CAAC"}
+{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/dex/spark/config.ts"],"names":[],"mappings":";;;;;;AAEA,+CAA0C;AAC1C,yCAA0C;AAC1C,4EAAkD;AAClD,+FAAiE;AACjE,4CAA+C;AAElC,QAAA,UAAU,GAA8B;IACnD,KAAK,EAAE;QACL,CAAC,mBAAO,CAAC,OAAO,CAAC,EAAE;YACjB,WAAW,EAAE,4CAA4C;YACzD,UAAU,EAAE,4CAA4C;YACxD,UAAU,EAAE,4CAA4C;YACxD,WAAW,EAAE;gBACX,MAAM,EAAE,KAAK;gBACb,+BAA+B;gBAC/B,KAAK,EACH,oEAAoE;aACvE;YACD,aAAa,EAAE,IAAI,eAAS,CAAC,kBAAM,CAAC;SACrC;KACF;IACD,KAAK,EAAE;QACL,CAAC,mBAAO,CAAC,OAAO,CAAC,EAAE;YACjB,WAAW,EAAE,4CAA4C;YACzD,UAAU,EAAE,4CAA4C;YACxD,UAAU,EAAE,4CAA4C;YACxD,WAAW,EAAE;gBACX,MAAM,EAAE,KAAK;gBACb,+BAA+B;gBAC/B,KAAK,EACH,oEAAoE;aACvE;YACD,aAAa,EAAE,IAAI,eAAS,CAAC,8BAAc,CAAC;SAC7C;KACF;CACF,CAAC;AAEW,QAAA,QAAQ,GAIjB;IACF,CAAC,mBAAO,CAAC,OAAO,CAAC,EAAE;QACjB,CAAC,eAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC;QAClD,CAAC,eAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,cAAc,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC;KACrD;CACF,CAAC"}

package/build/dex/spark/scripts/validate-state.js

@@ -48,7 +48,7 @@ function compareAndLogDifferences(obj1, obj2, keyNames, checkEachKey = false) {
     return isValid;
 }
 async function isPoolStateEqualToReal(state, blockNumber) {
-    const expected = await (0, utils_1.getOnChainState)(dexHelper.multiContract, potAddress, new abi_1.Interface(pot_json_1.default), blockNumber);
+    const expected = await (0, utils_1.getOnChainState)(dexHelper.multiContract, potAddress, new abi_1.Interface(pot_json_1.default), 'dsr', blockNumber);
     const isValidState = compareAndLogDifferences(state, expected, [
         'rho',
         'dsr',

package/build/dex/spark/scripts/validate-state.js.map

@@ -1 +1 @@
-{"version":3,"file":"validate-state.js","sourceRoot":"","sources":["../../../../src/dex/spark/scripts/validate-state.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"validate-state.js","sourceRoot":"","sources":["../../../../src/dex/spark/scripts/validate-state.ts"],"names":[],"mappings":"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"}

package/build/dex/spark/spark-sdai-pool.d.ts

@@ -4,13 +4,17 @@ import type { IDexHelper } from '../../dex-helper';
 import type { AsyncOrSync, DeepReadonly } from 'ts-essentials';
 import type { Address, BlockHeader, Log, Logger } from '../../types';
 import type { SparkSDaiPoolState } from './types';
+import { Network } from '../../constants';
+export declare const RAY: bigint;
+export declare const calcChi: (state: SparkSDaiPoolState, currentTimestamp?: number | undefined) => bigint;
 export declare class SparkSDaiEventPool extends StatefulEventSubscriber<SparkSDaiPoolState> {
     protected dexHelper: IDexHelper;
     private potAddress;
     private potInterface;
-    constructor(parentName: string, poolName: string, dexHelper: IDexHelper, potAddress: Address, potInterface: Interface, logger: Logger);
+    private savingsRateTopic;
+    private savingsRateSymbol;
+    constructor(parentName: string, network: Network, poolName: string, dexHelper: IDexHelper, potAddress: Address, potInterface: Interface, logger: Logger, savingsRateTopic: string, savingsRateSymbol: 'ssr' | 'dsr');
     protected processLog(state: DeepReadonly<SparkSDaiPoolState>, log: Readonly<Log>, blockHeader: Readonly<BlockHeader>): AsyncOrSync<DeepReadonly<SparkSDaiPoolState> | null>;
     generateState(blockNumber?: number | 'latest'): Promise<DeepReadonly<SparkSDaiPoolState>>;
-    convertToSDai(daiAmount: bigint, blockNumber: number): bigint;
-    convertToDai(sdaiAmount: bigint, blockNumber: number): bigint;
+    getOrGenerateState(blockNumber: number): Promise<SparkSDaiPoolState>;
 }

package/build/dex/spark/spark-sdai-pool.js

@@ -1,31 +1,27 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SparkSDaiEventPool = void 0;
+exports.SparkSDaiEventPool = exports.calcChi = exports.RAY = void 0;
 const bigint_constants_1 = require("../../bigint-constants");
 const stateful_event_subscriber_1 = require("../../stateful-event-subscriber");
 const utils_1 = require("./utils");
-const RAY = bigint_constants_1.BI_POWS[27];
+exports.RAY = bigint_constants_1.BI_POWS[27];
 const ZERO = BigInt(0);
 const TWO = BigInt(2);
-const HALF = RAY / TWO;
+const HALF = exports.RAY / TWO;
 // function file(bytes32,uint256)
 const FILE_TOPICHASH = `0x29ae811400000000000000000000000000000000000000000000000000000000`;
 // function drip()
 const DRIP_TOPICHASH = `0x9f678cca00000000000000000000000000000000000000000000000000000000`;
-// function cage()
-const CAGE_TOPICHASH = `0x6924500900000000000000000000000000000000000000000000000000000000`;
-// bytes32 repr of "dsr" string
-const DSR_TOPIC = `0x6473720000000000000000000000000000000000000000000000000000000000`;
 const rpow = (x, n) => {
     if (!x && !n)
-        return RAY;
+        return exports.RAY;
     if (!x)
         return ZERO;
-    let z = n % TWO > ZERO ? x : RAY;
+    let z = n % TWO > ZERO ? x : exports.RAY;
     for (n = n / TWO; n; n /= TWO) {
-        x = (x * x + HALF) / RAY;
+        x = (x * x + HALF) / exports.RAY;
         if (n % TWO > ZERO) {
-            z = (z * x + HALF) / RAY;
+            z = (z * x + HALF) / exports.RAY;
         }
     }
     return z;
@@ -33,24 +29,28 @@ const rpow = (x, n) => {
 const calcChi = (state, currentTimestamp) => {
     currentTimestamp || (currentTimestamp = Math.floor(Date.now() / 1000));
     if (!state.live)
-        return RAY;
+        return exports.RAY;
     const { dsr: dsr_, chi: chi_, rho: rho_ } = state;
     const now = BigInt(currentTimestamp);
     const rho = BigInt(rho_);
     const dsr = BigInt(dsr_);
     const chi = BigInt(chi_);
-    return now > rho ? (rpow(dsr, now - rho) * chi) / RAY : chi;
+    return now > rho ? (rpow(dsr, now - rho) * chi) / exports.RAY : chi;
 };
+exports.calcChi = calcChi;
 class SparkSDaiEventPool extends stateful_event_subscriber_1.StatefulEventSubscriber {
-    constructor(parentName, poolName, dexHelper, potAddress, potInterface, logger) {
+    constructor(parentName, network, poolName, dexHelper, potAddress, potInterface, logger, savingsRateTopic, savingsRateSymbol) {
         super(parentName, poolName, dexHelper, logger);
         this.dexHelper = dexHelper;
         this.potAddress = potAddress;
         this.potInterface = potInterface;
+        this.savingsRateTopic = savingsRateTopic;
+        this.savingsRateSymbol = savingsRateSymbol;
         this.addressesSubscribed = [potAddress];
     }
     processLog(state, log, blockHeader) {
-        if (log.topics[0] === FILE_TOPICHASH && log.topics[2] === DSR_TOPIC) {
+        if (log.topics[0] === FILE_TOPICHASH &&
+            log.topics[2] === this.savingsRateTopic) {
             return {
                 ...state,
                 dsr: BigInt(log.topics[3]).toString(),
@@ -60,25 +60,21 @@ class SparkSDaiEventPool extends stateful_event_subscriber_1.StatefulEventSubscr
             return {
                 ...state,
                 rho: blockHeader.timestamp.toString(),
-                chi: calcChi(state, +blockHeader.timestamp).toString(),
+                chi: (0, exports.calcChi)(state, +blockHeader.timestamp).toString(),
             };
         }
         return null;
     }
     async generateState(blockNumber = 'latest') {
-        return (0, utils_1.getOnChainState)(this.dexHelper.multiContract, this.potAddress, this.potInterface, blockNumber);
+        return (0, utils_1.getOnChainState)(this.dexHelper.multiContract, this.potAddress, this.potInterface, this.savingsRateSymbol, blockNumber);
     }
-    convertToSDai(daiAmount, blockNumber) {
-        const state = this.getState(blockNumber);
-        if (!state)
-            throw new Error(`SDai state at ${blockNumber} does not exists`);
-        return (daiAmount * RAY) / calcChi(state);
-    }
-    convertToDai(sdaiAmount, blockNumber) {
-        const state = this.getState(blockNumber);
-        if (!state)
-            throw new Error(`SDai state at ${blockNumber} does not exists`);
-        return (sdaiAmount * calcChi(state)) / RAY;
+    async getOrGenerateState(blockNumber) {
+        let state = this.getState(blockNumber);
+        if (!state) {
+            state = await this.generateState(blockNumber);
+            this.setState(state, blockNumber);
+        }
+        return state;
     }
 }
 exports.SparkSDaiEventPool = SparkSDaiEventPool;

package/build/dex/spark/spark-sdai-pool.js.map

@@ -1 +1 @@
-{"version":3,"file":"spark-sdai-pool.js","sourceRoot":"","sources":["../../../src/dex/spark/spark-sdai-pool.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"spark-sdai-pool.js","sourceRoot":"","sources":["../../../src/dex/spark/spark-sdai-pool.ts"],"names":[],"mappings":"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"}

package/build/dex/spark/spark.d.ts

@@ -1,6 +1,6 @@
 import { SimpleExchange } from '../simple-exchange';
 import { Context, IDex } from '../idex';
-import { SparkParams, SparkData } from './types';
+import { SparkParams, SparkData, SparkSDaiPoolState } from './types';
 import { Network, SwapSide } from '../../constants';
 import { AdapterExchangeParam, Address, DexExchangeParam, ExchangePrices, Logger, NumberAsString, PoolLiquidity, PoolPrices, SimpleExchangeParam, Token } from '../../types';
 import { IDexHelper } from '../../dex-helper';
@@ -8,10 +8,11 @@ import { Interface } from 'ethers/lib/utils';
 import { SparkSDaiEventPool } from './spark-sdai-pool';
 export declare class Spark extends SimpleExchange implements IDex<SparkData, SparkParams> {
     protected network: Network;
-    protected dexHelper: IDexHelper;
+    readonly dexHelper: IDexHelper;
     readonly daiAddress: string;
     readonly sdaiAddress: string;
     readonly potAddress: string;
+    readonly abiInterface: Interface;
     protected adapters: {
         [side: string]: {
             name: string;
@@ -19,7 +20,6 @@ export declare class Spark extends SimpleExchange implements IDex<SparkData, Spa
         }[];
     };
     protected sdaiInterface: Interface;
-    protected potInterface: Interface;
     readonly hasConstantPriceLargeAmounts = true;
     readonly isFeeOnTransferSupported = false;
     static dexKeysWithNetwork: {
@@ -28,12 +28,12 @@ export declare class Spark extends SimpleExchange implements IDex<SparkData, Spa
     }[];
     readonly eventPool: SparkSDaiEventPool;
     logger: Logger;
-    constructor(network: Network, dexKey: string, dexHelper: IDexHelper, daiAddress?: string, sdaiAddress?: string, potAddress?: string, adapters?: {
+    constructor(network: Network, dexKey: string, dexHelper: IDexHelper, daiAddress?: string, sdaiAddress?: string, potAddress?: string, abiInterface?: Interface, adapters?: {
         [side: string]: {
             name: string;
             index: number;
         }[];
-    }, sdaiInterface?: Interface, potInterface?: Interface);
+    }, sdaiInterface?: Interface);
     getAdapters(side: SwapSide): {
         name: string;
         index: number;
@@ -49,4 +49,9 @@ export declare class Spark extends SimpleExchange implements IDex<SparkData, Spa
     getSimpleParam(srcToken: string, destToken: string, srcAmount: string, destAmount: string, data: SparkData, side: SwapSide): Promise<SimpleExchangeParam>;
     getDexParam(srcToken: Address, destToken: Address, srcAmount: NumberAsString, destAmount: NumberAsString, recipient: Address, data: SparkData, side: SwapSide, _: Context, executorAddress: Address): DexExchangeParam;
     getAdapterParam(srcToken: string, destToken: string, srcAmount: string, destAmount: string, data: SparkData, side: SwapSide): AdapterExchangeParam;
+    previewRedeem(shares: bigint, state: SparkSDaiPoolState): bigint;
+    previewMint(shares: bigint, state: SparkSDaiPoolState): bigint;
+    previewWithdraw(assets: bigint, state: SparkSDaiPoolState): bigint;
+    previewDeposit(assets: bigint, state: SparkSDaiPoolState): bigint;
+    divUp(x: bigint, y: bigint): bigint;
 }