diff --git a/contracts/account/extensions/draft-AccountERC7579.sol b/contracts/account/extensions/draft-AccountERC7579.sol
index e24e56dce..09f19a3fb 100644
--- a/contracts/account/extensions/draft-AccountERC7579.sol
+++ b/contracts/account/extensions/draft-AccountERC7579.sol
@@ -4,7 +4,16 @@ pragma solidity ^0.8.26;
 
 import {PackedUserOperation} from "../../interfaces/draft-IERC4337.sol";
 import {IERC1271} from "../../interfaces/IERC1271.sol";
-import {IERC7579Module, IERC7579Validator, IERC7579Execution, IERC7579AccountConfig, IERC7579ModuleConfig, MODULE_TYPE_VALIDATOR, MODULE_TYPE_EXECUTOR, MODULE_TYPE_FALLBACK} from "../../interfaces/draft-IERC7579.sol";
+import {
+    IERC7579Module,
+    IERC7579Validator,
+    IERC7579Execution,
+    IERC7579AccountConfig,
+    IERC7579ModuleConfig,
+    MODULE_TYPE_VALIDATOR,
+    MODULE_TYPE_EXECUTOR,
+    MODULE_TYPE_FALLBACK
+} from "../../interfaces/draft-IERC7579.sol";
 import {ERC7579Utils, Mode, CallType, ExecType} from "../../account/utils/draft-ERC7579Utils.sol";
 import {EnumerableSet} from "../../utils/structs/EnumerableSet.sol";
 import {Bytes} from "../../utils/Bytes.sol";
diff --git a/contracts/mocks/account/modules/ERC7579Mock.sol b/contracts/mocks/account/modules/ERC7579Mock.sol
index 4cb559e4b..41083186c 100644
--- a/contracts/mocks/account/modules/ERC7579Mock.sol
+++ b/contracts/mocks/account/modules/ERC7579Mock.sol
@@ -2,7 +2,14 @@
 
 pragma solidity ^0.8.24;
 
-import {MODULE_TYPE_HOOK, MODULE_TYPE_FALLBACK, MODULE_TYPE_VALIDATOR, IERC7579Hook, IERC7579Module, IERC7579Validator} from "../../../interfaces/draft-IERC7579.sol";
+import {
+    MODULE_TYPE_HOOK,
+    MODULE_TYPE_FALLBACK,
+    MODULE_TYPE_VALIDATOR,
+    IERC7579Hook,
+    IERC7579Module,
+    IERC7579Validator
+} from "../../../interfaces/draft-IERC7579.sol";
 import {SignatureChecker} from "../../../utils/cryptography/SignatureChecker.sol";
 import {PackedUserOperation} from "../../../interfaces/draft-IERC4337.sol";
 import {IERC1271} from "../../../interfaces/IERC1271.sol";
diff --git a/package-lock.json b/package-lock.json
index acbc99212..ec1fe7738 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -38,7 +38,7 @@
         "micromatch": "^4.0.2",
         "p-limit": "^6.0.0",
         "prettier": "^3.0.0",
-        "prettier-plugin-solidity": "^1.1.0",
+        "prettier-plugin-solidity": "^2.0.0",
         "rimraf": "^6.0.0",
         "semver": "^7.3.5",
         "solhint": "^5.0.0",
@@ -8056,12 +8056,13 @@
       }
     },
     "node_modules/prettier-plugin-solidity": {
-      "version": "1.4.3",
-      "resolved": "https://registry.npmjs.org/prettier-plugin-solidity/-/prettier-plugin-solidity-1.4.3.tgz",
-      "integrity": "sha512-Mrr/iiR9f9IaeGRMZY2ApumXcn/C5Gs3S7B7hWB3gigBFML06C0yEyW86oLp0eqiA0qg+46FaChgLPJCj/pIlg==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/prettier-plugin-solidity/-/prettier-plugin-solidity-2.0.0.tgz",
+      "integrity": "sha512-tis3SwLSrYKDzzRFle48fjPM4GQKBtkVBUajAkt4b75/cc6zojFP7qjz6fDxKfup+34q0jKeSM3QeP9flJFXWw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
+        "@nomicfoundation/slang": "1.1.0",
         "@solidity-parser/parser": "^0.20.1",
         "semver": "^7.7.1"
       },
