refactor: update import paths for lsp1

lukso-network · Jan 25, 2024 · 1f7bb89 · 1f7bb89
1 parent 9374a02
commit 1f7bb89
Show file tree

Hide file tree

Showing 9 changed files with 11,192 additions and 3,184 deletions.
diff --git a/.github/workflows/solc_version.yml b/.github/workflows/solc_version.yml
@@ -81,10 +81,14 @@ jobs:
               @=node_modules/@ \
               solidity-bytes-utils/=node_modules/solidity-bytes-utils/ \
               ../=$(pwd)/contracts/ \
-              lsp25/=packages/LSP25ExecuteRelayCall/
+              lsp1/=packages/LSP1UniversalReceiver/ \
+              lsp2/=packages/LSP2ERC725YJSONSchema/ \
+              lsp25/=packages/LSP25ExecuteRelayCall/ 
           else
             solc contracts/**/*.sol \
               @=node_modules/@ \
               solidity-bytes-utils/=node_modules/solidity-bytes-utils/ \
-              lsp25/=packages/LSP25ExecuteRelayCall/
+              lsp1/=packages/LSP1UniversalReceiver/ \
+              lsp2/=packages/LSP2ERC725YJSONSchema/ \
+              lsp25/=packages/LSP25ExecuteRelayCall/ 
           fi;
diff --git a/contracts/LSP0ERC725Account/LSP0ERC725AccountCore.sol b/contracts/LSP0ERC725Account/LSP0ERC725AccountCore.sol
@@ -18,12 +18,8 @@ import {
     ERC165Checker
 } from "@openzeppelin/contracts/utils/introspection/ERC165Checker.sol";
 import {Address} from "@openzeppelin/contracts/utils/Address.sol";
-import {
-    LSP1Utils
-} from "lsp1/contracts/LSP1Utils.sol";
-import {
-    LSP2Utils
-} from "lsp2/contracts/LSP2Utils.sol";
+import {LSP1Utils} from "lsp1/contracts/LSP1Utils.sol";
+import {LSP2Utils} from "lsp2/contracts/LSP2Utils.sol";
 
 // modules
 import {ERC725YCore} from "@erc725/smart-contracts/contracts/ERC725YCore.sol";

diff --git a/package-lock.json b/package-lock.json
diff --git a/tests/foundry/GasTests/UniversalProfileTestsHelper.sol b/tests/foundry/GasTests/UniversalProfileTestsHelper.sol
@@ -10,16 +10,17 @@ import "../../../contracts/Mocks/Tokens/LSP7Tester.sol";
 import "../../../contracts/Mocks/Tokens/LSP8Tester.sol";
 import {
     _LSP1_UNIVERSAL_RECEIVER_DELEGATE_KEY
-} from "../../../contracts/LSP1UniversalReceiver/LSP1Constants.sol";
+} from "lsp1/contracts/LSP1Constants.sol";
 import {
     _LSP6KEY_ADDRESSPERMISSIONS_PERMISSIONS_PREFIX,
+    _LSP6KEY_ADDRESSPERMISSIONS_ALLOWEDCALLS_PREFIX,
     _PERMISSION_SUPER_SETDATA,
     _PERMISSION_SUPER_CALL,
     _PERMISSION_REENTRANCY,
     _PERMISSION_SUPER_TRANSFERVALUE
 } from "../../../contracts/LSP6KeyManager/LSP6Constants.sol";
 
-import "../../../contracts/LSP6KeyManager/LSP6Utils.sol";
+import {LSP6Utils} from "../../../contracts/LSP6KeyManager/LSP6Utils.sol";
 
 contract UniversalProfileTestsHelper is Test {
     function setURDToUPAndGivePermissions(

diff --git a/tests/foundry/GasTests/execute/RestrictedController.sol b/tests/foundry/GasTests/execute/RestrictedController.sol
@@ -9,7 +9,7 @@ import "../../../../contracts/Mocks/Tokens/LSP7Tester.sol";
 import "../../../../contracts/Mocks/Tokens/LSP8Tester.sol";
 import {
     _LSP1_UNIVERSAL_RECEIVER_DELEGATE_KEY
-} from "../../../../contracts/LSP1UniversalReceiver/LSP1Constants.sol";
+} from "lsp1/contracts/LSP1Constants.sol";
 import {
     _LSP4_TOKEN_TYPE_TOKEN,
     _LSP4_TOKEN_TYPE_NFT

diff --git a/tests/foundry/GasTests/execute/UnrestrictedController.sol b/tests/foundry/GasTests/execute/UnrestrictedController.sol
@@ -9,7 +9,7 @@ import "../../../../contracts/Mocks/Tokens/LSP7Tester.sol";
 import "../../../../contracts/Mocks/Tokens/LSP8Tester.sol";
 import {
     _LSP1_UNIVERSAL_RECEIVER_DELEGATE_KEY
-} from "../../../../contracts/LSP1UniversalReceiver/LSP1Constants.sol";
+} from "lsp1/contracts/LSP1Constants.sol";
 import {
     _LSP4_TOKEN_TYPE_TOKEN,
     _LSP4_TOKEN_TYPE_NFT

diff --git a/tests/foundry/GasTests/setData/RestrictedController.sol b/tests/foundry/GasTests/setData/RestrictedController.sol
@@ -5,6 +5,7 @@ import "../../../../contracts/LSP0ERC725Account/LSP0ERC725Account.sol";
 import "../../../../packages/LSP2ERC725YJSONSchema/contracts/LSP2Utils.sol";
 import {
     _LSP6KEY_ADDRESSPERMISSIONS_PERMISSIONS_PREFIX,
+    _LSP6KEY_ADDRESSPERMISSIONS_AllowedERC725YDataKeys_PREFIX,
     _PERMISSION_SUPER_SETDATA,
     _PERMISSION_SUPER_CALL,
     _PERMISSION_REENTRANCY,

diff --git a/tests/foundry/GasTests/setData/UnrestrictedController.sol b/tests/foundry/GasTests/setData/UnrestrictedController.sol
@@ -5,6 +5,7 @@ import "../../../../contracts/LSP0ERC725Account/LSP0ERC725Account.sol";
 import "../../../../packages/LSP2ERC725YJSONSchema/contracts/LSP2Utils.sol";
 import {
     _LSP6KEY_ADDRESSPERMISSIONS_PERMISSIONS_PREFIX,
+    _LSP6KEY_ADDRESSPERMISSIONS_AllowedERC725YDataKeys_PREFIX,
     _PERMISSION_SUPER_SETDATA,
     _PERMISSION_SUPER_CALL,
     _PERMISSION_REENTRANCY,

diff --git a/tests/foundry/LSP6KeyManager/LSP6SetDataTest.t.sol b/tests/foundry/LSP6KeyManager/LSP6SetDataTest.t.sol
@@ -12,7 +12,7 @@ import {BytesLib} from "solidity-bytes-utils/contracts/BytesLib.sol";
 import {LSP2Utils} from "lsp2/contracts/LSP2Utils.sol";
 import {LSP6Utils} from "../../../contracts/LSP6KeyManager/LSP6Utils.sol";
 
-import "../../../contracts/LSP1UniversalReceiver/LSP1Constants.sol";
+import "lsp1/contracts/LSP1Constants.sol";
 import "../../../contracts/LSP6KeyManager/LSP6Constants.sol";
 import "../../../contracts/LSP17ContractExtension/LSP17Constants.sol";