Skip to content

Commit

Permalink
merge in main; fix conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
saucepoint committed Dec 4, 2024
2 parents ea227f3 + b8dcc0a commit 31ba536
Show file tree
Hide file tree
Showing 198 changed files with 2,848 additions and 935 deletions.
2 changes: 1 addition & 1 deletion .forge-snapshots/BaseActionsRouter_mock10commands.snap
Original file line number Diff line number Diff line change
@@ -1 +1 @@
60677
61332
Original file line number Diff line number Diff line change
@@ -1 +1 @@
129854
132997
Original file line number Diff line number Diff line change
@@ -1 +1 @@
131905
134973
Original file line number Diff line number Diff line change
@@ -1 +1 @@
124110
127102
Original file line number Diff line number Diff line change
@@ -1 +1 @@
124252
127212
2 changes: 1 addition & 1 deletion .forge-snapshots/PositionManager_burn_empty.snap
Original file line number Diff line number Diff line change
@@ -1 +1 @@
50446
51576
2 changes: 1 addition & 1 deletion .forge-snapshots/PositionManager_burn_empty_native.snap
Original file line number Diff line number Diff line change
@@ -1 +1 @@
50446
51576
Original file line number Diff line number Diff line change
@@ -1 +1 @@
125574
128316
Original file line number Diff line number Diff line change
@@ -1 +1 @@
125021
127696
Original file line number Diff line number Diff line change
@@ -1 +1 @@
132427
135236
Original file line number Diff line number Diff line change
@@ -1 +1 @@
131874
134615
2 changes: 1 addition & 1 deletion .forge-snapshots/PositionManager_collect_native.snap
Original file line number Diff line number Diff line change
@@ -1 +1 @@
146282
148571
2 changes: 1 addition & 1 deletion .forge-snapshots/PositionManager_collect_sameRange.snap
Original file line number Diff line number Diff line change
@@ -1 +1 @@
154848
157220
2 changes: 1 addition & 1 deletion .forge-snapshots/PositionManager_collect_withClose.snap
Original file line number Diff line number Diff line change
@@ -1 +1 @@
154848
157220
2 changes: 1 addition & 1 deletion .forge-snapshots/PositionManager_collect_withTakePair.snap
Original file line number Diff line number Diff line change
@@ -1 +1 @@
154169
156456
Original file line number Diff line number Diff line change
@@ -1 +1 @@
111971
114165
Original file line number Diff line number Diff line change
@@ -1 +1 @@
119729
122555
Original file line number Diff line number Diff line change
@@ -1 +1 @@
119050
121791
2 changes: 1 addition & 1 deletion .forge-snapshots/PositionManager_decrease_burnEmpty.snap
Original file line number Diff line number Diff line change
@@ -1 +1 @@
135224
138177
Original file line number Diff line number Diff line change
@@ -1 +1 @@
128371
131258
Original file line number Diff line number Diff line change
@@ -1 +1 @@
132416
135218
2 changes: 1 addition & 1 deletion .forge-snapshots/PositionManager_decrease_take_take.snap
Original file line number Diff line number Diff line change
@@ -1 +1 @@
120305
123169
Original file line number Diff line number Diff line change
@@ -1 +1 @@
159033
162419
Original file line number Diff line number Diff line change
@@ -1 +1 @@
157973
161283
Original file line number Diff line number Diff line change
@@ -1 +1 @@
140860
145296
Original file line number Diff line number Diff line change
@@ -1 +1 @@
136359
138010
Original file line number Diff line number Diff line change
@@ -1 +1 @@
177340
180194
Original file line number Diff line number Diff line change
@@ -1 +1 @@
148016
150782
2 changes: 1 addition & 1 deletion .forge-snapshots/PositionManager_mint_native.snap
Original file line number Diff line number Diff line change
@@ -1 +1 @@
364721
369623
Original file line number Diff line number Diff line change
@@ -1 +1 @@
373244
378280
Original file line number Diff line number Diff line change
@@ -1 +1 @@
372467
377364
2 changes: 1 addition & 1 deletion .forge-snapshots/PositionManager_mint_onSameTickLower.snap
Original file line number Diff line number Diff line change
@@ -1 +1 @@
317569
321205
2 changes: 1 addition & 1 deletion .forge-snapshots/PositionManager_mint_onSameTickUpper.snap
Original file line number Diff line number Diff line change
@@ -1 +1 @@
318239
321875
2 changes: 1 addition & 1 deletion .forge-snapshots/PositionManager_mint_sameRange.snap
Original file line number Diff line number Diff line change
@@ -1 +1 @@
243808
247444
Original file line number Diff line number Diff line change
@@ -1 +1 @@
418988
423280
Original file line number Diff line number Diff line change
@@ -1 +1 @@
323600
327236
2 changes: 1 addition & 1 deletion .forge-snapshots/PositionManager_mint_withClose.snap
Original file line number Diff line number Diff line change
@@ -1 +1 @@
420122
423986
2 changes: 1 addition & 1 deletion .forge-snapshots/PositionManager_mint_withSettlePair.snap
Original file line number Diff line number Diff line change
@@ -1 +1 @@
419180
422936
Original file line number Diff line number Diff line change
@@ -1 +1 @@
463927
460558
2 changes: 1 addition & 1 deletion .forge-snapshots/PositionManager_permit.snap
Original file line number Diff line number Diff line change
@@ -1 +1 @@
79076
79259
Original file line number Diff line number Diff line change
@@ -1 +1 @@
61976
62159
2 changes: 1 addition & 1 deletion .forge-snapshots/PositionManager_permit_twice.snap
Original file line number Diff line number Diff line change
@@ -1 +1 @@
44876
45035
2 changes: 1 addition & 1 deletion .forge-snapshots/PositionManager_subscribe.snap
Original file line number Diff line number Diff line change
@@ -1 +1 @@
84348
88475
2 changes: 1 addition & 1 deletion .forge-snapshots/PositionManager_unsubscribe.snap
Original file line number Diff line number Diff line change
@@ -1 +1 @@
59238
63253
Original file line number Diff line number Diff line change
@@ -1 +1 @@
143930
146317
Original file line number Diff line number Diff line change
@@ -1 +1 @@
149382
151973
2 changes: 1 addition & 1 deletion .forge-snapshots/Quoter_exactOutputSingle_oneForZero.snap
Original file line number Diff line number Diff line change
@@ -1 +1 @@
78203
80048
2 changes: 1 addition & 1 deletion .forge-snapshots/Quoter_exactOutputSingle_zeroForOne.snap
Original file line number Diff line number Diff line change
@@ -1 +1 @@
82626
84626
Original file line number Diff line number Diff line change
@@ -1 +1 @@
120491
122994
Original file line number Diff line number Diff line change
@@ -1 +1 @@
145414
147949
Original file line number Diff line number Diff line change
@@ -1 +1 @@
79437
81420
2 changes: 1 addition & 1 deletion .forge-snapshots/Quoter_quoteExactInput_twoHops.snap
Original file line number Diff line number Diff line change
@@ -1 +1 @@
201179
205421
Original file line number Diff line number Diff line change
@@ -1 +1 @@
119782
122296
Original file line number Diff line number Diff line change
@@ -1 +1 @@
149919
152648
Original file line number Diff line number Diff line change
@@ -1 +1 @@
119850
122364
Original file line number Diff line number Diff line change
@@ -1 +1 @@
96549
98875
2 changes: 1 addition & 1 deletion .forge-snapshots/Quoter_quoteExactOutput_twoHops.snap
Original file line number Diff line number Diff line change
@@ -1 +1 @@
200630
204897
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2259
2367
Original file line number Diff line number Diff line change
@@ -1 +1 @@
8003
8444
2 changes: 1 addition & 1 deletion .forge-snapshots/StateView_extsload_getLiquidity.snap
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1399
1480
2 changes: 1 addition & 1 deletion .forge-snapshots/StateView_extsload_getPositionInfo.snap
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2829
2973
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1651
1750
2 changes: 1 addition & 1 deletion .forge-snapshots/StateView_extsload_getSlot0.snap
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1446
1548
2 changes: 1 addition & 1 deletion .forge-snapshots/StateView_extsload_getTickBitmap.snap
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1392
1476
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2546
2672
2 changes: 1 addition & 1 deletion .forge-snapshots/StateView_extsload_getTickInfo.snap
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2761
2896
2 changes: 1 addition & 1 deletion .forge-snapshots/StateView_extsload_getTickLiquidity.snap
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1646
1748
2 changes: 1 addition & 1 deletion .forge-snapshots/V4Router_Bytecode.snap
Original file line number Diff line number Diff line change
@@ -1 +1 @@
7148
5137
2 changes: 1 addition & 1 deletion .forge-snapshots/V4Router_ExactIn1Hop_nativeIn.snap
Original file line number Diff line number Diff line change
@@ -1 +1 @@
115722
121819
2 changes: 1 addition & 1 deletion .forge-snapshots/V4Router_ExactIn1Hop_nativeOut.snap
Original file line number Diff line number Diff line change
@@ -1 +1 @@
116043
120826
2 changes: 1 addition & 1 deletion .forge-snapshots/V4Router_ExactIn1Hop_oneForZero.snap
Original file line number Diff line number Diff line change
@@ -1 +1 @@
124861
129715
2 changes: 1 addition & 1 deletion .forge-snapshots/V4Router_ExactIn1Hop_zeroForOne.snap
Original file line number Diff line number Diff line change
@@ -1 +1 @@
130584
135623
2 changes: 1 addition & 1 deletion .forge-snapshots/V4Router_ExactIn2Hops.snap
Original file line number Diff line number Diff line change
@@ -1 +1 @@
185439
191979
2 changes: 1 addition & 1 deletion .forge-snapshots/V4Router_ExactIn2Hops_nativeIn.snap
Original file line number Diff line number Diff line change
@@ -1 +1 @@
170577
178175
2 changes: 1 addition & 1 deletion .forge-snapshots/V4Router_ExactIn3Hops.snap
Original file line number Diff line number Diff line change
@@ -1 +1 @@
240297
248385
2 changes: 1 addition & 1 deletion .forge-snapshots/V4Router_ExactIn3Hops_nativeIn.snap
Original file line number Diff line number Diff line change
@@ -1 +1 @@
225435
234581
2 changes: 1 addition & 1 deletion .forge-snapshots/V4Router_ExactInputSingle.snap
Original file line number Diff line number Diff line change
@@ -1 +1 @@
129854
134546
2 changes: 1 addition & 1 deletion .forge-snapshots/V4Router_ExactInputSingle_nativeIn.snap
Original file line number Diff line number Diff line change
@@ -1 +1 @@
114992
120742
2 changes: 1 addition & 1 deletion .forge-snapshots/V4Router_ExactInputSingle_nativeOut.snap
Original file line number Diff line number Diff line change
@@ -1 +1 @@
115282
119714
Original file line number Diff line number Diff line change
@@ -1 +1 @@
121985
128078
Loading

0 comments on commit 31ba536

Please sign in to comment.