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

Soft Fork 0.22.2 - Steem Protection #3615

Closed
wants to merge 6 commits into from
Closed

Soft Fork 0.22.2 - Steem Protection #3615

wants to merge 6 commits into from

Conversation

netuoso
Copy link

@netuoso netuoso commented Feb 23, 2020

For more details about these changes, please refer to the main announcement post here: https://steemit.com/steem/@softfork222/soft-fork-222

@iamsmooth
Copy link

iamsmooth commented Feb 24, 2020

@netuoso It is usually customary to squash a lot of the small commits when making a pull request, so the main repo isn't cluttered with in-progress versions on what overall is a pretty small update. I'm pretty sure you can do it in place on your repo and the PR will pick up the new (shorter) commit list.

@joticajulian
Copy link
Contributor

@netuoso escrow_transfer_operation is still open

@netuoso
Copy link
Author

netuoso commented Feb 25, 2020

@iamsmooth that is usually customary in a repo that does not rely on the particular hash that has been pushed. Since users built off the Steemdevs/steem branch at a particular hash, the PR should reflect that.

If SteemIt wants to remake the PR and squash the commits before they get into their branch, they can do so. But squashing and force pushing to a branch is a no go in this situation.

SteemIt tends to close PRs and remake them theirselves. Shouldn't affect their process.

However, if SteemIt doesnt want to remake the PR and would prefer it to be updated with master and the extraneous commits squashed, I can always make a new branch to base the PR from and resubmit. I will await their instruction. Assuming they even want to merge this at all.

This PR is really mainly for transparency on the main repo.

@netuoso
Copy link
Author

netuoso commented Feb 25, 2020

@joticajulian thanks. that hole has been patched and witnesses are on the latest update that blocks the escrow_transfer. Good thing we were able to patch so quickly since you dropped this comment in public.

@iamsmooth
Copy link

@netuoso

Since users built off the Steemdevs/steem branch at a particular hash, the PR should reflect that

Yeah I agree. It's ugly that it wasn't squashed before then, but I understand why it happened that way.

@joticajulian
Copy link
Contributor

Is there a specific reason to add the vote_operation in the list?
https://steemit.com/@jga/q6gb4b

@netuoso netuoso closed this Mar 3, 2020
@netuoso netuoso deleted the 0.22.2 branch March 3, 2020 21:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants