feat: sync the latest development (#72)

## Summary
I've synced the code from the development repository to this repository.
I also manually validated the hash using the following command:

```sh
(
  jq -c '.dependencies' package.json | sha256sum
  find src test .gitmodules -type f -exec sha256sum {} \;
) | sha256sum
```

Result:  
`bf428b0b456fd87dbbdc0c8715a817f71364cd4c86aed90b019c99cab1db19ed` (both
repos)

This ensures the integrity of the sync.

Note: `foundry.toml` is not included because it differs between the two
repositories. However, I have manually verified that the
compilation-related sections are the same.

## Detail
### Changeset
* Sync `src/`
* Update `foundry.toml`
* Update pr template per request from techops

### Checklist
- [x] Did you add new tests and confirm all tests pass? (`yarn test`)
- [x] Did you ensure any new Solidity source code files meet minimum
test coverage requirements? (`yarn coverage`)
- [ ] Did you update relevant docs? (docs are found in the `docs`
folder)
- [x] Do your commits follow the [Conventional
Commits](https://www.conventionalcommits.org/en/v1.0.0/) standard?
- [x] Does your PR title also follow the [Conventional
Commits](https://www.conventionalcommits.org/en/v1.0.0/) standard?
- [ ] If you have a breaking change, is it [correctly reflected in your
commit
message](https://www.conventionalcommits.org/en/v1.0.0/#examples)? (e.g.
`feat!: breaking change`)
- [x] Did you run lint (`yarn lint`) and fix any issues?
- [x] Did you run formatter (`yarn format:check`) and fix any issues
(`yarn format:write`)?

## Testing
* Sync `test/`

## Documentation
n/a

Author: huaweigu

.github/pull_request_template.md

@@ -12,7 +12,6 @@ Mandatory section.
 - [ ] Did you update relevant docs? (docs are found in the `docs` folder)
 - [ ] Do your commits follow the [Conventional Commits](https://www.conventionalcommits.org/en/v1.0.0/) standard?
 - [ ] Does your PR title also follow the [Conventional Commits](https://www.conventionalcommits.org/en/v1.0.0/) standard?
-- [ ] If you have a breaking change, is it [correctly reflected in your commit message](https://www.conventionalcommits.org/en/v1.0.0/#examples)? (e.g. `feat!: breaking change`)
 - [ ] Did you run lint (`yarn lint`) and fix any issues?
 - [ ] Did you run formatter (`yarn format:check`) and fix any issues (`yarn format:write`)?
 

foundry.toml

@@ -8,6 +8,8 @@ libs = ['lib', 'node_modules']
 solc_version = "0.8.24"
 evm_version = 'paris'
 test = 'test'
+optimizer = true
+optimizer_runs = 200
 via_ir = true
 auto_detect_solc = false
 auto_detect_remappings = false

src/msca/6900/v0.8/README.md

@@ -1,8 +1,15 @@
 # Modular Smart Contract Account
-MSCA that's in compliant with [EIP-6900](https://eips.ethereum.org/EIPS/eip-6900).
+MSCA that's in compliant with [ERC-6900](https://eips.ethereum.org/EIPS/eip-6900).
 
 ## Disclaimer
 Please be aware that all contracts within this package are still in active development and are not deployed on any mainnets yet, so proceed with caution if you intend to test them on your own.
 
-## Signature Encoding
-TODO.
+## Features
+1. Deploy an account using the account factory.
+2. Receive **ERC-721, ERC-1155,** and **ERC-777** tokens.
+3. Supports **ERC-1271** for contract signatures.
+4. Enables **upgradeability** via the **ERC-1967 proxy**, allowing users to update their proxy’s implementation and choose different smart account versions. We follow the **ERC-7201 namespaced storage standard** to prevent storage collisions when switching implementations.
+5. **Extensible through modules**, allowing additional functionality to be integrated into the account.
+
+## Acknowledgements
+The contracts in this repository follow the **ERC-6900 specification** and are largely inspired by the design of its reference implementation.

src/msca/6900/v0.8/account/BaseMSCA.sol

@@ -86,7 +86,7 @@ contract UpgradableMSCA is BaseMSCA, DefaultCallbackHandler, UUPSUpgradeable {
         payable
         override
         onlyProxy
-        validateNativeFunction
+        wrapNativeExecutionFunction
     {
         super.upgradeToAndCall(newImplementation, data);
     }

src/msca/6900/v0.8/account/UpgradableMSCA.sol

@@ -18,7 +18,7 @@
  */
 pragma solidity 0.8.24;
 
-import {WalletStorageLib} from "../libs/WalletStorageLib.sol";
+import {WalletStorageV2Lib} from "../libs/WalletStorageV2Lib.sol";
 
 /// @notice Forked from OpenZeppelin (proxy/utils/Initializable.sol) with wallet storage access.
 ///         Reinitialization is removed.
@@ -43,8 +43,8 @@ abstract contract WalletStorageInitializable {
      * Emits an {WalletStorageInitialized} event.
      */
     modifier walletStorageInitializer() {
-        bool isTopLevelCall = !WalletStorageLib.getLayout().initializing;
-        uint8 initialized = WalletStorageLib.getLayout().initialized;
+        bool isTopLevelCall = !WalletStorageV2Lib.getLayout().initializing;
+        uint8 initialized = WalletStorageV2Lib.getLayout().initialized;
 
         // Allowed calls:
         // - initialSetup: the contract is not in the initializing state and no previous version was
@@ -56,13 +56,13 @@ abstract contract WalletStorageInitializable {
         if (!initialSetup && !deploying) {
             revert WalletStorageIsInitialized();
         }
-        WalletStorageLib.getLayout().initialized = 1;
+        WalletStorageV2Lib.getLayout().initialized = 1;
         if (isTopLevelCall) {
-            WalletStorageLib.getLayout().initializing = true;
+            WalletStorageV2Lib.getLayout().initializing = true;
         }
         _;
         if (isTopLevelCall) {
-            WalletStorageLib.getLayout().initializing = false;
+            WalletStorageV2Lib.getLayout().initializing = false;
             emit WalletStorageInitialized();
         }
     }
@@ -72,7 +72,7 @@ abstract contract WalletStorageInitializable {
      * {walletStorageInitializer} modifier, directly or indirectly.
      */
     modifier onlyWalletStorageInitializing() {
-        if (!WalletStorageLib.getLayout().initializing) {
+        if (!WalletStorageV2Lib.getLayout().initializing) {
             revert WalletStorageIsNotInitializing();
         }
         _;
@@ -87,11 +87,11 @@ abstract contract WalletStorageInitializable {
      * Emits an {WalletStorageInitialized} event the first time it is successfully executed.
      */
     function _disableWalletStorageInitializers() internal virtual {
-        if (WalletStorageLib.getLayout().initializing) {
+        if (WalletStorageV2Lib.getLayout().initializing) {
             revert WalletStorageIsInitializing();
         }
-        if (WalletStorageLib.getLayout().initialized != type(uint8).max) {
-            WalletStorageLib.getLayout().initialized = type(uint8).max;
+        if (WalletStorageV2Lib.getLayout().initialized != type(uint8).max) {
+            WalletStorageV2Lib.getLayout().initialized = type(uint8).max;
             emit WalletStorageInitialized();
         }
     }

src/msca/6900/v0.8/account/WalletStorageInitializable.sol

@@ -18,7 +18,7 @@
  */
 pragma solidity 0.8.24;
 
-import {InvalidLength} from "../../../../common/Errors.sol";
+import {InvalidLength, Unsupported} from "../../../../common/Errors.sol";
 import {Create2FailedDeployment} from "../../shared/common/Errors.sol";
 import {UpgradableMSCA} from "../account/UpgradableMSCA.sol";
 
@@ -143,6 +143,11 @@ contract UpgradableMSCAFactory is Ownable2Step {
         ENTRY_POINT.withdrawStake(_withdrawAddress);
     }
 
+    /// @notice Disable renouncing ownership.
+    function renounceOwnership() public view override onlyOwner {
+        revert Unsupported();
+    }
+
     function _getAddressWithValidation(
         bytes32 _sender,
         bytes32 _salt,

src/msca/6900/v0.8/factories/UpgradableMSCAFactory.sol

@@ -18,28 +18,36 @@
  */
 pragma solidity 0.8.24;
 
-import {IExecutionHookModule} from "@erc6900/reference-implementation/interfaces/IExecutionHookModule.sol";
-import {IModularAccountView} from "@erc6900/reference-implementation/interfaces/IModularAccountView.sol";
-import {IModule} from "@erc6900/reference-implementation/interfaces/IModule.sol";
-
-import {IModularAccount} from "@erc6900/reference-implementation/interfaces/IModularAccount.sol";
-
 import {IAccount} from "@account-abstraction/contracts/interfaces/IAccount.sol";
+import {IAccountExecute} from "@account-abstraction/contracts/interfaces/IAccountExecute.sol";
 import {IAggregator} from "@account-abstraction/contracts/interfaces/IAggregator.sol";
+
+import {IERC165} from "@openzeppelin/contracts/utils/introspection/IERC165.sol";
+
 import {IPaymaster} from "@account-abstraction/contracts/interfaces/IPaymaster.sol";
+import {IExecutionHookModule} from "@erc6900/reference-implementation/interfaces/IExecutionHookModule.sol";
 import {IExecutionModule} from "@erc6900/reference-implementation/interfaces/IExecutionModule.sol";
+import {IModularAccount} from "@erc6900/reference-implementation/interfaces/IModularAccount.sol";
+import {IModularAccountView} from "@erc6900/reference-implementation/interfaces/IModularAccountView.sol";
+import {IModule} from "@erc6900/reference-implementation/interfaces/IModule.sol";
 import {IValidationHookModule} from "@erc6900/reference-implementation/interfaces/IValidationHookModule.sol";
+
+import {BaseMSCA} from "../account/BaseMSCA.sol";
 import {IValidationModule} from "@erc6900/reference-implementation/interfaces/IValidationModule.sol";
 import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";
 
-import {IERC165} from "@openzeppelin/contracts/utils/introspection/IERC165.sol";
+import {IERC1271} from "@openzeppelin/contracts/interfaces/IERC1271.sol";
+import {IERC777Recipient} from "@openzeppelin/contracts/interfaces/IERC777Recipient.sol";
+import {IERC1155Receiver} from "@openzeppelin/contracts/token/ERC1155/IERC1155Receiver.sol";
+import {IERC721Receiver} from "@openzeppelin/contracts/token/ERC721/IERC721Receiver.sol";
 
 library SelectorRegistryLib {
     /**
-     * @dev Check if the selector is native execution function.
+     * @dev Determines whether a function is a native execution function with the validateNativeFunction modifier,
+     * indicating that it triggers execution hooks (if any) associated with execution selector from msg.sig.
      * @param selector the function selector.
      */
-    function _isNativeExecutionFunction(bytes4 selector) internal pure returns (bool) {
+    function _isWrappedNativeExecutionFunction(bytes4 selector) internal pure returns (bool) {
         return selector == IModularAccount.execute.selector || selector == IModularAccount.executeBatch.selector
             || selector == IModularAccount.installExecution.selector
             || selector == IModularAccount.uninstallExecution.selector
@@ -48,21 +56,48 @@ library SelectorRegistryLib {
             || selector == IModularAccount.uninstallValidation.selector;
     }
 
+    /**
+     * @dev Determines whether a function is a native execution function without the validateNativeFunction modifier,
+     * indicating that it triggers execution hooks (if any) associated with the validation function.
+     * @param selector the function selector.
+     */
+    function _isNonWrappedNativeExecutionFunction(bytes4 selector) internal pure returns (bool) {
+        return selector == IAccountExecute.executeUserOp.selector
+            || selector == IModularAccount.executeWithRuntimeValidation.selector;
+    }
+
+    /**
+     * @dev Check whether a selector is a native execution function that allows global validation.
+     * @param selector the function selector.
+     */
+    function _isNativeExecutionFunction(bytes4 selector) internal pure returns (bool) {
+        return _isWrappedNativeExecutionFunction(selector) || _isNonWrappedNativeExecutionFunction(selector);
+    }
+
+    /**
+     * @dev Check whether a selector is a native view function.
+     * @param selector the function selector.
+     */
+    function _isNativeViewFunction(bytes4 selector) internal pure returns (bool) {
+        return selector == BaseMSCA.entryPoint.selector || selector == IModularAccount.accountId.selector
+            || selector == UUPSUpgradeable.proxiableUUID.selector
+            || selector == IModularAccountView.getExecutionData.selector
+            || selector == IModularAccountView.getValidationData.selector || selector == IAccount.validateUserOp.selector
+            || selector == IERC165.supportsInterface.selector || selector == IERC1271.isValidSignature.selector
+            || selector == IERC1155Receiver.onERC1155BatchReceived.selector
+            || selector == IERC1155Receiver.onERC1155Received.selector
+            || selector == IERC721Receiver.onERC721Received.selector || selector == IERC777Recipient.tokensReceived.selector;
+    }
+
     /**
      * @dev Check if the selector is for native function.
      * @param selector the function selector.
      */
     function _isNativeFunction(bytes4 selector) internal pure returns (bool) {
-        return _isNativeExecutionFunction(selector) || selector == IModularAccount.executeWithRuntimeValidation.selector
-            || selector == IModularAccount.accountId.selector || selector == UUPSUpgradeable.proxiableUUID.selector
-        // check against IERC165 methods
-        || selector == IERC165.supportsInterface.selector
-        // check against IModularAccountView methods
-        || selector == IModularAccountView.getExecutionData.selector
-            || selector == IModularAccountView.getValidationData.selector || selector == IAccount.validateUserOp.selector;
+        return _isNativeExecutionFunction(selector) || _isNativeViewFunction(selector);
     }
 
-    function _isErc4337Function(bytes4 selector) internal pure returns (bool) {
+    function _isERC4337Function(bytes4 selector) internal pure returns (bool) {
         return selector == IAggregator.validateSignatures.selector
             || selector == IAggregator.validateUserOpSignature.selector
             || selector == IAggregator.aggregateSignatures.selector
@@ -76,6 +111,7 @@ library SelectorRegistryLib {
             || selector == IValidationModule.validateRuntime.selector
             || selector == IValidationModule.validateSignature.selector
             || selector == IValidationHookModule.preRuntimeValidationHook.selector
+            || selector == IValidationHookModule.preSignatureValidationHook.selector
             || selector == IExecutionHookModule.preExecutionHook.selector
             || selector == IExecutionHookModule.postExecutionHook.selector
             || selector == IExecutionModule.executionManifest.selector;

src/msca/6900/v0.8/libs/SelectorRegistryLib.sol

@@ -21,10 +21,15 @@ pragma solidity 0.8.24;
 import {ExecutionStorage, ValidationStorage} from "../common/Structs.sol";
 import {ModuleEntity} from "@erc6900/reference-implementation/interfaces/IModularAccount.sol";
 
-/// @dev The same storage will be used for ERC6900 v0.8 MSCAs.
-library WalletStorageLib {
-    // keccak256 hash of "circle.msca.v0_8.storage" subtracted by 1
-    bytes32 internal constant WALLET_STORAGE_SLOT = 0x45b8c59e88d59f48fa992cc87612124331f3e8b18f76fa4c146925e98c37c228;
+/// @dev The same storage will be used for v2.x.y of MSCAs.
+library WalletStorageV2Lib {
+    // @notice On 12/16/2024, storage was aligned to 256 as a potential optimization in anticipation of gas schedule
+    // changes following the Verkle state tree migration. This adjustment accounts for scenarios where groups
+    // of 256 storage slots may become warm simultaneously and will only apply to newly deployed accounts.
+    // For more details, please refer to https://eips.ethereum.org/EIPS/eip-7201.
+    // 1. id = "circle.msca.v2.storage"
+    // 2. keccak256(abi.encode(uint256(keccak256(id)) - 1)) & ~bytes32(uint256(0xff))
+    bytes32 internal constant WALLET_STORAGE_SLOT = 0x1ffef775e8122370efaac4f28eeec94f03b0484eca026ee3ab713094c73f5d00;
 
     struct Layout {
         // list of ERC-165 interfaceIds to add to account to support introspection checks

src/msca/6900/v0.8/libs/WalletStorageLib.sol renamed to src/msca/6900/v0.8/libs/WalletStorageV2Lib.sol

@@ -19,7 +19,13 @@
 pragma solidity 0.8.24;
 
 import {PublicKey} from "../../../../../common/CommonStructs.sol";
-import {AccountMetadata, CheckNSignaturesRequest, SignerMetadata, SignerMetadataWithId} from "./MultisigStructs.sol";
+import {
+    AccountMetadata,
+    CheckNSignaturesRequest,
+    CheckNSignaturesResponse,
+    SignerMetadata,
+    SignerMetadataWithId
+} from "./MultisigStructs.sol";
 import {IValidationModule} from "@erc6900/reference-implementation/interfaces/IValidationModule.sol";
 
 /// @title Weighted Multisig Validation Module Interface
@@ -52,6 +58,9 @@ interface IWeightedMultisigValidationModule is IValidationModule {
     error InvalidSigOffset(uint32 entityId, address account, uint256 offset);
     error InvalidNumSigsOnActualDigest(uint32 entityId, address account, uint256 numSigs);
     error InvalidUserOpDigest(uint32 entityId, address account);
+    error UnsupportedSigType(uint32 entityId, address account, uint8 sigType);
+    error InvalidAuthorizationLength(uint32 entityId, address account, uint256 length);
+    error InvalidRuntimeDigest(uint32 entityId, address account);
 
     /// @notice Get the signer id.
     /// @param signer The signer to check.
@@ -130,14 +139,15 @@ interface IWeightedMultisigValidationModule is IValidationModule {
     /// entityId - entity id for the account and signer.
     /// account - the account to check the signatures for.
     /// signatures - the signatures to check.
-    /// @return success true if the signatures are valid.
-    /// @return firstFailure first failure, if failed is true.
+    /// @return response - success true if the signatures are valid.
+    /// firstFailure if failed is true.
+    /// returnError for debugging if available.
     /// (Note: if all signatures are individually valid but do not satisfy the
     /// multisig, firstFailure will be set to the last signature's index.)
     function checkNSignatures(CheckNSignaturesRequest calldata nSignaturesInput)
         external
         view
-        returns (bool success, uint256 firstFailure);
+        returns (CheckNSignaturesResponse memory response);
 
     /// @notice Return all the signer metadata of an account.
     /// @param entityId entity id for the account and signers.