Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
113 changes: 59 additions & 54 deletions .gas-snapshot.runtime
Original file line number Diff line number Diff line change
@@ -1,75 +1,80 @@
DeepstateV1IntegratorFeeGasTest:testGas_IntegratorAndProtocolFeeFill() (gas: 129374)
DeepstateV1IntegratorFeeGasTest:testGas_IntegratorFillAskFullyMatchesSingleBid() (gas: 103768)
DeepstateV1IntegratorFeeGasTest:testGas_IntegratorFillBidFullyMatchesSingleAsk() (gas: 103888)
DeepstateV1IntegratorFeeGasTest:testGas_IntegratorFillRestBidEmptyBook() (gas: 151809)
DeepstateV1IntegratorFeeGasTest:testGas_IntegratorRouteNetsRepeatedFeeToken() (gas: 122504)
RadixMatchingEngineFeeGasTest:testGas_CancelAskSkipsPathologicalBidTree() (gas: 39664)
RadixMatchingEngineFeeGasTest:testGas_CancelFilledBidClaim() (gas: 36750)
RadixMatchingEngineFeeGasTest:testGas_CancelFullDepthBidCombRightmost() (gas: 423078)
RadixMatchingEngineFeeGasTest:testGas_CancelMaxValidDepthAskCombRightmost() (gas: 424771)
RadixMatchingEngineFeeGasTest:testGas_CancelPartialBid() (gas: 48804)
RadixMatchingEngineFeeGasTest:testGas_CancelUnfilledAsk() (gas: 39881)
RadixMatchingEngineFeeGasTest:testGas_CancelUnfilledBid() (gas: 39717)
RadixMatchingEngineFeeGasTest:testGas_FillAskConsumesDirtySamePriceBidSubtree() (gas: 87785)
RadixMatchingEngineFeeGasTest:testGas_FillAskConsumesFullDepthBidComb() (gas: 352938)
RadixMatchingEngineFeeGasTest:testGas_FillAskFullyMatchesSingleBid() (gas: 78136)
RadixMatchingEngineFeeGasTest:testGas_FillAskPartiallyMatchesSingleBid() (gas: 97831)
RadixMatchingEngineFeeGasTest:testGas_FillBidConsumesAskAndRestsRemainder() (gas: 130796)
RadixMatchingEngineFeeGasTest:testGas_FillBidConsumesDirtySamePriceAskSubtree() (gas: 87928)
RadixMatchingEngineFeeGasTest:testGas_FillBidConsumesMaxValidDepthAskComb() (gas: 324052)
RadixMatchingEngineFeeGasTest:testGas_FillBidConsumesSamePriceAskSubtree() (gas: 77920)
RadixMatchingEngineFeeGasTest:testGas_FillBidFullyMatchesSingleAsk() (gas: 77820)
RadixMatchingEngineFeeGasTest:testGas_FillBidPartiallyMatchesSingleAsk() (gas: 97734)
RadixMatchingEngineFeeGasTest:testGas_FillRestAskEmptyBook() (gas: 150833)
RadixMatchingEngineFeeGasTest:testGas_FillRestBidEmptyBook() (gas: 152609)
RadixMatchingEngineFeeGasTest:testGas_LargeRandomBookAskMatchesOneBid() (gas: 122040)
RadixMatchingEngineFeeGasTest:testGas_LargeRandomBookBidMatchesOneAsk() (gas: 137260)
RadixMatchingEngineFeeGasTest:testGas_LargeRandomBookPartialFillsAsk() (gas: 138398)
RadixMatchingEngineFeeGasTest:testGas_LargeRandomBookPartialFillsBid() (gas: 123164)
RadixMatchingEngineFeeGasTest:testGas_LargeRandomBookRestsAsk() (gas: 163907)
RadixMatchingEngineFeeGasTest:testGas_LargeRandomBookRestsBid() (gas: 173244)
RadixMatchingEngineFeeGasTest:testGas_FillAskConsumesDirtySamePriceBidSubtree() (gas: 87846)
RadixMatchingEngineFeeGasTest:testGas_FillAskConsumesFullDepthBidComb() (gas: 352999)
RadixMatchingEngineFeeGasTest:testGas_FillAskFullyMatchesSingleBid() (gas: 78197)
RadixMatchingEngineFeeGasTest:testGas_FillAskPartiallyMatchesSingleBid() (gas: 97892)
RadixMatchingEngineFeeGasTest:testGas_FillBidConsumesAskAndRestsRemainder() (gas: 130838)
RadixMatchingEngineFeeGasTest:testGas_FillBidConsumesDirtySamePriceAskSubtree() (gas: 87970)
RadixMatchingEngineFeeGasTest:testGas_FillBidConsumesMaxValidDepthAskComb() (gas: 324094)
RadixMatchingEngineFeeGasTest:testGas_FillBidConsumesSamePriceAskSubtree() (gas: 77962)
RadixMatchingEngineFeeGasTest:testGas_FillBidFullyMatchesSingleAsk() (gas: 77862)
RadixMatchingEngineFeeGasTest:testGas_FillBidPartiallyMatchesSingleAsk() (gas: 97776)
RadixMatchingEngineFeeGasTest:testGas_FillRestAskEmptyBook() (gas: 150894)
RadixMatchingEngineFeeGasTest:testGas_FillRestBidEmptyBook() (gas: 152651)
RadixMatchingEngineFeeGasTest:testGas_LargeRandomBookAskMatchesOneBid() (gas: 122101)
RadixMatchingEngineFeeGasTest:testGas_LargeRandomBookBidMatchesOneAsk() (gas: 137302)
RadixMatchingEngineFeeGasTest:testGas_LargeRandomBookPartialFillsAsk() (gas: 138440)
RadixMatchingEngineFeeGasTest:testGas_LargeRandomBookPartialFillsBid() (gas: 123225)
RadixMatchingEngineFeeGasTest:testGas_LargeRandomBookRestsAsk() (gas: 163968)
RadixMatchingEngineFeeGasTest:testGas_LargeRandomBookRestsBid() (gas: 173286)
RadixMatchingEngineGasTest:testGas_CancelAskSkipsPathologicalBidTree() (gas: 39664)
RadixMatchingEngineGasTest:testGas_CancelFilledBidClaim() (gas: 36750)
RadixMatchingEngineGasTest:testGas_CancelFullDepthBidCombRightmost() (gas: 423078)
RadixMatchingEngineGasTest:testGas_CancelMaxValidDepthAskCombRightmost() (gas: 424751)
RadixMatchingEngineGasTest:testGas_CancelPartialBid() (gas: 48804)
RadixMatchingEngineGasTest:testGas_CancelUnfilledAsk() (gas: 39881)
RadixMatchingEngineGasTest:testGas_CancelUnfilledBid() (gas: 39717)
RadixMatchingEngineGasTest:testGas_FillAskConsumesDirtySamePriceBidSubtree() (gas: 87178)
RadixMatchingEngineGasTest:testGas_FillAskConsumesFullDepthBidComb() (gas: 327239)
RadixMatchingEngineGasTest:testGas_FillAskFullyMatchesSingleBid() (gas: 77529)
RadixMatchingEngineGasTest:testGas_FillAskPartiallyMatchesSingleBid() (gas: 97224)
RadixMatchingEngineGasTest:testGas_FillBidConsumesAskAndRestsRemainder() (gas: 130196)
RadixMatchingEngineGasTest:testGas_FillBidConsumesDirtySamePriceAskSubtree() (gas: 87331)
RadixMatchingEngineGasTest:testGas_FillBidConsumesMaxValidDepthAskComb() (gas: 323455)
RadixMatchingEngineGasTest:testGas_FillBidConsumesSamePriceAskSubtree() (gas: 77323)
RadixMatchingEngineGasTest:testGas_FillBidFullyMatchesSingleAsk() (gas: 77223)
RadixMatchingEngineGasTest:testGas_FillBidPartiallyMatchesSingleAsk() (gas: 97137)
RadixMatchingEngineGasTest:testGas_FillRestAskEmptyBook() (gas: 150604)
RadixMatchingEngineGasTest:testGas_FillRestBidEmptyBook() (gas: 152387)
RadixMatchingEngineGasTest:testGas_LargeRandomBookAskMatchesOneBid() (gas: 121433)
RadixMatchingEngineGasTest:testGas_LargeRandomBookBidMatchesOneAsk() (gas: 136663)
RadixMatchingEngineGasTest:testGas_LargeRandomBookPartialFillsAsk() (gas: 137801)
RadixMatchingEngineGasTest:testGas_LargeRandomBookPartialFillsBid() (gas: 122557)
RadixMatchingEngineGasTest:testGas_LargeRandomBookRestsAsk() (gas: 163678)
RadixMatchingEngineGasTest:testGas_LargeRandomBookRestsBid() (gas: 173022)
RadixMatchingEngineGasTest:testGas_FillAskConsumesDirtySamePriceBidSubtree() (gas: 87242)
RadixMatchingEngineGasTest:testGas_FillAskConsumesFullDepthBidComb() (gas: 327303)
RadixMatchingEngineGasTest:testGas_FillAskFullyMatchesSingleBid() (gas: 77593)
RadixMatchingEngineGasTest:testGas_FillAskPartiallyMatchesSingleBid() (gas: 97288)
RadixMatchingEngineGasTest:testGas_FillBidConsumesAskAndRestsRemainder() (gas: 130241)
RadixMatchingEngineGasTest:testGas_FillBidConsumesDirtySamePriceAskSubtree() (gas: 87376)
RadixMatchingEngineGasTest:testGas_FillBidConsumesMaxValidDepthAskComb() (gas: 323500)
RadixMatchingEngineGasTest:testGas_FillBidConsumesSamePriceAskSubtree() (gas: 77368)
RadixMatchingEngineGasTest:testGas_FillBidFullyMatchesSingleAsk() (gas: 77268)
RadixMatchingEngineGasTest:testGas_FillBidPartiallyMatchesSingleAsk() (gas: 97182)
RadixMatchingEngineGasTest:testGas_FillRestAskEmptyBook() (gas: 150668)
RadixMatchingEngineGasTest:testGas_FillRestBidEmptyBook() (gas: 152432)
RadixMatchingEngineGasTest:testGas_LargeRandomBookAskMatchesOneBid() (gas: 121497)
RadixMatchingEngineGasTest:testGas_LargeRandomBookBidMatchesOneAsk() (gas: 136708)
RadixMatchingEngineGasTest:testGas_LargeRandomBookPartialFillsAsk() (gas: 137846)
RadixMatchingEngineGasTest:testGas_LargeRandomBookPartialFillsBid() (gas: 122621)
RadixMatchingEngineGasTest:testGas_LargeRandomBookRestsAsk() (gas: 163742)
RadixMatchingEngineGasTest:testGas_LargeRandomBookRestsBid() (gas: 173067)
RadixMatchingEngineHookGasTest:testGas_CancelAskSkipsPathologicalBidTree() (gas: 43705)
RadixMatchingEngineHookGasTest:testGas_CancelFilledBidClaim() (gas: 37497)
RadixMatchingEngineHookGasTest:testGas_CancelFullDepthBidCombRightmost() (gas: 446433)
RadixMatchingEngineHookGasTest:testGas_CancelMaxValidDepthAskCombRightmost() (gas: 447267)
RadixMatchingEngineHookGasTest:testGas_CancelPartialBid() (gas: 53592)
RadixMatchingEngineHookGasTest:testGas_CancelUnfilledAsk() (gas: 43922)
RadixMatchingEngineHookGasTest:testGas_CancelUnfilledBid() (gas: 44505)
RadixMatchingEngineHookGasTest:testGas_FillAskConsumesDirtySamePriceBidSubtree() (gas: 95188)
RadixMatchingEngineHookGasTest:testGas_FillAskConsumesFullDepthBidComb() (gas: 414714)
RadixMatchingEngineHookGasTest:testGas_FillAskFullyMatchesSingleBid() (gas: 85705)
RadixMatchingEngineHookGasTest:testGas_FillAskPartiallyMatchesSingleBid() (gas: 105408)
RadixMatchingEngineHookGasTest:testGas_FillBidConsumesAskAndRestsRemainder() (gas: 139173)
RadixMatchingEngineHookGasTest:testGas_FillBidConsumesDirtySamePriceAskSubtree() (gas: 94198)
RadixMatchingEngineHookGasTest:testGas_FillBidConsumesMaxValidDepthAskComb() (gas: 410071)
RadixMatchingEngineHookGasTest:testGas_FillBidConsumesSamePriceAskSubtree() (gas: 93303)
RadixMatchingEngineHookGasTest:testGas_FillBidFullyMatchesSingleAsk() (gas: 84150)
RadixMatchingEngineHookGasTest:testGas_FillBidPartiallyMatchesSingleAsk() (gas: 104072)
RadixMatchingEngineHookGasTest:testGas_FillRestAskEmptyBook() (gas: 140293)
RadixMatchingEngineHookGasTest:testGas_FillRestBidEmptyBook() (gas: 142073)
RadixMatchingEngineHookGasTest:testGas_LargeRandomBookAskMatchesOneBid() (gas: 138909)
RadixMatchingEngineHookGasTest:testGas_LargeRandomBookBidMatchesOneAsk() (gas: 154741)
RadixMatchingEngineHookGasTest:testGas_LargeRandomBookPartialFillsAsk() (gas: 146826)
RadixMatchingEngineHookGasTest:testGas_LargeRandomBookPartialFillsBid() (gas: 133192)
RadixMatchingEngineHookGasTest:testGas_LargeRandomBookRestsAsk() (gas: 193659)
RadixMatchingEngineHookGasTest:testGas_LargeRandomBookRestsBid() (gas: 198605)
RadixMatchingEngineHookGasTest:testGas_FillAskConsumesDirtySamePriceBidSubtree() (gas: 95252)
RadixMatchingEngineHookGasTest:testGas_FillAskConsumesFullDepthBidComb() (gas: 414778)
RadixMatchingEngineHookGasTest:testGas_FillAskFullyMatchesSingleBid() (gas: 85769)
RadixMatchingEngineHookGasTest:testGas_FillAskPartiallyMatchesSingleBid() (gas: 105472)
RadixMatchingEngineHookGasTest:testGas_FillBidConsumesAskAndRestsRemainder() (gas: 139218)
RadixMatchingEngineHookGasTest:testGas_FillBidConsumesDirtySamePriceAskSubtree() (gas: 94243)
RadixMatchingEngineHookGasTest:testGas_FillBidConsumesMaxValidDepthAskComb() (gas: 410116)
RadixMatchingEngineHookGasTest:testGas_FillBidConsumesSamePriceAskSubtree() (gas: 93348)
RadixMatchingEngineHookGasTest:testGas_FillBidFullyMatchesSingleAsk() (gas: 84195)
RadixMatchingEngineHookGasTest:testGas_FillBidPartiallyMatchesSingleAsk() (gas: 104117)
RadixMatchingEngineHookGasTest:testGas_FillRestAskEmptyBook() (gas: 140357)
RadixMatchingEngineHookGasTest:testGas_FillRestBidEmptyBook() (gas: 142118)
RadixMatchingEngineHookGasTest:testGas_LargeRandomBookAskMatchesOneBid() (gas: 138973)
RadixMatchingEngineHookGasTest:testGas_LargeRandomBookBidMatchesOneAsk() (gas: 154786)
RadixMatchingEngineHookGasTest:testGas_LargeRandomBookPartialFillsAsk() (gas: 146871)
RadixMatchingEngineHookGasTest:testGas_LargeRandomBookPartialFillsBid() (gas: 133256)
RadixMatchingEngineHookGasTest:testGas_LargeRandomBookRestsAsk() (gas: 193723)
RadixMatchingEngineHookGasTest:testGas_LargeRandomBookRestsBid() (gas: 198650)
2 changes: 2 additions & 0 deletions .github/workflows/verify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,8 @@ jobs:
contract: RadixMatchingEngineHookGasTest
- label: fees
contract: RadixMatchingEngineFeeGasTest
- label: integrator-fees
contract: DeepstateV1IntegratorFeeGasTest
env:
FOUNDRY_DISABLE_NIGHTLY_WARNING: "1"
steps:
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ INVARIANT_DEPTH ?= 64
INVARIANT_SHARDS ?= 8
INVARIANT_SHARD ?= 1
INVARIANT_CONTRACTS ?= .*(RadixMatchingEngineInvariantTest|DeepstateV1MultiPoolInvariantTest|DeepstateV1NativeETHInvariantTest).*
GAS_CONTRACTS ?= RadixMatchingEngine(Gas|HookGas|FeeGas)Test
GAS_CONTRACTS ?= (RadixMatchingEngine(Gas|HookGas|FeeGas)Test|DeepstateV1IntegratorFeeGasTest)
COVERAGE_FILES ?= src/DeepstateV1.sol,src/libraries/TickMath32.sol
COVERAGE_EXCLUSIONS ?= coverage.exclusions.json
# Coverage runs every behavioral, routing, boundary, and math test. Formal proofs, stateful
Expand Down Expand Up @@ -61,7 +61,7 @@ snapshot-runtime-check:
forge snapshot --isolate --force --match-contract '$(GAS_CONTRACTS)' --check .gas-snapshot.runtime

