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

Update copyright notice and formatting of solidity interfaces #68

Draft
wants to merge 2 commits into
base: develop
Choose a base branch
from
Draft

Update copyright notice and formatting of solidity interfaces #68

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
a0fb56b
Format solidity interfaces
zguesmi Apr 22, 2024
394a04a
Update changelog
zguesmi Apr 22, 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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
- Migrate to `SignatureVerifier.v8`
- Change MNEMONIC var name for production & clean Hardhat file. (#53)
- Format files & update copyright notices:
- Solidity interfaces (#68)
- DelegateBase, IexecERC20Core (#64)
- PoCo2 contracts (#54)
- PoCo1 contracts (#52)
Expand Down
45 changes: 14 additions & 31 deletions contracts/IexecInterfaceNative.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,6 @@
// SPDX-FileCopyrightText: 2020-2024 IEXEC BLOCKCHAIN TECH <[email protected]>
// SPDX-License-Identifier: Apache-2.0

/******************************************************************************
* Copyright 2020 IEXEC BLOCKCHAIN TECH *
* *
* Licensed under the Apache License, Version 2.0 (the "License"); *
* you may not use this file except in compliance with the License. *
* You may obtain a copy of the License at *
* *
* http://www.apache.org/licenses/LICENSE-2.0 *
* *
* Unless required by applicable law or agreed to in writing, software *
* distributed under the License is distributed on an "AS IS" BASIS, *
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. *
* See the License for the specific language governing permissions and *
* limitations under the License. *
******************************************************************************/

pragma solidity ^0.6.0;
pragma experimental ABIEncoderV2;

Expand All @@ -32,19 +17,17 @@ import "./modules/interfaces/IexecRelay.sol";
import "./modules/interfaces/IexecTokenSpender.sol";
import "./modules/interfaces/ENSIntegration.sol";


interface IexecInterfaceNative is
IOwnable,
IexecAccessors,
IexecCategoryManager,
IexecERC20,
IexecEscrowNative,
IexecMaintenance,
IexecOrderManagement,
IexecPoco1,
IexecPoco2,
IexecRelay,
IexecTokenSpender,
ENSIntegration
{
}
IOwnable,
IexecAccessors,
IexecCategoryManager,
IexecERC20,
IexecEscrowNative,
IexecMaintenance,
IexecOrderManagement,
IexecPoco1,
IexecPoco2,
IexecRelay,
IexecTokenSpender,
ENSIntegration
{}
47 changes: 15 additions & 32 deletions contracts/IexecInterfaceNativeABILegacy.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,6 @@
// SPDX-FileCopyrightText: 2020-2024 IEXEC BLOCKCHAIN TECH <[email protected]>
// SPDX-License-Identifier: Apache-2.0

/******************************************************************************
* Copyright 2020 IEXEC BLOCKCHAIN TECH *
* *
* Licensed under the Apache License, Version 2.0 (the "License"); *
* you may not use this file except in compliance with the License. *
* You may obtain a copy of the License at *
* *
* http://www.apache.org/licenses/LICENSE-2.0 *
* *
* Unless required by applicable law or agreed to in writing, software *
* distributed under the License is distributed on an "AS IS" BASIS, *
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. *
* See the License for the specific language governing permissions and *
* limitations under the License. *
******************************************************************************/

pragma solidity ^0.6.0;
pragma experimental ABIEncoderV2;

Expand All @@ -33,20 +18,18 @@ import "./modules/interfaces/IexecRelay.sol";
import "./modules/interfaces/IexecTokenSpender.sol";
import "./modules/interfaces/ENSIntegration.sol";


interface IexecInterfaceNativeABILegacy is
IOwnable,
IexecAccessors,
IexecAccessorsABILegacy,
IexecCategoryManager,
IexecERC20,
IexecEscrowNative,
IexecMaintenance,
IexecOrderManagement,
IexecPoco1,
IexecPoco2,
IexecRelay,
IexecTokenSpender,
ENSIntegration
{
}
IOwnable,
IexecAccessors,
IexecAccessorsABILegacy,
IexecCategoryManager,
IexecERC20,
IexecEscrowNative,
IexecMaintenance,
IexecOrderManagement,
IexecPoco1,
IexecPoco2,
IexecRelay,
IexecTokenSpender,
ENSIntegration
{}
49 changes: 17 additions & 32 deletions contracts/IexecInterfaceToken.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,6 @@
// SPDX-FileCopyrightText: 2020-2024 IEXEC BLOCKCHAIN TECH <[email protected]>
// SPDX-License-Identifier: Apache-2.0

/******************************************************************************
* Copyright 2020 IEXEC BLOCKCHAIN TECH *
* *
* Licensed under the Apache License, Version 2.0 (the "License"); *
* you may not use this file except in compliance with the License. *
* You may obtain a copy of the License at *
* *
* http://www.apache.org/licenses/LICENSE-2.0 *
* *
* Unless required by applicable law or agreed to in writing, software *
* distributed under the License is distributed on an "AS IS" BASIS, *
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. *
* See the License for the specific language governing permissions and *
* limitations under the License. *
******************************************************************************/

pragma solidity ^0.6.0;
pragma experimental ABIEncoderV2;

Expand All @@ -33,22 +18,22 @@ import "./modules/interfaces/IexecRelay.sol";
import "./modules/interfaces/IexecTokenSpender.sol";
import "./modules/interfaces/ENSIntegration.sol";


interface IexecInterfaceToken is
IOwnable,
IexecAccessors,
IexecCategoryManager,
IexecERC20,
IexecEscrowToken,
IexecEscrowTokenSwap,
IexecMaintenance,
IexecOrderManagement,
IexecPoco1,
IexecPoco2,
IexecRelay,
IexecTokenSpender,
ENSIntegration
IOwnable,
IexecAccessors,
IexecCategoryManager,
IexecERC20,
IexecEscrowToken,
IexecEscrowTokenSwap,
IexecMaintenance,
IexecOrderManagement,
IexecPoco1,
IexecPoco2,
IexecRelay,
IexecTokenSpender,
ENSIntegration
{
receive() external override(IexecEscrowToken, IexecEscrowTokenSwap) payable;
fallback() external override(IexecEscrowToken, IexecEscrowTokenSwap) payable;
receive() external payable override(IexecEscrowToken, IexecEscrowTokenSwap);

fallback() external payable override(IexecEscrowToken, IexecEscrowTokenSwap);
}
51 changes: 18 additions & 33 deletions contracts/IexecInterfaceTokenABILegacy.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,6 @@
// SPDX-FileCopyrightText: 2020-2024 IEXEC BLOCKCHAIN TECH <[email protected]>
// SPDX-License-Identifier: Apache-2.0

/******************************************************************************
* Copyright 2020 IEXEC BLOCKCHAIN TECH *
* *
* Licensed under the Apache License, Version 2.0 (the "License"); *
* you may not use this file except in compliance with the License. *
* You may obtain a copy of the License at *
* *
* http://www.apache.org/licenses/LICENSE-2.0 *
* *
* Unless required by applicable law or agreed to in writing, software *
* distributed under the License is distributed on an "AS IS" BASIS, *
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. *
* See the License for the specific language governing permissions and *
* limitations under the License. *
******************************************************************************/

pragma solidity ^0.6.0;
pragma experimental ABIEncoderV2;

Expand All @@ -34,23 +19,23 @@ import "./modules/interfaces/IexecRelay.sol";
import "./modules/interfaces/IexecTokenSpender.sol";
import "./modules/interfaces/ENSIntegration.sol";


interface IexecInterfaceTokenABILegacy is
IOwnable,
IexecAccessors,
IexecAccessorsABILegacy,
IexecCategoryManager,
IexecERC20,
IexecEscrowToken,
IexecEscrowTokenSwap,
IexecMaintenance,
IexecOrderManagement,
IexecPoco1,
IexecPoco2,
IexecRelay,
IexecTokenSpender,
ENSIntegration
IOwnable,
IexecAccessors,
IexecAccessorsABILegacy,
IexecCategoryManager,
IexecERC20,
IexecEscrowToken,
IexecEscrowTokenSwap,
IexecMaintenance,
IexecOrderManagement,
IexecPoco1,
IexecPoco2,
IexecRelay,
IexecTokenSpender,
ENSIntegration
{
receive() external override(IexecEscrowToken, IexecEscrowTokenSwap) payable;
fallback() external override(IexecEscrowToken, IexecEscrowTokenSwap) payable;
receive() external payable override(IexecEscrowToken, IexecEscrowTokenSwap);

fallback() external payable override(IexecEscrowToken, IexecEscrowTokenSwap);
}
17 changes: 1 addition & 16 deletions contracts/external/interfaces/IERC734.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,6 @@
// SPDX-FileCopyrightText: 2023-2024 IEXEC BLOCKCHAIN TECH <[email protected]>
// SPDX-License-Identifier: Apache-2.0

/******************************************************************************
* Copyright 2023 IEXEC BLOCKCHAIN TECH *
* *
* Licensed under the Apache License, Version 2.0 (the "License"); *
* you may not use this file except in compliance with the License. *
* You may obtain a copy of the License at *
* *
* http://www.apache.org/licenses/LICENSE-2.0 *
* *
* Unless required by applicable law or agreed to in writing, software *
* distributed under the License is distributed on an "AS IS" BASIS, *
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. *
* See the License for the specific language governing permissions and *
* limitations under the License. *
******************************************************************************/

pragma solidity ^0.8.0;

/**
Expand Down
23 changes: 3 additions & 20 deletions contracts/modules/interfaces/ENSIntegration.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,9 @@
// SPDX-FileCopyrightText: 2020-2024 IEXEC BLOCKCHAIN TECH <[email protected]>
// SPDX-License-Identifier: Apache-2.0

/******************************************************************************
* Copyright 2020 IEXEC BLOCKCHAIN TECH *
* *
* Licensed under the Apache License, Version 2.0 (the "License"); *
* you may not use this file except in compliance with the License. *
* You may obtain a copy of the License at *
* *
* http://www.apache.org/licenses/LICENSE-2.0 *
* *
* Unless required by applicable law or agreed to in writing, software *
* distributed under the License is distributed on an "AS IS" BASIS, *
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. *
* See the License for the specific language governing permissions and *
* limitations under the License. *
******************************************************************************/

pragma solidity ^0.6.0;
pragma experimental ABIEncoderV2;


interface ENSIntegration
{
function setName(address ens, string calldata name) external;
interface ENSIntegration {
function setName(address ens, string calldata name) external;
gfournieriExec marked this conversation as resolved.
Show resolved Hide resolved
}
29 changes: 7 additions & 22 deletions contracts/modules/interfaces/IOwnable.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,30 +1,15 @@
// SPDX-FileCopyrightText: 2020-2024 IEXEC BLOCKCHAIN TECH <[email protected]>
// SPDX-License-Identifier: Apache-2.0

/******************************************************************************
* Copyright 2020 IEXEC BLOCKCHAIN TECH *
* *
* Licensed under the Apache License, Version 2.0 (the "License"); *
* you may not use this file except in compliance with the License. *
* You may obtain a copy of the License at *
* *
* http://www.apache.org/licenses/LICENSE-2.0 *
* *
* Unless required by applicable law or agreed to in writing, software *
* distributed under the License is distributed on an "AS IS" BASIS, *
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. *
* See the License for the specific language governing permissions and *
* limitations under the License. *
******************************************************************************/

pragma solidity ^0.6.0;
pragma experimental ABIEncoderV2;

interface IOwnable {
event OwnershipTransferred(address indexed previousOwner, address indexed newOwner);

function owner() external view returns (address);

interface IOwnable
{
event OwnershipTransferred(address indexed previousOwner, address indexed newOwner);
function renounceOwnership() external;

function owner() external view returns (address);
function renounceOwnership() external;
function transferOwnership(address) external;
function transferOwnership(address) external;
}
Loading