Skip to content

fix: add deploy guards to light account deploy script (#70) #71

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
dancoombs merged 1 commit into from
Jan 7, 2026
Merged

fix: add deploy guards to light account deploy script (#70) #71

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
38 changes: 24 additions & 14 deletions script/Deploy_LightAccountFactory.s.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,17 +32,22 @@ contract Deploy_LightAccountFactory is Script {
console.log("******** Deploying.... *********");
console.log("********************************");

LightAccountFactory factory = new LightAccountFactory{salt: factorySalt}(owner, entryPoint);

// Deployed address check
if (address(factory) != expectedFactoryAddress) {
revert DeployedAddressMismatch(address(factory));
if (expectedFactoryAddress.code.length == 0) {
address factory = address(new LightAccountFactory{salt: factorySalt}(owner, entryPoint));
// Deployed address check
if (factory != expectedFactoryAddress) {
revert DeployedAddressMismatch(factory);
}
} else {
console.log("Factory already deployed at: ", expectedFactoryAddress);
}

_addStakeForFactory(address(factory));
_addStakeForFactory(expectedFactoryAddress);

console.log("LightAccountFactory:", address(factory));
console.log("LightAccount:", address(factory.ACCOUNT_IMPLEMENTATION()));
console.log("LightAccountFactory:", address(expectedFactoryAddress));
console.log(
"LightAccount:", address(LightAccountFactory(payable(expectedFactoryAddress)).ACCOUNT_IMPLEMENTATION())
);
console.log();

vm.stopBroadcast();
Expand All @@ -53,11 +58,16 @@ contract Deploy_LightAccountFactory is Script {
uint256 requiredStakeAmount = vm.envUint("REQUIRED_STAKE_AMOUNT");
uint256 currentStakedAmount = entryPoint.getDepositInfo(factoryAddr).stake;
uint256 stakeAmount = requiredStakeAmount - currentStakedAmount;
LightAccountFactory(payable(factoryAddr)).addStake{value: stakeAmount}(unstakeDelaySec, stakeAmount);
console.log("******** Add Stake Verify *********");
console.log("Staked factory: ", factoryAddr);
console.log("Stake amount: ", entryPoint.getDepositInfo(factoryAddr).stake);
console.log("Unstake delay: ", entryPoint.getDepositInfo(factoryAddr).unstakeDelaySec);
console.log("******** Stake Verify Done *********");

if (stakeAmount > 0) {
LightAccountFactory(payable(factoryAddr)).addStake{value: stakeAmount}(unstakeDelaySec, stakeAmount);
console.log("******** Add Stake Verify *********");
console.log("Staked factory: ", factoryAddr);
console.log("Stake amount: ", entryPoint.getDepositInfo(factoryAddr).stake);
console.log("Unstake delay: ", entryPoint.getDepositInfo(factoryAddr).unstakeDelaySec);
console.log("******** Stake Verify Done *********");
} else {
console.log("Factory already staked");
}
}
}