Backports 0.19 pr9 #4612

Munkybooty · 2021-12-07T16:16:39Z

No description provided.

PastaPastaPasta · 2021-12-11T05:30:14Z

depends/config.site.in

I don't think this is correct, since we've never made it such that bip70 is disabled by default. Instead it should be disable_bip70=no etc

PastaPastaPasta · 2021-12-11T05:33:45Z

test/functional/data/wallets/high_minversion/GENERATE.md

16845: I think this should wait until we backport 16796?

PastaPastaPasta · 2021-12-11T05:36:27Z

src/rpc/rawtransaction.cpp

16512: this doesn't do anything

src/test/data/script_tests.json

test/functional/p2p_connect_to_devnet.py

github-actions · 2021-12-12T22:17:54Z

This pull request has conflicts, please rebase.

github-actions · 2021-12-17T16:58:39Z

This pull request has conflicts, please rebase.

PastaPastaPasta · 2021-12-28T04:33:27Z

test/functional/rpc_net.py

you should simply drop 16898, we already merged it (and did this change, some other PR must have reverted)

PastaPastaPasta · 2021-12-28T04:39:28Z

doc/release-notes-16512.md

16512 is either incomplete or dnm

It seems like all the additions to joinpsbts was not added which could explain why including random did nothing

PastaPastaPasta · 2021-12-28T04:41:03Z

test/functional/p2p_invalid_block.py

14696 was already merged, should be dropped (your change is duplicative)

PastaPastaPasta · 2021-12-28T04:42:53Z

src/validation.cpp

imo, should merge bitcoin#14457 before 16885

PastaPastaPasta · 2021-12-28T04:43:41Z

test/functional/test_framework/util.py

16918 was already merged, drop

depends/Makefile

depends/config.site.in

github-actions · 2021-12-29T02:26:18Z

This pull request has conflicts, please rebase.

depends/Makefile

github-actions · 2021-12-30T19:09:00Z

This Pull Request may conflict if the Pull Requests below are merged first.

#4650
conflictable files: src/validation.cpp

UdjinM6

pls see 912294b9a64dc636782112c95ee4f8ae162e3576

ci/dash/matrix.sh

depends/Makefile

Munkybooty · 2022-01-04T06:17:21Z

I had fixed feature_block.py but it appears that p2p_invalid_tx.py fails now. I'm not sure whats caused this new error.

UdjinM6

pls see below and #4668 (will require rebase to fix tests)

test/lint/lint-python-dead-code.sh

github-actions · 2022-01-20T16:08:09Z

This pull request has conflicts, please rebase.

…tcoin-wallet's help b6233a4 bitcoin-wallet: Add a missing closing parenthesis in the help (darosior) Pull request description: ACKs for top commit: kristapsk: utACK b6233a4 fanquake: ACK b6233a4 Tree-SHA512: acf18633fdca4bd73838fcaa0ebe4121dd0b5308daa77c4458ec4c98a9e8aa6d9d6580a48c884147438af14e670b0606c1e76f72d1d7efd221c4da419061beed

…onf, and Info.plist.in 6aab764 doc: Fix whitespace errs in .md files, bitcoin.conf, Info.plist.in, and find_bdb48.m4 (Jon Layton) Pull request description: Although there is an existing `test/lint/lint-whitespace.sh` linter, it only prevents new errors from being introduced. This commit removes all existing whitespace errors from Core markdown files (skips `src/crypto/ctaes/`, `leveldb/`, and `doc/release-notes/`), `bitcoin.conf`, and `Info.plist.in`. Further formatting could be done on the markdown documents, but seeing as there several coexisting styles that break a few `markdownlint` rules, a first step would be to define and add a linter to Travis. For now, the small fix is made. ACKs for top commit: fanquake: ACK 6aab764 - Thanks for following up. Hopefully we now never have to deal with whitespace again. Tree-SHA512: 810cc31ae4364b2dedf85783e67315d7b4e11589e4b32c599606e1b1ba8de0663bcae9ddb1bd8c9762a3636a2d65bdcd64ec22d2e90943f374a0c9574b77ca23

