build: add lsp2 package dependency in root

lukso-network · Jan 19, 2024 · 478d4f0 · 478d4f0
1 parent 7bc0d13
commit 478d4f0
Show file tree

Hide file tree

Showing 19 changed files with 95 additions and 40 deletions.
diff --git a/contracts/LSP0ERC725Account/LSP0ERC725AccountCore.sol b/contracts/LSP0ERC725Account/LSP0ERC725AccountCore.sol
@@ -19,9 +19,7 @@ import {
 } from "@openzeppelin/contracts/utils/introspection/ERC165Checker.sol";
 import {Address} from "@openzeppelin/contracts/utils/Address.sol";
 import {LSP1Utils} from "../LSP1UniversalReceiver/LSP1Utils.sol";
-import {
-    LSP2Utils
-} from "../../packages/LSP2ERC725YJSONSchema/contracts/LSP2Utils.sol";
+import {LSP2Utils} from "lsp2/contracts/LSP2Utils.sol";
 
 // modules
 import {ERC725YCore} from "@erc725/smart-contracts/contracts/ERC725YCore.sol";

diff --git a/contracts/LSP10ReceivedVaults/LSP10Utils.sol b/contracts/LSP10ReceivedVaults/LSP10Utils.sol
@@ -7,9 +7,7 @@ import {
 } from "@erc725/smart-contracts/contracts/interfaces/IERC725Y.sol";
 
 // libraries
-import {
-    LSP2Utils
-} from "../../packages/LSP2ERC725YJSONSchema/contracts/LSP2Utils.sol";
+import {LSP2Utils} from "lsp2/contracts/LSP2Utils.sol";
 
 // constants
 import {_INTERFACEID_LSP9} from "../LSP9Vault/LSP9Constants.sol";

diff --git a/contracts/LSP1UniversalReceiver/LSP1Utils.sol b/contracts/LSP1UniversalReceiver/LSP1Utils.sol
@@ -5,9 +5,7 @@ pragma solidity ^0.8.4;
 import {
     ERC165Checker
 } from "@openzeppelin/contracts/utils/introspection/ERC165Checker.sol";
-import {
-    LSP2Utils
-} from "../../packages/LSP2ERC725YJSONSchema/contracts/LSP2Utils.sol";
+import {LSP2Utils} from "lsp2/contracts/LSP2Utils.sol";
 
 // constants
 import {ILSP1UniversalReceiver as ILSP1} from "./ILSP1UniversalReceiver.sol";

