Skip to content

Update from Bitcoin 0.16.2 and 0.16.3#2

Merged
Bushstar merged 38 commits into
fiscalobject:master-0.16from
Bushstar:master-0.16
Sep 22, 2018
Merged

Update from Bitcoin 0.16.2 and 0.16.3#2
Bushstar merged 38 commits into
fiscalobject:master-0.16from
Bushstar:master-0.16

Conversation

@Bushstar

Copy link
Copy Markdown
Collaborator

No description provided.

fanquake and others added 30 commits September 22, 2018 07:58
GitHub-Pull: #13544
Rebased-From: 2fca656
Github-Pull: #13507
Rebased-From: 3f72d04
GitHub-Pull: #13451
Rebased-From: 86edf4a
GitHub-Pull: #13131
Rebased-From: ddebde7
GitHub-Pull: #12859
Rebased-From: a5bca13
Currently, error messages (such as InitError) are displayed as-is, which
means Qt does auto detection on the format.

This means that it's possible to inject HTML from the command line
though e.g. specifying a wallet name with HTML in it. This isn't
a direct security risk because fetching content from internet is
disabled (and as far as I know we never report strings received
from the network this way). However, it can be confusing.

So explicitly force the format as text.

Github-Pull: #12617
Rebased-From: 6fbc098
Github-Pull: #13452
Rebased-From: d280617
#ifdef is not correct since defination is defined to 0 or 1. Should change to #if

Github-Pull: #12573
Rebased-From: 1830784
Github-Pull: #13545
Rebased-From: c6fd0df
also test that 64 bit integers are properly handled

Github-Pull: #13061
Rebased-From: 3ee4be1
Larger values seem to trigger a bug on macos+libevent (resulting in the
rpc server stopping).

Github-Pull: #12905
Rebased-From: 662d19f
Github-Pull: #13304
Rebased-From: fa865ef
Added handling for the case where headers are announced over more than one message.
refs #12453

Github-Pull: #13192
Rebased-From: 12d1b77
Log messages should terminate with a '\n', or the following log will be
written to the same line without a timestamp. Fix a couple of cases
where the message is not terminated with a \n.

Github-Pull: #12887
Rebased-From: 5b10ab0
Github-Pull: #12793
Rebased-From: 342fb80
I thought we had removed this a long time ago, TBH, its really
confusing feedback to users that we display whether a tx was
broadcast to immediate neighbor nodes, given that has little
indication of whether the tx propagated very far.

Github-Pull: #13622
Rebased-From: beef7ec
…or type, add test cases covering bitcoinconsensus error codes

Github-Pull: #13655
Rebased-From: 417b6c1
Signatures using segregated witness commit to the amount being spent,
so that value must be passed into signrawtransactionwithkey and
signrawtransactionwithwallet. This ensures an error is issued if that
doesn't happen, rather than just assuming the value is 0 and producing
a signature that is almost certainly invalid.

Github-Pull: #13547
Rebased-From: a3b065b
see: .../src/init.cpp#L1063

Github-Pull: #13844
Rebased-From: 312ff01
Empact and others added 8 commits September 22, 2018 08:01
Prior to this change, it would mark only the first layer of
child transactions abandoned, due to always following the input hashTx
rather than the current now tx.
Tree-SHA512: cb2a7cd91447b6e4ad13055e97b542c6984309e28cd33898f3c4bbe92141c6cb65cc472821b34e63f94aa675553d8d68709c431255ccc17e0fc0c54c0c3836bc
Tree-SHA512: fb7208356134322f3515c682ac7349eddb1ff54094abe397c94acb7e931b42265aca6b716eba072f79ebdb4a69ea87a5e40b6c4a48571db5b7b095ead45456ef
Tree-SHA512: 56565311429f56d68508215eaa04f31f3e3f0144f367fc874da78652ce0aeb62b1d609513d9f8dcb204425c8e108103855a737eefc661f8b1f94c6219a9518a3
Tree-SHA512: 4237ac0c1cd0c0f4c3f50494cf5985a95317730194820a22e2814571107a684fdd5253625707c95ac558a1ad8ab9f36904c46647d0cb931fe67ea2407738133a
Tree-SHA512: f0a863919ba6a81da0e6021752ab7499460bb606bb7b12f22a7fe3f4d6705f81cf2a7d9a8f53a52a3e63c767541bc656124ca8e7633713d68796cc630c5a1846
@Bushstar Bushstar merged commit b982d72 into fiscalobject:master-0.16 Sep 22, 2018
Bushstar pushed a commit that referenced this pull request Jul 29, 2019
…eprecated zeromq api functions

f1bd03e [depends, zmq, doc] upgrade zeromq to 4.2.5 and avoid deprecated zeromq api functions (mruddy)

Pull request description:

  Upgrade the ZeroMQ dependency from version 4.2.3 to the latest stable version 4.2.5.

  This PR Follows the lead of bitcoin/bitcoin#11986.

  I upgraded both patch files to correspond to the version `4.2.5` libzmq files.
  I assume doing so is still necessary and correct.

  Without updating the patch line numbers, things appear to work, but you get extra log messages while building `depends` because things don't exactly match, e.g.:
  ```
  /bitcoin/depends> make zeromq
  Extracting zeromq...
  /bitcoin/depends/sources/zeromq-4.2.5.tar.gz: OK
  Preprocessing zeromq...
  patching file src/windows.hpp
  Hunk #1 succeeded at 58 (offset 3 lines).
  patching file src/thread.cpp
  Hunk #1 succeeded at 307 with fuzz 2 (offset 87 lines).
  Hunk #2 succeeded at 323 with fuzz 2 (offset 90 lines).
  ```
  Updating the patches seemed cleaner, so I did it. Note that libzmq had some whitespace changes, so that's why the updated patches do too.

  More info: https://github.com/zeromq/libzmq/releases/tag/v4.2.5

  tags: libzmq, zmq, 0mq

Tree-SHA512: 78659dd276b5311e40634b1bbebb802ddd6b69662ba3c84995ef1e3795c49a78b1635112c7fd72a405ea36e2cc3bdeb84e6d00d4e491a349bba1dafff50e2fa5
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.