Merge pull request #217 from Uniswap/dev-oz

dev-oz audit diff

Author: zhongeric

README.md

@@ -1,4 +1,4 @@
-# Minimal Delegation
+# Calibur
 
 a minimal, non-upgradeable implementation contract that can be set on an EIP-7702 delegation txn
 
@@ -37,22 +37,22 @@ forge test
 
 ```mermaid
 classDiagram
-    MinimalDelegation --|> ERC7821
-    MinimalDelegation --|> ERC1271
-    MinimalDelegation --|> EIP712
-    MinimalDelegation --|> ERC4337Account
-    MinimalDelegation --|> Receiver
-    MinimalDelegation --|> KeyManagement
-    MinimalDelegation --|> NonceManager
-    MinimalDelegation --|> ERC7914
-    MinimalDelegation --|> ERC7201
-    MinimalDelegation --|> ERC7739
-    MinimalDelegation --|> Multicall
+    Calibur --|> ERC7821
+    Calibur --|> ERC1271
+    Calibur --|> EIP712
+    Calibur --|> ERC4337Account
+    Calibur --|> Receiver
+    Calibur --|> KeyManagement
+    Calibur --|> NonceManager
+    Calibur --|> ERC7914
+    Calibur --|> ERC7201
+    Calibur --|> ERC7739
+    Calibur --|> Multicall
     
     EIP712 --|> IERC5267
     ERC4337Account --|> IAccount
     
-    class MinimalDelegation {
+    class Calibur {
         +execute(BatchedCall batchedCall)
         +execute(SignedBatchedCall signedBatchedCall, bytes wrappedSignature)
         +execute(bytes32 mode, bytes executionData)
@@ -68,12 +68,12 @@ classDiagram
 
 ```mermaid
 sequenceDiagram
-    participant SignerAccount as EOA (delegated to MinimalDelegation)
-    participant Account as MinimalDelegation
+    participant SignerAccount as EOA (delegated to Calibur)
+    participant Account as Calibur
     participant Hook
     participant Target
     
-    Note over SignerAccount, Account: EOA is delegated to MinimalDelegation via EIP-7702
+    Note over SignerAccount, Account: EOA is delegated to Calibur via EIP-7702
     SignerAccount->>Account: execute(BatchedCall batchedCall)
     Account->>Account: Check if sender keyHash is owner or admin
     Account->>Account: _processBatch(batchedCall, keyHash)
@@ -106,7 +106,7 @@ sequenceDiagram
 sequenceDiagram
     actor Signer
     participant Relayer
-    participant Account as MinimalDelegation
+    participant Account as Calibur
     participant Hook
     participant Target
     
@@ -164,12 +164,12 @@ sequenceDiagram
 
 ```mermaid
 sequenceDiagram
-    participant SignerAccount as EOA (delegated to MinimalDelegation)
-    participant Account as MinimalDelegation
+    participant SignerAccount as EOA (delegated to Calibur)
+    participant Account as Calibur
     participant Hook
     participant Target
     
-    Note over SignerAccount, Account: EOA is delegated to MinimalDelegation via EIP-7702
+    Note over SignerAccount, Account: EOA is delegated to Calibur via EIP-7702
     SignerAccount->>Account: execute(bytes32 mode, bytes executionData)
     Account->>Account: mode.isBatchedCall()
     opt If !mode.isBatchedCall()
@@ -214,7 +214,7 @@ sequenceDiagram
     actor Signer
     participant Bundler
     participant EntryPoint
-    participant Account as MinimalDelegation
+    participant Account as Calibur
     participant Hook
     participant Target
     
@@ -274,7 +274,7 @@ sequenceDiagram
 ```mermaid
 sequenceDiagram
     participant VerifyingContract
-    participant Account as MinimalDelegation
+    participant Account as Calibur
     participant Hook
     
     VerifyingContract->>+Account: isValidSignature(bytes32 digest, bytes wrappedSignature)
