Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

build!: move LSP14 in its own package #860

Merged
merged 2 commits into from
Jan 30, 2024
Merged

build!: move LSP14 in its own package #860

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a685c7f
build: move LSP14 in its own package
CJ42 Nov 24, 2023
d71c72d
refactor: update import paths + add LSP14 in remappings
CJ42 Jan 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/workflows/solc_version.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ jobs:
lsp2/=packages/LSP2ERC725YJSONSchema/ \
lsp4/=packages/LSP4DigitalAssetMetadata/ \
lsp5/=packages/LSP5ReceivedAssets/ \
lsp14/=packages/LSP14Ownable2Step/ \
lsp17contractextension/=packages/LSP17ContractExtension/ \
lsp20/=packages/LSP20CallVerification/ \
lsp25/=packages/LSP25ExecuteRelayCall/
Expand All @@ -96,6 +97,7 @@ jobs:
lsp2/=packages/LSP2ERC725YJSONSchema/ \
lsp4/=packages/LSP4DigitalAssetMetadata/ \
lsp5/=packages/LSP5ReceivedAssets/ \
lsp14/=packages/LSP14Ownable2Step/ \
lsp17contractextension/=packages/LSP17ContractExtension/ \
lsp20/=packages/LSP20CallVerification/ \
lsp25/=packages/LSP25ExecuteRelayCall/
Expand Down
4 changes: 2 additions & 2 deletions contracts/LSP0ERC725Account/LSP0ERC725AccountCore.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import {ERC725XCore} from "@erc725/smart-contracts/contracts/ERC725XCore.sol";
import {
OwnableUnset
} from "@erc725/smart-contracts/contracts/custom/OwnableUnset.sol";
import {LSP14Ownable2Step} from "../LSP14Ownable2Step/LSP14Ownable2Step.sol";
import {LSP14Ownable2Step} from "lsp14/contracts/LSP14Ownable2Step.sol";
import {
LSP17Extendable
} from "lsp17contractextension/contracts/LSP17Extendable.sol";
Expand All @@ -50,7 +50,7 @@ import {
_LSP1_UNIVERSAL_RECEIVER_DELEGATE_PREFIX,
_LSP1_UNIVERSAL_RECEIVER_DELEGATE_KEY
} from "lsp1/contracts/LSP1Constants.sol";
import {_INTERFACEID_LSP14} from "../LSP14Ownable2Step/LSP14Constants.sol";
import {_INTERFACEID_LSP14} from "lsp14/contracts/LSP14Constants.sol";

import {
_LSP17_EXTENSION_PREFIX
Expand Down
2 changes: 1 addition & 1 deletion contracts/LSP17Extensions/Extension4337.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import {
import {ILSP20CallVerifier} from "lsp20/contracts/ILSP20CallVerifier.sol";

// modules
import {LSP14Ownable2Step} from "../LSP14Ownable2Step/LSP14Ownable2Step.sol";
import {LSP14Ownable2Step} from "lsp14/contracts/LSP14Ownable2Step.sol";
import {
LSP17Extension
} from "lsp17contractextension/contracts/LSP17Extension.sol";
Expand Down
2 changes: 1 addition & 1 deletion contracts/LSP6KeyManager/LSP6KeyManagerCore.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import {
} from "lsp25/contracts/ILSP25ExecuteRelayCall.sol";

// modules
import {ILSP14Ownable2Step} from "../LSP14Ownable2Step/ILSP14Ownable2Step.sol";
import {ILSP14Ownable2Step} from "lsp14/contracts/ILSP14Ownable2Step.sol";
import {ERC725Y} from "@erc725/smart-contracts/contracts/ERC725Y.sol";
import {ERC165} from "@openzeppelin/contracts/utils/introspection/ERC165.sol";
import {LSP6SetDataModule} from "./LSP6Modules/LSP6SetDataModule.sol";
Expand Down
4 changes: 2 additions & 2 deletions contracts/LSP9Vault/LSP9VaultCore.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import {ERC725YCore} from "@erc725/smart-contracts/contracts/ERC725YCore.sol";
import {
OwnableUnset
} from "@erc725/smart-contracts/contracts/custom/OwnableUnset.sol";
import {LSP14Ownable2Step} from "../LSP14Ownable2Step/LSP14Ownable2Step.sol";
import {LSP14Ownable2Step} from "lsp14/contracts/LSP14Ownable2Step.sol";
import {
LSP17Extendable
} from "lsp17contractextension/contracts/LSP17Extendable.sol";
Expand Down Expand Up @@ -61,7 +61,7 @@ import {
_TYPEID_LSP9_OwnershipTransferred_SenderNotification,
_TYPEID_LSP9_OwnershipTransferred_RecipientNotification
} from "./LSP9Constants.sol";
import {_INTERFACEID_LSP14} from "../LSP14Ownable2Step/LSP14Constants.sol";
import {_INTERFACEID_LSP14} from "lsp14/contracts/LSP14Constants.sol";
import {
_LSP17_EXTENSION_PREFIX
} from "lsp17contractextension/contracts/LSP17Constants.sol";
Expand Down
4 changes: 2 additions & 2 deletions contracts/Mocks/ERC165Interfaces.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ import {
} from "../LSP11BasicSocialRecovery/ILSP11BasicSocialRecovery.sol";
import {
ILSP14Ownable2Step as ILSP14
} from "../LSP14Ownable2Step/ILSP14Ownable2Step.sol";
} from "lsp14/contracts/ILSP14Ownable2Step.sol";
import {
ILSP20CallVerifier as ILSP20
} from "lsp20/contracts/ILSP20CallVerifier.sol";
Expand All @@ -74,7 +74,7 @@ import {_INTERFACEID_LSP9} from "../LSP9Vault/LSP9Constants.sol";
import {
_INTERFACEID_LSP11
} from "../LSP11BasicSocialRecovery/LSP11Constants.sol";
import {_INTERFACEID_LSP14} from "../LSP14Ownable2Step/LSP14Constants.sol";
import {_INTERFACEID_LSP14} from "lsp14/contracts/LSP14Constants.sol";
import {
_INTERFACEID_LSP17_EXTENDABLE,
_INTERFACEID_LSP17_EXTENSION
Expand Down
2 changes: 1 addition & 1 deletion contracts/Mocks/LSP1TypeIDsTester.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import {
_TYPEID_LSP14_OwnershipTransferStarted,
_TYPEID_LSP14_OwnershipTransferred_SenderNotification,
_TYPEID_LSP14_OwnershipTransferred_RecipientNotification
} from "../LSP14Ownable2Step/LSP14Constants.sol";
} from "lsp14/contracts/LSP14Constants.sol";

error LSP1TypeIdHashIsWrong(bytes32 typeIdHash, string typeIdname);

Expand Down
4 changes: 1 addition & 3 deletions contracts/Mocks/LSP20Owners/FallbackReturnMagicValue.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,7 @@
pragma solidity ^0.8.4;

import {ILSP20CallVerifier} from "lsp20/contracts/ILSP20CallVerifier.sol";
import {
ILSP14Ownable2Step
} from "../../LSP14Ownable2Step/ILSP14Ownable2Step.sol";
import {ILSP14Ownable2Step} from "lsp14/contracts/ILSP14Ownable2Step.sol";

/**
* @title sample contract used for testing
Expand Down
4 changes: 1 addition & 3 deletions contracts/Mocks/LSP20Owners/FirstCallReturnExpandedInvalidValue.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
// SPDX-License-Identifier: Apache-2.0
pragma solidity ^0.8.4;

import {
ILSP14Ownable2Step
} from "../../LSP14Ownable2Step/ILSP14Ownable2Step.sol";
import {ILSP14Ownable2Step} from "lsp14/contracts/ILSP14Ownable2Step.sol";

/**
* @title sample contract used for testing
Expand Down
4 changes: 1 addition & 3 deletions contracts/Mocks/LSP20Owners/FirstCallReturnInvalidMagicValue.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
// SPDX-License-Identifier: Apache-2.0
pragma solidity ^0.8.4;
import {
ILSP14Ownable2Step
} from "../../LSP14Ownable2Step/ILSP14Ownable2Step.sol";
import {ILSP14Ownable2Step} from "lsp14/contracts/ILSP14Ownable2Step.sol";

/**
* @title sample contract used for testing
Expand Down
4 changes: 1 addition & 3 deletions contracts/Mocks/LSP20Owners/ImplementingFallback.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
// SPDX-License-Identifier: Apache-2.0
pragma solidity ^0.8.4;

import {
ILSP14Ownable2Step
} from "../../LSP14Ownable2Step/ILSP14Ownable2Step.sol";
import {ILSP14Ownable2Step} from "lsp14/contracts/ILSP14Ownable2Step.sol";

/**
* @title sample contract used for testing
Expand Down
4 changes: 1 addition & 3 deletions contracts/Mocks/LSP20Owners/NotImplementingVerifyCall.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
// SPDX-License-Identifier: Apache-2.0
pragma solidity ^0.8.4;

import {
ILSP14Ownable2Step
} from "../../LSP14Ownable2Step/ILSP14Ownable2Step.sol";
import {ILSP14Ownable2Step} from "lsp14/contracts/ILSP14Ownable2Step.sol";

/**
* @title sample contract used for testing
Expand Down
4 changes: 1 addition & 3 deletions contracts/Mocks/LSP20Owners/OwnerWIthURD.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,7 @@ import {
ILSP1UniversalReceiver
} from "lsp1/contracts/ILSP1UniversalReceiver.sol";

import {
ILSP14Ownable2Step
} from "../../LSP14Ownable2Step/ILSP14Ownable2Step.sol";
import {ILSP14Ownable2Step} from "lsp14/contracts/ILSP14Ownable2Step.sol";

import {ILSP20CallVerifier} from "lsp20/contracts/ILSP20CallVerifier.sol";
import {
Expand Down
4 changes: 2 additions & 2 deletions contracts/Mocks/UPWithInstantAcceptOwnership.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import {
import {
OwnableUnset
} from "@erc725/smart-contracts/contracts/custom/OwnableUnset.sol";
import {LSP14Ownable2Step} from "../LSP14Ownable2Step/LSP14Ownable2Step.sol";
import {LSP14Ownable2Step} from "lsp14/contracts/LSP14Ownable2Step.sol";

// constants
import {
Expand All @@ -19,7 +19,7 @@ import {
} from "../LSP9Vault/LSP9Constants.sol";
import {
_TYPEID_LSP14_OwnershipTransferStarted
} from "../LSP14Ownable2Step/LSP14Constants.sol";
} from "lsp14/contracts/LSP14Constants.sol";

/**
* @dev This contract is used only for testing purposes
Expand Down
2 changes: 1 addition & 1 deletion contracts/Mocks/UniversalReceivers/UniversalReceiverDelegateDataUpdater.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ pragma solidity ^0.8.4;

// interfaces
import {ILSP6KeyManager} from "../../LSP6KeyManager/ILSP6KeyManager.sol";
import {LSP14Ownable2Step} from "../../LSP14Ownable2Step/LSP14Ownable2Step.sol";
import {LSP14Ownable2Step} from "lsp14/contracts/LSP14Ownable2Step.sol";

import {
ILSP1UniversalReceiverDelegate
Expand Down
Loading
Loading