Skip to content

Conversation

sipa
Copy link
Member

@sipa sipa commented Oct 17, 2016

See corresponding mailing list discussion (https://lists.linuxfoundation.org/pipermail/bitcoin-dev/2016-October/013226.html) and BIP update PR (bitcoin/bips#464).

@@ -93,8 +93,8 @@ class CMainParams : public CChainParams {

// Deployment of SegWit (BIP141 and BIP143)
Copy link
Contributor

Choose a reason for hiding this comment

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

also BIP147

Copy link
Member Author

Choose a reason for hiding this comment

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

Fixed.

@laanwj laanwj added this to the 0.13.1 milestone Oct 17, 2016
@btcdrak
Copy link
Contributor

btcdrak commented Oct 17, 2016

utACK f9c23de

1 similar comment
@achow101
Copy link
Member

utACK f9c23de

@JornC
Copy link

JornC commented Oct 17, 2016

Start: http://www.wolframalpha.com/input/?i=unix+1479168000

12:00:00 am UTC | Tuesday, November 15, 2016

End: http://www.wolframalpha.com/input/?i=unix+1510704000

12:00:00 am UTC | Wednesday, November 15, 2017

utACK f9c23de

@instagibbs
Copy link
Member

11/15/2016 @ 12:00am (UTC)
to
11/15/2017 @ 12:00am (UTC)

utACK f9c23de

@@ -91,10 +91,10 @@ class CMainParams : public CChainParams {
consensus.vDeployments[Consensus::DEPLOYMENT_CSV].nStartTime = 1462060800; // May 1st, 2016
consensus.vDeployments[Consensus::DEPLOYMENT_CSV].nTimeout = 1493596800; // May 1st, 2017

// Deployment of SegWit (BIP141 and BIP143)
// Deployment of SegWit (BIP141, BIP143, and BIP147)
Copy link
Contributor

Choose a reason for hiding this comment

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

No need for comma before "and".

Copy link
Member

Choose a reason for hiding this comment

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

NACK, Oxford comma for life.

consensus.vDeployments[Consensus::DEPLOYMENT_SEGWIT].bit = 1;
consensus.vDeployments[Consensus::DEPLOYMENT_SEGWIT].nStartTime = 0;
consensus.vDeployments[Consensus::DEPLOYMENT_SEGWIT].nTimeout = 0; // Never / undefined
consensus.vDeployments[Consensus::DEPLOYMENT_SEGWIT].nStartTime = 1479168000; // November 15th, 2016.
Copy link
Contributor

Choose a reason for hiding this comment

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

No need for dot at the end of the line. This is the third format for simple date we use now (as shown in the Files changed in this PR) :-)

Copy link
Contributor

Choose a reason for hiding this comment

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

Glory to ISO 8601. Should be 2016-11-15. ;)

@@ -91,10 +91,10 @@ class CMainParams : public CChainParams {
consensus.vDeployments[Consensus::DEPLOYMENT_CSV].nStartTime = 1462060800; // May 1st, 2016
consensus.vDeployments[Consensus::DEPLOYMENT_CSV].nTimeout = 1493596800; // May 1st, 2017

// Deployment of SegWit (BIP141 and BIP143)
// Deployment of SegWit (BIP141, BIP143, and BIP147)
Copy link
Member Author

Choose a reason for hiding this comment

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

Copy link
Contributor

Choose a reason for hiding this comment

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

Yes, I'm on the "against" side, sorry.

Copy link
Contributor

Choose a reason for hiding this comment

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

BIP141, BIP143, BIP147,

C forever! ;-)

Copy link
Contributor

Choose a reason for hiding this comment

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

Brit here, I approve of Oxford comma!

Choose a reason for hiding this comment

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

Oxford comma is best practice.

Copy link
Contributor

Choose a reason for hiding this comment

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

honestly... does it even matter?!

@paveljanik
Copy link
Contributor

ACK /me too for simple epoch conversion ;-)

@TheBlueMatt
Copy link
Contributor

utACK f9c23de

@jameshilliard
Copy link
Contributor

utACK f9c23de

@jl2012
Copy link
Contributor

jl2012 commented Oct 17, 2016

utACK f9c23de

@laanwj
Copy link
Member

laanwj commented Oct 17, 2016

utACK f9c23de. Timestamps match those in the BIP update bitcoin/bips@5c2da7e, which matches the UTC dates in the mailing list post. Let's not hold this up on comment formatting minutia.

@laanwj laanwj merged commit f9c23de into bitcoin:master Oct 17, 2016
laanwj added a commit that referenced this pull request Oct 17, 2016
f9c23de Define start and end time for segwit deployment (Pieter Wuille)
laanwj pushed a commit that referenced this pull request Oct 17, 2016
@dcousens
Copy link
Contributor

utACK 8b66659

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.