Skip to content

feat(mola): fix mola deployer #65

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

Merged
0xfourzerofour merged 2 commits into from
Oct 3, 2025
Merged

feat(mola): fix mola deployer #65

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
88ccb06
feat(mola): fix mola deployer
0xfourzerofour Oct 3, 2025
106aef4
feat(mola): fix mola deployer
0xfourzerofour Oct 3, 2025
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
28 changes: 18 additions & 10 deletions script/Deploy_MultiOwnerLightAccountFactory.s.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ pragma solidity ^0.8.19;
import "forge-std/Script.sol";

import {IEntryPoint} from "account-abstraction/interfaces/IEntryPoint.sol";

import {Create2} from "@openzeppelin/contracts/utils/Create2.sol";
import {MultiOwnerLightAccountFactory} from "../src/MultiOwnerLightAccountFactory.sol";

contract Deploy_MultiOwnerLightAccountFactory is Script {
Expand All @@ -21,7 +21,6 @@ contract Deploy_MultiOwnerLightAccountFactory is Script {
function run() public {
vm.startBroadcast();

// Init code hash check
bytes32 initCodeHash =
keccak256(abi.encodePacked(type(MultiOwnerLightAccountFactory).creationCode, abi.encode(owner, entryPoint)));

Expand All @@ -39,14 +38,7 @@ contract Deploy_MultiOwnerLightAccountFactory is Script {
console.log("******** Deploying.... *********");
console.log("********************************");

MultiOwnerLightAccountFactory factory = new MultiOwnerLightAccountFactory{
salt: 0x0000000000000000000000000000000000000000bb3ab048b3f4ef2620ea0163
}(owner, entryPoint);

// Deployed address check
if (address(factory) != 0x000000000019d2Ee9F2729A65AfE20bb0020AefC) {
revert DeployedAddressMismatch(address(factory));
}
MultiOwnerLightAccountFactory factory = deployImpl(0x0000000000000000000000000000000000000000bb3ab048b3f4ef2620ea0163, 0x000000000019d2Ee9F2729A65AfE20bb0020AefC, owner, entryPoint);

_addStakeForFactory(address(factory));

Expand All @@ -57,6 +49,22 @@ contract Deploy_MultiOwnerLightAccountFactory is Script {
vm.stopBroadcast();
}

function deployImpl(bytes32 saltBytes, address expected, address ownerAddr, IEntryPoint ep) private returns (MultiOwnerLightAccountFactory) {
address addr = Create2.computeAddress(
saltBytes, keccak256(abi.encodePacked(type(MultiOwnerLightAccountFactory).creationCode, abi.encode(ownerAddr, ep))), CREATE2_FACTORY
);
console.logAddress(addr);
require(addr == expected, "Expected address is not the same as computed for impl");
if (addr.code.length > 0) {
console.log("MultiOwnerLightAccount impl already deployed. Skipping");
return MultiOwnerLightAccountFactory(payable(addr));
}

MultiOwnerLightAccountFactory impl = new MultiOwnerLightAccountFactory{salt: saltBytes}(ownerAddr, ep);
require(address(impl) == addr, "Impl address did not match predicted");
return impl;
}

function _addStakeForFactory(address factoryAddr) internal {
uint32 unstakeDelaySec = uint32(vm.envOr("UNSTAKE_DELAY_SEC", uint32(86400)));
uint256 requiredStakeAmount = vm.envUint("REQUIRED_STAKE_AMOUNT");
Expand Down
Loading