diff --git a/contracts/LSP6KeyManager/LSP6Utils.sol b/contracts/LSP6KeyManager/LSP6Utils.sol
@@ -8,9 +8,7 @@ import {
 import {ILSP6KeyManager} from "./ILSP6KeyManager.sol";
 
 // libraries
-import {
-    LSP2Utils
-} from "../../packages/LSP2ERC725YJSONSchema/contracts/LSP2Utils.sol";
+import {LSP2Utils} from "lsp2/contracts/LSP2Utils.sol";
 
 // constants
 import {

diff --git a/contracts/LSP7DigitalAsset/LSP7DigitalAsset.sol b/contracts/LSP7DigitalAsset/LSP7DigitalAsset.sol
@@ -13,9 +13,7 @@ import {LSP7DigitalAssetCore} from "./LSP7DigitalAssetCore.sol";
 import {LSP17Extendable} from "../LSP17ContractExtension/LSP17Extendable.sol";
 
 // libraries
-import {
-    LSP2Utils
-} from "../../packages/LSP2ERC725YJSONSchema/contracts/LSP2Utils.sol";
+import {LSP2Utils} from "lsp2/contracts/LSP2Utils.sol";
 
 // constants
 import {_INTERFACEID_LSP7} from "./LSP7Constants.sol";

diff --git a/contracts/LSP7DigitalAsset/LSP7DigitalAssetInitAbstract.sol b/contracts/LSP7DigitalAsset/LSP7DigitalAssetInitAbstract.sol
@@ -14,9 +14,7 @@ import {LSP7DigitalAssetCore} from "./LSP7DigitalAssetCore.sol";
 import {LSP17Extendable} from "../LSP17ContractExtension/LSP17Extendable.sol";
 
 // libraries
-import {
-    LSP2Utils
-} from "../../packages/LSP2ERC725YJSONSchema/contracts/LSP2Utils.sol";
+import {LSP2Utils} from "lsp2/contracts/LSP2Utils.sol";
 
 // constants
 import {_INTERFACEID_LSP7} from "./LSP7Constants.sol";

diff --git a/contracts/LSP8IdentifiableDigitalAsset/LSP8IdentifiableDigitalAsset.sol b/contracts/LSP8IdentifiableDigitalAsset/LSP8IdentifiableDigitalAsset.sol
@@ -20,9 +20,7 @@ import {
 import {LSP17Extendable} from "../LSP17ContractExtension/LSP17Extendable.sol";
 
 // libraries
-import {
-    LSP2Utils
-} from "../../packages/LSP2ERC725YJSONSchema/contracts/LSP2Utils.sol";
+import {LSP2Utils} from "lsp2/contracts/LSP2Utils.sol";
 
 // constants
 import {_INTERFACEID_LSP8, _LSP8_TOKENID_FORMAT_KEY} from "./LSP8Constants.sol";

diff --git a/contracts/LSP8IdentifiableDigitalAsset/LSP8IdentifiableDigitalAssetInitAbstract.sol b/contracts/LSP8IdentifiableDigitalAsset/LSP8IdentifiableDigitalAssetInitAbstract.sol
@@ -20,9 +20,7 @@ import {
 import {LSP17Extendable} from "../LSP17ContractExtension/LSP17Extendable.sol";
 
 // libraries
-import {
-    LSP2Utils
-} from "../../packages/LSP2ERC725YJSONSchema/contracts/LSP2Utils.sol";
+import {LSP2Utils} from "lsp2/contracts/LSP2Utils.sol";
 
 // constants
 import {_INTERFACEID_LSP8, _LSP8_TOKENID_FORMAT_KEY} from "./LSP8Constants.sol";

diff --git a/contracts/LSP9Vault/LSP9VaultCore.sol b/contracts/LSP9Vault/LSP9VaultCore.sol
@@ -16,9 +16,7 @@ import {
     ERC165Checker
 } from "@openzeppelin/contracts/utils/introspection/ERC165Checker.sol";
 import {LSP1Utils} from "../LSP1UniversalReceiver/LSP1Utils.sol";
-import {
-    LSP2Utils
-} from "../../packages/LSP2ERC725YJSONSchema/contracts/LSP2Utils.sol";
+import {LSP2Utils} from "lsp2/contracts/LSP2Utils.sol";
 
 // modules
 import {ERC725XCore} from "@erc725/smart-contracts/contracts/ERC725XCore.sol";

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -112,7 +112,9 @@
     "@erc725/smart-contracts": "^7.0.0",
     "@openzeppelin/contracts": "^4.9.2",
     "@openzeppelin/contracts-upgradeable": "^4.9.2",
-    "solidity-bytes-utils": "0.8.0"
+    "solidity-bytes-utils": "0.8.0",
+    "lsp2": "*",
+    "lsp5": "*"
   },
   "devDependencies": {
     "@b00ste/hardhat-dodoc": "^0.3.15",

diff --git a/tests/foundry/GasTests/UniversalProfileTestsHelper.sol b/tests/foundry/GasTests/UniversalProfileTestsHelper.sol
@@ -5,7 +5,7 @@ import "forge-std/Test.sol";
 
 import "../../../contracts/LSP0ERC725Account/LSP0ERC725Account.sol";
 import "../../../contracts/LSP1UniversalReceiver/LSP1UniversalReceiverDelegateUP/LSP1UniversalReceiverDelegateUP.sol";
-import "../../../packages/LSP2ERC725YJSONSchema/contracts/LSP2Utils.sol";
+import "lsp2/contracts/LSP2Utils.sol";
 import "../../../contracts/Mocks/Tokens/LSP7Tester.sol";
 import "../../../contracts/Mocks/Tokens/LSP8Tester.sol";
 import {

diff --git a/tests/foundry/GasTests/execute/RestrictedController.sol b/tests/foundry/GasTests/execute/RestrictedController.sol
@@ -4,7 +4,7 @@ pragma solidity ^0.8.13;
 import "../LSP6s/LSP6ExecuteRC.sol";
 import "../../../../contracts/LSP0ERC725Account/LSP0ERC725Account.sol";
 import "../../../../contracts/LSP1UniversalReceiver/LSP1UniversalReceiverDelegateUP/LSP1UniversalReceiverDelegateUP.sol";
-import "../../../../packages/LSP2ERC725YJSONSchema/contracts/LSP2Utils.sol";
+import "lsp2/contracts/contracts/LSP2Utils.sol";
 import "../../../../contracts/Mocks/Tokens/LSP7Tester.sol";
 import "../../../../contracts/Mocks/Tokens/LSP8Tester.sol";
 import {

diff --git a/tests/foundry/GasTests/execute/UnrestrictedController.sol b/tests/foundry/GasTests/execute/UnrestrictedController.sol
@@ -4,7 +4,7 @@ pragma solidity ^0.8.13;
 import "../LSP6s/LSP6ExecuteUC.sol";
 import "../../../../contracts/LSP0ERC725Account/LSP0ERC725Account.sol";
 import "../../../../contracts/LSP1UniversalReceiver/LSP1UniversalReceiverDelegateUP/LSP1UniversalReceiverDelegateUP.sol";
-import "../../../../packages/LSP2ERC725YJSONSchema/contracts/LSP2Utils.sol";
+import "lsp2/contracts/LSP2Utils.sol";
 import "../../../../contracts/Mocks/Tokens/LSP7Tester.sol";
 import "../../../../contracts/Mocks/Tokens/LSP8Tester.sol";
 import {

diff --git a/tests/foundry/GasTests/setData/RestrictedController.sol b/tests/foundry/GasTests/setData/RestrictedController.sol
@@ -2,7 +2,7 @@ pragma solidity ^0.8.13;
 
 import "../LSP6s/LSP6SetDataRC.sol";
 import "../../../../contracts/LSP0ERC725Account/LSP0ERC725Account.sol";
-import "../../../../packages/LSP2ERC725YJSONSchema/contracts/LSP2Utils.sol";
+import "lsp2/contracts/LSP2Utils.sol";
 import {
     _LSP6KEY_ADDRESSPERMISSIONS_PERMISSIONS_PREFIX,
     _PERMISSION_SUPER_SETDATA,

diff --git a/tests/foundry/GasTests/setData/UnrestrictedController.sol b/tests/foundry/GasTests/setData/UnrestrictedController.sol
@@ -2,7 +2,7 @@ pragma solidity ^0.8.13;
 
 import "../LSP6s/LSP6SetDataUC.sol";
 import "../../../../contracts/LSP0ERC725Account/LSP0ERC725Account.sol";
-import "../../../../packages/LSP2ERC725YJSONSchema/contracts/LSP2Utils.sol";
+import "lsp2/contracts/LSP2Utils.sol";
 import {
     _LSP6KEY_ADDRESSPERMISSIONS_PERMISSIONS_PREFIX,
     _PERMISSION_SUPER_SETDATA,

diff --git a/tests/foundry/LSP6KeyManager/LSP6AllowedCallsTest.t.sol b/tests/foundry/LSP6KeyManager/LSP6AllowedCallsTest.t.sol
@@ -3,9 +3,7 @@ pragma solidity ^0.8.4;
 
 // libraries
 import "forge-std/Test.sol";
-import {
-    LSP2Utils
-} from "../../../packages/LSP2ERC725YJSONSchema/contracts/LSP2Utils.sol";
+import {LSP2Utils} from "lsp2/contracts/LSP2Utils.sol";
 
 // modules
 import {UniversalProfile} from "../../../contracts/UniversalProfile.sol";

diff --git a/tests/foundry/LSP6KeyManager/LSP6RestrictedController.t.sol b/tests/foundry/LSP6KeyManager/LSP6RestrictedController.t.sol
@@ -2,7 +2,7 @@ pragma solidity ^0.8.13;
 
 import "../../../contracts/LSP6KeyManager/LSP6KeyManager.sol";
 import "../../../contracts/LSP0ERC725Account/LSP0ERC725Account.sol";
-import "../../../packages/LSP2ERC725YJSONSchema/contracts/LSP2Utils.sol";
+import "lsp2/contracts/LSP2Utils.sol";
 import "../../../contracts/LSP6KeyManager/LSP6Constants.sol";
 import "../GasTests/UniversalProfileTestsHelper.sol";
 

diff --git a/tests/foundry/LSP6KeyManager/LSP6SetDataTest.t.sol b/tests/foundry/LSP6KeyManager/LSP6SetDataTest.t.sol
@@ -9,9 +9,7 @@ import "../../../contracts/LSP14Ownable2Step/ILSP14Ownable2Step.sol";
 import "@erc725/smart-contracts/contracts/interfaces/IERC725Y.sol";
 
 import {BytesLib} from "solidity-bytes-utils/contracts/BytesLib.sol";
-import {
-    LSP2Utils
-} from "../../../packages/LSP2ERC725YJSONSchema/contracts/LSP2Utils.sol";
+import {LSP2Utils} from "lsp2/contracts/LSP2Utils.sol";
 import {LSP6Utils} from "../../../contracts/LSP6KeyManager/LSP6Utils.sol";
 
 import "../../../contracts/LSP1UniversalReceiver/LSP1Constants.sol";