@@ -314,7 +314,7 @@ sequenceDiagram
 ```mermaid
 sequenceDiagram
     participant Caller
-    participant Account as MinimalDelegation
+    participant Account as Calibur
     participant Spender
     
     Caller->>+Account: approveNative(spender, amount)

foundry.toml

@@ -14,8 +14,9 @@ remappings = [
 additional_compiler_profiles = [{ name = "via_ir", optimizer_runs = 10000, via_ir = true }]
 
 compilation_restrictions = [
-  { paths = "src/MinimalDelegationEntry.sol", via_ir = true },
-  { paths = "src/MinimalDelegation.sol", via_ir = true }
+  { paths = "src/CaliburEntry.sol", via_ir = true },
+  { paths = "src/Calibur.sol", via_ir = true },
+  { paths = "test/ERC7739.t.sol", via_ir = true }
 ]
 
 [profile.default.invariant]

script/DeployCaliburEntry.s.sol

@@ -0,0 +1,19 @@
+// SPDX-License-Identifier: UNLICENSED
+pragma solidity ^0.8.23;
+
+import "forge-std/console2.sol";
+import "forge-std/Script.sol";
+import {CaliburEntry} from "../src/CaliburEntry.sol";
+
+contract DeployCaliburEntry is Script {
+    function setUp() public {}
+
+    function run() public returns (CaliburEntry entry) {
+        vm.startBroadcast();
+
+        entry = new CaliburEntry{salt: bytes32(0)}();
+        console2.log("CaliburEntry", address(entry));
+
+        vm.stopBroadcast();
+    }
+}

script/DeployMinimalDelegationEntry.s.sol

@@ -0,0 +1,4 @@
+{
+  "hanldeOps_BATCHED_CALL_singleCall_P256": "208852",
+  "hanldeOps_BATCHED_CALL_singleCall_eoaSigner": "183119"
+}

snapshots/Calibur4337Test.json

@@ -0,0 +1,13 @@
+{
+  "execute_empty": "23124",
+  "execute_invalidMode_reverts": "22940",
+  "execute_native_singleCall": "59809",
+  "execute_singleCall": "59522",
+  "execute_twoCalls": "95374",
+  "execute_withSignature_P256_singleCall": "122462",
+  "execute_withSignature_executor_singleCall": "96979",
+  "execute_withSignature_singleCall": "96703",
+  "execute_withSignature_singleCall_native": "97511",
+  "execute_withSignature_twoCalls": "134205",
+  "multicall": "184914"
+}

snapshots/CaliburExecuteTest.json

@@ -0,0 +1,13 @@
+{
+  "isValidSignature_P256_wrappedSignature___typedDataSign": "42450",
+  "isValidSignature_P256_wrappedSignature___typedDataSign_withHook": "48459",
+  "isValidSignature_P256_wrappedSignature__nestedPersonalSign": "35044",
+  "isValidSignature_WebAuthnP256_wrappedSignature___typedDataSign": "48785",
+  "isValidSignature_WebAuthnP256_wrappedSignature__nestedPersonalSign": "41347",
+  "isValidSignature_rootKey_compactSignature": "4670",
+  "isValidSignature_rootKey_rawSignature": "4647",
+  "isValidSignature_rootKey_wrappedSignature___typedDataSign": "17535",
+  "isValidSignature_rootKey_wrappedSignature__nestedPersonalSign": "10129",
+  "isValidSignature_secp256k1_wrappedSignature___typedDataSign": "38344",
+  "isValidSignature_secp256k1_wrappedSignature__nestedPersonalSign": "12938"
+}

snapshots/CaliburIsValidSignatureTest.json

@@ -0,0 +1,11 @@
+{
+  "caliburEntry bytecode size": "24504",
+  "entrypoint": "2786",
+  "register": "184872",
+  "revoke": "54555",
+  "validateUserOp_invalidSignature": "33250",
+  "validateUserOp_missingAccountFunds": "63882",
+  "validateUserOp_no_missingAccountFunds": "33244",
+  "validateUserOp_withHook_invalidSignature": "317995",
+  "validateUserOp_withHook_validSignature": "65930"
+}

snapshots/CaliburTest.json

@@ -1,5 +1,5 @@
 {
   "approveNative": "45970",
   "approveNativeTransient": "24010",
-  "transferFromNative": "31950"
+  "transferFromNative": "33350"
 }