Skip to content

Dynamic account benchmark tests #550

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 8 commits into
base: main
Choose a base branch
from
Open

Dynamic account benchmark tests #550

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e7926bd
added benchmark tests for Dynamic Contract
Oct 12, 2023
fe82f16
Merge branch 'thirdweb-dev:main' into dynamic-account-benchmark-tests
alfheimrShiven Oct 12, 2023
f43d316
pull from main
Oct 20, 2023
60a904b
BT for Dynamic Account
Oct 20, 2023
451f41c
updated SignerPermissionRequest
Oct 20, 2023
db33c6f
Merge branch 'main' into dynamic-account-benchmark-tests
nkrishang Nov 20, 2023
1c92589
Merge branch 'thirdweb-dev:main' into dynamic-account-benchmark-tests
alfheimrShiven Nov 21, 2023
2df6469
updated DynamicAccountFactory instance creation
Nov 21, 2023
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
Prev Previous commit
updated DynamicAccountFactory instance creation
  • Loading branch information
Shivendra Singh committed Nov 21, 2023
commit 2df6469b4475686fd605f0133c5f60db82ebf58c
38 changes: 14 additions & 24 deletions src/test/benchmark/DynamicAccountBenchmark.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,7 @@ contract Number {
}

contract NFTRejector {
function onERC721Received(
address,
address,
uint256,
bytes memory
) public virtual returns (bytes4) {
function onERC721Received(address, address, uint256, bytes memory) public virtual returns (bytes4) {
revert("NFTs not accepted");
}
}
Expand Down Expand Up @@ -72,12 +67,10 @@ contract DynamicAccountBenchmarkTest is BaseTest {

event AccountCreated(address indexed account, address indexed accountAdmin);

function _signSignerPermissionRequest(IAccountPermissions.SignerPermissionRequest memory _req)
internal
view
returns (bytes memory signature)
{
bytes32 typehashSignerPermissionRequest = keccak256(
function _signSignerPermissionRequest(
IAccountPermissions.SignerPermissionRequest memory _req
) internal view returns (bytes memory signature) {
bytes32 typehashSignerPermissionRequest = keccak256(
"SignerPermissionRequest(address signer,uint8 isAdmin,address[] approvedTargets,uint256 nativeTokenLimitPerTransaction,uint128 permissionStartTimestamp,uint128 permissionEndTimestamp,uint128 reqValidityStartTimestamp,uint128 reqValidityEndTimestamp,bytes32 uid)"
);
bytes32 nameHash = keccak256(bytes("Account"));
Expand All @@ -102,8 +95,8 @@ contract DynamicAccountBenchmarkTest is BaseTest {
_req.reqValidityEndTimestamp,
_req.uid
);
bytes32 structHash = keccak256(bytes.concat(encodedRequestStart, encodedRequestEnd));

bytes32 structHash = keccak256(bytes.concat(encodedRequestStart, encodedRequestEnd));
bytes32 typedDataHash = keccak256(abi.encodePacked("\x19\x01", domainSeparator, structHash));

(uint8 v, bytes32 r, bytes32 s) = vm.sign(accountAdminPKey, typedDataHash);
Expand Down Expand Up @@ -241,7 +234,7 @@ contract DynamicAccountBenchmarkTest is BaseTest {
extensions[0] = defaultExtension;

// deploy account factory
accountFactory = new DynamicAccountFactory(IEntryPoint(payable(address(entrypoint))), extensions);
accountFactory = new DynamicAccountFactory(deployer, extensions);
// deploy dummy contract
numberContract = new Number();
}
Expand Down Expand Up @@ -298,10 +291,7 @@ contract DynamicAccountBenchmarkTest is BaseTest {

vm.resumeGasMetering();
// deploy account factory
DynamicAccountFactory factory = new DynamicAccountFactory(
IEntryPoint(payable(address(entrypoint))),
extensions
);
DynamicAccountFactory factory = new DynamicAccountFactory(deployer, extensions);
}

/// @dev Create an account by directly calling the factory.
Expand Down Expand Up @@ -382,7 +372,7 @@ contract DynamicAccountBenchmarkTest is BaseTest {
callData[i] = abi.encodeWithSignature("incrementNum()", i);
}

vm.resumeGasMetering();
vm.resumeGasMetering();
vm.prank(accountAdmin);
SimpleAccount(payable(account)).executeBatch(targets, values, callData);
}
Expand Down Expand Up @@ -544,13 +534,13 @@ contract DynamicAccountBenchmarkTest is BaseTest {
uint256 value = 1000;

address account = accountFactory.getAddress(accountAdmin, bytes(""));

vm.prank(accountAdmin);
// solhint-disable-next-line avoid-low-level-calls
(bool success, bytes memory ret) = payable(account).call{ value: value }("");

address recipient = address(0x3456);

vm.resumeGasMetering();
UserOperation[] memory userOp = _setupUserOpExecute(accountAdminPKey, bytes(""), recipient, value, bytes(""));

Expand Down Expand Up @@ -608,7 +598,7 @@ contract DynamicAccountBenchmarkTest is BaseTest {

// The account can initially receive NFTs.
erc721.mint(account, 1);

// Make the account reject ERC-721 NFTs going forward.
IExtension.Extension memory extension;

Expand Down