fix build error

SoulWallet · Jan 3, 2024 · 5dce926 · 5dce926
1 parent ff3bb87
commit 5dce926
Show file tree

Hide file tree

Showing 13 changed files with 21 additions and 25 deletions.
diff --git a/contracts/dev/Tokens/TokenERC20.sol → contracts/dev/tokens/TokenERC20.sol b/contracts/dev/Tokens/TokenERC20.sol → contracts/dev/tokens/TokenERC20.sol
diff --git a/...ntrolModule/BaseSecurityControlModule.sol → ...ntrolModule/BaseSecurityControlModule.sol b/...ntrolModule/BaseSecurityControlModule.sol → ...ntrolModule/BaseSecurityControlModule.sol
diff --git a/...trolModule/IBaseSecurityControlModule.sol → ...trolModule/IBaseSecurityControlModule.sol b/...trolModule/IBaseSecurityControlModule.sol → ...trolModule/IBaseSecurityControlModule.sol
diff --git a/...tyControlModule/SecurityControlModule.sol → ...tyControlModule/SecurityControlModule.sol b/...tyControlModule/SecurityControlModule.sol → ...tyControlModule/SecurityControlModule.sol
diff --git a/...ntractManager/ITrustedContractManager.sol → ...ntractManager/ITrustedContractManager.sol b/...ntractManager/ITrustedContractManager.sol → ...ntractManager/ITrustedContractManager.sol
diff --git a/...ontractManager/TrustedContractManager.sol → ...ontractManager/TrustedContractManager.sol b/...ontractManager/TrustedContractManager.sol → ...ontractManager/TrustedContractManager.sol
diff --git a/...trustedHookManager/TrustedHookManager.sol → ...trustedHookManager/TrustedHookManager.sol b/...trustedHookManager/TrustedHookManager.sol → ...trustedHookManager/TrustedHookManager.sol
diff --git a/...tedModuleManager/TrustedModuleManager.sol → ...tedModuleManager/TrustedModuleManager.sol b/...tedModuleManager/TrustedModuleManager.sol → ...tedModuleManager/TrustedModuleManager.sol
diff --git a/...idatorManager/TrustedValidatorManager.sol → ...idatorManager/TrustedValidatorManager.sol b/...idatorManager/TrustedValidatorManager.sol → ...idatorManager/TrustedValidatorManager.sol
diff --git a/contracts/modules/Upgrade/IUpgrade.sol → contracts/modules/upgrade/IUpgrade.sol b/contracts/modules/Upgrade/IUpgrade.sol → contracts/modules/upgrade/IUpgrade.sol
diff --git a/contracts/modules/Upgrade/UpgradeModule.sol → contracts/modules/upgrade/UpgradeModule.sol b/contracts/modules/Upgrade/UpgradeModule.sol → contracts/modules/upgrade/UpgradeModule.sol
diff --git a/contracts/validator/KeystoreValidator.sol → contracts/validator/KeyStoreValidator.sol b/contracts/validator/KeystoreValidator.sol → contracts/validator/KeyStoreValidator.sol
@@ -1,39 +1,36 @@
 // SPDX-License-Identifier: GPL-3.0
 pragma solidity ^0.8.20;
+
 import "@openzeppelin/contracts/utils/cryptography/ECDSA.sol";
 import "../keystore/L1/interfaces/IKeyStoreValidator.sol";
 import "./libraries/ValidatorSigDecoder.sol";
 import "../libraries/WebAuthn.sol";
 import "../libraries/Errors.sol";
 import "../libraries/TypeConversion.sol";
 
-contract KeyStoreValidator is IKeyStoreValidator{
+contract KeyStoreValidator is IKeyStoreValidator {
     using TypeConversion for address;
 
-    function recoverSignature(
-        bytes32 rawHash,
-        bytes calldata rawSignature
-    ) external view returns (bytes32 recovered, bool success) {
+    function recoverSignature(bytes32 rawHash, bytes calldata rawSignature)
+        external
+        view
+        returns (bytes32 recovered, bool success)
+    {
         uint8 signatureType;
         bytes calldata signature;
         uint256 validationData;
-        (signatureType, validationData, signature) = ValidatorSigDecoder
-            .decodeValidatorSignature(rawSignature);
+        (signatureType, validationData, signature) = ValidatorSigDecoder.decodeValidatorSignature(rawSignature);
 
-        bytes32 hash = _packSignatureHash(
-            rawHash,
-            signatureType,
-            validationData
-        );
+        bytes32 hash = _packSignatureHash(rawHash, signatureType, validationData);
 
         (recovered, success) = recover(signatureType, hash, signature);
     }
 
-    function _packSignatureHash(
-        bytes32 _hash,
-        uint8 signatureType,
-        uint256 validationData
-    ) internal pure returns (bytes32 packedHash) {
+    function _packSignatureHash(bytes32 _hash, uint8 signatureType, uint256 validationData)
+        internal
+        pure
+        returns (bytes32 packedHash)
+    {
         if (signatureType == 0x0) {
             packedHash = _hash;
         } else if (signatureType == 0x1) {
@@ -47,15 +44,14 @@ contract KeyStoreValidator is IKeyStoreValidator{
         }
     }
 
-    function recover(
-        uint8 signatureType,
-        bytes32 rawHash,
-        bytes calldata rawSignature
-    ) internal view returns (bytes32 recovered, bool success) {
+    function recover(uint8 signatureType, bytes32 rawHash, bytes calldata rawSignature)
+        internal
+        view
+        returns (bytes32 recovered, bool success)
+    {
         if (signatureType == 0x0 || signatureType == 0x1) {
             //ecdas recover
-            (address recoveredAddr, ECDSA.RecoverError error, ) = ECDSA
-                .tryRecover(rawHash, rawSignature);
+            (address recoveredAddr, ECDSA.RecoverError error,) = ECDSA.tryRecover(rawHash, rawSignature);
             if (error != ECDSA.RecoverError.NoError) {
                 success = false;
             } else {

diff --git a/script/PaymasterDeployer.s.sol b/script/PaymasterDeployer.s.sol
@@ -3,7 +3,7 @@ pragma solidity ^0.8.13;
 
 import "forge-std/Script.sol";
 import "@account-abstraction/contracts/core/EntryPoint.sol";
-import "@source/dev/Tokens/TokenERC20.sol";
+import "@source/dev/tokens/TokenERC20.sol";
 import "@source/dev/TestOracle.sol";
 import "./DeployHelper.sol";
 import "@source/paymaster/ERC20Paymaster.sol";