diff --git a/.gas-snapshot b/.gas-snapshot
index ceda2802..87fa46d5 100644
--- a/.gas-snapshot
+++ b/.gas-snapshot
@@ -1,7 +1,7 @@
 AccountDelegate:test_isAccountDelegate_account_doesnt_exist() (gas: 26743)
-AccountDelegate:test_isAccountDelegate_false() (gas: 397544)
-AccountDelegate:test_isAccountDelegate_true() (gas: 395514)
-AccountDelegate:test_isAccountDelegate_zero_address_caller() (gas: 28029)
+AccountDelegate:test_isAccountDelegate_false() (gas: 397500)
+AccountDelegate:test_isAccountDelegate_true() (gas: 395470)
+AccountDelegate:test_isAccountDelegate_zero_address_caller() (gas: 27985)
 AccountOwner:test_isAccountOwner_account_doesnt_exist() (gas: 29978)
 AccountOwner:test_isAccountOwner_false() (gas: 235169)
 AccountOwner:test_isAccountOwner_true() (gas: 235159)
@@ -11,36 +11,39 @@ CanExecute:test_canExecute_false_invalid_signature() (gas: 455279)
 CanExecute:test_canExecute_false_invalid_signer() (gas: 448270)
 CanExecute:test_canExecute_false_maxExecutorFee_exceeded() (gas: 403759)
 CanExecute:test_canExecute_false_nonce_used() (gas: 1028844)
-CanExecute:test_canExecute_false_require_verify_condition_not_met() (gas: 538438)
+CanExecute:test_canExecute_false_require_verify_condition_not_met() (gas: 538460)
 CanExecute:test_canExecute_false_trusted_executor() (gas: 444532)
 CanExecute:test_canExecute_true() (gas: 444149)
 CommitOrder:test_commitOrder() (gas: 585339)
 CommitOrder:test_commitOrder_Unauthorized() (gas: 37908)
 CommitOrder:test_commitOrder_insufficient_collateral() (gas: 425933)
 CommitOrder:test_commitOrder_invalid_market() (gas: 44592)
-Conditions:test_isOrderFeeBelow() (gas: 154802)
+Conditions:test_isOrderFeeBelow() (gas: 154868)
 Conditions:test_isPositionSizeAbove() (gas: 24623)
-Conditions:test_isPositionSizeBelow() (gas: 24532)
-Conditions:test_isPriceAbove() (gas: 175726)
-Conditions:test_isPriceBelow() (gas: 175643)
-Conditions:test_isTimestampAfter() (gas: 13288)
-Conditions:test_isTimestampBefore() (gas: 13310)
-Credit:test_credit(uint256) (runs: 256, μ: 94026, ~: 103617)
-Credit:test_credit_event() (gas: 88153)
-Debit:test_debit(uint256) (runs: 256, μ: 135804, ~: 145727)
-Debit:test_debit_InsufficientBalance() (gas: 122862)
-Debit:test_debit_Unauthorized() (gas: 122911)
-Debit:test_debit_event() (gas: 104517)
-DeploymentTest:test_deploy() (gas: 4562614)
-DeploymentTest:test_deploy_perps_market_proxy_zero_address() (gas: 58650)
-DeploymentTest:test_deploy_spot_market_proxy_zero_address() (gas: 56053)
-DeploymentTest:test_deploy_susd_proxy_zero_address() (gas: 56040)
+Conditions:test_isPositionSizeBelow() (gas: 24598)
+Conditions:test_isPriceAbove() (gas: 175814)
+Conditions:test_isPriceBelow() (gas: 175731)
+Conditions:test_isTimestampAfter() (gas: 13354)
+Conditions:test_isTimestampBefore() (gas: 13376)
+Credit:test_credit(uint256) (runs: 256, μ: 94465, ~: 105154)
+Credit:test_credit_event() (gas: 88175)
+Credit:test_credit_zap() (gas: 679183)
+Debit:test_debit(uint256) (runs: 256, μ: 137033, ~: 147361)
+Debit:test_debit_InsufficientBalance() (gas: 122884)
+Debit:test_debit_Unauthorized() (gas: 122901)
+Debit:test_debit_event() (gas: 104535)
+Debit:test_debit_zap() (gas: 987564)
+Debit:test_debit_zap_Unauthorized() (gas: 123023)
+DeploymentTest:test_deploy() (gas: 4568832)
+DeploymentTest:test_deploy_perps_market_proxy_zero_address() (gas: 58659)
+DeploymentTest:test_deploy_spot_market_proxy_zero_address() (gas: 56062)
+DeploymentTest:test_deploy_susd_proxy_zero_address() (gas: 56049)
 DepositCollateral:test_depositCollateral() (gas: 433746)
 DepositCollateral:test_depositCollateral_availableMargin() (gas: 437913)
 DepositCollateral:test_depositCollateral_collateralAmount() (gas: 433866)
 DepositCollateral:test_depositCollateral_insufficient_balance() (gas: 61182)
 DepositCollateral:test_depositCollateral_totalCollateralValue() (gas: 435542)