@@ -8069,7 +8070,24 @@
         "node": ">=18"
       },
       "peerDependencies": {
-        "prettier": ">=2.3.0"
+        "prettier": ">=3.0.0"
+      }
+    },
+    "node_modules/prettier-plugin-solidity/node_modules/@bytecodealliance/preview2-shim": {
+      "version": "0.17.2",
+      "resolved": "https://registry.npmjs.org/@bytecodealliance/preview2-shim/-/preview2-shim-0.17.2.tgz",
+      "integrity": "sha512-mNm/lblgES8UkVle8rGImXOz4TtL3eU3inHay/7TVchkKrb/lgcVvTK0+VAw8p5zQ0rgQsXm1j5dOlAAd+MeoA==",
+      "dev": true,
+      "license": "(Apache-2.0 WITH LLVM-exception)"
+    },
+    "node_modules/prettier-plugin-solidity/node_modules/@nomicfoundation/slang": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@nomicfoundation/slang/-/slang-1.1.0.tgz",
+      "integrity": "sha512-g2BofMUq1qCP22L/ksOftScrCxjdHTxgg8ch5PYon2zfSSKGCMwE4TgIC64CuorMcSsvCmqNNFEWR/fwFcMeTw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@bytecodealliance/preview2-shim": "0.17.2"
       }
     },
     "node_modules/prettier-plugin-solidity/node_modules/@solidity-parser/parser": {
diff --git a/package.json b/package.json
index cad57a97b..e66a34e35 100644
--- a/package.json
+++ b/package.json
@@ -80,7 +80,7 @@
     "micromatch": "^4.0.2",
     "p-limit": "^6.0.0",
     "prettier": "^3.0.0",
-    "prettier-plugin-solidity": "^1.1.0",
+    "prettier-plugin-solidity": "^2.0.0",
     "rimraf": "^6.0.0",
     "semver": "^7.3.5",
     "solhint": "^5.0.0",
diff --git a/test/account/AccountERC7702.t.sol b/test/account/AccountERC7702.t.sol
index f08193f29..0b2d588aa 100644
--- a/test/account/AccountERC7702.t.sol
+++ b/test/account/AccountERC7702.t.sol
@@ -5,7 +5,13 @@ import {Test} from "forge-std/Test.sol";
 import {AccountERC7702Mock} from "@openzeppelin/contracts/mocks/account/AccountMock.sol";
 import {CallReceiverMock} from "@openzeppelin/contracts/mocks/CallReceiverMock.sol";
 import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";
-import {ERC7579Utils, Execution, Mode, ModeSelector, ModePayload} from "@openzeppelin/contracts/account/utils/draft-ERC7579Utils.sol";
+import {
+    ERC7579Utils,
+    Execution,
+    Mode,
+    ModeSelector,
+    ModePayload
+} from "@openzeppelin/contracts/account/utils/draft-ERC7579Utils.sol";
 import {ERC4337Utils, IEntryPointExtra} from "@openzeppelin/contracts/account/utils/draft-ERC4337Utils.sol";
 import {Strings} from "@openzeppelin/contracts/utils/Strings.sol";
 import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";
diff --git a/test/account/utils/draft-ERC7579Utils.t.sol b/test/account/utils/draft-ERC7579Utils.t.sol
index bc69e4c34..f8ff5fda5 100644
--- a/test/account/utils/draft-ERC7579Utils.t.sol
+++ b/test/account/utils/draft-ERC7579Utils.t.sol
@@ -11,7 +11,15 @@ import {ECDSA} from "@openzeppelin/contracts/utils/cryptography/ECDSA.sol";
 import {MessageHashUtils} from "@openzeppelin/contracts/utils/cryptography/MessageHashUtils.sol";
 import {PackedUserOperation, IAccount, IEntryPoint} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";
 import {ERC4337Utils} from "@openzeppelin/contracts/account/utils/draft-ERC4337Utils.sol";
-import {ERC7579Utils, Mode, CallType, ExecType, ModeSelector, ModePayload, Execution} from "@openzeppelin/contracts/account/utils/draft-ERC7579Utils.sol";
+import {
+    ERC7579Utils,
+    Mode,
+    CallType,
+    ExecType,
+    ModeSelector,
+    ModePayload,
+    Execution
+} from "@openzeppelin/contracts/account/utils/draft-ERC7579Utils.sol";
 import {Test, Vm, console} from "forge-std/Test.sol";
 
 contract SampleAccount is IAccount, Ownable {
diff --git a/test/governance/extensions/GovernorSuperQuorumGreaterThanQuorum.t.sol b/test/governance/extensions/GovernorSuperQuorumGreaterThanQuorum.t.sol
index eb0409c8e..25fd84683 100644
--- a/test/governance/extensions/GovernorSuperQuorumGreaterThanQuorum.t.sol
+++ b/test/governance/extensions/GovernorSuperQuorumGreaterThanQuorum.t.sol
@@ -3,9 +3,13 @@
 pragma solidity ^0.8.20;
 
 import {Test} from "forge-std/Test.sol";
-import {GovernorVotesSuperQuorumFractionMock} from "../../../contracts/mocks/governance/GovernorVotesSuperQuorumFractionMock.sol";
+import {
+    GovernorVotesSuperQuorumFractionMock
+} from "../../../contracts/mocks/governance/GovernorVotesSuperQuorumFractionMock.sol";
 import {GovernorVotesQuorumFraction} from "../../../contracts/governance/extensions/GovernorVotesQuorumFraction.sol";
-import {GovernorVotesSuperQuorumFraction} from "../../../contracts/governance/extensions/GovernorVotesSuperQuorumFraction.sol";
+import {
+    GovernorVotesSuperQuorumFraction
+} from "../../../contracts/governance/extensions/GovernorVotesSuperQuorumFraction.sol";
 import {GovernorSettings} from "../../../contracts/governance/extensions/GovernorSettings.sol";
 import {GovernorVotes} from "../../../contracts/governance/extensions/GovernorVotes.sol";
 import {Governor} from "../../../contracts/governance/Governor.sol";