--- Day changed Sat Jun 04 2016
00:13 -!- Alopex [~bitcoin@cyber.dealing.ninja] has quit [Remote host closed the connection]
00:14 -!- Alopex [~bitcoin@cyber.dealing.ninja] has joined #bitcoin-core-dev
00:26 -!- AtashiCon [arnavion@unaffiliated/arnavion] has quit [Quit: AtashiCon]
00:36 -!- Ylbam [uid99779@gateway/web/irccloud.com/x-cvhhlkqoertgxorl] has joined #bitcoin-core-dev
00:58 -!- AtashiCon [arnavion@unaffiliated/arnavion] has joined #bitcoin-core-dev
01:21 -!- jtimon [~quassel@4.28.134.37.dynamic.jazztel.es] has quit [Ping timeout: 244 seconds]
01:26 -!- frankenmint [~frankenmi@75-175-110-137.ptld.qwest.net] has quit []
01:28 -!- Guyver2 [~Guyver2@guyver2.xs4all.nl] has joined #bitcoin-core-dev
01:56 -!- frankenmint [~frankenmi@75-175-110-137.ptld.qwest.net] has joined #bitcoin-core-dev
02:15 -!- murch [~murch@p4FE389F8.dip0.t-ipconnect.de] has joined #bitcoin-core-dev
02:25 -!- Guyver2 [~Guyver2@guyver2.xs4all.nl] has quit [Quit: :)]
02:32 -!- xiangfu [~xiangfu@58.135.95.131] has joined #bitcoin-core-dev
02:40 -!- xiangfu [~xiangfu@58.135.95.131] has quit [Ping timeout: 264 seconds]
02:56 -!- G1lius [~stefangil@85.17.24.5] has joined #bitcoin-core-dev
02:58 -!- xiangfu [~xiangfu@58.135.95.131] has joined #bitcoin-core-dev
03:03  * sipa just learned how to rebase a branch that has merges
03:03 < sipa> (where the merges have merge conflicts)
03:24 -!- mrpocoyo [~renlord@59.167.194.21] has quit [Quit: leaving]
03:41 < btcdrak> sipa: what dark magic is this?
03:42 < sipa> first use git rebase -i -p <base commit>
03:43 < btcdrak> TIL: -p
03:45 < sipa> that will complain whenever the merge commit is to be merged, as it has merge conflicts
03:45 < sipa> (and rebase -p can't deal with reapplying merge resolution)
03:45 < sipa> then use git checkout -p <original merge commit id>
03:46 < sipa> wait, first use git add -P, to mark all merge conflicts as resolved (you're lying, they aren't)
03:47 < sipa> and then use git checkout -p <original merge commit id>, which applies all changes between the current tree and the tree after that commit 
03:47 < sipa> sorry, git add -A
03:47 < sipa> grr
03:49 < sipa> that git checkout -p will show you all the differences between the current tree (which includes the <<< === >>> markers from conflicts you haven't actually resolved) and the result of the original merge commit
03:50 < sipa> which you all accept
03:50 < sipa> except the changes that are due to changes made earlier in history
03:51 < sipa> as you don't want those reset to the original
03:54 -!- afk11 [~afk11@unaffiliated/afk11] has quit [Ping timeout: 240 seconds]
03:58 -!- afk11 [~afk11@109.255.154.81] has joined #bitcoin-core-dev
03:58 -!- afk11 [~afk11@109.255.154.81] has quit [Changing host]
03:58 -!- afk11 [~afk11@unaffiliated/afk11] has joined #bitcoin-core-dev
04:52 -!- laurentmt [~Thunderbi@213-245-86-6.rev.numericable.fr] has joined #bitcoin-core-dev
04:57 -!- laurentmt [~Thunderbi@213-245-86-6.rev.numericable.fr] has quit [Client Quit]
05:10 -!- TomMc [~tom@unaffiliated/tommc] has joined #bitcoin-core-dev
05:12 -!- jtimon [~quassel@4.28.134.37.dynamic.jazztel.es] has joined #bitcoin-core-dev
05:15 -!- PRab [~chatzilla@c-68-62-95-247.hsd1.mi.comcast.net] has quit [Quit: ChatZilla 0.9.92 [Firefox 46.0.1/20160502172042]]
05:21 -!- fengling [~fengling@58.135.95.134] has quit [Quit: WeeChat 1.4]
05:24 -!- TheFactory7 [uid164731@gateway/web/irccloud.com/x-ydjjohbqxbwnwejo] has joined #bitcoin-core-dev
05:25 -!- xiangfu [~xiangfu@58.135.95.131] has quit [Remote host closed the connection]
06:24 -!- AaronvanW [~ewout@unaffiliated/aaronvanw] has quit [Ping timeout: 276 seconds]
06:26 < NicolasDorier> sipa: are you here ? I noticed strange incoherence between the BIP and CMPTBLK implementation, I'm wondering if I've not missed something
06:27 < NicolasDorier> I've added some comment during my review, but either I'm completely misunderstanding something or the BIP and implementation is completely off
06:27 < phantomcircuit> NicolasDorier, something something dont ask to ask
06:27 < phantomcircuit> :P
06:28 < NicolasDorier> what does it mean ? :p
06:29 < NicolasDorier> so basically my problem is
06:29 < NicolasDorier> SENDCMPCT should have a boolean which indicate in which mode the peer want to receive new blocks
06:29 -!- Chris_Stewart_5 [~Chris_Ste@unaffiliated/chris-stewart-5/x-3612383] has joined #bitcoin-core-dev
06:29 < NicolasDorier> either with INV or with CMPCT BLK
06:30 < sipa> indeed, and a version number
06:30 < NicolasDorier> problem is, in the PR, this boolean is used to indicate whether the sender provide or not CMPCTBLK
06:30 < NicolasDorier> https://github.com/bitcoin/bitcoin/pull/8068/files#diff-7ec3c68a81efff79b6ca22ac1f1eabbaR4915
06:30 < NicolasDorier> oups
06:30 < NicolasDorier> no
06:31 < NicolasDorier> this
06:31 < NicolasDorier> https://github.com/bitcoin/bitcoin/pull/8068/files#diff-7ec3c68a81efff79b6ca22ac1f1eabbaR4846
06:33 < sipa> NicolasDorier: i think you're right
06:34 < NicolasDorier> sipa: I guess the spec changed after the code was released for example: https://github.com/bitcoin/bitcoin/pull/8068/files#diff-7ec3c68a81efff79b6ca22ac1f1eabbaR4920
06:34 < NicolasDorier> the intention was to use the bool to activate or deactivate CMPCT
06:34 < NicolasDorier> as far as I understand
06:35 < NicolasDorier> I can work on fixing it, but I heard you are working on the PR right now sipa ?
06:35 < sipa> i think fProvidesHeaderAndIDs should just be set to true in response to SENDCMPCT
06:35 < NicolasDorier> mmh it is not the same semantic
06:36 < NicolasDorier> SENDCMPCT tell you about the want of the remote node
06:36 < NicolasDorier> not about his capabilities
06:36 < sipa> both
06:36 < NicolasDorier> well, you can already use the version in the handshake for it
06:36 < sipa> no, you can't
06:36 < sipa> nVersion >= 70014 does not imply you support compact blocks
06:37 < NicolasDorier> ? why ? because of pruned nodes ?
06:37 < sipa> because we don't want everyone in the network to be forced to implement this
06:38 < sipa> maybe 70015 introduces another features that is easy to implement
06:38 < NicolasDorier> in such case maybe a service BIT can be useful
06:38 < sipa> service bits are expensive
06:38 < sipa> we only have 48
06:38 < sipa> sorry, 56
06:39 < sipa> BIP130 also does not use a service bit
06:39 < NicolasDorier> is it a problem ? if we run out of them we can release a new protocol version with more bits
06:39 < sipa> maybe :)
06:39 < sipa> but there is a lot of infrastructure
06:40 < sipa> that uses it
06:40 < NicolasDorier> understood, are you working on it ? I can refactor things a bit and fix the terminology to match the bip
06:41 < NicolasDorier> also https://github.com/bitcoin/bitcoin/pull/8068/files#diff-7ec3c68a81efff79b6ca22ac1f1eabbaR4920 is completely out of purpose
06:41 < NicolasDorier> and duplicated on https://github.com/bitcoin/bitcoin/pull/8068/files#diff-7ec3c68a81efff79b6ca22ac1f1eabbaR5504
06:41 < sipa> BlueMatt commented on the suggestion to use a service bit here: https://lists.linuxfoundation.org/pipermail/bitcoin-dev/2016-May/012630.html
06:41 < sipa> yes, i commented on the duplication
06:42 < sipa> you also commented on some of the refcounting... the refcounting is gone in my branch (https://github.com/sipa/bitcoin/commits/compactblocks)
06:43 < NicolasDorier> ok I'll continue my review on your branch instead
06:44 < sipa> i think the two assignments to preferheadersandids and providesheadersandids just need to be swapped
06:46 < NicolasDorier> it is also a bit confusing: I fail to understand if preferHeadersAndIds means that we use the "high bandwidth (without inv)" or the "low bandwidth" one
06:46 < sipa> that's exactly what it means
06:47 < NicolasDorier> it can also mean that it does not support CMPCTBLK at all
06:47 < sipa> no, that's providesheadersandids
06:47 < NicolasDorier> an enum with 3 values would be easier imhi
06:47 < sipa> providesheadersandids is something that affects our request logic
06:47 < sipa> preferheadersandids is something that affects our send logic
06:49 < NicolasDorier> sipa: on send logic we have 3 cases, legacy, high bandwidth and low bandwidth. PreferHeadersAndIds is a boolean
06:50 < NicolasDorier> oh
06:50 < NicolasDorier> oh no I get it 
06:50 < NicolasDorier> because low bandwidth still use INV, it is not different from legacy
06:51 < NicolasDorier> ok, thanks... continuing my review I think it is clearer now
06:51 < sipa> indeed; the difference is that the peer will respond with a getdata MSG_COMPCT_BLOCK rather than MSG_COMPCT_BLOCK
06:51 < sipa> eh
06:51 < sipa> rather than MSG_BLOCK
06:52 < sipa> but that's not our worry
06:52 < NicolasDorier> yes make sense thanks!
07:01  * MarcoFalke looks at travis merge commit hash 4222221c0000... and wonders about the odds
07:01 < sipa> MarcoFalke: i have considered grinding commit hashes in segwit to be consecutive numbers :p
07:01 < GitHub189> [bitcoin] jonasschnelli pushed 2 new commits to master: https://github.com/bitcoin/bitcoin/compare/8c1e49ba13a8...d46b8b50fc3e
07:01 < GitHub189> bitcoin/master e39dc69 instagibbs: comment nit: miners don't vote
07:01 < GitHub189> bitcoin/master d46b8b5 Jonas Schnelli: Merge #8143: comment nit: miners don't vote...
07:02 < MarcoFalke> You should do it after the rebase :P
07:02 < GitHub195> [bitcoin] jonasschnelli closed pull request #8143: comment nit: miners don't vote (master...notavote) https://github.com/bitcoin/bitcoin/pull/8143
07:08 < MarcoFalke> sipa: Could you push a `git commit --allow-empty` or something to have at least one travis result for https://github.com/bitcoin/bitcoin/pull/7749#issuecomment-223558640 ?
07:11 -!- Chris_Stewart_5 [~Chris_Ste@unaffiliated/chris-stewart-5/x-3612383] has quit [Ping timeout: 240 seconds]
07:13 -!- fengling [~fengling@124.205.63.11] has joined #bitcoin-core-dev
07:24  * MarcoFalke wonders what happens if someone merges https://github.com/bitcoin/bitcoin/pull/7510 via the GitHub GUI. (The pull conflicts with master but GitHub shows no conflicts... o0 )
07:26 -!- Chris_Stewart_5 [~Chris_Ste@unaffiliated/chris-stewart-5/x-3612383] has joined #bitcoin-core-dev
07:30 -!- ghtdak [~ghtdak@unaffiliated/ghtdak] has quit [Ping timeout: 240 seconds]
07:33 < sipa> MarcoFalke: dragons
07:34 < MarcoFalke> GitHub unicorn
07:34 -!- AaronvanW [~ewout@unaffiliated/aaronvanw] has joined #bitcoin-core-dev
07:34 -!- ghtdak [~ghtdak@unaffiliated/ghtdak] has joined #bitcoin-core-dev
07:36 < MarcoFalke> They have figured out AI that can solve conflicts for you
07:39 < sipa> we should invent a programming language in which every sequence of ascii characters is a valid program
07:40 < sipa> no more merge conflicts
07:40 < sipa> the result may however not be code you want to run
07:40 < sipa> <<< should mean "format disk"
07:41 < btcdrak> babies speak that but they forget it when they grow up so cant teach the adults
08:00 -!- Giszmo [~leo@pc-122-14-46-190.cm.vtr.net] has joined #bitcoin-core-dev
08:13 -!- TheFactory7 [uid164731@gateway/web/irccloud.com/x-ydjjohbqxbwnwejo] has quit [Quit: Connection closed for inactivity]
08:14 -!- calibre720 [~calibre72@182.57.111.5] has quit [Ping timeout: 276 seconds]
08:23 -!- AaronvanW [~ewout@unaffiliated/aaronvanw] has quit [Ping timeout: 276 seconds]
08:27 -!- calibre720 [~calibre72@182.57.125.111] has joined #bitcoin-core-dev
08:28 -!- fengling [~fengling@124.205.63.11] has quit [Quit: WeeChat 1.4]
08:48 -!- mkarrer [~mkarrer@3.red-83-55-151.dynamicip.rima-tde.net] has quit []
08:54 -!- laurentmt [~Thunderbi@213-245-86-6.rev.numericable.fr] has joined #bitcoin-core-dev
08:54 -!- laurentmt [~Thunderbi@213-245-86-6.rev.numericable.fr] has quit [Client Quit]
09:12 -!- calibre720 [~calibre72@182.57.125.111] has quit [Ping timeout: 244 seconds]
09:18 -!- Giszmo [~leo@pc-122-14-46-190.cm.vtr.net] has quit [Quit: Leaving.]
09:21 -!- Ylbam [uid99779@gateway/web/irccloud.com/x-cvhhlkqoertgxorl] has quit [Quit: Connection closed for inactivity]
09:22 -!- calibre720 [~calibre72@182.57.91.126] has joined #bitcoin-core-dev
09:33 -!- mkarrer [~mkarrer@3.red-83-55-151.dynamicip.rima-tde.net] has joined #bitcoin-core-dev
09:44 -!- calibre720 [~calibre72@182.57.91.126] has quit [Ping timeout: 246 seconds]
09:54 -!- calibre720 [~calibre72@182.57.57.128] has joined #bitcoin-core-dev
10:05 -!- calibre720 [~calibre72@182.57.57.128] has quit [Ping timeout: 264 seconds]
10:05 -!- TomMc [~tom@unaffiliated/tommc] has quit [Ping timeout: 258 seconds]
10:06 -!- gevs [~greg@unaffiliated/gevs] has quit [Ping timeout: 244 seconds]
10:16 -!- calibre720 [~calibre72@182.57.101.29] has joined #bitcoin-core-dev
10:20 -!- gevs [~greg@unaffiliated/gevs] has joined #bitcoin-core-dev
10:34 -!- murch [~murch@p4FE389F8.dip0.t-ipconnect.de] has quit [Quit: Leaving.]
10:38 -!- calibre720 [~calibre72@182.57.101.29] has quit [Ping timeout: 260 seconds]
10:40 -!- Ylbam [uid99779@gateway/web/irccloud.com/x-ealrgrujigvakbqo] has joined #bitcoin-core-dev
10:50 -!- calibre720 [~calibre72@182.57.82.191] has joined #bitcoin-core-dev
10:58 -!- laurentmt [~Thunderbi@213-245-86-6.rev.numericable.fr] has joined #bitcoin-core-dev
10:59 -!- laurentmt [~Thunderbi@213-245-86-6.rev.numericable.fr] has quit [Client Quit]
11:12 -!- justanot1eruser [~Justan@unaffiliated/justanotheruser] has joined #bitcoin-core-dev
11:14 -!- calibre720 [~calibre72@182.57.82.191] has quit [Ping timeout: 264 seconds]
11:15 -!- justanotheruser [~Justan@unaffiliated/justanotheruser] has quit [Ping timeout: 244 seconds]
11:44 -!- MrHodl [~fuc@190.112.223.117] has joined #bitcoin-core-dev
11:51 -!- iniana [2e3b026a@gateway/web/freenode/ip.46.59.2.106] has joined #bitcoin-core-dev
11:54 -!- droark [~droark@c-24-22-36-12.hsd1.or.comcast.net] has joined #bitcoin-core-dev
12:07 -!- G1lius [~stefangil@85.17.24.5] has quit [Read error: Connection reset by peer]
12:32 -!- AaronvanW [~ewout@unaffiliated/aaronvanw] has joined #bitcoin-core-dev
12:42 -!- justanot1eruser [~Justan@unaffiliated/justanotheruser] has quit [Ping timeout: 240 seconds]
12:54 -!- achow101 [~achow101@pool-96-227-114-115.phlapa.fios.verizon.net] has joined #bitcoin-core-dev
13:05 -!- molz [~molly@unaffiliated/molly] has quit [Write error: Connection reset by peer]
13:06 -!- molz [~molly@unaffiliated/molly] has joined #bitcoin-core-dev
13:06 -!- pmienk [~pmienk@c-71-227-177-179.hsd1.wa.comcast.net] has quit [Remote host closed the connection]
13:07 -!- baldur [~baldur@pool-108-29-176-11.nycmny.fios.verizon.net] has joined #bitcoin-core-dev
13:11 -!- justanotheruser [~Justan@unaffiliated/justanotheruser] has joined #bitcoin-core-dev
13:24 -!- Guyver2 [~Guyver2@guyver2.xs4all.nl] has joined #bitcoin-core-dev
13:41 -!- MrHodl [~fuc@190.112.223.117] has quit []
14:19 -!- jarret [~jarret@162.216.46.137] has joined #bitcoin-core-dev
14:30 -!- Arnavion [~Arnavion@unaffiliated/arnavion] has quit [Disconnected by services]
14:30 -!- Arnavion [arnavion@unaffiliated/arnavion] has joined #bitcoin-core-dev
15:09 -!- raedah [~x@172.58.41.91] has quit [Quit: WeeChat 1.5]
15:19 -!- AaronvanW [~ewout@unaffiliated/aaronvanw] has quit [Remote host closed the connection]
15:20 -!- raedah [~x@172.58.41.91] has joined #bitcoin-core-dev
15:57 -!- Guyver2 [~Guyver2@guyver2.xs4all.nl] has quit [Quit: :)]
16:36 -!- Chris_Stewart_5 [~Chris_Ste@unaffiliated/chris-stewart-5/x-3612383] has quit [Ping timeout: 252 seconds]
17:27 -!- baldur [~baldur@pool-108-29-176-11.nycmny.fios.verizon.net] has quit [Remote host closed the connection]
18:35 -!- Giszmo [~leo@pc-122-14-46-190.cm.vtr.net] has joined #bitcoin-core-dev
18:44 -!- baldur [~baldur@pool-108-29-176-11.nycmny.fios.verizon.net] has joined #bitcoin-core-dev
19:01 -!- Ylbam [uid99779@gateway/web/irccloud.com/x-ealrgrujigvakbqo] has quit [Quit: Connection closed for inactivity]
19:44 -!- molly [~molly@unaffiliated/molly] has joined #bitcoin-core-dev
19:47 -!- molz [~molly@unaffiliated/molly] has quit [Ping timeout: 246 seconds]
20:11 -!- achow101 [~achow101@pool-96-227-114-115.phlapa.fios.verizon.net] has quit [Quit: Leaving]
20:14 -!- Alopex [~bitcoin@cyber.dealing.ninja] has quit [Remote host closed the connection]
20:15 -!- Alopex [~bitcoin@cyber.dealing.ninja] has joined #bitcoin-core-dev
20:27 -!- Alopex [~bitcoin@cyber.dealing.ninja] has quit [Remote host closed the connection]
20:28 -!- Alopex [~bitcoin@cyber.dealing.ninja] has joined #bitcoin-core-dev
20:30 -!- raedah [~x@172.58.41.91] has quit [Quit: WeeChat 1.5]
20:33 -!- frankenm_ [~frankenmi@67-5-211-132.ptld.qwest.net] has joined #bitcoin-core-dev
20:34 -!- frankenmint [~frankenmi@75-175-110-137.ptld.qwest.net] has quit [Ping timeout: 264 seconds]
20:38 -!- jtimon [~quassel@4.28.134.37.dynamic.jazztel.es] has quit [Ping timeout: 252 seconds]
20:40 -!- TomMc [~tom@unaffiliated/tommc] has joined #bitcoin-core-dev
20:43 -!- raedah [~x@172.58.41.91] has joined #bitcoin-core-dev
21:01 -!- justanotheruser [~Justan@unaffiliated/justanotheruser] has quit [Read error: Connection reset by peer]
21:02 -!- justanotheruser [~Justan@unaffiliated/justanotheruser] has joined #bitcoin-core-dev
21:14 -!- Alopex [~bitcoin@cyber.dealing.ninja] has quit [Remote host closed the connection]
21:15 -!- Alopex [~bitcoin@cyber.dealing.ninja] has joined #bitcoin-core-dev
21:17 -!- TomMc [~tom@unaffiliated/tommc] has quit [Ping timeout: 252 seconds]
22:02 -!- Alopex [~bitcoin@cyber.dealing.ninja] has quit [Remote host closed the connection]
22:03 -!- Alopex [~bitcoin@cyber.dealing.ninja] has joined #bitcoin-core-dev
22:15 -!- raedah [~x@172.58.41.91] has quit [Ping timeout: 264 seconds]
22:24 -!- raedah [~x@172.58.41.91] has joined #bitcoin-core-dev
22:26 -!- Alopex [~bitcoin@cyber.dealing.ninja] has quit [Remote host closed the connection]
22:27 -!- Alopex [~bitcoin@cyber.dealing.ninja] has joined #bitcoin-core-dev
22:37 -!- Alopex [~bitcoin@cyber.dealing.ninja] has quit [Remote host closed the connection]
22:38 -!- Alopex [~bitcoin@cyber.dealing.ninja] has joined #bitcoin-core-dev
22:55 -!- Alopex [~bitcoin@cyber.dealing.ninja] has quit [Remote host closed the connection]
22:56 -!- Alopex [~bitcoin@cyber.dealing.ninja] has joined #bitcoin-core-dev
23:16 -!- murch [~murch@p4FDB7B31.dip0.t-ipconnect.de] has joined #bitcoin-core-dev
23:46 -!- Alopex [~bitcoin@cyber.dealing.ninja] has quit [Remote host closed the connection]
23:47 -!- Alopex [~bitcoin@cyber.dealing.ninja] has joined #bitcoin-core-dev
23:51 -!- raedah2 [~x@172.58.41.91] has joined #bitcoin-core-dev
23:54 -!- raedah [~x@172.58.41.91] has quit [Ping timeout: 272 seconds]