-DepositCollateral:test_depositCollateral_zap() (gas: 941559)
+DepositCollateral:test_depositCollateral_zap() (gas: 942619)
 EIP712Test:test_DOMAIN_SEPARATOR() (gas: 165)
 EIP712Test:test_buildDomainSeparator() (gas: 165)
 EIP712Test:test_cachedDomainSeparatorInvalidated() (gas: 144)
@@ -56,9 +59,9 @@ Execute:test_execute_order_committed() (gas: 632349)
 Fee:test_fee_exceeds_account_credit() (gas: 125042)
 Fee:test_fee_exceeds_maxExecutorFee() (gas: 124604)
 Fee:test_fee_imposed() (gas: 719871)
-FulfillOracleQuery:test_fulfillOracleQuery(bytes) (runs: 256, μ: 31280, ~: 31272)
-FulfillOracleQuery:test_fulfillOracleQuery_refund(bytes) (runs: 256, μ: 40303, ~: 40295)
-FulfillOracleQuery:test_fulfillOracleQuery_revert(bytes) (runs: 256, μ: 32927, ~: 32919)
+FulfillOracleQuery:test_fulfillOracleQuery(bytes) (runs: 256, μ: 31302, ~: 31294)
+FulfillOracleQuery:test_fulfillOracleQuery_refund(bytes) (runs: 256, μ: 40325, ~: 40317)
+FulfillOracleQuery:test_fulfillOracleQuery_revert(bytes) (runs: 256, μ: 32949, ~: 32941)
 MathLibTest:test_abs128() (gas: 448)
 MathLibTest:test_abs256() (gas: 458)
 MathLibTest:test_fuzz_abs128(int128) (runs: 256, μ: 578, ~: 603)
@@ -67,12 +70,12 @@ MathLibTest:test_fuzz_toInt256(uint256) (runs: 256, μ: 1054, ~: 438)
 MathLibTest:test_isSameSign() (gas: 999)
 MathLibTest:test_toInt256() (gas: 3347)
 MathLibTest:test_toInt256_overflow() (gas: 3251)
-MockUpgrade:test_upgrade() (gas: 4586818)
-MockUpgrade:test_upgrade_credit_state(uint256) (runs: 256, μ: 4665339, ~: 4665339)
-MockUpgrade:test_upgrade_nonce_state(uint256) (runs: 256, μ: 4620625, ~: 4620625)
-MockUpgrade:test_upgrade_only_pDAO() (gas: 4571918)
-MulticallFulfillOracleQuery:test_fulfillOracleQuery_multicall(bytes) (runs: 256, μ: 34586, ~: 34521)
-MulticallFulfillOracleQuery:test_fulfillOracleQuery_multicall_double_spend(bytes) (runs: 256, μ: 47615, ~: 47489)
+MockUpgrade:test_upgrade() (gas: 4593013)
+MockUpgrade:test_upgrade_credit_state(uint256) (runs: 256, μ: 4671534, ~: 4671534)
+MockUpgrade:test_upgrade_nonce_state(uint256) (runs: 256, μ: 4626754, ~: 4626754)
+MockUpgrade:test_upgrade_only_pDAO() (gas: 4578113)
+MulticallFulfillOracleQuery:test_fulfillOracleQuery_multicall(bytes) (runs: 256, μ: 34630, ~: 34565)
+MulticallFulfillOracleQuery:test_fulfillOracleQuery_multicall_double_spend(bytes) (runs: 256, μ: 47681, ~: 47555)
 MulticallablePayableTest:testMulticallableBenchmark() (gas: 29229)
 MulticallablePayableTest:testMulticallableOriginalBenchmark() (gas: 38407)
 MulticallablePayableTest:testMulticallablePreservesMsgSender() (gas: 11065)
