Skip to content

Commit

Permalink
build: update package names
Browse files Browse the repository at this point in the history
  • Loading branch information
b00ste committed Feb 12, 2024
1 parent 709962f commit 1637db9
Show file tree
Hide file tree
Showing 148 changed files with 2,914 additions and 2,682 deletions.
82 changes: 42 additions & 40 deletions .github/workflows/solc_version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -81,48 +81,50 @@ jobs:
../=$(pwd)/contracts/ \
@=node_modules/@ \
solidity-bytes-utils/=node_modules/solidity-bytes-utils/ \
lsp0/=packages/LSP0ERC725Account/ \
lsp1/=packages/LSP1UniversalReceiver/ \
lsp1delegate/=packages/LSP1UniversalReceiverDelegate/ \
lsp2/=packages/LSP2ERC725YJSONSchema/ \
lsp3/=packages/LSP3ProfileMetadata/ \
lsp4/=packages/LSP4DigitalAssetMetadata/ \
lsp5/=packages/LSP5ReceivedAssets/ \
lsp6/=packages/LSP6KeyManager/ \
lsp7/=packages/LSP7DigitalAsset/ \
lsp8/=packages/LSP8IdentifiableDigitalAsset/ \
lsp9/=packages/LSP9Vault/ \
lsp10/=packages/LSP10ReceivedVaults/ \
lsp12/=packages/LSP12IssuedAssets/ \
lsp14/=packages/LSP14Ownable2Step/ \
lsp16/=packages/LSP16UniversalFactory/ \
lsp17/=packages/LSP17Extensions/ \
lsp17contractextension/=packages/LSP17ContractExtension/ \
lsp20/=packages/LSP20CallVerification/ \
lsp25/=packages/LSP25ExecuteRelayCall/ \
universalprofile/=packages/UniversalProfile/
@lukso/lsp0-contracts/=packages/LSP0ERC725Account/ \
@lukso/lsp1-contracts/=packages/LSP1UniversalReceiver/ \
@lukso/lsp1delegate-contracts/=packages/LSP1UniversalReceiverDelegate/ \
@lukso/lsp2-contracts/=packages/LSP2ERC725YJSONSchema/ \
@lukso/lsp3-contracts/=packages/LSP3ProfileMetadata/ \
@lukso/lsp4-contracts/=packages/LSP4DigitalAssetMetadata/ \
@lukso/lsp5-contracts/=packages/LSP5ReceivedAssets/ \
@lukso/lsp6-contracts/=packages/LSP6KeyManager/ \
@lukso/lsp7-contracts/=packages/LSP7DigitalAsset/ \
@lukso/lsp8-contracts/=packages/LSP8IdentifiableDigitalAsset/ \
@lukso/lsp9-contracts/=packages/LSP9Vault/ \
@lukso/lsp10-contracts/=packages/LSP10ReceivedVaults/ \
@lukso/lsp12-contracts/=packages/LSP12IssuedAssets/ \
@lukso/lsp14-contracts/=packages/LSP14Ownable2Step/ \
@lukso/lsp16-contracts/=packages/LSP16UniversalFactory/ \
@lukso/lsp17-contracts/=packages/LSP17Extensions/ \
@lukso/lsp17contractextension-contracts/=packages/LSP17ContractExtension/ \
@lukso/lsp20-contracts/=packages/LSP20CallVerification/ \
@lukso/lsp23-contracts/=packages/LSP23LinkedContractsDeployment/ \
@lukso/lsp25-contracts/=packages/LSP25ExecuteRelayCall/ \
@lukso/universalprofile-contracts/=packages/UniversalProfile/
else
solc contracts/**/*.sol \
@=node_modules/@ \
solidity-bytes-utils/=node_modules/solidity-bytes-utils/ \
lsp0/=packages/LSP0ERC725Account/ \
lsp1/=packages/LSP1UniversalReceiver/ \
lsp1delegate/=packages/LSP1UniversalReceiverDelegate/ \
lsp2/=packages/LSP2ERC725YJSONSchema/ \
lsp3/=packages/LSP3ProfileMetadata/ \
lsp4/=packages/LSP4DigitalAssetMetadata/ \
lsp5/=packages/LSP5ReceivedAssets/ \
lsp6/=packages/LSP6KeyManager/ \
lsp7/=packages/LSP7DigitalAsset/ \
lsp8/=packages/LSP8IdentifiableDigitalAsset/ \
lsp9/=packages/LSP9Vault/ \
lsp10/=packages/LSP10ReceivedVaults/ \
lsp12/=packages/LSP12IssuedAssets/ \
lsp14/=packages/LSP14Ownable2Step/ \
lsp16/=packages/LSP16UniversalFactory/ \
lsp17/=packages/LSP17Extensions/ \
lsp17contractextension/=packages/LSP17ContractExtension/ \
lsp20/=packages/LSP20CallVerification/ \
lsp25/=packages/LSP25ExecuteRelayCall/ \
universalprofile/=packages/UniversalProfile/
@lukso/lsp0-contracts/=packages/LSP0ERC725Account/ \
@lukso/lsp1-contracts/=packages/LSP1UniversalReceiver/ \
@lukso/lsp1delegate-contracts/=packages/LSP1UniversalReceiverDelegate/ \
@lukso/lsp2-contracts/=packages/LSP2ERC725YJSONSchema/ \
@lukso/lsp3-contracts/=packages/LSP3ProfileMetadata/ \
@lukso/lsp4-contracts/=packages/LSP4DigitalAssetMetadata/ \
@lukso/lsp5-contracts/=packages/LSP5ReceivedAssets/ \
@lukso/lsp6-contracts/=packages/LSP6KeyManager/ \
@lukso/lsp7-contracts/=packages/LSP7DigitalAsset/ \
@lukso/lsp8-contracts/=packages/LSP8IdentifiableDigitalAsset/ \
@lukso/lsp9-contracts/=packages/LSP9Vault/ \
@lukso/lsp10-contracts/=packages/LSP10ReceivedVaults/ \
@lukso/lsp12-contracts/=packages/LSP12IssuedAssets/ \
@lukso/lsp14-contracts/=packages/LSP14Ownable2Step/ \
@lukso/lsp16-contracts/=packages/LSP16UniversalFactory/ \
@lukso/lsp17-contracts/=packages/LSP17Extensions/ \
@lukso/lsp17contractextension-contracts/=packages/LSP17ContractExtension/ \
@lukso/lsp20-contracts/=packages/LSP20CallVerification/ \
@lukso/lsp23-contracts/=packages/LSP23LinkedContractsDeployment/ \
@lukso/lsp25-contracts/=packages/LSP25ExecuteRelayCall/ \
@lukso/universalprofile-contracts/=packages/UniversalProfile/
fi;
66 changes: 33 additions & 33 deletions .mythx.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,50 +16,50 @@ analyze:
targets:
# LSP1
# ------------------
- lsp1delegate/contract/LSP1UniversalReceiverDelegateUP.sol
- lsp1delegate/contract/LSP1UniversalReceiverDelegateVault.sol
- @lukso/lsp1delegate-contracts/contract/LSP1UniversalReceiverDelegateUP.sol
- @lukso/lsp1delegate-contracts/contract/LSP1UniversalReceiverDelegateVault.sol

