@paraswap/dex-lib 3.0.6 → 3.2.5-return-amount-pos.5

package/src/config.ts

@@ -47,15 +47,15 @@ const baseConfigs: { [network: number]: BaseConfig } = {
     wrappedNativeTokenAddress: '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
     hasEIP1559: true,
     augustusAddress: '0xDEF171Fe48CF0115B1d80b88dc8eAB59176FEe57',
-    augustusV6Address: '0x00000000FdAC7708D0D360BDDc1bc7d097F47439',
     augustusRFQAddress: '0xe92b586627ccA7a83dC919cc7127196d70f55a06',
     tokenTransferProxyAddress: '0x216b4b4ba9f3e719726886d34a177484278bfcae',
     multicallV2Address: '0x5BA1e12693Dc8F9c48aAD8770482f4739bEeD696',
     privateHttpProvider: process.env.HTTP_PROVIDER_1,
+    augustusV6Address: '0x000dB803A70511E09dA650D4C0506d0000100000',
     executorsAddresses: {
-      Executor01: '0x000000006E85dF93Da91e65184708f020e58df2c',
-      Executor02: '0x000000C0ef6dBff0E689d393EDBb93702eEEf0d8',
-      Executor03: '0x000000856CFe8D0625D96BD87712A074d90a9F5b',
+      Executor01: '0x9000D0c03F00f002C440030024042c02E2e0E0d0',
+      Executor02: '0xb0DE0000b80000520aCf020C52D006500017055f',
+      Executor03: '0xBa0200000D0903dC0c1000801B0573090078E09E',
     },
     adapterAddresses: {
       Adapter01: '0x9bE264469eF954c139Da4A45Cf76CbCC5e3A6A73',
@@ -63,8 +63,9 @@ const baseConfigs: { [network: number]: BaseConfig } = {
       Adapter03: '0xBAEeb4540f59d30E567a5B563CC0c4587eDd9366',
       Adapter04: '0x369A2FDb910d432f0a07381a5E3d27572c876713',
       Adapter05: '0x3329dfa55A40B450952FBE0203167Ae6908E656d',
+      Adapter06: '0xe9166234DFB6d3ec05C82404109C02Ca82b16c22',
       BuyAdapter: '0x84bEF12C9931cE12662cc9F2366b6a5029E4BD29',
-      BuyAdapter02: '0xe53d24CD81cC81bbf271AD7B02D0d67f851D727c',
+      BuyAdapter02: '0xF73335b89e6EeACD4d7D8e397ACCd9F93E723952',
     },
     uniswapV2ExchangeRouterAddress:
       '0xF9234CB08edb93c0d4a4d4c70cC3FfD070e78e07',
@@ -167,15 +168,15 @@ const baseConfigs: { [network: number]: BaseConfig } = {
     wrappedNativeTokenAddress: '0xbb4cdb9cbd36b01bd1cbaebf2de08d9173bc095c',
     hasEIP1559: false,
     augustusAddress: '0xDEF171Fe48CF0115B1d80b88dc8eAB59176FEe57',
-    augustusV6Address: '0x00000000FdAC7708D0D360BDDc1bc7d097F47439',
     augustusRFQAddress: '0x8DcDfe88EF0351f27437284D0710cD65b20288bb',
     tokenTransferProxyAddress: '0x216b4b4ba9f3e719726886d34a177484278bfcae',
     multicallV2Address: '0xC50F4c1E81c873B2204D7eFf7069Ffec6Fbe136D',
     privateHttpProvider: process.env.HTTP_PROVIDER_56,
+    augustusV6Address: '0x000dB803A70511E09dA650D4C0506d0000100000',
     executorsAddresses: {
-      Executor01: '0x000000006E85dF93Da91e65184708f020e58df2c',
-      Executor02: '0x000000C0ef6dBff0E689d393EDBb93702eEEf0d8',
-      Executor03: '0x000000856CFe8D0625D96BD87712A074d90a9F5b',
+      Executor01: '0x9000D0c03F00f002C440030024042c02E2e0E0d0',
+      Executor02: '0xb0DE0000b80000520aCf020C52D006500017055f',
+      Executor03: '0xBa0200000D0903dC0c1000801B0573090078E09E',
     },
     hashFlowAuthToken: process.env.API_KEY_HASHFLOW_AUTH_TOKEN || '',
     smardexSubgraphAuthToken: process.env.API_KEY_SMARDEX_SUBGRAPH || '',
@@ -183,8 +184,8 @@ const baseConfigs: { [network: number]: BaseConfig } = {
       process.env[`HASHFLOW_DISABLED_MMS_56`]?.split(',') || [],
     adapterAddresses: {
       BscAdapter01: '0xA31d9C571DF00e0F428B0bD24c34D103E8112222',
-      BscAdapter02: '0x9A92D2649C38415860FA59ba8B9a9960cd2839Db',
-      BscBuyAdapter: '0xd32C191e0febaa6Cc93A29Cb676474c72486E00b',
+      BscAdapter02: '0x7A8f0436981B893349514655a00Ca974A6e9fd93',
+      BscBuyAdapter: '0x2389726B55948d8D8944b0145204761215AaEc71',
     },
     rpcPollingMaxAllowedStateDelayInBlocks: 1,
     rpcPollingBlocksBackToTriggerUpdate: 1,
@@ -202,15 +203,15 @@ const baseConfigs: { [network: number]: BaseConfig } = {
     wrappedNativeTokenAddress: '0x0d500B1d8E8eF31E21C99d1Db9A6444d3ADf1270',
     hasEIP1559: true,
     augustusAddress: '0xDEF171Fe48CF0115B1d80b88dc8eAB59176FEe57',
-    augustusV6Address: '0x00000000FdAC7708D0D360BDDc1bc7d097F47439',
     augustusRFQAddress: '0xF3CD476C3C4D3Ac5cA2724767f269070CA09A043',
     tokenTransferProxyAddress: '0x216b4b4ba9f3e719726886d34a177484278bfcae',
     multicallV2Address: '0x275617327c958bD06b5D6b871E7f491D76113dd8',
     privateHttpProvider: process.env.HTTP_PROVIDER_137,
+    augustusV6Address: '0x000dB803A70511E09dA650D4C0506d0000100000',
     executorsAddresses: {
-      Executor01: '0x000000006E85dF93Da91e65184708f020e58df2c',
-      Executor02: '0x000000C0ef6dBff0E689d393EDBb93702eEEf0d8',
-      Executor03: '0x000000856CFe8D0625D96BD87712A074d90a9F5b',
+      Executor01: '0x9000D0c03F00f002C440030024042c02E2e0E0d0',
+      Executor02: '0xb0DE0000b80000520aCf020C52D006500017055f',
+      Executor03: '0xBa0200000D0903dC0c1000801B0573090078E09E',
     },
     hashFlowAuthToken: process.env.API_KEY_HASHFLOW_AUTH_TOKEN || '',
     smardexSubgraphAuthToken: process.env.API_KEY_SMARDEX_SUBGRAPH || '',
@@ -218,8 +219,8 @@ const baseConfigs: { [network: number]: BaseConfig } = {
       process.env[`HASHFLOW_DISABLED_MMS_137`]?.split(',') || [],
     adapterAddresses: {
       PolygonAdapter01: '0xE44769f42E1e9592f86B82f206407a8f7C84b4ed',
-      PolygonAdapter02: '0x84bEF12C9931cE12662cc9F2366b6a5029E4BD29',
-      PolygonBuyAdapter: '0xBAEeb4540f59d30E567a5B563CC0c4587eDd9366',
+      PolygonAdapter02: '0xE7d4CC1589311BD7Bb58739269748a20DAAD755D',
+      PolygonBuyAdapter: '0x8643Aa3E63dF7742223A713C7525677df336183f',
     },
     uniswapV2ExchangeRouterAddress:
       '0xf3938337F7294fEf84e9B2c6D548A93F956Cc281',
@@ -239,7 +240,6 @@ const baseConfigs: { [network: number]: BaseConfig } = {
     wrappedNativeTokenAddress: '0xB31f66AA3C1e785363F0875A1B74E27b85FD66c7',
     hasEIP1559: true,
     augustusAddress: '0xDEF171Fe48CF0115B1d80b88dc8eAB59176FEe57',
-    augustusV6Address: '0x00000000FdAC7708D0D360BDDc1bc7d097F47439',
     augustusRFQAddress: '0x34302c4267d0dA0A8c65510282Cc22E9e39df51f',
     tokenTransferProxyAddress: '0x216b4b4ba9f3e719726886d34a177484278bfcae',
     multicallV2Address: '0xd7Fc8aD069f95B6e2835f4DEff03eF84241cF0E1',
@@ -249,10 +249,11 @@ const baseConfigs: { [network: number]: BaseConfig } = {
     hashFlowDisabledMMs:
       process.env[`HASHFLOW_DISABLED_MMS_43114`]?.split(',') || [],
     dexalotAuthToken: process.env.API_KEY_DEXALOT_AUTH_TOKEN || '',
+    augustusV6Address: '0x000dB803A70511E09dA650D4C0506d0000100000',
     executorsAddresses: {
-      Executor01: '0x000000006E85dF93Da91e65184708f020e58df2c',
-      Executor02: '0x000000C0ef6dBff0E689d393EDBb93702eEEf0d8',
-      Executor03: '0x000000856CFe8D0625D96BD87712A074d90a9F5b',
+      Executor01: '0x9000D0c03F00f002C440030024042c02E2e0E0d0',
+      Executor02: '0xb0DE0000b80000520aCf020C52D006500017055f',
+      Executor03: '0xBa0200000D0903dC0c1000801B0573090078E09E',
     },
     adapterAddresses: {
       AvalancheAdapter01: '0x745Ec73855CeC7249E5fF4c9DD81cc65b4D297a9',
@@ -275,7 +276,6 @@ const baseConfigs: { [network: number]: BaseConfig } = {
     wrappedNativeTokenAddress: '0x21be370d5312f44cb42ce377bc9b8a0cef1a4c83',
     hasEIP1559: false,
     augustusAddress: '0xDEF171Fe48CF0115B1d80b88dc8eAB59176FEe57',
-    augustusV6Address: '0x00000000FdAC7708D0D360BDDc1bc7d097F47439',
     augustusRFQAddress: '0x2DF17455B96Dde3618FD6B1C3a9AA06D6aB89347',
     tokenTransferProxyAddress: '0x216b4b4ba9f3e719726886d34a177484278bfcae',
     multicallV2Address: '0xdC6E2b14260F972ad4e5a31c68294Fba7E720701',
@@ -284,14 +284,16 @@ const baseConfigs: { [network: number]: BaseConfig } = {
     smardexSubgraphAuthToken: process.env.API_KEY_SMARDEX_SUBGRAPH || '',
     hashFlowDisabledMMs:
       process.env[`HASHFLOW_DISABLED_MMS_250`]?.split(',') || [],
+    augustusV6Address: '0x000dB803A70511E09dA650D4C0506d0000100000',
     executorsAddresses: {
-      Executor01: '0x000000006E85dF93Da91e65184708f020e58df2c',
-      Executor02: '0x000000C0ef6dBff0E689d393EDBb93702eEEf0d8',
-      Executor03: '0x000000856CFe8D0625D96BD87712A074d90a9F5b',
+      Executor01: '0x9000D0c03F00f002C440030024042c02E2e0E0d0',
+      Executor02: '0xb0DE0000b80000520aCf020C52D006500017055f',
+      Executor03: '0xBa0200000D0903dC0c1000801B0573090078E09E',
     },
     adapterAddresses: {
       FantomAdapter01: '0x654dE10890f8B2C5bF54E50Af169a7E93165C416',
-      FantomBuyAdapter: '0xb2634B3CBc1E401AB3C2743DB44d459C5c9aA662',
+      FantomAdapter02: '0x248009f6F78b5AcD5EA2fc86d56b77A7AeEe2eFc',
+      FantomBuyAdapter: '0xEECA9223063bD13e8ca77ed9e39a07f2BD1923E6',
     },
     uniswapV2ExchangeRouterAddress:
       '0xAB86e2bC9ec5485a9b60E684BA6d49bf4686ACC2',
@@ -309,7 +311,6 @@ const baseConfigs: { [network: number]: BaseConfig } = {
     wrappedNativeTokenAddress: '0x82aF49447D8a07e3bd95BD0d56f35241523fBab1',
     hasEIP1559: false,
     augustusAddress: '0xDEF171Fe48CF0115B1d80b88dc8eAB59176FEe57',
-    augustusV6Address: '0x00000000FdAC7708D0D360BDDc1bc7d097F47439',
     augustusRFQAddress: '0x0927FD43a7a87E3E8b81Df2c44B03C4756849F6D',
     tokenTransferProxyAddress: '0x216b4b4ba9f3e719726886d34a177484278bfcae',
     multicallV2Address: '0x7eCfBaa8742fDf5756DAC92fbc8b90a19b8815bF',
@@ -319,15 +320,18 @@ const baseConfigs: { [network: number]: BaseConfig } = {
     swaapV2AuthToken: process.env.API_KEY_SWAAP_V2_AUTH_TOKEN || '',
     hashFlowDisabledMMs:
       process.env[`HASHFLOW_DISABLED_MMS_42161`]?.split(',') || [],
+    augustusV6Address: '0x000dB803A70511E09dA650D4C0506d0000100000',
     executorsAddresses: {
-      Executor01: '0x000000006E85dF93Da91e65184708f020e58df2c',
-      Executor02: '0x000000C0ef6dBff0E689d393EDBb93702eEEf0d8',
-      Executor03: '0x000000856CFe8D0625D96BD87712A074d90a9F5b',
+      Executor01: '0x9000D0c03F00f002C440030024042c02E2e0E0d0',
+      Executor02: '0xb0DE0000b80000520aCf020C52D006500017055f',
+      Executor03: '0xBa0200000D0903dC0c1000801B0573090078E09E',
     },
+    dexalotAuthToken: process.env.API_KEY_DEXALOT_AUTH_TOKEN || '',
     adapterAddresses: {
       ArbitrumAdapter01: '0x369A2FDb910d432f0a07381a5E3d27572c876713',
       ArbitrumAdapter02: '0x58a5f0b73969800FAFf8556cD2187E3FCE71A6cb',
-      ArbitrumBuyAdapter: '0x4483Ae378897eB9FbF7f15Df98Bf07233ffFEe8b',
+      ArbitrumAdapter03: '0x97bdD2B98D9802b0e387FefdB2882C1b2dc2c344',
+      ArbitrumBuyAdapter: '0x005213c48d4aafFcA0b6D1CbA8710F4D035C18f9',
     },
     uniswapV2ExchangeRouterAddress:
       '0xB41dD984730dAf82f5C41489E21ac79D5e3B61bC',
@@ -346,15 +350,15 @@ const baseConfigs: { [network: number]: BaseConfig } = {
     wrappedNativeTokenAddress: '0x4200000000000000000000000000000000000006',
     hasEIP1559: false,
     augustusAddress: '0xDEF171Fe48CF0115B1d80b88dc8eAB59176FEe57',
-    augustusV6Address: '0x00000000FdAC7708D0D360BDDc1bc7d097F47439',
     augustusRFQAddress: '0x0927FD43a7a87E3E8b81Df2c44B03C4756849F6D',
     tokenTransferProxyAddress: '0x216b4b4ba9f3e719726886d34a177484278bfcae',
     multicallV2Address: '0x2DC0E2aa608532Da689e89e237dF582B783E552C',
     privateHttpProvider: process.env.HTTP_PROVIDER_10,
+    augustusV6Address: '0x000dB803A70511E09dA650D4C0506d0000100000',
     executorsAddresses: {
-      Executor01: '0x000000006E85dF93Da91e65184708f020e58df2c',
-      Executor02: '0x000000C0ef6dBff0E689d393EDBb93702eEEf0d8',
-      Executor03: '0x000000856CFe8D0625D96BD87712A074d90a9F5b',
+      Executor01: '0x9000D0c03F00f002C440030024042c02E2e0E0d0',
+      Executor02: '0xb0DE0000b80000520aCf020C52D006500017055f',
+      Executor03: '0xBa0200000D0903dC0c1000801B0573090078E09E',
     },
     hashFlowAuthToken: process.env.API_KEY_HASHFLOW_AUTH_TOKEN || '',
     smardexSubgraphAuthToken: process.env.API_KEY_SMARDEX_SUBGRAPH || '',
@@ -362,7 +366,8 @@ const baseConfigs: { [network: number]: BaseConfig } = {
       process.env[`HASHFLOW_DISABLED_MMS_10`]?.split(',') || [],
     adapterAddresses: {
       OptimismAdapter01: '0x5dcf544b0c9689fa67dcb713fd2656d217e25a59',
-      OptimismBuyAdapter: '0xA10c9a84E72d9DfF424Fe2284B6460784bed407E',
+      OptimismAdapter02: '0x4483Ae378897eB9FbF7f15Df98Bf07233ffFEe8b',
+      OptimismBuyAdapter: '0xe9166234DFB6d3ec05C82404109C02Ca82b16c22',
     },
     uniswapV2ExchangeRouterAddress:
       '0xB41dD984730dAf82f5C41489E21ac79D5e3B61bC',
@@ -381,15 +386,15 @@ const baseConfigs: { [network: number]: BaseConfig } = {
     wrappedNativeTokenAddress: '0x4F9A0e7FD2Bf6067db6994CF12E4495Df938E6e9',
     hasEIP1559: true,
     augustusAddress: '0xB83B554730d29cE4Cb55BB42206c3E2c03E4A40A',
-    augustusV6Address: '0x00000000FdAC7708D0D360BDDc1bc7d097F47439',
     augustusRFQAddress: '0x7Ee1F7fa4C0b2eDB0Fdd5944c14A07167700486E',
     tokenTransferProxyAddress: '0xc8a21fcd5a100c3ecc037c97e2f9c53a8d3a02a1',
     multicallV2Address: '0x6cA478C852DfA8941FC819fDf248606eA04780B6',
     privateHttpProvider: process.env.HTTP_PROVIDER_1101,
+    augustusV6Address: '0x000dB803A70511E09dA650D4C0506d0000100000',
     executorsAddresses: {
-      Executor01: '0x000000006E85dF93Da91e65184708f020e58df2c',
-      Executor02: '0x000000C0ef6dBff0E689d393EDBb93702eEEf0d8',
-      Executor03: '0x000000856CFe8D0625D96BD87712A074d90a9F5b',
+      Executor01: '0x9000D0c03F00f002C440030024042c02E2e0E0d0',
+      Executor02: '0xb0DE0000b80000520aCf020C52D006500017055f',
+      Executor03: '0xBa0200000D0903dC0c1000801B0573090078E09E',
     },
     adapterAddresses: {
       PolygonZkEvmAdapter01: '0xd63B7691dD98fa89A2ea5e1604700489c585aa7B',
@@ -417,7 +422,6 @@ const baseConfigs: { [network: number]: BaseConfig } = {
     wrappedNativeTokenAddress: '0x4200000000000000000000000000000000000006',
     hasEIP1559: false,
     augustusAddress: '0x59C7C832e96D2568bea6db468C1aAdcbbDa08A52',
-    augustusV6Address: '0x00000000FdAC7708D0D360BDDc1bc7d097F47439',
     augustusRFQAddress: '0xa003dFBA51C9e1e56C67ae445b852bdEd7aC5EEd',
     tokenTransferProxyAddress: '0x93aAAe79a53759cD164340E4C8766E4Db5331cD7',
     multicallV2Address: '0xeDF6D2a16e8081F777eB623EeB4411466556aF3d',
@@ -425,14 +429,15 @@ const baseConfigs: { [network: number]: BaseConfig } = {
     hashFlowAuthToken: process.env.API_KEY_HASHFLOW_AUTH_TOKEN || '',
     smardexSubgraphAuthToken: process.env.API_KEY_SMARDEX_SUBGRAPH || '',
     hashFlowDisabledMMs: [],
+    augustusV6Address: '0x000dB803A70511E09dA650D4C0506d0000100000',
     executorsAddresses: {
-      Executor01: '0x000000006E85dF93Da91e65184708f020e58df2c',
-      Executor02: '0x000000C0ef6dBff0E689d393EDBb93702eEEf0d8',
-      Executor03: '0x000000856CFe8D0625D96BD87712A074d90a9F5b',
+      Executor01: '0x9000D0c03F00f002C440030024042c02E2e0E0d0',
+      Executor02: '0xb0DE0000b80000520aCf020C52D006500017055f',
+      Executor03: '0xBa0200000D0903dC0c1000801B0573090078E09E',
     },
     adapterAddresses: {
-      BaseAdapter01: '0xA10c9a84E72d9DfF424Fe2284B6460784bed407E',
-      BaseBuyAdapter: '0xEECA9223063bD13e8ca77ed9e39a07f2BD1923E6',
+      BaseAdapter01: '0xe53d24CD81cC81bbf271AD7B02D0d67f851D727c',
+      BaseBuyAdapter: '0xe07678E5Fd104cbabb239049148b8a4E9dA5d07E',
     },
     uniswapV2ExchangeRouterAddress:
       '0x75d199EfB540e47D27D52c62Da3E7daC2B9e834F',

package/src/dex/aave-v1/aave-v1.ts

@@ -237,6 +237,7 @@ export class AaveV1
       dexFuncHasRecipient: false,
       exchangeData,
       targetExchange: swapCallee,
+      returnAmountPos: undefined,
     };
   }
 

package/src/dex/aave-v2/aave-v2.ts

@@ -386,6 +386,7 @@ export class AaveV2
       dexFuncHasRecipient: true,
       exchangeData,
       targetExchange: swapCallee,
+      returnAmountPos: undefined,
     };
   }
 

package/src/dex/aave-v3/aave-v3.ts

@@ -245,6 +245,7 @@ export class AaveV3 extends SimpleExchange implements IDex<Data, Param> {
       dexFuncHasRecipient: true,
       exchangeData,
       targetExchange: swapCallee,
+      returnAmountPos: undefined,
     };
   }
 

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

@@ -266,4 +266,26 @@ describe('Algebra', () => {
       );
     });
   });
+
+  describe('SwapBasedV3', () => {
+    const dexKey = 'SwapBasedV3';
+    const network = Network.BASE;
+
+    const tokenASymbol: string = 'USDC';
+    const tokenBSymbol: string = 'WETH';
+
+    const tokenAAmount: string = '1000000000';
+    const tokenBAmount: string = '1000000000000000000';
+    const nativeTokenAmount = '1000000000000000000';
+
+    testForNetwork(
+      network,
+      dexKey,
+      tokenASymbol,
+      tokenBSymbol,
+      tokenAAmount,
+      tokenBAmount,
+      nativeTokenAmount,
+    );
+  });
 });

package/src/dex/algebra/algebra-factory.ts

@@ -36,7 +36,14 @@ export class AlgebraFactory extends StatefulEventSubscriber<FactoryState> {
     protected readonly onPoolCreated: OnPoolCreatedCallback,
     mapKey: string = '',
   ) {
-    super(parentName, `${parentName} Factory`, dexHelper, logger, true, mapKey);
+    super(
+      parentName,
+      `${parentName} Factory`,
+      dexHelper,
+      logger,
+      false,
+      mapKey,
+    );
 
     this.addressesSubscribed = [factoryAddress];
 

package/src/dex/algebra/algebra-pool-v1_1.ts

@@ -53,7 +53,7 @@ const MAX_BATCH_SIZE = 100;
 const MAX_NUMBER_OF_BATCH_REQUEST_HALVING = 3;
 
 export class AlgebraEventPoolV1_1 extends StatefulEventSubscriber<PoolStateV1_1> {
-  handlers: {
+  protected handlers: {
     [event: string]: (
       event: any,
       state: DeepReadonly<PoolStateV1_1>,
@@ -95,6 +95,7 @@ export class AlgebraEventPoolV1_1 extends StatefulEventSubscriber<PoolStateV1_1>
     readonly poolInitCodeHash: string,
     readonly poolDeployer: string,
     private readonly forceManualStateGeneration: boolean = false,
+    private readonly areTicksCompressed: boolean = true,
   ) {
     super(parentName, `${token0}_${token1}`, dexHelper, logger, true, mapKey);
     this.token0 = token0.toLowerCase();
@@ -132,6 +133,13 @@ export class AlgebraEventPoolV1_1 extends StatefulEventSubscriber<PoolStateV1_1>
     await super.initialize(blockNumber, options);
   }
 
+  protected getPoolIdentifierData() {
+    return {
+      token0: this.token0,
+      token1: this.token1,
+    };
+  }
+
   protected async processBlockLogs(
     state: DeepReadonly<PoolStateV1_1>,
     logs: Readonly<Log>[],
@@ -641,7 +649,7 @@ export class AlgebraEventPoolV1_1 extends StatefulEventSubscriber<PoolStateV1_1>
       isValid: true,
       balance0,
       balance1,
-      areTicksCompressed: true,
+      areTicksCompressed: this.areTicksCompressed,
     };
   }
 

package/src/dex/algebra/algebra-pool-v1_9.ts

@@ -106,6 +106,13 @@ export class AlgebraEventPoolV1_9 extends StatefulEventSubscriber<PoolState_v1_9
     await super.initialize(blockNumber, options);
   }
 
+  protected getPoolIdentifierData() {
+    return {
+      token0: this.token0,
+      token1: this.token1,
+    };
+  }
+
   protected async processBlockLogs(
     state: DeepReadonly<PoolState_v1_9>,
     logs: Readonly<Log>[],

package/src/dex/algebra/algebra-pool-v1_9_bidirectional_fee.ts

@@ -0,0 +1,55 @@
+import { Interface } from '@ethersproject/abi';
+import { Contract } from 'web3-eth-contract';
+import { IDexHelper } from '../../dex-helper/idex-helper';
+import { Address, BlockHeader, Log, Logger } from '../../types';
+import { bigIntify } from '../../utils';
+import { AlgebraEventPoolV1_1 } from './algebra-pool-v1_1';
+import { PoolStateV1_1 } from './types';
+
+export class AlgebraEventPoolV1_9_bidirectional_fee extends AlgebraEventPoolV1_1 {
+  constructor(
+    readonly dexHelper: IDexHelper,
+    parentName: string,
+    readonly stateMultiContract: Contract,
+    readonly erc20Interface: Interface,
+    protected readonly factoryAddress: Address,
+    token0: Address,
+    token1: Address,
+    logger: Logger,
+    mapKey: string = '',
+    readonly poolInitCodeHash: string,
+    readonly poolDeployer: string,
+  ) {
+    super(
+      dexHelper,
+      parentName,
+      stateMultiContract,
+      erc20Interface,
+      factoryAddress,
+      token0,
+      token1,
+      logger,
+      mapKey,
+      poolInitCodeHash,
+      poolDeployer,
+      false, // forceManualStateGeneration; mainly for zkEVM
+      false, // areTicksCompressed
+    );
+
+    this.handlers['TickSpacing'] = this.handleTickSpacing.bind(this);
+  }
+
+  handleTickSpacing(
+    event: any,
+    pool: PoolStateV1_1,
+    log: Log,
+    blockHeader: BlockHeader,
+  ) {
+    const newTickSpacing = bigIntify(event.args.newTickSpacing);
+
+    pool.tickSpacing = newTickSpacing;
+    pool.blockTimestamp = bigIntify(blockHeader.timestamp);
+
+    return pool;
+  }
+}

package/src/dex/algebra/algebra.ts

@@ -51,12 +51,16 @@ import { AlgebraEventPoolV1_1 } from './algebra-pool-v1_1';
 import { AlgebraEventPoolV1_9 } from './algebra-pool-v1_9';
 import { AlgebraFactory, OnPoolCreatedCallback } from './algebra-factory';
 import { applyTransferFee } from '../../lib/token-transfer-fee';
+import { AlgebraEventPoolV1_9_bidirectional_fee } from './algebra-pool-v1_9_bidirectional_fee';
+import { extractReturnAmountPosition } from '../../executor/utils';
 
 type PoolPairsInfo = {
   token0: Address;
   token1: Address;
 };
 
+const PoolsRegistryHashKey = `${CACHE_PREFIX}_poolsRegistry`;
+
 // const ALGEBRA_CLEAN_NOT_EXISTING_POOL_TTL_MS = 3 * 24 * 60 * 60 * 1000; // 3 days
 // const ALGEBRA_CLEAN_NOT_EXISTING_POOL_INTERVAL_MS = 24 * 60 * 60 * 1000; // Once in a day
 const ALGEBRA_EFFICIENCY_FACTOR = 3;
@@ -69,7 +73,10 @@ const MAX_STALE_STATE_BLOCK_AGE = {
   [Network.ZKEVM]: 150, // approximately 3min
 };
 
-type IAlgebraEventPool = AlgebraEventPoolV1_1 | AlgebraEventPoolV1_9;
+type IAlgebraEventPool =
+  | AlgebraEventPoolV1_1
+  | AlgebraEventPoolV1_9
+  | AlgebraEventPoolV1_9_bidirectional_fee;
 
 export class Algebra extends SimpleExchange implements IDex<AlgebraData> {
   private readonly factory: AlgebraFactory;
@@ -95,7 +102,8 @@ export class Algebra extends SimpleExchange implements IDex<AlgebraData> {
 
   private AlgebraPoolImplem:
     | typeof AlgebraEventPoolV1_1
-    | typeof AlgebraEventPoolV1_9;
+    | typeof AlgebraEventPoolV1_9
+    | typeof AlgebraEventPoolV1_9_bidirectional_fee;
 
   readonly SRC_TOKEN_DEX_TRANSFERS = 1;
   readonly DEST_TOKEN_DEX_TRANSFERS = 1;
@@ -132,7 +140,11 @@ export class Algebra extends SimpleExchange implements IDex<AlgebraData> {
       `${CACHE_PREFIX}_${network}_${dexKey}_not_existings_pool_set`.toLowerCase();
 
     this.AlgebraPoolImplem =
-      config.version === 'v1.1' ? AlgebraEventPoolV1_1 : AlgebraEventPoolV1_9;
+      config.version === 'v1.1'
+        ? AlgebraEventPoolV1_1
+        : config.version === 'v1.9-bidirectional-fee'
+        ? AlgebraEventPoolV1_9_bidirectional_fee
+        : AlgebraEventPoolV1_9;
 
     this.factory = new AlgebraFactory(
       dexHelper,
@@ -271,15 +283,6 @@ export class Algebra extends SimpleExchange implements IDex<AlgebraData> {
         this.eventPools[this.getPoolIdentifier(srcAddress, destAddress)] = null;
         return null;
       }
-
-      await this.dexHelper.cache.hset(
-        this.dexmapKey,
-        key,
-        JSON.stringify({
-          token0,
-          token1,
-        }),
-      );
     }
 
     this.logger.trace(`starting to listen to new pool: ${key}`);
@@ -374,10 +377,13 @@ export class Algebra extends SimpleExchange implements IDex<AlgebraData> {
   }
 
   async addMasterPool(poolKey: string, blockNumber: number): Promise<boolean> {
-    const _pairs = await this.dexHelper.cache.hget(this.dexmapKey, poolKey);
+    const _pairs = await this.dexHelper.cache.hget(
+      PoolsRegistryHashKey,
+      `${this.cacheStateKey}_${poolKey}`,
+    );
     if (!_pairs) {
       this.logger.warn(
-        `did not find poolConfig in for key ${this.dexmapKey} ${poolKey}`,
+        `did not find poolConfig in for key ${PoolsRegistryHashKey} ${this.cacheStateKey}_${poolKey}`,
       );
       return false;
     }
@@ -937,6 +943,14 @@ export class Algebra extends SimpleExchange implements IDex<AlgebraData> {
       dexFuncHasRecipient: true,
       exchangeData,
       targetExchange: this.config.router,
+      returnAmountPos:
+        side === SwapSide.SELL
+          ? extractReturnAmountPosition(
+              this.routerIface,
+              swapFunction,
+              'amountOut',
+            )
+          : undefined,
     };
   }
 

package/src/dex/algebra/config.ts

@@ -105,4 +105,8 @@ export const Adapters: Record<number, AdapterMappings> = {
     [SwapSide.SELL]: [{ name: 'OptimismAdapter01', index: 3 }],
     [SwapSide.BUY]: [{ name: 'OptimismBuyAdapter', index: 2 }],
   },
+  [Network.BASE]: {
+    [SwapSide.SELL]: [{ name: 'BaseAdapter01', index: 10 }],
+    [SwapSide.BUY]: [{ name: 'BaseBuyAdapter', index: 6 }],
+  },
 };

package/src/dex/algebra/types.ts

@@ -84,7 +84,7 @@ export type DexParams = {
   deployer: Address;
   subgraphURL: string;
   initHash: string;
-  version: 'v1.1' | 'v1.9';
+  version: 'v1.1' | 'v1.9' | 'v1.9-bidirectional-fee';
   forceRPC?: boolean;
   forceManualStateGenerate?: boolean;
 };