backport: Merge bitcoin#23642, 22794, 23316, 24365, gui#517, 24219, 23253, 24449, 22543 #6300

vijaydasmp · 2024-10-03T02:59:11Z

Bitcoin Backports

github-actions · 2024-10-04T19:23:20Z

This pull request has conflicts, please rebase.

github-actions · 2024-10-26T17:27:16Z

This pull request has conflicts, please rebase.

knst · 2024-11-25T14:26:55Z

src/rpc/rawtransaction.cpp

+            {
+                {RPCResult::Type::STR, "asm", "Script public key"},
+                {RPCResult::Type::STR, "type", "The output type (e.g. " + GetAllOutputTypes() + ")"},
+                {RPCResult::Type::STR, "address", /* optional */ true, "The Bitcoin address (only if a well-defined address exists)"},


23642: missing dashification in this line and below: Bitcoin -> Dash

knst · 2024-11-25T14:27:14Z

src/rpc/rawtransaction.cpp

+                 {
+                     {RPCResult::Type::STR, "asm", "String representation of the script public key"},
+                     {RPCResult::Type::STR_HEX, "hex", "Hex string of the script public key"},
+                     {RPCResult::Type::STR, "type", "The type of the script public key (e.g. witness_v0_keyhash or witness_v0_scripthash)"},


23642: missing dashification we don't have type here

knst · 2024-11-25T14:27:28Z

src/rpc/rawtransaction.cpp

+                     {RPCResult::Type::STR_HEX, "hex", "Hex string of the script public key"},
+                     {RPCResult::Type::STR, "type", "The type of the script public key (e.g. witness_v0_keyhash or witness_v0_scripthash)"},
+                     {RPCResult::Type::STR, "address", /* optional */ true, "The Bitcoin address (only if a well-defined address exists)"},
+                     {RPCResult::Type::STR, "p2sh-segwit", "address of the P2SH script wrapping this witness redeem script"},


23642: missing dashification no segwit for dash

knst · 2024-11-26T08:14:06Z

src/rpc/rawtransaction.cpp

+                {RPCResult::Type::STR, "address", /* optional */ true, "The Dash address (only if a well-defined address exists)"},
+                {RPCResult::Type::STR, "p2sh", /* optional */ true, "address of P2SH script wrapping this redeem script (not returned if the script is already a P2SH)"},
+                {RPCResult::Type::OBJ, "segwit", /* optional */ true, "Result of a witness script public key wrapping this redeem script (not returned if the script is a P2SH or witness)",
+                 {
+                     {RPCResult::Type::STR, "asm", "String representation of the script public key"},
+                     {RPCResult::Type::STR_HEX, "hex", "Hex string of the script public key"},
+                     {RPCResult::Type::STR, "address", /* optional */ true, "The Dash address (only if a well-defined address exists)"},
+                 }},
+            },


all of these lines should not have any diff except whitespaces, but it's removed substrings "DEPRECATED", added "segwit", etc... Please check carefully

original patch (ignoring whitespaces chages):

vs your patch (ignoring whitespaces changes):

@vijaydasmp you can use feature git diff -b and git show -b to compare diff without whitespace-changes or use similar feature on GitHub to do self-review of changes

knst

LGTM 0cf0b91

vijaydasmp · 2024-11-30T15:11:38Z

Hello @PastaPastaPasta @UdjinM6 requesting review

src/rpc/rawtransaction.cpp

UdjinM6 · 2024-12-03T17:34:51Z

test/util/data/bitcoin-util-test.json

@@ -463,9 +487,9 @@
    "description": "Creates a new transaction with a single 2-of-3 multisig output"
  },
  { "exec": "./dash-tx",
-    "args": ["-json", "-create", "outmultisig=1:2:3:02a5613bd857b7048924264d1e70e08fb2a7e6527d32b7ab1bb993ac59964ff397:021ac43c7ff740014c3b33737ede99c967e4764553d1b2b83db77c83b8715fa72d:02df2089105c77f266fa11a9d33f05c735234075f2e8780824c6b709415f9fb485", "nversion=1"],
+    "args": ["-json", "-create", "outmultisig=1: 2: 3:02a5613bd857b7048924264d1e70e08fb2a7e6527d32b7ab1bb993ac59964ff397:021ac43c7ff740014c3b33737ede99c967e4764553d1b2b83db77c83b8715fa72d:02df2089105c77f266fa11a9d33f05c735234075f2e8780824c6b709415f9fb485", "nversion=1"],


23253: missing 2 new tests in test/util/data/bitcoin-util-test.json?

github-actions · 2024-12-04T15:53:58Z

This pull request has conflicts, please rebase.

3333070 refactor: Call type-solver earlier in decodescript (MarcoFalke) fab0d99 style: Remove whitespace (MarcoFalke) Pull request description: The current logic is a bit confusing. First creating the `UniValue` return dict, then parsing it again to get the type as `std::string`. Clean this up by using a strong type `TxoutType`. Also, remove whitespace. ACKs for top commit: shaavan: ACK 3333070 theStack: Code-review ACK 3333070 Tree-SHA512: 49db7bc614d2491cd3ec0177d21ad1e9924dbece1eb5635290cd7fd18cb30adf4711b891daf522e7c4f6baab3033b66393bbfcd1d4726f24f90a433124f925d6

…d_address_message.py test c2fbdca Add BECH32_INVALID_VERSION test (lsilva01) b142f79 skip test_getaddressinfo() if wallet is disabled (lsilva01) Pull request description: Most of `test/functional/rpc_invalid_address_message.py` does not requires wallet. But if the project is compiled in disable-wallet mode, the entire test will be skipped. This PR changes the test to run the RPC tests first and then checks if the wallet is compiled. ACKs for top commit: stratospher: tested ACK c2fbdca Tree-SHA512: 11fa2fedf4a15aa45e3f12490df8e22290a867d5de594247211499533c32289c68c0b60bd42dbf8305e43dbcc042789e7139317ef5c9f8cf386f2d84c91b9ac2

7b3c9e4 Make explicit the node param in init_wallet() (lsilva01) Pull request description: This PR changes the definition of `def init_wallet(self, i)` to `def init_wallet(self, *, node)` to make the node parameter explicit, as suggested in bitcoin#22794 (comment) . ACKs for top commit: stratospher: tested ACK 7b3c9e4. Tree-SHA512: 2ef036f4c2110b2f7dc893dc6eea8faa0a18edd7f8f59b25460a6c544df7238175ddd6a0d766e2bb206326b1c9afc84238c75613a0f01eeda89a8ccb7d86a4f1

…vate keys disabled during upgradewallet c7376cc tests: Test upgrading wallet with privkeys disabled (Andrew Chow) 3d985d4 wallet: Don't generate keys when privkeys disabled when upgrading (Andrew Chow) Pull request description: When we're upgrading a wallet, we shouldn't be trying to generate new keys for wallets where private keys are disabled. Fixes bitcoin#23610 ACKs for top commit: laanwj: Code review ACK c7376cc benthecarman: tACK c7376cc this fixed the issue for me Tree-SHA512: fa07cf37df9196ff98671bb1ce5c9aa0bab46495066b4dab796d7e8e5d5c7adb414ff56adae4fd3e15658a610995bd19a9e1edb00c46144b0df635c5b343f3a6

…ers of QTimer methods 51250b0 refactor, qt: Use std::chrono for input_filter_delay constant (Hennadii Stepanov) f3bdc14 refactor, qt: Add SHUTDOWN_POLLING_DELAY constant (Hennadii Stepanov) 0e193de refactor, qt: Use std::chrono for non-zero arguments in QTimer methods (Hennadii Stepanov) 6f0da95 refactor, qt: Use std::chrono in ConfirmMessage parameter (Hennadii Stepanov) 33d520a refactor, qt: Use std::chrono for MODEL_UPDATE_DELAY constant (Hennadii Stepanov) Pull request description: Since Qt 5.8 `QTimer` methods have overloads that accept `std::chrono::milliseconds` arguments: - [`QTimer::singleShot`](https://doc.qt.io/archives/qt-5.9/qtimer.html#singleShot-8) - [`QTimer::start`](https://doc.qt.io/archives/qt-5.9/qtimer.html#start-2) ACKs for top commit: promag: Code review ACK 51250b0. shaavan: reACK 51250b0 Tree-SHA512: aa843bb2322a84c0c2bb113d3b48d7bf02d7f09a770779dcde312c32887f973ef9445cdef42f39edaa599ff0f3d0457454f6153aa130efadd989e413d39c6062

fad84a2 refactor: Fixup uint64_t-cast style in touched line (MarcoFalke) fa04187 Fix implicit-integer-sign-change in bloom (MarcoFalke) Pull request description: Signed values don't really make sense when using `std::vector::operator[]`. Fix that and remove the suppression. ACKs for top commit: PastaPastaPasta: utACK fad84a2 theStack: Code-review ACK fad84a2 Tree-SHA512: 7139dd9aa098c41e4af1b6e63dd80e71a92b0a98062d1676b01fe550ffa8e21a5f84a578afa7a536d70dad1b8a5017625e3a9e2dda6f864b452ec77b130ddf2a

… int strings fa6f29d bitcoin-tx: Reject non-integral and out of range multisig numbers (MarcoFalke) fafab8e bitcoin-tx: Reject non-integral and out of range sequence ids (MarcoFalke) fa53d3d test: Check that bitcoin-tx accepts whitespace around sequence id and multisig numbers (MarcoFalke) Pull request description: Seems odd to silently accept arbitrary strings that don't even represent integral values. Fix that. ACKs for top commit: practicalswift: cr ACK fa6f29d laanwj: Code review ACK fa6f29d Empact: Code review ACK bitcoin@fa6f29d promag: Code review ACK fa6f29d. Tree-SHA512: e31f7f21fe55ac069e755557bdbcae8d5d29e20ff82e441ebdfc65153e3a31a4edd46ad3e6dea5190ecbd1b8ea5a8f94daa5d59a3b7558e46e794e30db0e6c79

…n negative value fc47181 fuzz: FuzzedFileProvider::write should not return negative value (eugene) Pull request description: Doing so can lead to a glibc crash (from 2005 but I think it's relevant https://sourceware.org/bugzilla/show_bug.cgi?id=2074). Also the manpage for fopencookie warns against this: https://man7.org/linux/man-pages/man3/fopencookie.3.html. This would invalidate the autofile seeds (and maybe others?) in qa-assets. On another note, I noticed that FuzzedFileProvider::seek has some confusing behavior with SEEK_END. It seems to me that if these handlers are supposed to mimic the real functions, that SEEK_END would use the offset from the end of the stream, rather than changing the offset with a random value between 0 and 4096. I could also open a PR to fix SEEK_END, but it would invalidate the seeds. ACKs for top commit: MarcoFalke: cr ACK fc47181 Tree-SHA512: 9db41637f0df7f2b2407b82531cbc34f4ba9393063b63ec6786372e808fe991f7f24df45936c203fe0f9fc49686180c65ad57c2ce7d49e0c5402240616bcfede

08634e8 fix typos in logging messages (ShubhamPalriwala) d447ded replace: self.nodes[0] with node (ShubhamPalriwala) dddca38 test: use MiniWallet in mempool_limit.py (ShubhamPalriwala) Pull request description: This is a PR proposed in bitcoin#20078 This PR enables running another non-wallet functional test even when the wallet is disabled thanks to the MiniWallet, i.e. it can be run even when bitcoin-core is compiled with --disable-wallet. It also includes changes in wallet.py in the form of a new method, `create_large_transactions()` for the MiniWallet to create large transactions. Efforts for this feature started in bitcoin#20874 but were not continued and that PR was closed hence I picked this up. To test this PR locally, compile and build bitcoin-core without the wallet and run: ``` $ test/functional/mempool_limit.py ``` ACKs for top commit: amitiuttarwar: ACK 08634e8, only git changes since last push (and one new line). Zero-1729: ACK 08634e8 🧉 Tree-SHA512: 0f744ad26bf7a5a784aac1ed5077b59c95a36d1ff3ad0087ffd10ac8d5979f7362c63c20c2ce2bfa650fda02dfbcd60b1fceee049a2465c8d221cce51c20369f

UdjinM6

utACK 3931608

vijaydasmp · 2024-12-10T11:59:28Z

Hello @knst @PastaPastaPasta , requesting review

vijaydasmp · 2024-12-15T10:25:44Z

Hello @knst @PastaPastaPasta , requesting review

vijaydasmp · 2024-12-16T15:25:55Z

Hello @PastaPastaPasta requesting review

PastaPastaPasta

utACK 3931608

vijaydasmp changed the title ~~backport~~ Merge bitcoin#23642, 22794, 23316, 24365, gui#517, 24219, 23636, 23253, 24449, 22543 Oct 3, 2024

vijaydasmp changed the title ~~Merge bitcoin#23642, 22794, 23316, 24365, gui#517, 24219, 23636, 23253, 24449, 22543~~ backport: Merge bitcoin#23642, 22794, 23316, 24365, gui#517, 24219, 23636, 23253, 24449, 22543 Oct 3, 2024

github-actions bot added the needs rebase label Oct 4, 2024

vijaydasmp force-pushed the bp23_2024_10_02 branch from a6ddfa1 to 1b73dd3 Compare October 5, 2024 01:45

vijaydasmp changed the title ~~backport: Merge bitcoin#23642, 22794, 23316, 24365, gui#517, 24219, 23636, 23253, 24449, 22543~~ backport: Merge bitcoin#23642, 22794, 23316, 24365, gui#517, 24219, 23253, 24449, 22543 Oct 5, 2024

vijaydasmp force-pushed the bp23_2024_10_02 branch from 1b73dd3 to 71921c0 Compare October 5, 2024 01:56

github-actions bot removed the needs rebase label Oct 5, 2024

vijaydasmp force-pushed the bp23_2024_10_02 branch from 71921c0 to 1cce271 Compare October 17, 2024 15:57

github-actions bot added the needs rebase label Oct 26, 2024

vijaydasmp force-pushed the bp23_2024_10_02 branch from 1cce271 to f4571e1 Compare November 23, 2024 15:08

github-actions bot removed the needs rebase label Nov 23, 2024

vijaydasmp force-pushed the bp23_2024_10_02 branch 3 times, most recently from 782d966 to e2e7682 Compare November 24, 2024 12:07

vijaydasmp marked this pull request as ready for review November 24, 2024 14:56

knst requested changes Nov 25, 2024

View reviewed changes

vijaydasmp force-pushed the bp23_2024_10_02 branch from e2e7682 to 96793d6 Compare November 26, 2024 03:22

knst reviewed Nov 26, 2024

View reviewed changes

vijaydasmp force-pushed the bp23_2024_10_02 branch 4 times, most recently from f2d260d to 0cf0b91 Compare November 27, 2024 06:20

vijaydasmp requested a review from knst November 27, 2024 06:25

knst previously approved these changes Nov 27, 2024

View reviewed changes

knst requested review from UdjinM6 and PastaPastaPasta November 27, 2024 07:18

UdjinM6 reviewed Dec 3, 2024

View reviewed changes

github-actions bot added the needs rebase label Dec 4, 2024

MarcoFalke and others added 6 commits December 5, 2024 08:43

vijaydasmp dismissed knst’s stale review via 8042994 December 5, 2024 03:33

vijaydasmp force-pushed the bp23_2024_10_02 branch from 0cf0b91 to 8042994 Compare December 5, 2024 03:33

github-actions bot removed the needs rebase label Dec 5, 2024

laanwj and others added 3 commits December 6, 2024 17:48

vijaydasmp force-pushed the bp23_2024_10_02 branch from 8042994 to 3931608 Compare December 6, 2024 12:18

vijaydasmp requested review from knst and UdjinM6 December 7, 2024 00:24

UdjinM6 approved these changes Dec 7, 2024

View reviewed changes

UdjinM6 added this to the 22.1 milestone Dec 7, 2024

PastaPastaPasta approved these changes Dec 17, 2024

View reviewed changes

PastaPastaPasta merged commit 5bf0409 into dashpay:develop Dec 17, 2024
21 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

backport: Merge bitcoin#23642, 22794, 23316, 24365, gui#517, 24219, 23253, 24449, 22543 #6300

backport: Merge bitcoin#23642, 22794, 23316, 24365, gui#517, 24219, 23253, 24449, 22543 #6300

vijaydasmp commented Oct 3, 2024

github-actions bot commented Oct 4, 2024

github-actions bot commented Oct 26, 2024

knst Nov 25, 2024

knst Nov 25, 2024

knst Nov 25, 2024

knst Nov 26, 2024

knst Nov 26, 2024

knst left a comment

vijaydasmp commented Nov 30, 2024

UdjinM6 Dec 3, 2024

github-actions bot commented Dec 4, 2024

UdjinM6 left a comment

vijaydasmp commented Dec 10, 2024

vijaydasmp commented Dec 15, 2024

vijaydasmp commented Dec 16, 2024

PastaPastaPasta left a comment

backport: Merge bitcoin#23642, 22794, 23316, 24365, gui#517, 24219, 23253, 24449, 22543 #6300

backport: Merge bitcoin#23642, 22794, 23316, 24365, gui#517, 24219, 23253, 24449, 22543 #6300

Conversation

vijaydasmp commented Oct 3, 2024

github-actions bot commented Oct 4, 2024

github-actions bot commented Oct 26, 2024

knst Nov 25, 2024

Choose a reason for hiding this comment

knst Nov 25, 2024

Choose a reason for hiding this comment

knst Nov 25, 2024

Choose a reason for hiding this comment

knst Nov 26, 2024

Choose a reason for hiding this comment

knst Nov 26, 2024

Choose a reason for hiding this comment

knst left a comment

Choose a reason for hiding this comment

vijaydasmp commented Nov 30, 2024

UdjinM6 Dec 3, 2024

Choose a reason for hiding this comment

github-actions bot commented Dec 4, 2024

UdjinM6 left a comment

Choose a reason for hiding this comment

vijaydasmp commented Dec 10, 2024

vijaydasmp commented Dec 15, 2024

vijaydasmp commented Dec 16, 2024

PastaPastaPasta left a comment

Choose a reason for hiding this comment