@@ -84,29 +87,29 @@ MulticallablePayableTest:testMulticallableRevertWithMessage() (gas: 13406)
 MulticallablePayableTest:testMulticallableRevertWithMessage(string) (runs: 256, μ: 14013, ~: 13861)
 MulticallablePayableTest:testMulticallableRevertWithNothing() (gas: 11633)
 MulticallablePayableTest:testMulticallableWithNoData() (gas: 6266)
-NonceBitmapTest:test_fuzz_invalidateUnorderedNonces(uint256) (runs: 256, μ: 58065, ~: 58065)
-NonceBitmapTest:test_hasUnorderedNonceBeenUsed() (gas: 59816)
-NonceBitmapTest:test_invalidateUnorderedNonces() (gas: 83141)
-NonceBitmapTest:test_invalidateUnorderedNonces_Only_Owner_Delegate() (gas: 196599)
-NonceBitmapTest:test_invalidateUnorderedNonces_Unauthorized() (gas: 35573)
-NonceBitmapTest:test_invalidateUnorderedNonces_event() (gas: 58321)
+NonceBitmapTest:test_fuzz_invalidateUnorderedNonces(uint256) (runs: 256, μ: 57999, ~: 57999)
+NonceBitmapTest:test_hasUnorderedNonceBeenUsed() (gas: 59750)
+NonceBitmapTest:test_invalidateUnorderedNonces() (gas: 83075)
+NonceBitmapTest:test_invalidateUnorderedNonces_Only_Owner_Delegate() (gas: 196467)
+NonceBitmapTest:test_invalidateUnorderedNonces_Unauthorized() (gas: 35507)
+NonceBitmapTest:test_invalidateUnorderedNonces_event() (gas: 58255)
 ReduceOnly:test_reduce_only() (gas: 634071)
 ReduceOnly:test_reduce_only_same_sign() (gas: 77865)
 ReduceOnly:test_reduce_only_truncate_size_down() (gas: 634211)
 ReduceOnly:test_reduce_only_truncate_size_up() (gas: 614756)
 ReduceOnly:test_reduce_only_when_position_doesnt_exist() (gas: 166319)
 ReduceOnly:test_reduce_only_zero_size_delta() (gas: 166353)
-RemoveUpgradability:test_removeUpgradability() (gas: 4557239)
+RemoveUpgradability:test_removeUpgradability() (gas: 4563434)
 SignatureCheckerLibTest:test_isValidSignatureNowCalldata(address,bytes32,bytes) (runs: 256, μ: 3487, ~: 3474)
-VerifyConditions:test_max_condition_size_exceeded() (gas: 51317)
-VerifyConditions:test_verifyConditions_InvalidConditionSelector() (gas: 19085)
-VerifyConditions:test_verify_conditions_not_verified() (gas: 127879)
-VerifyConditions:test_verify_conditions_verified() (gas: 175681)
+VerifyConditions:test_max_condition_size_exceeded() (gas: 51339)
+VerifyConditions:test_verifyConditions_InvalidConditionSelector() (gas: 19107)
+VerifyConditions:test_verify_conditions_not_verified() (gas: 127989)
+VerifyConditions:test_verify_conditions_verified() (gas: 175835)
 VerifySignature:test_verifySignature(uint256) (runs: 256, μ: 30191, ~: 30191)
 VerifySignature:test_verifySignature_false_private_key() (gas: 32855)
-VerifySigner:test_verifySigner() (gas: 30918)
-VerifySigner:test_verifySigner_false() (gas: 33626)
+VerifySigner:test_verifySigner() (gas: 30940)
+VerifySigner:test_verifySigner_false() (gas: 33648)
 WithdrawCollateral:test_withdrawCollateral() (gas: 539651)
 WithdrawCollateral:test_withdrawCollateral_insufficient_account_collateral_balance() (gas: 445868)
-WithdrawCollateral:test_withdrawCollateral_zap() (gas: 936156)
+WithdrawCollateral:test_withdrawCollateral_zap() (gas: 937481)
 WithdrawCollateral:test_withdrawCollateral_zero() (gas: 441518)
\ No newline at end of file
diff --git a/lcov.info b/lcov.info
index 15df7538..51f8940a 100644
--- a/lcov.info
+++ b/lcov.info
@@ -1,52 +1,52 @@
 TN:
 SF:script/Deploy.s.sol
