From f7d601de519332fcff6866eda8413a2df51d9638 Mon Sep 17 00:00:00 2001
From: JaredBorders <jaredborders@pm.me>
Date: Tue, 19 Dec 2023 20:14:04 -0500
Subject: [PATCH] =?UTF-8?q?=F0=9F=93=B8=20Update=20gas-snapshot/lcov?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gas-snapshot | 169 ++++++-------
 lcov.info     | 663 ++++++++++++++++++++++++++++----------------------
 2 files changed, 461 insertions(+), 371 deletions(-)

diff --git a/.gas-snapshot b/.gas-snapshot
index eddca4ed..87c3ec4a 100644
--- a/.gas-snapshot
+++ b/.gas-snapshot
@@ -1,47 +1,47 @@
 AccountDelegate:test_isAccountDelegate_account_doesnt_exist() (gas: 26492)
-AccountDelegate:test_isAccountDelegate_false() (gas: 392017)
-AccountDelegate:test_isAccountDelegate_true() (gas: 389964)
-AccountDelegate:test_isAccountDelegate_zero_address_caller() (gas: 23181)
-AccountOwner:test_isAccountOwner_account_doesnt_exist() (gas: 25044)
-AccountOwner:test_isAccountOwner_false() (gas: 229891)
-AccountOwner:test_isAccountOwner_true() (gas: 229814)
-AccountOwner:test_isAccountOwner_zero_address_caller() (gas: 10785)
-CanExecute:test_canExecute_false_insufficent_account_credit() (gas: 414884)
-CanExecute:test_canExecute_false_invalid_signature() (gas: 448966)
-CanExecute:test_canExecute_false_invalid_signer() (gas: 442163)
-CanExecute:test_canExecute_false_maxExecutorFee_exceeded() (gas: 397594)
-CanExecute:test_canExecute_false_nonce_used() (gas: 825200)
-CanExecute:test_canExecute_false_require_verify_condition_not_met() (gas: 532204)
-CanExecute:test_canExecute_false_trusted_executor() (gas: 438771)
-CanExecute:test_canExecute_true() (gas: 438410)
-CommitOrder:test_commitOrder() (gas: 382992)
-CommitOrder:test_commitOrder_Unauthorized() (gas: 33029)
-CommitOrder:test_commitOrder_insufficient_collateral() (gas: 441149)
-CommitOrder:test_commitOrder_invalid_market() (gas: 38262)
-Conditions:test_isMarketOpen() (gas: 26596)
-Conditions:test_isOrderFeeBelow() (gas: 179828)
-Conditions:test_isPositionSizeAbove() (gas: 18893)
-Conditions:test_isPositionSizeBelow() (gas: 18863)
-Conditions:test_isPriceAbove() (gas: 196473)
-Conditions:test_isPriceBelow() (gas: 196438)
-Conditions:test_isTimestampAfter() (gas: 7668)
-Conditions:test_isTimestampBefore() (gas: 7645)
-Credit:test_credit(uint256) (runs: 256, μ: 102617, ~: 112702)
-Credit:test_credit_AccountDoesNotExist() (gas: 28011)
-Credit:test_credit_event() (gas: 97230)
-Debit:test_debit(uint256) (runs: 256, μ: 133085, ~: 142379)
-Debit:test_debit_InsufficientBalance() (gas: 119995)
-Debit:test_debit_Unauthorized() (gas: 120025)
-Debit:test_debit_event() (gas: 102161)
-DeploymentTest:test_deploy() (gas: 3094956)
-DeploymentTest:test_deploy_perps_market_proxy_zero_address() (gas: 42548)
-DeploymentTest:test_deploy_spot_market_proxy_zero_address() (gas: 42615)
-DeploymentTest:test_deploy_susd_proxy_zero_address() (gas: 42606)
-DepositCollateral:test_depositCollateral() (gas: 258395)
-DepositCollateral:test_depositCollateral_availableMargin() (gas: 265963)
-DepositCollateral:test_depositCollateral_collateralAmount() (gas: 259016)
-DepositCollateral:test_depositCollateral_insufficient_balance() (gas: 55978)
-DepositCollateral:test_depositCollateral_totalCollateralValue() (gas: 263325)
+AccountDelegate:test_isAccountDelegate_false() (gas: 396923)
+AccountDelegate:test_isAccountDelegate_true() (gas: 394870)
+AccountDelegate:test_isAccountDelegate_zero_address_caller() (gas: 28087)
+AccountOwner:test_isAccountOwner_account_doesnt_exist() (gas: 29906)
+AccountOwner:test_isAccountOwner_false() (gas: 234753)
+AccountOwner:test_isAccountOwner_true() (gas: 234676)
+AccountOwner:test_isAccountOwner_zero_address_caller() (gas: 15647)
+CanExecute:test_canExecute_false_insufficent_account_credit() (gas: 420796)
+CanExecute:test_canExecute_false_invalid_signature() (gas: 455166)
+CanExecute:test_canExecute_false_invalid_signer() (gas: 448221)
+CanExecute:test_canExecute_false_maxExecutorFee_exceeded() (gas: 403646)
+CanExecute:test_canExecute_false_nonce_used() (gas: 831410)
+CanExecute:test_canExecute_false_require_verify_condition_not_met() (gas: 538325)
+CanExecute:test_canExecute_false_trusted_executor() (gas: 444486)
+CanExecute:test_canExecute_true() (gas: 444080)
+CommitOrder:test_commitOrder() (gas: 387933)
+CommitOrder:test_commitOrder_Unauthorized() (gas: 37944)
+CommitOrder:test_commitOrder_insufficient_collateral() (gas: 446067)
+CommitOrder:test_commitOrder_invalid_market() (gas: 43202)
+Conditions:test_isMarketOpen() (gas: 31858)
+Conditions:test_isOrderFeeBelow() (gas: 185520)
+Conditions:test_isPositionSizeAbove() (gas: 24560)
+Conditions:test_isPositionSizeBelow() (gas: 24468)
+Conditions:test_isPriceAbove() (gas: 202533)
+Conditions:test_isPriceBelow() (gas: 202498)
+Conditions:test_isTimestampAfter() (gas: 13288)
+Conditions:test_isTimestampBefore() (gas: 13288)
+Credit:test_credit(uint256) (runs: 256, μ: 107465, ~: 117605)
+Credit:test_credit_AccountDoesNotExist() (gas: 32831)
+Credit:test_credit_event() (gas: 102066)
+Debit:test_debit(uint256) (runs: 256, μ: 138131, ~: 148022)
+Debit:test_debit_InsufficientBalance() (gas: 125261)
+Debit:test_debit_Unauthorized() (gas: 125291)
+Debit:test_debit_event() (gas: 106371)
+DeploymentTest:test_deploy() (gas: 3590064)
+DeploymentTest:test_deploy_perps_market_proxy_zero_address() (gas: 43343)
+DeploymentTest:test_deploy_spot_market_proxy_zero_address() (gas: 43366)
+DeploymentTest:test_deploy_susd_proxy_zero_address() (gas: 43423)
+DepositCollateral:test_depositCollateral() (gas: 263304)
+DepositCollateral:test_depositCollateral_availableMargin() (gas: 270872)
+DepositCollateral:test_depositCollateral_collateralAmount() (gas: 263858)
+DepositCollateral:test_depositCollateral_insufficient_balance() (gas: 60810)
+DepositCollateral:test_depositCollateral_totalCollateralValue() (gas: 268212)
 EIP712Test:test_DOMAIN_SEPARATOR() (gas: 165)
 EIP712Test:test_buildDomainSeparator() (gas: 165)
 EIP712Test:test_cachedDomainSeparatorInvalidated() (gas: 144)
