build!: move LSP3 and Universal Profile in their own package (#879)

lukso-network · Feb 6, 2024 · ad785db · ad785db
1 parent 39daa22
commit ad785db
Show file tree

Hide file tree

Showing 27 changed files with 682 additions and 50 deletions.
diff --git a/.github/workflows/solc_version.yml b/.github/workflows/solc_version.yml
@@ -78,12 +78,13 @@ jobs:
           then
             solc $(ls contracts/**/*.sol | grep -v "Extension4337\|contracts/LSP8IdentifiableDigitalAsset/LSP8IdentifiableDigitalAsset") \
               --allow-paths $(pwd)/node_modules/,$(pwd)/packages/ \
+              ../=$(pwd)/contracts/ \
               @=node_modules/@ \
               solidity-bytes-utils/=node_modules/solidity-bytes-utils/ \
-              ../=$(pwd)/contracts/ \
               lsp0/=packages/LSP0ERC725Account/ \
               lsp1/=packages/LSP1UniversalReceiver/ \
               lsp2/=packages/LSP2ERC725YJSONSchema/ \
+              lsp3/=packages/LSP3ProfileMetadata/ \
               lsp4/=packages/LSP4DigitalAssetMetadata/ \
               lsp5/=packages/LSP5ReceivedAssets/ \
               lsp6/=packages/LSP6KeyManager/ \
@@ -92,16 +93,19 @@ jobs:
               lsp10/=packages/LSP10ReceivedVaults/ \
               lsp14/=packages/LSP14Ownable2Step/ \
               lsp16/=packages/LSP16UniversalFactory/ \
+              lsp17/=packages/LSP17Extensions/ \
               lsp17contractextension/=packages/LSP17ContractExtension/ \
               lsp20/=packages/LSP20CallVerification/ \
-              lsp25/=packages/LSP25ExecuteRelayCall/
+              lsp25/=packages/LSP25ExecuteRelayCall/ \
+              universalprofile/=packages/UniversalProfile/
           else
             solc contracts/**/*.sol \
               @=node_modules/@ \
               solidity-bytes-utils/=node_modules/solidity-bytes-utils/ \
               lsp0/=packages/LSP0ERC725Account/ \
               lsp1/=packages/LSP1UniversalReceiver/ \
               lsp2/=packages/LSP2ERC725YJSONSchema/ \
+              lsp3/=packages/LSP3ProfileMetadata/ \
               lsp4/=packages/LSP4DigitalAssetMetadata/ \
               lsp5/=packages/LSP5ReceivedAssets/ \
               lsp6/=packages/LSP6KeyManager/ \
@@ -110,7 +114,9 @@ jobs:
               lsp10/=packages/LSP10ReceivedVaults/ \
               lsp14/=packages/LSP14Ownable2Step/ \
               lsp16/=packages/LSP16UniversalFactory/ \
+              lsp17/=packages/LSP17Extensions/ \
               lsp17contractextension/=packages/LSP17ContractExtension/ \
               lsp20/=packages/LSP20CallVerification/ \
-              lsp25/=packages/LSP25ExecuteRelayCall/
+              lsp25/=packages/LSP25ExecuteRelayCall/ \
+              universalprofile/=packages/UniversalProfile/
           fi;
diff --git a/contracts/LSP23LinkedContractsFactory/modules/UniversalProfileInitPostDeploymentModule.sol b/contracts/LSP23LinkedContractsFactory/modules/UniversalProfileInitPostDeploymentModule.sol
@@ -5,7 +5,9 @@ import {
     OPERATION_4_DELEGATECALL
 } from "@erc725/smart-contracts/contracts/constants.sol";
 
-import {UniversalProfileInit} from "../../UniversalProfileInit.sol";
+import {
+    UniversalProfileInit
+} from "universalprofile/contracts/UniversalProfileInit.sol";
 
 contract UniversalProfileInitPostDeploymentModule is UniversalProfileInit {
     constructor() {

diff --git a/contracts/LSP23LinkedContractsFactory/modules/UniversalProfilePostDeploymentModule.sol b/contracts/LSP23LinkedContractsFactory/modules/UniversalProfilePostDeploymentModule.sol
@@ -5,7 +5,9 @@ import {
     OPERATION_4_DELEGATECALL
 } from "@erc725/smart-contracts/contracts/constants.sol";
 
-import {UniversalProfile} from "../../UniversalProfile.sol";
+import {
+    UniversalProfile
+} from "universalprofile/contracts/UniversalProfile.sol";
 
 contract UniversalProfilePostDeploymentModule is UniversalProfile {
     constructor() UniversalProfile(address(0)) {}

diff --git a/contracts/Mocks/Executor.sol b/contracts/Mocks/Executor.sol
@@ -11,7 +11,9 @@ import {
 import {ILSP6KeyManager} from "lsp6/contracts/ILSP6KeyManager.sol";
 
 // modules
-import {UniversalProfile} from "../UniversalProfile.sol";
+import {
+    UniversalProfile
+} from "universalprofile/contracts/UniversalProfile.sol";
 import {LSP6KeyManager} from "lsp6/contracts/LSP6KeyManager.sol";
 
 // constants

diff --git a/contracts/Mocks/ExecutorLSP20.sol b/contracts/Mocks/ExecutorLSP20.sol
@@ -10,7 +10,9 @@ import {
 } from "@erc725/smart-contracts/contracts/interfaces/IERC725Y.sol";
 
 // modules
-import {UniversalProfile} from "../UniversalProfile.sol";
+import {
+    UniversalProfile
+} from "universalprofile/contracts/UniversalProfile.sol";
 
 // constants
 import {

diff --git a/docs/contracts/UniversalProfile.md → ...rsalprofile/contracts/UniversalProfile.md b/docs/contracts/UniversalProfile.md → ...rsalprofile/contracts/UniversalProfile.md
diff --git a/dodoc/config.ts b/dodoc/config.ts
@@ -4,7 +4,7 @@ import { HelperContent } from 'squirrelly/dist/types/containers';
 export const dodocConfig = {
   runOnCompile: false,
   include: [
-    'contracts/UniversalProfile.sol',
+    'universalprofile/contracts/UniversalProfile.sol',
     'lsp0/contracts/LSP0ERC725Account.sol',
     'contracts/LSP1UniversalReceiver/LSP1UniversalReceiverDelegateUP/LSP1UniversalReceiverDelegateUP.sol',
     'contracts/LSP1UniversalReceiver/LSP1UniversalReceiverDelegateVault/LSP1UniversalReceiverDelegateVault.sol',