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

Update EIP-3267: Fix SPDX license identifier #5227

Merged
merged 6 commits into from
Jan 6, 2023
Merged

Update EIP-3267: Fix SPDX license identifier #5227

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
13d4576
Make EIP-3267 assets CC0
Pandapip1 Jul 12, 2022
255e973
I guess I'll fix a typo to allow EIP bot to merge this with approval
Pandapip1 Jul 13, 2022
197d5b1
Merge branch 'ethereum:master' into 3267-assets-cc0
Pandapip1 Jul 26, 2022
10f59a0
Merge branch 'ethereum:master' into 3267-assets-cc0
Pandapip1 Aug 1, 2022
6f2310a
Merge branch 'ethereum:master' into 3267-assets-cc0
Pandapip1 Aug 11, 2022
532078d
Merge branch 'master' into 3267-assets-cc0
Pandapip1 Aug 12, 2022
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: 1 addition & 1 deletion EIPS/eip-3267.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ Paradoxically, it will directly benefit miners/validators, see the discussion.

`MineFraction` = `TBD` (0..1)

[The contracts source](../assets/eip-3267/contracts/README.md)
[The contract's source](../assets/eip-3267/contracts/README.md)

Prior to `FORK_BLOCK_NUMBER`, `SalaryWithDAO` and `DefaultDAOInterface` contracts will be deployed to the network and exist at the above specified addresses.

Expand Down
2 changes: 1 addition & 1 deletion assets/eip-3267/contracts/BaseBidOnAddresses.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: LGPL-3.0-or-later
// SPDX-License-Identifier: CC0-1.0
pragma solidity ^0.7.1;
import { SafeMath } from "@openzeppelin/contracts/math/SafeMath.sol";
import { ABDKMath64x64 } from "abdk-libraries-solidity/ABDKMath64x64.sol";
Expand Down
2 changes: 1 addition & 1 deletion assets/eip-3267/contracts/BaseLock.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: LGPL-3.0-or-later
// SPDX-License-Identifier: CC0-1.0
pragma solidity ^0.7.1;
import { SafeMath } from "@openzeppelin/contracts/math/SafeMath.sol";
import { ABDKMath64x64 } from "abdk-libraries-solidity/ABDKMath64x64.sol";
Expand Down
2 changes: 1 addition & 1 deletion assets/eip-3267/contracts/BaseRestorableSalary.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: LGPL-3.0-or-later
// SPDX-License-Identifier: CC0-1.0
Copy link
Contributor

@xinbenlv xinbenlv Sep 24, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For licensing change like this and elsewhere, ask the original code author for approval?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes

pragma solidity ^0.7.1;
import "./Salary.sol";

Expand Down
2 changes: 1 addition & 1 deletion assets/eip-3267/contracts/BaseSalary.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: LGPL-3.0-or-later
// SPDX-License-Identifier: CC0-1.0
pragma solidity ^0.7.1;
import "./BaseBidOnAddresses.sol";

Expand Down
2 changes: 1 addition & 1 deletion assets/eip-3267/contracts/BidOnAddresses.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: LGPL-3.0-or-later
// SPDX-License-Identifier: CC0-1.0
pragma solidity ^0.7.1;
import "./BaseBidOnAddresses.sol";

Expand Down
2 changes: 1 addition & 1 deletion assets/eip-3267/contracts/DAOInterface.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: LGPL-3.0-or-later
// SPDX-License-Identifier: CC0-1.0
pragma solidity ^0.7.1;

/// @notice The "DAO plugin" interface.
Expand Down
2 changes: 1 addition & 1 deletion assets/eip-3267/contracts/DefaultDAOInterface.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: LGPL-3.0-or-later
// SPDX-License-Identifier: CC0-1.0
pragma solidity ^0.7.1;
import "./DAOInterface.sol";

Expand Down
2 changes: 1 addition & 1 deletion assets/eip-3267/contracts/ERC1155/ERC1155.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: MIT
// SPDX-License-Identifier: CC0-1.0

pragma solidity >=0.6.0 <0.8.0;

Expand Down
2 changes: 1 addition & 1 deletion assets/eip-3267/contracts/ERC1155/ERC1155TokenReceiver.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: LGPL-3.0-or-later
// SPDX-License-Identifier: CC0-1.0
pragma solidity ^0.7.1;

import "./IERC1155TokenReceiver.sol";
Expand Down
2 changes: 1 addition & 1 deletion assets/eip-3267/contracts/ERC1155/ERC1155WithTotals.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: LGPL-3.0-or-later
// SPDX-License-Identifier: CC0-1.0
pragma solidity ^0.7.1;
import "@openzeppelin/contracts/math/SafeMath.sol";
import { ERC1155 } from "./ERC1155.sol";
Expand Down
2 changes: 1 addition & 1 deletion assets/eip-3267/contracts/ERC1155/IERC1155.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: LGPL-3.0-or-later
// SPDX-License-Identifier: CC0-1.0
pragma solidity ^0.7.1;

import "@openzeppelin/contracts/introspection/IERC165.sol";
Expand Down
2 changes: 1 addition & 1 deletion assets/eip-3267/contracts/ERC1155/IERC1155TokenReceiver.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: LGPL-3.0-or-later
// SPDX-License-Identifier: CC0-1.0
pragma solidity ^0.7.1;

import "@openzeppelin/contracts/introspection/IERC165.sol";
Expand Down
2 changes: 1 addition & 1 deletion assets/eip-3267/contracts/Salary.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: LGPL-3.0-or-later
// SPDX-License-Identifier: CC0-1.0
pragma solidity ^0.7.1;
import "./BaseSalary.sol";

Expand Down
2 changes: 1 addition & 1 deletion assets/eip-3267/contracts/SalaryWithDAO.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: LGPL-3.0-or-later
// SPDX-License-Identifier: CC0-1.0
pragma solidity ^0.7.1;
import { ABDKMath64x64 } from "abdk-libraries-solidity/ABDKMath64x64.sol";
import "./BaseRestorableSalary.sol";
Expand Down