-FN:165,DeployOptimism_Synthetix.run
-FNDA:0,DeployOptimism_Synthetix.run
-DA:166,0
-DA:167,0
-DA:169,0
-DA:178,0
-FN:57,DeployBase_Synthetix.run
-FNDA:0,DeployBase_Synthetix.run
-DA:58,0
-DA:59,0
-DA:61,0
-DA:70,0
+FN:99,DeployBaseGoerli_Synthetix.run
+FNDA:0,DeployBaseGoerli_Synthetix.run
+DA:100,0
+DA:101,0
+DA:103,0
+DA:112,0
+FN:28,Setup.deploySystem
+FNDA:4,Setup.deploySystem
+DA:36,88
+DA:46,85
+DA:49,85
 FN:186,DeployOptimismGoerli_Synthetix.run
 FNDA:0,DeployOptimismGoerli_Synthetix.run
 DA:187,0
 DA:188,0
 DA:190,0
 DA:199,0
-FN:78,DeployBase_Andromeda.run
-FNDA:0,DeployBase_Andromeda.run
-DA:79,0
-DA:80,0
-DA:82,0
-DA:91,0
-FN:28,Setup.deploySystem
-FNDA:4,Setup.deploySystem
-DA:36,89
-DA:46,86
-DA:49,86
-FN:120,DeployBaseGoerli_Andromeda.run
-FNDA:0,DeployBaseGoerli_Andromeda.run
-DA:121,0
-DA:122,0
-DA:124,0
-DA:133,0
+FN:57,DeployBase_Synthetix.run
+FNDA:0,DeployBase_Synthetix.run
+DA:58,0
+DA:59,0
+DA:61,0
+DA:70,0
 FN:144,DeployBaseGoerli_KwentaFork.run
 FNDA:0,DeployBaseGoerli_KwentaFork.run
 DA:145,0
 DA:146,0
 DA:148,0
 DA:157,0
-FN:99,DeployBaseGoerli_Synthetix.run
-FNDA:0,DeployBaseGoerli_Synthetix.run
-DA:100,0
-DA:101,0
-DA:103,0
-DA:112,0
+FN:120,DeployBaseGoerli_Andromeda.run
+FNDA:0,DeployBaseGoerli_Andromeda.run
+DA:121,0
+DA:122,0
+DA:124,0
+DA:133,0
+FN:78,DeployBase_Andromeda.run
+FNDA:0,DeployBase_Andromeda.run
+DA:79,0
+DA:80,0
+DA:82,0
+DA:91,0
+FN:165,DeployOptimism_Synthetix.run
+FNDA:0,DeployOptimism_Synthetix.run
+DA:166,0
+DA:167,0
+DA:169,0
+DA:178,0
 FNF:8
 FNH:1
 LF:31
@@ -56,45 +56,45 @@ BRH:0
 end_of_record
 TN:
 SF:script/Upgrade.s.sol
-FN:25,Setup.deployImplementation
-FNDA:0,Setup.deployImplementation
-DA:33,0
-FN:93,DeployBaseGoerli_KwentaFork.run
-FNDA:0,DeployBaseGoerli_KwentaFork.run
-DA:94,0
-DA:95,0
-DA:97,0
-DA:106,0
-FN:156,DeployOptimismGoerli_Synthetix.run
-FNDA:0,DeployOptimismGoerli_Synthetix.run
-DA:157,0
-DA:158,0
-DA:160,0
-DA:169,0
 FN:48,DeployBase_Synthetix.run
 FNDA:0,DeployBase_Synthetix.run
 DA:49,0
 DA:50,0
 DA:52,0
 DA:61,0
-FN:69,DeployBaseGoerli_Synthetix.run
-FNDA:0,DeployBaseGoerli_Synthetix.run
-DA:70,0
-DA:71,0
-DA:73,0
-DA:82,0
 FN:114,DeployBaseGoerli_Andromeda.run
 FNDA:0,DeployBaseGoerli_Andromeda.run
 DA:115,0
 DA:116,0
 DA:118,0
 DA:127,0
+FN:25,Setup.deployImplementation
+FNDA:0,Setup.deployImplementation
+DA:33,0
+FN:156,DeployOptimismGoerli_Synthetix.run
+FNDA:0,DeployOptimismGoerli_Synthetix.run
+DA:157,0
+DA:158,0
+DA:160,0
+DA:169,0
 FN:135,DeployOptimism_Synthetix.run
 FNDA:0,DeployOptimism_Synthetix.run
 DA:136,0
 DA:137,0
 DA:139,0
 DA:148,0
