Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Myriadcoin 0.18.1 #166

Merged
merged 57 commits into from
Aug 9, 2019
Merged

Conversation

cryptapus
Copy link
Member

@cryptapus cryptapus commented Aug 9, 2019

Upstream 0.18.1

MarcoFalke and others added 30 commits May 16, 2019 10:08
This helps to distinguish it from CNode::fRelayTxes and avoid bugs like
425278d

Github-Pull: bitcoin#15990
Rebased-From: fa1dce7
Updates text since -whitelistforcerelay was set to false by default in
PR bitcoin#15193.

Github-Pull: bitcoin#15890
Rebased-From: e0bb279
This change marks the already-existing bitcoin-wallet.1 manpage file for
installation together with the others.  Previously, only bitcoind.1,
bitcoin-cli.1, bitcoin-tx.1 and bitcoin-qt.1 would be installed.

Github-Pull: bitcoin#15947
Rebased-From: 00d1104
… of ignored wallet options"

106471d Bugfix: dummywallet: Add -ignorepartialspends to list of ignored wallet options (Luke Dashjr)
206c30f dummywallet: Reformat ignored wallet options list (MarcoFalke)

Pull request description:

  First run clang-format on the wallet options list (review with `--word-diff-regex=.`). This is not a backport.

  Then backport Github-Pull: bitcoin#15913

ACKs for commit 106471:
  promag:
    ACK 106471d.
  laanwj:
    ACK 106471d

Tree-SHA512: 3e6eb7997aa32ef7385842614bac8cac56f86b6dde949cfbbd33b4387e713bf5f65e40ee3e4228ac43dfe50829169175b80ddeaac8a714ad8a38175638123f5d
Github-Pull: bitcoin#15991
Rebased-From: f402012
The RPC examples for signrawtransactionwithkey are missing the 2nd parameter.

Github-Pull: bitcoin#16210
Rebased-From: 71fd628
…sage that depends on uncertain assumptions

When converttopsbt is called with a signed transaction, it either fails with "TX decode failed" if one or more inputs were segwit, or "Inputs must not have scriptSigs and scriptWitnesses" otherwise.
Since no effort is made by the test to ensure the inputs are segwit or not, avoid checking the exact message used.
The error code is still checked to ensure it is of the correct kind of failure.

Github-Pull: bitcoin#14818
Rebased-From: 097c4aa
Also explain the param in all RPCs

Github-Pull: bitcoin#15899
Rebased-From: fa499b5
-BEGIN VERIFY SCRIPT-
sed -i --regexp-extended -e 's/fprintf\(std(err|out), /tfm::format(std::c\1, /g' $(git grep -l 'fprintf(' -- ':(exclude)src/crypto' ':(exclude)src/leveldb' ':(exclude)src/univalue' ':(exclude)src/secp256k1')
-END VERIFY SCRIPT-

fixup! scripted-diff: Replace fprintf with tfm::format

Github-Pull: bitcoin#16205
Rebased-From: fac03ec
MarcoFalke and others added 26 commits June 21, 2019 08:17
This removes the dependency on OpenSSL for the interaction tests, by providing a pure-Python
toy implementation of secp256k1.

Github-Pull: bitcoin#15826
Rebased-From: 8c7b932
…n instead of two

Instead of creating a redeemScript with CreateMultisigRedeemscript and
then getting the destination with AddAndGetDestinationForScript, do
both in the same function.

CreateMultisigRedeemscript is changed to AddAndGetMultisigDestination.
It creates the redeemScript and returns it via an output parameter. Then
it calls AddAndGetDestinationForScript to add the destination to the
keystore and get the proper destination.

This allows us to inspect the public keys in the redeemScript before creating
the destination so that the correct destination is used when uncompressed
pubkeys are in the multisig.

Github-Pull: bitcoin#16026
Rebased-From: a495034
The menu must be created before connecting to aboutToShow signal.

Github-Pull: bitcoin#16231
Rebased-From: 5224be5
Qt docs: This attribute must be set before QGuiApplication is
constructed.

