Skip to content

Meetings: add 2018-07-12 & 2018-07-19 #576

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

Merged
merged 3 commits into from
Jul 23, 2018

Conversation

harding
Copy link
Contributor

@harding harding commented Jul 13, 2018

@harding harding force-pushed the 2018-07-13-meeting branch from 7a4ef3c to 494c83d Compare July 20, 2018 19:58
@harding
Copy link
Contributor Author

harding commented Jul 20, 2018

Added 2018-07-19 meeting since previous meeting notes didn't have any reviews yet. Preview: http://dg0.dtrt.org/en/meetings/2018/07/19/

For the topic about Bitcoin.org, I wrote a background and conclusion section but for the discussion section, I just linked to the log. That's not a subject about which I can credibly summarize in a dispassionate manner. I think just linking to the log here is fine, but if someone else wants to write a summary of the discussion, I'd be happy to include it.

@harding harding changed the title Meetings: add 2018-07-12 Meetings: add 2018-07-12 & 2018-07-19 Jul 21, 2018
Copy link
Contributor

@jnewbery jnewbery left a comment

Choose a reason for hiding this comment

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

ACK 494c83d. A few nits/comments inline, but this is good to go as-is.

For the Bitcoin.org topic, I've made some suggestions to change the wording, but I'll also recuse myself from writing the detailed log 😛

Several meeting participants listed things they'd like to get in that
they're worried won't be complete before the freeze:

- [New `scantxout` RPC][#12196], mentioned by Jonas Schnelli
Copy link
Contributor

Choose a reason for hiding this comment

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

nit: The rendered link looks slightly odd. It's a matter of personal taste, but consider removing the backticks.

which of a user's bitcoins to spend in a particular transaction. The
selected *Unspent Transaction Outputs (UTXOs)*, often simply called
*coins,* become *inputs* in the transaction. Developers have spent many
hours in the past year improving Bitcoin Core's coin selection to be
Copy link
Contributor

Choose a reason for hiding this comment

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

nit: many hours undersells this a bit! Many developer days or weeks would be closer to the mark.

[log coredev meet]: {{log}}#l-279

[meet osd]: /en/meetings/2018/06/28/#output-script-descriptors
[osd gist]: https://gist.github.com/sipa/e3d23d498c430bb601c5bca83523fa82
Copy link
Contributor

Choose a reason for hiding this comment

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

I sometimes worry that gists aren't stable links, since they feel more ephemeral. There's not really any alternative though, and better to link to this now and risk having it break in future than not link.

working for it.

There are several seeder programs written by different authors. One of
them is maintained by Pieter Wuille and is simply called `bitcoin-seeder`.
Copy link
Contributor

Choose a reason for hiding this comment

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


## Moving away from Bitcoin.org

**Background:** Since the 2009 release of the original Bitcoin software,
Copy link
Contributor

Choose a reason for hiding this comment

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

I think this is ok, but some of the conjunctions are perhaps a little loaded (But over time..., so Bitcoin Core began.., etc)

I've made an attempt at rewriting the section. Feel free to take or leave:

Background: Since the 2009 release of the original Bitcoin software, Bitcoin (and later Bitcoin Core) resources have been hosted on Bitcoin.org. Over time, this was augmented with additional resources about the increasingly diverse Bitcoin network.

In December 2015 Bitcoin Core began using its own domain to host its resources, and later also to host its software releases. Release announcements and software continue to be mirrored to Bitcoin.org.

Discussion: Andrew Chow introduced the topic by suggesting "moving away from Bitcoin.org". He added "we still link to bitcoin.org for things like downloads. [We] should probably change those". See the [log][log bco] for the full discussion. Some discussion also occurred [after the meeting][post-meeting bco].

Conclusion: No explicit conclusion. Post-meeting discussion seemed to indicate no significant changes to the current process.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Used this text verbatim except for two capitalization changes to match the style used elsewhere in the document. Thanks!

@harding
Copy link
Contributor Author

harding commented Jul 23, 2018

Commit c5495d1 implements all improvements suggested by @jnewbery (thanks!). I plan to merge this later today, but am happy to delay if anyone else wants to review.

Copy link
Contributor

@jnewbery jnewbery left a comment

Choose a reason for hiding this comment

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

looks good. Sorry, I've added one more nit.

they're worried won't be complete before the freeze:

- [New scantxout RPC][#12196], mentioned by Jonas Schnelli
- [New `disableprivatekey` setting][#9662] for watching-only wallets,
Copy link
Contributor

Choose a reason for hiding this comment

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

Same feedback as the line above: remove backticks to avoid strange-looking link.

Copy link
Contributor

Choose a reason for hiding this comment

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

I fixed, squashed and force-pushed this to not delay the merge. Hope that's ok @harding!

Copy link
Contributor

Choose a reason for hiding this comment

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

(I assume so since you'd already done the same fix to the link above)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

LGTM, thanks! I'll wait another couple hours until around 16:00 EDT in case anyone else wants to comment, then merge.

Includes some text about Bitcoin.org written by John Newbery
@jnewbery jnewbery force-pushed the 2018-07-13-meeting branch from c5495d1 to 2df5496 Compare July 23, 2018 18:06
@jnewbery
Copy link
Contributor

ACK 2df5496. Happy to have the fixup commit squashed (or not!)

@jnewbery jnewbery merged commit 7f12b8b into bitcoin-core:master Jul 23, 2018
@maflcko
Copy link

maflcko commented Jul 23, 2018

Could someone please create a singed merge commit of merge 1aa9649 7f12b8b?

Otherwise, this will not be shown on the website.

harding added a commit to harding/website that referenced this pull request Jul 23, 2018
@harding
Copy link
Contributor Author

harding commented Jul 23, 2018

@MarcoFalke do you know of a way to do that? I played around, I don't see a way to convince git to let me merge things that are already part of the tree.

This repository has its master branch protected against rewrites, so I can't reset to before the merge. The only way I know of to maybe fix this is to reset the trusted-git-root, which I'm reluctant to do and which may not work depending on how the build script works.

@laanwj @jonasschnelli @btcdrak maybe you have access to revert master to HEAD^ so that this can be re-merged properly? (Or another solution to suggest.)

Sorry for the miscommunication here.

@maflcko
Copy link

maflcko commented Jul 23, 2018

@harding untested gist:

git checkout 1aa9649
git merge 7f12b8b --no-ff -m 'Merge #576 (take 2)'
git commit --amend # Append Tree-SHA512
git push [email protected]:bitcoin-core/bitcoincore.org.git HEAD:master

@maflcko
Copy link

maflcko commented Jul 23, 2018

Note that the git push in my example does not use a -f.

harding added a commit to harding/website that referenced this pull request Jul 23, 2018
Tree-SHA512: 2e1493b59570ef967f31ca605a1f336b976f287240c319b4c31357135b8b354afd6475820d201ca16f21502616676dc6f810ac6f707cc2f7c232bdc3190053f2
@harding
Copy link
Contributor Author

harding commented Jul 24, 2018

@MarcoFalke many thanks, that worked. Unfortunately, the repo permissions are setup not to allow pushes without Approved reviews, so I had to open PR #580 and will have to wait for @jnewbery to Approve it. I think (and hope) I should then be able to merge it as a fast-forward and push it manually to get the intended effect.

@harding
Copy link
Contributor Author

harding commented Jul 24, 2018

Everything appears to be fixed now. Thanks again, @MarcoFalke.

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.

3 participants