+FN:69,DeployBaseGoerli_Synthetix.run
+FNDA:0,DeployBaseGoerli_Synthetix.run
+DA:70,0
+DA:71,0
+DA:73,0
+DA:82,0
+FN:93,DeployBaseGoerli_KwentaFork.run
+FNDA:0,DeployBaseGoerli_KwentaFork.run
+DA:94,0
+DA:95,0
+DA:97,0
+DA:106,0
 FNF:7
 FNH:0
 LF:25
@@ -104,258 +104,255 @@ BRH:0
 end_of_record
 TN:
 SF:src/Engine.sol
-FN:140,Engine.zap
-FNDA:1,Engine.zap
-DA:145,1
-FN:153,Engine._authorizeUpgrade
+FN:136,Engine._authorizeUpgrade
 FNDA:516,Engine._authorizeUpgrade
-DA:158,516
-BRDA:158,0,0,1
-BRDA:158,0,1,515
-DA:159,515
-BRDA:159,1,0,1
-BRDA:159,1,1,514
-FN:167,Engine.isAccountOwner
+DA:141,516
+BRDA:141,0,0,1
+BRDA:141,0,1,515
+DA:142,515
+BRDA:142,1,0,1
+BRDA:142,1,1,514
+FN:150,Engine.isAccountOwner
 FNDA:4,Engine.isAccountOwner
-DA:173,269
-DA:174,268
-FN:178,Engine.isAccountDelegate
+DA:156,269
+DA:157,268
+FN:161,Engine.isAccountDelegate
 FNDA:3,Engine.isAccountDelegate
-DA:184,3
-FN:189,Engine._isAccountOwnerOrDelegate
+DA:167,3
+FN:172,Engine._isAccountOwnerOrDelegate
 FNDA:543,Engine._isAccountOwnerOrDelegate
-DA:194,543
-DA:195,543
-FN:205,Engine.invalidateUnorderedNonces
+DA:177,543
+DA:178,543
+FN:188,Engine.invalidateUnorderedNonces
 FNDA:518,Engine.invalidateUnorderedNonces
-DA:210,518
-BRDA:210,2,0,517
-BRDA:210,2,1,1
-DA:216,517
-DA:218,517
-DA:220,1
-FN:225,Engine.hasUnorderedNonceBeenUsed
+DA:193,518
+BRDA:193,2,0,517
+BRDA:193,2,1,1
+DA:199,517
+DA:201,517
+DA:203,1
+FN:208,Engine.hasUnorderedNonceBeenUsed
 FNDA:772,Engine.hasUnorderedNonceBeenUsed
-DA:231,793
+DA:214,793
+DA:218,793
 DA:235,793
-DA:252,793
-FN:267,Engine._bitmapPositions
+FN:250,Engine._bitmapPositions
 FNDA:806,Engine._bitmapPositions
-DA:276,806
-DA:280,806
-FN:288,Engine._useUnorderedNonce
+DA:259,806
+DA:263,806
+FN:271,Engine._useUnorderedNonce
 FNDA:13,Engine._useUnorderedNonce
-DA:289,13
-DA:293,13
-DA:301,13
-DA:324,13
-BRDA:324,3,0,-
-BRDA:324,3,1,13
-FN:332,Engine.modifyCollateral
+DA:272,13
+DA:276,13
+DA:284,13
+DA:307,13
+BRDA:307,3,0,-
+BRDA:307,3,1,13
+FN:315,Engine.modifyCollateral
 FNDA:59,Engine.modifyCollateral
-DA:337,59
-DA:339,59
-BRDA:339,4,0,56
-BRDA:339,4,1,3
-DA:340,56
-DA:344,3
-BRDA:344,5,0,-
-BRDA:344,5,1,3
-DA:346,3
-FN:353,Engine.modifyCollateralZap
+DA:320,59
+DA:322,59
+BRDA:322,4,0,56
+BRDA:322,4,1,3
+DA:323,56
+DA:327,3
+BRDA:327,5,0,-
+BRDA:327,5,1,3
+DA:329,3
+FN:336,Engine.modifyCollateralZap
 FNDA:2,Engine.modifyCollateralZap
-DA:358,2
-BRDA:358,6,0,-
-BRDA:358,6,1,1
+DA:341,2
+BRDA:341,6,0,-
+BRDA:341,6,1,1
+DA:345,1
+DA:347,1
+DA:349,1
+DA:353,1
+BRDA:353,7,0,-
+BRDA:353,7,1,1
+DA:355,1
 DA:362,1
-DA:364,1
-DA:366,1
-DA:370,1
-BRDA:370,7,0,-
-BRDA:370,7,1,1
-DA:372,1
-DA:379,1
-DA:382,1
-FN:386,Engine._depositCollateral
+DA:365,1
+FN:369,Engine._depositCollateral
 FNDA:56,Engine._depositCollateral
