Conversation
|
ACK; tested on gitian |
|
Automatic sanity-testing: FAILED BUILD/TEST, see http://jenkins.bluematt.me/pull-tester/51600d0ab9ae88c7f2fac8423cf0a8bcc483f969 for binaries and test log. This could happen for one of several reasons:
|
|
AFAIK there were problems with Qt 4.8.3 at least when using it on Windows due to problems with ressource-files and qmake, I hope they fixed that. And I'm missing an updated download link for the updated Qt in: |
|
It seems gitian works with this (and already worked) because it first builds Bitcoin-Qt, which has some magic in its .pro file to build leveldb, and that leveldb built gets reused for the bitcoind build. That is fine of course, but we should make sure that building bitcoind separately also works, which probably means adding the ranlib magic to makefile.linux-mingw. |
|
@Diapolo So should we downgrade to 0.8.1 then? |
|
I don't know what's wrong with 4.8.3. Is it documented anywhere? |
|
I'm fine with 4.8.3 if it compiles just fine with Gitian, I only wanted to mention it is causing some trouble on Windows, when trying to build a project with that version. As this doesn't touch our builds don't weighten that info too much, as it was perhaps a missleading information, sorry then. See: https://bugreports.qt-project.org/browse/QTBUG-27424 Edit: It seems 4.8.4 is near, too http://qt.digia.com/Release-Notes/Release-Notes-Qt-484/ |
|
It compiled fine in gitian for me |
|
Okay, then if you update the 3 missing references to Qt 4.8.3, too, I'm fine with that commit :). https://github.com/bitcoin/bitcoin/blob/master/contrib/gitian-descriptors/README#L34 |
|
Automatic sanity-testing: PASSED, see http://jenkins.bluematt.me/pull-tester/7bf7047b879a3903bbc8646cb5e1dd7ea8aff539 for binaries and test log. |
|
OK, updated with the missing 4.8.3 updates, should be good to pull now. |
|
ACK (untested but looks sane) |
Build script fixes
2fbb932 [Trivial] Fix typo desn't --> doesn't (random-zebra) 3dfc305 special tx validation unit test. (furszy) 862e1ab Adding extraPayload member to CMutableTransaction primitive. (furszy) 059a8c9 [Validation] Basic validation for special transactions (random-zebra) 0c7a129 [Validation] Serialize extra payload for transaction signature hash (random-zebra) 451a880 [Validation] Introduce transaction extra payload for special txes (random-zebra) 4b092c8 [Cleanup][Refactor] Use string stream for CTransaction::ToString() (random-zebra) ad12be5 [Tests] fix bitcoin-util-tests adding type to the expected json outputs (random-zebra) 2cc8d8d [Validation] Introduce transaction type (random-zebra) Pull request description: Introduce the concepts of "transaction type" and "extra payload" inspired by Dash's [DIP2](https://github.com/dashpay/dips/blob/master/dip-0002.md) and integrate them in our customized serialization for SAPLING_VERSION transactions. Even though we won't probably activate any special type with v5.0, having the new serialization already in place allows us to enable them in a future upgrade, without needing to increment the transaction version again. This PR includes basic non-contextual validation rules (that can only be safely enforced after Sapling NU): - nVersion=1 supports only nType=0 - A tx can have extra payload only if nType!=0 (thus, due to the previous rule, only if nVersion>=2) - A tx with nType!=0 cannot have empty payload. - The serialized payload cannot be bigger than a fixed max size (valid for all payload types, currently set at 10 kB). This also prepares the method stubs for the specific per-payload-type validation rules, and for the tiertwo data processing, that will be added in the future. ACKs for top commit: furszy: utACK 2fbb932 after rebase. Tree-SHA512: 37f53cff4bb6239eb0c2967c8decf851abca15780425603f3a25a07206efd0d8d746a5ab8ca52cf7bb514b0468b51d8e54ee2c991366beab922b09faae24c9ec
6 participants
Use && and fix linux-mingw, please wait for pull-tester output here.
Also upgrade to qt 4.8.3 because 4.8.2 isnt on the version archive anymore (dont see any mentions as to why, but we might as well upgrade so that everyone can build).