build!: move LSP8 in its own package

lukso-network · Feb 5, 2024 · 2626f19 · 2626f19
1 parent dd514a4
commit 2626f19
Show file tree

Hide file tree

Showing 42 changed files with 707 additions and 425 deletions.
diff --git a/.github/workflows/solc_version.yml b/.github/workflows/solc_version.yml
@@ -88,6 +88,7 @@ jobs:
               lsp5/=packages/LSP5ReceivedAssets/ \
               lsp6/=packages/LSP6KeyManager/ \
               lsp7/=packages/LSP7DigitalAsset/ \
+              lsp8/=packages/LSP8IdentifiableDigitalAsset/ \
               lsp10/=packages/LSP10ReceivedVaults/ \
               lsp14/=packages/LSP14Ownable2Step/ \
               lsp17contractextension/=packages/LSP17ContractExtension/ \
@@ -104,6 +105,7 @@ jobs:
               lsp5/=packages/LSP5ReceivedAssets/ \
               lsp6/=packages/LSP6KeyManager/ \
               lsp7/=packages/LSP7DigitalAsset/ \
+              lsp8/=packages/LSP8IdentifiableDigitalAsset/ \
               lsp10/=packages/LSP10ReceivedVaults/ \
               lsp14/=packages/LSP14Ownable2Step/ \
               lsp17contractextension/=packages/LSP17ContractExtension/ \

diff --git a/...LSP1UniversalReceiver/LSP1UniversalReceiverDelegateUP/LSP1UniversalReceiverDelegateUP.sol b/...LSP1UniversalReceiver/LSP1UniversalReceiverDelegateUP/LSP1UniversalReceiverDelegateUP.sol
@@ -32,7 +32,7 @@ import {
     _TYPEID_LSP8_TOKENSSENDER,
     _TYPEID_LSP8_TOKENSRECIPIENT,
     _INTERFACEID_LSP8
-} from "../../LSP8IdentifiableDigitalAsset/LSP8Constants.sol";
+} from "lsp8/contracts/LSP8Constants.sol";
 import {
     _TYPEID_LSP9_OwnershipTransferred_SenderNotification,
     _TYPEID_LSP9_OwnershipTransferred_RecipientNotification

diff --git a/...iversalReceiver/LSP1UniversalReceiverDelegateVault/LSP1UniversalReceiverDelegateVault.sol b/...iversalReceiver/LSP1UniversalReceiverDelegateVault/LSP1UniversalReceiverDelegateVault.sol
@@ -28,7 +28,7 @@ import {
     _TYPEID_LSP8_TOKENSSENDER,
     _TYPEID_LSP8_TOKENSRECIPIENT,
     _INTERFACEID_LSP8
-} from "../../LSP8IdentifiableDigitalAsset/LSP8Constants.sol";
+} from "lsp8/contracts/LSP8Constants.sol";
 
 // errors
 import {CannotRegisterEOAsAsAssets} from "../LSP1Errors.sol";

