Skip to content

Commit

Permalink
🥢
Browse files Browse the repository at this point in the history
  • Loading branch information
z0r0z committed Jun 24, 2024
1 parent f081234 commit f82fef8
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 23 deletions.
36 changes: 19 additions & 17 deletions .gas-snapshot
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
AccountTest:testCdFallback() (gas: 474764)
AccountTest:testCdFallback2() (gas: 1250652)
AccountTest:testDelegateExecute() (gas: 405036)
AccountTest:testDelegateExecute(uint256) (runs: 256, μ: 395014, ~: 384516)
AccountTest:testDelegateExecute(uint256) (runs: 256, μ: 394160, ~: 384516)
AccountTest:testDelegateExecuteRevertsIfOwnerSlotValueChanged() (gas: 360183)
AccountTest:testDepositFunctions() (gas: 533677)
AccountTest:testDirectStorage() (gas: 70166)
AccountTest:testDisableInitializerForImplementation() (gas: 1520828)
AccountTest:testDisableInitializerForImplementation() (gas: 1521228)
AccountTest:testETHReceived() (gas: 16591)
AccountTest:testExecute() (gas: 422663)
AccountTest:testExecuteBatch() (gas: 773653)
AccountTest:testInitializer() (gas: 1802685)
AccountTest:testInitializer() (gas: 1803085)
AccountTest:testIsValidSignature() (gas: 118863)
AccountTest:testIsValidSignatureViaPlugin() (gas: 98455)
AccountTest:testIsValidSignatureViaRPC() (gas: 8937393460516731459)
Expand All @@ -20,9 +20,9 @@ AccountTest:testOnERC721Received() (gas: 1693476)
AccountTest:testOwnerRecovery() (gas: 516827)
AccountTest:testSignaturePluginStorage() (gas: 86831)
AccountTest:testValidateUserOp() (gas: 525722)
AccountTest:test__codesize() (gas: 67288)
AccountsTest:testDeploy() (gas: 1777974)
AccountsTest:test__codesize() (gas: 10216)
AccountTest:test__codesize() (gas: 67290)
AccountsTest:testDeploy() (gas: 1778374)
AccountsTest:test__codesize() (gas: 10218)
JointValidatorTest:testDeploy() (gas: 466944)
JointValidatorTest:testInstall() (gas: 146205)
JointValidatorTest:testJointUserOp() (gas: 186)
Expand All @@ -43,24 +43,26 @@ PaymentValidatorTest:testFailPaymentPlanInvalidAllowance() (gas: 185331)
PaymentValidatorTest:testInstall() (gas: 171005)
PermitValidatorTest:testAddressPermission(address) (runs: 256, μ: 23814, ~: 23814)
PermitValidatorTest:testBoolPermission(bool) (runs: 256, μ: 22209, ~: 22209)
PermitValidatorTest:testEnumPermission(uint256) (runs: 256, μ: 27312, ~: 27360)
PermitValidatorTest:testEnumPermission(uint256) (runs: 256, μ: 27311, ~: 27360)
PermitValidatorTest:testInstall() (gas: 207712)
PermitValidatorTest:testTransferPermission(address,uint256,uint256,uint256) (runs: 256, μ: 8930, ~: 3728)
PermitValidatorTest:testUintPermission(uint256,uint256,uint256) (runs: 256, μ: 7122, ~: 3262)
PermitValidatorTest:testTransferPermission(address,uint256,uint256,uint256) (runs: 256, μ: 9302, ~: 3728)
PermitValidatorTest:testUintPermission(uint256,uint256,uint256) (runs: 256, μ: 6668, ~: 3262)
PermitValidatorTest:testValuePermission(uint256,uint256) (runs: 256, μ: 20022, ~: 20023)
PermitValidatorTest:test__codesize() (gas: 48481)
PermitValidatorTest:test__codesize() (gas: 48483)
PointsTest:testCheck(uint256) (runs: 256, μ: 31230, ~: 31230)
PointsTest:testDeploy() (gas: 103095)
RecoveryValidatorTest:testDeploy() (gas: 1433799)
RecoveryValidatorTest:testInstall() (gas: 172862)
RecoveryValidatorTest:testSetGuardians() (gas: 173312)
RecoveryValidatorTest:testSocialRecovery() (gas: 181200)
RecoveryValidatorTest:testUninstall() (gas: 144120)
RecoveryValidatorTest:testDeploy() (gas: 1433821)
RecoveryValidatorTest:testFailSocialRecoveryWithEOAKey() (gas: 179046)
RecoveryValidatorTest:testFailSocialRecoveryWithZeroKey() (gas: 179021)
RecoveryValidatorTest:testInstall() (gas: 172917)
RecoveryValidatorTest:testSetGuardians() (gas: 173389)
RecoveryValidatorTest:testSocialRecovery() (gas: 181216)
RecoveryValidatorTest:testUninstall() (gas: 144165)
TokenTest:testDeploy() (gas: 344605)
TokenTest:testFailTransferBeyondBalance(address) (runs: 256, μ: 39779, ~: 39779)
TokenTest:testFailUnsafeTransfer(address) (runs: 256, μ: 11389, ~: 11389)
TokenTest:testInitBalance() (gas: 10629)
TokenTest:testNameAndSymbolAndDecimals() (gas: 12365)
TokenTest:testTotalSupply() (gas: 8388)
TokenTest:testTransfer(address,uint96) (runs: 256, μ: 43689, ~: 44310)
TokenTest:testTransferFromOwner(address,uint96) (runs: 256, μ: 43793, ~: 44414)
TokenTest:testTransfer(address,uint96) (runs: 256, μ: 43600, ~: 44310)
TokenTest:testTransferFromOwner(address,uint96) (runs: 256, μ: 43704, ~: 44414)
4 changes: 1 addition & 3 deletions src/Account.sol
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ contract Account is ERC4337 {
override(EIP712)
returns (string memory, string memory)
{
return ("NANI", "1.2.0");
return ("NANI", "1.2.3");
}

/// @dev Validates userOp
Expand Down Expand Up @@ -129,10 +129,8 @@ contract Account is ERC4337 {
returndatacopy(0x00, 0x00, returndatasize())
revert(0x00, returndatasize())
}

mstore(0x40, m) // Restore the free memory pointer.
mstore(0x60, 0) // Restore zero pointer.

validationData := mload(0x00)
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/Accounts.sol
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ pragma solidity ^0.8.19;

import {ERC4337Factory} from "@solady/src/accounts/ERC4337Factory.sol";

/// @notice Simple extendable smart account factory. ERC1271/ERC4337. Version 1.1.1.
/// @notice Simple extendable smart account factory. ERC1271/ERC4337. Version 1.2.3.
/// @author nani.eth (https://github.com/NaniDAO/accounts/blob/main/src/Accounts.sol)
contract Accounts is ERC4337Factory {
constructor(address Account) payable ERC4337Factory(Account) {}
Expand Down
4 changes: 2 additions & 2 deletions test/Account.t.sol
Original file line number Diff line number Diff line change
Expand Up @@ -594,7 +594,7 @@ contract AccountTest is SoladyTest {
"EIP712Domain(string name,string version,uint256 chainId,address verifyingContract)"
),
keccak256("NANI"),
keccak256("1.2.0"),
keccak256("1.2.3"),
block.chainid,
address(account)
)
Expand All @@ -617,7 +617,7 @@ contract AccountTest is SoladyTest {
) internal view returns (bytes32 digest) {
address _account = address(account);
bytes32 nameHash = keccak256(bytes("NANI"));
bytes32 versionHash = keccak256(bytes("1.2.0"));
bytes32 versionHash = keccak256(bytes("1.2.3"));
assembly ("memory-safe") {
let m := mload(0x40) // Load the free memory pointer.
mstore(m, _DOMAIN_TYPEHASH)
Expand Down

0 comments on commit f82fef8

Please sign in to comment.