# Standard version
# ------------------
- contracts/UniversalProfile.sol
- contracts/LSP0ERC725Account/LSP0ERC725Account.sol
- contracts/LSP6KeyManager/LSP6KeyManager.sol
- @lukso/universalprofile-contracts/contracts/UniversalProfile.sol
- @lukso/lsp0-contracts/contracts/LSP0ERC725Account.sol
- @lukso/lsp6-contractscontracts/LSP6KeyManager.sol
# - Tokens & NFTs
- lsp4/contracts/LSP4DigitalAssetMetadata.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
- contracts/LSP8IdentifiableDigitalAsset/extensions/LSP8CappedSupply.sol
- contracts/LSP8IdentifiableDigitalAsset/extensions/LSP8Enumerable.sol
- @lukso/lsp4-contracts/contracts/LSP4DigitalAssetMetadata.sol
- @lukso/lsp7-contracts/contracts/LSP7DigitalAsset.sol
- @lukso/lsp7-contracts/contracts/presets/LSP7Mintable.sol
- @lukso/lsp7-contracts/contracts/extensions/LSP7Burnable.sol
- @lukso/lsp7-contracts/contracts/extensions/LSP7CappedSupply.sol
- @lukso/lsp8-contracts/contracts/presets/LSP8Mintable.sol
- @lukso/lsp8-contracts/contracts/LSP8IdentifiableDigitalAsset.sol
- @lukso/lsp8-contracts/contracts/extensions/LSP8Burnable.sol
- @lukso/lsp8-contracts/contracts/extensions/LSP8CappedSupply.sol
- @lukso/lsp8-contracts/contracts/extensions/LSP8Enumerable.sol
# - Vault & Social Recovery
- lsp9/contracts/LSP9Vault.sol
- @lukso/lsp9-contracts/contracts/LSP9Vault.sol
- contracts/LSP11BasicSocialRecovery/LSP11BasicSocialRecovery.sol

