From 7a84953f5d63c75e7b7d1978e932085a9c2015eb Mon Sep 17 00:00:00 2001
From: aboudjem <boudjemaa.adam@gmail.com>
Date: Tue, 17 Sep 2024 12:41:55 +0700
Subject: [PATCH] Update import paths for solady modules

---
 contracts/sponsorship/BiconomySponsorshipPaymaster.sol | 6 +++---
 contracts/token/BiconomyTokenPaymaster.sol             | 6 +++---
 contracts/utils/SoladyOwnable.sol                      | 2 +-
 test/base/TestBase.sol                                 | 2 +-
 test/base/TestHelper.sol                               | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/contracts/sponsorship/BiconomySponsorshipPaymaster.sol b/contracts/sponsorship/BiconomySponsorshipPaymaster.sol
index ae58109..ea530d1 100644
--- a/contracts/sponsorship/BiconomySponsorshipPaymaster.sol
+++ b/contracts/sponsorship/BiconomySponsorshipPaymaster.sol
@@ -6,12 +6,12 @@ pragma solidity ^0.8.27;
 import "../base/BasePaymaster.sol";
 import "@account-abstraction/core/UserOperationLib.sol";
 import "@account-abstraction/core/Helpers.sol";
-import { SignatureCheckerLib } from "@solady/utils/SignatureCheckerLib.sol";
-import { ECDSA as ECDSA_solady } from "@solady/utils/ECDSA.sol";
+import { SignatureCheckerLib } from "solady/utils/SignatureCheckerLib.sol";
+import { ECDSA as ECDSA_solady } from "solady/utils/ECDSA.sol";
 import { BiconomySponsorshipPaymasterErrors } from "../common/BiconomySponsorshipPaymasterErrors.sol";
 import { ReentrancyGuardTransient } from "@openzeppelin/utils/ReentrancyGuardTransient.sol";
 import { IERC20 } from "@openzeppelin/token/ERC20/IERC20.sol";
-import { SafeTransferLib } from "@solady/utils/SafeTransferLib.sol";
+import { SafeTransferLib } from "solady/utils/SafeTransferLib.sol";
 import { IBiconomySponsorshipPaymaster } from "../interfaces/IBiconomySponsorshipPaymaster.sol";
 
 /**
diff --git a/contracts/token/BiconomyTokenPaymaster.sol b/contracts/token/BiconomyTokenPaymaster.sol
index 085a106..fb10cfe 100644
--- a/contracts/token/BiconomyTokenPaymaster.sol
+++ b/contracts/token/BiconomyTokenPaymaster.sol
@@ -6,14 +6,14 @@ import { IEntryPoint } from "@account-abstraction/interfaces/IEntryPoint.sol";
 import { PackedUserOperation, UserOperationLib } from "@account-abstraction/core/UserOperationLib.sol";
 import { IERC20 } from "@openzeppelin/token/ERC20/ERC20.sol";
 import { IERC20Metadata } from "@openzeppelin/token/ERC20/extensions/IERC20Metadata.sol";
-import { SafeTransferLib } from "@solady/utils/SafeTransferLib.sol";
+import { SafeTransferLib } from "solady/utils/SafeTransferLib.sol";
 import { BasePaymaster } from "../base/BasePaymaster.sol";
 import { BiconomyTokenPaymasterErrors } from "../common/BiconomyTokenPaymasterErrors.sol";
 import { IBiconomyTokenPaymaster } from "../interfaces/IBiconomyTokenPaymaster.sol";
 import { IOracle } from "../interfaces/oracles/IOracle.sol";
 import { TokenPaymasterParserLib } from "../libraries/TokenPaymasterParserLib.sol";
-import { SignatureCheckerLib } from "@solady/utils/SignatureCheckerLib.sol";
-import { ECDSA as ECDSA_solady } from "@solady/utils/ECDSA.sol";
+import { SignatureCheckerLib } from "solady/utils/SignatureCheckerLib.sol";
+import { ECDSA as ECDSA_solady } from "solady/utils/ECDSA.sol";
 import "@account-abstraction/core/Helpers.sol";
 
 /**
diff --git a/contracts/utils/SoladyOwnable.sol b/contracts/utils/SoladyOwnable.sol
index 63f1b8f..4b12622 100644
--- a/contracts/utils/SoladyOwnable.sol
+++ b/contracts/utils/SoladyOwnable.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.27;
 
-import { Ownable } from "@solady/auth/Ownable.sol";
+import { Ownable } from "solady/auth/Ownable.sol";
 
 contract SoladyOwnable is Ownable {
     constructor(address _owner) Ownable() {
diff --git a/test/base/TestBase.sol b/test/base/TestBase.sol
index 8d90d93..7da68df 100644
--- a/test/base/TestBase.sol
+++ b/test/base/TestBase.sol
@@ -4,7 +4,7 @@ pragma solidity ^0.8.27;
 import { Test } from "forge-std/src/Test.sol";
 import { Vm } from "forge-std/src/Vm.sol";
 
-import "@solady/utils/ECDSA.sol";
+import "solady/utils/ECDSA.sol";
 import "./TestHelper.sol";
 
 import { IAccount } from "@account-abstraction/interfaces/IAccount.sol";
diff --git a/test/base/TestHelper.sol b/test/base/TestHelper.sol
index 35c7abb..e8be91a 100644
--- a/test/base/TestHelper.sol
+++ b/test/base/TestHelper.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import "solady/src/utils/ECDSA.sol";
+import "solady/utils/ECDSA.sol";
 import "@openzeppelin/utils/cryptography/MessageHashUtils.sol";
 import { EntryPoint } from "@account-abstraction/core/EntryPoint.sol";
 import { IEntryPoint } from "@account-abstraction/interfaces/IEntryPoint.sol";