-DA:395,56
-DA:397,55
-DA:399,55
-FN:402,Engine._withdrawCollateral
+DA:378,56
+DA:380,55
+DA:382,55
+FN:385,Engine._withdrawCollateral
 FNDA:3,Engine._withdrawCollateral
-DA:409,3
-DA:413,1
-FN:421,Engine._getSynthAddress
+DA:392,3
+DA:396,1
+FN:404,Engine._getSynthAddress
 FNDA:59,Engine._getSynthAddress
-DA:426,59
-FN:436,Engine.commitOrder
+DA:409,59
+FN:419,Engine.commitOrder
 FNDA:4,Engine.commitOrder
-DA:451,4
-BRDA:451,8,0,3
-BRDA:451,8,1,1
-DA:452,3
-DA:462,1
-FN:466,Engine._commitOrder
+DA:434,4
+BRDA:434,8,0,3
+BRDA:434,8,1,1
+DA:435,3
+DA:445,1
+FN:449,Engine._commitOrder
 FNDA:13,Engine._commitOrder
-DA:475,13
-FN:493,Engine.creditAccount
+DA:458,13
+FN:476,Engine.creditAccount
 FNDA:776,Engine.creditAccount
-DA:497,776
-DA:500,776
-DA:502,654
-FN:506,Engine.creditAccountZap
+DA:480,776
+DA:483,776
+DA:485,657
+FN:489,Engine.creditAccountZap
 FNDA:2,Engine.creditAccountZap
-DA:512,2
-DA:514,2
-DA:516,2
-FN:520,Engine.debitAccount
+DA:495,2
+DA:497,2
+DA:499,2
+FN:503,Engine.debitAccount
 FNDA:259,Engine.debitAccount
-DA:524,259
-BRDA:524,9,0,1
-BRDA:524,9,1,258
-DA:526,258
-DA:528,139
-FN:532,Engine.debitAccountZap
+DA:507,259
+BRDA:507,9,0,1
+BRDA:507,9,1,258
+DA:509,258
+DA:511,142
+FN:515,Engine.debitAccountZap
 FNDA:2,Engine.debitAccountZap
-DA:537,2
-BRDA:537,10,0,1
-BRDA:537,10,1,1
-DA:540,1
-DA:543,1
-DA:546,1
-DA:548,1
-FN:551,Engine._debit
+DA:520,2
+BRDA:520,10,0,1
+BRDA:520,10,1,1
+DA:523,1
+DA:526,1
+DA:529,1
+DA:531,1
+FN:534,Engine._debit
 FNDA:259,Engine._debit
-DA:554,259
-BRDA:554,11,0,105
-BRDA:554,11,1,154
-DA:557,154
-DA:560,154
-FN:568,Engine.execute
+DA:537,259
+BRDA:537,11,0,102
+BRDA:537,11,1,157
+DA:540,157
+DA:543,157
+FN:551,Engine.execute
 FNDA:15,Engine.execute
-DA:583,15
-BRDA:583,12,0,2
-BRDA:583,12,1,13
-DA:586,13
-DA:594,13
-BRDA:594,13,0,1
-BRDA:594,13,1,13
-DA:597,13
-DA:600,13
-BRDA:600,14,0,2
-BRDA:600,14,1,3
-DA:601,6
-DA:607,6
-BRDA:607,15,0,2
-BRDA:607,15,1,4
-DA:608,2
-DA:614,4
-BRDA:614,16,0,1
-BRDA:614,16,1,3
-DA:615,1
-DA:624,3
-BRDA:624,17,0,2
-BRDA:624,17,1,3
-DA:640,2
-DA:645,10
-DA:655,7
-FN:663,Engine.canExecute
+DA:566,15
+BRDA:566,12,0,2
+BRDA:566,12,1,13
+DA:569,13
+DA:577,13
+BRDA:577,13,0,1
+BRDA:577,13,1,13
+DA:580,13
+DA:583,13
+BRDA:583,14,0,2
+BRDA:583,14,1,3
+DA:584,6
+DA:590,6
+BRDA:590,15,0,2
+BRDA:590,15,1,4
+DA:591,2
+DA:597,4
+BRDA:597,16,0,1
+BRDA:597,16,1,3
+DA:598,1
+DA:607,3
+BRDA:607,17,0,2
+BRDA:607,17,1,3
+DA:623,2
+DA:628,10
+DA:638,7
+FN:646,Engine.canExecute
 FNDA:10,Engine.canExecute
