From 478d4f029f749eca3054a9af7173232d489a450a Mon Sep 17 00:00:00 2001 From: CJ42 Date: Fri, 19 Jan 2024 12:57:33 +0000 Subject: [PATCH] build: add `lsp2` package dependency in root --- .../LSP0ERC725AccountCore.sol | 4 +- contracts/LSP10ReceivedVaults/LSP10Utils.sol | 4 +- contracts/LSP1UniversalReceiver/LSP1Utils.sol | 4 +- contracts/LSP6KeyManager/LSP6Utils.sol | 4 +- .../LSP7DigitalAsset/LSP7DigitalAsset.sol | 4 +- .../LSP7DigitalAssetInitAbstract.sol | 4 +- .../LSP8IdentifiableDigitalAsset.sol | 4 +- ...P8IdentifiableDigitalAssetInitAbstract.sol | 4 +- contracts/LSP9Vault/LSP9VaultCore.sol | 4 +- package-lock.json | 75 +++++++++++++++++++ package.json | 4 +- .../GasTests/UniversalProfileTestsHelper.sol | 2 +- .../GasTests/execute/RestrictedController.sol | 2 +- .../execute/UnrestrictedController.sol | 2 +- .../GasTests/setData/RestrictedController.sol | 2 +- .../setData/UnrestrictedController.sol | 2 +- .../LSP6KeyManager/LSP6AllowedCallsTest.t.sol | 4 +- .../LSP6RestrictedController.t.sol | 2 +- .../LSP6KeyManager/LSP6SetDataTest.t.sol | 4 +- 19 files changed, 95 insertions(+), 40 deletions(-) diff --git a/contracts/LSP0ERC725Account/LSP0ERC725AccountCore.sol b/contracts/LSP0ERC725Account/LSP0ERC725AccountCore.sol index 4a32b3c4f..eecdf7d67 100644 --- 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 index efee6a010..5191c8360 100644 --- 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 index 4d92cd296..7ec9a8871 100644 --- 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 index 7d45ae00d..d9d764f4c 100644 --- 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 index 818c78ce1..447ff14d7 100644 --- 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 index bee5a0e07..7d0c9f93f 100644 --- 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 index 32b9cb18f..d718105de 100644 --- 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 index 087d2bbea..827c5a7a7 100644 --- 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 index 9ffc4a020..6c308ee6e 100644 --- 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 index 18dccb16a..d77d324d2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -17,6 +17,8 @@ "@erc725/smart-contracts": "^7.0.0", "@openzeppelin/contracts": "^4.9.2", "@openzeppelin/contracts-upgradeable": "^4.9.2", + "lsp2": "*", + "lsp5": "*", "solidity-bytes-utils": "0.8.0" }, "devDependencies": { @@ -13286,6 +13288,10 @@ "resolved": "packages/LSP2ERC725YJSONSchema", "link": true }, + "node_modules/lsp5": { + "resolved": "packages/LSP5ReceivedAssets", + "link": true + }, "node_modules/ltgt": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/ltgt/-/ltgt-2.2.1.tgz", @@ -23534,6 +23540,45 @@ "typechain": "^8.0.0", "typescript": "^5.3.3" } + }, + "packages/LSP5ReceivedAssets": { + "name": "lsp5", + "version": "0.12.1", + "license": "Apache-2.0", + "dependencies": { + "@erc725/smart-contracts": "^7.0.0" + }, + "devDependencies": { + "@nomicfoundation/hardhat-toolbox": "^2.0.2", + "@typechain/ethers-v5": "^10.2.0", + "dotenv": "^16.0.3", + "eslint-config-custom": "*", + "ethers": "^5.7.2", + "hardhat": "^2.13.0", + "hardhat-contract-sizer": "^2.8.0", + "hardhat-deploy": "^0.11.25", + "hardhat-gas-reporter": "^1.0.9", + "hardhat-packager": "^1.4.2", + "lsp2": "*", + "solhint": "^3.3.6", + "ts-node": "^10.2.0", + "tsconfig": "*", + "typechain": "^8.0.0", + "typescript": "^4.9.5" + } + }, + "packages/LSP5ReceivedAssets/node_modules/typescript": { + "version": "4.9.5", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz", + "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==", + "dev": true, + "bin": { + "tsc": "bin/tsc", + "tsserver": "bin/tsserver" + }, + "engines": { + "node": ">=4.2.0" + } } }, "dependencies": { @@ -33595,6 +33640,36 @@ "typescript": "^5.3.3" } }, + "lsp5": { + "version": "file:packages/LSP5ReceivedAssets", + "requires": { + "@erc725/smart-contracts": "^7.0.0", + "@nomicfoundation/hardhat-toolbox": "^2.0.2", + "@typechain/ethers-v5": "^10.2.0", + "dotenv": "^16.0.3", + "eslint-config-custom": "*", + "ethers": "^5.7.2", + "hardhat": "^2.13.0", + "hardhat-contract-sizer": "^2.8.0", + "hardhat-deploy": "^0.11.25", + "hardhat-gas-reporter": "^1.0.9", + "hardhat-packager": "^1.4.2", + "lsp2": "*", + "solhint": "^3.3.6", + "ts-node": "^10.2.0", + "tsconfig": "*", + "typechain": "^8.0.0", + "typescript": "^4.9.5" + }, + "dependencies": { + "typescript": { + "version": "4.9.5", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz", + "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==", + "dev": true + } + } + }, "ltgt": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/ltgt/-/ltgt-2.2.1.tgz", diff --git a/package.json b/package.json index b07a1fa0f..17e8b5fac 100644 --- 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 index 3417e0cd3..5e58b750f 100644 --- 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 index c891989ba..d4502034a 100644 --- 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 index ae0e3fd24..26121ad56 100644 --- 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 index aa142f725..16444729c 100644 --- 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 index 3a9330795..11f082a50 100644 --- 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 index 48161874e..bd48c2e3d 100644 --- 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 index ee5608651..a577f67c1 100644 --- 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 index 37dbe1236..e6d8a399f 100644 --- 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";