@@ -49,24 +49,28 @@ EIP712Test:test_constructor() (gas: 164)
 EIP712Test:test_domainNameAndVersion() (gas: 1261)
 EIP712Test:test_eip712Domain() (gas: 187)
 EIP712Test:test_hashTypedData() (gas: 187)
-Execute:test_execute_CannotExecuteOrder_invalid_acceptablePrice() (gas: 329711)
-Execute:test_execute_CannotExecuteOrder_invalid_settlementStrategyId() (gas: 95632)
-Execute:test_execute_CannotExecuteOrder_too_leveraged() (gas: 360306)
-Execute:test_execute_event() (gas: 432759)
-Execute:test_execute_order_committed() (gas: 429206)
-Fee:test_fee_exceeds_account_credit() (gas: 133066)
-Fee:test_fee_exceeds_maxExecutorFee() (gas: 132599)
-Fee:test_fee_imposed() (gas: 518738)
-FulfillOracleQuery:test_fulfillOracleQuery(bytes) (runs: 256, μ: 26404, ~: 26400)
-FulfillOracleQuery:test_fulfillOracleQuery_refund(bytes) (runs: 256, μ: 35041, ~: 35037)
-FulfillOracleQuery:test_fulfillOracleQuery_revert(bytes) (runs: 256, μ: 28105, ~: 28101)
+Execute:test_execute_CannotExecuteOrder_invalid_acceptablePrice() (gas: 335437)
+Execute:test_execute_CannotExecuteOrder_invalid_settlementStrategyId() (gas: 101310)
+Execute:test_execute_CannotExecuteOrder_too_leveraged() (gas: 365987)
+Execute:test_execute_event() (gas: 438457)
+Execute:test_execute_order_committed() (gas: 434904)
+Fee:test_fee_exceeds_account_credit() (gas: 138974)
+Fee:test_fee_exceeds_maxExecutorFee() (gas: 138485)
+Fee:test_fee_imposed() (gas: 524817)
+FulfillOracleQuery:test_fulfillOracleQuery(bytes) (runs: 256, μ: 31323, ~: 31315)
+FulfillOracleQuery:test_fulfillOracleQuery_refund(bytes) (runs: 256, μ: 40346, ~: 40338)
+FulfillOracleQuery:test_fulfillOracleQuery_revert(bytes) (runs: 256, μ: 32970, ~: 32962)
 MathLibTest:test_abs128() (gas: 425)
 MathLibTest:test_abs256() (gas: 480)
 MathLibTest:test_fuzz_abs128(int128) (runs: 256, μ: 577, ~: 603)
 MathLibTest:test_fuzz_abs256(int256) (runs: 256, μ: 472, ~: 458)
 MathLibTest:test_isSameSign() (gas: 999)