# Proxy version
# ------------------
- contracts/UniversalProfileInit.sol
- contracts/LSP0ERC725Account/LSP0ERC725AccountInit.sol
- lsp4/contracts/LSP4DigitalAssetMetadataInitAbstract.sol
- contracts/LSP6KeyManager/LSP6KeyManagerInit.sol
- @lukso/universalprofile-contracts/contracts/UniversalProfileInit.sol
- @lukso/lsp0-contracts/contracts/LSP0ERC725AccountInit.sol
- @lukso/lsp4-contracts/contracts/LSP4DigitalAssetMetadataInitAbstract.sol
- @lukso/lsp6-contractscontracts/LSP6KeyManagerInit.sol
# - Tokens & NFTs
- lsp7/contracts/LSP7DigitalAssetInitAbstract.sol
- lsp7/contracts/presets/LSP7MintableInit.sol
- contracts/LSP8IdentifiableDigitalAsset/LSP8IdentifiableDigitalAssetInitAbstract.sol
- contracts/LSP8IdentifiableDigitalAsset/presets/LSP8MintableInit.sol
- contracts/LSP8IdentifiableDigitalAsset/extensions/LSP8CappedSupplyInitAbstract.sol
- contracts/LSP8IdentifiableDigitalAsset/extensions/LSP8EnumerableInitAbstract.sol
# - Vault & Social Recovery
- lsp9/contracts/LSP9VaultInit.sol
- @lukso/lsp7-contracts/contracts/LSP7DigitalAssetInitAbstract.sol
- @lukso/lsp7-contracts/contracts/presets/LSP7MintableInit.sol
- @lukso/lsp8-contracts/contracts/LSP8IdentifiableDigitalAssetInitAbstract.sol
- @lukso/lsp8-contracts/contracts/presets/LSP8MintableInit.sol
- @lukso/lsp8-contracts/contracts/extensions/LSP8CappedSupplyInitAbstract.sol
- @lukso/lsp8-contracts/contracts/extensions/LSP8EnumerableInitAbstract.sol
# - Vault @lukso/lsp8-contracts/& Recovery
- @lukso/lsp9-contracts/contracts/LSP9VaultInit.sol
- contracts/LSP11BasicSocialRecovery/LSP11BasicSocialRecoveryInit.sol

# Generic Modules & Factories
# ------------------
- contracts/LSP14Ownable2Step/LSP14Ownable2Step.sol
- contracts/LSP16UniversalFactory/LSP16UniversalFactory.sol
- contracts/LSP17ContractExtension/LSP17Extendable.sol
- contracts/LSP17ContractExtension/LSP17Extension.sol
- contracts/LSP20CallVerification/LSP20CallVerification.sol
- @lukso/lsp14-contracts/contracts/LSP14Ownable2Step.sol
- @lukso/lsp16-contracts/contracts/LSP16UniversalFactory.sol
- @lukso/lsp17-contracts/contracts/LSP17Extendable.sol
- @lukso/lsp17-contracts/contracts/LSP17Extension.sol
- @lukso/lsp20-contracts/contracts/LSP20CallVerification.sol
8 changes: 4 additions & 4 deletions contracts/Imports.sol
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ pragma solidity ^0.8.4;

import {
LSP1UniversalReceiverDelegateUP
} from "lsp1delegate/contracts/LSP1UniversalReceiverDelegateUP.sol";
} from "@lukso/lsp1delegate-contracts/contracts/LSP1UniversalReceiverDelegateUP.sol";
import {
LSP1UniversalReceiverDelegateVault
} from "lsp1delegate/contracts/LSP1UniversalReceiverDelegateVault.sol";
} from "@lukso/lsp1delegate-contracts/contracts/LSP1UniversalReceiverDelegateVault.sol";

import {LSP9Vault} from "lsp9/contracts/LSP9Vault.sol";
import {LSP9VaultInit} from "lsp9/contracts/LSP9VaultInit.sol";
import {LSP9Vault} from "@lukso/lsp9-contracts/contracts/LSP9Vault.sol";
import {LSP9VaultInit} from "@lukso/lsp9-contracts/contracts/LSP9VaultInit.sol";
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ pragma solidity ^0.8.4;
import {ILSP11BasicSocialRecovery} from "./ILSP11BasicSocialRecovery.sol";

// libraries
import {LSP6Utils} from "lsp6/contracts/LSP6Utils.sol";
import {LSP6Utils} from "@lukso/lsp6-contracts/contracts/LSP6Utils.sol";

