12016-06-04T00:15:31  *** abc has joined #bitcoin-core-dev
  22016-06-04T00:15:55  *** abc is now known as Guest74801
  32016-06-04T00:19:00  *** Guest74801 has quit IRC
  42016-06-04T00:25:09  *** fengling has joined #bitcoin-core-dev
  52016-06-04T00:29:24  *** fengling has quit IRC
  62016-06-04T00:49:49  *** TomMc has joined #bitcoin-core-dev
  72016-06-04T00:52:04  *** fengling has joined #bitcoin-core-dev
  82016-06-04T00:54:54  *** TomMc has quit IRC
  92016-06-04T01:11:16  *** Ylbam has quit IRC
 102016-06-04T02:00:48  *** raedah has quit IRC
 112016-06-04T02:02:26  *** raedah has joined #bitcoin-core-dev
 122016-06-04T02:02:44  *** fengling has quit IRC
 132016-06-04T02:12:53  *** fengling has joined #bitcoin-core-dev
 142016-06-04T02:33:59  *** frankenmint has joined #bitcoin-core-dev
 152016-06-04T02:34:01  *** Alopex has quit IRC
 162016-06-04T02:35:06  *** Alopex has joined #bitcoin-core-dev
 172016-06-04T02:39:35  *** xiangfu has joined #bitcoin-core-dev
 182016-06-04T02:45:01  *** Alopex has quit IRC
 192016-06-04T02:46:06  *** Alopex has joined #bitcoin-core-dev
 202016-06-04T02:59:48  *** achow101 has quit IRC
 212016-06-04T03:02:12  *** Chris_Stewart_5 has quit IRC
 222016-06-04T03:26:38  *** frankenmint has quit IRC
 232016-06-04T03:27:36  *** xiangfu has quit IRC
 242016-06-04T03:33:56  *** molz has joined #bitcoin-core-dev
 252016-06-04T03:35:21  *** moli has quit IRC
 262016-06-04T03:50:44  *** fengling has quit IRC
 272016-06-04T03:52:09  *** frankenmint has joined #bitcoin-core-dev
 282016-06-04T03:53:49  *** frankenmint has quit IRC
 292016-06-04T03:58:10  *** PaulCape_ has joined #bitcoin-core-dev
 302016-06-04T03:58:44  *** PaulCape_ has quit IRC
 312016-06-04T03:59:17  *** PaulCape_ has joined #bitcoin-core-dev
 322016-06-04T04:01:05  *** PaulCapestany has quit IRC
 332016-06-04T04:03:25  *** frankenmint has joined #bitcoin-core-dev
 342016-06-04T04:04:45  *** PaulCape_ has quit IRC
 352016-06-04T04:05:11  *** PaulCapestany has joined #bitcoin-core-dev
 362016-06-04T04:17:59  *** frankenmint has quit IRC
 372016-06-04T04:18:05  *** xiangfu has joined #bitcoin-core-dev
 382016-06-04T04:22:03  *** mrpocoyo has joined #bitcoin-core-dev
 392016-06-04T04:22:44  *** [Author] has quit IRC
 402016-06-04T04:24:14  *** bsm117532 is now known as Guest26338
 412016-06-04T04:27:43  *** [Author] has joined #bitcoin-core-dev
 422016-06-04T04:29:03  *** ghtdak has quit IRC
 432016-06-04T04:29:59  *** ghtdak has joined #bitcoin-core-dev
 442016-06-04T04:30:15  *** frankenmint has joined #bitcoin-core-dev
 452016-06-04T04:42:29  *** fengling has joined #bitcoin-core-dev
 462016-06-04T04:46:24  *** xiangfu has quit IRC
 472016-06-04T04:53:00  *** xiangfu has joined #bitcoin-core-dev
 482016-06-04T05:30:26  *** PRab has quit IRC
 492016-06-04T05:50:02  *** frankenmint has quit IRC
 502016-06-04T05:51:16  *** frankenmint has joined #bitcoin-core-dev
 512016-06-04T05:53:01  *** Alopex has quit IRC
 522016-06-04T05:54:06  *** Alopex has joined #bitcoin-core-dev
 532016-06-04T05:56:49  *** PRab has joined #bitcoin-core-dev
 542016-06-04T05:58:59  *** frankenmint has joined #bitcoin-core-dev
 552016-06-04T06:39:33  *** MarcoFalke has joined #bitcoin-core-dev
 562016-06-04T06:49:05  *** Giszmo has quit IRC
 572016-06-04T06:58:18  *** xiangfu has quit IRC
 582016-06-04T07:13:02  *** Alopex has quit IRC
 592016-06-04T07:14:07  *** Alopex has joined #bitcoin-core-dev
 602016-06-04T07:26:34  *** AtashiCon has quit IRC
 612016-06-04T07:36:31  *** Ylbam has joined #bitcoin-core-dev
 622016-06-04T07:58:17  *** AtashiCon has joined #bitcoin-core-dev
 632016-06-04T08:21:40  *** jtimon has quit IRC
 642016-06-04T08:26:51  *** frankenmint has quit IRC
 652016-06-04T08:28:47  *** Guyver2 has joined #bitcoin-core-dev
 662016-06-04T08:56:24  *** frankenmint has joined #bitcoin-core-dev
 672016-06-04T09:15:25  *** murch has joined #bitcoin-core-dev
 682016-06-04T09:25:01  *** Guyver2 has quit IRC
 692016-06-04T09:32:52  *** xiangfu has joined #bitcoin-core-dev
 702016-06-04T09:40:04  *** xiangfu has quit IRC
 712016-06-04T09:56:04  *** G1lius has joined #bitcoin-core-dev
 722016-06-04T09:58:31  *** xiangfu has joined #bitcoin-core-dev
 732016-06-04T10:03:01  * sipa just learned how to rebase a branch that has merges
 742016-06-04T10:03:17  <sipa> (where the merges have merge conflicts)
 752016-06-04T10:24:05  *** mrpocoyo has quit IRC
 762016-06-04T10:41:02  <btcdrak> sipa: what dark magic is this?
 772016-06-04T10:42:01  <sipa> first use git rebase -i -p <base commit>
 782016-06-04T10:43:09  <btcdrak> TIL: -p
 792016-06-04T10:45:14  <sipa> that will complain whenever the merge commit is to be merged, as it has merge conflicts
 802016-06-04T10:45:32  <sipa> (and rebase -p can't deal with reapplying merge resolution)
 812016-06-04T10:45:48  <sipa> then use git checkout -p <original merge commit id>
 822016-06-04T10:46:34  <sipa> wait, first use git add -P, to mark all merge conflicts as resolved (you're lying, they aren't)
 832016-06-04T10:47:07  <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
 842016-06-04T10:47:14  <sipa> sorry, git add -A
 852016-06-04T10:47:16  <sipa> grr
 862016-06-04T10:49:15  <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
 872016-06-04T10:50:12  <sipa> which you all accept
 882016-06-04T10:50:27  <sipa> except the changes that are due to changes made earlier in history
 892016-06-04T10:51:34  <sipa> as you don't want those reset to the original
 902016-06-04T10:54:34  *** afk11 has quit IRC
 912016-06-04T10:58:18  *** afk11 has joined #bitcoin-core-dev
 922016-06-04T10:58:19  *** afk11 has quit IRC
 932016-06-04T10:58:19  *** afk11 has joined #bitcoin-core-dev
 942016-06-04T11:52:48  *** laurentmt has joined #bitcoin-core-dev
 952016-06-04T11:57:32  *** laurentmt has quit IRC
 962016-06-04T12:10:33  *** TomMc has joined #bitcoin-core-dev
 972016-06-04T12:12:44  *** jtimon has joined #bitcoin-core-dev
 982016-06-04T12:15:58  *** PRab has quit IRC
 992016-06-04T12:21:03  *** fengling has quit IRC
1002016-06-04T12:24:07  *** TheFactory7 has joined #bitcoin-core-dev
1012016-06-04T12:25:15  *** xiangfu has quit IRC
1022016-06-04T13:24:39  *** AaronvanW has quit IRC
1032016-06-04T13:26:33  <NicolasDorier> sipa: are you here ? I noticed strange incoherence between the BIP and CMPTBLK implementation, I'm wondering if I've not missed something
1042016-06-04T13:27:13  <NicolasDorier> I've added some comment during my review, but either I'm completely misunderstanding something or the BIP and implementation is completely off
1052016-06-04T13:27:50  <phantomcircuit> NicolasDorier, something something dont ask to ask
1062016-06-04T13:27:51  <phantomcircuit> :P
1072016-06-04T13:28:20  <NicolasDorier> what does it mean ? :p
1082016-06-04T13:29:12  <NicolasDorier> so basically my problem is
1092016-06-04T13:29:32  <NicolasDorier> SENDCMPCT should have a boolean which indicate in which mode the peer want to receive new blocks
1102016-06-04T13:29:42  *** Chris_Stewart_5 has joined #bitcoin-core-dev
1112016-06-04T13:29:55  <NicolasDorier> either with INV or with CMPCT BLK
1122016-06-04T13:30:07  <sipa> indeed, and a version number
1132016-06-04T13:30:33  <NicolasDorier> problem is, in the PR, this boolean is used to indicate whether the sender provide or not CMPCTBLK
1142016-06-04T13:30:45  <NicolasDorier> https://github.com/bitcoin/bitcoin/pull/8068/files#diff-7ec3c68a81efff79b6ca22ac1f1eabbaR4915
1152016-06-04T13:30:53  <NicolasDorier> oups
1162016-06-04T13:30:53  <NicolasDorier> no
1172016-06-04T13:31:01  <NicolasDorier> this
1182016-06-04T13:31:01  <NicolasDorier> https://github.com/bitcoin/bitcoin/pull/8068/files#diff-7ec3c68a81efff79b6ca22ac1f1eabbaR4846
1192016-06-04T13:33:15  <sipa> NicolasDorier: i think you're right
1202016-06-04T13:34:07  <NicolasDorier> sipa: I guess the spec changed after the code was released for example: https://github.com/bitcoin/bitcoin/pull/8068/files#diff-7ec3c68a81efff79b6ca22ac1f1eabbaR4920
1212016-06-04T13:34:26  <NicolasDorier> the intention was to use the bool to activate or deactivate CMPCT
1222016-06-04T13:34:38  <NicolasDorier> as far as I understand
1232016-06-04T13:35:26  <NicolasDorier> I can work on fixing it, but I heard you are working on the PR right now sipa ?
1242016-06-04T13:35:38  <sipa> i think fProvidesHeaderAndIDs should just be set to true in response to SENDCMPCT
1252016-06-04T13:35:58  <NicolasDorier> mmh it is not the same semantic
1262016-06-04T13:36:10  <NicolasDorier> SENDCMPCT tell you about the want of the remote node
1272016-06-04T13:36:14  <NicolasDorier> not about his capabilities
1282016-06-04T13:36:18  <sipa> both
1292016-06-04T13:36:33  <NicolasDorier> well, you can already use the version in the handshake for it
1302016-06-04T13:36:39  <sipa> no, you can't
1312016-06-04T13:36:57  <sipa> nVersion >= 70014 does not imply you support compact blocks
1322016-06-04T13:37:28  <NicolasDorier> ? why ? because of pruned nodes ?
1332016-06-04T13:37:46  <sipa> because we don't want everyone in the network to be forced to implement this
1342016-06-04T13:38:04  <sipa> maybe 70015 introduces another features that is easy to implement
1352016-06-04T13:38:07  <NicolasDorier> in such case maybe a service BIT can be useful
1362016-06-04T13:38:15  <sipa> service bits are expensive
1372016-06-04T13:38:24  <sipa> we only have 48
1382016-06-04T13:38:27  <sipa> sorry, 56
1392016-06-04T13:39:10  <sipa> BIP130 also does not use a service bit
1402016-06-04T13:39:15  <NicolasDorier> is it a problem ? if we run out of them we can release a new protocol version with more bits
1412016-06-04T13:39:40  <sipa> maybe :)
1422016-06-04T13:39:45  <sipa> but there is a lot of infrastructure
1432016-06-04T13:40:06  <sipa> that uses it
1442016-06-04T13:40:26  <NicolasDorier> understood, are you working on it ? I can refactor things a bit and fix the terminology to match the bip
1452016-06-04T13:41:22  <NicolasDorier> also https://github.com/bitcoin/bitcoin/pull/8068/files#diff-7ec3c68a81efff79b6ca22ac1f1eabbaR4920 is completely out of purpose
1462016-06-04T13:41:39  <NicolasDorier> and duplicated on https://github.com/bitcoin/bitcoin/pull/8068/files#diff-7ec3c68a81efff79b6ca22ac1f1eabbaR5504
1472016-06-04T13:41:40  <sipa> BlueMatt commented on the suggestion to use a service bit here: https://lists.linuxfoundation.org/pipermail/bitcoin-dev/2016-May/012630.html
1482016-06-04T13:41:47  <sipa> yes, i commented on the duplication
1492016-06-04T13:42:57  <sipa> you also commented on some of the refcounting... the refcounting is gone in my branch (https://github.com/sipa/bitcoin/commits/compactblocks)
1502016-06-04T13:43:19  <NicolasDorier> ok I'll continue my review on your branch instead
1512016-06-04T13:44:44  <sipa> i think the two assignments to preferheadersandids and providesheadersandids just need to be swapped
1522016-06-04T13:46:34  <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
1532016-06-04T13:46:55  <sipa> that's exactly what it means
1542016-06-04T13:47:12  <NicolasDorier> it can also mean that it does not support CMPCTBLK at all
1552016-06-04T13:47:20  <sipa> no, that's providesheadersandids
1562016-06-04T13:47:22  <NicolasDorier> an enum with 3 values would be easier imhi
1572016-06-04T13:47:38  <sipa> providesheadersandids is something that affects our request logic
1582016-06-04T13:47:47  <sipa> preferheadersandids is something that affects our send logic
1592016-06-04T13:49:51  <NicolasDorier> sipa: on send logic we have 3 cases, legacy, high bandwidth and low bandwidth. PreferHeadersAndIds is a boolean
1602016-06-04T13:50:30  <NicolasDorier> oh
1612016-06-04T13:50:35  <NicolasDorier> oh no I get it
1622016-06-04T13:50:51  <NicolasDorier> because low bandwidth still use INV, it is not different from legacy
1632016-06-04T13:51:30  <NicolasDorier> ok, thanks... continuing my review I think it is clearer now
1642016-06-04T13:51:51  <sipa> indeed; the difference is that the peer will respond with a getdata MSG_COMPCT_BLOCK rather than MSG_COMPCT_BLOCK
1652016-06-04T13:51:54  <sipa> eh
1662016-06-04T13:51:57  <sipa> rather than MSG_BLOCK
1672016-06-04T13:52:03  <sipa> but that's not our worry
1682016-06-04T13:52:20  <NicolasDorier> yes make sense thanks!
1692016-06-04T14:01:06  * MarcoFalke looks at travis merge commit hash 4222221c0000... and wonders about the odds
1702016-06-04T14:01:40  <sipa> MarcoFalke: i have considered grinding commit hashes in segwit to be consecutive numbers :p
1712016-06-04T14:01:52  <GitHub189> [bitcoin] jonasschnelli pushed 2 new commits to master: https://github.com/bitcoin/bitcoin/compare/8c1e49ba13a8...d46b8b50fc3e
1722016-06-04T14:01:52  <GitHub189> bitcoin/master e39dc69 instagibbs: comment nit: miners don't vote
1732016-06-04T14:01:53  <GitHub189> bitcoin/master d46b8b5 Jonas Schnelli: Merge #8143: comment nit: miners don't vote...
1742016-06-04T14:02:04  <MarcoFalke> You should do it after the rebase :P
1752016-06-04T14:02:05  <GitHub195> [bitcoin] jonasschnelli closed pull request #8143: comment nit: miners don't vote (master...notavote) https://github.com/bitcoin/bitcoin/pull/8143
1762016-06-04T14:08:34  <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 ?
1772016-06-04T14:11:03  *** Chris_Stewart_5 has quit IRC
1782016-06-04T14:13:06  *** fengling has joined #bitcoin-core-dev
1792016-06-04T14:24:25  * 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 )
1802016-06-04T14:26:10  *** Chris_Stewart_5 has joined #bitcoin-core-dev
1812016-06-04T14:30:01  *** ghtdak has quit IRC
1822016-06-04T14:33:20  <sipa> MarcoFalke: dragons
1832016-06-04T14:34:31  <MarcoFalke> GitHub unicorn
1842016-06-04T14:34:33  *** AaronvanW has joined #bitcoin-core-dev
1852016-06-04T14:34:38  *** ghtdak has joined #bitcoin-core-dev
1862016-06-04T14:36:54  <MarcoFalke> They have figured out AI that can solve conflicts for you
1872016-06-04T14:39:55  <sipa> we should invent a programming language in which every sequence of ascii characters is a valid program
1882016-06-04T14:40:05  <sipa> no more merge conflicts
1892016-06-04T14:40:15  <sipa> the result may however not be code you want to run
1902016-06-04T14:40:29  <sipa> <<< should mean "format disk"
1912016-06-04T14:41:12  <btcdrak> babies speak that but they forget it when they grow up so cant teach the adults
1922016-06-04T15:00:36  *** Giszmo has joined #bitcoin-core-dev
1932016-06-04T15:13:54  *** TheFactory7 has quit IRC
1942016-06-04T15:14:30  *** calibre720 has quit IRC
1952016-06-04T15:23:36  *** AaronvanW has quit IRC
1962016-06-04T15:27:08  *** calibre720 has joined #bitcoin-core-dev
1972016-06-04T15:28:13  *** fengling has quit IRC
1982016-06-04T15:48:00  *** mkarrer has quit IRC
1992016-06-04T15:54:11  *** laurentmt has joined #bitcoin-core-dev
2002016-06-04T15:54:29  *** laurentmt has quit IRC
2012016-06-04T16:12:41  *** calibre720 has quit IRC
2022016-06-04T16:18:23  *** Giszmo has quit IRC
2032016-06-04T16:21:16  *** Ylbam has quit IRC
2042016-06-04T16:22:50  *** calibre720 has joined #bitcoin-core-dev
2052016-06-04T16:33:09  *** mkarrer has joined #bitcoin-core-dev
2062016-06-04T16:44:00  *** calibre720 has quit IRC
2072016-06-04T16:54:45  *** calibre720 has joined #bitcoin-core-dev
2082016-06-04T17:05:16  *** calibre720 has quit IRC
2092016-06-04T17:05:48  *** TomMc has quit IRC
2102016-06-04T17:06:56  *** gevs has quit IRC
2112016-06-04T17:16:53  *** calibre720 has joined #bitcoin-core-dev
2122016-06-04T17:20:28  *** gevs has joined #bitcoin-core-dev
2132016-06-04T17:34:50  *** murch has quit IRC
2142016-06-04T17:38:50  *** calibre720 has quit IRC
2152016-06-04T17:40:14  *** Ylbam has joined #bitcoin-core-dev
2162016-06-04T17:50:36  *** calibre720 has joined #bitcoin-core-dev
2172016-06-04T17:58:46  *** laurentmt has joined #bitcoin-core-dev
2182016-06-04T17:59:01  *** laurentmt has quit IRC
2192016-06-04T18:12:13  *** justanot1eruser has joined #bitcoin-core-dev
2202016-06-04T18:14:16  *** calibre720 has quit IRC
2212016-06-04T18:15:39  *** justanotheruser has quit IRC
2222016-06-04T18:44:07  *** MrHodl has joined #bitcoin-core-dev
2232016-06-04T18:51:44  *** iniana has joined #bitcoin-core-dev
2242016-06-04T18:54:40  *** droark has joined #bitcoin-core-dev
2252016-06-04T19:07:26  *** G1lius has quit IRC
2262016-06-04T19:32:14  *** AaronvanW has joined #bitcoin-core-dev
2272016-06-04T19:42:04  *** justanot1eruser has quit IRC
2282016-06-04T19:54:06  *** achow101 has joined #bitcoin-core-dev
2292016-06-04T20:05:42  *** molz has quit IRC
2302016-06-04T20:06:11  *** molz has joined #bitcoin-core-dev
2312016-06-04T20:06:22  *** pmienk has quit IRC
2322016-06-04T20:07:11  *** baldur has joined #bitcoin-core-dev
2332016-06-04T20:11:06  *** justanotheruser has joined #bitcoin-core-dev
2342016-06-04T20:24:07  *** Guyver2 has joined #bitcoin-core-dev
2352016-06-04T20:41:21  *** MrHodl has quit IRC
2362016-06-04T21:19:15  *** jarret has joined #bitcoin-core-dev
2372016-06-04T21:30:18  *** Arnavion has quit IRC
2382016-06-04T21:30:23  *** Arnavion has joined #bitcoin-core-dev
2392016-06-04T22:09:52  *** raedah has quit IRC
2402016-06-04T22:19:25  *** AaronvanW has quit IRC
2412016-06-04T22:20:22  *** raedah has joined #bitcoin-core-dev
2422016-06-04T22:57:57  *** Guyver2 has quit IRC
2432016-06-04T23:36:01  *** Chris_Stewart_5 has quit IRC