-MulticallFulfillOracleQuery:test_fulfillOracleQuery_multicall(bytes) (runs: 256, μ: 29315, ~: 29258)
-MulticallFulfillOracleQuery:test_fulfillOracleQuery_multicall_double_spend(bytes) (runs: 256, μ: 41932, ~: 41822)
+MockUpgrade:test_upgrade() (gas: 3575535)
+MockUpgrade:test_upgrade_credit_state(uint256) (runs: 256, μ: 3670043, ~: 3670043)
+MockUpgrade:test_upgrade_nonce_state(uint256) (runs: 256, μ: 3611256, ~: 3611256)
+MockUpgrade:test_upgrade_only_pDAO() (gas: 3560685)
+MulticallFulfillOracleQuery:test_fulfillOracleQuery_multicall(bytes) (runs: 256, μ: 34651, ~: 34586)
+MulticallFulfillOracleQuery:test_fulfillOracleQuery_multicall_double_spend(bytes) (runs: 256, μ: 47701, ~: 47575)
 MulticallablePayableTest:testMulticallableBenchmark() (gas: 29229)
 MulticallablePayableTest:testMulticallableOriginalBenchmark() (gas: 38407)
 MulticallablePayableTest:testMulticallablePreservesMsgSender() (gas: 11065)
@@ -78,30 +82,31 @@ 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, μ: 52689, ~: 52689)
-NonceBitmapTest:test_hasUnorderedNonceBeenUsed() (gas: 53955)
-NonceBitmapTest:test_invalidateUnorderedNonces() (gas: 76562)
-NonceBitmapTest:test_invalidateUnorderedNonces_Only_Owner_Delegate() (gas: 190184)
-NonceBitmapTest:test_invalidateUnorderedNonces_Unauthorized() (gas: 30607)
-NonceBitmapTest:test_invalidateUnorderedNonces_event() (gas: 53396)
-ReduceOnly:test_reduce_only() (gas: 430941)
-ReduceOnly:test_reduce_only_same_sign() (gas: 72142)
-ReduceOnly:test_reduce_only_truncate_size_down() (gas: 431027)
-ReduceOnly:test_reduce_only_truncate_size_up() (gas: 407776)
-ReduceOnly:test_reduce_only_when_position_doesnt_exist() (gas: 162529)
-ReduceOnly:test_reduce_only_zero_size_delta() (gas: 162586)
+NonceBitmapTest:test_fuzz_invalidateUnorderedNonces(uint256) (runs: 256, μ: 58005, ~: 58005)
+NonceBitmapTest:test_hasUnorderedNonceBeenUsed() (gas: 59703)
+NonceBitmapTest:test_invalidateUnorderedNonces() (gas: 83122)
+NonceBitmapTest:test_invalidateUnorderedNonces_Only_Owner_Delegate() (gas: 196322)
+NonceBitmapTest:test_invalidateUnorderedNonces_Unauthorized() (gas: 35565)
+NonceBitmapTest:test_invalidateUnorderedNonces_event() (gas: 58283)
+ReduceOnly:test_reduce_only() (gas: 436631)
+ReduceOnly:test_reduce_only_same_sign() (gas: 77813)
+ReduceOnly:test_reduce_only_truncate_size_down() (gas: 436739)
+ReduceOnly:test_reduce_only_truncate_size_up() (gas: 413488)
+ReduceOnly:test_reduce_only_when_position_doesnt_exist() (gas: 168200)
+ReduceOnly:test_reduce_only_zero_size_delta() (gas: 168257)
+RemoveUpgradability:test_removeUpgradability() (gas: 3539625)
 SignatureCheckerLibTest:test_isValidSignatureNowCalldata(address,bytes32,bytes) (runs: 256, μ: 35465847065546049, ~: 3474)
