Skip to content
Closed
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 26 additions & 0 deletions foundry.lock
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Think it would be good to separate the lockfile and lib/forge-std diff into its own tiny PR for clarity and merge that first. Might not be worth the effort though, but generally touching build stuff is high enough importance to be isolated.

Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"lib/account-abstraction": {
"rev": "abff2aca61a8f0934e533d0d352978055fddbd96"
},
"lib/forge-std": {
"tag": {
"name": "v1.10.0",
"rev": "8bbcf6e3f8f62f419e5429a0bd89331c85c37824"
}
},
"lib/openzeppelin-contracts": {
"rev": "5705e8208bc92cd82c7bcdfeac8dbc7377767d96"
},
"lib/p256-verifier": {
"rev": "29475ae300ec95d98d5c7cc34c094846f0aa2dcd"
},
"lib/safe-singleton-deployer-sol": {
"rev": "cf2b89c33fed536c4dd6fef2fb84f39053068868"
},
"lib/solady": {
"rev": "c4c96607cb3aa3807b14c81ae2015bcba061f8fc"
},
"lib/webauthn-sol": {
"rev": "619f20ab0f074fef41066ee4ab24849a913263b2"
}
}
2 changes: 1 addition & 1 deletion lib/forge-std
Submodule forge-std updated 55 files
+1 −0 .github/CODEOWNERS
+57 −109 .github/workflows/ci.yml
+3 −1 .github/workflows/sync.yml
+0 −3 .gitmodules
+193 −0 CONTRIBUTING.md
+21 −5 README.md
+5 −3 foundry.toml
+0 −1 lib/ds-test
+1 −1 package.json
+13 −2 scripts/vm.py
+16 −9 src/Base.sol
+1 −0 src/Script.sol
+590 −202 src/StdAssertions.sol
+49 −11 src/StdChains.sol
+17 −5 src/StdCheats.sol
+30 −0 src/StdConstants.sol
+18 −3 src/StdInvariant.sol
+111 −11 src/StdJson.sol
+202 −107 src/StdStorage.sol
+283 −0 src/StdToml.sol
+1 −19 src/StdUtils.sol
+5 −4 src/Test.sol
+1,416 −62 src/Vm.sol
+635 −608 src/console.sol
+1 −1,555 src/console2.sol
+1 −1 src/interfaces/IERC1155.sol
+3 −3 src/interfaces/IERC4626.sol
+72 −0 src/interfaces/IERC6909.sol
+1 −1 src/interfaces/IERC721.sol
+150 −0 src/interfaces/IERC7540.sol
+241 −0 src/interfaces/IERC7575.sol
+0 −216 src/mocks/MockERC20.sol
+0 −221 src/mocks/MockERC721.sol
+693 −4 src/safeconsole.sol
+44 −0 test/CommonBase.t.sol
+35 −909 test/StdAssertions.t.sol
+55 −44 test/StdChains.t.sol
+66 −37 test/StdCheats.t.sol
+38 −0 test/StdConstants.t.sol
+12 −12 test/StdError.t.sol
+49 −0 test/StdJson.t.sol
+12 −22 test/StdMath.t.sol
+190 −17 test/StdStorage.t.sol
+1 −1 test/StdStyle.t.sol
+49 −0 test/StdToml.t.sol
+26 −26 test/StdUtils.t.sol
+9 −6 test/Vm.t.sol
+1 −1 test/compilation/CompilationScript.sol
+1 −1 test/compilation/CompilationScriptBase.sol
+1 −1 test/compilation/CompilationTest.sol
+1 −1 test/compilation/CompilationTestBase.sol
+8 −0 test/fixtures/test.json
+6 −0 test/fixtures/test.toml
+0 −441 test/mocks/MockERC20.t.sol
+0 −721 test/mocks/MockERC721.t.sol
6 changes: 6 additions & 0 deletions snapshots/EndToEndTest.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"e2e_transfer_erc20_4337": "159402",
"e2e_transfer_erc20_eoa": "50910",
"e2e_transfer_native_4337": "159635",
"e2e_transfer_native_eoa": "17652"
}
103 changes: 103 additions & 0 deletions test/gas/EndToEnd.t.sol
Original file line number Diff line number Diff line change
@@ -0,0 +1,103 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.4;

import {console2} from "forge-std/Test.sol";
import {SmartWalletTestBase} from "../CoinbaseSmartWallet/SmartWalletTestBase.sol";
import {CoinbaseSmartWallet} from "../../src/CoinbaseSmartWallet.sol";
import {CoinbaseSmartWalletFactory} from "../../src/CoinbaseSmartWalletFactory.sol";
import {MockTarget} from "../mocks/MockTarget.sol";
import {UserOperation} from "account-abstraction/interfaces/UserOperation.sol";
import {MockERC20} from "../../lib/solady/test/utils/mocks/MockERC20.sol";
import {Static} from "../CoinbaseSmartWallet/Static.sol";

