🔨 deploy: use canonical account implementtion

exactly · May 21, 2024 · e10980b · e10980b
1 parent c96289c
commit e10980b
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/.gas-snapshot b/.gas-snapshot
@@ -1,15 +1,15 @@
 MultiOwnerPluginIntegration:test_ownerPlugin_successInstallation() (gas: 39139)
 MultiOwnerPluginIntegration:test_runtimeValidation_alwaysAllow_isValidSignature() (gas: 105094)
 MultiOwnerPluginIntegration:test_runtimeValidation_ownerOrSelf_standardExecute() (gas: 145033)
-MultiOwnerPluginIntegration:test_userOpValidation_owner_standardExecute() (gas: 348256)
+MultiOwnerPluginIntegration:test_userOpValidation_owner_standardExecute() (gas: 348268)
 MultiOwnerPluginTest:testFuzz_isValidSignature_ContractOwner(bytes32) (runs: 256, μ: 110387, ~: 110387)
 MultiOwnerPluginTest:testFuzz_isValidSignature_ContractOwnerWithEOAOwner(bytes32) (runs: 256, μ: 120687, ~: 120687)
 MultiOwnerPluginTest:testFuzz_isValidSignature_EOAOwner(string,bytes32) (runs: 256, μ: 131232, ~: 131224)
-MultiOwnerPluginTest:testFuzz_isValidSignature_PasskeyOwner(bytes32) (runs: 256, μ: 365450, ~: 365556)
+MultiOwnerPluginTest:testFuzz_isValidSignature_PasskeyOwner(bytes32) (runs: 256, μ: 365820, ~: 365978)
 MultiOwnerPluginTest:testFuzz_userOpValidationFunction_ContractOwner((address,uint256,bytes,bytes,uint256,uint256,uint256,uint256,uint256,bytes,bytes)) (runs: 256, μ: 131442, ~: 131444)
 MultiOwnerPluginTest:testFuzz_userOpValidationFunction_ContractOwnerWithEOAOwner((address,uint256,bytes,bytes,uint256,uint256,uint256,uint256,uint256,bytes,bytes)) (runs: 256, μ: 145076, ~: 145077)
 MultiOwnerPluginTest:testFuzz_userOpValidationFunction_EOAOwner(string,(address,uint256,bytes,bytes,uint256,uint256,uint256,uint256,uint256,bytes,bytes)) (runs: 256, μ: 139178, ~: 139155)
-MultiOwnerPluginTest:testFuzz_userOpValidationFunction_PasskeyOwner((address,uint256,bytes,bytes,uint256,uint256,uint256,uint256,uint256,bytes,bytes)) (runs: 256, μ: 373715, ~: 373873)
+MultiOwnerPluginTest:testFuzz_userOpValidationFunction_PasskeyOwner((address,uint256,bytes,bytes,uint256,uint256,uint256,uint256,uint256,bytes,bytes)) (runs: 256, μ: 373608, ~: 373658)
 MultiOwnerPluginTest:test_eip712Domain() (gas: 35382)
 MultiOwnerPluginTest:test_multiOwnerPlugin_sentinelIsNotOwner() (gas: 19772)
 MultiOwnerPluginTest:test_onInstall_success() (gas: 101503)

diff --git a/script/Deploy.s.sol b/script/Deploy.s.sol
@@ -3,13 +3,13 @@ pragma solidity ^0.8.0;
 
 import { Script } from "forge-std/Script.sol";
 
-import { UpgradeableModularAccount } from "modular-account/src/account/UpgradeableModularAccount.sol";
 import { IEntryPoint } from "modular-account/src/interfaces/erc4337/IEntryPoint.sol";
 
 import { WebauthnModularAccountFactory } from "../src/WebauthnModularAccountFactory.sol";
 import { WebauthnOwnerPlugin } from "../src/WebauthnOwnerPlugin.sol";
 
 contract DeployScript is Script {
+  address public constant ACCOUNT_IMPL = 0x0046000000000151008789797b54fdb500E2a61e; // v1.0.0
   IEntryPoint public constant ENTRYPOINT = IEntryPoint(0x5FF137D4b0FDCD49DcA30c7CF57E578a026d2789); // v0.6.0
 
   WebauthnOwnerPlugin public plugin;
@@ -22,11 +22,7 @@ contract DeployScript is Script {
 
     plugin = new WebauthnOwnerPlugin();
     factory = new WebauthnModularAccountFactory(
-      address(msg.sender),
-      address(plugin),
-      address(new UpgradeableModularAccount(ENTRYPOINT)),
-      keccak256(abi.encode(plugin.pluginManifest())),
-      ENTRYPOINT
+      msg.sender, address(plugin), ACCOUNT_IMPL, keccak256(abi.encode(plugin.pluginManifest())), ENTRYPOINT
     );
     factory.addStake{ value: 0.1 ether }(1 days, 0.1 ether);
 

diff --git a/test/WebauthnModularAccountFactory.t.sol b/test/WebauthnModularAccountFactory.t.sol
@@ -50,6 +50,7 @@ contract WebauthnModularAccountFactoryTest is Test {
     DeployScript deploy = new DeployScript();
     entryPoint = EntryPoint(payable(address(deploy.ENTRYPOINT())));
     vm.etch(address(entryPoint), address(new EntryPoint()).code);
+    vm.etch(deploy.ACCOUNT_IMPL(), address(new UpgradeableModularAccount(deploy.ENTRYPOINT())).code);
     deploy.run();
     plugin = deploy.plugin();
     factory = deploy.factory();

diff --git a/test/WebauthnOwnerPlugin.t.sol b/test/WebauthnOwnerPlugin.t.sol
@@ -5,6 +5,7 @@ import { Test } from "forge-std/Test.sol";
 
 import { EntryPoint } from "account-abstraction/core/EntryPoint.sol";
 
+import { UpgradeableModularAccount } from "modular-account/src/account/UpgradeableModularAccount.sol";
 import { IEntryPoint } from "modular-account/src/interfaces/erc4337/IEntryPoint.sol";
 import { BasePlugin } from "modular-account/src/plugins/BasePlugin.sol";
 import { IMultiOwnerPlugin } from "modular-account/src/plugins/owner/IMultiOwnerPlugin.sol";
@@ -53,6 +54,7 @@ contract MultiOwnerPluginTest is Test {
     DeployScript deploy = new DeployScript();
     entryPoint = deploy.ENTRYPOINT();
     vm.etch(address(entryPoint), address(new EntryPoint()).code);
+    vm.etch(deploy.ACCOUNT_IMPL(), address(new UpgradeableModularAccount(entryPoint)).code);
     deploy.run();
     plugin = deploy.plugin();
 

diff --git a/test/WebauthnPluginIntegration.t.sol b/test/WebauthnPluginIntegration.t.sol
@@ -55,6 +55,7 @@ contract MultiOwnerPluginIntegration is Test {
     DeployScript deploy = new DeployScript();
     entryPoint = deploy.ENTRYPOINT();
     vm.etch(address(entryPoint), address(new EntryPoint()).code);
+    vm.etch(deploy.ACCOUNT_IMPL(), address(new UpgradeableModularAccount(entryPoint)).code);
     deploy.run();
     plugin = deploy.plugin();
     factory = deploy.factory();