-VerifyConditions:test_max_condition_size_exceeded() (gas: 45057)
-VerifyConditions:test_verifyConditions_InvalidConditionSelector() (gas: 14088)
-VerifyConditions:test_verify_conditions_not_verified() (gas: 129563)
-VerifyConditions:test_verify_conditions_verified() (gas: 184166)
-VerifySignature:test_verifySignature(uint256) (runs: 256, μ: 24445, ~: 24445)
-VerifySignature:test_verifySignature_false_private_key() (gas: 27166)
-VerifySigner:test_verifySigner() (gas: 25917)
-VerifySigner:test_verifySigner_false() (gas: 28647)
-WithdrawCollateral:test_withdrawCollateral() (gas: 353029)
-WithdrawCollateral:test_withdrawCollateral_availableMargin() (gas: 354583)
-WithdrawCollateral:test_withdrawCollateral_collateralAmount() (gas: 353557)
-WithdrawCollateral:test_withdrawCollateral_insufficient_account_collateral_balance() (gas: 274007)
-WithdrawCollateral:test_withdrawCollateral_totalCollateralValue() (gas: 354046)
-WithdrawCollateral:test_withdrawCollateral_zero() (gas: 265965)
\ No newline at end of file
+VerifyConditions:test_max_condition_size_exceeded() (gas: 51339)
+VerifyConditions:test_verifyConditions_InvalidConditionSelector() (gas: 19107)
+VerifyConditions:test_verify_conditions_not_verified() (gas: 136154)
+VerifyConditions:test_verify_conditions_verified() (gas: 192508)
+VerifySignature:test_verifySignature(uint256) (runs: 256, μ: 30147, ~: 30147)
+VerifySignature:test_verifySignature_false_private_key() (gas: 32855)
+VerifySigner:test_verifySigner() (gas: 30907)
+VerifySigner:test_verifySigner_false() (gas: 33615)
+WithdrawCollateral:test_withdrawCollateral() (gas: 357248)
+WithdrawCollateral:test_withdrawCollateral_availableMargin() (gas: 358802)
+WithdrawCollateral:test_withdrawCollateral_collateralAmount() (gas: 357776)
+WithdrawCollateral:test_withdrawCollateral_insufficient_account_collateral_balance() (gas: 279294)
+WithdrawCollateral:test_withdrawCollateral_totalCollateralValue() (gas: 358283)
+WithdrawCollateral:test_withdrawCollateral_zero() (gas: 271246)
\ No newline at end of file
diff --git a/lcov.info b/lcov.info
index b106cada..9e74a375 100644
--- a/lcov.info
+++ b/lcov.info
@@ -1,272 +1,330 @@
 TN:
 SF:script/Deploy.s.sol
-FN:41,DeployBase_Synthetix.run
-FNDA:0,DeployBase_Synthetix.run
-DA:42,0
-DA:43,0
-DA:45,0
-DA:51,0
-FN:98,DeployBaseGoerli_Andromeda.run
-FNDA:0,DeployBaseGoerli_Andromeda.run
-DA:99,0
-DA:100,0
-DA:102,0
-DA:108,0
-FN:59,DeployBaseGoerli_Synthetix.run
-FNDA:0,DeployBaseGoerli_Synthetix.run
-DA:60,0
-DA:61,0
-DA:63,0
-DA:69,0
-FN:116,DeployOptimism_Synthetix.run
+FN:132,DeployOptimism_Synthetix.run
 FNDA:0,DeployOptimism_Synthetix.run
+DA:133,0
+DA:134,0
+DA:136,0
+DA:143,0
+FN:113,DeployBaseGoerli_Andromeda.run
+FNDA:0,DeployBaseGoerli_Andromeda.run
+DA:114,0
+DA:115,0
 DA:117,0
-DA:118,0
-DA:120,0
-DA:126,0
-FN:80,DeployBaseGoerli_KwentaFork.run
+DA:124,0
+FN:94,DeployBaseGoerli_KwentaFork.run
 FNDA:0,DeployBaseGoerli_KwentaFork.run
-DA:81,0
-DA:82,0
-DA:84,0
-DA:90,0
-FN:134,DeployOptimismGoerli_Synthetix.run
+DA:95,0
+DA:96,0
+DA:98,0
+DA:105,0
+FN:53,DeployBase_Synthetix.run
+FNDA:0,DeployBase_Synthetix.run
+DA:54,0
+DA:55,0
+DA:57,0
+DA:64,0
+FN:72,DeployBaseGoerli_Synthetix.run
+FNDA:0,DeployBaseGoerli_Synthetix.run
+DA:73,0
+DA:74,0
+DA:76,0
+DA:83,0
+FN:151,DeployOptimismGoerli_Synthetix.run
 FNDA:0,DeployOptimismGoerli_Synthetix.run
-DA:135,0
-DA:136,0
-DA:138,0
-DA:144,0
-FN:24,Setup.deploySystem
+DA:152,0
+DA:153,0
+DA:155,0
+DA:162,0
+FN:28,Setup.deploySystem
 FNDA:4,Setup.deploySystem
-DA:29,4
+DA:34,88
+DA:42,85
+DA:45,85
 FNF:7
 FNH:1
+LF:27
+LH:3
+BRF:0
+BRH:0
+end_of_record
+TN:
+SF:script/Upgrade.s.sol
+FN:123,DeployOptimism_Synthetix.run
+FNDA:0,DeployOptimism_Synthetix.run
+DA:124,0
+DA:125,0
+DA:127,0
+DA:134,0
+FN:63,DeployBaseGoerli_Synthetix.run
+FNDA:0,DeployBaseGoerli_Synthetix.run
+DA:64,0
+DA:65,0
+DA:67,0
+DA:74,0
+FN:44,DeployBase_Synthetix.run
+FNDA:0,DeployBase_Synthetix.run
+DA:45,0
+DA:46,0
+DA:48,0
+DA:55,0
+FN:25,Setup.deployImplementation
+FNDA:0,Setup.deployImplementation
+DA:31,0
+FN:104,DeployBaseGoerli_Andromeda.run
+FNDA:0,DeployBaseGoerli_Andromeda.run
+DA:105,0
+DA:106,0
+DA:108,0
+DA:115,0
+FN:142,DeployOptimismGoerli_Synthetix.run
+FNDA:0,DeployOptimismGoerli_Synthetix.run
+DA:143,0
+DA:144,0
+DA:146,0
+DA:153,0
+FN:85,DeployBaseGoerli_KwentaFork.run
+FNDA:0,DeployBaseGoerli_KwentaFork.run
+DA:86,0
+DA:87,0
+DA:89,0
+DA:96,0
+FNF:7
+FNH:0
 LF:25
-LH:1
+LH:0
 BRF:0
 BRH:0
 end_of_record
 TN:
 SF:src/Engine.sol
-FN:94,Engine.isAccountOwner
+FN:115,Engine._authorizeUpgrade
+FNDA:516,Engine._authorizeUpgrade
+DA:120,516
+BRDA:120,0,0,1
+BRDA:120,0,1,515
+DA:121,515
+BRDA:121,1,0,1
+BRDA:121,1,1,514
+FN:129,Engine.isAccountOwner
 FNDA:4,Engine.isAccountOwner
-DA:100,269
-DA:101,268
-FN:105,Engine.isAccountDelegate
+DA:135,269
+DA:136,268
+FN:140,Engine.isAccountDelegate
 FNDA:3,Engine.isAccountDelegate
-DA:111,3
-FN:116,Engine._isAccountOwnerOrDelegate
-FNDA:287,Engine._isAccountOwnerOrDelegate
-DA:121,287
-DA:122,287
-FN:132,Engine.invalidateUnorderedNonces
-FNDA:262,Engine.invalidateUnorderedNonces
-DA:137,262
-BRDA:137,0,0,261
-BRDA:137,0,1,1
-DA:143,261
-DA:145,261
-DA:147,1
-FN:152,Engine.hasUnorderedNonceBeenUsed
-FNDA:260,Engine.hasUnorderedNonceBeenUsed
-DA:158,281
-DA:162,281
-DA:176,281
-FN:186,Engine._bitmapPositions
-FNDA:294,Engine._bitmapPositions
-DA:193,294
-DA:197,294
-FN:203,Engine._useUnorderedNonce
+DA:146,3
+FN:151,Engine._isAccountOwnerOrDelegate
+FNDA:543,Engine._isAccountOwnerOrDelegate
+DA:156,543
+DA:157,543
+FN:167,Engine.invalidateUnorderedNonces
+FNDA:518,Engine.invalidateUnorderedNonces
+DA:172,518
+BRDA:172,2,0,517
+BRDA:172,2,1,1
+DA:178,517
+DA:180,517
+DA:182,1
+FN:187,Engine.hasUnorderedNonceBeenUsed
+FNDA:772,Engine.hasUnorderedNonceBeenUsed
+DA:193,793
+DA:197,793
+DA:211,793
+FN:221,Engine._bitmapPositions
+FNDA:806,Engine._bitmapPositions
+DA:228,806
+DA:232,806
+FN:238,Engine._useUnorderedNonce
 FNDA:13,Engine._useUnorderedNonce
-DA:204,13
-DA:208,13
-DA:215,13
-DA:235,13
-BRDA:235,1,0,-
-BRDA:235,1,1,13
-FN:243,Engine.modifyCollateral
-FNDA:17,Engine.modifyCollateral
-DA:248,17
-DA:250,17
-BRDA:250,2,0,11
-BRDA:250,2,1,6
-DA:251,11
-DA:255,6
-BRDA:255,3,0,-
-BRDA:255,3,1,6
-DA:257,6
-FN:263,Engine._depositCollateral
-FNDA:11,Engine._depositCollateral
-DA:271,11
-DA:273,10
-DA:275,10
-FN:278,Engine._withdrawCollateral
+DA:239,13
+DA:243,13
+DA:250,13
+DA:270,13
+BRDA:270,3,0,-
+BRDA:270,3,1,13
+FN:278,Engine.modifyCollateral
+FNDA:65,Engine.modifyCollateral
+DA:283,65
+DA:285,65
+BRDA:285,4,0,59
+BRDA:285,4,1,6
+DA:286,59
+DA:290,6
+BRDA:290,5,0,-
+BRDA:290,5,1,6
+DA:292,6
+FN:298,Engine._depositCollateral
+FNDA:59,Engine._depositCollateral
+DA:306,59
+DA:308,58
+DA:310,58
+FN:313,Engine._withdrawCollateral
 FNDA:6,Engine._withdrawCollateral
-DA:285,6
-DA:288,4
-FN:294,Engine._getSynthAddress
-FNDA:17,Engine._getSynthAddress
-DA:299,17
-FN:309,Engine.commitOrder
-FNDA:4,Engine.commitOrder
+DA:320,6
 DA:323,4
-BRDA:323,4,0,3
-BRDA:323,4,1,1
-DA:324,3
-DA:334,1
-FN:338,Engine._commitOrder
+FN:329,Engine._getSynthAddress
+FNDA:65,Engine._getSynthAddress
+DA:334,65
+FN:344,Engine.commitOrder
+FNDA:4,Engine.commitOrder
+DA:358,4
+BRDA:358,6,0,3
+BRDA:358,6,1,1
+DA:359,3
+DA:369,1
+FN:373,Engine._commitOrder
 FNDA:13,Engine._commitOrder
-DA:347,13
-FN:365,Engine.creditAccount
-FNDA:520,Engine.creditAccount
-DA:371,520
-BRDA:371,5,0,1
-BRDA:371,5,1,519
-DA:372,1
-DA:375,519
-DA:378,519
-DA:380,415
-FN:384,Engine.debitAccount
+DA:382,13
+FN:400,Engine.creditAccount
+FNDA:776,Engine.creditAccount
+DA:406,776
+BRDA:406,7,0,1
+BRDA:406,7,1,775
+DA:407,1
+DA:410,775
+DA:413,775
+DA:415,667
+FN:419,Engine.debitAccount
 FNDA:259,Engine.debitAccount
-DA:388,259
-BRDA:388,6,0,1
-BRDA:388,6,1,258
-DA:390,258
-DA:392,153
-FN:399,Engine._debit
+DA:423,259
+BRDA:423,8,0,1
+BRDA:423,8,1,258
+DA:425,258
+DA:427,139
+FN:434,Engine._debit
 FNDA:259,Engine._debit
-DA:402,259
-BRDA:402,7,0,92
-BRDA:402,7,1,167
-DA:405,167
-DA:408,167
-FN:416,Engine.execute
+DA:437,259
+BRDA:437,9,0,104
+BRDA:437,9,1,155
+DA:440,155
+DA:443,155
+FN:451,Engine.execute
 FNDA:15,Engine.execute
-DA:431,15
-BRDA:431,8,0,2
-BRDA:431,8,1,13
-DA:434,13
-DA:440,13
-BRDA:440,9,0,1
-BRDA:440,9,1,13
-DA:443,13
-DA:446,13
-BRDA:446,10,0,2
-BRDA:446,10,1,3
-DA:447,6
-DA:452,6
-BRDA:452,11,0,2
-BRDA:452,11,1,4
-DA:453,2
-DA:458,4
-BRDA:458,12,0,1
-BRDA:458,12,1,3
-DA:459,1
-DA:465,3
-BRDA:465,13,0,2
-BRDA:465,13,1,3
-DA:475,2
-DA:480,10
-DA:490,7
-FN:498,Engine.canExecute
+DA:466,15
+BRDA:466,10,0,2
+BRDA:466,10,1,13
+DA:469,13
+DA:475,13
+BRDA:475,11,0,1
+BRDA:475,11,1,13
+DA:478,13
+DA:481,13
+BRDA:481,12,0,2
+BRDA:481,12,1,3
+DA:482,6
+DA:487,6
+BRDA:487,13,0,2
+BRDA:487,13,1,4
+DA:488,2
+DA:493,4
+BRDA:493,14,0,1
+BRDA:493,14,1,3
+DA:494,1
+DA:500,3
+BRDA:500,15,0,2
+BRDA:500,15,1,3
+DA:510,2
+DA:515,10
+DA:525,7
+FN:533,Engine.canExecute
 FNDA:10,Engine.canExecute
-DA:504,25
-BRDA:504,14,0,2
-BRDA:504,14,1,23
-DA:507,23
-BRDA:507,15,0,2
-BRDA:507,15,1,21
-DA:510,21
-BRDA:510,16,0,2
-BRDA:510,16,1,19
-DA:511,2
-DA:515,19
-BRDA:515,17,0,1
-BRDA:515,17,1,18
-DA:518,18
-BRDA:518,18,0,1
-BRDA:518,18,1,17
-DA:521,17
-BRDA:521,19,0,1
-BRDA:521,19,1,-
-DA:524,1
-BRDA:524,20,0,1
-BRDA:524,20,1,-
-DA:528,16
-BRDA:528,21,0,1
-BRDA:528,21,1,15
-DA:531,15
-FN:539,Engine.verifySigner
-FNDA:2,Engine.verifySigner
+DA:539,25
+BRDA:539,16,0,2
+BRDA:539,16,1,23
+DA:542,23
+BRDA:542,17,0,2
+BRDA:542,17,1,21
 DA:545,21
-FN:549,Engine.verifySignature
+BRDA:545,18,0,2
+BRDA:545,18,1,19
+DA:546,2
+DA:550,19
+BRDA:550,19,0,1
+BRDA:550,19,1,18
+DA:553,18
+BRDA:553,20,0,1
+BRDA:553,20,1,17
+DA:556,17
+BRDA:556,21,0,1
+BRDA:556,21,1,-
+DA:559,1
+BRDA:559,22,0,1
+BRDA:559,22,1,-
+DA:563,16
+BRDA:563,23,0,1
+BRDA:563,23,1,15
+DA:566,15
+FN:574,Engine.verifySigner
+FNDA:2,Engine.verifySigner
+DA:580,21
+FN:584,Engine.verifySignature
 FNDA:257,Engine.verifySignature
-DA:553,275
-FN:561,Engine.verifyConditions
+DA:588,275
+FN:596,Engine.verifyConditions
 FNDA:4,Engine.verifyConditions
-DA:567,5
-DA:568,5
-BRDA:568,22,0,1
-BRDA:568,22,1,4
-DA:569,1
-DA:572,4
-DA:573,14
-DA:574,14
-DA:577,14
-DA:582,14
-DA:583,12
-DA:584,10
-DA:585,7
-DA:586,5
-DA:587,4
-DA:588,3
-DA:589,2
-BRDA:581,23,0,2
-BRDA:581,23,1,11
-DA:592,13
-DA:595,13
-BRDA:595,24,0,2
-BRDA:595,24,1,11
-DA:598,11
-DA:601,1
-DA:605,1
-FN:613,Engine.isTimestampAfter
+DA:602,5
+DA:603,5
+BRDA:603,24,0,1
+BRDA:603,24,1,4
+DA:604,1
+DA:607,4
+DA:608,14
+DA:609,14
+DA:612,14
+DA:617,14
+DA:618,12
+DA:619,10
+DA:620,7
+DA:621,5
+DA:622,4
+DA:623,3
+DA:624,2
+BRDA:616,25,0,2
+BRDA:616,25,1,11
+DA:627,13
+DA:630,13
+BRDA:630,26,0,2
+BRDA:630,26,1,11
+DA:633,11
+DA:636,1
+DA:640,1
+FN:648,Engine.isTimestampAfter
 FNDA:6,Engine.isTimestampAfter
-DA:619,6
-FN:623,Engine.isTimestampBefore
+DA:654,6
+FN:658,Engine.isTimestampBefore
 FNDA:5,Engine.isTimestampBefore
-DA:629,5
-FN:633,Engine.isPriceAbove
+DA:664,5
+FN:668,Engine.isPriceAbove
 FNDA:6,Engine.isPriceAbove
-DA:639,6
-DA:644,6
-FN:648,Engine.isPriceBelow
+DA:674,6
+DA:679,6
+FN:683,Engine.isPriceBelow
 FNDA:6,Engine.isPriceBelow
-DA:654,6
-DA:659,6
-FN:663,Engine.isMarketOpen
+DA:689,6
+DA:694,6
+FN:698,Engine.isMarketOpen
 FNDA:3,Engine.isMarketOpen
-DA:669,3
-FN:673,Engine.isPositionSizeAbove
+DA:704,3
+FN:708,Engine.isPositionSizeAbove
 FNDA:4,Engine.isPositionSizeAbove
-DA:678,4
-DA:679,4
-DA:681,4
-FN:685,Engine.isPositionSizeBelow
+DA:713,4
+DA:714,4
+DA:716,4
+FN:720,Engine.isPositionSizeBelow
 FNDA:4,Engine.isPositionSizeBelow
-DA:690,4
-DA:691,4
-DA:693,4
-FN:697,Engine.isOrderFeeBelow
+DA:725,4
+DA:726,4
+DA:728,4
+FN:732,Engine.isOrderFeeBelow
 FNDA:4,Engine.isOrderFeeBelow
-DA:703,4
-DA:708,4
-FNF:29
-FNH:29
-LF:105
-LH:105
-BRF:50
-BRH:46
+DA:738,4
+DA:743,4
+FNF:30
+FNH:30
+LF:107
+LH:107
+BRF:54
+BRH:50
 end_of_record
 TN:
 SF:src/libraries/ConditionalOrderHashLib.sol
@@ -329,16 +387,16 @@ FN:80,EIP712.DOMAIN_SEPARATOR
 FNDA:283,EIP712.DOMAIN_SEPARATOR
 DA:81,283
 DA:82,283
-BRDA:82,0,0,-
+BRDA:82,0,0,283
 BRDA:82,0,1,283
-DA:83,0
+DA:83,283
 FN:100,EIP712._hashTypedData
 FNDA:275,EIP712._hashTypedData
 DA:106,275
 DA:107,275
-BRDA:107,1,0,-
+BRDA:107,1,0,275
 BRDA:107,1,1,275
-DA:108,0
+DA:108,275
 DA:116,275
 FN:128,EIP712.eip712Domain
 FNDA:0,EIP712.eip712Domain
@@ -349,21 +407,21 @@ DA:144,0
 DA:145,0
 DA:146,0
 FN:154,EIP712._buildDomainSeparator
-FNDA:0,EIP712._buildDomainSeparator
-DA:156,0
-DA:157,0
-DA:166,0
+FNDA:558,EIP712._buildDomainSeparator
+DA:156,558
+DA:157,558
+DA:166,558
 FN:171,EIP712._cachedDomainSeparatorInvalidated
 FNDA:558,EIP712._cachedDomainSeparatorInvalidated
 DA:176,558
 DA:177,558
 DA:180,558
 FNF:6
-FNH:3
+FNH:4
 LF:21
-LH:8
+LH:13
 BRF:4
-BRH:2
+BRH:4
 end_of_record
 TN:
 SF:src/utils/EIP7412.sol
@@ -382,8 +440,8 @@ SF:src/utils/MulticallablePayable.sol
 FN:24,MulticallablePayable.multicall
 FNDA:1287,MulticallablePayable.multicall
 DA:33,1287
-BRDA:33,0,0,130
-DA:43,1157
+BRDA:33,0,0,142
+DA:43,1145
 FNF:1
 FNH:1
 LF:2
@@ -488,55 +546,70 @@ BRF:0
 BRH:0
 end_of_record
 TN:
