From 7ac8eb4d3a40b95f14831239b51348a21929ae51 Mon Sep 17 00:00:00 2001 From: JaredBorders Date: Mon, 25 Sep 2023 15:53:48 -0400 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 | 95 ++++++------- lcov.info | 382 ++++++++++++++++++++++++++------------------------ 2 files changed, 245 insertions(+), 232 deletions(-) diff --git a/.gas-snapshot b/.gas-snapshot index 136dedb8..8bfe1c4c 100644 --- a/.gas-snapshot +++ b/.gas-snapshot @@ -1,17 +1,17 @@ -AccountDelegate:test_isAccountDelegate_account_doesnt_exist() (gas: 26494) -AccountDelegate:test_isAccountDelegate_false() (gas: 391959) -AccountDelegate:test_isAccountDelegate_true() (gas: 389928) +AccountDelegate:test_isAccountDelegate_account_doesnt_exist() (gas: 26514) +AccountDelegate:test_isAccountDelegate_false() (gas: 391991) +AccountDelegate:test_isAccountDelegate_true() (gas: 389960) AccountOwner:test_isAccountOwner_account_doesnt_exist() (gas: 25032) -AccountOwner:test_isAccountOwner_false() (gas: 229800) -AccountOwner:test_isAccountOwner_true() (gas: 229790) -CanExecute:test_canExecute_false_nonce_used() (gas: 623164) -CanExecute:test_canExecute_false_trusted_executor() (gas: 44049) -CanExecute:test_canExecute_true() (gas: 43648) -CommitOrder:test_commitOrder() (gas: 378408) -CommitOrder:test_commitOrder_insufficient_collateral() (gas: 433338) -CommitOrder:test_commitOrder_invalid_market() (gas: 37418) -Conditions:test_isMarketOpen() (gas: 26784) -Conditions:test_isOrderFeeBelow() (gas: 168839) +AccountOwner:test_isAccountOwner_false() (gas: 229812) +AccountOwner:test_isAccountOwner_true() (gas: 229802) +CanExecute:test_canExecute_false_nonce_used() (gas: 635740) +CanExecute:test_canExecute_false_trusted_executor() (gas: 44071) +CanExecute:test_canExecute_true() (gas: 43670) +CommitOrder:test_commitOrder() (gas: 382895) +CommitOrder:test_commitOrder_insufficient_collateral() (gas: 441115) +CommitOrder:test_commitOrder_invalid_market() (gas: 38252) +Conditions:test_isMarketOpen() (gas: 26586) +Conditions:test_isOrderFeeBelow() (gas: 179759) Conditions:test_isPositionSizeAbove() (gas: 18801) Conditions:test_isPositionSizeBelow() (gas: 18783) Conditions:test_isPriceAbove() (gas: 19194) @@ -23,48 +23,49 @@ DeploymentTest:test_deploy_oracle_zero_address() (gas: 39879) DeploymentTest:test_deploy_perps_market_proxy_zero_address() (gas: 39775) DeploymentTest:test_deploy_spot_market_proxy_zero_address() (gas: 39853) DeploymentTest:test_deploy_susd_proxy_zero_address() (gas: 39866) -DepositCollateral:test_depositCollateral() (gas: 258349) -DepositCollateral:test_depositCollateral_availableMargin() (gas: 265906) -DepositCollateral:test_depositCollateral_collateralAmount() (gas: 258925) -DepositCollateral:test_depositCollateral_insufficient_balance() (gas: 55890) -DepositCollateral:test_depositCollateral_totalCollateralValue() (gas: 263279) -Execute:test_execute_CannotExecuteOrder() (gas: 36391) -Execute:test_execute_leverage_exceeded() (gas: 698043) -Execute:test_execute_order_committed() (gas: 621144) -Fee:test_fee_imposed() (gas: 627241) -Fee:test_fee_imposed_above_upper_fee_cap() (gas: 608182) -Fee:test_fee_imposed_at_upper_fee_cap() (gas: 608085) -Fee:test_fee_imposed_below_lower_fee_cap() (gas: 606732) -Fee:test_fee_imposed_below_upper_fee_cap() (gas: 609005) -Fee:test_fee_imposed_fee_cannot_be_paid() (gas: 382488) -Fee:test_fee_imposed_insufficient_collateral_for_order() (gas: 698044) +DepositCollateral:test_depositCollateral() (gas: 258373) +DepositCollateral:test_depositCollateral_availableMargin() (gas: 265941) +DepositCollateral:test_depositCollateral_collateralAmount() (gas: 258949) +DepositCollateral:test_depositCollateral_insufficient_balance() (gas: 55891) +DepositCollateral:test_depositCollateral_totalCollateralValue() (gas: 263325) +Execute:test_execute_CannotExecuteOrder() (gas: 37262) +Execute:test_execute_leverage_exceeded() (gas: 716169) +Execute:test_execute_order_committed() (gas: 633720) +Fee:test_fee_imposed() (gas: 639801) +Fee:test_fee_imposed_above_upper_fee_cap() (gas: 618512) +Fee:test_fee_imposed_at_upper_fee_cap() (gas: 618415) +Fee:test_fee_imposed_below_lower_fee_cap() (gas: 617062) +Fee:test_fee_imposed_below_upper_fee_cap() (gas: 619335) +Fee:test_fee_imposed_fee_cannot_be_paid() (gas: 393807) +Fee:test_fee_imposed_insufficient_collateral_for_order() (gas: 716154) MathLibTest:test_abs128() (gas: 448) MathLibTest:test_abs256() (gas: 480) MathLibTest:test_castU128() (gas: 350) MathLibTest:test_castU128_overflow() (gas: 3509) -MathLibTest:test_fuzz_abs128(int128) (runs: 256, μ: 577, ~: 603) +MathLibTest:test_fuzz_abs128(int128) (runs: 256, μ: 576, ~: 603) MathLibTest:test_fuzz_abs256(int256) (runs: 256, μ: 472, ~: 458) MathLibTest:test_isSameSign() (gas: 999) -MulticallableTest:test_multicall_depositCollateral_commitOrder() (gas: 600450) -NonceBitmap:test_hasUnorderedNonceBeenUsed() (gas: 53903) -NonceBitmap:test_invalidateUnorderedNonces() (gas: 72810) -NonceBitmap:test_invalidateUnorderedNonces_Only_Owner_Delegate() (gas: 189948) -ReduceOnly:test_reduce_only() (gas: 622778) -ReduceOnly:test_reduce_only_same_sign() (gas: 68397) -ReduceOnly:test_reduce_only_truncate_size_down() (gas: 622908) -ReduceOnly:test_reduce_only_truncate_size_up() (gas: 603721) -ReduceOnly:test_reduce_only_zero_size() (gas: 158613) +MulticallableTest:test_multicall_depositCollateral_commitOrder() (gas: 604961) +NonceBitmapTest:test_fuzz_invalidateUnorderedNonces(uint256) (runs: 256, μ: 52614, ~: 52614) +NonceBitmapTest:test_hasUnorderedNonceBeenUsed() (gas: 53925) +NonceBitmapTest:test_invalidateUnorderedNonces() (gas: 72854) +NonceBitmapTest:test_invalidateUnorderedNonces_Only_Owner_Delegate() (gas: 190012) +ReduceOnly:test_reduce_only() (gas: 635354) +ReduceOnly:test_reduce_only_same_sign() (gas: 68419) +ReduceOnly:test_reduce_only_truncate_size_down() (gas: 635484) +ReduceOnly:test_reduce_only_truncate_size_up() (gas: 610287) +ReduceOnly:test_reduce_only_zero_size() (gas: 158892) VerifyConditions:test_max_condition_size_exceeded() (gas: 45046) VerifyConditions:test_verifyConditions_InvalidConditionSelector() (gas: 14079) VerifyConditions:test_verify_conditions_not_verified() (gas: 29659) -VerifyConditions:test_verify_conditions_verified() (gas: 135662) +VerifyConditions:test_verify_conditions_verified() (gas: 135808) VerifySignature:test_verifySignature() (gas: 23770) VerifySignature:test_verifySignature_false_private_key() (gas: 26592) -VerifySigner:test_verifySigner() (gas: 25801) -VerifySigner:test_verifySigner_false() (gas: 28509) -WithdrawCollateral:test_withdrawCollateral() (gas: 348278) -WithdrawCollateral:test_withdrawCollateral_availableMargin() (gas: 349788) -WithdrawCollateral:test_withdrawCollateral_collateralAmount() (gas: 348788) -WithdrawCollateral:test_withdrawCollateral_insufficient_account_collateral_balance() (gas: 279518) -WithdrawCollateral:test_withdrawCollateral_totalCollateralValue() (gas: 349277) -WithdrawCollateral:test_withdrawCollateral_zero() (gas: 265863) \ No newline at end of file +VerifySigner:test_verifySigner() (gas: 25823) +VerifySigner:test_verifySigner_false() (gas: 28531) +WithdrawCollateral:test_withdrawCollateral() (gas: 352984) +WithdrawCollateral:test_withdrawCollateral_availableMargin() (gas: 354503) +WithdrawCollateral:test_withdrawCollateral_collateralAmount() (gas: 353495) +WithdrawCollateral:test_withdrawCollateral_insufficient_account_collateral_balance() (gas: 273929) +WithdrawCollateral:test_withdrawCollateral_totalCollateralValue() (gas: 354001) +WithdrawCollateral:test_withdrawCollateral_zero() (gas: 265887) \ No newline at end of file diff --git a/lcov.info b/lcov.info index 0c10e533..e14e1bd4 100644 --- a/lcov.info +++ b/lcov.info @@ -1,23 +1,35 @@ TN: SF:script/Deploy.s.sol -FN:33,DeployOptimism.run -FNDA:0,DeployOptimism.run -DA:34,0 -DA:35,0 -DA:37,0 -DA:44,0 -FN:14,Setup.deploySystem +FN:17,Setup.deploySystem FNDA:0,Setup.deploySystem -DA:20,0 -FN:52,DeployOptimismGoerli.run +DA:23,0 +FN:36,DeployBase.run +FNDA:0,DeployBase.run +DA:37,0 +DA:38,0 +DA:40,0 +DA:47,0 +FN:94,DeployOptimismGoerli.run FNDA:0,DeployOptimismGoerli.run -DA:53,0 -DA:54,0 +DA:95,0 +DA:96,0 +DA:98,0 +DA:105,0 +FN:55,DeployBaseGoerli.run +FNDA:0,DeployBaseGoerli.run DA:56,0 -DA:63,0 -FNF:3 +DA:57,0 +DA:59,0 +DA:66,0 +FN:74,DeployOptimism.run +FNDA:0,DeployOptimism.run +DA:75,0 +DA:76,0 +DA:78,0 +DA:85,0 +FNF:5 FNH:0 -LF:9 +LF:17 LH:0 BRF:0 BRH:0 @@ -31,188 +43,188 @@ FN:139,Engine.isAccountDelegate FNDA:2,Engine.isAccountDelegate DA:145,2 FN:150,Engine._isAccountOwnerOrDelegate -FNDA:29,Engine._isAccountOwnerOrDelegate -DA:155,29 +FNDA:285,Engine._isAccountOwnerOrDelegate +DA:155,285 FN:165,Engine.invalidateUnorderedNonces -FNDA:4,Engine.invalidateUnorderedNonces -DA:170,4 -BRDA:170,0,0,4 +FNDA:260,Engine.invalidateUnorderedNonces +DA:170,260 +BRDA:170,0,0,260 BRDA:170,0,1,- -DA:171,4 -DA:173,4 -DA:175,0 -FN:180,Engine.hasUnorderedNonceBeenUsed -FNDA:4,Engine.hasUnorderedNonceBeenUsed -DA:186,25 -DA:187,25 -DA:188,25 -FN:198,Engine._bitmapPositions -FNDA:40,Engine._bitmapPositions -DA:203,40 -DA:204,40 -FN:210,Engine._useUnorderedNonce +DA:176,260 +DA:178,260 +DA:180,0 +FN:185,Engine.hasUnorderedNonceBeenUsed +FNDA:260,Engine.hasUnorderedNonceBeenUsed +DA:191,281 +DA:195,281 +DA:209,281 +FN:219,Engine._bitmapPositions +FNDA:296,Engine._bitmapPositions +DA:226,296 +DA:230,296 +FN:236,Engine._useUnorderedNonce FNDA:15,Engine._useUnorderedNonce -DA:211,15 -DA:212,15 -DA:213,15 -DA:215,15 -BRDA:215,1,0,- -BRDA:215,1,1,15 -FN:223,Engine.modifyCollateral +DA:237,15 +DA:241,15 +DA:248,15 +DA:268,15 +BRDA:268,1,0,- +BRDA:268,1,1,15 +FN:276,Engine.modifyCollateral FNDA:19,Engine.modifyCollateral -DA:228,19 -DA:230,19 -BRDA:230,2,0,12 -BRDA:230,2,1,7 -DA:231,12 -DA:235,7 -BRDA:235,3,0,- -BRDA:235,3,1,7 -DA:236,7 -FN:242,Engine._depositCollateral +DA:281,19 +DA:283,19 +BRDA:283,2,0,12 +BRDA:283,2,1,7 +DA:284,12 +DA:288,7 +BRDA:288,3,0,- +BRDA:288,3,1,7 +DA:289,7 +FN:295,Engine._depositCollateral FNDA:12,Engine._depositCollateral -DA:250,12 -DA:252,11 -DA:254,11 -FN:257,Engine._withdrawCollateral +DA:303,12 +DA:305,11 +DA:307,11 +FN:310,Engine._withdrawCollateral FNDA:20,Engine._withdrawCollateral -DA:264,20 -DA:267,17 -FN:273,Engine._getSynthAddress +DA:317,20 +DA:320,17 +FN:326,Engine._getSynthAddress FNDA:19,Engine._getSynthAddress -DA:278,19 -FN:288,Engine.commitOrder +DA:331,19 +FN:341,Engine.commitOrder FNDA:4,Engine.commitOrder -DA:302,4 -BRDA:302,4,0,4 -BRDA:302,4,1,- -DA:303,4 -DA:313,0 -FN:317,Engine._commitOrder +DA:355,4 +BRDA:355,4,0,4 +BRDA:355,4,1,- +DA:356,4 +DA:366,0 +FN:370,Engine._commitOrder FNDA:16,Engine._commitOrder -DA:326,16 -FN:344,Engine.execute +DA:379,16 +FN:397,Engine.execute FNDA:16,Engine.execute -DA:357,16 -BRDA:357,5,0,1 -BRDA:357,5,1,15 -DA:360,15 -DA:364,15 -DA:367,15 -BRDA:367,6,0,2 -BRDA:367,6,1,3 -DA:368,5 -DA:373,5 -BRDA:373,7,0,1 -BRDA:373,7,1,4 -DA:374,1 -DA:378,4 -BRDA:378,8,0,1 -BRDA:378,8,1,3 -DA:379,1 -DA:385,3 -BRDA:385,9,0,2 -BRDA:385,9,1,3 -DA:395,2 -DA:401,13 -DA:407,13 -DA:410,13 -BRDA:410,10,0,6 -BRDA:410,10,1,7 -DA:411,6 -DA:412,7 -BRDA:412,11,0,2 -BRDA:412,11,1,7 -DA:413,2 -DA:417,13 -DA:426,12 -FN:438,Engine.canExecute +DA:410,16 +BRDA:410,5,0,1 +BRDA:410,5,1,15 +DA:413,15 +DA:417,15 +DA:420,15 +BRDA:420,6,0,2 +BRDA:420,6,1,3 +DA:421,5 +DA:426,5 +BRDA:426,7,0,1 +BRDA:426,7,1,4 +DA:427,1 +DA:431,4 +BRDA:431,8,0,1 +BRDA:431,8,1,3 +DA:432,1 +DA:438,3 +BRDA:438,9,0,2 +BRDA:438,9,1,3 +DA:448,2 +DA:454,13 +DA:460,13 +DA:463,13 +BRDA:463,10,0,6 +BRDA:463,10,1,7 +DA:464,6 +DA:465,7 +BRDA:465,11,0,2 +BRDA:465,11,1,7 +DA:466,2 +DA:470,13 +DA:479,12 +FN:491,Engine.canExecute FNDA:5,Engine.canExecute -DA:443,21 -BRDA:443,12,0,2 -BRDA:443,12,1,19 -DA:444,2 -DA:448,19 -BRDA:448,13,0,1 -BRDA:448,13,1,18 -DA:451,18 -BRDA:451,14,0,- -BRDA:451,14,1,18 -DA:454,18 -BRDA:454,15,0,- -BRDA:454,15,1,- -DA:457,0 -BRDA:457,16,0,- -BRDA:457,16,1,- -DA:461,18 -BRDA:461,17,0,1 -BRDA:461,17,1,17 -DA:464,17 -FN:472,Engine.verifySigner +DA:496,21 +BRDA:496,12,0,2 +BRDA:496,12,1,19 +DA:497,2 +DA:501,19 +BRDA:501,13,0,1 +BRDA:501,13,1,18 +DA:504,18 +BRDA:504,14,0,- +BRDA:504,14,1,18 +DA:507,18 +BRDA:507,15,0,- +BRDA:507,15,1,- +DA:510,0 +BRDA:510,16,0,- +BRDA:510,16,1,- +DA:514,18 +BRDA:514,17,0,1 +BRDA:514,17,1,17 +DA:517,17 +FN:525,Engine.verifySigner FNDA:2,Engine.verifySigner -DA:478,21 -FN:482,Engine.verifySignature +DA:531,21 +FN:535,Engine.verifySignature FNDA:2,Engine.verifySignature -DA:486,20 -FN:492,Engine.verifyConditions +DA:539,20 +FN:545,Engine.verifyConditions FNDA:4,Engine.verifyConditions -DA:498,4 -DA:499,4 -BRDA:499,18,0,1 -BRDA:499,18,1,3 -DA:500,1 -DA:503,3 -DA:504,13 -DA:505,13 -DA:508,13 -DA:513,13 -DA:514,11 -DA:515,9 -DA:516,7 -DA:517,5 -DA:518,4 -DA:519,3 -DA:520,2 -BRDA:512,19,0,1 -BRDA:512,19,1,11 -DA:523,12 -DA:526,12 -BRDA:526,20,0,1 -BRDA:526,20,1,11 -DA:529,11 -DA:532,1 -DA:536,1 -FN:544,Engine.isTimestampAfter +DA:551,4 +DA:552,4 +BRDA:552,18,0,1 +BRDA:552,18,1,3 +DA:553,1 +DA:556,3 +DA:557,13 +DA:558,13 +DA:561,13 +DA:566,13 +DA:567,11 +DA:568,9 +DA:569,7 +DA:570,5 +DA:571,4 +DA:572,3 +DA:573,2 +BRDA:565,19,0,1 +BRDA:565,19,1,11 +DA:576,12 +DA:579,12 +BRDA:579,20,0,1 +BRDA:579,20,1,11 +DA:582,11 +DA:585,1 +DA:589,1 +FN:597,Engine.isTimestampAfter FNDA:5,Engine.isTimestampAfter -DA:550,5 -FN:554,Engine.isTimestampBefore +DA:603,5 +FN:607,Engine.isTimestampBefore FNDA:5,Engine.isTimestampBefore -DA:560,5 -FN:564,Engine.isPriceAbove +DA:613,5 +FN:617,Engine.isPriceAbove FNDA:6,Engine.isPriceAbove -DA:569,6 -DA:574,6 -FN:578,Engine.isPriceBelow +DA:622,6 +DA:627,6 +FN:631,Engine.isPriceBelow FNDA:6,Engine.isPriceBelow -DA:583,6 -DA:588,6 -FN:592,Engine.isMarketOpen +DA:636,6 +DA:641,6 +FN:645,Engine.isMarketOpen FNDA:3,Engine.isMarketOpen -DA:598,3 -FN:602,Engine.isPositionSizeAbove +DA:651,3 +FN:655,Engine.isPositionSizeAbove FNDA:4,Engine.isPositionSizeAbove -DA:607,4 -DA:608,4 -DA:610,4 -FN:614,Engine.isPositionSizeBelow +DA:660,4 +DA:661,4 +DA:663,4 +FN:667,Engine.isPositionSizeBelow FNDA:4,Engine.isPositionSizeBelow -DA:619,4 -DA:620,4 -DA:622,4 -FN:626,Engine.isOrderFeeBelow +DA:672,4 +DA:673,4 +DA:675,4 +FN:679,Engine.isOrderFeeBelow FNDA:4,Engine.isOrderFeeBelow -DA:632,4 -DA:637,4 +DA:685,4 +DA:690,4 FNF:26 FNH:26 LF:95 @@ -337,14 +349,14 @@ BRH:0 end_of_record TN: SF:test/AsyncOrder.t.sol -FN:9,AsyncOrderTest.setUp +FN:8,AsyncOrderTest.setUp FNDA:0,AsyncOrderTest.setUp +DA:9,0 DA:10,0 -DA:11,0 -DA:13,0 -DA:15,0 -DA:17,0 -DA:23,0 +DA:12,0 +DA:14,0 +DA:16,0 +DA:22,0 FNF:1 FNH:0 LF:6 @@ -404,16 +416,16 @@ BRH:0 end_of_record TN: SF:test/utils/Bootstrap.sol -FN:102,BootstrapOptimism.init -FNDA:0,BootstrapOptimism.init -DA:106,0 -DA:113,0 -DA:120,0 FN:132,BootstrapOptimismGoerli.init FNDA:0,BootstrapOptimismGoerli.init DA:136,0 DA:143,0 DA:150,0 +FN:102,BootstrapOptimism.init +FNDA:0,BootstrapOptimism.init +DA:106,0 +DA:113,0 +DA:120,0 FN:36,Bootstrap.initializeOptimismGoerli FNDA:0,Bootstrap.initializeOptimismGoerli DA:37,0