c0b5d97 Test that joinpsbts randomly shuffles the inputs (Andrew Chow) 6f405a1 Shuffle inputs and outputs after joining psbts (Andrew Chow) Pull request description: `joinpsbts` currently just adds the inputs and outputs in the order of that the PSBTs were provided. This makes it extremely easy to identify which outputs belong to which inputs. This PR changes that so that all of the inputs and outputs are shuffled in the joined transaction. ACKs for top commit: instagibbs: utACK bitcoin@c0b5d97 jonatack: ACK c0b5d97 modulo suggestions for later. Tree-SHA512: 14a0b7aae07d92e6d2c76a3a3b228b481e1964cb7d34f97515bdda18e2ea05a9f97c5a22affc143b86ae8b95c3cb239849fb54219d65512bc2112264dca915c8

…high_minversion 2222c96 test: Add notes on how to generate data/wallets/high_minversion (MarcoFalke) Pull request description: I forgot to do this in bitcoin#16796 ACKs for top commit: ryanofsky: ACK 2222c96 Tree-SHA512: 5f24ffa641b97eac4febad42ade7228b14fa72335c918a10880c5dec86a3ecc3075a31526f275188e07fea95b8e2c6320c64f716099f604b00e13d5366fcee37

…onal tests 59e3877 test: add invalid tx templates for use in functional tests (James O'Beirne) Pull request description: This change adds a list of `CTransaction`-generating templates which each correspond to a specific type of invalid transaction. We then use this list to test for a wider variety of invalid tx types in `p2p_invalid_tx.py` and `feature_block.py`. Consolidating all invalid tx types will allow us to more easily cover all tx reject cases from a variety of tests without repeating ourselves. Validation logic doesn't differ much between mempool and block acceptance, but there *is* a difference and we should be sure we're testing both comprehensively. Right now, I've only added templates covering the tx reject types listed below but if this approach seems worthwhile I will expand the list to be fully comprehensive. ``` bad-txns-in-belowout bad-txns-inputs-duplicate bad-txns-too-many-sigops bad-txns-vin-empty bad-txns-vout-empty bad-txns-vout-negative ``` Tree-SHA512: 05407f4a953fbd7c44c08bb49bb989cefd39a2b05ea00f5b3c92197a3f05e1b302f789e33832445734220e1c333d133aba385740b77b84139b170c583471ce20

…CVE disclosure c4b0c08 Update tx-size-small comment with relevant CVE disclosure (Gregory Sanders) Pull request description: Code first introduced under bitcoin#11423 with essentially no description and no discussion. ACKs for top commit: MarcoFalke: ACK c4b0c08 fanquake: ACK c4b0c08 Tree-SHA512: 95d5c92998b8b1e944c477dbaee265b62612b6e815099ab31d9ff580b4dff777abaf7f326a284644709f918aa1510412d62310689b1250ef6e64de7b19ca9f71

107e030 build: make protobuf optional in depends (fanquake) ff6122f doc: clarify protobuf build requirements (fanquake) Pull request description: As mentioned by dongcarl in bitcoin#15584 (comment), make building `protobuf` optional in depends. With this change it will only be built if you pass `PROTOBUF=1`. ACKs for top commit: laanwj: code review ACK 107e030 Sjors: tACK 107e030 on macOS 10.14. When I build depends with `PROTOBUF=1` then `./configure` has `bip70` enabled. Tree-SHA512: 49bc247a6879aaf55b943a3d0b930544ddef1e69a481955a8bebe0b02c9ad0fe168b93025f34168334cef34bb567478eb98eacab62ba909f2f64fb21119c71b8

UdjinM6

LGTM, utACK

PastaPastaPasta

utACK for merging via merge commit

one nit, up to Udjin whether it's blocking

PastaPastaPasta · 2022-01-24T15:13:27Z

test/functional/data/invalid_txs.py

+    """Allows simple construction of a certain kind of invalid tx. Base class to be subclassed."""
+    __metaclass__ = abc.ABCMeta
+
+    # The expected error code given by bitcoind upon submission of the tx.


nit: dashify

UdjinM6 · 2022-01-24T15:26:41Z

We have a couple of these in our code already 🙈 should be ok to fix them all in a separate cleanup PR.

PastaPastaPasta requested changes Dec 11, 2021

View reviewed changes

UdjinM6 requested changes Dec 11, 2021

View reviewed changes

src/test/data/script_tests.json Outdated Show resolved Hide resolved

src/test/data/script_tests.json Outdated Show resolved Hide resolved

test/functional/p2p_connect_to_devnet.py Outdated Show resolved Hide resolved

github-actions bot added the needs rebase label Dec 12, 2021

Munkybooty force-pushed the backports-0.19-pr9 branch from bbdfc85 to fb617cc Compare December 15, 2021 16:45

github-actions bot removed the needs rebase label Dec 15, 2021

Munkybooty force-pushed the backports-0.19-pr9 branch from 9eb4f84 to 222305a Compare December 15, 2021 17:06

github-actions bot added the needs rebase label Dec 17, 2021

Munkybooty force-pushed the backports-0.19-pr9 branch from 222305a to b78e18d Compare December 20, 2021 17:59

github-actions bot removed the needs rebase label Dec 20, 2021

Munkybooty force-pushed the backports-0.19-pr9 branch 4 times, most recently from 2821799 to 451c7ee Compare December 27, 2021 03:18

PastaPastaPasta requested changes Dec 28, 2021

View reviewed changes

Munkybooty force-pushed the backports-0.19-pr9 branch from 451c7ee to 088dd5b Compare December 28, 2021 06:24

UdjinM6 requested changes Dec 28, 2021

View reviewed changes

depends/Makefile Outdated Show resolved Hide resolved

depends/config.site.in Outdated Show resolved Hide resolved

Munkybooty force-pushed the backports-0.19-pr9 branch from 088dd5b to 46bd0f4 Compare December 29, 2021 02:26

github-actions bot added the needs rebase label Dec 29, 2021

Munkybooty force-pushed the backports-0.19-pr9 branch from 46bd0f4 to 1f308e0 Compare December 29, 2021 02:36

github-actions bot removed the needs rebase label Dec 29, 2021

UdjinM6 requested changes Dec 30, 2021

View reviewed changes

depends/Makefile Outdated Show resolved Hide resolved

github-actions bot mentioned this pull request Dec 30, 2021

Drop all conflicting tx locks in ConnectBlock #4650

Merged

Munkybooty force-pushed the backports-0.19-pr9 branch 2 times, most recently from 6bb38fa to 1afbbc2 Compare January 1, 2022 00:41

UdjinM6 requested changes Jan 3, 2022

View reviewed changes

ci/dash/matrix.sh Outdated Show resolved Hide resolved

depends/Makefile Outdated Show resolved Hide resolved

Munkybooty force-pushed the backports-0.19-pr9 branch from 1afbbc2 to 4d51bb9 Compare January 3, 2022 16:12

Munkybooty force-pushed the backports-0.19-pr9 branch from 4d51bb9 to 0fc7a7f Compare January 4, 2022 05:21

UdjinM6 mentioned this pull request Jan 19, 2022

Reduce MIN_STANDARD_TX_SIZE to 83 bytes #4668

Merged

UdjinM6 requested changes Jan 19, 2022

View reviewed changes

test/lint/lint-python-dead-code.sh Outdated Show resolved Hide resolved

Munkybooty force-pushed the backports-0.19-pr9 branch from 0fc7a7f to 15f2873 Compare January 19, 2022 17:14

github-actions bot added the needs rebase label Jan 20, 2022

fanquake and others added 7 commits January 20, 2022 13:09

Munkybooty force-pushed the backports-0.19-pr9 branch from 15f2873 to fc5ed58 Compare January 20, 2022 18:10

github-actions bot removed the needs rebase label Jan 20, 2022

UdjinM6 added this to the 18 milestone Jan 24, 2022

UdjinM6 approved these changes Jan 24, 2022

View reviewed changes

UdjinM6 requested a review from PastaPastaPasta January 24, 2022 14:35

PastaPastaPasta approved these changes Jan 24, 2022

View reviewed changes

UdjinM6 merged commit 0ed9f56 into dashpay:develop Jan 24, 2022

Munkybooty mentioned this pull request Feb 11, 2022

build: allow building without openssl, enables native m1 development builds #4683

Merged

Backports 0.19 pr9 #4612

Backports 0.19 pr9 #4612

Uh oh!

Conversation

Munkybooty commented Dec 7, 2021

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

github-actions bot commented Dec 12, 2021

Uh oh!

github-actions bot commented Dec 17, 2021

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

github-actions bot commented Dec 29, 2021

Uh oh!

Uh oh!

github-actions bot commented Dec 30, 2021

Uh oh!

UdjinM6 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Munkybooty commented Jan 4, 2022

Uh oh!

UdjinM6 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

github-actions bot commented Jan 20, 2022

Uh oh!

UdjinM6 left a comment

Choose a reason for hiding this comment

Uh oh!

PastaPastaPasta left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

UdjinM6 commented Jan 24, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants