1 2016-01-13T00:01:11  *** AtashiCon has quit IRC
  2 2016-01-13T00:01:29  *** AtashiCon has joined #bitcoin-core-dev
  3 2016-01-13T00:09:35  *** adam3us has joined #bitcoin-core-dev
  4 2016-01-13T00:22:39  *** zookolaptop has quit IRC
  5 2016-01-13T00:22:55  *** arowser has quit IRC
  6 2016-01-13T00:23:27  *** arowser has joined #bitcoin-core-dev
  7 2016-01-13T00:39:21  *** dcousens has joined #bitcoin-core-dev
  8 2016-01-13T00:56:11  *** jcorgan|away is now known as jcorgan
  9 2016-01-13T01:16:49  *** brg444 has quit IRC
 10 2016-01-13T01:23:36  *** zookolaptop has joined #bitcoin-core-dev
 11 2016-01-13T01:27:48  *** teward has joined #bitcoin-core-dev
 12 2016-01-13T01:29:48  <Anduck> why not bitcoincore.org instead of bitcoinco.re (which imo sucks)?
 13 2016-01-13T01:38:21  *** Ylbam has quit IRC
 14 2016-01-13T01:38:26  *** brg444 has joined #bitcoin-core-dev
 15 2016-01-13T01:51:48  *** zookolap` has joined #bitcoin-core-dev
 16 2016-01-13T01:53:05  *** zookolaptop has quit IRC
 17 2016-01-13T02:03:15  *** zookolap` is now known as zooko
 18 2016-01-13T02:09:56  *** adam3us has quit IRC
 19 2016-01-13T02:15:46  *** teward has quit IRC
 20 2016-01-13T02:21:13  *** teward has joined #bitcoin-core-dev
 21 2016-01-13T02:39:43  *** neha has joined #bitcoin-core-dev
 22 2016-01-13T02:55:56  *** go1111111 has quit IRC
 23 2016-01-13T02:57:54  *** xiangfu has joined #bitcoin-core-dev
 24 2016-01-13T03:06:18  *** p15 has joined #bitcoin-core-dev
 25 2016-01-13T03:07:59  *** go1111111 has joined #bitcoin-core-dev
 26 2016-01-13T03:54:29  *** p15 has quit IRC
 27 2016-01-13T03:56:22  *** dcousens has quit IRC
 28 2016-01-13T03:57:47  *** xiangfu has quit IRC
 29 2016-01-13T03:59:22  *** xiangfu has joined #bitcoin-core-dev
 30 2016-01-13T04:13:22  *** brg444 has quit IRC
 31 2016-01-13T04:29:28  *** p15 has joined #bitcoin-core-dev
 32 2016-01-13T04:30:10  *** da2ce7_mobile_ has quit IRC
 33 2016-01-13T04:30:30  *** da2ce7 has quit IRC
 34 2016-01-13T04:33:06  *** Yoghur114 has quit IRC
 35 2016-01-13T04:33:23  *** Yoghur114 has joined #bitcoin-core-dev
 36 2016-01-13T04:37:15  *** da2ce7 has joined #bitcoin-core-dev
 37 2016-01-13T04:40:15  *** da2ce7_mobile has joined #bitcoin-core-dev
 38 2016-01-13T04:45:04  *** adam3us has joined #bitcoin-core-dev
 39 2016-01-13T04:46:47  *** zooko has quit IRC
 40 2016-01-13T04:47:25  *** zookolaptop has joined #bitcoin-core-dev
 41 2016-01-13T04:52:49  *** dcousens has joined #bitcoin-core-dev
 42 2016-01-13T05:01:07  *** wallet42 has joined #bitcoin-core-dev
 43 2016-01-13T05:20:46  *** Chris_Stewart_5 has quit IRC
 44 2016-01-13T05:25:41  *** wallet42 has quit IRC
 45 2016-01-13T05:40:18  *** wallet42 has joined #bitcoin-core-dev
 46 2016-01-13T05:41:51  *** wallet42 has left #bitcoin-core-dev
 47 2016-01-13T05:51:41  *** p15_ has joined #bitcoin-core-dev
 48 2016-01-13T05:54:12  *** p15 has quit IRC
 49 2016-01-13T06:00:47  *** jcorgan is now known as jcorgan|away
 50 2016-01-13T06:04:29  *** moli has quit IRC
 51 2016-01-13T06:19:04  *** moli has joined #bitcoin-core-dev
 52 2016-01-13T06:36:30  *** Ylbam has joined #bitcoin-core-dev
 53 2016-01-13T06:43:40  <arowser> bitcoinco
 54 2016-01-13T06:44:09  *** adam3us has quit IRC
 55 2016-01-13T06:47:58  *** adam3us has joined #bitcoin-core-dev
 56 2016-01-13T07:39:13  *** p15 has joined #bitcoin-core-dev
 57 2016-01-13T07:42:02  *** p15_ has quit IRC
 58 2016-01-13T07:44:57  *** jtimon has joined #bitcoin-core-dev
 59 2016-01-13T07:46:27  *** blkdb has joined #bitcoin-core-dev
 60 2016-01-13T07:46:50  *** JackH has joined #bitcoin-core-dev
 61 2016-01-13T07:48:34  *** blkdb has quit IRC
 62 2016-01-13T07:49:46  *** blkdb has joined #bitcoin-core-dev
 63 2016-01-13T08:00:52  *** arowser has quit IRC
 64 2016-01-13T08:01:21  *** arowser has joined #bitcoin-core-dev
 65 2016-01-13T08:01:58  *** blkdb has quit IRC
 66 2016-01-13T08:12:55  *** blkdb has joined #bitcoin-core-dev
 67 2016-01-13T08:18:09  *** paveljanik has quit IRC
 68 2016-01-13T08:46:15  *** BashCo has quit IRC
 69 2016-01-13T08:57:15  *** blkdb has quit IRC
 70 2016-01-13T08:57:54  *** blkdb has joined #bitcoin-core-dev
 71 2016-01-13T09:14:00  *** BashCo has joined #bitcoin-core-dev
 72 2016-01-13T09:28:10  *** murch has joined #bitcoin-core-dev
 73 2016-01-13T09:28:46  *** blkdb has quit IRC
 74 2016-01-13T09:28:56  *** blkdb has joined #bitcoin-core-dev
 75 2016-01-13T09:33:14  *** Guyver2 has joined #bitcoin-core-dev
 76 2016-01-13T09:36:58  *** ChanServ sets mode: +o wumpus
 77 2016-01-13T09:37:00  *** wumpus sets mode: +b *!*@unaffiliated/quent
 78 2016-01-13T09:37:11  *** Quent was kicked by wumpus (persistently offtopic)
 79 2016-01-13T09:55:17  <GitHub88> [bitcoin] laanwj pushed 2 new commits to master: https://github.com/bitcoin/bitcoin/compare/dd1304ec216c...18ca3fa84058
 80 2016-01-13T09:55:17  <GitHub88> bitcoin/master d570a1f Luke Dashjr: doc/bips: Document BIP 125 support
 81 2016-01-13T09:55:18  <GitHub88> bitcoin/master 18ca3fa Wladimir J. van der Laan: Merge pull request #7324...
 82 2016-01-13T09:55:27  <GitHub165> [bitcoin] laanwj closed pull request #7324: doc/bips: Document BIP 125 support (master...bips_rbf) https://github.com/bitcoin/bitcoin/pull/7324
 83 2016-01-13T09:55:57  <GitHub173> [bitcoin] laanwj pushed 1 new commit to 0.12: https://github.com/bitcoin/bitcoin/commit/8f25d6eb0e0a4c1a369878808fb041283617081c
 84 2016-01-13T09:55:58  <GitHub173> bitcoin/0.12 8f25d6e Wladimir J. van der Laan: Merge pull request #7324
 85 2016-01-13T10:04:28  <GitHub133> [bitcoin] laanwj pushed 4 new commits to master: https://github.com/bitcoin/bitcoin/compare/18ca3fa84058...c49551886a75
 86 2016-01-13T10:04:29  <GitHub133> bitcoin/master 995b9f3 Alex Morcos: Always respect GetRequiredFee for wallet txs
 87 2016-01-13T10:04:30  <GitHub133> bitcoin/master e420a1b Alex Morcos: Add sane fallback for fee estimation...
 88 2016-01-13T10:04:30  <GitHub133> bitcoin/master bebe58b Alex Morcos: SQUASHME: Fix rpc tests that assumed fallback to minRelayTxFee
 89 2016-01-13T10:04:33  <GitHub162> [bitcoin] laanwj closed pull request #7296: Add sane fallback for fee estimation (master...fallbackfee) https://github.com/bitcoin/bitcoin/pull/7296
 90 2016-01-13T10:04:38  <GitHub35> [bitcoin] laanwj closed pull request #7321: Always respect GetRequiredFee for wallet txs (master...Mf1601-walletFeeFix) https://github.com/bitcoin/bitcoin/pull/7321
 91 2016-01-13T10:06:21  <GitHub37> [bitcoin] laanwj pushed 1 new commit to 0.12: https://github.com/bitcoin/bitcoin/commit/a36d79bfe247e7fc5c6296fd8603f5094edfe558
 92 2016-01-13T10:06:21  <GitHub37> bitcoin/0.12 a36d79b Alex Morcos: Add sane fallback for fee estimation...
 93 2016-01-13T10:37:44  <GitHub195> [bitcoin] MarcoFalke opened pull request #7332: [wallet] Clarify rpc help message with regard to rounding (master...Mf1601-docAmount) https://github.com/bitcoin/bitcoin/pull/7332
 94 2016-01-13T10:42:39  *** laurentmt has joined #bitcoin-core-dev
 95 2016-01-13T10:43:51  *** laurentmt has quit IRC
 96 2016-01-13T10:50:36  <GitHub104> [bitcoin] laanwj pushed 2 new commits to master: https://github.com/bitcoin/bitcoin/compare/c49551886a75...2cd004b1232a
 97 2016-01-13T10:50:36  <GitHub104> bitcoin/master 3a9dfe9 paveljanik: Fix typo, wrong information in gettxout help text.
 98 2016-01-13T10:50:37  <GitHub104> bitcoin/master 2cd004b Wladimir J. van der Laan: Merge pull request #7326...
 99 2016-01-13T10:50:43  <GitHub32> [bitcoin] laanwj closed pull request #7326: [Trivial] Fix typo, wrong information in gettxout help text (master...patch-15) https://github.com/bitcoin/bitcoin/pull/7326
