@paraswap/dex-lib 2.28.9 → 2.28.10-camelot-v3-tick-bugs.0

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 (12) hide show
  1. package/build/dex/algebra/algebra.d.ts +1 -1
  2. package/build/dex/algebra/algebra.js.map +1 -1
  3. package/build/dex/algebra/config.js +1 -1
  4. package/build/dex/algebra/config.js.map +1 -1
  5. package/build/dex/algebra/lib/TickTable.js +46 -35
  6. package/build/dex/algebra/lib/TickTable.js.map +1 -1
  7. package/package.json +1 -1
  8. package/src/dex/algebra/algebra-integration.test.ts +102 -16
  9. package/src/dex/algebra/algebra.ts +1 -1
  10. package/src/dex/algebra/config.ts +1 -1
  11. package/src/dex/algebra/lib/TickTable.ts +63 -65
  12. package/tests/constants-e2e.ts +4 -4
package/build/dex/algebra/algebra.d.ts CHANGED
@@ -15,7 +15,7 @@ export declare class Algebra extends SimpleExchange implements IDex<AlgebraData>
15
15
  protected adapters: import("../../types").AdapterMappings;
16
16
  readonly routerIface: Interface;
17
17
  readonly quoterIface: Interface;
18
- protected config: DexParams;
18
+ readonly config: DexParams;
19
19
  readonly isFeeOnTransferSupported: boolean;
20
20
  protected eventPools: Record<string, IAlgebraEventPool | null>;
21
21
  readonly hasConstantPriceLargeAmounts = false;
package/build/dex/algebra/algebra.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"algebra.js","sourceRoot":"","sources":["../../../src/dex/algebra/algebra.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"algebra.js","sourceRoot":"","sources":["../../../src/dex/algebra/algebra.ts"],"names":[],"mappings":"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"}
package/build/dex/algebra/config.js CHANGED
@@ -72,7 +72,7 @@ exports.AlgebraConfig = {
72
72
  uniswapMulticall: '0x1F98415757620B543A52E61c46B32eB19261F984',
73
73
  deployer: '0x6dd3fb9653b10e806650f107c3b5a0a6ff974f65',
74
74
  version: 'v1.9',
75
- forceRPC: true,
75
+ forceRPC: false,
76
76
  },
77
77
  },
78
78
  };
