1 2016-06-04T00:15:31  *** abc has joined #bitcoin-core-dev
  2 2016-06-04T00:15:55  *** abc is now known as Guest74801
  3 2016-06-04T00:19:00  *** Guest74801 has quit IRC
  4 2016-06-04T00:25:09  *** fengling has joined #bitcoin-core-dev
  5 2016-06-04T00:29:24  *** fengling has quit IRC
  6 2016-06-04T00:49:49  *** TomMc has joined #bitcoin-core-dev
  7 2016-06-04T00:52:04  *** fengling has joined #bitcoin-core-dev
  8 2016-06-04T00:54:54  *** TomMc has quit IRC
  9 2016-06-04T01:11:16  *** Ylbam has quit IRC
 10 2016-06-04T02:00:48  *** raedah has quit IRC
 11 2016-06-04T02:02:26  *** raedah has joined #bitcoin-core-dev
 12 2016-06-04T02:02:44  *** fengling has quit IRC
 13 2016-06-04T02:12:53  *** fengling has joined #bitcoin-core-dev
 14 2016-06-04T02:33:59  *** frankenmint has joined #bitcoin-core-dev
 15 2016-06-04T02:34:01  *** Alopex has quit IRC
 16 2016-06-04T02:35:06  *** Alopex has joined #bitcoin-core-dev
 17 2016-06-04T02:39:35  *** xiangfu has joined #bitcoin-core-dev
 18 2016-06-04T02:45:01  *** Alopex has quit IRC
 19 2016-06-04T02:46:06  *** Alopex has joined #bitcoin-core-dev
 20 2016-06-04T02:59:48  *** achow101 has quit IRC
 21 2016-06-04T03:02:12  *** Chris_Stewart_5 has quit IRC
 22 2016-06-04T03:26:38  *** frankenmint has quit IRC
 23 2016-06-04T03:27:36  *** xiangfu has quit IRC
 24 2016-06-04T03:33:56  *** molz has joined #bitcoin-core-dev
 25 2016-06-04T03:35:21  *** moli has quit IRC
 26 2016-06-04T03:50:44  *** fengling has quit IRC
 27 2016-06-04T03:52:09  *** frankenmint has joined #bitcoin-core-dev
 28 2016-06-04T03:53:49  *** frankenmint has quit IRC
 29 2016-06-04T03:58:10  *** PaulCape_ has joined #bitcoin-core-dev
 30 2016-06-04T03:58:44  *** PaulCape_ has quit IRC
 31 2016-06-04T03:59:17  *** PaulCape_ has joined #bitcoin-core-dev
 32 2016-06-04T04:01:05  *** PaulCapestany has quit IRC
 33 2016-06-04T04:03:25  *** frankenmint has joined #bitcoin-core-dev
 34 2016-06-04T04:04:45  *** PaulCape_ has quit IRC
 35 2016-06-04T04:05:11  *** PaulCapestany has joined #bitcoin-core-dev
 36 2016-06-04T04:17:59  *** frankenmint has quit IRC
 37 2016-06-04T04:18:05  *** xiangfu has joined #bitcoin-core-dev
 38 2016-06-04T04:22:03  *** mrpocoyo has joined #bitcoin-core-dev
 39 2016-06-04T04:22:44  *** [Author] has quit IRC
 40 2016-06-04T04:24:14  *** bsm117532 is now known as Guest26338
 41 2016-06-04T04:27:43  *** [Author] has joined #bitcoin-core-dev
 42 2016-06-04T04:29:03  *** ghtdak has quit IRC
 43 2016-06-04T04:29:59  *** ghtdak has joined #bitcoin-core-dev
 44 2016-06-04T04:30:15  *** frankenmint has joined #bitcoin-core-dev
 45 2016-06-04T04:42:29  *** fengling has joined #bitcoin-core-dev
 46 2016-06-04T04:46:24  *** xiangfu has quit IRC
 47 2016-06-04T04:53:00  *** xiangfu has joined #bitcoin-core-dev
 48 2016-06-04T05:30:26  *** PRab has quit IRC
 49 2016-06-04T05:50:02  *** frankenmint has quit IRC
 50 2016-06-04T05:51:16  *** frankenmint has joined #bitcoin-core-dev
 51 2016-06-04T05:53:01  *** Alopex has quit IRC
 52 2016-06-04T05:54:06  *** Alopex has joined #bitcoin-core-dev
 53 2016-06-04T05:56:49  *** PRab has joined #bitcoin-core-dev
 54 2016-06-04T05:58:59  *** frankenmint has joined #bitcoin-core-dev
 55 2016-06-04T06:39:33  *** MarcoFalke has joined #bitcoin-core-dev
 56 2016-06-04T06:49:05  *** Giszmo has quit IRC
 57 2016-06-04T06:58:18  *** xiangfu has quit IRC
 58 2016-06-04T07:13:02  *** Alopex has quit IRC
 59 2016-06-04T07:14:07  *** Alopex has joined #bitcoin-core-dev
 60 2016-06-04T07:26:34  *** AtashiCon has quit IRC
 61 2016-06-04T07:36:31  *** Ylbam has joined #bitcoin-core-dev
 62 2016-06-04T07:58:17  *** AtashiCon has joined #bitcoin-core-dev
 63 2016-06-04T08:21:40  *** jtimon has quit IRC
 64 2016-06-04T08:26:51  *** frankenmint has quit IRC
 65 2016-06-04T08:28:47  *** Guyver2 has joined #bitcoin-core-dev
 66 2016-06-04T08:56:24  *** frankenmint has joined #bitcoin-core-dev
 67 2016-06-04T09:15:25  *** murch has joined #bitcoin-core-dev
 68 2016-06-04T09:25:01  *** Guyver2 has quit IRC
 69 2016-06-04T09:32:52  *** xiangfu has joined #bitcoin-core-dev
 70 2016-06-04T09:40:04  *** xiangfu has quit IRC
 71 2016-06-04T09:56:04  *** G1lius has joined #bitcoin-core-dev
 72 2016-06-04T09:58:31  *** xiangfu has joined #bitcoin-core-dev
 73 2016-06-04T10:03:01  * sipa just learned how to rebase a branch that has merges
 74 2016-06-04T10:03:17  <sipa> (where the merges have merge conflicts)
 75 2016-06-04T10:24:05  *** mrpocoyo has quit IRC
 76 2016-06-04T10:41:02  <btcdrak> sipa: what dark magic is this?
 77 2016-06-04T10:42:01  <sipa> first use git rebase -i -p <base commit>
 78 2016-06-04T10:43:09  <btcdrak> TIL: -p
 79 2016-06-04T10:45:14  <sipa> that will complain whenever the merge commit is to be merged, as it has merge conflicts
 80 2016-06-04T10:45:32  <sipa> (and rebase -p can't deal with reapplying merge resolution)
 81 2016-06-04T10:45:48  <sipa> then use git checkout -p <original merge commit id>
 82 2016-06-04T10:46:34  <sipa> wait, first use git add -P, to mark all merge conflicts as resolved (you're lying, they aren't)
 83 2016-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
 84 2016-06-04T10:47:14  <sipa> sorry, git add -A
 85 2016-06-04T10:47:16  <sipa> grr
 86 2016-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
 87 2016-06-04T10:50:12  <sipa> which you all accept
 88 2016-06-04T10:50:27  <sipa> except the changes that are due to changes made earlier in history
 89 2016-06-04T10:51:34  <sipa> as you don't want those reset to the original
 90 2016-06-04T10:54:34  *** afk11 has quit IRC
 91 2016-06-04T10:58:18  *** afk11 has joined #bitcoin-core-dev
 92 2016-06-04T10:58:19  *** afk11 has quit IRC
 93 2016-06-04T10:58:19  *** afk11 has joined #bitcoin-core-dev
 94 2016-06-04T11:52:48  *** laurentmt has joined #bitcoin-core-dev
 95 2016-06-04T11:57:32  *** laurentmt has quit IRC
 96 2016-06-04T12:10:33  *** TomMc has joined #bitcoin-core-dev
 97 2016-06-04T12:12:44  *** jtimon has joined #bitcoin-core-dev
 98 2016-06-04T12:15:58  *** PRab has quit IRC
 99 2016-06-04T12:21:03  *** fengling has quit IRC
100 2016-06-04T12:24:07  *** TheFactory7 has joined #bitcoin-core-dev
101 2016-06-04T12:25:15  *** xiangfu has quit IRC
102 2016-06-04T13:24:39  *** AaronvanW has quit IRC
103 2016-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
104 2016-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
105 2016-06-04T13:27:50  <phantomcircuit> NicolasDorier, something something dont ask to ask
106 2016-06-04T13:27:51  <phantomcircuit> :P
107 2016-06-04T13:28:20  <NicolasDorier> what does it mean ? :p
108 2016-06-04T13:29:12  <NicolasDorier> so basically my problem is
109 2016-06-04T13:29:32  <NicolasDorier> SENDCMPCT should have a boolean which indicate in which mode the peer want to receive new blocks
110 2016-06-04T13:29:42  *** Chris_Stewart_5 has joined #bitcoin-core-dev
111 2016-06-04T13:29:55  <NicolasDorier> either with INV or with CMPCT BLK
112 2016-06-04T13:30:07  <sipa> indeed, and a version number
113 2016-06-04T13:30:33  <NicolasDorier> problem is, in the PR, this boolean is used to indicate whether the sender provide or not CMPCTBLK
114 2016-06-04T13:30:45  <NicolasDorier> https://github.com/bitcoin/bitcoin/pull/8068/files#diff-7ec3c68a81efff79b6ca22ac1f1eabbaR4915
115 2016-06-04T13:30:53  <NicolasDorier> oups
116 2016-06-04T13:30:53  <NicolasDorier> no
117 2016-06-04T13:31:01  <NicolasDorier> this
118 2016-06-04T13:31:01  <NicolasDorier> https://github.com/bitcoin/bitcoin/pull/8068/files#diff-7ec3c68a81efff79b6ca22ac1f1eabbaR4846
119 2016-06-04T13:33:15  <sipa> NicolasDorier: i think you're right
120 2016-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
121 2016-06-04T13:34:26  <NicolasDorier> the intention was to use the bool to activate or deactivate CMPCT
122 2016-06-04T13:34:38  <NicolasDorier> as far as I understand
123 2016-06-04T13:35:26  <NicolasDorier> I can work on fixing it, but I heard you are working on the PR right now sipa ?
124 2016-06-04T13:35:38  <sipa> i think fProvidesHeaderAndIDs should just be set to true in response to SENDCMPCT
125 2016-06-04T13:35:58  <NicolasDorier> mmh it is not the same semantic
126 2016-06-04T13:36:10  <NicolasDorier> SENDCMPCT tell you about the want of the remote node
127 2016-06-04T13:36:14  <NicolasDorier> not about his capabilities
128 2016-06-04T13:36:18  <sipa> both
129 2016-06-04T13:36:33  <NicolasDorier> well, you can already use the version in the handshake for it
130 2016-06-04T13:36:39  <sipa> no, you can't
131 2016-06-04T13:36:57  <sipa> nVersion >= 70014 does not imply you support compact blocks
132 2016-06-04T13:37:28  <NicolasDorier> ? why ? because of pruned nodes ?
133 2016-06-04T13:37:46  <sipa> because we don't want everyone in the network to be forced to implement this
134 2016-06-04T13:38:04  <sipa> maybe 70015 introduces another features that is easy to implement
135 2016-06-04T13:38:07  <NicolasDorier> in such case maybe a service BIT can be useful
136 2016-06-04T13:38:15  <sipa> service bits are expensive
137 2016-06-04T13:38:24  <sipa> we only have 48
138 2016-06-04T13:38:27  <sipa> sorry, 56
139 2016-06-04T13:39:10  <sipa> BIP130 also does not use a service bit
140 2016-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
141 2016-06-04T13:39:40  <sipa> maybe :)
142 2016-06-04T13:39:45  <sipa> but there is a lot of infrastructure
143 2016-06-04T13:40:06  <sipa> that uses it
144 2016-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
145 2016-06-04T13:41:22  <NicolasDorier> also https://github.com/bitcoin/bitcoin/pull/8068/files#diff-7ec3c68a81efff79b6ca22ac1f1eabbaR4920 is completely out of purpose
146 2016-06-04T13:41:39  <NicolasDorier> and duplicated on https://github.com/bitcoin/bitcoin/pull/8068/files#diff-7ec3c68a81efff79b6ca22ac1f1eabbaR5504
147 2016-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
148 2016-06-04T13:41:47  <sipa> yes, i commented on the duplication
149 2016-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)
150 2016-06-04T13:43:19  <NicolasDorier> ok I'll continue my review on your branch instead
151 2016-06-04T13:44:44  <sipa> i think the two assignments to preferheadersandids and providesheadersandids just need to be swapped
152 2016-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
153 2016-06-04T13:46:55  <sipa> that's exactly what it means
154 2016-06-04T13:47:12  <NicolasDorier> it can also mean that it does not support CMPCTBLK at all
155 2016-06-04T13:47:20  <sipa> no, that's providesheadersandids
156 2016-06-04T13:47:22  <NicolasDorier> an enum with 3 values would be easier imhi
157 2016-06-04T13:47:38  <sipa> providesheadersandids is something that affects our request logic
158 2016-06-04T13:47:47  <sipa> preferheadersandids is something that affects our send logic
159 2016-06-04T13:49:51  <NicolasDorier> sipa: on send logic we have 3 cases, legacy, high bandwidth and low bandwidth. PreferHeadersAndIds is a boolean
160 2016-06-04T13:50:30  <NicolasDorier> oh
161 2016-06-04T13:50:35  <NicolasDorier> oh no I get it
162 2016-06-04T13:50:51  <NicolasDorier> because low bandwidth still use INV, it is not different from legacy
163 2016-06-04T13:51:30  <NicolasDorier> ok, thanks... continuing my review I think it is clearer now
164 2016-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
165 2016-06-04T13:51:54  <sipa> eh
166 2016-06-04T13:51:57  <sipa> rather than MSG_BLOCK
167 2016-06-04T13:52:03  <sipa> but that's not our worry
168 2016-06-04T13:52:20  <NicolasDorier> yes make sense thanks!
169 2016-06-04T14:01:06  * MarcoFalke looks at travis merge commit hash 4222221c0000... and wonders about the odds
170 2016-06-04T14:01:40  <sipa> MarcoFalke: i have considered grinding commit hashes in segwit to be consecutive numbers :p
171 2016-06-04T14:01:52  <GitHub189> [bitcoin] jonasschnelli pushed 2 new commits to master: https://github.com/bitcoin/bitcoin/compare/8c1e49ba13a8...d46b8b50fc3e
172 2016-06-04T14:01:52  <GitHub189> bitcoin/master e39dc69 instagibbs: comment nit: miners don't vote
173 2016-06-04T14:01:53  <GitHub189> bitcoin/master d46b8b5 Jonas Schnelli: Merge #8143: comment nit: miners don't vote...
174 2016-06-04T14:02:04  <MarcoFalke> You should do it after the rebase :P
175 2016-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
176 2016-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 ?
177 2016-06-04T14:11:03  *** Chris_Stewart_5 has quit IRC
178 2016-06-04T14:13:06  *** fengling has joined #bitcoin-core-dev
179 2016-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 )
180 2016-06-04T14:26:10  *** Chris_Stewart_5 has joined #bitcoin-core-dev
181 2016-06-04T14:30:01  *** ghtdak has quit IRC
182 2016-06-04T14:33:20  <sipa> MarcoFalke: dragons
183 2016-06-04T14:34:31  <MarcoFalke> GitHub unicorn
184 2016-06-04T14:34:33  *** AaronvanW has joined #bitcoin-core-dev
185 2016-06-04T14:34:38  *** ghtdak has joined #bitcoin-core-dev
186 2016-06-04T14:36:54  <MarcoFalke> They have figured out AI that can solve conflicts for you
187 2016-06-04T14:39:55  <sipa> we should invent a programming language in which every sequence of ascii characters is a valid program
188 2016-06-04T14:40:05  <sipa> no more merge conflicts
189 2016-06-04T14:40:15  <sipa> the result may however not be code you want to run
190 2016-06-04T14:40:29  <sipa> <<< should mean "format disk"
191 2016-06-04T14:41:12  <btcdrak> babies speak that but they forget it when they grow up so cant teach the adults
192 2016-06-04T15:00:36  *** Giszmo has joined #bitcoin-core-dev
193 2016-06-04T15:13:54  *** TheFactory7 has quit IRC
194 2016-06-04T15:14:30  *** calibre720 has quit IRC
195 2016-06-04T15:23:36  *** AaronvanW has quit IRC
196 2016-06-04T15:27:08  *** calibre720 has joined #bitcoin-core-dev
197 2016-06-04T15:28:13  *** fengling has quit IRC
198 2016-06-04T15:48:00  *** mkarrer has quit IRC
199 2016-06-04T15:54:11  *** laurentmt has joined #bitcoin-core-dev
200 2016-06-04T15:54:29  *** laurentmt has quit IRC
201 2016-06-04T16:12:41  *** calibre720 has quit IRC
202 2016-06-04T16:18:23  *** Giszmo has quit IRC
203 2016-06-04T16:21:16  *** Ylbam has quit IRC
204 2016-06-04T16:22:50  *** calibre720 has joined #bitcoin-core-dev
205 2016-06-04T16:33:09  *** mkarrer has joined #bitcoin-core-dev
206 2016-06-04T16:44:00  *** calibre720 has quit IRC
207 2016-06-04T16:54:45  *** calibre720 has joined #bitcoin-core-dev
208 2016-06-04T17:05:16  *** calibre720 has quit IRC
209 2016-06-04T17:05:48  *** TomMc has quit IRC
210 2016-06-04T17:06:56  *** gevs has quit IRC
211 2016-06-04T17:16:53  *** calibre720 has joined #bitcoin-core-dev
212 2016-06-04T17:20:28  *** gevs has joined #bitcoin-core-dev
213 2016-06-04T17:34:50  *** murch has quit IRC
214 2016-06-04T17:38:50  *** calibre720 has quit IRC
215 2016-06-04T17:40:14  *** Ylbam has joined #bitcoin-core-dev
216 2016-06-04T17:50:36  *** calibre720 has joined #bitcoin-core-dev
217 2016-06-04T17:58:46  *** laurentmt has joined #bitcoin-core-dev
218 2016-06-04T17:59:01  *** laurentmt has quit IRC
219 2016-06-04T18:12:13  *** justanot1eruser has joined #bitcoin-core-dev
220 2016-06-04T18:14:16  *** calibre720 has quit IRC
221 2016-06-04T18:15:39  *** justanotheruser has quit IRC
222 2016-06-04T18:44:07  *** MrHodl has joined #bitcoin-core-dev
223 2016-06-04T18:51:44  *** iniana has joined #bitcoin-core-dev
224 2016-06-04T18:54:40  *** droark has joined #bitcoin-core-dev
225 2016-06-04T19:07:26  *** G1lius has quit IRC
226 2016-06-04T19:32:14  *** AaronvanW has joined #bitcoin-core-dev
227 2016-06-04T19:42:04  *** justanot1eruser has quit IRC
228 2016-06-04T19:54:06  *** achow101 has joined #bitcoin-core-dev
229 2016-06-04T20:05:42  *** molz has quit IRC
230 2016-06-04T20:06:11  *** molz has joined #bitcoin-core-dev
231 2016-06-04T20:06:22  *** pmienk has quit IRC
232 2016-06-04T20:07:11  *** baldur has joined #bitcoin-core-dev
233 2016-06-04T20:11:06  *** justanotheruser has joined #bitcoin-core-dev
234 2016-06-04T20:24:07  *** Guyver2 has joined #bitcoin-core-dev
235 2016-06-04T20:41:21  *** MrHodl has quit IRC
236 2016-06-04T21:19:15  *** jarret has joined #bitcoin-core-dev
237 2016-06-04T21:30:18  *** Arnavion has quit IRC
238 2016-06-04T21:30:23  *** Arnavion has joined #bitcoin-core-dev
239 2016-06-04T22:09:52  *** raedah has quit IRC
240 2016-06-04T22:19:25  *** AaronvanW has quit IRC
241 2016-06-04T22:20:22  *** raedah has joined #bitcoin-core-dev
242 2016-06-04T22:57:57  *** Guyver2 has quit IRC
243 2016-06-04T23:36:01  *** Chris_Stewart_5 has quit IRC