@paraswap/dex-lib 3.8.37 → 3.8.39-bebop

package/src/dex/woo-fi-v2/woo-fi-v2-pool.ts

@@ -26,8 +26,7 @@ export class WooFiV2PollingPool extends StatefulRpcPoller<
     poolIdentifier: string,
     dexHelper: IDexHelper,
     protected config: DexParams,
-    // It already includes quoteToken
-    protected tokens: Token[],
+    protected baseTokens: Token[],
   ) {
     const callbacks = pollingManagerCbExtractor(
       StatePollingManager.getInstance(dexHelper),
@@ -50,37 +49,66 @@ export class WooFiV2PollingPool extends StatefulRpcPoller<
           decodeFunction: uint256ToBigInt,
         },
       ] as MultiCallParams<MulticallResultOutputs>[]
-    ).concat(
-      this.tokens
-        .map(t => [
-          {
-            target: this.config.wooPPV2Address,
-            callData: ifaces.PPV2.encodeFunctionData('tokenInfos', [t.address]),
-            decodeFunction: tokenInfoDecoder,
-          },
-          {
-            target: this.config.wooPPV2Address,
-            callData: ifaces.PPV2.encodeFunctionData('decimalInfo', [
-              t.address,
-            ]),
-            decodeFunction: decimalInfoDecoder,
-          },
-          {
-            target: this.config.wooOracleV2Address,
-            callData: ifaces.oracleV2.encodeFunctionData('state', [t.address]),
-            decodeFunction: stateDecoder,
-          },
-        ])
-        .flat(),
-    );
+    )
+      .concat([
+        {
+          target: this.config.wooPPV2Address,
+          callData: ifaces.PPV2.encodeFunctionData('tokenInfos', [
+            this.config.quoteToken.address,
+          ]),
+          decodeFunction: tokenInfoDecoder,
+        },
+        {
+          target: this.config.wooPPV2Address,
+          callData: ifaces.PPV2.encodeFunctionData('decimalInfo', [
+            this.config.quoteToken.address,
+          ]),
+          decodeFunction: decimalInfoDecoder,
+        },
+      ])
+      .concat(
+        this.baseTokens
+          .map(t => [
+            {
+              target: this.config.wooPPV2Address,
+              callData: ifaces.PPV2.encodeFunctionData('tokenInfos', [
+                t.address,
+              ]),
+              decodeFunction: tokenInfoDecoder,
+            },
+            {
+              target: this.config.wooPPV2Address,
+              callData: ifaces.PPV2.encodeFunctionData('decimalInfo', [
+                t.address,
+              ]),
+              decodeFunction: decimalInfoDecoder,
+            },
+            {
+              target: this.config.wooOracleV2Address,
+              callData: ifaces.oracleV2.encodeFunctionData('state', [
+                t.address,
+              ]),
+              decodeFunction: stateDecoder,
+            },
+          ])
+          .flat(),
+      );
   }
 
   protected _parseStateFromMultiResults(
     multiOutputs: MulticallResultOutputs[],
   ): PoolState {
-    const [isPaused, oracleTimestamp, ...remained] = multiOutputs as [
+    const [
+      isPaused,
+      oracleTimestamp,
+      quoteTokenInfo,
+      quoteTokenDecimals,
+      ...remained
+    ] = multiOutputs as [
       boolean,
       bigint,
+      TokenInfo,
+      DecimalInfo,
       ...MulticallResultOutputs[],
     ];
 
@@ -88,13 +116,16 @@ export class WooFiV2PollingPool extends StatefulRpcPoller<
     const decimals: Record<string, DecimalInfo> = {};
     const tokenStates: Record<string, TokenState> = {};
 
+    tokenInfos[this.config.quoteToken.address] = quoteTokenInfo;
+    decimals[this.config.quoteToken.address] = quoteTokenDecimals;
+
     _.chunk(remained, 3).forEach((chunk, i) => {
       const [tokenInfo, decimalInfo, tokenState] = chunk as [
         TokenInfo,
         DecimalInfo,
         TokenState,
       ];
-      const token = this.tokens[i];
+      const token = this.baseTokens[i];
 
       tokenInfos[token.address] = tokenInfo;
       decimals[token.address] = decimalInfo;

package/src/dex/woo-fi-v2/woo-fi-v2.ts

@@ -27,7 +27,6 @@ import { ethers } from 'ethers';
 import { addressDecode } from '../../lib/decoders';
 import { ifaces } from './utils';
 import { StatePollingManager } from '../../lib/stateful-rpc-poller/state-polling-manager';
-import { solidityPack } from 'ethers/lib/utils';
 import { extractReturnAmountPosition } from '../../executor/utils';
 
 export class WooFiV2 extends SimpleExchange implements IDex<WooFiV2Data> {
@@ -521,7 +520,7 @@ export class WooFiV2 extends SimpleExchange implements IDex<WooFiV2Data> {
       this.getIdentifier(),
       this.dexHelper,
       this.config,
-      Object.values(this.tokenByAddress),
+      this.baseTokens,
     );
 
     this.pollingManager.initializeAllPendingPools();

package/src/lib/fetcher/wsFetcher.ts

@@ -0,0 +1,126 @@
+import { Logger } from 'log4js';
+import { RequestConfig, Response } from '../../dex-helper/irequest-wrapper';
+import {
+  connection as WebSocketConnection,
+  client as WebSocketClient,
+} from 'websocket';
+
+export class SkippingRequest {
+  constructor(public message = '') {}
+}
+
+export type RequestInfo<T> = {
+  requestFunc?: (
+    options: RequestConfig,
+  ) => Promise<Response<T> | SkippingRequest>;
+  requestOptions: RequestConfig;
+  caster: (data: unknown) => T;
+  authenticate?: (options: RequestConfig) => RequestConfig;
+  excludedFieldsCaching?: string[];
+};
+
+export type RequestInfoWithHandler<T> = {
+  info: RequestInfo<T>;
+  handler: (data: T) => void;
+};
+
+export class WebSocketFetcher<T> {
+  private requests: RequestInfoWithHandler<T>;
+  public lastFetchSucceeded: boolean = false;
+  private stop: boolean = true;
+  private ws: WebSocketClient = new WebSocketClient();
+  private connection: WebSocketConnection | null = null;
+
+  constructor(requestsInfo: RequestInfoWithHandler<T>, private logger: Logger) {
+    this.requests = requestsInfo;
+    this.ws.on('connect', this.connected.bind(this));
+    this.ws.on('connectFailed', this.connectFailed.bind(this));
+  }
+
+  private connected(connection: WebSocketConnection) {
+    this.connection = connection;
+    this.logger.info(`Connected to ${this.requests.info.requestOptions.url}`);
+    this.connection.on('error', this.onError.bind(this));
+    this.connection.on('close', this.onClose.bind(this));
+    this.connection.on('message', this.onMessage.bind(this));
+  }
+
+  private connectFailed(error: any) {
+    this.logger.error(`Connect Error: ${error.toString()}`);
+  }
+
+  private onClose() {
+    this.logger.info(`Connection closed`);
+  }
+
+  private onError(error: any) {
+    this.logger.error(`Connection Error: ${error.toString()}`);
+  }
+
+  private onMessage(message: any) {
+    if (message.type === 'utf8') {
+      const response = JSON.parse(message.utf8Data) as Response<T>;
+      const reqInfo = this.requests;
+      const info = reqInfo.info;
+      const options = reqInfo.info.requestOptions;
+      this.logger.debug(`(${options.url}) received new data`);
+
+      try {
+        const parsedData = info.caster(response);
+        reqInfo.handler(parsedData);
+      } catch (e) {
+        this.logger.info(e);
+        this.logger.info(
+          `(${options.url}) received incorrect data ${JSON.stringify(
+            response,
+          ).replace(/(?:\r\n|\r|\n)/g, ' ')}`,
+          e,
+        );
+        return;
+      }
+    }
+  }
+
+  private connect() {
+    const authorization =
+      this.requests.info.requestOptions.headers!.authorization;
+    const name = this.requests.info.requestOptions.headers!.name;
+    if (typeof authorization !== 'string') {
+      throw new Error('Authorization header is not a string');
+    }
+    if (typeof name !== 'string') {
+      throw new Error('Name header is not a string');
+    }
+    this.ws.connect(
+      this.requests.info.requestOptions.url!,
+      undefined,
+      undefined,
+      {
+        Authorization: authorization,
+        name: name,
+      },
+    );
+  }
+
+  startPolling(): void {
+    this.stop = false;
+    this.connect();
+    this.logger.info(
+      `Connection started for ${this.requests.info.requestOptions.url}`,
+    );
+  }
+
+  stopPolling() {
+    if (this.connection) {
+      this.connection.close();
+    }
+    this.stop = true;
+    this.logger.info(
+      `Connection stopped for ${this.requests.info.requestOptions.url}`,
+    );
+  }
+
+  isPolling(): boolean {
+    return !this.stop;
+  }
+}

package/src/types.ts

@@ -304,6 +304,7 @@ export type Config = {
   uniswapV3EventLoggingSampleRate?: number;
   swaapV2AuthToken?: string;
   dexalotAuthToken?: string;
+  bebopAuthToken?: string;
   idleDaoAuthToken?: string;
   forceRpcFallbackDexs: string[];
   apiKeyTheGraph: string;

package/tests/constants-e2e.ts

@@ -19,6 +19,10 @@ export const Tokens: {
   [network: number]: { [symbol: string]: SmartTokenParams };
 } = {
   [Network.MAINNET]: {
+    sUSDS: {
+      address: '0xa3931d71877C0E7a3148CB7Eb4463524FEc27fbD',
+      decimals: 18,
+    },
     USDS: {
       address: '0xdC035D45d973E3EC169d2276DDab16f1e407384F',
       decimals: 18,
@@ -1511,6 +1515,7 @@ export const Holders: {
 } = {
   [Network.MAINNET]: {
     USDS: '0xB1796E8f1eEcF23027c1E3C00fE303629A189d10',
+    sUSDS: '0xd564B3aE673CAa49D054Bf185bD72a6853763eE7',
     SKY: '0x0ddda327A6614130CCb20bc0097313A282176A01',
     MKR: '0xe9aAA7A9DDc0877626C1779AbC29993aD89A6c1f',
     // Idle tokens