@paraswap/dex-lib 2.35.6-ramses-v2-50-fee-pools-bug → 2.35.6

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.
Files changed (9) hide show
  1. package/build/config.js +13 -13
  2. package/build/dex-helper/dummy-dex-helper.js +4 -1
  3. package/build/dex-helper/dummy-dex-helper.js.map +1 -1
  4. package/package.json +1 -1
  5. package/src/config.ts +13 -13
  6. package/src/dex/hashflow/hashflow-e2e.test.ts +36 -3
  7. package/src/dex-helper/dummy-dex-helper.ts +4 -1
  8. package/tests/tenderly-simulation.ts +2 -2
  9. package/tests/utils-e2e.ts +2 -1
package/build/config.js CHANGED
@@ -20,9 +20,9 @@ const baseConfigs = {
20
20
  adapterAddresses: {
21
21
  Adapter01: '0x9bE264469eF954c139Da4A45Cf76CbCC5e3A6A73',
22
22
  Adapter02: '0xFC2Ba6E830a04C25e207B8214b26d8C713F6881F',
23
- Adapter03: '0x7c7f62e5ba00783f57b39df0530e32c195696a57',
23
+ Adapter03: '0xfb2a3de6c7B8c77b520E3da16021f3D8A4E93168',
24
24
  Adapter04: '0x30F6B9b6485ff0B67E881f5ac80D3F1c70A4B23d',
25
- BuyAdapter: '0xDCf4EE5B700e2a5Fec458e06B763A4a3E3004494',
25
+ BuyAdapter: '0x613876f3dE2Ec633f8054fE7a561324c1a01d9cB',
26
26
  },
27
27
  uniswapV2ExchangeRouterAddress: '0xF9234CB08edb93c0d4a4d4c70cC3FfD070e78e07',
28
28
  rpcPollingMaxAllowedStateDelayInBlocks: 0,
@@ -127,8 +127,8 @@ const baseConfigs = {
127
127
  hashFlowDisabledMMs: process.env[`HASHFLOW_DISABLED_MMS_56`]?.split(',') || [],
128
128
  adapterAddresses: {
129
129
  BscAdapter01: '0xA31d9C571DF00e0F428B0bD24c34D103E8112222',
130
- BscAdapter02: '0x1d2Fd92a1942A92a51198168eFCd626ed441CEC0',
131
- BscBuyAdapter: '0x64C856fafE4C83a818514cBDfD661a3563a71B98',
130
+ BscAdapter02: '0x02f2c31ebDE63E871AD0E74c01E21c819292a59D',
131
+ BscBuyAdapter: '0x301c2813e3ceb43A448a12f21551EDBcdC37F157',
132
132
  },
133
133
  rpcPollingMaxAllowedStateDelayInBlocks: 1,
134
134
  rpcPollingBlocksBackToTriggerUpdate: 1,
@@ -153,8 +153,8 @@ const baseConfigs = {
153
153
  hashFlowDisabledMMs: process.env[`HASHFLOW_DISABLED_MMS_137`]?.split(',') || [],
154
154
  adapterAddresses: {
155
155
  PolygonAdapter01: '0xE44769f42E1e9592f86B82f206407a8f7C84b4ed',
156
- PolygonAdapter02: '0xa05d8C3F278fC7b20b39Ea7A3035E3aD8D808c78',
157
- PolygonBuyAdapter: '0xB11bCA7B01b425afD0743A4D77B4f593883f94C0',
156
+ PolygonAdapter02: '0x654cD2Cf97D23059B3db4FaA38BB2b1F8351211d',
157
+ PolygonBuyAdapter: '0x4426a1F87Ee7e366542c58e29c02AFa2b5878b37',
158
158
  },
159
159
  uniswapV2ExchangeRouterAddress: '0xf3938337F7294fEf84e9B2c6D548A93F956Cc281',
160
160
  uniswapV3EventLoggingSampleRate: 0,
@@ -181,8 +181,8 @@ const baseConfigs = {
181
181
  hashFlowDisabledMMs: process.env[`HASHFLOW_DISABLED_MMS_43114`]?.split(',') || [],
182
182
  adapterAddresses: {
183
183
  AvalancheAdapter01: '0x745Ec73855CeC7249E5fF4c9DD81cc65b4D297a9',
184
- AvalancheAdapter02: '0xDCf4EE5B700e2a5Fec458e06B763A4a3E3004494',
185
- AvalancheBuyAdapter: '0x7ebbDBB57d2ab59079423cf8337cf8805e225bB1',
184
+ AvalancheAdapter02: '0xFb8773AA4Fd02e54bbd352061D8Be1911FAa210a',
185
+ AvalancheBuyAdapter: '0x434C1Cca4842629230067674Dd54E21a14D9FD5D',
186
186
  },
187
187
  uniswapV2ExchangeRouterAddress: '0x53e693c6C7FFC4446c53B205Cf513105Bf140D7b',
188
188
  rfqConfigs: {},
@@ -231,9 +231,9 @@ const baseConfigs = {
231
231
  hashFlowAuthToken: process.env.API_KEY_HASHFLOW_AUTH_TOKEN || '',
232
232
  hashFlowDisabledMMs: process.env[`HASHFLOW_DISABLED_MMS_42161`]?.split(',') || [],
233
233
  adapterAddresses: {
234
- ArbitrumAdapter01: '0x745Ec73855CeC7249E5fF4c9DD81cc65b4D297a9',
235
- ArbitrumAdapter02: '0x3ad7f275E27AC579cA88e0b4765828242A9E8C49',
236
- ArbitrumBuyAdapter: '0x6c33C7f6CBB4a428fe9ee31ca500a787c9f1525b',
234
+ ArbitrumAdapter01: '0xD8134ACfc9c71Ab51452b5bA23A31354F4739032',
235
+ ArbitrumAdapter02: '0xD1F70c98a78d48A93F0B4dDa49057469dc5aC126',
236
+ ArbitrumBuyAdapter: '0x434C1Cca4842629230067674Dd54E21a14D9FD5D',
237
237
  },
238
238
  uniswapV2ExchangeRouterAddress: '0xB41dD984730dAf82f5C41489E21ac79D5e3B61bC',
239
239
  uniswapV3EventLoggingSampleRate: 0,
@@ -258,8 +258,8 @@ const baseConfigs = {
258
258
  hashFlowAuthToken: process.env.API_KEY_HASHFLOW_AUTH_TOKEN || '',
259
259
  hashFlowDisabledMMs: process.env[`HASHFLOW_DISABLED_MMS_10`]?.split(',') || [],
260
260
  adapterAddresses: {
261
- OptimismAdapter01: '0x4669D27A649f5451e0D44C20a2b246431F1B0572',
262
- OptimismBuyAdapter: '0xb2634B3CBc1E401AB3C2743DB44d459C5c9aA662',
261
+ OptimismAdapter01: '0x3ad7f275E27AC579cA88e0b4765828242A9E8C49',
262
+ OptimismBuyAdapter: '0xfdDD975FE4c1af20c24A3Ad2b33e8609a62DDC73',
263
263
  },
264
264
  uniswapV2ExchangeRouterAddress: '0xB41dD984730dAf82f5C41489E21ac79D5e3B61bC',
265
265
  uniswapV3EventLoggingSampleRate: 0,
package/build/dex-helper/dummy-dex-helper.js CHANGED
@@ -29,12 +29,15 @@ class DummyCache {
29
29
  return null;
30
30
  }
31
31
  async rawget(key) {
32
+ return this.storage[key] ? this.storage[key] : null;
32
33
  return null;
33
34
  }
34
35
  async rawset(key, value, ttl) {
35
- return null;
36
+ this.storage[key] = value;
37
+ return 'OK';
36
38
  }
37
39
  async rawdel(key) {
40
+ delete this.storage[key];
38
41
  return;
39
42
  }
40
43
  async del(dexKey, network, cacheKey) {
package/build/dex-helper/dummy-dex-helper.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"dummy-dex-helper.js","sourceRoot":"","sources":["../../src/dex-helper/dummy-dex-helper.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"dummy-dex-helper.js","sourceRoot":"","sources":["../../src/dex-helper/dummy-dex-helper.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@paraswap/dex-lib",
3
- "version": "2.35.6-ramses-v2-50-fee-pools-bug",
3
+ "version": "2.35.6",
4
4
  "main": "build/index.js",
5
5
  "types": "build/index.d.ts",
6
6
  "repository": "https://github.com/paraswap/paraswap-dex-lib",
package/src/config.ts CHANGED
@@ -50,9 +50,9 @@ const baseConfigs: { [network: number]: BaseConfig } = {
50
50
  adapterAddresses: {
51
51
  Adapter01: '0x9bE264469eF954c139Da4A45Cf76CbCC5e3A6A73',
52
52
  Adapter02: '0xFC2Ba6E830a04C25e207B8214b26d8C713F6881F',
53
- Adapter03: '0x7c7f62e5ba00783f57b39df0530e32c195696a57',
53
+ Adapter03: '0xfb2a3de6c7B8c77b520E3da16021f3D8A4E93168',
54
54
  Adapter04: '0x30F6B9b6485ff0B67E881f5ac80D3F1c70A4B23d',
55
- BuyAdapter: '0xDCf4EE5B700e2a5Fec458e06B763A4a3E3004494',
55
+ BuyAdapter: '0x613876f3dE2Ec633f8054fE7a561324c1a01d9cB',
56
56
  },
57
57
  uniswapV2ExchangeRouterAddress:
58
58
  '0xF9234CB08edb93c0d4a4d4c70cC3FfD070e78e07',
@@ -163,8 +163,8 @@ const baseConfigs: { [network: number]: BaseConfig } = {
163
163
  process.env[`HASHFLOW_DISABLED_MMS_56`]?.split(',') || [],
164
164
  adapterAddresses: {
165
165
  BscAdapter01: '0xA31d9C571DF00e0F428B0bD24c34D103E8112222',
166
- BscAdapter02: '0x1d2Fd92a1942A92a51198168eFCd626ed441CEC0',
167
- BscBuyAdapter: '0x64C856fafE4C83a818514cBDfD661a3563a71B98',
166
+ BscAdapter02: '0x02f2c31ebDE63E871AD0E74c01E21c819292a59D',
167
+ BscBuyAdapter: '0x301c2813e3ceb43A448a12f21551EDBcdC37F157',
168
168
  },
169
169
  rpcPollingMaxAllowedStateDelayInBlocks: 1,
170
170
  rpcPollingBlocksBackToTriggerUpdate: 1,
@@ -191,8 +191,8 @@ const baseConfigs: { [network: number]: BaseConfig } = {
191
191
  process.env[`HASHFLOW_DISABLED_MMS_137`]?.split(',') || [],
192
192
  adapterAddresses: {
193
193
  PolygonAdapter01: '0xE44769f42E1e9592f86B82f206407a8f7C84b4ed',
194
- PolygonAdapter02: '0xa05d8C3F278fC7b20b39Ea7A3035E3aD8D808c78',
195
- PolygonBuyAdapter: '0xB11bCA7B01b425afD0743A4D77B4f593883f94C0',
194
+ PolygonAdapter02: '0x654cD2Cf97D23059B3db4FaA38BB2b1F8351211d',
195
+ PolygonBuyAdapter: '0x4426a1F87Ee7e366542c58e29c02AFa2b5878b37',
196
196
  },
197
197
  uniswapV2ExchangeRouterAddress:
198
198
  '0xf3938337F7294fEf84e9B2c6D548A93F956Cc281',
@@ -221,8 +221,8 @@ const baseConfigs: { [network: number]: BaseConfig } = {
221
221
  process.env[`HASHFLOW_DISABLED_MMS_43114`]?.split(',') || [],
222
222
  adapterAddresses: {
223
223
  AvalancheAdapter01: '0x745Ec73855CeC7249E5fF4c9DD81cc65b4D297a9',
224
- AvalancheAdapter02: '0xDCf4EE5B700e2a5Fec458e06B763A4a3E3004494',
225
- AvalancheBuyAdapter: '0x7ebbDBB57d2ab59079423cf8337cf8805e225bB1',
224
+ AvalancheAdapter02: '0xFb8773AA4Fd02e54bbd352061D8Be1911FAa210a',
225
+ AvalancheBuyAdapter: '0x434C1Cca4842629230067674Dd54E21a14D9FD5D',
226
226
  },
227
227
  uniswapV2ExchangeRouterAddress:
228
228
  '0x53e693c6C7FFC4446c53B205Cf513105Bf140D7b',
@@ -276,9 +276,9 @@ const baseConfigs: { [network: number]: BaseConfig } = {
276
276
  hashFlowDisabledMMs:
277
277
  process.env[`HASHFLOW_DISABLED_MMS_42161`]?.split(',') || [],
278
278
  adapterAddresses: {
279
- ArbitrumAdapter01: '0x745Ec73855CeC7249E5fF4c9DD81cc65b4D297a9',
280
- ArbitrumAdapter02: '0x3ad7f275E27AC579cA88e0b4765828242A9E8C49',
281
- ArbitrumBuyAdapter: '0x6c33C7f6CBB4a428fe9ee31ca500a787c9f1525b',
279
+ ArbitrumAdapter01: '0xD8134ACfc9c71Ab51452b5bA23A31354F4739032',
280
+ ArbitrumAdapter02: '0xD1F70c98a78d48A93F0B4dDa49057469dc5aC126',
281
+ ArbitrumBuyAdapter: '0x434C1Cca4842629230067674Dd54E21a14D9FD5D',
282
282
  },
283
283
  uniswapV2ExchangeRouterAddress:
284
284
  '0xB41dD984730dAf82f5C41489E21ac79D5e3B61bC',
@@ -306,8 +306,8 @@ const baseConfigs: { [network: number]: BaseConfig } = {
306
306
  process.env[`HASHFLOW_DISABLED_MMS_10`]?.split(',') || [],
307
307
 
308
308
  adapterAddresses: {
309
- OptimismAdapter01: '0x4669D27A649f5451e0D44C20a2b246431F1B0572',
310
- OptimismBuyAdapter: '0xb2634B3CBc1E401AB3C2743DB44d459C5c9aA662',
309
+ OptimismAdapter01: '0x3ad7f275E27AC579cA88e0b4765828242A9E8C49',
310
+ OptimismBuyAdapter: '0xfdDD975FE4c1af20c24A3Ad2b33e8609a62DDC73',
311
311
  },
312
312
  uniswapV2ExchangeRouterAddress:
313
313
  '0xB41dD984730dAf82f5C41489E21ac79D5e3B61bC',
package/src/dex/hashflow/hashflow-e2e.test.ts CHANGED
@@ -11,6 +11,9 @@ import { Network, ContractMethod, SwapSide } from '../../constants';
11
11
  import { StaticJsonRpcProvider } from '@ethersproject/providers';
12
12
  import { generateConfig } from '../../config';
13
13
 
14
+ // Give time for rate fetcher to fill the cache
15
+ const sleepMs = 3000;
16
+
14
17
  function testForNetwork(
15
18
  network: Network,
16
19
  dexKey: string,
@@ -58,6 +61,11 @@ function testForNetwork(
58
61
  contractMethod,
59
62
  network,
60
63
  provider,
64
+ undefined,
65
+ undefined,
66
+ undefined,
67
+ undefined,
68
+ sleepMs,
61
69
  );
62
70
  });
63
71
  it(`${tokenBSymbol} -> ${tokenASymbol}`, async () => {
@@ -71,6 +79,11 @@ function testForNetwork(
71
79
  contractMethod,
72
80
  network,
73
81
  provider,
82
+ undefined,
83
+ undefined,
84
+ undefined,
85
+ undefined,
86
+ sleepMs,
74
87
  );
75
88
  });
76
89
  } else {
@@ -85,6 +98,11 @@ function testForNetwork(
85
98
  contractMethod,
86
99
  network,
87
100
  provider,
101
+ undefined,
102
+ undefined,
103
+ undefined,
104
+ undefined,
105
+ sleepMs,
88
106
  );
89
107
  });
90
108
  it(`${tokenASymbol} -> ${nativeTokenSymbol}`, async () => {
@@ -98,6 +116,11 @@ function testForNetwork(
98
116
  contractMethod,
99
117
  network,
100
118
  provider,
119
+ undefined,
120
+ undefined,
121
+ undefined,
122
+ undefined,
123
+ sleepMs,
101
124
  );
102
125
  });
103
126
  it(`${tokenASymbol} -> ${tokenBSymbol}`, async () => {
@@ -111,6 +134,11 @@ function testForNetwork(
111
134
  contractMethod,
112
135
  network,
113
136
  provider,
137
+ undefined,
138
+ undefined,
139
+ undefined,
140
+ undefined,
141
+ sleepMs,
114
142
  );
115
143
  });
116
144
  it(`${tokenBSymbol} -> ${tokenASymbol}`, async () => {
@@ -124,6 +152,11 @@ function testForNetwork(
124
152
  contractMethod,
125
153
  network,
126
154
  provider,
155
+ undefined,
156
+ undefined,
157
+ undefined,
158
+ undefined,
159
+ sleepMs,
127
160
  );
128
161
  });
129
162
  }
@@ -163,9 +196,9 @@ describe('Hashflow E2E', () => {
163
196
  const tokenASymbol: string = 'USDC';
164
197
  const tokenBSymbol: string = 'DAI';
165
198
 
166
- const tokenAAmount: string = '100000000';
167
- const tokenBAmount: string = '100000000000000000000';
168
- const nativeTokenAmount = '1000000000000000000';
199
+ const tokenAAmount: string = '1000000000';
200
+ const tokenBAmount: string = '1000000000000000000000';
201
+ const nativeTokenAmount = '100000000000000000000';
169
202
 
170
203
  testForNetwork(
171
204
  network,
package/src/dex-helper/dummy-dex-helper.ts CHANGED
@@ -41,6 +41,7 @@ class DummyCache implements ICache {
41
41
  }
42
42
 
43
43
  async rawget(key: string): Promise<string | null> {
44
+ return this.storage[key] ? this.storage[key] : null;
44
45
  return null;
45
46
  }
46
47
 
@@ -49,10 +50,12 @@ class DummyCache implements ICache {
49
50
  value: string,
50
51
  ttl: number,
51
52
  ): Promise<string | null> {
52
- return null;
53
+ this.storage[key] = value;
54
+ return 'OK';
53
55
  }
54
56
 
55
57
  async rawdel(key: string): Promise<void> {
58
+ delete this.storage[key];
56
59
  return;
57
60
  }
58
61
 
package/tests/tenderly-simulation.ts CHANGED
@@ -149,13 +149,13 @@ export class TenderlySimulation implements TransactionSimulator {
149
149
  return {
150
150
  success: true,
151
151
  gasUsed: data.transaction.gas_used,
152
- tenderlyUrl: `https://dashboard.tenderly.co/${TENDERLY_ACCOUNT_ID}/${TENDERLY_PROJECT}/fork/${this.forkId}/simulation/${lastTx}`,
152
+ url: `https://dashboard.tenderly.co/${TENDERLY_ACCOUNT_ID}/${TENDERLY_PROJECT}/fork/${this.forkId}/simulation/${lastTx}`,
153
153
  transaction: data.transaction,
154
154
  };
155
155
  } else {
156
156
  return {
157
157
  success: false,
158
- tenderlyUrl: `https://dashboard.tenderly.co/${TENDERLY_ACCOUNT_ID}/${TENDERLY_PROJECT}/fork/${this.forkId}/simulation/${lastTx}`,
158
+ url: `https://dashboard.tenderly.co/${TENDERLY_ACCOUNT_ID}/${TENDERLY_PROJECT}/fork/${this.forkId}/simulation/${lastTx}`,
159
159
  error: `Simulation failed: ${data.transaction.error_info.error_message} at ${data.transaction.error_info.address}`,
160
160
  };
161
161
  }
package/tests/utils-e2e.ts CHANGED
@@ -298,6 +298,7 @@ export async function testE2E(
298
298
  ),
299
299
  );
300
300
  expect(whitelistTx.success).toEqual(true);
301
+ console.log(`Successfully whitelisted ${deployedTestContractAddress}`);
301
302
 
302
303
  if (testContractType === 'router') {
303
304
  const setImplementationTx = await ts.simulate(
@@ -622,7 +623,7 @@ export async function newTestE2E({
622
623
  parseInt(priceRoute.gasCost) - parseInt(swapTx!.gasUsed)
623
624
  }`,
624
625
  );
625
- console.log(`Tenderly URL: ${swapTx!.tenderlyUrl}`);
626
+ console.log(`Tenderly URL: ${swapTx!.url}`);
626
627
  expect(swapTx!.success).toEqual(true);
627
628
  }
628
629
  } finally {