🏅 Guhu Audit Response

.gas-snapshot

@@ -1,110 +1,99 @@
-AccountDelegate:test_isAccountDelegate_account_doesnt_exist() (gas: 26514)
-AccountDelegate:test_isAccountDelegate_false() (gas: 391969)
-AccountDelegate:test_isAccountDelegate_true() (gas: 389938)
-AccountOwner:test_isAccountOwner_account_doesnt_exist() (gas: 25010)
-AccountOwner:test_isAccountOwner_false() (gas: 229790)
-AccountOwner:test_isAccountOwner_true() (gas: 229780)
-CanExecute:test_canExecute_false_insufficent_account_credit() (gas: 414871)
-CanExecute:test_canExecute_false_invalid_signature() (gas: 448904)
-CanExecute:test_canExecute_false_invalid_signer() (gas: 442063)
-CanExecute:test_canExecute_false_maxExecutorFee_exceeded() (gas: 397562)
-CanExecute:test_canExecute_false_nonce_used() (gas: 826365)
-CanExecute:test_canExecute_false_trusted_executor() (gas: 438807)
-CanExecute:test_canExecute_true() (gas: 438401)
-CommitOrder:test_commitOrder() (gas: 382994)
-CommitOrder:test_commitOrder_insufficient_collateral() (gas: 441236)
-CommitOrder:test_commitOrder_invalid_market() (gas: 38373)
-Conditions:test_isMarketOpen() (gas: 26619)
-Conditions:test_isOrderFeeBelow() (gas: 179759)
-Conditions:test_isPositionSizeAbove() (gas: 18823)
-Conditions:test_isPositionSizeBelow() (gas: 18762)
-Conditions:test_isPriceAbove() (gas: 19098)
-Conditions:test_isPriceBelow() (gas: 19092)
-Conditions:test_isTimestampAfter() (gas: 7711)
-Conditions:test_isTimestampBefore() (gas: 7579)
-DeploymentTest:test_deploy() (gas: 4890031)
-DeploymentTest:test_deploy_oracle_zero_address() (gas: 1903033)
-DeploymentTest:test_deploy_perps_market_proxy_zero_address() (gas: 1902949)
-DeploymentTest:test_deploy_spot_market_proxy_zero_address() (gas: 1903016)
-DeploymentTest:test_deploy_susd_proxy_zero_address() (gas: 1903029)
-DeploymentTest:test_deploy_trusted_forwarder_zero_address() (gas: 37562)
-Deposit:test_depositEth() (gas: 55255)
-Deposit:test_depositEth_Account_Doesnt_Exist() (gas: 34271)
-Deposit:test_depositEth_event() (gas: 56815)
-Deposit:test_depositEth_fuzz(uint256,uint128) (runs: 256, μ: 36765, ~: 34889)
-Deposit:test_depositEth_via_trustedForwarder() (gas: 85374)
-Deposit:test_depositEth_via_trustedForwarder_value_mismatch() (gas: 87469)
-Deposit:test_depositEth_via_trustedForwarder_value_mismatch_require_success() (gas: 86713)
-DepositCollateral:test_depositCollateral() (gas: 258530)
-DepositCollateral:test_depositCollateral_availableMargin() (gas: 266098)
-DepositCollateral:test_depositCollateral_collateralAmount() (gas: 259106)
-DepositCollateral:test_depositCollateral_insufficient_balance() (gas: 56046)
-DepositCollateral:test_depositCollateral_totalCollateralValue() (gas: 263482)
-EIP7412Test:test_fulfillOracleQuery(bytes) (runs: 256, μ: 149614, ~: 149516)
-Execute:test_execute_CannotExecuteOrder_invalid_acceptablePrice() (gas: 330951)
-Execute:test_execute_CannotExecuteOrder_invalid_settlementStrategyId() (gas: 96827)
-Execute:test_execute_CannotExecuteOrder_too_leveraged() (gas: 361524)
-Execute:test_execute_event() (gas: 433933)
-Execute:test_execute_order_committed() (gas: 430425)
-ExecuteBatch:test_executeBatch() (gas: 95256)
-ExecuteBatch:test_executeBatch_invalid_signature() (gas: 48173)
-Fee:test_fee_exceeds_account_credit() (gas: 67907)
-Fee:test_fee_exceeds_maxExecutorFee() (gas: 67486)
-Fee:test_fee_imposed() (gas: 468614)
-MathLibTest:test_abs128() (gas: 448)
+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: 446810)
+CanExecute:test_canExecute_false_invalid_signer() (gas: 442163)
+CanExecute:test_canExecute_false_maxExecutorFee_exceeded() (gas: 397594)
+CanExecute:test_canExecute_false_nonce_used() (gas: 825780)
+CanExecute:test_canExecute_false_require_verify_condition_not_met() (gas: 532786)
+CanExecute:test_canExecute_false_trusted_executor() (gas: 439360)
+CanExecute:test_canExecute_true() (gas: 438999)
+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, μ: 103044, ~: 112702)
+Credit:test_credit_AccountDoesNotExist() (gas: 28011)
+Credit:test_credit_event() (gas: 97230)
+Debit:test_debit(uint256) (runs: 256, μ: 132589, ~: 142379)
+Debit:test_debit_InsufficientBalance() (gas: 119995)
+Debit:test_debit_Unauthorized() (gas: 120025)
+Debit:test_debit_event() (gas: 102161)
+DeploymentTest:test_deploy() (gas: 3195810)
+DeploymentTest:test_deploy_perps_market_proxy_zero_address() (gas: 42676)
+DeploymentTest:test_deploy_spot_market_proxy_zero_address() (gas: 42743)
+DeploymentTest:test_deploy_susd_proxy_zero_address() (gas: 42734)
+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)
+Execute:test_execute_CannotExecuteOrder_invalid_acceptablePrice() (gas: 330290)
+Execute:test_execute_CannotExecuteOrder_invalid_settlementStrategyId() (gas: 96211)
+Execute:test_execute_CannotExecuteOrder_too_leveraged() (gas: 360885)
+Execute:test_execute_event() (gas: 433339)
+Execute:test_execute_order_committed() (gas: 429786)
+Fee:test_fee_exceeds_account_credit() (gas: 133066)
+Fee:test_fee_exceeds_maxExecutorFee() (gas: 132599)
+Fee:test_fee_imposed() (gas: 519317)
+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)
+MathLibTest:test_abs128() (gas: 425)
 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_abs256(int256) (runs: 256, μ: 472, ~: 458)
 MathLibTest:test_isSameSign() (gas: 999)