build-size:
forge build --sizes
forge build --sizes src/DeepstateV1.sol

tick-reference:
python3 script/check_tick_math.py --check test/TickMath32.t.sol
Expand Down
79 changes: 44 additions & 35 deletions coverage.exclusions.json
Original file line number Diff line number Diff line change
Expand Up @@ -98,42 +98,51 @@
2033,
2057,
2067,
2282,
2292,
2320,
2324,
2366,
2367,
2368,
2369,
2382,
2306,
2316,
2379,
2383,
2384,
2385,
2386,
2387,
2561,
2630,
2631,
2811,
2812,
2813,
2840,
2844,
2846,
2871,
2875,
2877,
2915,
2924,
2929,
2945,
2950,
2998,
2999,
3066
2421,
2424,
2465,
2466,
2467,
2468,
2481,
2482,
2483,
2484,
2485,
2486,
2660,
2759,
2760,
2940,
2941,
2942,
2969,
2973,
2975,
3000,
3004,
3006,
3026,
3030,
3032,
3070,
3079,
3084,
3100,
3105,
3153,
3154,
3172,
3173,
3227,
3235,
3300
],
"statements": 136,
"statements": 145,
"functions": [],
"branches": [
"240:0:0",
Expand All @@ -145,7 +154,7 @@
"1938:149:0",
"1945:150:0",
"1975:151:0",
"2811:190:0"
"2940:198:0"
]
},
"src/libraries/TickMath32.sol": {
Expand Down
Loading