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

EIP-5058:Lockable ERC-721 Standard #5058

Merged
merged 48 commits into from
Aug 25, 2022
Merged

EIP-5058:Lockable ERC-721 Standard #5058

merged 48 commits into from
Aug 25, 2022

Conversation

radiocaca
Copy link
Contributor

No description provided.

@eth-bot
Copy link
Collaborator

eth-bot commented Apr 29, 2022 •
edited
Loading

A critical exception has occurred:
Message: pr 5058 is already merged; quitting
(cc @alita-moore, @mryalamanchi)

@poojaranjan poojaranjan mentioned this pull request May 3, 2022
Closed
Pandapip1
Pandapip1 suggested changes May 4, 2022
View reviewed changes
Copy link
Member

@Pandapip1 Pandapip1 left a comment

Choose a reason for hiding this comment

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

Here's my first pass of this EIP. There are a few things that need fixing.

EIPS/eip-5058.md Outdated Show resolved Hide resolved
EIPS/eip-5058.md Outdated Show resolved Hide resolved
EIPS/eip-5058.md Outdated Show resolved Hide resolved
EIPS/eip-5058.md Outdated Show resolved Hide resolved
EIPS/eip-5058.md Outdated Show resolved Hide resolved
EIPS/eip-5058.md Outdated Show resolved Hide resolved
EIPS/eip-5058.md Outdated Show resolved Hide resolved
EIPS/eip-5058.md Outdated Show resolved Hide resolved
EIPS/eip-5058.md Outdated Show resolved Hide resolved
EIPS/eip-5058.md Outdated Show resolved Hide resolved
@radiocaca
Copy link
Contributor Author

Here's my first pass of this EIP. There are a few things that need fixing.

Thanks, I will fix your suggestion soon.

kjhman21
kjhman21 reviewed May 8, 2022
View reviewed changes
EIPS/eip-5058.md Outdated Show resolved Hide resolved
@radiocaca
Copy link
Contributor Author

radiocaca commented May 10, 2022 •
edited
Loading

@kjhman21 @Pandapip1
The proposal has been updated as required, please review it here.

Pandapip1
Pandapip1 suggested changes May 11, 2022
View reviewed changes
assets/eip-5058/ERC721Lockable.sol Outdated Show resolved Hide resolved
assets/eip-5058/IERC721Lockable.sol Outdated Show resolved Hide resolved
assets/eip-5058/extensions/EIP5058Bound.sol Outdated Show resolved Hide resolved
assets/eip-5058/factory/EIP5058Factory.sol Outdated Show resolved Hide resolved
assets/eip-5058/factory/ERC721Bound.sol Outdated Show resolved Hide resolved
assets/eip-5058/factory/IEIP5058Factory.sol Outdated Show resolved Hide resolved
assets/eip-5058/factory/IERC721Bound.sol Outdated Show resolved Hide resolved
EIPS/eip-5058.md Outdated Show resolved Hide resolved
radiocaca and others added 9 commits May 12, 2022 00:58
@radiocaca @Pandapip1
Update assets/eip-5058/factory/IERC721Bound.sol
07f7fe6 
Co-authored-by: Pandapip1 <45835846+Pandapip1@users.noreply.github.com>
@radiocaca @Pandapip1
Update assets/eip-5058/ERC721Lockable.sol
456c60e 
Co-authored-by: Pandapip1 <45835846+Pandapip1@users.noreply.github.com>
@radiocaca @Pandapip1
Update assets/eip-5058/IERC721Lockable.sol
cdbe439 
Co-authored-by: Pandapip1 <45835846+Pandapip1@users.noreply.github.com>
@radiocaca @Pandapip1
Update assets/eip-5058/factory/IEIP5058Factory.sol
2a7e737 
Co-authored-by: Pandapip1 <45835846+Pandapip1@users.noreply.github.com>
@radiocaca @Pandapip1
Update assets/eip-5058/factory/ERC721Bound.sol
fcd52e2 
Co-authored-by: Pandapip1 <45835846+Pandapip1@users.noreply.github.com>
@radiocaca @Pandapip1
Update assets/eip-5058/factory/EIP5058Factory.sol
5415e9c 
Co-authored-by: Pandapip1 <45835846+Pandapip1@users.noreply.github.com>
@radiocaca @Pandapip1
Update assets/eip-5058/extensions/EIP5058Bound.sol
2c29f8c 
Co-authored-by: Pandapip1 <45835846+Pandapip1@users.noreply.github.com>
@radiocaca
rename to ERC5058
82b6584
@radiocaca
update revert domain
9676777
Pandapip1
Pandapip1 reviewed May 13, 2022
View reviewed changes
EIPS/eip-5058.md Outdated Show resolved Hide resolved
@radiocaca @Pandapip1
Update EIPS/eip-5058.md
9002b06 
Co-authored-by: Pandapip1 <45835846+Pandapip1@users.noreply.github.com>
@radiocaca
Copy link
Contributor Author