-NonceBitmapTest:test_fuzz_invalidateUnorderedNonces(uint256) (runs: 256, μ: 52770, ~: 52770)
-NonceBitmapTest:test_hasUnorderedNonceBeenUsed() (gas: 54126)
-NonceBitmapTest:test_invalidateUnorderedNonces() (gas: 76509)
-NonceBitmapTest:test_invalidateUnorderedNonces_Only_Owner_Delegate() (gas: 190324)
-NonceBitmapTest:test_invalidateUnorderedNonces_event() (gas: 53464)
-ReduceOnly:test_reduce_only() (gas: 432125)
-ReduceOnly:test_reduce_only_same_sign() (gas: 72481)
-ReduceOnly:test_reduce_only_truncate_size_down() (gas: 432232)
-ReduceOnly:test_reduce_only_truncate_size_up() (gas: 408894)
-ReduceOnly:test_reduce_only_zero_size() (gas: 162976)
-TrustedMulticallForwarderTest:testAggregate3() (gas: 24779)
-TrustedMulticallForwarderTest:testAggregate3Unsuccessful() (gas: 21395)
-TrustedMulticallForwarderTest:testAggregate3Value() (gas: 49261)
-TrustedMulticallForwarderTest:testAggregate3ValueUnsuccessful() (gas: 87877)
-TrustedMulticallForwarderTest:testAggregation() (gas: 15186)
-TrustedMulticallForwarderTest:testBlockAndAggregateUnsuccessful() (gas: 21080)
-TrustedMulticallForwarderTest:testGetBasefee() (gas: 5486)
-TrustedMulticallForwarderTest:testGetBlockHash(uint256) (runs: 256, μ: 5674, ~: 5674)
-TrustedMulticallForwarderTest:testGetBlockNumber() (gas: 5487)
-TrustedMulticallForwarderTest:testGetChainId() (gas: 5486)
-TrustedMulticallForwarderTest:testGetCurrentBlockCoinbase() (gas: 5579)
-TrustedMulticallForwarderTest:testGetCurrentBlockGasLimit() (gas: 5463)
-TrustedMulticallForwarderTest:testGetCurrentBlockTimestamp() (gas: 5433)
-TrustedMulticallForwarderTest:testGetEthBalance(address) (runs: 256, μ: 8421, ~: 8451)
-TrustedMulticallForwarderTest:testGetLastBlockHash() (gas: 5670)
-TrustedMulticallForwarderTest:testTryAggregate() (gas: 19577)
-TrustedMulticallForwarderTest:testTryAggregateUnsuccessful() (gas: 21084)
-TrustedMulticallForwarderTest:testTryBlockAndAggregate() (gas: 19879)
-TrustedMulticallForwarderTest:testTryBlockAndAggregateUnsuccessful() (gas: 21185)
-TrustedMulticallForwarderTest:testUnsuccessfulAggregation() (gas: 20818)
-VerifyConditions:test_max_condition_size_exceeded() (gas: 45101)
-VerifyConditions:test_verifyConditions_InvalidConditionSelector() (gas: 14132)
-VerifyConditions:test_verify_conditions_not_verified() (gas: 29707)
-VerifyConditions:test_verify_conditions_verified() (gas: 135835)
-VerifySignature:test_verifySignature(uint256) (runs: 256, μ: 24402, ~: 24402)
-VerifySignature:test_verifySignature_false_private_key() (gas: 27079)
-VerifySigner:test_verifySigner() (gas: 25862)
-VerifySigner:test_verifySigner_false() (gas: 28614)
-Withdraw:test_withdrawEth() (gas: 52547)
-Withdraw:test_withdrawEth_EthTransferFailed() (gas: 93091)
-Withdraw:test_withdrawEth_InsufficientEthBalance() (gas: 59781)
-Withdraw:test_withdrawEth_Unauthorized() (gas: 59420)
-Withdraw:test_withdrawEth_event() (gas: 51791)
-Withdraw:test_withdrawEth_fuzz(uint256) (runs: 256, μ: 70862, ~: 71511)
-WithdrawCollateral:test_withdrawCollateral() (gas: 353254)
-WithdrawCollateral:test_withdrawCollateral_availableMargin() (gas: 354755)
-WithdrawCollateral:test_withdrawCollateral_collateralAmount() (gas: 353747)
-WithdrawCollateral:test_withdrawCollateral_insufficient_account_collateral_balance() (gas: 274242)
-WithdrawCollateral:test_withdrawCollateral_totalCollateralValue() (gas: 354253)
-WithdrawCollateral:test_withdrawCollateral_zero() (gas: 266200)
+MulticallFulfillOracleQuery:test_fulfillOracleQuery_multicall(bytes) (runs: 256, μ: 29315, ~: 29258)
+MulticallFulfillOracleQuery:test_fulfillOracleQuery_multicall_double_spend(bytes) (runs: 256, μ: 41932, ~: 41822)
+MulticallablePayableTest:testMulticallableBenchmark() (gas: 29229)
+MulticallablePayableTest:testMulticallableOriginalBenchmark() (gas: 38407)
+MulticallablePayableTest:testMulticallablePreservesMsgSender() (gas: 11065)
+MulticallablePayableTest:testMulticallableReturnDataIsProperlyEncoded() (gas: 11548)
+MulticallablePayableTest:testMulticallableReturnDataIsProperlyEncoded(string,string,uint256) (runs: 256, μ: 9837, ~: 11626)
+MulticallablePayableTest:testMulticallableReturnDataIsProperlyEncoded(uint256,uint256,uint256,uint256) (runs: 256, μ: 11694, ~: 11694)
+MulticallablePayableTest:testMulticallableRevertWithCustomError() (gas: 11767)
+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: 77151)
+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: 431521)
+ReduceOnly:test_reduce_only_same_sign() (gas: 72722)
+ReduceOnly:test_reduce_only_truncate_size_down() (gas: 431607)
+ReduceOnly:test_reduce_only_truncate_size_up() (gas: 408356)
+ReduceOnly:test_reduce_only_when_position_doesnt_exist() (gas: 163109)
+ReduceOnly:test_reduce_only_zero_size_delta() (gas: 163166)
+VerifyConditions:test_max_condition_size_exceeded() (gas: 45057)
+VerifyConditions:test_verifyConditions_InvalidConditionSelector() (gas: 14089)
+VerifyConditions:test_verify_conditions_not_verified() (gas: 129563)
+VerifyConditions:test_verify_conditions_verified() (gas: 184166)
+VerifySignature:test_verifySignature(uint256) (runs: 256, μ: 25033, ~: 25033)
+VerifySignature:test_verifySignature_false_private_key() (gas: 25009)
+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)