/// forge-config: default.isolate = true
contract EndToEndTest is SmartWalletTestBase {
address eoaUser = address(0xe0a);

MockERC20 usdc;
MockTarget target;
CoinbaseSmartWalletFactory factory;

function setUp() public override {
vm.etch(0x5FF137D4b0FDCD49DcA30c7CF57E578a026d2789, Static.ENTRY_POINT_BYTES);

CoinbaseSmartWallet implementation = new CoinbaseSmartWallet();
factory = new CoinbaseSmartWalletFactory(address(implementation));

signerPrivateKey = 0xa11ce;
signer = vm.addr(signerPrivateKey);
owners.push(abi.encode(signer));
account = factory.createAccount(owners, 0);

vm.deal(address(account), 100 ether);
vm.deal(eoaUser, 100 ether);

usdc = new MockERC20("USD Coin", "USDC", 6);
usdc.mint(address(account), 10000e6);
usdc.mint(eoaUser, 10000e6);

target = new MockTarget();
}

// Native ETH transfer comparison between ERC-4337 and EOA
function test_transfer_native() public {
userOpCalldata = abi.encodeCall(CoinbaseSmartWallet.execute, (address(0x1234), 1 ether, ""));
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Recommend fuzzing in general which can remove hardcoded values.

Also there's an increased cost when updating the storage for a users balance from zero to nonzero so we can cover for that by dusting the address first.

Suggested change
function test_transfer_native() public {
userOpCalldata = abi.encodeCall(CoinbaseSmartWallet.execute, (address(0x1234), 1 ether, ""));
function test_transfer_native(address recipient, uint256 amount) public {
vm.assume(amount < 1 ether);
// Dust recipient to control for gas increase for first non-zero balance
vm.deal(recipient, 1 wei);
usdc.mint(eoaUser, 1 wei);
// Prepare userOp
userOpCalldata = abi.encodeCall(CoinbaseSmartWallet.execute, (recipient, amount, "");

UserOperation memory op = _getUserOpWithSignature();

bytes memory handleOpsCalldata = abi.encodeCall(entryPoint.handleOps, (_makeOpsArray(op), payable(bundler)));
console2.log("test_transfer_native ERC-4337 calldata size:", handleOpsCalldata.length);
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

also thinking we should log the calldata size for eoa execution as well for easy diff


vm.startSnapshotGas("e2e_transfer_native_4337");
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

naming nit

Suggested change
vm.startSnapshotGas("e2e_transfer_native_4337");
vm.startSnapshotGas("e2e_transfer_native_baseAccount");

_sendUserOperation(op);
uint256 gas4337 = vm.stopSnapshotGas();
console2.log("test_transfer_native ERC-4337 gas:", gas4337);

console2.log("test_transfer_native EOA calldata size:", uint256(0));

vm.prank(eoaUser);
vm.startSnapshotGas("e2e_transfer_native_eoa");
payable(address(0x1234)).transfer(1 ether);
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if using fuzzing from earlier comment

Suggested change
payable(address(0x1234)).transfer(1 ether);
payable(address(recipient)).transfer(1 ether);

uint256 gasEOA = vm.stopSnapshotGas();
console2.log("test_transfer_native EOA gas:", gasEOA);
console2.log("Gas overhead (4337/EOA):", (gas4337 * 100) / gasEOA, "%");
}

// ERC20 transfer comparison between ERC-4337 and EOA
function test_transfer_erc20() public {
userOpCalldata = abi.encodeCall(
CoinbaseSmartWallet.execute,
(address(usdc), 0, abi.encodeCall(usdc.transfer, (address(0x5678), 100e6)))
);
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same thing here as previous function with:

  1. fuzzing instead of hardcoding values
  2. dust recipients to remove variability from zero->nonzero storage transition

UserOperation memory op = _getUserOpWithSignature();

bytes memory handleOpsCalldata = abi.encodeCall(entryPoint.handleOps, (_makeOpsArray(op), payable(bundler)));
console2.log("test_transfer_erc20 ERC-4337 calldata size:", handleOpsCalldata.length);
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

also add eoa calldata size for comparison


vm.startSnapshotGas("e2e_transfer_erc20_4337");
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
vm.startSnapshotGas("e2e_transfer_erc20_4337");
vm.startSnapshotGas("e2e_transfer_erc20_baseAccount");

_sendUserOperation(op);
uint256 gas4337 = vm.stopSnapshotGas();
console2.log("test_transfer_erc20 ERC-4337 gas:", gas4337);

bytes memory eoaCalldata = abi.encodeCall(usdc.transfer, (address(0x5678), 100e6));
console2.log("test_transfer_erc20 EOA calldata size:", eoaCalldata.length);

vm.prank(eoaUser);
vm.startSnapshotGas("e2e_transfer_erc20_eoa");
usdc.transfer(address(0x5678), 100e6);
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

use fuzzing

Suggested change
usdc.transfer(address(0x5678), 100e6);
usdc.transfer(recipient, amount);

uint256 gasEOA = vm.stopSnapshotGas();
console2.log("test_transfer_erc20 EOA gas:", gasEOA);
console2.log("Gas overhead (4337/EOA):", (gas4337 * 100) / gasEOA, "%");
}

function _makeOpsArray(UserOperation memory op) internal pure returns (UserOperation[] memory) {
UserOperation[] memory ops = new UserOperation[](1);
ops[0] = op;
return ops;
}

function _sign(UserOperation memory userOp) internal view override returns (bytes memory signature) {
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not seeing where this is being used. Does the parent test contract require use to override this?

bytes32 toSign = entryPoint.getUserOpHash(userOp);
(uint8 v, bytes32 r, bytes32 s) = vm.sign(signerPrivateKey, toSign);
signature = abi.encode(CoinbaseSmartWallet.SignatureWrapper(0, abi.encodePacked(r, s, v)));
}
}