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.

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

lang edits (careful merging w/upstream comments) #3

Closed
wants to merge 98 commits into from
Closed

lang edits (careful merging w/upstream comments) #3

wants to merge 98 commits into from

Conversation

bumblefudge
Copy link

@bumblefudge bumblefudge commented Jul 1, 2023

I guess on the EIPs repo un-requested reviewers can't just request changes on any old line so I had to open a PR... but I think I was pulling against an older master branch (maybe you've been accepting suggestions or pushing commits direct to your branch on ethereum/eips?), so this might be an exercise in chaos. i'll keep my local branch in case it's easier to just resubmit elsewhere/otherwise (i.e., just request my review over there if it saves you time!)

g11tech and others added 30 commits May 30, 2023 09:54
Merged by EIP-Bot.
* Update eip-2612.md

* Update eip-2612.md

---------

Co-authored-by: zakrad <[email protected]>
Merged by EIP-Bot.
fulldecent and others added 9 commits June 24, 2023 10:56
* erc721lockable init

* update discussion

* update license

* update readme

* add eip header

* update title

* update readme

* update readme

* update readme

* update readme

* update eip number

* update eip number

* update eip number

* update eip number

* update eip number

* update readme

* update readme

* update readme

* update readme

* error codes

* added interface to specification

* lint fixe

* transfer with lock/approve

* rename

* readme update

* optimize lock/unlock

* readme with new functions

* readme update

* error codes

* discussion link

* tokenId

* remove redundancy

* updates test

* updates doc

* review fixes

* overrides and interface correction

* add locker to transferAndLock

* remove locker

* license

* doc update

* doc update

* doc update

* author updates

---------

Co-authored-by: piyush.chittara <[email protected]>
Co-authored-by: Piyush <[email protected]>
Co-authored-by: Sam Wilson <[email protected]>
@kdenhartog
Copy link
Owner

kdenhartog commented Jul 4, 2023

Yeah I've been trying to use feature branches. Can you do this PR against the kdh/eip-6963-updates branch instead which is the one I'm PRing against EIP repo? You should already be able to directly merge against that feature branch since I don't have branch protections on it. I'll grant you permissions on this repo as well to make it easier.

@github-actions
Copy link

github-actions bot commented Jul 4, 2023

The commit ebea035 (as a parent of 5781f3d) contains errors.
Please inspect the Run Summary for details.

@github-actions github-actions bot added the w-ci label Jul 4, 2023
@bumblefudge
Copy link
Author

closed in leiu of #4

@bumblefudge bumblefudge closed this Jul 4, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment