Merge branch 'lsp-monorepo' of https://github.com/lukso-network/lsp-s…

…mart-contracts into package/lsp17
lukso-network · Feb 5, 2024 · 8edb6af · 8edb6af
2 parents 7faa42c + dd514a4
commit 8edb6af
Show file tree

Hide file tree

Showing 55 changed files with 483 additions and 2,158 deletions.
diff --git a/.github/workflows/solc_version.yml b/.github/workflows/solc_version.yml
@@ -87,6 +87,7 @@ jobs:
               lsp4/=packages/LSP4DigitalAssetMetadata/ \
               lsp5/=packages/LSP5ReceivedAssets/ \
               lsp6/=packages/LSP6KeyManager/ \
+              lsp7/=packages/LSP7DigitalAsset/ \
               lsp10/=packages/LSP10ReceivedVaults/ \
               lsp14/=packages/LSP14Ownable2Step/ \
               lsp17contractextension/=packages/LSP17ContractExtension/ \
@@ -102,6 +103,7 @@ jobs:
               lsp4/=packages/LSP4DigitalAssetMetadata/ \
               lsp5/=packages/LSP5ReceivedAssets/ \
               lsp6/=packages/LSP6KeyManager/ \
+              lsp7/=packages/LSP7DigitalAsset/ \
               lsp10/=packages/LSP10ReceivedVaults/ \
               lsp14/=packages/LSP14Ownable2Step/ \
               lsp17contractextension/=packages/LSP17ContractExtension/ \

diff --git a/.mythx.yml b/.mythx.yml
@@ -26,10 +26,10 @@ analyze:
     - contracts/LSP6KeyManager/LSP6KeyManager.sol
     # - Tokens & NFTs
     - lsp4/contracts/LSP4DigitalAssetMetadata.sol
-    - contracts/LSP7DigitalAsset/LSP7DigitalAsset.sol
-    - contracts/LSP7DigitalAsset/presets/LSP7Mintable.sol
-    - contracts/LSP7DigitalAsset/extensions/LSP7Burnable.sol
-    - contracts/LSP7DigitalAsset/extensions/LSP7CappedSupply.sol
+    - lsp7/contracts/LSP7DigitalAsset.sol
+    - lsp7/contracts/presets/LSP7Mintable.sol
+    - lsp7/contracts/extensions/LSP7Burnable.sol
+    - lsp7/contracts/extensions/LSP7CappedSupply.sol
     - contracts/LSP8IdentifiableDigitalAsset/presets/LSP8Mintable.sol
     - contracts/LSP8IdentifiableDigitalAsset/LSP8IdentifiableDigitalAsset.sol
     - contracts/LSP8IdentifiableDigitalAsset/extensions/LSP8Burnable.sol
@@ -46,8 +46,8 @@ analyze:
     - lsp4/contracts/LSP4DigitalAssetMetadataInitAbstract.sol
     - contracts/LSP6KeyManager/LSP6KeyManagerInit.sol
     # - Tokens & NFTs
-    - contracts/LSP7DigitalAsset/LSP7DigitalAssetInitAbstract.sol
-    - contracts/LSP7DigitalAsset/presets/LSP7MintableInit.sol
+    - lsp7/contracts/LSP7DigitalAssetInitAbstract.sol
+    - lsp7/contracts/presets/LSP7MintableInit.sol
     - contracts/LSP8IdentifiableDigitalAsset/LSP8IdentifiableDigitalAssetInitAbstract.sol
     - contracts/LSP8IdentifiableDigitalAsset/presets/LSP8MintableInit.sol
     - contracts/LSP8IdentifiableDigitalAsset/extensions/LSP8CappedSupplyInitAbstract.sol