.gitmodules

@@ -1,6 +1,3 @@
 [submodule "lib/forge-std"]
 	path = lib/forge-std
 	url = https://github.com/foundry-rs/forge-std
-[submodule "lib/openzeppelin-contracts"]
-	path = lib/openzeppelin-contracts
-	url = https://github.com/openzeppelin/openzeppelin-contracts

README.md

@@ -24,8 +24,6 @@ src/
 ├── Engine.sol
 ├── interfaces
 │   ├── IEngine.sol
-│   ├── oracles
-│   │   └── IPyth.sol
 │   ├── synthetix
 │   │   ├── IERC7412.sol
 │   │   ├── IPerpsMarketProxy.sol
@@ -39,7 +37,7 @@ src/
 └── utils
     ├── EIP712.sol
     ├── EIP7412.sol
-    └── TrustedMulticallForwarder.sol
+    └── Multicallable.sol
 ```
 
 ## Tests
@@ -81,7 +79,7 @@ npm run decode-custom-error -- <error hash 0x...>
 > project must be compiled first (see step 2)
 
 ```
-npx hardhat test
+npm run test:hh
 ```
 
 ## Deployment Addresses

deployments/Base.json

@@ -1,14 +1,11 @@
 {
     "Synthetix": {
-        "Engine": "",
-        "TrustedMulticallForwarder": ""
+        "Engine": ""
     },
     "Andromeda": {
-        "Engine": "",
-        "TrustedMulticallForwarder": ""
+        "Engine": ""
     },
     "Kwenta": {
-        "Engine": "",
-        "TrustedMulticallForwarder": ""
+        "Engine": ""
     }
 }

deployments/BaseGoerli.json

@@ -1,14 +1,11 @@
 {
     "Synthetix": {
-        "Engine": "0x500A139459fA3628C416A6b19BFADd83B20e5D0b",
-        "TrustedMulticallForwarder": "0x14aE2D8fA531A9e77aE434d2d700218C2845Bc83"
+        "Engine": ""
     },
     "Andromeda": {
-        "Engine": "0x3617154844291712cBD2148D912b61d6641229a4",
-        "TrustedMulticallForwarder": "0xb5dCFb08a2CB07399b75B650B980732340c5Ed90"
+        "Engine": ""
     },
     "Kwenta": {
-        "Engine": "0x0b5456EB6eE169C533a931aD2a420237ADf3Da49",
-        "TrustedMulticallForwarder": "0xe68Faa95D54bf335E67128c4528A551eaB3AF9fE"
+        "Engine": ""
     }
 }

deployments/Optimism.json

@@ -1,14 +1,11 @@
 {
     "Synthetix": {
-        "Engine": "",
-        "TrustedMulticallForwarder": ""
+        "Engine": ""
     },
     "Andromeda": {
-        "Engine": "",
-        "TrustedMulticallForwarder": ""
+        "Engine": ""
     },
     "Kwenta": {
-        "Engine": "",
-        "TrustedMulticallForwarder": ""
+        "Engine": ""
     }
 }

deployments/OptimismGoerli.json

@@ -1,14 +1,11 @@
 {
     "Synthetix": {
-        "Engine": "0x06198fCE58194C0cB7AB420D6da791789cE01F9d",
-        "TrustedMulticallForwarder": "0x9Fb8Fa76d34ad7b03A945f8335D3Ab24637091d6"
+        "Engine": ""
     },
     "Andromeda": {
-        "Engine": "",
-        "TrustedMulticallForwarder": ""
+        "Engine": ""
     },
     "Kwenta": {
-        "Engine": "",
-        "TrustedMulticallForwarder": ""
+        "Engine": ""
     }
 }