Github-Pull: bitcoin#16254
Rebased-From: 099e4b9
bcb27d7 .python-version: Bump to 3.5.6 (MarcoFalke)
af25a75 Add comments to Python ECDSA implementation (John Newbery)
715da91 Set AA_EnableHighDpiScaling attribute early (Hennadii Stepanov)
2800b3d gui: Fix open wallet menu initialization order (João Barbosa)
e78007f Make and get the multisig redeemscript and destination in one function instead of two (Andrew Chow)
d9fc969 Pure python EC (Pieter Wuille)
23ba460 test: Add test that addmultisigaddress fails for watchonly addresses (MarcoFalke)
13b3bb5 test: Fixup creatmultisig documentation and whitespace (MarcoFalke)
79745d1 Replace remaining fprintf with tfm::format manually (MarcoFalke)
beb09f0 scripted-diff: Replace fprintf with tfm::format (MarcoFalke)
e29aa6e Exceptions should be caught by reference, not by value. (Kristaps Kaupe)
f88959b tinyformat: Add doc to Bitcoin Core specific strprintf (MarcoFalke)
0023c97 rpc: bugfix: Properly use iswitness in converttopsbt (MarcoFalke)
832eb4f Bugfix: test/functional/rpc_psbt: Correct test description comment (Luke Dashjr)
966d8d0 Bugfix: test/functional/rpc_psbt: Remove check for specific error message that depends on uncertain assumptions (Luke Dashjr)
bb36ac8 rpc: Switch touched RPCs to IsValidNumArgs (MarcoFalke)
d24d0ec Add example 2nd arg to signrawtransactionwithkey (Chris Moore)
592016b fixup: Fix prunning test (João Barbosa)
c80a498 Fix RPC/pruneblockchain returned prune height (Jonas Schnelli)
b239824 gui: Enable open wallet menu on setWalletController (João Barbosa)
d1f2611 Add test for GCC bug 90348 (Pieter Wuille)
d80c558 gui: Set progressDialog to nullptr (João Barbosa)
7ed1a60 gui: Enable console line edit on setClientModel (João Barbosa)
b55cbe8 qt: fix opening bitcoin.conf via Preferences on macOS; see bitcoin#15409 (shannon1916)
b6c1f94 Disallow extended encoding for non-witness transactions (take 3) (MarcoFalke)
8603108 Add test for superfluous witness record in deserialization (Gregory Sanders)
5a58ddb Fix missing input template by making minimal tx (Gregory Sanders)
206f5ee Disallow extended encoding for non-witness transactions (Pieter Wuille)
3dbc7de Show loaded wallets as disabled in open menu instead of nothing (MeshCollider)
a635377 Install bitcoin-wallet manpage. (Daniel Kraft)
eb85ee6 Doc: remove text about txes always relayed from -whitelist (David A. Harding)
890a92e doc: Mention blocksonly in reduce-traffic.md, unhide option (MarcoFalke)
3460555 test: Add test for p2p_blocksonly (MarcoFalke)
8f215c7 test: Format predicate source as multiline on error (MarcoFalke)
9c1a607 net: Rename ::fRelayTxes to ::g_relay_txes (MarcoFalke)
5935f01 build with -fstack-reuse=none (MarcoFalke)

Pull request description:

Tree-SHA512: 5cd73a4319cb69c92b528239cf97c0ed5fcf2b9e8c7fe154e4679eeec95db433a0223d8dc574e4cdc96c1913cfdf160b10c42dcdbcb5bbc8fb743c07930ef9da
…cript/witnessScript

1dc357d signrawtransactionwithkey: report error when missing redeemScript/witnessScript param (Anthony Towns)

Pull request description:

  Backport of bitcoin#16250 which fixes regression introduced in 0.18 in relation to signrawtransactionwithkey error handling (see bitcoin#16249).

Tree-SHA512: 0d75fa2aa578b886ace3bda92a02e25993f9f51d41db8c0eb3013bd77d266c45ad8b67dd0ed11c66533724f892be4e254edeb59fa70585ff762f522791fcca36
…thod result"

