build!: move LSP17ContractExtension in its own package

lukso-network · Jan 24, 2024 · 2fe241f · 2fe241f
1 parent 4c31ce7
commit 2fe241f
Show file tree

Hide file tree

Showing 31 changed files with 25,808 additions and 31 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+  "CodeGPT.apiKey": "CodeGPT Plus Beta"
+}
diff --git a/contracts/LSP0ERC725Account/LSP0ERC725AccountCore.sol b/contracts/LSP0ERC725Account/LSP0ERC725AccountCore.sol
@@ -30,7 +30,9 @@ import {
     OwnableUnset
 } from "@erc725/smart-contracts/contracts/custom/OwnableUnset.sol";
 import {LSP14Ownable2Step} from "../LSP14Ownable2Step/LSP14Ownable2Step.sol";
-import {LSP17Extendable} from "../LSP17ContractExtension/LSP17Extendable.sol";
+import {
+    LSP17Extendable
+} from "lsp17contractextension/contracts/LSP17Extendable.sol";
 import {
     LSP20CallVerification
 } from "../LSP20CallVerification/LSP20CallVerification.sol";
@@ -56,7 +58,7 @@ import {_INTERFACEID_LSP14} from "../LSP14Ownable2Step/LSP14Constants.sol";
 
 import {
     _LSP17_EXTENSION_PREFIX
-} from "../LSP17ContractExtension/LSP17Constants.sol";
+} from "lsp17contractextension/contracts/LSP17Constants.sol";
 import {
     _INTERFACEID_LSP20_CALL_VERIFICATION
 } from "../LSP20CallVerification/LSP20Constants.sol";
@@ -68,7 +70,7 @@ import {
 } from "@erc725/smart-contracts/contracts/errors.sol";
 import {
     NoExtensionFoundForFunctionSelector
-} from "../LSP17ContractExtension/LSP17Errors.sol";
+} from "lsp17contractextension/contracts/LSP17Errors.sol";
 
 /**
  * @title The Core Implementation of [LSP-0-ERC725Account] Standard.

diff --git a/contracts/LSP17Extensions/Extension4337.sol b/contracts/LSP17Extensions/Extension4337.sol
@@ -12,7 +12,9 @@ import {
 
 // modules
 import {LSP14Ownable2Step} from "../LSP14Ownable2Step/LSP14Ownable2Step.sol";
-import {LSP17Extension} from "../LSP17ContractExtension/LSP17Extension.sol";
+import {
+    LSP17Extension
+} from "lsp17contractextension/contracts/LSP17Extension.sol";
 
 // librairies
 import {ECDSA} from "@openzeppelin/contracts/utils/cryptography/ECDSA.sol";

diff --git a/contracts/LSP17Extensions/OnERC721ReceivedExtension.sol b/contracts/LSP17Extensions/OnERC721ReceivedExtension.sol
@@ -4,11 +4,15 @@ pragma solidity ^0.8.4;
 import {
     ERC721Holder
 } from "@openzeppelin/contracts/token/ERC721/utils/ERC721Holder.sol";
-import {LSP17Extension} from "../LSP17ContractExtension/LSP17Extension.sol";
+import {
+    LSP17Extension
+} from "lsp17contractextension/contracts/LSP17Extension.sol";
 
 /**
  * @dev LSP17 Extension that can be attached to a LSP17Extendable contract
  * to allow it to receive ERC721 tokens via `safeTransferFrom`.
  */
 // solhint-disable-next-line no-empty-blocks