diff --git a/...LSP1UniversalReceiver/LSP1UniversalReceiverDelegateUP/LSP1UniversalReceiverDelegateUP.sol b/...LSP1UniversalReceiver/LSP1UniversalReceiverDelegateUP/LSP1UniversalReceiverDelegateUP.sol
@@ -8,7 +8,7 @@ import {
 import {
     ILSP1UniversalReceiverDelegate
 } from "lsp1/contracts/ILSP1UniversalReceiverDelegate.sol";
-import {ILSP7DigitalAsset} from "../../LSP7DigitalAsset/ILSP7DigitalAsset.sol";
+import {ILSP7DigitalAsset} from "lsp7/contracts/ILSP7DigitalAsset.sol";
 
 // modules
 import {ERC165} from "@openzeppelin/contracts/utils/introspection/ERC165.sol";
@@ -27,7 +27,7 @@ import {
     _TYPEID_LSP7_TOKENSSENDER,
     _TYPEID_LSP7_TOKENSRECIPIENT,
     _INTERFACEID_LSP7
-} from "../../LSP7DigitalAsset/LSP7Constants.sol";
+} from "lsp7/contracts/LSP7Constants.sol";
 import {
     _TYPEID_LSP8_TOKENSSENDER,
     _TYPEID_LSP8_TOKENSRECIPIENT,

diff --git a/...iversalReceiver/LSP1UniversalReceiverDelegateVault/LSP1UniversalReceiverDelegateVault.sol b/...iversalReceiver/LSP1UniversalReceiverDelegateVault/LSP1UniversalReceiverDelegateVault.sol
@@ -8,7 +8,7 @@ import {
 import {
     ILSP1UniversalReceiverDelegate
 } from "lsp1/contracts/ILSP1UniversalReceiverDelegate.sol";
-import {ILSP7DigitalAsset} from "../../LSP7DigitalAsset/ILSP7DigitalAsset.sol";
+import {ILSP7DigitalAsset} from "lsp7/contracts/ILSP7DigitalAsset.sol";
 
 // modules
 import {ERC165} from "@openzeppelin/contracts/utils/introspection/ERC165.sol";
@@ -23,7 +23,7 @@ import {
     _TYPEID_LSP7_TOKENSSENDER,
     _TYPEID_LSP7_TOKENSRECIPIENT,
     _INTERFACEID_LSP7
-} from "../../LSP7DigitalAsset/LSP7Constants.sol";
+} from "lsp7/contracts/LSP7Constants.sol";
 import {
     _TYPEID_LSP8_TOKENSSENDER,
     _TYPEID_LSP8_TOKENSRECIPIENT,

diff --git a/contracts/Mocks/ERC165Interfaces.sol b/contracts/Mocks/ERC165Interfaces.sol
@@ -38,9 +38,7 @@ import {
 } from "lsp1/contracts/ILSP1UniversalReceiverDelegate.sol";
 
 import {ILSP6KeyManager as ILSP6} from "lsp6/contracts/ILSP6KeyManager.sol";
-import {
-    ILSP7DigitalAsset as ILSP7
-} from "../LSP7DigitalAsset/ILSP7DigitalAsset.sol";
+import {ILSP7DigitalAsset as ILSP7} from "lsp7/contracts/ILSP7DigitalAsset.sol";
 import {
     ILSP8IdentifiableDigitalAsset as ILSP8
 } from "../LSP8IdentifiableDigitalAsset/ILSP8IdentifiableDigitalAsset.sol";
@@ -66,7 +64,7 @@ import {
     _INTERFACEID_LSP1_DELEGATE
 } from "lsp1/contracts/LSP1Constants.sol";
 import {_INTERFACEID_LSP6} from "lsp6/contracts/LSP6Constants.sol";
-import {_INTERFACEID_LSP7} from "../LSP7DigitalAsset/LSP7Constants.sol";
+import {_INTERFACEID_LSP7} from "lsp7/contracts/LSP7Constants.sol";
 import {
     _INTERFACEID_LSP8
 } from "../LSP8IdentifiableDigitalAsset/LSP8Constants.sol";

diff --git a/contracts/Mocks/LSP1TypeIDsTester.sol b/contracts/Mocks/LSP1TypeIDsTester.sol
@@ -11,7 +11,7 @@ import {
     _TYPEID_LSP7_TOKENSSENDER,
     _TYPEID_LSP7_TOKENSRECIPIENT,
     _TYPEID_LSP7_TOKENOPERATOR
-} from "../LSP7DigitalAsset/LSP7Constants.sol";
+} from "lsp7/contracts/LSP7Constants.sol";
 import {
     _TYPEID_LSP8_TOKENSSENDER,
     _TYPEID_LSP8_TOKENSRECIPIENT,

diff --git a/contracts/Mocks/Tokens/LSP7CappedSupplyInitTester.sol b/contracts/Mocks/Tokens/LSP7CappedSupplyInitTester.sol
@@ -5,10 +5,10 @@ pragma solidity ^0.8.4;
 // modules
 import {
     LSP7DigitalAssetInitAbstract
-} from "../../LSP7DigitalAsset/LSP7DigitalAssetInitAbstract.sol";
+} from "lsp7/contracts/LSP7DigitalAssetInitAbstract.sol";
 import {
     LSP7CappedSupplyInitAbstract
-} from "../../LSP7DigitalAsset/extensions/LSP7CappedSupplyInitAbstract.sol";
+} from "lsp7/contracts/extensions/LSP7CappedSupplyInitAbstract.sol";
 
 contract LSP7CappedSupplyInitTester is LSP7CappedSupplyInitAbstract {
     function initialize(

diff --git a/contracts/Mocks/Tokens/LSP7CappedSupplyTester.sol b/contracts/Mocks/Tokens/LSP7CappedSupplyTester.sol
@@ -3,10 +3,8 @@
 pragma solidity ^0.8.4;
 
 // modules
-import {LSP7DigitalAsset} from "../../LSP7DigitalAsset/LSP7DigitalAsset.sol";
-import {
-    LSP7CappedSupply
-} from "../../LSP7DigitalAsset/extensions/LSP7CappedSupply.sol";
+import {LSP7DigitalAsset} from "lsp7/contracts/LSP7DigitalAsset.sol";
+import {LSP7CappedSupply} from "lsp7/contracts/extensions/LSP7CappedSupply.sol";
 
 contract LSP7CappedSupplyTester is LSP7CappedSupply {
     constructor(

diff --git a/contracts/Mocks/Tokens/LSP7InitTester.sol b/contracts/Mocks/Tokens/LSP7InitTester.sol
@@ -5,10 +5,10 @@ pragma solidity ^0.8.4;
 // modules
 import {
     LSP7DigitalAssetInitAbstract
-} from "../../LSP7DigitalAsset/LSP7DigitalAssetInitAbstract.sol";
+} from "lsp7/contracts/LSP7DigitalAssetInitAbstract.sol";
 import {
     LSP7BurnableInitAbstract
-} from "../../LSP7DigitalAsset/extensions/LSP7BurnableInitAbstract.sol";
+} from "lsp7/contracts/extensions/LSP7BurnableInitAbstract.sol";
 
 contract LSP7InitTester is
     LSP7DigitalAssetInitAbstract,

diff --git a/contracts/Mocks/Tokens/LSP7MintWhenDeployed.sol b/contracts/Mocks/Tokens/LSP7MintWhenDeployed.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.4;
 
-import {LSP7DigitalAsset} from "../../LSP7DigitalAsset/LSP7DigitalAsset.sol";
+import {LSP7DigitalAsset} from "lsp7/contracts/LSP7DigitalAsset.sol";
 
 contract LSP7MintWhenDeployed is LSP7DigitalAsset {
     constructor(

diff --git a/contracts/Mocks/Tokens/LSP7Tester.sol b/contracts/Mocks/Tokens/LSP7Tester.sol
@@ -2,8 +2,8 @@
 pragma solidity ^0.8.4;
 
 // modules
-import {LSP7DigitalAsset} from "../../LSP7DigitalAsset/LSP7DigitalAsset.sol";
-import {LSP7Burnable} from "../../LSP7DigitalAsset/extensions/LSP7Burnable.sol";
+import {LSP7DigitalAsset} from "lsp7/contracts/LSP7DigitalAsset.sol";
+import {LSP7Burnable} from "lsp7/contracts/extensions/LSP7Burnable.sol";
 
 contract LSP7Tester is LSP7DigitalAsset, LSP7Burnable {
     constructor(

diff --git a/contracts/Mocks/UniversalReceivers/UniversalReceiverDelegateDataUpdater.sol b/contracts/Mocks/UniversalReceivers/UniversalReceiverDelegateDataUpdater.sol
@@ -15,9 +15,7 @@ import {
 } from "@openzeppelin/contracts/utils/introspection/ERC165Storage.sol";
 
 // constants
-import {
-    _TYPEID_LSP7_TOKENSSENDER
-} from "../../LSP7DigitalAsset/LSP7Constants.sol";
+import {_TYPEID_LSP7_TOKENSSENDER} from "lsp7/contracts/LSP7Constants.sol";
 
 import {_INTERFACEID_LSP1_DELEGATE} from "lsp1/contracts/LSP1Constants.sol";
 

diff --git a/contracts/Mocks/UniversalReceivers/UniversalReceiverDelegateTokenReentrant.sol b/contracts/Mocks/UniversalReceivers/UniversalReceiverDelegateTokenReentrant.sol
@@ -18,9 +18,7 @@ import {
 } from "@openzeppelin/contracts/utils/introspection/ERC165Storage.sol";
 
 // constants
-import {
-    _TYPEID_LSP7_TOKENSRECIPIENT
-} from "../../LSP7DigitalAsset/LSP7Constants.sol";
+import {_TYPEID_LSP7_TOKENSRECIPIENT} from "lsp7/contracts/LSP7Constants.sol";
 
 import {
     _TYPEID_LSP8_TOKENSRECIPIENT