Skip to content

Commit

Permalink
chore: cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
Zer0dot committed Dec 11, 2024
1 parent 1f33e89 commit 3f9a964
Showing 1 changed file with 6 additions and 12 deletions.
18 changes: 6 additions & 12 deletions script/DeployAccounts.s.sol
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@ import {IEntryPoint} from "@eth-infinitism/account-abstraction/interfaces/IEntry
contract DeployAccountsScript is ScriptBase, Artifacts {
// State vars for expected addresses and salts.

// uint256

IEntryPoint public entryPoint;

address public expectedExecutionInstallDelegate;
Expand Down Expand Up @@ -67,9 +65,7 @@ contract DeployAccountsScript is ScriptBase, Artifacts {
"Modular Account Impl",
expectedModularAccountImpl,
modularAccountImplSalt,
_getModularAccountInitcode(
IEntryPoint(entryPoint), ExecutionInstallDelegate(expectedExecutionInstallDelegate)
),
_getModularAccountInitcode(entryPoint, ExecutionInstallDelegate(expectedExecutionInstallDelegate)),
_wrappedDeployModularAccount
);

Expand All @@ -78,7 +74,7 @@ contract DeployAccountsScript is ScriptBase, Artifacts {
expectedSemiModularAccountBytecodeImpl,
semiModularAccountBytecodeImplSalt,
_getSemiModularAccountBytecodeInitcode(
IEntryPoint(entryPoint), ExecutionInstallDelegate(expectedExecutionInstallDelegate)
entryPoint, ExecutionInstallDelegate(expectedExecutionInstallDelegate)
),
_wrappedDeploySemiModularAccountBytecode
);
Expand All @@ -88,7 +84,7 @@ contract DeployAccountsScript is ScriptBase, Artifacts {
expectedSemiModularAccountStorageOnlyImpl,
semiModularAccountStorageOnlyImplSalt,
_getSemiModularAccountStorageOnlyInitcode(
IEntryPoint(entryPoint), ExecutionInstallDelegate(expectedExecutionInstallDelegate)
entryPoint, ExecutionInstallDelegate(expectedExecutionInstallDelegate)
),
_wrappedDeploySemiModularAccountStorageOnly
);
Expand All @@ -102,20 +98,18 @@ contract DeployAccountsScript is ScriptBase, Artifacts {
// without affecting the expected signature from _safeDeploy.

function _wrappedDeployModularAccount(bytes32 salt) internal returns (address) {
return _deployModularAccount(
salt, IEntryPoint(entryPoint), ExecutionInstallDelegate(expectedExecutionInstallDelegate)
);
return _deployModularAccount(salt, entryPoint, ExecutionInstallDelegate(expectedExecutionInstallDelegate));
}

function _wrappedDeploySemiModularAccountBytecode(bytes32 salt) internal returns (address) {
return _deploySemiModularAccountBytecode(
salt, IEntryPoint(entryPoint), ExecutionInstallDelegate(expectedExecutionInstallDelegate)
salt, entryPoint, ExecutionInstallDelegate(expectedExecutionInstallDelegate)
);
}

function _wrappedDeploySemiModularAccountStorageOnly(bytes32 salt) internal returns (address) {
return _deploySemiModularAccountStorageOnly(
salt, IEntryPoint(entryPoint), ExecutionInstallDelegate(expectedExecutionInstallDelegate)
salt, entryPoint, ExecutionInstallDelegate(expectedExecutionInstallDelegate)
);
}
}

0 comments on commit 3f9a964

Please sign in to comment.