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

merged 6 commits into from
Jan 6, 2023

Conversation

Pandapip1
Copy link
Member

When opening a pull request to submit a new EIP, please use the suggested template: https://github.com/ethereum/EIPs/blob/master/eip-template.md

We have a GitHub bot that automatically merges some PRs. It will merge yours immediately if certain criteria are met:

  • The PR edits only existing draft PRs.
  • The build passes.
  • Your GitHub username or email address is listed in the 'author' header of all affected PRs, inside .
  • If matching on email address, the email address is the one publicly listed on your GitHub profile.

@eth-bot
Copy link
Collaborator

eth-bot commented Jul 12, 2022 •
edited
Loading

Hi! I'm a bot, and I wanted to automerge your PR, but couldn't because of the following issue(s):

(fail) eip-3267.md

classification
updateEIP
  • eip-3267.md requires approval from one of (@vporton)

(pass) assets/eip-3267/contracts/BaseBidOnAddresses.sol

classification
ambiguous
  • file assets/eip-3267/contracts/BaseBidOnAddresses.sol is associated with EIP 3267; because there are also changes being made to EIPS/eip-3267.md all changes to corresponding assets are also allowed

(pass) assets/eip-3267/contracts/BaseLock.sol

classification
ambiguous
  • file assets/eip-3267/contracts/BaseLock.sol is associated with EIP 3267; because there are also changes being made to EIPS/eip-3267.md all changes to corresponding assets are also allowed

(pass) assets/eip-3267/contracts/BaseRestorableSalary.sol

classification
ambiguous
  • file assets/eip-3267/contracts/BaseRestorableSalary.sol is associated with EIP 3267; because there are also changes being made to EIPS/eip-3267.md all changes to corresponding assets are also allowed

(pass) assets/eip-3267/contracts/BaseSalary.sol

classification
ambiguous
  • file assets/eip-3267/contracts/BaseSalary.sol is associated with EIP 3267; because there are also changes being made to EIPS/eip-3267.md all changes to corresponding assets are also allowed

(pass) assets/eip-3267/contracts/BidOnAddresses.sol

classification
ambiguous
  • file assets/eip-3267/contracts/BidOnAddresses.sol is associated with EIP 3267; because there are also changes being made to EIPS/eip-3267.md all changes to corresponding assets are also allowed

(pass) assets/eip-3267/contracts/DAOInterface.sol

classification
ambiguous
  • file assets/eip-3267/contracts/DAOInterface.sol is associated with EIP 3267; because there are also changes being made to EIPS/eip-3267.md all changes to corresponding assets are also allowed

(pass) assets/eip-3267/contracts/DefaultDAOInterface.sol

classification
ambiguous
  • file assets/eip-3267/contracts/DefaultDAOInterface.sol is associated with EIP 3267; because there are also changes being made to EIPS/eip-3267.md all changes to corresponding assets are also allowed

(pass) assets/eip-3267/contracts/ERC1155/ERC1155.sol

classification
ambiguous
  • file assets/eip-3267/contracts/ERC1155/ERC1155.sol is associated with EIP 3267; because there are also changes being made to EIPS/eip-3267.md all changes to corresponding assets are also allowed

(pass) assets/eip-3267/contracts/ERC1155/ERC1155TokenReceiver.sol

classification
ambiguous
  • file assets/eip-3267/contracts/ERC1155/ERC1155TokenReceiver.sol is associated with EIP 3267; because there are also changes being made to EIPS/eip-3267.md all changes to corresponding assets are also allowed

(pass) assets/eip-3267/contracts/ERC1155/ERC1155WithTotals.sol

classification
ambiguous
  • file assets/eip-3267/contracts/ERC1155/ERC1155WithTotals.sol is associated with EIP 3267; because there are also changes being made to EIPS/eip-3267.md all changes to corresponding assets are also allowed

(pass) assets/eip-3267/contracts/ERC1155/IERC1155.sol

classification
ambiguous
  • file assets/eip-3267/contracts/ERC1155/IERC1155.sol is associated with EIP 3267; because there are also changes being made to EIPS/eip-3267.md all changes to corresponding assets are also allowed

(pass) assets/eip-3267/contracts/ERC1155/IERC1155TokenReceiver.sol

classification
ambiguous
  • file assets/eip-3267/contracts/ERC1155/IERC1155TokenReceiver.sol is associated with EIP 3267; because there are also changes being made to EIPS/eip-3267.md all changes to corresponding assets are also allowed

(pass) assets/eip-3267/contracts/Salary.sol

classification
ambiguous
  • file assets/eip-3267/contracts/Salary.sol is associated with EIP 3267; because there are also changes being made to EIPS/eip-3267.md all changes to corresponding assets are also allowed

(pass) assets/eip-3267/contracts/SalaryWithDAO.sol

classification
ambiguous
  • file assets/eip-3267/contracts/SalaryWithDAO.sol is associated with EIP 3267; because there are also changes being made to EIPS/eip-3267.md all changes to corresponding assets are also allowed

@Pandapip1 Pandapip1 closed this Jul 14, 2022
@Pandapip1 Pandapip1 reopened this Jul 14, 2022
@Pandapip1
Copy link
Member Author

Closing and re-opening to test something unrelated.

@Pandapip1 Pandapip1 closed this Jul 14, 2022
@Pandapip1 Pandapip1 reopened this Jul 14, 2022
@Pandapip1 Pandapip1 closed this Jul 14, 2022
@Pandapip1 Pandapip1 reopened this Jul 14, 2022
@Pandapip1
Copy link
Member Author

Testing in prod moment

@Pandapip1 Pandapip1 closed this Jul 14, 2022
@Pandapip1 Pandapip1 reopened this Jul 14, 2022
@Pandapip1 Pandapip1 closed this Jul 14, 2022
@Pandapip1 Pandapip1 reopened this Jul 14, 2022
@Pandapip1 Pandapip1 closed this Jul 14, 2022
@Pandapip1 Pandapip1 reopened this Jul 14, 2022
@Pandapip1 Pandapip1 closed this Jul 14, 2022
@Pandapip1 Pandapip1 reopened this Jul 14, 2022
@Pandapip1
Copy link
Member Author

Bump.

@poojaranjan poojaranjan mentioned this pull request Jul 26, 2022
Closed
@lightclient
Copy link
Member

@Pandapip1 I don't think we can unilaterally convert these licenses as the authors should approve the change.

This was referenced Jul 26, 2022
Merged
Merged
Merged
Merged
@github-actions
Copy link

The commit 197d5b1 (as a parent of b7cdcd7) contains errors. Please inspect the Run Summary for details.

xinbenlv
xinbenlv reviewed Sep 24, 2022
View reviewed changes
assets/eip-3267/contracts/BaseRestorableSalary.sol
@@ -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

@github-actions
Copy link

There has been no activity on this pull request for 2 weeks. It will be closed after 3 months of inactivity. If you would like to move this PR forward, please respond to any outstanding feedback or add a comment indicating that you have addressed all required feedback and are ready for a review.

@github-actions github-actions bot added the w-stale Waiting on activity label Oct 11, 2022
@Pandapip1
Copy link
Member Author

Waiting for author review.

@github-actions github-actions bot removed the w-stale Waiting on activity label Oct 12, 2022
@github-actions
Copy link

There has been no activity on this pull request for 2 weeks. It will be closed after 3 months of inactivity. If you would like to move this PR forward, please respond to any outstanding feedback or add a comment indicating that you have addressed all required feedback and are ready for a review.

@github-actions github-actions bot added the w-stale Waiting on activity label Oct 27, 2022
@Pandapip1
Copy link
Member Author

Waiting for author review.

@github-actions github-actions bot removed the w-stale Waiting on activity label Oct 28, 2022
@github-actions
Copy link

There has been no activity on this pull request for 2 weeks. It will be closed after 3 months of inactivity. If you would like to move this PR forward, please respond to any outstanding feedback or add a comment indicating that you have addressed all required feedback and are ready for a review.

@github-actions github-actions bot added the w-stale Waiting on activity label Nov 12, 2022
@Pandapip1
Copy link
Member Author

Waiting for review

@github-actions github-actions bot removed the w-stale Waiting on activity label Nov 13, 2022
@github-actions
Copy link

There has been no activity on this pull request for 2 weeks. It will be closed after 3 months of inactivity. If you would like to move this PR forward, please respond to any outstanding feedback or add a comment indicating that you have addressed all required feedback and are ready for a review.

@github-actions github-actions bot added the w-stale Waiting on activity label Nov 27, 2022
@Pandapip1
Copy link
Member Author

Waiting on author review

@github-actions github-actions bot removed the w-stale Waiting on activity label Nov 28, 2022
@github-actions
Copy link

There has been no activity on this pull request for 2 weeks. It will be closed after 3 months of inactivity. If you would like to move this PR forward, please respond to any outstanding feedback or add a comment indicating that you have addressed all required feedback and are ready for a review.

@github-actions github-actions bot added the w-stale Waiting on activity label Dec 12, 2022
@ethereum ethereum deleted a comment from Rachi26 Dec 12, 2022
@github-actions github-actions bot removed the w-stale Waiting on activity label Dec 13, 2022
@github-actions
Copy link

There has been no activity on this pull request for 2 weeks. It will be closed after 3 months of inactivity. If you would like to move this PR forward, please respond to any outstanding feedback or add a comment indicating that you have addressed all required feedback and are ready for a review.

@github-actions github-actions bot added the w-stale Waiting on activity label Dec 28, 2022
@vporton
Copy link
Contributor

vporton commented Dec 28, 2022

For the author everything seems OK.

@github-actions github-actions bot removed the w-stale Waiting on activity label Dec 29, 2022
@Pandapip1
Copy link
Member Author

For the author everything seems OK.

Great! Adding to manual merge queue.

@Pandapip1 Pandapip1 added this to the Manual Merge Queue milestone Jan 4, 2023
@SamWilsn SamWilsn disabled auto-merge January 6, 2023 17:32
@SamWilsn SamWilsn merged commit e3c784a into ethereum:master Jan 6, 2023
@Pandapip1 Pandapip1 deleted the 3267-assets-cc0 branch January 6, 2023 17:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@xinbenlv xinbenlv xinbenlv left review comments

@eth-bot eth-bot Awaiting requested review from eth-bot eth-bot is a code owner

Assignees
No one assigned
Labels
a-review Waiting on author to review
Projects
None yet
Milestone
Manual Merge Queue
Development

Successfully merging this pull request may close these issues.
7 participants
@Pandapip1 @eth-bot @lightclient @MicahZoltu @vporton @xinbenlv @SamWilsn