-DA:670,25
-BRDA:670,18,0,2
-BRDA:670,18,1,23
-DA:673,23
-BRDA:673,19,0,2
-BRDA:673,19,1,21
-DA:676,21
-BRDA:676,20,0,2
-BRDA:676,20,1,19
-DA:677,2
-DA:682,19
-BRDA:682,21,0,1
-BRDA:682,21,1,18
-DA:685,18
-BRDA:685,22,0,1
-BRDA:685,22,1,17
-DA:688,17
-BRDA:688,23,0,1
-BRDA:688,23,1,-
-DA:691,1
-BRDA:691,24,0,1
-BRDA:691,24,1,-
-DA:695,16
-BRDA:695,25,0,1
-BRDA:695,25,1,15
-DA:698,15
-FN:706,Engine.verifySigner
+DA:653,25
+BRDA:653,18,0,2
+BRDA:653,18,1,23
+DA:656,23
+BRDA:656,19,0,2
+BRDA:656,19,1,21
+DA:659,21
+BRDA:659,20,0,2
+BRDA:659,20,1,19
+DA:660,2
+DA:665,19
+BRDA:665,21,0,1
+BRDA:665,21,1,18
+DA:668,18
+BRDA:668,22,0,1
+BRDA:668,22,1,17
+DA:671,17
+BRDA:671,23,0,1
+BRDA:671,23,1,-
+DA:674,1
+BRDA:674,24,0,1
+BRDA:674,24,1,-
+DA:678,16
+BRDA:678,25,0,1
+BRDA:678,25,1,15
+DA:681,15
+FN:689,Engine.verifySigner
 FNDA:2,Engine.verifySigner
-DA:712,21
-FN:716,Engine.verifySignature
+DA:695,21
+FN:699,Engine.verifySignature
 FNDA:257,Engine.verifySignature
-DA:720,275
-FN:728,Engine.verifyConditions
+DA:703,275
+FN:711,Engine.verifyConditions
 FNDA:4,Engine.verifyConditions
-DA:734,5
-DA:735,5
-BRDA:735,26,0,1
-BRDA:735,26,1,4
-DA:736,1
-DA:739,4
-DA:740,14
-DA:741,14
-DA:744,14
-DA:750,14
-DA:751,12
-DA:752,10
-DA:753,7
-DA:754,5
-DA:755,4
-DA:756,3
-DA:757,2
-BRDA:749,27,0,2
-BRDA:749,27,1,11
-DA:761,13
-DA:764,13
-BRDA:764,28,0,2
-BRDA:764,28,1,11
-DA:767,11
-DA:770,1
-DA:774,1
-FN:782,Engine.isTimestampAfter
+DA:717,5
+DA:718,5
+BRDA:718,26,0,1
+BRDA:718,26,1,4
+DA:719,1
+DA:722,4
+DA:723,14
+DA:724,14
+DA:727,14
+DA:733,14
+DA:734,12
+DA:735,10
+DA:736,7
+DA:737,5
+DA:738,4
+DA:739,3
+DA:740,2
+BRDA:732,27,0,2
+BRDA:732,27,1,11
+DA:744,13
+DA:747,13
+BRDA:747,28,0,2
+BRDA:747,28,1,11
+DA:750,11
+DA:753,1
+DA:757,1
+FN:765,Engine.isTimestampAfter
 FNDA:6,Engine.isTimestampAfter
-DA:788,6
-FN:792,Engine.isTimestampBefore
+DA:771,6
+FN:775,Engine.isTimestampBefore
 FNDA:5,Engine.isTimestampBefore
-DA:798,5
-FN:802,Engine.isPriceAbove
+DA:781,5
+FN:785,Engine.isPriceAbove
 FNDA:6,Engine.isPriceAbove
-DA:808,6
-DA:813,6
-FN:817,Engine.isPriceBelow
+DA:791,6
+DA:796,6
+FN:800,Engine.isPriceBelow
 FNDA:6,Engine.isPriceBelow
-DA:823,6
-DA:828,6
-FN:832,Engine.isMarketOpen
+DA:806,6
+DA:811,6
+FN:815,Engine.isMarketOpen
 FNDA:1,Engine.isMarketOpen
-DA:838,1
-FN:842,Engine.isPositionSizeAbove
+DA:821,1
+FN:825,Engine.isPositionSizeAbove
 FNDA:4,Engine.isPositionSizeAbove