-contract OnERC721ReceivedExtension is ERC721Holder, LSP17Extension {}
+contract OnERC721ReceivedExtension is ERC721Holder, LSP17Extension {
+
+}
diff --git a/contracts/LSP6KeyManager/LSP6Modules/LSP6SetDataModule.sol b/contracts/LSP6KeyManager/LSP6Modules/LSP6SetDataModule.sol
@@ -35,7 +35,7 @@ import {
 } from "../../LSP1UniversalReceiver/LSP1Constants.sol";
 import {
     _LSP17_EXTENSION_PREFIX
-} from "../../LSP17ContractExtension/LSP17Constants.sol";
+} from "lsp17contractextension/contracts/LSP17Constants.sol";
 
 // errors
 import {

diff --git a/contracts/LSP7DigitalAsset/LSP7DigitalAsset.sol b/contracts/LSP7DigitalAsset/LSP7DigitalAsset.sol
@@ -10,7 +10,9 @@ import {
     LSP4DigitalAssetMetadata
 } from "../LSP4DigitalAssetMetadata/LSP4DigitalAssetMetadata.sol";
 import {LSP7DigitalAssetCore} from "./LSP7DigitalAssetCore.sol";
-import {LSP17Extendable} from "../LSP17ContractExtension/LSP17Extendable.sol";
+import {
+    LSP17Extendable
+} from "lsp17contractextension/contracts/LSP17Extendable.sol";
 
 // libraries
 import {
@@ -23,15 +25,15 @@ import {LSP7TokenContractCannotHoldValue} from "./LSP7Errors.sol";
 
 import {
     _LSP17_EXTENSION_PREFIX
-} from "../LSP17ContractExtension/LSP17Constants.sol";
+} from "lsp17contractextension/contracts/LSP17Constants.sol";
 
 // errors
 
 import {
     NoExtensionFoundForFunctionSelector,
     InvalidFunctionSelector,
     InvalidExtensionAddress
-} from "../LSP17ContractExtension/LSP17Errors.sol";
+} from "lsp17contractextension/contracts/LSP17Errors.sol";
 
 /**
  * @title Implementation of a LSP7 Digital Asset, a contract that represents a fungible token.

diff --git a/contracts/LSP7DigitalAsset/LSP7DigitalAssetInitAbstract.sol b/contracts/LSP7DigitalAsset/LSP7DigitalAssetInitAbstract.sol
@@ -11,7 +11,9 @@ import {
 } from "../LSP4DigitalAssetMetadata/LSP4DigitalAssetMetadataInitAbstract.sol";
 import {LSP7DigitalAssetCore} from "./LSP7DigitalAssetCore.sol";
 
-import {LSP17Extendable} from "../LSP17ContractExtension/LSP17Extendable.sol";
+import {
+    LSP17Extendable
+} from "lsp17contractextension/contracts/LSP17Extendable.sol";
 
 // libraries
 import {
@@ -24,15 +26,15 @@ import {LSP7TokenContractCannotHoldValue} from "./LSP7Errors.sol";
 
 import {
     _LSP17_EXTENSION_PREFIX
-} from "../LSP17ContractExtension/LSP17Constants.sol";
+} from "lsp17contractextension/contracts/LSP17Constants.sol";
 
 // errors
 
 import {
     NoExtensionFoundForFunctionSelector,
     InvalidFunctionSelector,
     InvalidExtensionAddress
-} from "../LSP17ContractExtension/LSP17Errors.sol";
+} from "lsp17contractextension/contracts/LSP17Errors.sol";
 
 /**
  * @title LSP7DigitalAsset contract

diff --git a/contracts/LSP8IdentifiableDigitalAsset/LSP8IdentifiableDigitalAsset.sol b/contracts/LSP8IdentifiableDigitalAsset/LSP8IdentifiableDigitalAsset.sol
@@ -17,7 +17,9 @@ import {
     LSP4DigitalAssetMetadataCore
 } from "../LSP4DigitalAssetMetadata/LSP4DigitalAssetMetadataCore.sol";
 
-import {LSP17Extendable} from "../LSP17ContractExtension/LSP17Extendable.sol";
+import {
+    LSP17Extendable
+} from "lsp17contractextension/contracts/LSP17Extendable.sol";
 
 // libraries
 import {
@@ -35,15 +37,15 @@ import {
 
 import {
     _LSP17_EXTENSION_PREFIX
-} from "../LSP17ContractExtension/LSP17Constants.sol";
+} from "lsp17contractextension/contracts/LSP17Constants.sol";
 
 // errors
 
 import {
     NoExtensionFoundForFunctionSelector,
     InvalidFunctionSelector,
     InvalidExtensionAddress
-} from "../LSP17ContractExtension/LSP17Errors.sol";
+} from "lsp17contractextension/contracts/LSP17Errors.sol";
 
 /**
  * @title Implementation of a LSP8 Identifiable Digital Asset, a contract that represents a non-fungible token.

diff --git a/contracts/LSP8IdentifiableDigitalAsset/LSP8IdentifiableDigitalAssetInitAbstract.sol b/contracts/LSP8IdentifiableDigitalAsset/LSP8IdentifiableDigitalAssetInitAbstract.sol
@@ -17,7 +17,9 @@ import {
     LSP4DigitalAssetMetadataCore
 } from "../LSP4DigitalAssetMetadata/LSP4DigitalAssetMetadataCore.sol";
 
-import {LSP17Extendable} from "../LSP17ContractExtension/LSP17Extendable.sol";
+import {
+    LSP17Extendable
+} from "lsp17contractextension/contracts/LSP17Extendable.sol";
 
 // libraries
 import {
@@ -35,15 +37,15 @@ import {
 
 import {
     _LSP17_EXTENSION_PREFIX
-} from "../LSP17ContractExtension/LSP17Constants.sol";
+} from "lsp17contractextension/contracts/LSP17Constants.sol";
 
 // errors
 
 import {
     NoExtensionFoundForFunctionSelector,
     InvalidFunctionSelector,
     InvalidExtensionAddress
-} from "../LSP17ContractExtension/LSP17Errors.sol";
+} from "lsp17contractextension/contracts/LSP17Errors.sol";
 
 /**
  * @title Implementation of a LSP8 Identifiable Digital Asset, a contract that represents a non-fungible token.

diff --git a/contracts/LSP9Vault/LSP9VaultCore.sol b/contracts/LSP9Vault/LSP9VaultCore.sol
@@ -27,7 +27,9 @@ import {
     OwnableUnset
 } from "@erc725/smart-contracts/contracts/custom/OwnableUnset.sol";
 import {LSP14Ownable2Step} from "../LSP14Ownable2Step/LSP14Ownable2Step.sol";
-import {LSP17Extendable} from "../LSP17ContractExtension/LSP17Extendable.sol";
+import {
+    LSP17Extendable
+} from "lsp17contractextension/contracts/LSP17Extendable.sol";
 
 // constants
 import {
@@ -64,14 +66,14 @@ import {
 import {_INTERFACEID_LSP14} from "../LSP14Ownable2Step/LSP14Constants.sol";
 import {
     _LSP17_EXTENSION_PREFIX
-} from "../LSP17ContractExtension/LSP17Constants.sol";
+} from "lsp17contractextension/contracts/LSP17Constants.sol";
 
 // errors
 import {LSP1DelegateNotAllowedToSetDataKey} from "./LSP9Errors.sol";
 
 import {
     NoExtensionFoundForFunctionSelector
-} from "../LSP17ContractExtension/LSP17Errors.sol";
+} from "lsp17contractextension/contracts/LSP17Errors.sol";
 
 /**
  * @title Core Implementation of LSP9Vault built on top of [ERC725], [LSP1UniversalReceiver]

diff --git a/contracts/Mocks/ERC165Interfaces.sol b/contracts/Mocks/ERC165Interfaces.sol
@@ -78,7 +78,7 @@ import {_INTERFACEID_LSP14} from "../LSP14Ownable2Step/LSP14Constants.sol";
 import {
     _INTERFACEID_LSP17_EXTENDABLE,
     _INTERFACEID_LSP17_EXTENSION
-} from "../LSP17ContractExtension/LSP17Constants.sol";
+} from "lsp17contractextension/contracts/LSP17Constants.sol";
 import {
     _INTERFACEID_LSP20_CALL_VERIFICATION,
     _INTERFACEID_LSP20_CALL_VERIFIER

diff --git a/contracts/Mocks/LSP17ExtendableTester.sol b/contracts/Mocks/LSP17ExtendableTester.sol
@@ -1,7 +1,9 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.4;
 
-import {LSP17Extendable} from "../LSP17ContractExtension/LSP17Extendable.sol";
+import {
+    LSP17Extendable
+} from "lsp17contractextension/contracts/LSP17Extendable.sol";
 
 /**
  * @dev This contract is used only for testing purposes

diff --git a/contracts/Mocks/UniversalReceivers/UniversalReceiverDelegateVaultMalicious.sol b/contracts/Mocks/UniversalReceivers/UniversalReceiverDelegateVaultMalicious.sol
@@ -30,7 +30,7 @@ import {
 
 import {
     _LSP17_EXTENSION_PREFIX
-} from "../../LSP17ContractExtension/LSP17Constants.sol";
+} from "lsp17contractextension/contracts/LSP17Constants.sol";
 
 /**
  * @dev This contract is used only for testing

diff --git a/dodoc/config.ts b/dodoc/config.ts
@@ -13,8 +13,8 @@ export const dodocConfig = {
     'contracts/LSP11BasicSocialRecovery/LSP11BasicSocialRecovery.sol',
     'contracts/LSP14Ownable2Step/LSP14Ownable2Step.sol',
     'contracts/LSP16UniversalFactory/LSP16UniversalFactory.sol',
-    'contracts/LSP17ContractExtension/LSP17Extendable.sol',
-    'contracts/LSP17ContractExtension/LSP17Extension.sol',
+    'packages/LSP17ContractExtension/LSP17Extendable.sol',
+    'packages/LSP17ContractExtension/LSP17Extension.sol',
     'contracts/LSP17Extensions/Extension4337.sol',
     'contracts/LSP17Extensions/OnERC721ReceivedExtension.sol',
     'contracts/LSP20CallVerification/LSP20CallVerification.sol',
@@ -44,7 +44,7 @@ export const dodocConfig = {
     'contracts/LSP5ReceivedAssets/LSP5Utils.sol',
     'contracts/LSP6KeyManager/LSP6Utils.sol',
     'contracts/LSP10ReceivedVaults/LSP10Utils.sol',
-    'contracts/LSP17ContractExtension/LSP17Utils.sol',
+    'packages/LSP17ContractExtension/LSP17Utils.sol',
 
     // external --------------------
     '@erc725/smart-contracts/contracts/ERC725.sol',
@@ -55,7 +55,7 @@ export const dodocConfig = {
     'contracts/LSP5ReceivedAssets/LSP5Utils.sol',
     'contracts/LSP6KeyManager/LSP6Utils.sol',
     'contracts/LSP10ReceivedVaults/LSP10Utils.sol',
-    'contracts/LSP17ContractExtension/LSP17Utils.sol',
+    'packages/LSP17ContractExtension/LSP17Utils.sol',
   ],
   templatePath: './dodoc/template.sqrl',
   helpers: [

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -112,7 +112,8 @@
     "@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",
+    "lsp17contractextension": "*"
   },
   "devDependencies": {
     "@b00ste/hardhat-dodoc": "^0.3.15",

diff --git a/packages/LSP17ContractExtension/.eslintrc.js b/packages/LSP17ContractExtension/.eslintrc.js
@@ -0,0 +1,4 @@
+module.exports = {
+  root: true,
+  extends: ['custom'],
+};
diff --git a/packages/LSP17ContractExtension/.gitmodules b/packages/LSP17ContractExtension/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "lib/forge-std"]
+	path = ../../lib/forge-std
+	url = https://github.com/foundry-rs/forge-std.git