@MicahZoltu @kjhman21 @Pandapip1 pls review.

@Pandapip1 Pandapip1 disabled auto-merge August 25, 2022 14:30
@Pandapip1 Pandapip1 enabled auto-merge (squash) August 25, 2022 14:30
@Pandapip1 Pandapip1 disabled auto-merge August 25, 2022 14:32
@eth-bot eth-bot enabled auto-merge (squash) August 25, 2022 14:33
@eth-bot eth-bot merged commit cff0163 into ethereum:master Aug 25, 2022
nachomazzara pushed a commit to nachomazzara/EIPs that referenced this pull request Jan 13, 2023
@radiocaca @sfumato00
@Pandapip1 @kjhman21 @nachomazzara
EIP-5058:Lockable ERC-721 Standard (ethereum#5058)
f37335e 
* EIP-5058:Lockable ERC-721 Standard

* update eip

* Update eip-5058.md

* Update eip-5058.md proposal language

* Update eip-5058.md proposal language

* Update eip-5058.md

* Update eip-5058.md

* upload example

* Update assets/eip-5058/factory/IERC721Bound.sol

Co-authored-by: Pandapip1 <45835846+Pandapip1@users.noreply.github.com>

* Update assets/eip-5058/ERC721Lockable.sol

Co-authored-by: Pandapip1 <45835846+Pandapip1@users.noreply.github.com>

* Update assets/eip-5058/IERC721Lockable.sol

Co-authored-by: Pandapip1 <45835846+Pandapip1@users.noreply.github.com>

* Update assets/eip-5058/factory/IEIP5058Factory.sol

Co-authored-by: Pandapip1 <45835846+Pandapip1@users.noreply.github.com>

* Update assets/eip-5058/factory/ERC721Bound.sol

Co-authored-by: Pandapip1 <45835846+Pandapip1@users.noreply.github.com>

* Update assets/eip-5058/factory/EIP5058Factory.sol

Co-authored-by: Pandapip1 <45835846+Pandapip1@users.noreply.github.com>

* Update assets/eip-5058/extensions/EIP5058Bound.sol

Co-authored-by: Pandapip1 <45835846+Pandapip1@users.noreply.github.com>

* rename to ERC5058

* update revert domain

* Update EIPS/eip-5058.md

Co-authored-by: Pandapip1 <45835846+Pandapip1@users.noreply.github.com>

* Update EIPS/eip-5058.md

Co-authored-by: Junghyun Colin Kim <colin.klaytn@krustuniverse.com>

* Update EIPS/eip-5058.md

Co-authored-by: Junghyun Colin Kim <colin.klaytn@krustuniverse.com>

* remove all external links and add lockExpiredTime function

* add tests

* rename from to owner

* Update EIPS/eip-5058.md

Co-authored-by: Pandapip1 <45835846+Pandapip1@users.noreply.github.com>

* Update EIPS/eip-5058.md

Co-authored-by: Pandapip1 <45835846+Pandapip1@users.noreply.github.com>

* Update EIPS/eip-5058.md

Co-authored-by: Pandapip1 <45835846+Pandapip1@users.noreply.github.com>

* Update EIPS/eip-5058.md

Co-authored-by: Pandapip1 <45835846+Pandapip1@users.noreply.github.com>

* Update EIPS/eip-5058.md

Co-authored-by: Pandapip1 <45835846+Pandapip1@users.noreply.github.com>

* Update assets/eip-5058/IERC5058.sol

Co-authored-by: Pandapip1 <45835846+Pandapip1@users.noreply.github.com>

* Update EIPS/eip-5058.md

Co-authored-by: Pandapip1 <45835846+Pandapip1@users.noreply.github.com>

* Update EIPS/eip-5058.md

Co-authored-by: Pandapip1 <45835846+Pandapip1@users.noreply.github.com>

* Update EIPS/eip-5058.md

Co-authored-by: Pandapip1 <45835846+Pandapip1@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: Pandapip1 <45835846+Pandapip1@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: Pandapip1 <45835846+Pandapip1@users.noreply.github.com>

* fix lockFrom

* update md

* fix lockFrom tests

* remove oz deps

* modify md for eip change

* refine tests

Co-authored-by: John Sfumato <sfumato000@gmail.com>
Co-authored-by: Pandapip1 <45835846+Pandapip1@users.noreply.github.com>
Co-authored-by: Junghyun Colin Kim <colin.klaytn@krustuniverse.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@eth-bot eth-bot eth-bot approved these changes

@Pandapip1 Pandapip1 Pandapip1 approved these changes

@kjhman21 kjhman21 kjhman21 approved these changes

@MicahZoltu MicahZoltu Awaiting requested review from MicahZoltu

@lightclient lightclient Awaiting requested review from lightclient

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@radiocaca @eth-bot @MicahZoltu @lightclient @kjhman21 @Pandapip1 @SamWilsn @sfumato00