@paraswap/dex-lib 2.41.2 → 2.41.3

package/src/dex/solidly/config.ts

@@ -178,7 +178,7 @@ export const SolidlyConfig: DexConfigMap<DexParams> = {
       poolGasCost: 180 * 1000,
     },
   },
-  Fvm: {
+  Velocimeter: {
     [Network.FANTOM]: {
       factoryAddress: '0x472f3C3c9608fe0aE8d702f3f8A2d12c410C881A',
       router: '0x93d2611EB8b85bE4FDEa9D94Ce9913D90072eC0f',
@@ -205,7 +205,7 @@ export const Adapters: Record<number, AdapterMappings> = {
     [SwapSide.SELL]: [{ name: 'PolygonAdapter02', index: 3 }], // dystopia
   },
   [Network.FANTOM]: {
-    [SwapSide.SELL]: [{ name: 'FantomAdapter01', index: 10 }], // solidly, spiritSwapV2, equalizer, fvm
+    [SwapSide.SELL]: [{ name: 'FantomAdapter01', index: 10 }], // solidly, spiritSwapV2, equalizer, velocimeter
   },
   [Network.OPTIMISM]: {
     [SwapSide.SELL]: [{ name: 'OptimismAdapter01', index: 8 }], // velodrome
@@ -223,6 +223,6 @@ export const Adapters: Record<number, AdapterMappings> = {
     [SwapSide.SELL]: [{ name: 'ArbitrumAdapter02', index: 1 }], // chronos, ramses
   },
   [Network.BASE]: {
-    [SwapSide.SELL]: [{ name: 'BaseAdapter01', index: 3 }], // aerodrome, equalizer
+    [SwapSide.SELL]: [{ name: 'BaseAdapter01', index: 3 }], // aerodrome, equalizer, velocimeter
   },
 };

package/src/dex/solidly/forks-override/{fvm.ts → velocimeter.ts}

@@ -7,7 +7,7 @@ import { getDexKeysWithNetwork } from '../../../utils';
 import { SolidlyConfig } from '../config';
 import _ from 'lodash';
 
-const FvmFactoryABI = [
+const velocimeterFactoryABI = [
   {
     inputs: [{ internalType: '_pair', name: '_stable', type: 'address' }],
     name: 'getFee',
@@ -17,11 +17,11 @@ const FvmFactoryABI = [
   },
 ];
 
-const fvmFactoryIface = new Interface(FvmFactoryABI);
+const velocimeterFactoryIface = new Interface(velocimeterFactoryABI);
 
-export class Fvm extends Solidly {
+export class Velocimeter extends Solidly {
   public static dexKeysWithNetwork: { key: string; networks: Network[] }[] =
-    getDexKeysWithNetwork(_.pick(SolidlyConfig, ['Fvm']));
+    getDexKeysWithNetwork(_.pick(SolidlyConfig, ['Velocimeter']));
 
   constructor(
     protected network: Network,
@@ -39,11 +39,11 @@ export class Fvm extends Solidly {
   protected getFeesMultiCallData(pair: SolidlyPair) {
     const callEntry = {
       target: this.factoryAddress,
-      callData: fvmFactoryIface.encodeFunctionData('getFee', [pair.exchange]),
+      callData: velocimeterFactoryIface.encodeFunctionData('getFee', [pair.exchange]),
     };
     const callDecoder = (values: any[]) =>
       parseInt(
-        fvmFactoryIface.decodeFunctionResult('getFee', values)[0].toString(),
+        velocimeterFactoryIface.decodeFunctionResult('getFee', values)[0].toString(),
       );
 
     return {

package/src/dex/solidly/solidly-e2e.test.ts

@@ -416,8 +416,8 @@ describe('Solidly E2E', () => {
       );
     });
 
-    describe('Fvm', () => {
-      const dexKey = 'Fvm';
+    describe('Velocimeter', () => {
+      const dexKey = 'Velocimeter';
       const network = Network.FANTOM;
 
       const tokenASymbol: string = 'lzUSDC';
@@ -1514,8 +1514,8 @@ describe('Solidly E2E', () => {
       );
     });
 
-    describe('Fvm', () => {
-      const dexKey = 'Fvm';
+    describe('Velocimeter', () => {
+      const dexKey = 'Velocimeter';
 
       const tokenASymbol: string = 'USDbC';
       const tokenBSymbol: string = 'DAI';

package/src/dex/solidly/solidly-integration.test.ts

@@ -17,7 +17,7 @@ import { Ramses } from './forks-override/ramses';
 import * as util from 'util';
 import { VelodromeV2 } from './forks-override/velodromeV2';
 import { Equalizer } from './forks-override/equalizer';
-import { Fvm } from './forks-override/fvm';
+import { Velocimeter } from './forks-override/velocimeter';
 
 const amounts18 = [0n, BI_POWS[18], 2000000000000000000n];
 const amounts6 = [0n, BI_POWS[6], 2000000n];
@@ -527,9 +527,9 @@ describe('Solidly integration tests', () => {
       });
     });
 
-    describe('Fvm', () => {
-      const dexKey = 'Fvm';
-      const fvm = new Fvm(network, dexKey, dexHelper);
+    describe('Velocimeter', () => {
+      const dexKey = 'Velocimeter';
+      const velocimeter = new Velocimeter(network, dexKey, dexHelper);
 
       describe('UniswapV2 like pool', function () {
         const TokenASymbol = 'WFTM';
@@ -541,7 +541,7 @@ describe('Solidly integration tests', () => {
 
         it('getPoolIdentifiers and getPricesVolume', async function () {
           const blocknumber = await dexHelper.web3Provider.eth.getBlockNumber();
-          const pools = await fvm.getPoolIdentifiers(
+          const pools = await velocimeter.getPoolIdentifiers(
             tokenA,
             tokenB,
             SwapSide.SELL,
@@ -554,7 +554,7 @@ describe('Solidly integration tests', () => {
 
           expect(pools.length).toBeGreaterThan(0);
 
-          const poolPrices = await fvm.getPricesVolume(
+          const poolPrices = await velocimeter.getPricesVolume(
             tokenA,
             tokenB,
             amounts,
@@ -574,7 +574,7 @@ describe('Solidly integration tests', () => {
 
           for (const poolPrice of poolPrices || []) {
             await checkOnChainPricing(
-              fvm,
+              velocimeter,
               'getAmountOut',
               blocknumber,
               poolPrice.prices,
@@ -596,7 +596,7 @@ describe('Solidly integration tests', () => {
 
         it('getPoolIdentifiers and getPricesVolume', async function () {
           const blocknumber = await dexHelper.web3Provider.eth.getBlockNumber();
-          const pools = await fvm.getPoolIdentifiers(
+          const pools = await velocimeter.getPoolIdentifiers(
             tokenA,
             tokenB,
             SwapSide.SELL,
@@ -609,7 +609,7 @@ describe('Solidly integration tests', () => {
 
           expect(pools.length).toBeGreaterThan(0);
 
-          const poolPrices = await fvm.getPricesVolume(
+          const poolPrices = await velocimeter.getPricesVolume(
             tokenA,
             tokenB,
             amounts,
@@ -628,7 +628,7 @@ describe('Solidly integration tests', () => {
           // Check if onchain pricing equals to calculated ones
           for (const poolPrice of poolPrices || []) {
             await checkOnChainPricing(
-              fvm,
+              velocimeter,
               'getAmountOut',
               blocknumber,
               poolPrice.prices,
@@ -652,7 +652,7 @@ describe('Solidly integration tests', () => {
         it('getPoolIdentifiers and getPricesVolume', async function () {
           // const blocknumber = await dexHelper.web3Provider.eth.getBlockNumber();
           const blocknumber = 67666611;
-          const pools = await fvm.getPoolIdentifiers(
+          const pools = await velocimeter.getPoolIdentifiers(
             tokenA,
             tokenB,
             SwapSide.SELL,
@@ -665,7 +665,7 @@ describe('Solidly integration tests', () => {
 
           expect(pools.length).toBeGreaterThan(0);
 
-          const poolPrices = await fvm.getPricesVolume(
+          const poolPrices = await velocimeter.getPricesVolume(
             tokenA,
             tokenB,
             amounts,
@@ -684,7 +684,7 @@ describe('Solidly integration tests', () => {
           // Check if onchain pricing equals to calculated ones
           for (const poolPrice of poolPrices || []) {
             await checkOnChainPricing(
-              fvm,
+              velocimeter,
               'getAmountOut',
               blocknumber,
               poolPrice.prices,
@@ -1439,9 +1439,9 @@ describe('Solidly integration tests', () => {
       });
     });
 
-    describe('Fvm', () => {
-      const dexKey = 'Fvm';
-      const fvm = new Fvm(network, dexKey, dexHelper);
+    describe('Velocimeter', () => {
+      const dexKey = 'Velocimeter';
+      const velocimeter = new Velocimeter(network, dexKey, dexHelper);
 
       describe('UniswapV2 like pool', function () {
         const TokenASymbol = 'WETH';
@@ -1453,7 +1453,7 @@ describe('Solidly integration tests', () => {
 
         it('getPoolIdentifiers and getPricesVolume', async function () {
           const blocknumber = await dexHelper.web3Provider.eth.getBlockNumber();
-          const pools = await fvm.getPoolIdentifiers(
+          const pools = await velocimeter.getPoolIdentifiers(
             tokenA,
             tokenB,
             SwapSide.SELL,
@@ -1466,7 +1466,7 @@ describe('Solidly integration tests', () => {
 
           expect(pools.length).toBeGreaterThan(0);
 
-          const poolPrices = await fvm.getPricesVolume(
+          const poolPrices = await velocimeter.getPricesVolume(
             tokenA,
             tokenB,
             amounts,
@@ -1486,7 +1486,7 @@ describe('Solidly integration tests', () => {
 
           for (const poolPrice of poolPrices || []) {
             await checkOnChainPricing(
-              fvm,
+              velocimeter,
               'getAmountOut',
               blocknumber,
               poolPrice.prices,
@@ -1508,7 +1508,7 @@ describe('Solidly integration tests', () => {
 
         it('getPoolIdentifiers and getPricesVolume', async function () {
           const blocknumber = await dexHelper.web3Provider.eth.getBlockNumber();
-          const pools = await fvm.getPoolIdentifiers(
+          const pools = await velocimeter.getPoolIdentifiers(
             tokenA,
             tokenB,
             SwapSide.SELL,
@@ -1521,7 +1521,7 @@ describe('Solidly integration tests', () => {
 
           expect(pools.length).toBeGreaterThan(0);
 
-          const poolPrices = await fvm.getPricesVolume(
+          const poolPrices = await velocimeter.getPricesVolume(
             tokenA,
             tokenB,
             amounts,
@@ -1540,7 +1540,7 @@ describe('Solidly integration tests', () => {
           // Check if onchain pricing equals to calculated ones
           for (const poolPrice of poolPrices || []) {
             await checkOnChainPricing(
-              fvm,
+              velocimeter,
               'getAmountOut',
               blocknumber,
               poolPrice.prices,

package/src/dex/solidly/solidly.ts

@@ -75,7 +75,7 @@ export class Solidly extends UniswapV2 {
         'Chronos',
         'Ramses',
         'Equalizer',
-        'Fvm',
+        'Velocimeter',
       ]),
     );