refactor: followup of remove -deprecatedrpc=addresses flag #24673

1. 
   fanquake commented at 2:51 pm on March 25, 2022: member

   I’ve cherry-picked some of the commits out of #22924, and made minor changes (like fixing named args).
2. fanquake added the label Refactoring on Mar 25, 2022
3. 
   DrahtBot commented at 9:36 pm on March 25, 2022: member

   The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.

   Conflicts

   Reviewers, this pull request conflicts with the following ones:

   • #24661 (refactor: Use clang-tidy syntax for C++ named arguments by fanquake)
   • #23599 (Tidy up RPCTxSerializationFlags by MarcoFalke)
   • #23319 (rpc: Return fee and prevout (utxos) to getrawtransaction by dougEfresh)
   • #21283 (Implement BIP 370 PSBTv2 by achow101)

   If you consider this pull request important, please also help to review the conflicting pull requests. Ideally, start with the one that should be merged first.

4. in src/rest.cpp:858 in 93b28f0cd6 outdated

   854@@ -855,7 +855,7 @@ static bool rest_getutxos(const std::any& context, HTTPRequest* req, const std::
   855 
   856             // include the script in a json output
   857             UniValue o(UniValue::VOBJ);
   858-            ScriptPubKeyToUniv(coin.out.scriptPubKey, o, true);
   859+            ScriptToUniv(coin.out.scriptPubKey, o, true, /*include_address=*/true);
   

   ---

   ---

   

   MarcoFalke commented at 1:11 pm on March 30, 2022:

   first commit: named arg?

   ---

   

   fanquake commented at 7:12 pm on March 30, 2022:

   Should be addressed
5. in src/test/fuzz/script_format.cpp:34 in 93b28f0cd6 outdated

   28@@ -29,7 +29,7 @@ FUZZ_TARGET_INIT(script_format, initialize_script_format)
   29     (void)ScriptToAsmStr(script, /*fAttemptSighashDecode=*/fuzzed_data_provider.ConsumeBool());
   30 
   31     UniValue o1(UniValue::VOBJ);
   32-    ScriptPubKeyToUniv(script, o1, /*include_hex=*/fuzzed_data_provider.ConsumeBool());
   33+    ScriptToUniv(script, o1, /*include_hex=*/fuzzed_data_provider.ConsumeBool(), /*include_address=*/fuzzed_data_provider.ConsumeBool());
   34     UniValue o3(UniValue::VOBJ);
   35     ScriptToUniv(script, o3);
   

   ---

   ---

   

   MarcoFalke commented at 1:11 pm on March 30, 2022:

   I think this can be removed

   ---

   

   fanquake commented at 7:11 pm on March 30, 2022:

   Removed
6. in src/core_write.cpp:256 in abcd5de1d2 outdated

   252@@ -253,8 +253,8 @@ void TxToUniv(const CTransaction& tx, const uint256& hashBlock, UniValue& entry,
   253         entry.pushKV("fee", ValueFromAmount(fee));
   254     }
   255 
   256-    if (!hashBlock.IsNull())
   257-        entry.pushKV("blockhash", hashBlock.GetHex());
   258+    if (!block_hash.IsNull())
   

   ---

   ---

   

   MarcoFalke commented at 1:12 pm on March 30, 2022:

   missing {}

   ---

   

   fanquake commented at 7:11 pm on March 30, 2022:

   Added
7. MarcoFalke approved
8. 
   MarcoFalke commented at 1:14 pm on March 30, 2022: member

   review ACK 9aad2844aa7047121e72cb0bd416cc14101e2b7c 😼

   Signature:

    0-----BEGIN PGP SIGNED MESSAGE-----
    1Hash: SHA512
    2
    3review ACK 9aad2844aa7047121e72cb0bd416cc14101e2b7c 😼
    4-----BEGIN PGP SIGNATURE-----
    5
    6iQGzBAEBCgAdFiEE+rVPoUahrI9sLGYTzit1aX5ppUgFAlwqrYAACgkQzit1aX5p
    7pUigxAwAuyqNsS2+EPh36vJ7QjbJzWcX1/55TU4yjULBwisAqfcoU06nfp5nmlWB
    8lJ7y4iJJ/ZgcS/XP5Lf3yCKz6KmnViT1T6CGrEVsIFnZQ70cyzMm+Ikt2NkeDZE5
    9f8QqOW6wucqWC4kt8Cu9557cuwYQy7lkk7fZdNcOQhN8PC0J2MKp6VOf3Q63cQYF
   10HJmM5cXeo0e5+O+k+aAKABxOEjV5dJH8dKXZfPVgb8jeZuHlm1PTvRsIulWYWPRg
   11WbZXkRcN/+v0EEetVa8IhYV4tWpoiWzHXrGLnTo4MzDttsL7PFVKba3Pv01iXflx
   12eY+wbE6W4wwYfTn9S+UwHFA5MolNeuwMnC2N1MWuI6HBMqQ2SilP1zbb5bX2QZby
   13VLiJ4UB8pMDWqY2mBsDEfGKscgdOR6qK38zH8iFmfWIwKphFT5sRzTHR2f3rALmN
   14u3NnyMcmn+YvWyDgyTWC/e2g2TQeIAHeux9wQHrcyAXqvOw9qtTab5EE1FexLk/T
   15JdbYgGFz
   16=/ATi
   17-----END PGP SIGNATURE-----
   

9. refactor: merge ScriptPubKeyToUniv & ScriptToUniv into one function 828a094ecf
10. refactor: prefer snake case, TxToUniv arg hashBlock renamed block_hash 22f25a6116
11. refactor: use named args when ScriptToUniv or TxToUniv are invoked 8b9efebb0a
12. refactor: add stdd:: includes to core_write 9563a645c2
13. fanquake force-pushed on Mar 30, 2022
14. 
    MarcoFalke commented at 6:30 am on March 31, 2022: member

    re-ACK 9563a645c22a455da3d2d305ed0eef4266b1d322 🕓

    Signature:

     0-----BEGIN PGP SIGNED MESSAGE-----
     1Hash: SHA512
     2
     3re-ACK 9563a645c22a455da3d2d305ed0eef4266b1d322 🕓
     4-----BEGIN PGP SIGNATURE-----
     5
     6iQGzBAEBCgAdFiEE+rVPoUahrI9sLGYTzit1aX5ppUgFAlwqrYAACgkQzit1aX5p
     7pUjyqQv/WChwsfIm2X3iwc5IJ6TYwiH81nmMk6ELbpIwzjD3uqWS3ordwelmW9jH
     8MbCxAv44LJ4IBG6XzFXKBKwuHCmuky7/5EfmBVlX/H6ztnamQMXDbYswpYpQiIq+
     9HXu8f2pDe/+U025h36rALlmc9OuCBQWlKmBzktnOhCaSg4LD+72qqQQ+B8Avr6DE
    101tv/s0u1/5lC8DvsjENGJi+ah6fO87qp2n5+deFFEBpQt40EmHbVJcHM+suDvP3d
    11qIBomRIYP5OxGB1oQ4xcq5+7/qpgdxh/elN9Q1diaDWuCmYQ46Omnft8yvWu4YSS
    120fLoFkXztAMYgAd4yrgs8OUQAN4DdSc3xBuYwtaxmhHvFl+wnWUhScFE7/bTtjRb
    13RlrEljbFIYjJASQzETp9WHhgfMRq6ARaJc+ulS0+g1UAMNg3PX8taSkX7YmJaN2l
    14Q4JO2N/Rw0feV94pOKNyOByhkwieAz7izabBeahq/Yr+2iJzGKSrxzOUar5z9G0K
    15KjIqtwNr
    16=O5zM
    17-----END PGP SIGNATURE-----
    

15. MarcoFalke merged this on Mar 31, 2022
16. MarcoFalke closed this on Mar 31, 2022

    ---

17. fanquake deleted the branch on Mar 31, 2022
18. 
    mjdietzx commented at 2:48 pm on March 31, 2022: contributor

    Post merge review ACK 9563a645c22a455da3d2d305ed0eef4266b1d322
19. sidhujag referenced this in commit 3ac281c1a0 on Apr 3, 2022
20. DrahtBot locked this on Mar 31, 2023

Contributors
fanquake DrahtBot MarcoFalke mjdietzx

Labels
Refactoring