fix: prepare for v3 migration

Gearbox-protocol · Mar 10, 2023 · 0c3e3b8 · 0c3e3b8
1 parent 6489b4b
commit 0c3e3b8
Show file tree

Hide file tree

Showing 123 changed files with 184 additions and 8,138 deletions.
diff --git a/.github/workflows/lint_pr.yml → .github copy/workflows/lint_pr.yml b/.github/workflows/lint_pr.yml → .github copy/workflows/lint_pr.yml
diff --git a/.github/workflows/pr.yml → .github copy/workflows/pr.yml b/.github/workflows/pr.yml → .github copy/workflows/pr.yml
diff --git a/.github/workflows/release.yml → .github copy/workflows/release.yml b/.github/workflows/release.yml → .github copy/workflows/release.yml
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -3,7 +3,7 @@
     "editor.defaultFormatter": "esbenp.prettier-vscode"
   },
   "[solidity]": {
-    "editor.defaultFormatter": "NomicFoundation.hardhat-solidity"
+    "editor.defaultFormatter": "JuanBlanco.solidity"
   },
 
   "editor.defaultFormatter": "esbenp.prettier-vscode",
@@ -19,6 +19,7 @@
     "@ensdomains/=node_modules/@ensdomains/",
     "@openzeppelin/=node_modules/@openzeppelin/contracts",
     "ds-test/=lib/ds-test/src/",
-    "hardhat/=node_modules/hardhat/"
+    "hardhat/=node_modules/hardhat/",
+    "@gearbox-protocol=node_modules/@gearbox-protocol/"
   ]
 }
diff --git a/contracts/adapters/UniversalAdapter.sol b/contracts/adapters/UniversalAdapter.sol
@@ -8,7 +8,7 @@ import {AdapterType} from "../interfaces/adapters/IAdapter.sol";
 import {ICreditManagerV2} from "../interfaces/ICreditManagerV2.sol";
 import {ZeroAddressException} from "../interfaces/IErrors.sol";
 import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
-import {UNIVERSAL_CONTRACT} from "../libraries/Constants.sol";
+import {UNIVERSAL_CONTRACT} from "@gearbox-protocol/core-v2/contracts/libraries/Constants.sol";
 
 /// @title UniversalAdapter
 /// @dev Implements the initial version of universal adapter, which handles allowance revocations

diff --git a/contracts/core/ACL.sol b/contracts/core/ACL.sol
diff --git a/contracts/core/ACLNonReentrantTrait.sol b/contracts/core/ACLNonReentrantTrait.sol
@@ -4,8 +4,8 @@
 pragma solidity ^0.8.10;
 
 import {Pausable} from "@openzeppelin/contracts/security/Pausable.sol";
-import {AddressProvider} from "./AddressProvider.sol";
-import {IACL} from "../interfaces/IACL.sol";
+import {AddressProvider} from "@gearbox-protocol/core-v2/contracts/core/AddressProvider.sol";
+import {IACL} from "@gearbox-protocol/core-v2/contracts/interfaces/IACL.sol";
 import {
     ZeroAddressException,
     CallerNotConfiguratorException,