package/build/dex/algebra/config.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/dex/algebra/config.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/dex/algebra/config.ts"],"names":[],"mappings":"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"}
package/build/dex/algebra/lib/TickTable.js CHANGED
@@ -54,11 +54,11 @@ class TickTable {
54
54
  if (tickSpacing !== undefined) {
55
55
  tick = yul_helper_1.Yul.sub(yul_helper_1.Yul.sdiv(tick, tickSpacing), yul_helper_1.Yul.and(yul_helper_1.Yul.slt(tick, 0n), yul_helper_1.Yul.not(yul_helper_1.Yul.iszero(yul_helper_1.Yul.smod(tick, tickSpacing)))));
56
56
  }
57
- const [rowNumber, bitNumber] = TickTable.position(tick);
58
- isWordPosOut(rowNumber, state.startTickBitmap, isPriceQuery);
59
- let tickBitmapValue = state.tickBitmap[rowNumber.toString()];
60
- tickBitmapValue = tickBitmapValue === undefined ? 0n : tickBitmapValue;
61
57
  if (lte) {
58
+ const [rowNumber, bitNumber] = TickTable.position(tick);
59
+ isWordPosOut(rowNumber, state.startTickBitmap, isPriceQuery);
60
+ let tickBitmapValue = state.tickBitmap[rowNumber.toString()];
61
+ tickBitmapValue = tickBitmapValue === undefined ? 0n : tickBitmapValue;
62
62
  const _row = tickBitmapValue << (255n - bitNumber);
63
63
  if (_row != 0n) {
64
64
  tick -= BigInt.asIntN(24, 255n - TickTable.getMostSignificantBit(_row));
@@ -71,6 +71,10 @@ class TickTable {
71
71
  }
72
72
  else {
73
73
  tick += 1n;
74
+ const [rowNumber, bitNumber] = TickTable.position(tick);
75
+ isWordPosOut(rowNumber, state.startTickBitmap, isPriceQuery);
76
+ let tickBitmapValue = state.tickBitmap[rowNumber.toString()];
77
+ tickBitmapValue = tickBitmapValue === undefined ? 0n : tickBitmapValue;
74
78
  const _row = tickBitmapValue >> bitNumber;
75
79
  if (_row !== 0n) {
76
80
  tick += BigInt.asIntN(24, TickTable.getSingleSignificantBit(-_row & _row));
@@ -84,47 +88,54 @@ class TickTable {
84
88
  }
85
89
  static getSingleSignificantBit(word) {
86
90
  let singleBitPos = 0n;
87
- singleBitPos = yul_helper_1.Yul.iszero(word &&
88
- BigInt('0x5555555555555555555555555555555555555555555555555555555555555555'));
91
+ singleBitPos = yul_helper_1.Yul.iszero(word &
92
+ 0x5555555555555555555555555555555555555555555555555555555555555555n);
89
93
  singleBitPos =
90
- singleBitPos ||
91
- yul_helper_1.Yul.iszero(word &&
92
- BigInt('0x00000000000000000000000000000000ffffffffffffffffffffffffffffffff')) << 7n;
94
+ singleBitPos |
95
+ (yul_helper_1.Yul.iszero(word &
96
+ 0x00000000000000000000000000000000ffffffffffffffffffffffffffffffffn) <<
97
+ 7n);
93
98
  singleBitPos =
94
- singleBitPos ||
95
- yul_helper_1.Yul.iszero(word &&
96
- BigInt('0x0000000000000000ffffffffffffffff0000000000000000ffffffffffffffff')) << 6n;
99
+ singleBitPos |
100
+ (yul_helper_1.Yul.iszero(word &
101
+ 0x0000000000000000ffffffffffffffff0000000000000000ffffffffffffffffn) <<
102
+ 6n);
97
103
  singleBitPos =
98
- singleBitPos ||
99
- yul_helper_1.Yul.iszero(word &&
100
- BigInt('0x00000000ffffffff00000000ffffffff00000000ffffffff00000000ffffffff')) << 5n;
104
+ singleBitPos |
105
+ (yul_helper_1.Yul.iszero(word &
106
+ 0x00000000ffffffff00000000ffffffff00000000ffffffff00000000ffffffffn) <<
107
+ 5n);
101
108
  singleBitPos =
102
- singleBitPos ||
103
- yul_helper_1.Yul.iszero(word &&
104
- BigInt('0x0000ffff0000ffff0000ffff0000ffff0000ffff0000ffff0000ffff0000ffff')) << 4n;
109
+ singleBitPos |
110
+ (yul_helper_1.Yul.iszero(word &
111
+ 0x0000ffff0000ffff0000ffff0000ffff0000ffff0000ffff0000ffff0000ffffn) <<
112
+ 4n);
105
113
  singleBitPos =
106
- singleBitPos ||
107
- yul_helper_1.Yul.iszero(word &&
108
- BigInt('0x00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff')) << 3n;
114
+ singleBitPos |
115
+ (yul_helper_1.Yul.iszero(word &
116
+ 0x00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ffn) <<
117
+ 3n);
109
118
  singleBitPos =
110
- singleBitPos ||
111
- yul_helper_1.Yul.iszero(word &&
112
- BigInt('0x0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f')) << 2n;
119
+ singleBitPos |
120
+ (yul_helper_1.Yul.iszero(word &
121
+ 0x0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0fn) <<
122
+ 2n);
113
123
  singleBitPos =
114
- singleBitPos ||
115
- yul_helper_1.Yul.iszero(word &&
116
- BigInt('0x3333333333333333333333333333333333333333333333333333333333333333')) << 1n;
124
+ singleBitPos |
125
+ (yul_helper_1.Yul.iszero(word &
126
+ 0x3333333333333333333333333333333333333333333333333333333333333333n) <<
127
+ 1n);
117
128
  return BigInt.asUintN(8, singleBitPos);
118
129
  }
119
130
  static getMostSignificantBit(word) {
120
- word = word || word >> 1n;
121
- word = word || word >> 2n;
122
- word = word || word >> 4n;
123
- word = word || word >> 8n;
124
- word = word || word >> 16n;
125
- word = word || word >> 32n;
126
- word = word || word >> 64n;
127
- word = word || word >> 128n;
131
+ word = word | (word >> 1n);
132
+ word = word | (word >> 2n);
133
+ word = word | (word >> 4n);
134
+ word = word | (word >> 8n);
135
+ word = word | (word >> 16n);
136
+ word = word | (word >> 32n);
137
+ word = word | (word >> 64n);
138
+ word = word | (word >> 128n);
128
139
  word = word - (word >> 1n);
129
140
  return TickTable.getSingleSignificantBit(BigInt.asUintN(256, word));
130
141
  }
package/build/dex/algebra/lib/TickTable.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"TickTable.js","sourceRoot":"","sources":["../../../../src/dex/algebra/lib/TickTable.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"TickTable.js","sourceRoot":"","sources":["../../../../src/dex/algebra/lib/TickTable.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.28.9",
3
+ "version": "2.28.10-camelot-v3-tick-bugs.0",
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/dex/algebra/algebra-integration.test.ts CHANGED
@@ -15,21 +15,6 @@ import {
15
15
  import { Tokens } from '../../../tests/constants-e2e';
16
16
  import { Address } from '@paraswap/core';
17
17
 
18
- /*
19
- README
20
- ======
21
-
22
- This test script adds tests for Algebra general integration
23
- with the DEX interface. The test cases below are example tests.
24
- It is recommended to add tests which cover Algebra specific
25
- logic.
26
-
27
- You can run this individual test script by running:
28
- `npx jest src/dex/<dex-name>/<dex-name>-integration.test.ts`
29
-
30
- (This comment should be removed from the final implementation)
31
- */
32
-
33
18
  function getReaderCalldata(
34
19
  exchangeAddress: string,
35
20
  readerIface: Interface,
@@ -70,7 +55,7 @@ async function checkOnChainPricing(
70
55
  tokenOut: Address,
71
56
  amounts: bigint[],
72
57
  ) {
73
- const exchangeAddress = '0xa15f0d7377b2a0c0c10db057f641bed21028fc89'; // Quoter address
58
+ const exchangeAddress = algebra.config.quoter;
74
59
 
75
60
  const readerIface = algebra.quoterIface;
76
61
 
@@ -155,6 +140,107 @@ async function testPricingOnNetwork(
155
140
  );
156
141
  }
157
142
 
143
+ describe('CamelotV3', function () {
144
+ const dexKey = 'CamelotV3';
145
+ let blockNumber: number;
146
+ let algebra: Algebra;
147
+
148
+ describe('Arbitrum', () => {
149
+ const network = Network.ARBITRUM;
150
+ const dexHelper = new DummyDexHelper(network);
151
+
152
+ const tokens = Tokens[network];
153
+
154
+ const srcTokenSymbol = 'USDCe';
155
+ const destTokenSymbol = 'GRAIL';
156
+
157
+ const amountsForSell = [
158
+ 0n,
159
+ 10_000n * BI_POWS[tokens[srcTokenSymbol].decimals],
160
+ 20_000n * BI_POWS[tokens[srcTokenSymbol].decimals],
161
+ 30_000n * BI_POWS[tokens[srcTokenSymbol].decimals],
162
+ 40_000n * BI_POWS[tokens[srcTokenSymbol].decimals],
163
+ 50_000n * BI_POWS[tokens[srcTokenSymbol].decimals],
164
+ 60_000n * BI_POWS[tokens[srcTokenSymbol].decimals],
165
+ 70_000n * BI_POWS[tokens[srcTokenSymbol].decimals],
166
+ 80_000n * BI_POWS[tokens[srcTokenSymbol].decimals],
167
+ 90_000n * BI_POWS[tokens[srcTokenSymbol].decimals],
168
+ 100_000n * BI_POWS[tokens[srcTokenSymbol].decimals],
169
+ ];
170
+
171
+ const amountsForBuy = [
172
+ 0n,
173
+ 1n * BI_POWS[tokens[destTokenSymbol].decimals],
174
+ 2n * BI_POWS[tokens[destTokenSymbol].decimals],
175
+ 3n * BI_POWS[tokens[destTokenSymbol].decimals],
176
+ 4n * BI_POWS[tokens[destTokenSymbol].decimals],
177
+ 5n * BI_POWS[tokens[destTokenSymbol].decimals],
178
+ 6n * BI_POWS[tokens[destTokenSymbol].decimals],
179
+ 7n * BI_POWS[tokens[destTokenSymbol].decimals],
180
+ 8n * BI_POWS[tokens[destTokenSymbol].decimals],
181
+ 9n * BI_POWS[tokens[destTokenSymbol].decimals],
182
+ 10n * BI_POWS[tokens[destTokenSymbol].decimals],
183
+ ];
184
+
185
+ beforeAll(async () => {
186
+ blockNumber = await dexHelper.web3Provider.eth.getBlockNumber();
187
+ algebra = new Algebra(network, dexKey, dexHelper);
188
+ if (algebra.initializePricing) {
189
+ await algebra.initializePricing(blockNumber);
190
+ }
191
+ });
192
+
193
+ it('getPoolIdentifiers and getPricesVolume SELL', async function () {
194
+ await testPricingOnNetwork(
195
+ algebra,
196
+ network,
197
+ dexKey,
198
+ dexHelper,
199
+ blockNumber,
200
+ srcTokenSymbol,
201
+ destTokenSymbol,
202
+ SwapSide.SELL,
203
+ amountsForSell,
204
+ 'quoteExactInputSingle',
205
+ );
206
+ });
207
+
208
+ it('getPoolIdentifiers and getPricesVolume BUY', async function () {
209
+ await testPricingOnNetwork(
210
+ algebra,
211
+ network,
212
+ dexKey,
213
+ dexHelper,
214
+ blockNumber,
215
+ srcTokenSymbol,
216
+ destTokenSymbol,
217
+ SwapSide.BUY,
218
+ amountsForBuy,
219
+ 'quoteExactOutputSingle',
220
+ );
221
+ });
222
+
223
+ it('getTopPoolsForToken', async function () {
224
+ // We have to check without calling initializePricing, because
225
+ // pool-tracker is not calling that function
226
+ const newAlgebra = new Algebra(network, dexKey, dexHelper);
227
+ const poolLiquidity = await newAlgebra.getTopPoolsForToken(
228
+ tokens[srcTokenSymbol].address,
229
+ 10,
230
+ );
231
+ console.log(`${srcTokenSymbol} Top Pools:`, poolLiquidity);
232
+
233
+ if (!newAlgebra.hasConstantPriceLargeAmounts) {
234
+ checkPoolsLiquidity(
235
+ poolLiquidity,
236
+ Tokens[network][srcTokenSymbol].address,
237
+ dexKey,
238
+ );
239
+ }
240
+ });
241
+ });
242
+ });
243
+
158
244
  describe('Algebra', function () {
159
245
  const dexKey = 'QuickSwapV3';
160
246
  let blockNumber: number;
package/src/dex/algebra/algebra.ts CHANGED
@@ -88,7 +88,7 @@ export class Algebra extends SimpleExchange implements IDex<AlgebraData> {
88
88
  protected adapters = Adapters[network] || {},
89
89
  readonly routerIface = new Interface(UniswapV3RouterABI), // same abi as uniswapV3
90
90
  readonly quoterIface = new Interface(AlgebraQuoterABI),
91
- protected config = AlgebraConfig[dexKey][network],
91
+ readonly config = AlgebraConfig[dexKey][network],
92
92
  ) {
93
93
  super(dexHelper, dexKey);
94
94
  this.logger = dexHelper.getLogger(dexKey + '-' + network);
package/src/dex/algebra/config.ts CHANGED
@@ -82,7 +82,7 @@ export const AlgebraConfig: DexConfigMap<DexParams> = {
82
82
  uniswapMulticall: '0x1F98415757620B543A52E61c46B32eB19261F984',
83
83
  deployer: '0x6dd3fb9653b10e806650f107c3b5a0a6ff974f65',
84
84
  version: 'v1.9',
85
- forceRPC: true,
85
+ forceRPC: false,
86
86
  },
87
87
  },
88
88
  };
package/src/dex/algebra/lib/TickTable.ts CHANGED
@@ -91,11 +91,12 @@ export class TickTable {
91
91
  ),
92
92
  );
93
93
  }
94
- const [rowNumber, bitNumber] = TickTable.position(tick);
95
- isWordPosOut(rowNumber, state.startTickBitmap, isPriceQuery);
96
- let tickBitmapValue = state.tickBitmap[rowNumber.toString()];
97
- tickBitmapValue = tickBitmapValue === undefined ? 0n : tickBitmapValue;
98
94
  if (lte) {
95
+ const [rowNumber, bitNumber] = TickTable.position(tick);
96
+ isWordPosOut(rowNumber, state.startTickBitmap, isPriceQuery);
97
+ let tickBitmapValue = state.tickBitmap[rowNumber.toString()];
98
+ tickBitmapValue = tickBitmapValue === undefined ? 0n : tickBitmapValue;
99
+
99
100
  const _row = tickBitmapValue << (255n - bitNumber);
100
101
  if (_row != 0n) {
101
102
  tick -= BigInt.asIntN(24, 255n - TickTable.getMostSignificantBit(_row));
@@ -106,6 +107,12 @@ export class TickTable {
106
107
  }
107
108
  } else {
108
109
  tick += 1n;
110
+
111
+ const [rowNumber, bitNumber] = TickTable.position(tick);
112
+ isWordPosOut(rowNumber, state.startTickBitmap, isPriceQuery);
113
+ let tickBitmapValue = state.tickBitmap[rowNumber.toString()];
114
+ tickBitmapValue = tickBitmapValue === undefined ? 0n : tickBitmapValue;
115
+
109
116
  const _row = tickBitmapValue >> bitNumber;
110
117
  if (_row !== 0n) {
111
118
  tick += BigInt.asIntN(
@@ -123,80 +130,71 @@ export class TickTable {
123
130
  static getSingleSignificantBit(word: bigint): bigint {
124
131
  let singleBitPos = 0n;
125
132
  singleBitPos = Yul.iszero(
126
- word &&
127
- BigInt(
128
- '0x5555555555555555555555555555555555555555555555555555555555555555',
129
- ),
133
+ word &
134
+ 0x5555555555555555555555555555555555555555555555555555555555555555n,
130
135
  );
131
136
  singleBitPos =
132
- singleBitPos ||
133
- Yul.iszero(
134
- word &&
135
- BigInt(
136
- '0x00000000000000000000000000000000ffffffffffffffffffffffffffffffff',
137
- ),
138
- ) << 7n;
137
+ singleBitPos |
138
+ (Yul.iszero(
139
+ word &
140
+ 0x00000000000000000000000000000000ffffffffffffffffffffffffffffffffn,
141
+ ) <<
142
+ 7n);
139
143
  singleBitPos =
140
- singleBitPos ||
141
- Yul.iszero(
142
- word &&
143
- BigInt(
144
- '0x0000000000000000ffffffffffffffff0000000000000000ffffffffffffffff',
145
- ),
146
- ) << 6n;
144
+ singleBitPos |
145
+ (Yul.iszero(
146
+ word &
147
+ 0x0000000000000000ffffffffffffffff0000000000000000ffffffffffffffffn,
148
+ ) <<
149
+ 6n);
147
150
  singleBitPos =
148
- singleBitPos ||
149
- Yul.iszero(
150
- word &&
151
- BigInt(
152
- '0x00000000ffffffff00000000ffffffff00000000ffffffff00000000ffffffff',
153
- ),
154
- ) << 5n;
151
+ singleBitPos |
152
+ (Yul.iszero(
153
+ word &
154
+ 0x00000000ffffffff00000000ffffffff00000000ffffffff00000000ffffffffn,
155
+ ) <<
156
+ 5n);
155
157
  singleBitPos =
156
- singleBitPos ||
157
- Yul.iszero(
158
- word &&
159
- BigInt(
160
- '0x0000ffff0000ffff0000ffff0000ffff0000ffff0000ffff0000ffff0000ffff',
161
- ),
162
- ) << 4n;
158
+ singleBitPos |
159
+ (Yul.iszero(
160
+ word &
161
+ 0x0000ffff0000ffff0000ffff0000ffff0000ffff0000ffff0000ffff0000ffffn,
162
+ ) <<
163
+ 4n);
163
164
  singleBitPos =
164
- singleBitPos ||
165
- Yul.iszero(
166
- word &&
167
- BigInt(
168
- '0x00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff',
169
- ),
170
- ) << 3n;
165
+ singleBitPos |
166
+ (Yul.iszero(
167
+ word &
168
+ 0x00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ffn,
169
+ ) <<
170
+ 3n);
171
171
  singleBitPos =
172
- singleBitPos ||
173
- Yul.iszero(
174
- word &&
175
- BigInt(
176
- '0x0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f',
177
- ),
178
- ) << 2n;
172
+ singleBitPos |
173
+ (Yul.iszero(
174
+ word &
175
+ 0x0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0fn,
176
+ ) <<
177
+ 2n);
179
178
  singleBitPos =
180
- singleBitPos ||
181
- Yul.iszero(
182
- word &&
183
- BigInt(
184
- '0x3333333333333333333333333333333333333333333333333333333333333333',
185
- ),
186
- ) << 1n;
179
+ singleBitPos |
180
+ (Yul.iszero(
181
+ word &
182
+ 0x3333333333333333333333333333333333333333333333333333333333333333n,
183
+ ) <<
184
+ 1n);
187
185
 
188
186
  return BigInt.asUintN(8, singleBitPos);
189
187
  }
190
188
 
191
189
  static getMostSignificantBit(word: bigint): bigint {
192
- word = word || word >> 1n;
193
- word = word || word >> 2n;
194
- word = word || word >> 4n;
195
- word = word || word >> 8n;
196
- word = word || word >> 16n;
197
- word = word || word >> 32n;
198
- word = word || word >> 64n;
199
- word = word || word >> 128n;
190
+ word = word | (word >> 1n);
191
+ word = word | (word >> 2n);
192
+ word = word | (word >> 4n);
193
+ word = word | (word >> 8n);
194
+ word = word | (word >> 16n);
195
+ word = word | (word >> 32n);
196
+ word = word | (word >> 64n);
197
+ word = word | (word >> 128n);
200
198
  word = word - (word >> 1n);
201
199
  return TickTable.getSingleSignificantBit(BigInt.asUintN(256, word));
202
200
  }
package/tests/constants-e2e.ts CHANGED
@@ -785,14 +785,14 @@ export const Tokens: {
785
785
  address: '0x2f2a2543b76a4166549f7aab2e75bef0aefc5b0f',
786
786
  decimals: 8,
787
787
  },
788
- USDCe: {
789
- address: '0xff970a61a04b1ca14834a43f5de4533ebddb5cc8',
790
- decimals: 6,
791
- },
792
788
  LEX: {
793
789
  address: '0x6bB7A17AcC227fd1F6781D1EEDEAE01B42047eE0',
794
790
  decimals: 18,
795
791
  },
792
+ GRAIL: {
793
+ address: '0x3d9907f9a368ad0a51be60f7da3b97cf940982d8',
794
+ decimals: 18,
795
+ },
796
796
  },
797
797
  [Network.OPTIMISM]: {
798
798
  DAI: {