-DA:847,4
-DA:848,4
-DA:850,4
-FN:854,Engine.isPositionSizeBelow
+DA:830,4
+DA:831,4
+DA:833,4
+FN:837,Engine.isPositionSizeBelow
 FNDA:4,Engine.isPositionSizeBelow
-DA:859,4
-DA:860,4
-DA:862,4
-FN:866,Engine.isOrderFeeBelow
+DA:842,4
+DA:843,4
+DA:845,4
+FN:849,Engine.isOrderFeeBelow
 FNDA:4,Engine.isOrderFeeBelow
-DA:872,4
-DA:877,4
-FNF:34
-FNH:34
-LF:122
-LH:122
+DA:855,4
+DA:860,4
+FNF:33
+FNH:33
+LF:121
+LH:121
 BRF:58
 BRH:52
 end_of_record
@@ -479,8 +476,8 @@ SF:src/utils/MulticallablePayable.sol
 FN:24,MulticallablePayable.multicall
 FNDA:1287,MulticallablePayable.multicall
 DA:33,1287
-BRDA:33,0,0,122
-DA:43,1165
+BRDA:33,0,0,124
+DA:43,1163
 FNF:1
 FNH:1
 LF:2
@@ -599,16 +596,6 @@ BRH:0
 end_of_record
 TN:
 SF:test/utils/Bootstrap.sol
-FN:342,BootstrapBaseGoerli.init
-FNDA:0,BootstrapBaseGoerli.init
-DA:355,0
-DA:364,0
-DA:373,0
-FN:207,BootstrapOptimism.init
-FNDA:0,BootstrapOptimism.init
-DA:220,0
-DA:229,0
-DA:238,0
 FN:65,Bootstrap.initializeOptimism
 FNDA:0,Bootstrap.initializeOptimism
 DA:66,0
@@ -690,11 +677,21 @@ FNDA:0,BootstrapOptimismGoerli.init
 DA:265,0
 DA:274,0
 DA:283,0
+FN:207,BootstrapOptimism.init
+FNDA:0,BootstrapOptimism.init
+DA:220,0
+DA:229,0
+DA:238,0
 FN:297,BootstrapBase.init
-FNDA:85,BootstrapBase.init
-DA:310,85
-DA:319,85
-DA:328,85
+FNDA:84,BootstrapBase.init
+DA:310,84
+DA:319,84
+DA:328,84
+FN:342,BootstrapBaseGoerli.init
+FNDA:0,BootstrapBaseGoerli.init
+DA:355,0
+DA:364,0
+DA:373,0
 FNF:8
 FNH:1
 LF:80
@@ -763,8 +760,8 @@ end_of_record
 TN:
 SF:test/utils/SynthMinter.sol
 FN:18,SynthMinter.mint_sUSD
-FNDA:128,SynthMinter.mint_sUSD
-DA:19,128
+FNDA:127,SynthMinter.mint_sUSD
+DA:19,127
 FNF:1
 FNH:1
 LF:1
@@ -786,6 +783,9 @@ BRH:0
 end_of_record
 TN:
 SF:test/utils/mocks/EIP7412Mock.sol
+FN:24,EIP7412MockRevert.fulfillOracleQuery
+FNDA:256,EIP7412MockRevert.fulfillOracleQuery
+DA:25,256
 FN:16,EIP7412MockRefund.fulfillOracleQuery
 FNDA:256,EIP7412MockRefund.fulfillOracleQuery
 DA:17,256
@@ -795,9 +795,6 @@ DA:18,256
 DA:19,256
 BRDA:19,1,0,256
 BRDA:19,1,1,-
-FN:24,EIP7412MockRevert.fulfillOracleQuery
-FNDA:256,EIP7412MockRevert.fulfillOracleQuery
-DA:25,256
 FN:9,EIP7412Mock.fulfillOracleQuery
 FNDA:768,EIP7412Mock.fulfillOracleQuery
 DA:10,768
@@ -838,8 +835,8 @@ FN:29,MockMulticallablePayable.returnsTuple
 FNDA:534,MockMulticallablePayable.returnsTuple
 DA:34,534
 FN:37,MockMulticallablePayable.returnsString
-FNDA:135,MockMulticallablePayable.returnsString
-DA:42,135
+FNDA:133,MockMulticallablePayable.returnsString
+DA:42,133
 FN:47,MockMulticallablePayable.pay
 FNDA:0,MockMulticallablePayable.pay
 DA:48,0