// modules
import {ERC725} from "@erc725/smart-contracts/contracts/ERC725.sol";
Expand All @@ -18,7 +18,9 @@ import {
} from "@openzeppelin/contracts/utils/structs/EnumerableSet.sol";

// constants
import {ALL_REGULAR_PERMISSIONS} from "lsp6/contracts/LSP6Constants.sol";
import {
ALL_REGULAR_PERMISSIONS
} from "@lukso/lsp6-contracts/contracts/LSP6Constants.sol";
import {_INTERFACEID_LSP11} from "./LSP11Constants.sol";
import {
CallerIsNotGuardian,
Expand Down
62 changes: 42 additions & 20 deletions contracts/Mocks/ERC165Interfaces.sol
Original file line number Diff line number Diff line change
Expand Up @@ -28,58 +28,80 @@ import {IERC223} from "./Tokens/IERC223.sol";

// LSPs interfaces

import {ILSP0ERC725Account} from "lsp0/contracts/ILSP0ERC725Account.sol";
import {
ILSP0ERC725Account
} from "@lukso/lsp0-contracts/contracts/ILSP0ERC725Account.sol";
import {
ILSP1UniversalReceiver as ILSP1
} from "lsp1/contracts/ILSP1UniversalReceiver.sol";
} from "@lukso/lsp1-contracts/contracts/ILSP1UniversalReceiver.sol";

import {
ILSP1UniversalReceiverDelegate as ILSP1Delegate
} from "lsp1/contracts/ILSP1UniversalReceiverDelegate.sol";
} from "@lukso/lsp1-contracts/contracts/ILSP1UniversalReceiverDelegate.sol";

import {ILSP6KeyManager as ILSP6} from "lsp6/contracts/ILSP6KeyManager.sol";
import {ILSP7DigitalAsset as ILSP7} from "lsp7/contracts/ILSP7DigitalAsset.sol";
import {
ILSP6KeyManager as ILSP6
} from "@lukso/lsp6-contracts/contracts/ILSP6KeyManager.sol";
import {
ILSP7DigitalAsset as ILSP7
} from "@lukso/lsp7-contracts/contracts/ILSP7DigitalAsset.sol";
import {
ILSP8IdentifiableDigitalAsset as ILSP8
} from "lsp8/contracts/ILSP8IdentifiableDigitalAsset.sol";
} from "@lukso/lsp8-contracts/contracts/ILSP8IdentifiableDigitalAsset.sol";

import {ILSP9Vault as ILSP9} from "lsp9/contracts/ILSP9Vault.sol";
import {
ILSP9Vault as ILSP9
} from "@lukso/lsp9-contracts/contracts/ILSP9Vault.sol";
import {
ILSP11BasicSocialRecovery as ILSP11
} from "../LSP11BasicSocialRecovery/ILSP11BasicSocialRecovery.sol";
import {
ILSP14Ownable2Step as ILSP14
} from "lsp14/contracts/ILSP14Ownable2Step.sol";
} from "@lukso/lsp14-contracts/contracts/ILSP14Ownable2Step.sol";
import {
ILSP20CallVerifier as ILSP20
} from "lsp20/contracts/ILSP20CallVerifier.sol";
} from "@lukso/lsp20-contracts/contracts/ILSP20CallVerifier.sol";
import {
ILSP25ExecuteRelayCall as ILSP25
} from "lsp25/contracts/ILSP25ExecuteRelayCall.sol";
} from "@lukso/lsp25-contracts/contracts/ILSP25ExecuteRelayCall.sol";

// constants
import {_INTERFACEID_LSP0} from "lsp0/contracts/LSP0Constants.sol";
import {
_INTERFACEID_LSP0
} from "@lukso/lsp0-contracts/contracts/LSP0Constants.sol";
import {
_INTERFACEID_LSP1,
_INTERFACEID_LSP1_DELEGATE
} 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 "lsp8/contracts/LSP8Constants.sol";
import {_INTERFACEID_LSP9} from "lsp9/contracts/LSP9Constants.sol";
} from "@lukso/lsp1-contracts/contracts/LSP1Constants.sol";
import {
_INTERFACEID_LSP6
} from "@lukso/lsp6-contracts/contracts/LSP6Constants.sol";
import {
_INTERFACEID_LSP7
} from "@lukso/lsp7-contracts/contracts/LSP7Constants.sol";
import {
_INTERFACEID_LSP8
} from "@lukso/lsp8-contracts/contracts/LSP8Constants.sol";
import {
_INTERFACEID_LSP9
} from "@lukso/lsp9-contracts/contracts/LSP9Constants.sol";
import {
_INTERFACEID_LSP11
} from "../LSP11BasicSocialRecovery/LSP11Constants.sol";
import {_INTERFACEID_LSP14} from "lsp14/contracts/LSP14Constants.sol";
import {
_INTERFACEID_LSP14
} from "@lukso/lsp14-contracts/contracts/LSP14Constants.sol";
import {
_INTERFACEID_LSP17_EXTENDABLE,
_INTERFACEID_LSP17_EXTENSION
} from "lsp17contractextension/contracts/LSP17Constants.sol";
} from "@lukso/lsp17contractextension-contracts/contracts/LSP17Constants.sol";
import {
_INTERFACEID_LSP20_CALL_VERIFICATION,
_INTERFACEID_LSP20_CALL_VERIFIER
} from "lsp20/contracts/LSP20Constants.sol";
import {_INTERFACEID_LSP25} from "lsp25/contracts/LSP25Constants.sol";
} from "@lukso/lsp20-contracts/contracts/LSP20Constants.sol";
import {
_INTERFACEID_LSP25
} from "@lukso/lsp25-contracts/contracts/LSP25Constants.sol";