df695db qt: Assert QMetaObject::invokeMethod result (João Barbosa)
e2f7677 gui: Fix missing qRegisterMetaType(WalletModel*) (João Barbosa)

Pull request description:

ACKs for top commit:
  hebasto:
    ACK df695db, I have not tested the code, but I have reviewed it and it looks OK, I agree it can be merged.
  laanwj:
    ACK df695db

Tree-SHA512: 5ce162e59331f6da8ae9ba41eff809881442fab93d65362b5f67aba19da76a72362f0daba9ad1f909478bf26f2daf53b110a0486d7b29b23b3716a7cd7177922
…he event's callback

b2711b9 fix: tor: Call event_base_loopbreak from the event's callback (João Barbosa)

Pull request description:

  Github-Pull: bitcoin#16405
  Rebased-From: a981e74

ACKs for top commit:
  laanwj:
    ACK b2711b9, code change is the same as for master
  fanquake:
    ACK b2711b9

Tree-SHA512: 9f225e505c0241be422ed897f56aef6ebad57e15d3bfe5154c7fe4f874df342e0df287871cd737eb777d0f45865a6d129cd5d1a4c036ea0a4e5d4f36520ab174
poll should block until there is data to be read or the timeout expires.

Filtering for the POLLOUT event causes poll to return immediately which leads to high CPU usage when trying to connect to non-responding peers through tor.

Removing POLLOUT matches how select is used when USE_POLL isn't defined.

Github-Pull: bitcoin#16412
Rebased-From: a52818c
Tree-SHA512: eaf466630ba9d2a2a7443c9679c83c2cb13e779a5948f409cddb4c48cf32126ac68f3de48e394f9302e99858efa17cdb14650751a1b55c3b79e8a7507cab352d
Tree-SHA512: b97fd91b7ab1eb2297007a9821def31c065a2a33f12cf51fd5e5be5dff1e8afb4f5b001d220c3873d72ca5b06484ad2d1e2c8df5300770145de0dfebe56db303
Tree-SHA512: f746d4cfda1eb433c4c99b8d80392ac2e905c1f39591eb5579a708129e3b1b36479a2da45221594713cf20069bde78c29a31cb10d39c7bc96544694d9832cda0
Tree-SHA512: 805a6931e2bd059ee2da42634f687828a50b2ccd3a1ac0071cd626e9a2f52b7afc79af3c8f3d5b013a853d5e59068314e744a4694dceef598710f0694babbd99
Tree-SHA512: e5422eaed5339327b600bfe07e5cdb1517bf6f3d9a39d27c9c59a68ceadbef398960c69630bc727f3f8d7330353e7823905f5107dba6d8827965565157cdeca1
…md and riscv changes

5f5b444 Doc: remove old release notes about systemd and riscv changes (David A. Harding)

Pull request description:

  Removes these two paragraphs that were part of the 0.18.0 release notes but which I don't think need to be repeated for the 0.18.1 release notes.  The systemd release note in particular links to a section that isn't part of the document.

ACKs for top commit:
  practicalswift:
    ACK 5f5b444
  laanwj:
    ACK 5f5b444
  fanquake:
    ACK 5f5b444 - this should be fine.

Tree-SHA512: 3930b832eeed1f938cd6423dd9ac1e02ab7bb4fc218f433551fa995f40b84e8f2af5755ca4bf56caccdc742b6884bc79b381c9bdb3ad90e99ca90011d9e12665
Tree-SHA512: b74ff824278e6a4c4781c904e3f68295c76d9de79cc174a6e7127273295ef3fddb87de89143ceb76805e33b8c2dec77b3e6ae4bec97a3128d9908c065c7f95de
No changes, only the month changed from July to August.

Tree-SHA512: c8f672f3a6e570ea1feda2c2f17d30da8a04b705d990bf5aec8e09da5937f3f9a608f4f50941f183c536a4158001b13d149bd0c873a24eae48ae57d96cd274c8
@cryptapus cryptapus added this to the Release v0.18 milestone Aug 9, 2019
@cryptapus cryptapus merged commit accff60 into myriadteam:master Aug 9, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet