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-4886: Fix SPDX license identifier #5232

Merged
merged 6 commits into from
Sep 4, 2022
Merged

Update EIP-4886: Fix SPDX license identifier #5232

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
26c9044
Fix SPDX license identifier in EIP-4886
Pandapip1 Jul 12, 2022
d5188dc
Satisfy eth bot
Pandapip1 Jul 13, 2022
94d343e
Merge branch 'ethereum:master' into 4886-assets-cc0
Pandapip1 Jul 26, 2022
abec7ab
Merge branch 'ethereum:master' into 4886-assets-cc0
Pandapip1 Aug 1, 2022
c0b2f7d
Merge branch 'ethereum:master' into 4886-assets-cc0
Pandapip1 Aug 11, 2022
8d02f32
Merge branch 'master' into 4886-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
1 change: 1 addition & 0 deletions EIPS/eip-4886.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,4 +291,5 @@ Potential negative security implications have been considered and none are envis
From a usability perspective the key risk is in users specifying the incorrect asset delivery address, though it is noted that this burden of accuracy is no different to that currently on the network.

## Copyright

Copyright and related rights waived via [CC0](../LICENSE.md).
2 changes: 1 addition & 1 deletion assets/eip-4886/contracts/EPS.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
// EPSProxy Contracts v1.7.0 (epsproxy/contracts/EPS.sol)

pragma solidity ^0.8.9;
Expand Down
2 changes: 1 addition & 1 deletion assets/eip-4886/contracts/Proxiable.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
// EPSProxy Contracts v1.7.0 (epsproxy/contracts/Proxiable.sol)

pragma solidity ^0.8.9;
Expand Down
2 changes: 1 addition & 1 deletion assets/eip-4886/contracts/ProxyRegister.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: BUSL-1.1
// SPDX-License-Identifier: CC0-1.0
// EPSProxy Contracts v1.7.0 (epsproxy/contracts/ProxyRegister.sol)

pragma solidity ^0.8.9;
Expand Down
2 changes: 1 addition & 1 deletion assets/eip-4886/contracts/examples/EPSExample721.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
// EPSProxy Contracts v1.8.0 (epsproxy/contracts/examples/EPSExample721.sol)

pragma solidity ^0.8.9;
Expand Down
2 changes: 1 addition & 1 deletion assets/eip-4886/contracts/examples/EPSGenesis.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
// EPSProxy Contracts v1.8.0 (epsproxy/contracts/examples/EPSGenesis.sol)

pragma solidity ^0.8.9;
Expand Down
2 changes: 1 addition & 1 deletion assets/eip-4886/contracts/examples/ERC20Proxied.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
// EPSProxy Contracts v1.8.0 (epsproxy/contracts/examples/ERC20Proxied.sol)

pragma solidity ^0.8.9;
Expand Down
2 changes: 1 addition & 1 deletion assets/eip-4886/contracts/examples/ERC721Proxied.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
// EPSProxy Contracts v1.8.0 (epsproxy/contracts/examples/ERC721Proxied.sol)

pragma solidity ^0.8.9;
Expand Down