100 2016-01-13T10:59:35  *** NicolasDorier has quit IRC
101 2016-01-13T10:59:53  *** NicolasDorier has joined #bitcoin-core-dev
102 2016-01-13T11:08:18  *** jcorgan|away is now known as jcorgan
103 2016-01-13T11:09:10  *** davec has quit IRC
104 2016-01-13T11:09:15  *** Squidicuz has quit IRC
105 2016-01-13T11:09:22  *** MarcoFalke has joined #bitcoin-core-dev
106 2016-01-13T11:09:24  *** davec has joined #bitcoin-core-dev
107 2016-01-13T11:11:57  *** SmiteMeSmith__ has joined #bitcoin-core-dev
108 2016-01-13T11:13:24  *** dcousens has quit IRC
109 2016-01-13T11:15:14  *** SmiteMeSmith_ has quit IRC
110 2016-01-13T11:23:29  *** Thireus has joined #bitcoin-core-dev
111 2016-01-13T11:36:54  *** bsm117532 has quit IRC
112 2016-01-13T11:37:35  *** bsm117532 has joined #bitcoin-core-dev
113 2016-01-13T11:43:59  <GitHub11> [bitcoin] laanwj closed pull request #7309: [0.12] Update release-notes.md (0.12...Mf1601-releaseNotes0.12) https://github.com/bitcoin/bitcoin/pull/7309
114 2016-01-13T11:44:00  <GitHub158> [bitcoin] laanwj pushed 5 new commits to 0.12: https://github.com/bitcoin/bitcoin/compare/a36d79bfe247...2c5c2154c935
115 2016-01-13T11:44:01  <GitHub158> bitcoin/0.12 fabba1c MarcoFalke: Update release-notes.md...
116 2016-01-13T11:44:01  <GitHub158> bitcoin/0.12 fa4ba40 MarcoFalke: Expand section "Wallet transaction fees" & fix format and typos
117 2016-01-13T11:44:01  <GitHub158> bitcoin/0.12 fa0a391 MarcoFalke: Add Replace-by-fee to release-notes
118 2016-01-13T11:44:10  *** jcorgan is now known as jcorgan|away
119 2016-01-13T12:11:49  *** laurentmt has joined #bitcoin-core-dev
120 2016-01-13T12:16:08  *** dcousens has joined #bitcoin-core-dev
121 2016-01-13T12:16:56  *** xiangfu has quit IRC
122 2016-01-13T12:18:50  *** laurentmt has quit IRC
123 2016-01-13T12:30:33  *** MarcoFalke has quit IRC
124 2016-01-13T12:31:10  *** dcousens has quit IRC
125 2016-01-13T12:47:28  *** paveljanik has joined #bitcoin-core-dev
126 2016-01-13T13:02:52  *** guest21333 has joined #bitcoin-core-dev
127 2016-01-13T13:15:59  <morcos> wumpus: thanks for taking a look at 7312.  i liked the hack of reusing hashBlock b/c that meant whenever hashBlock was already being set/unset the abandon status would be kept in sync.  but perhas that was not the best way to create a special value which flagged it?
128 2016-01-13T13:17:06  <wumpus> CMerkleTx just doesn't look like the place for it
129 2016-01-13T13:17:14  <wumpus> conceptually
130 2016-01-13T13:17:24  <wumpus> why not  a field on CWallet instead?
131 2016-01-13T13:18:15  <wumpus> also it lacks documentation; so this field is 'the last transaction marked abandoned'
132 2016-01-13T13:18:18  <wumpus> ?
133 2016-01-13T13:20:19  <morcos> yes i'll definitely add documentation
134 2016-01-13T13:20:27  <morcos> the field is just a special flag
135 2016-01-13T13:20:41  <wumpus> yes, but it has nothing to do with MerkleTx - it's a wallet internal detail
136 2016-01-13T13:20:47  <morcos> blockHash is the hash of the block that the tx is confirmed iin
137 2016-01-13T13:20:50  <wumpus> I'm not sure it should be global static something
138 2016-01-13T13:21:04  <morcos> in the even blockHash.isNull that means it is not confirmed
139 2016-01-13T13:21:20  <morcos> recently we made it so that if the nIndex is -1
140 2016-01-13T13:21:27  <morcos> then hashBlock is now the hash of the conflicting tx
141 2016-01-13T13:21:32  <morcos> all that stuff is in CMerkle
142 2016-01-13T13:22:03  <morcos> So I was kind of overloading that hashBlock one more time to say, if it's 0 or 1 that means its not in a block and not conflicted, but 0 means regular and 1 means abandoned
143 2016-01-13T13:22:06  <wumpus> but conceptually it is wallet state, right, not global state? say if there are multiple CWallet objects, would they interfere with each other?
144 2016-01-13T13:22:25  <morcos> its not a variable, its just a constant
145 2016-01-13T13:22:32  <wumpus> oh!
146 2016-01-13T13:22:32  <morcos> hashBlock is the variable
147 2016-01-13T13:22:38  <wumpus> let me recheck
148 2016-01-13T13:22:48  <morcos> i'm not arguing its right btw
149 2016-01-13T13:23:34  *** laurentmt has joined #bitcoin-core-dev
150 2016-01-13T13:23:34  <wumpus> right, I missed the const, oops
151 2016-01-13T13:23:52  <wumpus> the field is hashBlock which already exists and is not a static
152 2016-01-13T13:23:55  <morcos> i was trying to encapsulate the constant somewhere that made sense, but perhaps it would have been better to just make it outside the class, or to just recreate it when we're checking it?  i'm not sure
153 2016-01-13T13:23:59  <morcos> correct
154 2016-01-13T13:24:23  <morcos> so if you are ok with perpetuating hte hack, i'm happy to move the constant whereever you think it should live, and comment it
155 2016-01-13T13:25:00  <wumpus> I think for most constants we use UPPER_CASE
156 2016-01-13T13:25:11  <wumpus> that's what made me confused... the field looks the same as the constant
157 2016-01-13T13:25:51  <wumpus> e.g. call it ABANDON_HASH
158 2016-01-13T13:26:00  <morcos> you're right.  i'm a copy paste coder and was copying the constant "one" from signature checking..  : )  but yes happy to
159 2016-01-13T13:29:42  <morcos> but should i move it?  it does seem like this is kind of a slippery slope from thread safety perspective right?  of course these things are all heavily locked now but if in the future you wanted multiple threads accessing different wallet tx's it seems silly to worry about synchronizing around a constnat
160 2016-01-13T13:29:43  *** Chris_Stewart_5 has joined #bitcoin-core-dev
161 2016-01-13T13:32:50  <wumpus> but there is no sync problem if it is a const
162 2016-01-13T13:33:01  *** laurentmt has quit IRC
163 2016-01-13T13:33:03  <wumpus> disregard that, I was confused, I thought it was a global value that changed
164 2016-01-13T13:33:25  <morcos> i don't know, one of you guys scared me with that article on thread safety
165 2016-01-13T13:33:52  <wumpus> no need to move it, just make clear it is a constant marker value
166 2016-01-13T13:34:06  <morcos> ok, well like i said, happy to capitalize, and comment, but please let me know if you think that is ok ..   ok great.   thanks
167 2016-01-13T13:34:06  *** guest21333 has quit IRC
168 2016-01-13T13:47:07  <morcos> wumpus: ok pushed.  thanks for waiting for this.  i think we'll be very happy we have it around if there is another major spam attack or other surge of transactions.  If not, no one has to use it.
169 2016-01-13T13:48:23  <wumpus> agreed
170 2016-01-13T14:00:05  *** Arnavion has quit IRC
171 2016-01-13T14:00:16  *** AtashiCon has quit IRC
172 2016-01-13T14:00:21  *** Arnavion3 has joined #bitcoin-core-dev
173 2016-01-13T14:00:24  *** Arnavion3 is now known as AtashiCon
174 2016-01-13T14:06:05  *** Arnavion has joined #bitcoin-core-dev
175 2016-01-13T14:47:41  *** treehug88 has joined #bitcoin-core-dev
176 2016-01-13T14:47:46  <GitHub13> [bitcoin] laanwj pushed 5 new commits to master: https://github.com/bitcoin/bitcoin/compare/2cd004b1232a...be6d5a617d29
177 2016-01-13T14:47:47  <GitHub13> bitcoin/master 9e69717 Alex Morcos: Make wallet descendant searching more efficient
178 2016-01-13T14:47:48  <GitHub13> bitcoin/master 01e06d1 Alex Morcos: Add new rpc call: abandontransaction...
179 2016-01-13T14:47:48  <GitHub13> bitcoin/master df0e222 Alex Morcos: Add RPC test for abandoned and conflicted transactions.
180 2016-01-13T14:47:54  <GitHub146> [bitcoin] laanwj closed pull request #7312: Add RPC call abandontransaction (master...forgetstuck) https://github.com/bitcoin/bitcoin/pull/7312
181 2016-01-13T14:52:47  *** MarcoFalke has joined #bitcoin-core-dev
182 2016-01-13T14:59:06  <GitHub179> [bitcoin] laanwj pushed 3 new commits to 0.12: https://github.com/bitcoin/bitcoin/compare/2c5c2154c935...afe825f0758a
183 2016-01-13T14:59:07  <GitHub179> bitcoin/0.12 fd4bd50 Alex Morcos: Add RPC call abandontransaction...
184 2016-01-13T14:59:08  <GitHub179> bitcoin/0.12 071f704 Wladimir J. van der Laan: Preliminary release notes 0.12.0
185 2016-01-13T14:59:08  <GitHub179> bitcoin/0.12 afe825f Wladimir J. van der Laan: Update translations pre-rc1
186 2016-01-13T14:59:43  *** treehug88 has quit IRC
187 2016-01-13T15:00:50  *** laurentmt has joined #bitcoin-core-dev
188 2016-01-13T15:01:21  <GitHub69> [bitcoin] laanwj pushed 2 new commits to master: https://github.com/bitcoin/bitcoin/compare/be6d5a617d29...17ef279304a9
189 2016-01-13T15:01:22  <GitHub69> bitcoin/master faf671b MarcoFalke: [wallet] Clarify rpc help message with regard to rounding
190 2016-01-13T15:01:22  <GitHub69> bitcoin/master 17ef279 Wladimir J. van der Laan: Merge pull request #7332...
191 2016-01-13T15:01:31  <GitHub168> [bitcoin] laanwj closed pull request #7332: [wallet] Clarify rpc help message with regard to rounding (master...Mf1601-docAmount) https://github.com/bitcoin/bitcoin/pull/7332
192 2016-01-13T15:02:16  <GitHub22> [bitcoin] laanwj pushed 1 new commit to 0.12: https://github.com/bitcoin/bitcoin/commit/2a3161bf8bd458ef44a53af37899fad684b257d6
193 2016-01-13T15:02:17  <GitHub22> bitcoin/0.12 2a3161b Wladimir J. van der Laan: Merge pull request #7332
194 2016-01-13T15:03:43  *** laurentmt has quit IRC
195 2016-01-13T15:05:46  <wumpus> ok, that should be all, going to tag 0.12.0rc1 in a minute
196 2016-01-13T15:11:03  *** laurentmt has joined #bitcoin-core-dev
197 2016-01-13T15:14:02  <wumpus>  * [new tag]         v0.12.0rc1 -> v0.12.0rc1
198 2016-01-13T15:14:14  <MarcoFalke> woohoo!
199 2016-01-13T15:14:40  <JackH> yay we have 0.12 incoming :)
200 2016-01-13T15:15:45  *** laurentmt has quit IRC
201 2016-01-13T15:29:21  *** Thireus has quit IRC
202 2016-01-13T15:46:17  <btcdrak> w00t
203 2016-01-13T15:51:06  <btcdrak> wumpus: pm
204 2016-01-13T16:06:02  *** dgenr8 has quit IRC
205 2016-01-13T16:20:05  <morcos> wumpus, your release candidate isn't compiling for me, looking into it
206 2016-01-13T16:20:35  <wumpus> linux build is still in progress here
207 2016-01-13T16:20:43  <morcos> ah backport failure of my pr, damn it, sorry i should have tested it in 0.12
208 2016-01-13T16:20:44  *** dgenr8 has joined #bitcoin-core-dev
209 2016-01-13T16:20:46  <morcos> will get you a fix
210 2016-01-13T16:21:15  <wumpus> ok, probably better to revert it, this was a bad idea last minute
211 2016-01-13T16:22:05  <morcos> wumpus: the problem was simple, it just used a function that hadn't been backported
212 2016-01-13T16:22:09  <wumpus> going to remove the rc1 tag again
213 2016-01-13T16:22:20  <morcos> give me 10 mins before making any decisions
214 2016-01-13T16:23:21  <wumpus>  - [deleted]         v0.12.0rc1   sorry for the noise...
215 2016-01-13T16:23:23  <morcos> probably the right answer is #7154 should be backported to.  it will be better UI for 0.12 and should fix the problem
216 2016-01-13T16:23:59  <wumpus> nah, I'm not going to do any last minute UI backports
217 2016-01-13T16:24:05  <wumpus> is there any quick fix?
218 2016-01-13T16:24:30  <morcos> yes, i can just inline the contents of the inmempool function
219 2016-01-13T16:24:40  <morcos> you don't want to do a UI backport because of translations?
220 2016-01-13T16:24:51  <wumpus> yes
221 2016-01-13T16:25:22  <morcos> ok, i'll just take the part of his commit in that pull that creates InMempool
222 2016-01-13T16:25:28  <morcos> thats cleanest
223 2016-01-13T16:25:43  <wumpus> makes sense, thanks
224 2016-01-13T16:26:08  <wumpus> can do the GUI part for 0.12.1, but it's too late for 0.12.0
225 2016-01-13T16:29:14  *** BashCo has quit IRC
226 2016-01-13T16:32:18  *** adam3us has quit IRC
227 2016-01-13T16:32:46  *** Chris_Stewart_5 has quit IRC
228 2016-01-13T16:37:23  <morcos> wumpus: ok i did it. but show me how you want to give it to you.  my branch v12rebase adds the commit in the right place.   and my branch forgetstuck12 has the commit just on top if you want to do the rebasing yourself.
229 2016-01-13T16:37:59  <morcos> in the v12rebase, i tried to comment the commit appropriately.  i didn't really put detail in the commit message on the forgetstuck12 branch
230 2016-01-13T16:38:06  *** laurentmt has joined #bitcoin-core-dev
231 2016-01-13T16:38:16  <morcos> i'm not sure how it is easiest for you to merge
232 2016-01-13T16:38:26  <morcos> also i tested
233 2016-01-13T16:38:30  *** laurentmt has quit IRC
234 2016-01-13T16:39:57  <MarcoFalke> Did you test the v12rebase?
235 2016-01-13T16:40:09  <morcos> MarcoFalke: yes
236 2016-01-13T16:40:14  <MarcoFalke> Then just merge that into bitcoin/bitcoin
237 2016-01-13T16:40:46  <morcos> its not a commit its a branch with the ordering of commits
238 2016-01-13T16:42:29  <MarcoFalke> a06a8b488896dd83a320fff10d48300ca01e9ba4 looks fine, I mean.
239 2016-01-13T16:43:15  <GitHub114> [bitcoin] morcos opened pull request #7333: add InMempool() function (0.12...forgetstuck12) https://github.com/bitcoin/bitcoin/pull/7333
240 2016-01-13T16:47:04  *** Chris_Stewart_5 has joined #bitcoin-core-dev
241 2016-01-13T16:49:13  <MarcoFalke> morcos, we can't rewrite history if that's what you mean?
242 2016-01-13T16:49:27  <MarcoFalke> Merging a06a is good enough
243 2016-01-13T16:52:01  <morcos> MarcoFalke: whatever wumpus wants as far as i'm concerned, but yes i guess 0.12 is already a public branch, so you might be right
244 2016-01-13T16:52:39  <wumpus> I'm just going to merge #7333, no need to change history
245 2016-01-13T16:55:22  <MarcoFalke> each commit should be atomic and compile on its own but that was never true anyway.
246 2016-01-13T16:59:51  <wumpus> it's usually the case
247 2016-01-13T17:00:49  <MarcoFalke> s/never/not always/
248 2016-01-13T17:05:17  <MarcoFalke> travis is smiling again
249 2016-01-13T17:08:06  <GitHub99> [bitcoin] laanwj closed pull request #7333: add InMempool() function (0.12...forgetstuck12) https://github.com/bitcoin/bitcoin/pull/7333
250 2016-01-13T17:08:06  <GitHub149> [bitcoin] laanwj pushed 2 new commits to 0.12: https://github.com/bitcoin/bitcoin/compare/2a3161bf8bd4...3d5cf698d60e
251 2016-01-13T17:08:06  <GitHub149> bitcoin/0.12 a06a8b4 Jonas Schnelli: add InMempool() function
252 2016-01-13T17:08:07  <GitHub149> bitcoin/0.12 3d5cf69 Wladimir J. van der Laan: Merge pull request #7333...
253 2016-01-13T17:08:35  <Luke-Jr> at the very least, 7149 is still needed to fix a bug in 0.12 (although note even with it, there are still bugs I am working on fixing/testing)
254 2016-01-13T17:08:50  <Luke-Jr> could wait for rc2 I suppose
255 2016-01-13T17:09:11  <MarcoFalke> There is indeed more bugs
256 2016-01-13T17:09:26  <MarcoFalke> We need to leave some for later
257 2016-01-13T17:09:48  <Luke-Jr> yeah, I guess we should get rc1 out ASAP so users can begin *finding* [more] bugs :p
258 2016-01-13T17:09:54  <morcos> MarcoFalke: more bugs?
259 2016-01-13T17:10:21  <MarcoFalke> I will create pulls in the coming days
260 2016-01-13T17:10:39  <MarcoFalke> Some of those exist for a long time
261 2016-01-13T17:10:49  <MarcoFalke> It's not too critical
262 2016-01-13T17:11:07  <MarcoFalke> +1 Luke-Jr :)
263 2016-01-13T17:12:34  <wumpus> of course there is always more work to be done, but we can't keep postponing 0.12 forever
264 2016-01-13T17:12:58  <MarcoFalke> Sure, there are 351 other bugs open at this time, I think
265 2016-01-13T17:13:25  <MarcoFalke> But nothing holding back a rc1
266 2016-01-13T17:16:30  *** BashCo has joined #bitcoin-core-dev
267 2016-01-13T17:17:07  <wumpus>  * [new tag]         v0.12.0rc1 -> v0.12.0rc1   ok,. this time for real
268 2016-01-13T17:17:13  <michagogo> Release notes talk about BIP65 locking in in future tense...
269 2016-01-13T17:18:40  <wumpus> hm, that probably shouldn't be there at al
270 2016-01-13T17:18:54  <Luke-Jr> XD
271 2016-01-13T17:20:11  <michagogo> (Also, is github being weird or did v0.11.2 have a handful of version numbers that stayed at 0.10?)
272 2016-01-13T17:20:23  <Luke-Jr> huh?
273 2016-01-13T17:20:39  <GitHub52> [bitcoin] laanwj pushed 1 new commit to 0.12: https://github.com/bitcoin/bitcoin/commit/5771b71ca533d712893c7895204a47c9ad70c9c7
274 2016-01-13T17:20:39  <GitHub52> bitcoin/0.12 5771b71 Wladimir J. van der Laan: doc: Remove BIP65 mention from release notes...
275 2016-01-13T17:21:10  <michagogo> Luke-Jr: GitHub's v0.11.2...0.12 comparison shows a bunch of lines replacing 0.10 or 0.10.99 with 0.12
276 2016-01-13T17:22:20  *** Thireus has joined #bitcoin-core-dev
277 2016-01-13T17:22:27  <wumpus> no, 0.11.x doesn't have any 0.10 versions, I don't think we've ever had a wrong version number slip into a (non-rc) release
278 2016-01-13T17:25:28  <michagogo> Hm, GitHub must be messing up somehow then.
279 2016-01-13T17:25:47  <MarcoFalke> GitHub diff is not git diff
280 2016-01-13T17:25:49  <michagogo> I'm also seeing changes that I *know* were in 0.11
281 2016-01-13T17:26:17  <michagogo> MarcoFalke: I know that, but how do you mean exactly?
282 2016-01-13T17:27:06  <MarcoFalke> GitHub compare will go back to the common branch point to compare, I think.
283 2016-01-13T17:28:00  <MarcoFalke> You can't compare branches in GitHub when they conflict each otehr
284 2016-01-13T17:31:31  <michagogo> Meh, really?
285 2016-01-13T17:31:34  <michagogo> :-/
286 2016-01-13T17:31:41  <michagogo> It certainty doesn't make that obvious.
287 2016-01-13T17:37:52  <morcos> wumpus: ok it passed extended rpc tests for me now.  woo hoo!
288 2016-01-13T17:42:40  *** wangchun has quit IRC
289 2016-01-13T17:42:55  *** wangchun has joined #bitcoin-core-dev
290 2016-01-13T17:51:14  <GitHub193> [bitcoin] MarcoFalke opened pull request #7334: [qt] coincontrol workaround is still needed in qt5.4 (fixed in qt5.5) (master...Mf1601-qt55Workaround) https://github.com/bitcoin/bitcoin/pull/7334
291 2016-01-13T17:53:32  <cfields> MarcoFalke: that looks like it should be a runtime check?
292 2016-01-13T17:53:43  *** murch has quit IRC
293 2016-01-13T17:53:48  <MarcoFalke> jonas didn't like that
294 2016-01-13T17:54:22  <cfields> hmm
295 2016-01-13T17:55:15  <MarcoFalke> by runtime check you mean compile time check?
296 2016-01-13T17:55:20  <MarcoFalke> #if QT_VERSION >= 0x050000 && QT_VERSION <= 0x050500
297 2016-01-13T17:55:29  <cfields> no, i mean the opposite of that :)
298 2016-01-13T17:56:48  <MarcoFalke> Why is that preferred?
299 2016-01-13T17:57:39  <cfields> what if it's built against 5.5 and run against 5.2?
300 2016-01-13T17:58:13  <Luke-Jr> cfields: is that even supported? O.o
301 2016-01-13T17:58:38  <cfields> Luke-Jr: sure, official builds used qt shared libs for a long time, remember?
302 2016-01-13T17:58:45  <wumpus> I don't think that's supported, you can run against newer versions but *not* older
303 2016-01-13T17:59:04  <Luke-Jr> cfields: doesn't mean it's supported to run against older libs
304 2016-01-13T17:59:17  <wumpus> so you can build against 5.2 and run against 5.5 (probably), but not the other way around
305 2016-01-13T17:59:33  <Luke-Jr> ^
306 2016-01-13T17:59:34  <cfields> wumpus: yes, sorry
307 2016-01-13T18:00:50  *** brg444 has joined #bitcoin-core-dev
308 2016-01-13T18:01:34  <cfields> MarcoFalke: i suppose there's no harm in running that code unconditionally, though?
309 2016-01-13T18:01:49  <MarcoFalke> not that I am aware of
310 2016-01-13T18:02:50  <cfields> ok, not worth worrying about then. nm.
311 2016-01-13T18:08:29  *** btcdrak has quit IRC
312 2016-01-13T18:08:31  *** mturquette has quit IRC
313 2016-01-13T18:08:33  *** Ylbam has quit IRC
314 2016-01-13T18:08:34  *** CodeShark has quit IRC
315 2016-01-13T18:08:35  *** NicolasDorier has quit IRC
316 2016-01-13T18:08:35  *** zmanian_ has quit IRC
317 2016-01-13T18:08:36  *** jl2012 has quit IRC
318 2016-01-13T18:08:38  *** michagogo has quit IRC
319 2016-01-13T18:16:39  *** Guest31456 is now known as mr_burdell
320 2016-01-13T18:16:56  *** mr_burdell has quit IRC
321 2016-01-13T18:16:56  *** mr_burdell has joined #bitcoin-core-dev
322 2016-01-13T18:17:58  *** Ylbam has joined #bitcoin-core-dev
323 2016-01-13T18:18:13  *** jl2012 has joined #bitcoin-core-dev
324 2016-01-13T18:20:16  *** zmanian_ has joined #bitcoin-core-dev
325 2016-01-13T18:22:54  *** mturquette has joined #bitcoin-core-dev
326 2016-01-13T18:23:33  *** michagogo has joined #bitcoin-core-dev
327 2016-01-13T18:28:37  *** btcdrak has joined #bitcoin-core-dev
328 2016-01-13T18:29:49  *** CodeShark has joined #bitcoin-core-dev
329 2016-01-13T18:31:44  *** NicolasDorier has joined #bitcoin-core-dev
330 2016-01-13T18:34:15  *** Dizzle has joined #bitcoin-core-dev
331 2016-01-13T18:44:55  *** p15 has quit IRC
332 2016-01-13T18:57:11  *** laurentmt has joined #bitcoin-core-dev
333 2016-01-13T18:57:26  *** laurentmt has quit IRC
334 2016-01-13T19:12:37  <GitHub111> [bitcoin] MarcoFalke opened pull request #7335: [qa] Fix pyton syntax in rpc tests (master...Mf1601-rpcSyntax) https://github.com/bitcoin/bitcoin/pull/7335
335 2016-01-13T19:25:28  <michagogo> Can someone please pastebin a git diff from v0.11.2..v0.12.0rc1 of any gitian-building related files (especially release-process.md)?
336 2016-01-13T19:33:19  <arubi> michagogo, http://paste.debian.net/plain/365610
337 2016-01-13T19:39:48  *** MarcoFalke has quit IRC
338 2016-01-13T20:05:26  *** adam3us has joined #bitcoin-core-dev
339 2016-01-13T20:10:21  <michagogo> arubi: וחשמלי
340 2016-01-13T20:10:25  <michagogo> Thanks*
341 2016-01-13T20:10:40  <arubi> 'קךבםצק!
342 2016-01-13T20:10:44  <arubi> welcome ;)
343 2016-01-13T20:11:12  * michagogo whoises
344 2016-01-13T20:11:18  <michagogo> Ah, I see
345 2016-01-13T20:11:18  <arubi> hehe :)
346 2016-01-13T20:12:53  <GitHub173> [bitcoin] jtimon closed pull request #6382: DEPENDENT: Chainparams: Introduce N testnet chains to test different block sizes (master...chainparams-sizetest-0.11.99) https://github.com/bitcoin/bitcoin/pull/6382
347 2016-01-13T20:14:30  <michagogo> Okay, cool, so no changes to the gbuild instructions. I think I should be able to reuse the same script from 0.11.
348 2016-01-13T20:15:05  <michagogo> (Other than optional gverify lines, which I might add if I get a chance)
349 2016-01-13T20:16:27  <Luke-Jr> new base image IIRC
350 2016-01-13T20:24:17  <GitHub31> [bitcoin] morcos opened pull request #7336: release note fixups (0.12...rnfixes) https://github.com/bitcoin/bitcoin/pull/7336
351 2016-01-13T20:25:05  <GitHub69> [bitcoin] jonasschnelli pushed 2 new commits to master: https://github.com/bitcoin/bitcoin/compare/17ef279304a9...c079d79c9a9c
352 2016-01-13T20:25:05  <GitHub69> bitcoin/master 30cdace crowning-: [Wallet] Transaction View: LastMonth calculation fixed
353 2016-01-13T20:25:06  <GitHub69> bitcoin/master c079d79 Jonas Schnelli: Merge pull request #7327...
354 2016-01-13T20:25:12  <GitHub103> [bitcoin] jonasschnelli closed pull request #7327: [Wallet] Transaction View: LastMonth calculation fixed (master...patch-2) https://github.com/bitcoin/bitcoin/pull/7327
355 2016-01-13T20:28:29  *** laurentmt has joined #bitcoin-core-dev
356 2016-01-13T20:29:06  *** laurentmt has quit IRC
357 2016-01-13T20:40:10  <Luke-Jr> btw, the pruning test seems to presently fail in master
358 2016-01-13T20:40:21  <Luke-Jr> s/presently/whenever I pulled last/
359 2016-01-13T20:48:29  <morcos> Luke-Jr: can you paste me the error
360 2016-01-13T20:49:38  <Luke-Jr> morcos: I'd have to run it again, and it's .. slow :<
361 2016-01-13T20:50:18  <morcos> yep!
362 2016-01-13T20:50:42  <morcos> i'll run it on master
363 2016-01-13T20:51:49  <Luke-Jr> did the OP_NOP2 replacement get into 0.12rc1?
364 2016-01-13T20:55:16  <Luke-Jr> apparently not. why?
365 2016-01-13T20:58:19  *** paveljanik has quit IRC
366 2016-01-13T21:17:25  <GitHub107> [bitcoin] luke-jr opened pull request #7338: Backports for 0.12.0 (updated to e289807) (0.12...backports-for-0.12.0) https://github.com/bitcoin/bitcoin/pull/7338
367 2016-01-13T21:17:31  <Luke-Jr> wumpus: ^
368 2016-01-13T21:18:00  <wumpus> couldn't you have opened that last week?
369 2016-01-13T21:18:44  <Luke-Jr> wumpus: I didn't know they were missing until now :p
370 2016-01-13T21:18:49  <wumpus> I don't agree on porting most of those, let's leave that for important fixes
371 2016-01-13T21:18:52  <Luke-Jr> O.o
372 2016-01-13T21:19:46  <Luke-Jr> so delay these for 0.12.1, or just close it and forget?
373 2016-01-13T21:19:50  <wumpus> I mean something like "rpc: remove cs_main lock from `createrawtransaction`" I've done on 0.13 on purpose, it's not something that needs to be backported
374 2016-01-13T21:20:21  <wumpus> it's a small improvement, but also has a small risk, not really user visible in any case
375 2016-01-13T21:20:47  <Luke-Jr> or I could remove that one, if it's uniquely undesired.
376 2016-01-13T21:21:35  <wumpus> and certainly things that involve translation changes are too late
377 2016-01-13T21:21:57  <Luke-Jr> even if the current strings are outright wrong?
378 2016-01-13T21:22:23  <wumpus> the Rename OP_NOP2 to OP_CHECKLOCKTIMEVERIFY makes sense ofc
379 2016-01-13T21:22:48  <wumpus> String freeze was *december 1* for 0.12.0, more than a month ago
380 2016-01-13T21:23:23  <wumpus> not something you'd propose inserting between two rcs
381 2016-01-13T21:23:34  <wumpus> for 0.12.1 it's ok
382 2016-01-13T21:23:47  <wumpus> but that will have to wait, then
383 2016-01-13T21:24:22  <Luke-Jr> yes, I know that. but usually I would consider "this string is wrong" to trump a string freeze (and the PR it's a backport of didn't even exist back then) :p
384 2016-01-13T21:24:49  <Luke-Jr> ok, so remove the cs_main lock thing, and delay the string change?
385 2016-01-13T21:25:23  <wumpus> if there is a strong that is so wrong it could cause serious harm to users of course an exception can be made but that's shouldn't be the assumption.
386 2016-01-13T21:26:41  <Luke-Jr> k, removed those two then
387 2016-01-13T21:34:37  <Luke-Jr> wumpus: added the release-notes combine
388 2016-01-13T21:37:25  <Luke-Jr> (also, https://github.com/bitcoin/bitcoin/pull/7149 needs 0.12.0 milestone too)
389 2016-01-13T21:38:57  <wumpus> 7149 has no ACKs at all
390 2016-01-13T21:39:11  <wumpus> it doesn't seem it will still make 0.12.0
391 2016-01-13T21:40:13  <wumpus> (fine with adding 0.12 milestone, but that will mean 0.12.1 at first)
392 2016-01-13T21:40:41  <Luke-Jr> just added unit tests, so not much more I can do at this point to help it along
393 2016-01-13T21:42:50  <wumpus> why does it include some commits from morcos last year? is it a continuation of one of his pulls? your description is very short for relatively many changes
394 2016-01-13T21:43:34  <wumpus> and it's open since dec 1, don't know why no one has looked at it yet
395 2016-01-13T21:43:51  <wumpus> maybe discuss at the meeting tomrrow
396 2016-01-13T21:46:04  <morcos> wumpus: 7149 is based off my code to keep the priority calculation the same as it was in 0.11 but to calculate it dynamically so it was not expensive to GetPriority
397 2016-01-13T21:46:07  <Luke-Jr> yes, the bugs go back a long ways, but morcos introduced them into the mining code with the CNB rewrite and also wrote those commits to fix it
398 2016-01-13T21:46:11  *** randy-waterhouse has joined #bitcoin-core-dev
399 2016-01-13T21:46:33  *** zookolaptop has quit IRC
400 2016-01-13T21:46:42  <morcos> I think the consensus other than Luke-Jr was the modified priority calculation that exists in 0.12/master right now is good enough.
401 2016-01-13T21:47:05  <morcos> This has the effect of not increasing prioirty of txs for inputs that were not already in the block chain at the time the tx was accepted to the mempool.
402 2016-01-13T21:47:20  <Luke-Jr> "good enough" isn't a strong reason not to fix bugs..
403 2016-01-13T21:47:46  <morcos> So it will still age and increase in priority but by a smaller amount.  There may be some inaccuracy around reorgs to.
404 2016-01-13T21:48:04  <morcos> It only affects how priority is calculated for mining
405 2016-01-13T21:49:21  <morcos> If we were going to keep priority as it exists now for the long term.  I might think it was worth adding this code.  But it is somewhat complicated and I believe it would be better not to add this complication if we're not fully committed to maintaining priority
406 2016-01-13T21:49:38  <morcos> It was discussed at length previously
407 2016-01-13T21:50:41  <Luke-Jr> fixing this also means we can have working tests for it
408 2016-01-13T21:50:51  <Luke-Jr> (and it isn't that complicated)
409 2016-01-13T21:51:26  <Luke-Jr> in any case, I do plan to maintain priority
410 2016-01-13T22:12:50  *** zookolaptop has joined #bitcoin-core-dev
411 2016-01-13T22:34:48  *** arowser has quit IRC
412 2016-01-13T22:35:12  *** arowser has joined #bitcoin-core-dev
413 2016-01-13T22:36:56  *** murch has joined #bitcoin-core-dev
414 2016-01-13T22:55:32  *** thrasher` has joined #bitcoin-core-dev
415 2016-01-13T23:19:27  *** Dizzle has quit IRC
416 2016-01-13T23:24:53  <GitHub46> [bitcoin] luke-jr opened pull request #7339: Support building without libevent (master...opt_libevent) https://github.com/bitcoin/bitcoin/pull/7339
417 2016-01-13T23:31:29  * Luke-Jr should have done that one a few weeks ago <.<
418 2016-01-13T23:35:46  *** Guyver2 has quit IRC
419 2016-01-13T23:55:42  *** Thireus has quit IRC
420 2016-01-13T23:59:51  *** murch has quit IRC