Fix/develop build and tests

.gitmodules

@@ -1,12 +1,11 @@
-[submodule "lib/account-abstraction"]
-	path = lib/account-abstraction
-	url = https://github.com/eth-infinitism/account-abstraction
 [submodule "lib/forge-std"]
 	path = lib/forge-std
 	url = https://github.com/foundry-rs/forge-std
 [submodule "lib/scw-contracts"]
 	path = lib/scw-contracts
 	url = https://github.com/bcnmy/scw-contracts
-[submodule "lib/openzeppelin-contracts"]
-	path = lib/openzeppelin-contracts
-	url = https://github.com/OpenZeppelin/openzeppelin-contracts
+	branch = develop
+[submodule "lib/account-abstraction"]
+	path = lib/account-abstraction
+	url = https://github.com/eth-infinitism/account-abstraction
+	tag = v0.6.0

package.json

@@ -88,19 +88,12 @@
     "typescript": "^5.2.2"
   },
   "dependencies": {
-    "@account-abstraction/contracts": "^0.6.0",
+    "@account-abstraction/contracts": "0.6.0",
     "@biconomy-devx/account-contracts-v2": "^2.0.3",
-    "@biconomy/account-contracts": "^2.0.0",
     "@chainlink/contracts": "^0.6.0",
     "@ethersproject/abstract-signer": "^5.6.2",
     "@ethersproject/constants": "^5.6.1",
-    "@mean-finance/uniswap-v3-oracle": "^1.0.3",
     "@openzeppelin/contracts": "4.9.3",
-    "@openzeppelin/contracts-upgradeable": "4.8.1",
-    "@pimlico/erc20-paymaster": "^0.0.1",
-    "@uniswap/sdk-core": "^3.2.2",
-    "@uniswap/universal-router": "^1.4.1",
-    "@uniswap/v3-periphery": "^1.4.3",
     "axios": "^1.4.0",
     "chai-as-promised": "^7.1.1",
     "chai-string": "^1.5.0",

remappings.txt

@@ -1,2 +1,3 @@
 ds-test/=lib/forge-std/lib/ds-test/src/
 forge-std/=lib/forge-std/src/
+@openzeppelin/contracts/=node_modules/@openzeppelin/contracts/