chore: merge v0.8-develop into develop

.env.example

@@ -0,0 +1,20 @@
+
+# Factory owner capable only of managing stake
+OWNER=
+# EP 0.7 address
+ENTRYPOINT=
+
+# Create2 expected addresses of the contracts.
+# When running for the first time, the error message will contain the expected addresses.
+ACCOUNT_IMPL=
+FACTORY=
+SINGLE_SIGNER_VALIDATION=
+
+# Optional, defaults to bytes32(0)
+ACCOUNT_IMPL_SALT=
+FACTORY_SALT=
+SINGLE_SIGNER_VALIDATION_SALT=
+
+# Optional, defaults to 0.1 ether and 1 day, respectively
+STAKE_AMOUNT=
+UNSTAKE_DELAY=

.gitignore

@@ -7,3 +7,6 @@ node_modules/
 # Coverage
 report/
 lcov.info
+
+# env vars
+.env

.gitmodules

@@ -7,3 +7,6 @@
 [submodule "lib/forge-std"]
 	path = lib/forge-std
 	url = https://github.com/foundry-rs/forge-std
+[submodule "lib/modular-account-libs"]
+	path = lib/modular-account-libs
+	url = https://github.com/erc6900/modular-account-libs

.solhint-test.json

@@ -1,17 +1,20 @@
 {
-    "extends": "solhint:recommended",
-    "rules": {
-      "func-name-mixedcase": "off",
-      "immutable-vars-naming": ["error"],
-      "no-unused-import": ["error"],
-      "compiler-version": ["error", ">=0.8.19"],
-      "func-visibility": ["error", { "ignoreConstructors": true }],
-      "max-line-length": ["error", 120],
-      "max-states-count": ["warn", 30],
-      "modifier-name-mixedcase": ["error"],
-      "private-vars-leading-underscore": ["error"],
-      "no-inline-assembly": "off",
-      "avoid-low-level-calls": "off"
-    }
+  "extends": "solhint:recommended",
+  "rules": {
+    "func-name-mixedcase": "off",
+    "immutable-vars-naming": ["error"],
+    "no-unused-import": ["error"],
+    "compiler-version": ["error", ">=0.8.19"],
+    "custom-errors": "off",
+    "func-visibility": ["error", { "ignoreConstructors": true }],
+    "max-line-length": ["error", 120],
+    "max-states-count": ["warn", 30],
+    "modifier-name-mixedcase": ["error"],
+    "private-vars-leading-underscore": ["error"],
+    "no-inline-assembly": "off",
+    "avoid-low-level-calls": "off",
+    "one-contract-per-file": "off",
+    "no-empty-blocks": "off",
+    "reason-string": ["warn", { "maxLength": 64 }]
   }
-  
+}

.vscode/settings.json