// libraries
import {
Expand Down
10 changes: 7 additions & 3 deletions contracts/Mocks/Executor.sol
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,17 @@ import {
import {
IERC725Y
} from "@erc725/smart-contracts/contracts/interfaces/IERC725Y.sol";
import {ILSP6KeyManager} from "lsp6/contracts/ILSP6KeyManager.sol";
import {
ILSP6KeyManager
} from "@lukso/lsp6-contracts/contracts/ILSP6KeyManager.sol";

// modules
import {
UniversalProfile
} from "universalprofile/contracts/UniversalProfile.sol";
import {LSP6KeyManager} from "lsp6/contracts/LSP6KeyManager.sol";
} from "@lukso/universalprofile-contracts/contracts/UniversalProfile.sol";
import {
LSP6KeyManager
} from "@lukso/lsp6-contracts/contracts/LSP6KeyManager.sol";

// constants
import {
Expand Down
2 changes: 1 addition & 1 deletion contracts/Mocks/ExecutorLSP20.sol
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import {
// modules
import {
UniversalProfile
} from "universalprofile/contracts/UniversalProfile.sol";
} from "@lukso/universalprofile-contracts/contracts/UniversalProfile.sol";

// constants
import {
Expand Down
6 changes: 4 additions & 2 deletions contracts/Mocks/KeyManager/KeyManagerInternalsTester.sol
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,13 @@
pragma solidity ^0.8.4;

// libraries
import {LSP6Utils} from "lsp6/contracts/LSP6Utils.sol";
import {LSP6Utils} from "@lukso/lsp6-contracts/contracts/LSP6Utils.sol";

// modules
import {ERC725Y} from "@erc725/smart-contracts/contracts/ERC725Y.sol";
import {LSP6KeyManager} from "lsp6/contracts/LSP6KeyManager.sol";
import {
LSP6KeyManager
} from "@lukso/lsp6-contracts/contracts/LSP6KeyManager.sol";

/**
* Helper contract to test internal functions of the KeyManager
Expand Down
4 changes: 3 additions & 1 deletion contracts/Mocks/KeyManagerInitWithExtraParams.sol
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
// SPDX-License-Identifier: Apache-2.0
pragma solidity ^0.8.4;

import {LSP6KeyManagerInit} from "lsp6/contracts/LSP6KeyManagerInit.sol";
import {
LSP6KeyManagerInit
} from "@lukso/lsp6-contracts/contracts/LSP6KeyManagerInit.sol";

contract KeyManagerInitWithExtraParams is LSP6KeyManagerInit {
address public firstParam;
Expand Down
4 changes: 3 additions & 1 deletion contracts/Mocks/KeyManagerWithExtraParams.sol
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
// SPDX-License-Identifier: Apache-2.0
pragma solidity ^0.8.4;

import {LSP6KeyManager} from "lsp6/contracts/LSP6KeyManager.sol";
import {
LSP6KeyManager
} from "@lukso/lsp6-contracts/contracts/LSP6KeyManager.sol";

contract KeyManagerWithExtraParams is LSP6KeyManager {
address public immutable FIRST_PARAM;
Expand Down
2 changes: 1 addition & 1 deletion contracts/Mocks/LSP17ExtendableTester.sol
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ pragma solidity ^0.8.4;

import {
LSP17Extendable
} from "lsp17contractextension/contracts/LSP17Extendable.sol";
} from "@lukso/lsp17contractextension-contracts/contracts/LSP17Extendable.sol";

/**
* @dev This contract is used only for testing purposes
Expand Down
Loading

0 comments on commit 1637db9

Please sign in to comment.