+SF:test/Upgrade.t.sol
+FN:9,UpgradeTest.setUp
+FNDA:0,UpgradeTest.setUp
+DA:10,0
+DA:11,0
+FNF:1
+FNH:0
+LF:2
+LH:0
+BRF:0
+BRH:0
+end_of_record
+TN:
 SF:test/utils/Bootstrap.sol
-FN:119,BootstrapOptimism.init
+FN:156,BootstrapOptimismGoerli.init
+FNDA:84,BootstrapOptimismGoerli.init
+DA:160,84
+DA:167,84
+DA:174,84
+FN:126,BootstrapOptimism.init
 FNDA:0,BootstrapOptimism.init
-DA:123,0
-DA:129,0
-DA:135,0
-FN:57,Bootstrap.initializeOptimismGoerli
+DA:130,0
+DA:137,0
+DA:144,0
+FN:60,Bootstrap.initializeOptimismGoerli
 FNDA:0,Bootstrap.initializeOptimismGoerli
-DA:58,0
-DA:59,0
-DA:65,0
-DA:67,0
-DA:68,0
+DA:61,0
+DA:62,0
 DA:69,0
-DA:70,0
 DA:71,0
 DA:72,0
 DA:73,0
+DA:74,0
 DA:75,0
 DA:76,0
 DA:77,0
+DA:78,0
+DA:80,0
+DA:81,0
 DA:82,0
-DA:84,0
-FN:87,Bootstrap.initializeOptimism
-FNDA:0,Bootstrap.initializeOptimism
-DA:88,0
+DA:87,0
 DA:89,0
-DA:95,0
-DA:97,0
-DA:98,0
-DA:99,0
-DA:100,0
+FN:92,Bootstrap.initializeOptimism
+FNDA:0,Bootstrap.initializeOptimism
+DA:93,0
+DA:94,0
 DA:101,0
-DA:102,0
 DA:103,0
+DA:104,0
 DA:105,0
 DA:106,0
 DA:107,0
+DA:108,0
+DA:109,0
+DA:110,0
 DA:112,0
+DA:113,0
 DA:114,0
-FN:146,BootstrapOptimismGoerli.init
-FNDA:0,BootstrapOptimismGoerli.init
-DA:150,0
-DA:156,0
-DA:162,0
+DA:119,0
+DA:121,0
 FNF:4
-FNH:0
-LF:36
-LH:0
+FNH:1
+LF:38
+LH:3
 BRF:0
 BRH:0
 end_of_record
@@ -601,20 +674,20 @@ end_of_record
 TN:
 SF:test/utils/SynthMinter.sol
 FN:24,SynthMinter.mint_sUSD
-FNDA:0,SynthMinter.mint_sUSD
-DA:25,0
+FNDA:128,SynthMinter.mint_sUSD
+DA:25,128
 FNF:1
-FNH:0
+FNH:1
 LF:1
-LH:0
+LH:1
 BRF:0
 BRH:0
 end_of_record
 TN:
 SF:test/utils/exposed/EngineExposed.sol
-FN:17,EngineExposed.getSynthAddress
+FN:16,EngineExposed.getSynthAddress
 FNDA:0,EngineExposed.getSynthAddress
-DA:22,0
+DA:21,0
 FNF:1
 FNH:0
 LF:1
@@ -624,12 +697,6 @@ BRH:0
 end_of_record
 TN:
 SF:test/utils/mocks/EIP7412Mock.sol
-FN:9,EIP7412Mock.fulfillOracleQuery
-FNDA:768,EIP7412Mock.fulfillOracleQuery
-DA:10,768
-BRDA:10,0,0,-
-BRDA:10,0,1,768
-DA:11,768
 FN:16,EIP7412MockRefund.fulfillOracleQuery
 FNDA:256,EIP7412MockRefund.fulfillOracleQuery
 DA:17,256
@@ -642,6 +709,12 @@ 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
+BRDA:10,0,0,-
+BRDA:10,0,1,768
+DA:11,768
 FNF:3
 FNH:3
 LF:6
@@ -650,6 +723,18 @@ BRF:6
 BRH:3
 end_of_record
 TN:
+SF:test/utils/mocks/MockEngineUpgrade.sol
+FN:16,MockEngineUpgrade.echo
+FNDA:1,MockEngineUpgrade.echo
+DA:17,1
+FNF:1
+FNH:1
+LF:1
+LH:1
+BRF:0
+BRH:0
+end_of_record
+TN:
 SF:test/utils/mocks/MockMulticallablePayable.sol
 FN:17,MockMulticallablePayable.revertsWithString
 FNDA:257,MockMulticallablePayable.revertsWithString
@@ -664,8 +749,8 @@ FN:29,MockMulticallablePayable.returnsTuple
 FNDA:534,MockMulticallablePayable.returnsTuple
 DA:34,534
 FN:37,MockMulticallablePayable.returnsString
-FNDA:127,MockMulticallablePayable.returnsString
-DA:42,127
+FNDA:115,MockMulticallablePayable.returnsString
+DA:42,115
 FN:47,MockMulticallablePayable.pay
 FNDA:0,MockMulticallablePayable.pay
 DA:48,0