@@ -1,7 +1,7 @@
 {
   "solidity.packageDefaultDependenciesContractsDirectory": "src",
   "solidity.packageDefaultDependenciesDirectory": "lib",
-  "solidity.compileUsingRemoteVersion": "v0.8.19",
+  "solidity.compileUsingRemoteVersion": "v0.8.25",
   "editor.formatOnSave": true,
   "[solidity]": {
     "editor.defaultFormatter": "JuanBlanco.solidity"

README.md

@@ -2,7 +2,7 @@
 
 Reference implementation for [ERC-6900](https://eips.ethereum.org/EIPS/eip-6900). It is an early draft implementation.
 
-The implementation includes an upgradable modular account with two plugins (`SingleOwnerPlugin` and `TokenReceiverPlugin`). It is compliant with ERC-6900 with the latest updates.
+The implementation includes an upgradable modular account with three modules (`SingleSignerValidation`, `TokenReceiverModule`, and `AllowlistModule`). It is compliant with ERC-6900 with the latest updates.
 
 ## Important Callouts
 
@@ -11,7 +11,7 @@ The implementation includes an upgradable modular account with two plugins (`Sin
 
 ## Development
 
-Anyone is welcome to submit feedback and/or PRs to improve code or add Plugins.
+Anyone is welcome to submit feedback and/or PRs to improve code.
 
 ### Testing
 
@@ -28,3 +28,14 @@ Since IR compilation generates different bytecode, it's useful to test against t
 FOUNDRY_PROFILE=optimized-build forge build
 FOUNDRY_PROFILE=optimized-test forge test -vvv
 ```
+
+## Integration testing
+
+The reference implementation provides a sample factory and deploy script for the factory, account implementation, and the demo validation module `SingleSignerValidation`. This is not auditted, nor intended for production use. Limitations set by the GPL-V3 license apply.
+
+To run this script, provide appropriate values in a `.env` file based on the `.env.example` template, then run:
+```bash
+forge script script/Deploy.s.sol <wallet options> -r <rpc_url> --broadcast
+```
+
+Where `<wallet_options>` specifies a way to sign the deployment transaction (see [here](https://book.getfoundry.sh/reference/forge/forge-script#wallet-options---raw)) and `<rpc_url>` specifies an RPC for the network you are deploying on.

foundry.toml

@@ -1,13 +1,15 @@
 [profile.default]
-solc = '0.8.19'
+solc = '0.8.26'
 via_ir = false
 src = 'src'
 test = 'test'
 libs = ['lib']
 out = 'out'
 optimizer = true
 optimizer_runs = 200
-ignored_error_codes = []
+auto_detect_solc = false
+bytecode_hash = "none"
+auto_detect_remappings = false
 fs_permissions = [
   { access = "read", path = "./out-optimized" }
 ]
@@ -23,6 +25,7 @@ depth = 10
 [profile.optimized-build]
 via_ir = true
 test = 'src'
+optimizer_runs = 20000
 out = 'out-optimized'
 
 [profile.optimized-test]
@@ -39,7 +42,7 @@ runs = 5000
 depth = 32
 
 [profile.deep.fuzz]
-runs = 10000
+runs = 100000
 
 [profile.deep.invariant]
 runs = 5000
@@ -48,6 +51,9 @@ depth = 32
 [fmt]
 line_length = 115
 wrap_comments = true
+sort_imports = true
+number_underscore = "thousands"
+int_types = "long"
 
 [rpc_endpoints]
 mainnet = "${RPC_URL_MAINNET}"

package.json

@@ -5,7 +5,7 @@
   },
   "scripts": {
     "lint": "pnpm lint:src && pnpm lint:test",
-    "lint:src": "solhint -c .solhint-src.json ./src/**/*.sol",
-    "lint:test": "solhint -c .solhint-test.json ./test/**/*.sol"
+    "lint:src": "solhint --max-warnings 0 -c .solhint-src.json './src/**/*.sol'",
+    "lint:test": "solhint --max-warnings 0 -c .solhint-test.json './test/**/*.sol'"
   }
 }

remappings.txt

@@ -2,3 +2,4 @@ ds-test/=lib/forge-std/lib/ds-test/src/
 forge-std/=lib/forge-std/src/
 @eth-infinitism/account-abstraction/=lib/account-abstraction/contracts/
 @openzeppelin/=lib/openzeppelin-contracts/
+@modular-account-libs/=lib/modular-account-libs/src/

script/Deploy.s.sol

@@ -0,0 +1,156 @@
+// SPDX-License-Identifier: UNLICENSED
+pragma solidity ^0.8.25;
+
+import {IEntryPoint} from "@eth-infinitism/account-abstraction/interfaces/IEntryPoint.sol";
+import {Script} from "forge-std/Script.sol";
+import {console2} from "forge-std/Test.sol";
+
+import {Create2} from "@openzeppelin/contracts/utils/Create2.sol";
+
+import {AccountFactory} from "../src/account/AccountFactory.sol";
+import {UpgradeableModularAccount} from "../src/account/UpgradeableModularAccount.sol";
+import {SingleSignerValidation} from "../src/modules/validation/SingleSignerValidation.sol";
+
+contract DeployScript is Script {
+    IEntryPoint public entryPoint = IEntryPoint(payable(vm.envAddress("ENTRYPOINT")));
+
+    address public owner = vm.envAddress("OWNER");
+
+    address public accountImpl = vm.envOr("ACCOUNT_IMPL", address(0));
+    address public factory = vm.envOr("FACTORY", address(0));
+    address public singleSignerValidation = vm.envOr("SINGLE_SIGNER_VALIDATION", address(0));
+
+    bytes32 public accountImplSalt = bytes32(vm.envOr("ACCOUNT_IMPL_SALT", uint256(0)));
+    bytes32 public factorySalt = bytes32(vm.envOr("FACTORY_SALT", uint256(0)));
+    bytes32 public singleSignerValidationSalt = bytes32(vm.envOr("SINGLE_SIGNER_VALIDATION_SALT", uint256(0)));
+
+    uint256 public requiredStakeAmount = vm.envOr("STAKE_AMOUNT", uint256(0.1 ether));
+    uint256 public requiredUnstakeDelay = vm.envOr("UNSTAKE_DELAY", uint256(1 days));
+
+    function run() public {
+        console2.log("******** Deploying ERC-6900 Reference Implementation ********");
+        console2.log("Chain: ", block.chainid);
+        console2.log("EP: ", address(entryPoint));
+        console2.log("Factory owner: ", owner);
+
+        _deployAccountImpl(accountImplSalt, accountImpl);
+        _deploySingleSignerValidation(singleSignerValidationSalt, singleSignerValidation);
+        _deployAccountFactory(factorySalt, factory);
+        _addStakeForFactory(uint32(requiredUnstakeDelay), requiredStakeAmount);
+    }
+
+    function _deployAccountImpl(bytes32 salt, address expected) internal {
+        console2.log(string.concat("Deploying AccountImpl with salt: ", vm.toString(salt)));
+
+        address addr = Create2.computeAddress(
+            salt, keccak256(abi.encodePacked(type(UpgradeableModularAccount).creationCode, abi.encode(entryPoint)))
+        );
+        if (addr != expected) {
+            console2.log("Expected address mismatch");
+            console2.log("Expected: ", expected);
+            console2.log("Actual: ", addr);
+            revert();
+        }
+
+        if (addr.code.length == 0) {
+            console2.log("No code found at expected address, deploying...");
+            UpgradeableModularAccount deployed = new UpgradeableModularAccount{salt: salt}(entryPoint);
+
+            if (address(deployed) != expected) {
+                console2.log("Deployed address mismatch");
+                console2.log("Expected: ", expected);
+                console2.log("Deployed: ", address(deployed));
+                revert();
+            }
+
+            console2.log("Deployed AccountImpl at: ", address(deployed));
+        } else {
+            console2.log("Code found at expected address, skipping deployment");
+        }
+    }
+
+    function _deploySingleSignerValidation(bytes32 salt, address expected) internal {
+        console2.log(string.concat("Deploying SingleSignerValidation with salt: ", vm.toString(salt)));
+
+        address addr =
+            Create2.computeAddress(salt, keccak256(abi.encodePacked(type(SingleSignerValidation).creationCode)));
+        if (addr != expected) {
+            console2.log("Expected address mismatch");
+            console2.log("Expected: ", expected);
+            console2.log("Actual: ", addr);
+            revert();
+        }
+
+        if (addr.code.length == 0) {
+            console2.log("No code found at expected address, deploying...");
+            SingleSignerValidation deployed = new SingleSignerValidation{salt: salt}();
+
+            if (address(deployed) != expected) {
+                console2.log("Deployed address mismatch");
+                console2.log("Expected: ", expected);
+                console2.log("Deployed: ", address(deployed));
+                revert();
+            }
+
+            console2.log("Deployed SingleSignerValidation at: ", address(deployed));
+        } else {
+            console2.log("Code found at expected address, skipping deployment");
+        }
+    }
+
+    function _deployAccountFactory(bytes32 salt, address expected) internal {
+        console2.log(string.concat("Deploying AccountFactory with salt: ", vm.toString(salt)));
+
+        address addr = Create2.computeAddress(
+            salt,
+            keccak256(
+                abi.encodePacked(
+                    type(AccountFactory).creationCode,
+                    abi.encode(entryPoint, accountImpl, singleSignerValidation, owner)
+                )
+            )
+        );
+        if (addr != expected) {
+            console2.log("Expected address mismatch");
+            console2.log("Expected: ", expected);
+            console2.log("Actual: ", addr);
+            revert();
+        }
+
+        if (addr.code.length == 0) {
+            console2.log("No code found at expected address, deploying...");
+            AccountFactory deployed = new AccountFactory{salt: salt}(
+                entryPoint, UpgradeableModularAccount(payable(accountImpl)), singleSignerValidation, owner
+            );
+
+            if (address(deployed) != expected) {
+                console2.log("Deployed address mismatch");
+                console2.log("Expected: ", expected);
+                console2.log("Deployed: ", address(deployed));
+                revert();
+            }
+
+            console2.log("Deployed AccountFactory at: ", address(deployed));
+        } else {
+            console2.log("Code found at expected address, skipping deployment");
+        }
+    }
+
+    function _addStakeForFactory(uint32 unstakeDelay, uint256 stakeAmount) internal {
+        console2.log("Adding stake to factory");
+
+        uint256 currentStake = entryPoint.getDepositInfo(address(factory)).stake;
+        console2.log("Current stake: ", currentStake);
+        uint256 stakeToAdd = stakeAmount - currentStake;
+
+        if (stakeToAdd > 0) {
+            console2.log("Adding stake: ", stakeToAdd);
+            entryPoint.addStake{value: stakeToAdd}(unstakeDelay);
+            console2.log("Staked factory: ", address(factory));
+            console2.log("Total stake amount: ", entryPoint.getDepositInfo(address(factory)).stake);
+            console2.log("Unstake delay: ", entryPoint.getDepositInfo(address(factory)).unstakeDelaySec);
+        } else {
+            console2.log("No stake to add");
+        }
+    }
+}

src/account/AccountExecutor.sol

@@ -1,25 +1,12 @@
 // SPDX-License-Identifier: GPL-3.0
-pragma solidity ^0.8.19;
-
-import {ERC165Checker} from "@openzeppelin/contracts/utils/introspection/ERC165Checker.sol";
-import {IPlugin} from "../interfaces/IPlugin.sol";
+pragma solidity ^0.8.25;
 
 abstract contract AccountExecutor {
-    error PluginExecutionDenied(address plugin);
-
-    /// @dev If the target is a plugin (as determined by its support for the IPlugin interface), revert.
-    /// This prevents the modular account from calling plugins (both installed and uninstalled) outside
-    /// of the normal flow (via execution functions installed on the account), which could lead to data
-    /// inconsistencies and unexpected behavior.
     /// @param target The address of the contract to call.
     /// @param value The value to send with the call.
     /// @param data The call data.
     /// @return result The return data of the call, or the error message from the call if call reverts.
     function _exec(address target, uint256 value, bytes memory data) internal returns (bytes memory result) {
-        if (ERC165Checker.supportsInterface(target, type(IPlugin).interfaceId)) {
-            revert PluginExecutionDenied(target);
-        }
-
         bool success;
         (success, result) = target.call{value: value}(data);