Merge pull request #187 from bcnmy/feat/sma-420-sol-0.8.23

SMA-420: Migrate to Solidity 0.8.23

contracts/smart-account/BaseSmartAccount.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.23;
 
 import {IBaseSmartAccount} from "./interfaces/IBaseSmartAccount.sol";
 import {IEntryPoint} from "@account-abstraction/contracts/interfaces/IEntryPoint.sol";

contracts/smart-account/Proxy.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.23;
 
 /**
  * @title Proxy // This is the user's Smart Account

contracts/smart-account/SmartAccount.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.23;
 
 import {IERC165} from "@openzeppelin/contracts/utils/introspection/IERC165.sol";
 import {BaseSmartAccount, IEntryPoint, UserOperation} from "./BaseSmartAccount.sol";

contracts/smart-account/base/Executor.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: LGPL-3.0-only
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.23;
 
 import {IExecutor} from "../interfaces/base/IExecutor.sol";
 import {Enum} from "../common/Enum.sol";

contracts/smart-account/base/FallbackManager.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: LGPL-3.0-only
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.23;
 
 import {SelfAuthorized} from "../common/SelfAuthorized.sol";
 import {IFallbackManager} from "../interfaces/base/IFallbackManager.sol";

contracts/smart-account/base/ModuleManager.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: LGPL-3.0-only
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.23;
 
 import {SelfAuthorized} from "../common/SelfAuthorized.sol";
 import {Executor, Enum} from "./Executor.sol";

contracts/smart-account/common/Enum.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: LGPL-3.0-only
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.23;
 
 /// @title Enum - Collection of enums
 abstract contract Enum {

contracts/smart-account/common/ReentrancyGuard.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: LGPL-3.0-only
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.23;
 
 /**
  * @title ReentrancyGuard

contracts/smart-account/common/SecuredTokenTransfer.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: LGPL-3.0-only
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.23;
 
 /// @title SecuredTokenTransfer - Secure token transfer
 abstract contract SecuredTokenTransfer {

contracts/smart-account/common/SelfAuthorized.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: LGPL-3.0-only
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.23;
 
 import {ISelfAuthorized} from "../interfaces/common/ISelfAuthorized.sol";
 

contracts/smart-account/common/SignatureDecoder.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: LGPL-3.0-only
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.23;
 
 /// @title SignatureDecoder - Decodes signatures that a encoded as bytes
 abstract contract SignatureDecoder {

contracts/smart-account/common/Stakeable.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.23;
 
 import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";
 import {IEntryPoint} from "@account-abstraction/contracts/interfaces/IEntryPoint.sol";

contracts/smart-account/deployer/Create3.sol

@@ -1,5 +1,5 @@
 //SPDX-License-Identifier: Unlicense
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.23;
 
 /**
   @title A library for deploying contracts EIP-3171 style.

contracts/smart-account/deployer/Deployer.sol

@@ -1,5 +1,5 @@
 //SPDX-License-Identifier: Unlicense
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.23;
 
 import "./Create3.sol";
 

contracts/smart-account/factory/SmartAccountFactory.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.23;
 
 import "../Proxy.sol";
 import "../BaseSmartAccount.sol";

contracts/smart-account/handler/DefaultCallbackHandler.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: LGPL-3.0-only
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.23;
 
 /* solhint-disable no-empty-blocks */
 