diff --git a/contracts/Mocks/ERC165Interfaces.sol b/contracts/Mocks/ERC165Interfaces.sol
@@ -41,7 +41,7 @@ import {ILSP6KeyManager as ILSP6} from "lsp6/contracts/ILSP6KeyManager.sol";
 import {ILSP7DigitalAsset as ILSP7} from "lsp7/contracts/ILSP7DigitalAsset.sol";
 import {
     ILSP8IdentifiableDigitalAsset as ILSP8
-} from "../LSP8IdentifiableDigitalAsset/ILSP8IdentifiableDigitalAsset.sol";
+} from "lsp8/contracts/ILSP8IdentifiableDigitalAsset.sol";
 
 import {ILSP9Vault as ILSP9} from "../LSP9Vault/ILSP9Vault.sol";
 import {
@@ -65,9 +65,7 @@ import {
 } from "lsp1/contracts/LSP1Constants.sol";
 import {_INTERFACEID_LSP6} from "lsp6/contracts/LSP6Constants.sol";
 import {_INTERFACEID_LSP7} from "lsp7/contracts/LSP7Constants.sol";
-import {
-    _INTERFACEID_LSP8
-} from "../LSP8IdentifiableDigitalAsset/LSP8Constants.sol";
+import {_INTERFACEID_LSP8} from "lsp8/contracts/LSP8Constants.sol";
 import {_INTERFACEID_LSP9} from "../LSP9Vault/LSP9Constants.sol";
 import {
     _INTERFACEID_LSP11

diff --git a/contracts/Mocks/LSP1TypeIDsTester.sol b/contracts/Mocks/LSP1TypeIDsTester.sol
@@ -16,7 +16,7 @@ import {
     _TYPEID_LSP8_TOKENSSENDER,
     _TYPEID_LSP8_TOKENSRECIPIENT,
     _TYPEID_LSP8_TOKENOPERATOR
-} from "../LSP8IdentifiableDigitalAsset/LSP8Constants.sol";
+} from "lsp8/contracts/LSP8Constants.sol";
 import {
     _TYPEID_LSP9_VALUE_RECEIVED,
     _TYPEID_LSP9_OwnershipTransferStarted,

diff --git a/contracts/Mocks/Tokens/LSP8BurnableInitTester.sol b/contracts/Mocks/Tokens/LSP8BurnableInitTester.sol
@@ -5,10 +5,10 @@ pragma solidity ^0.8.4;
 // modules
 import {
     LSP8IdentifiableDigitalAssetInitAbstract
-} from "../../LSP8IdentifiableDigitalAsset/LSP8IdentifiableDigitalAssetInitAbstract.sol";
+} from "lsp8/contracts/LSP8IdentifiableDigitalAssetInitAbstract.sol";
 import {
     LSP8BurnableInitAbstract
-} from "../../LSP8IdentifiableDigitalAsset/extensions/LSP8BurnableInitAbstract.sol";
+} from "lsp8/contracts/extensions/LSP8BurnableInitAbstract.sol";
 
 contract LSP8BurnableInitTester is LSP8BurnableInitAbstract {
     function initialize(

diff --git a/contracts/Mocks/Tokens/LSP8BurnableTester.sol b/contracts/Mocks/Tokens/LSP8BurnableTester.sol
@@ -5,10 +5,8 @@ pragma solidity ^0.8.4;
 // modules
 import {
     LSP8IdentifiableDigitalAsset
-} from "../../LSP8IdentifiableDigitalAsset/LSP8IdentifiableDigitalAsset.sol";
-import {
-    LSP8Burnable
-} from "../../LSP8IdentifiableDigitalAsset/extensions/LSP8Burnable.sol";
+} from "lsp8/contracts/LSP8IdentifiableDigitalAsset.sol";
+import {LSP8Burnable} from "lsp8/contracts/extensions/LSP8Burnable.sol";
 
 contract LSP8BurnableTester is LSP8Burnable {
     constructor(

diff --git a/contracts/Mocks/Tokens/LSP8CappedSupplyInitTester.sol b/contracts/Mocks/Tokens/LSP8CappedSupplyInitTester.sol
@@ -5,10 +5,10 @@ pragma solidity ^0.8.4;
 // modules
 import {
     LSP8IdentifiableDigitalAssetInitAbstract
-} from "../../LSP8IdentifiableDigitalAsset/LSP8IdentifiableDigitalAssetInitAbstract.sol";
+} from "lsp8/contracts/LSP8IdentifiableDigitalAssetInitAbstract.sol";
 import {
     LSP8CappedSupplyInitAbstract
-} from "../../LSP8IdentifiableDigitalAsset/extensions/LSP8CappedSupplyInitAbstract.sol";
+} from "lsp8/contracts/extensions/LSP8CappedSupplyInitAbstract.sol";
 
 contract LSP8CappedSupplyInitTester is LSP8CappedSupplyInitAbstract {
     function initialize(

diff --git a/contracts/Mocks/Tokens/LSP8CappedSupplyTester.sol b/contracts/Mocks/Tokens/LSP8CappedSupplyTester.sol
@@ -5,10 +5,8 @@ pragma solidity ^0.8.4;
 // modules
 import {
     LSP8IdentifiableDigitalAsset
-} from "../../LSP8IdentifiableDigitalAsset/LSP8IdentifiableDigitalAsset.sol";
-import {
-    LSP8CappedSupply
-} from "../../LSP8IdentifiableDigitalAsset/extensions/LSP8CappedSupply.sol";
+} from "lsp8/contracts/LSP8IdentifiableDigitalAsset.sol";
+import {LSP8CappedSupply} from "lsp8/contracts/extensions/LSP8CappedSupply.sol";
 
 contract LSP8CappedSupplyTester is LSP8CappedSupply {
     constructor(

diff --git a/contracts/Mocks/Tokens/LSP8EnumerableInitTester.sol b/contracts/Mocks/Tokens/LSP8EnumerableInitTester.sol
@@ -5,10 +5,10 @@ pragma solidity ^0.8.4;
 // modules
 import {
     LSP8IdentifiableDigitalAssetInitAbstract
-} from "../../LSP8IdentifiableDigitalAsset/LSP8IdentifiableDigitalAssetInitAbstract.sol";
+} from "lsp8/contracts/LSP8IdentifiableDigitalAssetInitAbstract.sol";
 import {
     LSP8EnumerableInitAbstract
-} from "../../LSP8IdentifiableDigitalAsset/extensions/LSP8EnumerableInitAbstract.sol";
+} from "lsp8/contracts/extensions/LSP8EnumerableInitAbstract.sol";
 
 contract LSP8EnumerableInitTester is LSP8EnumerableInitAbstract {
     function initialize(

diff --git a/contracts/Mocks/Tokens/LSP8EnumerableTester.sol b/contracts/Mocks/Tokens/LSP8EnumerableTester.sol
@@ -5,10 +5,8 @@ pragma solidity ^0.8.4;
 // modules
 import {
     LSP8IdentifiableDigitalAsset
-} from "../../LSP8IdentifiableDigitalAsset/LSP8IdentifiableDigitalAsset.sol";
-import {
-    LSP8Enumerable
-} from "../../LSP8IdentifiableDigitalAsset/extensions/LSP8Enumerable.sol";
+} from "lsp8/contracts/LSP8IdentifiableDigitalAsset.sol";
+import {LSP8Enumerable} from "lsp8/contracts/extensions/LSP8Enumerable.sol";
 
 contract LSP8EnumerableTester is LSP8Enumerable {
     constructor(

diff --git a/contracts/Mocks/Tokens/LSP8InitTester.sol b/contracts/Mocks/Tokens/LSP8InitTester.sol
@@ -5,10 +5,10 @@ pragma solidity ^0.8.4;
 // modules
 import {
     LSP8IdentifiableDigitalAssetInitAbstract
-} from "../../LSP8IdentifiableDigitalAsset/LSP8IdentifiableDigitalAssetInitAbstract.sol";
+} from "lsp8/contracts/LSP8IdentifiableDigitalAssetInitAbstract.sol";
 import {
     LSP8BurnableInitAbstract
-} from "../../LSP8IdentifiableDigitalAsset/extensions/LSP8BurnableInitAbstract.sol";
+} from "lsp8/contracts/extensions/LSP8BurnableInitAbstract.sol";
 
 contract LSP8InitTester is
     LSP8IdentifiableDigitalAssetInitAbstract,

diff --git a/contracts/Mocks/Tokens/LSP8Tester.sol b/contracts/Mocks/Tokens/LSP8Tester.sol
@@ -5,10 +5,8 @@ pragma solidity ^0.8.4;
 // modules
 import {
     LSP8IdentifiableDigitalAsset
-} from "../../LSP8IdentifiableDigitalAsset/LSP8IdentifiableDigitalAsset.sol";
-import {
-    LSP8Burnable
-} from "../../LSP8IdentifiableDigitalAsset/extensions/LSP8Burnable.sol";
+} from "lsp8/contracts/LSP8IdentifiableDigitalAsset.sol";
+import {LSP8Burnable} from "lsp8/contracts/extensions/LSP8Burnable.sol";
 
 contract LSP8Tester is LSP8IdentifiableDigitalAsset, LSP8Burnable {
     constructor(

diff --git a/contracts/Mocks/Tokens/LSP8TransferOwnerChange.sol b/contracts/Mocks/Tokens/LSP8TransferOwnerChange.sol
@@ -5,10 +5,8 @@ pragma solidity ^0.8.4;
 // modules
 import {
     LSP8IdentifiableDigitalAsset
-} from "../../LSP8IdentifiableDigitalAsset/LSP8IdentifiableDigitalAsset.sol";
-import {
-    LSP8Burnable
-} from "../../LSP8IdentifiableDigitalAsset/extensions/LSP8Burnable.sol";
+} from "lsp8/contracts/LSP8IdentifiableDigitalAsset.sol";
+import {LSP8Burnable} from "lsp8/contracts/extensions/LSP8Burnable.sol";
 
 contract LSP8TransferOwnerChange is LSP8IdentifiableDigitalAsset, LSP8Burnable {
     // solhint-disable-next-line no-empty-blocks

diff --git a/contracts/Mocks/UniversalReceivers/UniversalReceiverDelegateTokenReentrant.sol b/contracts/Mocks/UniversalReceivers/UniversalReceiverDelegateTokenReentrant.sol
@@ -20,9 +20,7 @@ import {
 // constants
 import {_TYPEID_LSP7_TOKENSRECIPIENT} from "lsp7/contracts/LSP7Constants.sol";
 
-import {
-    _TYPEID_LSP8_TOKENSRECIPIENT
-} from "../../LSP8IdentifiableDigitalAsset/LSP8Constants.sol";
+import {_TYPEID_LSP8_TOKENSRECIPIENT} from "lsp8/contracts/LSP8Constants.sol";
 
 import {_INTERFACEID_LSP1_DELEGATE} from "lsp1/contracts/LSP1Constants.sol";