contracts/smart-account/interfaces/IAccountRecoveryModule.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.23;
 
 interface IAccountRecoveryModule {
     /**

contracts/smart-account/interfaces/IAddressResolver.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.23;
 
 interface IAddressResolver {
     struct SmartAccountResult {

contracts/smart-account/interfaces/IAuthorizationModule.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.23;
 
 import {UserOperation} from "@account-abstraction/contracts/interfaces/UserOperation.sol";
 

contracts/smart-account/interfaces/IBaseSmartAccount.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: LGPL-3.0-only
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.23;
 
 import {IAccount} from "@account-abstraction/contracts/interfaces/IAccount.sol";
 import {UserOperation} from "@account-abstraction/contracts/interfaces/UserOperation.sol";

contracts/smart-account/interfaces/ISignatureValidator.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: LGPL-3.0-only
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.23;
 
 // bytes4(keccak256("isValidSignature(bytes32,bytes)")
 bytes4 constant EIP1271_MAGIC_VALUE = 0x1626ba7e;

contracts/smart-account/interfaces/ISmartAccount.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: LGPL-3.0-only
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.23;
 
 import {IBaseSmartAccount} from "./IBaseSmartAccount.sol";
 import {IModuleManager} from "./base/IModuleManager.sol";

contracts/smart-account/interfaces/base/IExecutor.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: LGPL-3.0-only
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.23;
 
 import {Enum} from "../../common/Enum.sol";
 

contracts/smart-account/interfaces/base/IFallbackManager.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: LGPL-3.0-only
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.23;
 
 /**
  *   @title Fallback Manager - A contract that manages fallback calls made to the Smart Account

contracts/smart-account/interfaces/base/IModuleManager.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: LGPL-3.0-only
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.23;
 
 import {Enum} from "../../common/Enum.sol";
 

contracts/smart-account/interfaces/common/ISelfAuthorized.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: LGPL-3.0-only
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.23;
 
 /// @title SelfAuthorized - authorizes current contract to perform actions
 interface ISelfAuthorized {

contracts/smart-account/interfaces/common/IStakeable.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: LGPL-3.0-only
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.23;
 
 /**
  * @title Stakeable Entity

contracts/smart-account/interfaces/factory/ISmartAccountFactory.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: LGPL-3.0-only
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.23;
 
 /**
  * @title Smart Account Factory - factory responsible for deploying Smart Accounts using CREATE2 and CREATE

contracts/smart-account/interfaces/factory/ISmartAccountFactoryV1.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: LGPL-3.0-only
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.23;
 
 interface ISmartAccountFactoryV1 {
     function getAddressForCounterFactualAccount(

contracts/smart-account/interfaces/modules/IBaseAuthorizationModule.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.23;
 
 import {IAuthorizationModule} from "../../interfaces/IAuthorizationModule.sol";
 import {ISignatureValidator} from "../../interfaces/ISignatureValidator.sol";

contracts/smart-account/interfaces/modules/IBatchedSessionRouterModule.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.23;
 
 /**
  * @title Batched Session Router

contracts/smart-account/interfaces/modules/IERC7484SecurityPolicyPlugin.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.23;
 
 import {ISecurityPolicyPlugin} from "contracts/smart-account/interfaces/modules/ISecurityPolicyManagerPlugin.sol";
 import {IERC7484SecurityPolicyPluginEventsErrors} from "contracts/smart-account/interfaces/modules/IERC7484SecurityPolicyPluginEventsErrors.sol";

contracts/smart-account/interfaces/modules/IERC7484SecurityPolicyPluginEventsErrors.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.23;
 
 interface IERC7484SecurityPolicyPluginEventsErrors {
     struct Configuration {

contracts/smart-account/interfaces/modules/IEcdsaOwnershipRegistryModule.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.23;
 
 /**
  * @title ECDSA ownership Authorization module for Biconomy Smart Accounts.

contracts/smart-account/interfaces/modules/IMultiOwnedECDSAModule.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.23;
 
 /**
  * @title ECDSA Multi Ownership Authorization Module for Biconomy Smart Accounts.

contracts/smart-account/interfaces/modules/IPasskeyRegistryModule.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.23;
 
 /**
  * @title Passkey ownership Authorization module for Biconomy Smart Accounts.

contracts/smart-account/interfaces/modules/ISecurityPolicyManagerPlugin.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.23;
 
 import {ISecurityPolicyPlugin} from "./ISecurityPolicyPlugin.sol";
 import {ISecurityPolicyManagerPluginEventsErrors} from "./ISecurityPolicyManagerPluginEventsErrors.sol";

contracts/smart-account/interfaces/modules/ISecurityPolicyManagerPluginEventsErrors.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.23;
 
 interface ISecurityPolicyManagerPluginEventsErrors {
     event SecurityPolicyEnabled(address indexed sa, address indexed policy);

contracts/smart-account/interfaces/modules/ISecurityPolicyPlugin.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.23;
 
 /**
  * @title Security Policy Plugin

contracts/smart-account/interfaces/modules/ISessionKeyManagerModule.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.23;
 
 /**
  * @title Session Key Manager module for Biconomy Modular Smart Accounts.

contracts/smart-account/interfaces/modules/ISessionValidationModule.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.23;
 
 import {UserOperation} from "@account-abstraction/contracts/interfaces/UserOperation.sol";
 

contracts/smart-account/interfaces/modules/ISmartContractOwnershipRegistryModule.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.23;
 
 /**
  * @title Smart Contract Ownership Authorization module for Biconomy Smart Accounts.

contracts/smart-account/libs/LibAddress.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.23;
 
 library LibAddress {
     /**

contracts/smart-account/modules/AccountRecoveryModule.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.23;
 
 import {BaseAuthorizationModule} from "./BaseAuthorizationModule.sol";
 import {UserOperation} from "@account-abstraction/contracts/interfaces/UserOperation.sol";

contracts/smart-account/modules/AuthorizationModulesConstants.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.23;
 
 /// @dev Contract containing constants related to authorization module results.
 contract AuthorizationModulesConstants {

contracts/smart-account/modules/BaseAuthorizationModule.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.23;
 
 /* solhint-disable no-empty-blocks */
 

contracts/smart-account/modules/BatchedSessionRouterModule.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.23;
 
 /* solhint-disable function-max-lines */
 

contracts/smart-account/modules/EcdsaOwnershipRegistryModule.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.23;
 
 /* solhint-disable no-unused-import */
 

contracts/smart-account/modules/MultiOwnedECDSAModule.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.23;
 
 /* solhint-disable no-unused-import */
 

contracts/smart-account/modules/MultichainECDSAValidator.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.23;
 
 import {UserOperation} from "@account-abstraction/contracts/interfaces/UserOperation.sol";
 import {EcdsaOwnershipRegistryModule} from "./EcdsaOwnershipRegistryModule.sol";
@@ -43,7 +43,7 @@ contract MultichainECDSAValidator is EcdsaOwnershipRegistryModule {
 
         address sender;
         // read sender from userOp, which is first userOp member (saves gas)
-        assembly {
+        assembly ("memory-safe") {
             sender := calldataload(userOp)
         }
 
@@ -70,16 +70,19 @@ contract MultichainECDSAValidator is EcdsaOwnershipRegistryModule {
                 moduleSignature,
                 (uint48, uint48, bytes32, bytes32[], bytes)
             );
+        {
+            // make a leaf out of userOpHash, validUntil and validAfter
+            bytes32 leaf = keccak256(
+                abi.encodePacked(validUntil, validAfter, userOpHash)
+            );
 
-        // make a leaf out of userOpHash, validUntil and validAfter
-        bytes32 leaf = keccak256(
-            abi.encodePacked(validUntil, validAfter, userOpHash)
-        );
-
-        if (!MerkleProof.verify(merkleProof, merkleTreeRoot, leaf)) {
-            revert("Invalid UserOp");
+            if (!MerkleProof.verify(merkleProof, merkleTreeRoot, leaf)) {
+                revert("Invalid UserOp");
+            }
         }
 
+        validUntil = validUntil == 0 ? type(uint48).max : validUntil;
+
         return
             _verifySignature(
                 merkleTreeRoot,
@@ -88,7 +91,7 @@ contract MultichainECDSAValidator is EcdsaOwnershipRegistryModule {
             )
                 ? _packValidationData(
                     false, //sigVerificationFailed = false
-                    validUntil == 0 ? type(uint48).max : validUntil,
+                    validUntil,
                     validAfter
                 )
                 : SIG_VALIDATION_FAILED;