Page MenuHomePhabricator
Differential D8421

Implement GetNewDestination for DescriptorScriptPubKeyMan
ClosedPublic
Actions

Authored by deadalnix on Nov 15 2020, 11:56.

Details

Reviewers
majcosta
Group Reviewers
Restricted Project
Commits
rABC1390ead60fa8: Implement GetNewDestination for DescriptorScriptPubKeyMan
Summary

Backport of Core PR16528 [22/43] : https://github.com/bitcoin/bitcoin/pull/16528/commits/bfdd0734869a22217c15858d7a76d0dacc2ebc86

Depends on D8419

Test Plan
ninja all check-all

Diff Detail

Repository
rABC Bitcoin ABC
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

deadalnix created this revision.Nov 15 2020, 11:56
Herald added a reviewer: Restricted Project. · View Herald TranscriptNov 15 2020, 11:56
deadalnix requested review of this revision.Nov 15 2020, 11:56
teamcity edited the summary of this revision. (Show Details)Nov 15 2020, 11:57
Harbormaster completed remote builds in B14058: Diff 25787.Nov 15 2020, 11:59
teamcity added a comment.Nov 15 2020, 12:00
Build Bitcoin ABC Diffs / Diff Testing (build-clang-tidy) failed.

Tail of the build log:

[320/489] Building C object src/secp256k1/CMakeFiles/verify-bench.dir/src/bench_verify.c.o
[321/489] Building CXX object src/CMakeFiles/bitcoinconsensus.dir/consensus/tx_check.cpp.o
[322/489] Building C object src/secp256k1/CMakeFiles/internal-bench.dir/src/bench_internal.c.o
[323/489] Building CXX object src/CMakeFiles/common.dir/psbt.cpp.o
[324/489] Building C object src/secp256k1/CMakeFiles/secp256k1.dir/src/secp256k1.c.o
[325/489] Linking C static library src/secp256k1/libsecp256k1.a
[326/489] Linking C executable src/secp256k1/ecmult-bench
[327/489] Building CXX object src/test/CMakeFiles/testutil.dir/util/str.cpp.o
[328/489] Linking C executable src/secp256k1/internal-bench
[329/489] Linking C executable src/secp256k1/sign-bench
[330/489] Linking C executable src/secp256k1/verify-bench
[331/489] Building CXX object src/CMakeFiles/script.dir/script/interpreter.cpp.o
[332/489] Linking C executable src/secp256k1/recover-bench
[333/489] Building CXX object src/test/CMakeFiles/testutil.dir/util/logging.cpp.o
[334/489] Building CXX object src/test/CMakeFiles/testutil.dir/util/transaction_utils.cpp.o
[335/489] Building CXX object src/CMakeFiles/bitcoinconsensus.dir/pubkey.cpp.o
[336/489] Building CXX object src/CMakeFiles/script.dir/script/standard.cpp.o
[337/489] Building CXX object src/CMakeFiles/script.dir/script/sign.cpp.o
[338/489] Building CXX object src/CMakeFiles/bitcoin-wallet.dir/bitcoin-wallet.cpp.o
[339/489] Building CXX object src/wallet/CMakeFiles/wallet.dir/coinselection.cpp.o
[340/489] Building CXX object src/CMakeFiles/script.dir/script/signingprovider.cpp.o
[341/489] Building CXX object src/wallet/CMakeFiles/wallet.dir/db.cpp.o
[342/489] Building CXX object src/CMakeFiles/script.dir/script/descriptor.cpp.o
[343/489] Linking CXX static library src/libscript.a
[344/489] Linking CXX static library src/libcommon.a
[345/489] Linking CXX executable src/bitcoin-cli
[346/489] Linking CXX static library src/libbitcoinconsensus.a
[347/489] Building CXX object src/test/CMakeFiles/testutil.dir/util/blockfilter.cpp.o
[348/489] Linking CXX shared library src/libbitcoinconsensus.so.0.22.7
[349/489] Creating library symlink src/libbitcoinconsensus.so.0 src/libbitcoinconsensus.so
[350/489] Building CXX object src/wallet/CMakeFiles/wallet.dir/coincontrol.cpp.o
[351/489] Building CXX object src/wallet/CMakeFiles/wallet.dir/crypter.cpp.o
[352/489] Building CXX object src/test/CMakeFiles/testutil.dir/util/mining.cpp.o
[353/489] Building CXX object src/test/CMakeFiles/testutil.dir/util/wallet.cpp.o
[354/489] Building CXX object src/wallet/CMakeFiles/wallet.dir/scriptpubkeyman.cpp.o
FAILED: src/wallet/CMakeFiles/wallet.dir/scriptpubkeyman.cpp.o 
/usr/bin/cmake -E __run_co_compile --launcher=/usr/bin/ccache --tidy="/usr/bin/clang-tidy-8;-warnings-as-errors=*" --source=../../src/wallet/scriptpubkeyman.cpp -- /usr/bin/clang++  -DBOOST_AC_USE_STD_ATOMIC -DBOOST_SP_USE_STD_ATOMIC -DBUILD_BITCOIN_INTERNAL -DENABLE_AVX2 -DENABLE_SHANI -DENABLE_SSE41 -DHAVE_BUILD_INFO -DHAVE_CONFIG_H -DHAVE_CONSENSUS_LIB -I../../src/. -Isrc -I../../src/univalue/include -Isrc/crypto/.. -I../../src/secp256k1/include -isystem /usr/include/jemalloc -g -O2 -fPIC -fvisibility=hidden   -fstack-protector-all -Wstack-protector -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -Wall -Wextra -Wformat -Wvla -Wcast-align -Wunused-parameter -Wmissing-braces -Wthread-safety -Wshadow -Wshadow-field -Wrange-loop-analysis -Wredundant-decls -Wformat-security -Wredundant-move -Wno-unused-parameter -Wno-implicit-fallthrough -pthread -std=gnu++14 -MD -MT src/wallet/CMakeFiles/wallet.dir/scriptpubkeyman.cpp.o -MF src/wallet/CMakeFiles/wallet.dir/scriptpubkeyman.cpp.o.d -o src/wallet/CMakeFiles/wallet.dir/scriptpubkeyman.cpp.o -c ../../src/wallet/scriptpubkeyman.cpp
/work/abc-ci-builds/build-clang-tidy/../../src/wallet/scriptpubkeyman.cpp:1657:71: error: statement should be inside braces [readability-braces-around-statements,-warnings-as-errors]
                    i, provider, scripts_temp, out_keys, &temp_cache))
                                                                      ^
                                                                       {
2732 warnings generated.
Suppressed 2731 warnings (2731 in non-user code).
Use -header-filter=.* to display errors from all non-system headers. Use -system-headers to display errors from system headers as well.
1 warning treated as error
[355/489] Building CXX object src/CMakeFiles/bitcoin-tx.dir/bitcoin-tx.cpp.o
[356/489] Building CXX object src/wallet/CMakeFiles/wallet.dir/fees.cpp.o
[357/489] Building CXX object src/seeder/CMakeFiles/seeder.dir/bitcoin.cpp.o
[358/489] Building CXX object src/seeder/CMakeFiles/seeder.dir/db.cpp.o
[359/489] Building CXX object src/wallet/CMakeFiles/wallet.dir/load.cpp.o
[360/489] Building CXX object src/wallet/CMakeFiles/wallet-tool.dir/wallettool.cpp.o
[361/489] Building CXX object src/test/CMakeFiles/testutil.dir/util/setup_common.cpp.o
[362/489] Building CXX object src/wallet/CMakeFiles/wallet.dir/walletutil.cpp.o
[363/489] Building CXX object src/wallet/CMakeFiles/wallet.dir/__/interfaces/wallet.cpp.o
[364/489] Building CXX object src/wallet/CMakeFiles/wallet.dir/walletdb.cpp.o
[365/489] Building CXX object src/wallet/CMakeFiles/wallet.dir/rpcdump.cpp.o
[366/489] Building CXX object src/wallet/CMakeFiles/wallet.dir/rpcwallet.cpp.o
[367/489] Building CXX object src/wallet/CMakeFiles/wallet.dir/wallet.cpp.o
ninja: build stopped: subcommand failed.
Build build-clang-tidy failed with exit code 1
teamcity added a comment.Nov 15 2020, 12:03
Build Bitcoin ABC Diffs / Diff Testing (build-without-wallet) failed.

Tail of the build log:

[12:02:54] :	 [Step 1/1]  [0m [1;30mwallet_groups.py                                 | ○ Skipped | 0 s
[12:02:54] :	 [Step 1/1]  [0m [1;30mwallet_hd.py                                     | ○ Skipped | 0 s
[12:02:54] :	 [Step 1/1]  [0m [1;30mwallet_import_rescan.py                          | ○ Skipped | 0 s
[12:02:54] :	 [Step 1/1]  [0m [1;30mwallet_import_with_label.py                      | ○ Skipped | 0 s
[12:02:54] :	 [Step 1/1]  [0m [1;30mwallet_importmulti.py                            | ○ Skipped | 0 s
[12:02:54] :	 [Step 1/1]  [0m [1;30mwallet_importprunedfunds.py                      | ○ Skipped | 0 s
[12:02:54] :	 [Step 1/1]  [0m [1;30mwallet_keypool.py                                | ○ Skipped | 0 s
[12:02:54] :	 [Step 1/1]  [0m [1;30mwallet_keypool_topup.py                          | ○ Skipped | 0 s
[12:02:54] :	 [Step 1/1]  [0m [1;30mwallet_labels.py                                 | ○ Skipped | 0 s
[12:02:54] :	 [Step 1/1]  [0m [1;30mwallet_listreceivedby.py                         | ○ Skipped | 0 s
[12:02:54] :	 [Step 1/1]  [0m [1;30mwallet_listsinceblock.py                         | ○ Skipped | 0 s
[12:02:54] :	 [Step 1/1]  [0m [1;30mwallet_listtransactions.py                       | ○ Skipped | 0 s
[12:02:54] :	 [Step 1/1]  [0m [1;30mwallet_multiwallet.py                            | ○ Skipped | 0 s
[12:02:54] :	 [Step 1/1]  [0m [1;30mwallet_multiwallet.py --usecli                   | ○ Skipped | 0 s
[12:02:54] :	 [Step 1/1]  [0m [1;30mwallet_reorgsrestore.py                          | ○ Skipped | 0 s
[12:02:54] :	 [Step 1/1]  [0m [1;30mwallet_resendwallettransactions.py               | ○ Skipped | 1 s
[12:02:54] :	 [Step 1/1]  [0m [1;30mwallet_txn_clone.py                              | ○ Skipped | 0 s
[12:02:54] :	 [Step 1/1]  [0m [1;30mwallet_txn_clone.py --mineblock                  | ○ Skipped | 0 s
[12:02:54] :	 [Step 1/1]  [0m [1;30mwallet_txn_doublespend.py                        | ○ Skipped | 0 s
[12:02:54] :	 [Step 1/1]  [0m [1;30mwallet_txn_doublespend.py --mineblock            | ○ Skipped | 0 s
[12:02:54] :	 [Step 1/1]  [0m [1;30mwallet_watchonly.py                              | ○ Skipped | 0 s
[12:02:54] :	 [Step 1/1]  [0m [1;30mwallet_watchonly.py --usecli                     | ○ Skipped | 0 s
[12:02:54] :	 [Step 1/1]  [0m [1;30mwallet_zapwallettxes.py                          | ○ Skipped | 0 s
[12:02:54] :	 [Step 1/1]  [0m [1m
[12:02:54] :	 [Step 1/1] ALL                                              | ✓ Passed  | 301 s (accumulated)
[12:02:54] :	 [Step 1/1]  [0mRuntime: 61 s
[12:02:54] :	 [Step 1/1] 
[12:02:54] :	 [Step 1/1] [157/386] Running seeder test suite
[12:02:54] :	 [Step 1/1] PASSED: seeder test suite
[12:02:54] :	 [Step 1/1] [158/386] Test Bitcoin RPC authentication...
[12:02:54] :	 [Step 1/1] ...
[12:02:54] :	 [Step 1/1] ----------------------------------------------------------------------
[12:02:54] :	 [Step 1/1] Ran 3 tests in 0.005s
[12:02:54] :	 [Step 1/1] 
[12:02:54] :	 [Step 1/1] OK
[12:02:54] :	 [Step 1/1] [166/386] Running pow test suite
[12:02:54] :	 [Step 1/1] PASSED: pow test suite
[12:02:54] :	 [Step 1/1] [174/386] Running bitcoin-qt test suite
[12:02:54] :	 [Step 1/1] PASSED: bitcoin-qt test suite
[12:02:54] :	 [Step 1/1] [385/386] Running bitcoin test suite
[12:02:54] :	 [Step 1/1] PASSED: bitcoin test suite
[12:02:54] :	 [Step 1/1] Build build-without-wallet completed successfully
[12:02:54] :	 [Step 1/1] Process exited with code 0
[12:02:57] :	 [Step 1/1] Waiting for 1 service processes to complete
[12:02:57] :	 [Step 1/1] Ant JUnit report watcher
[12:02:57] :		 [Ant JUnit report watcher] 5 reports found for paths:
[12:02:57] :		 [Ant JUnit report watcher] /home/teamcity/buildAgent/work/jailed-build/results/artifacts/junit/*.xml
[12:02:57] :		 [Ant JUnit report watcher] Successfully parsed
[12:02:57] :			 [Successfully parsed] 5 reports
[12:02:58]E: Ant JUnit report watcher
[12:02:58]E:	 [Ant JUnit report watcher] No reports found for paths:
[12:02:58]E:	 [Ant JUnit report watcher] +:results/test_bitcoin.xml
[12:02:58]E:	 [Ant JUnit report watcher] +:results/**/junit_results*.xml
[12:02:58] : Publishing internal artifacts (4s)
[12:03:02] :	 [Publishing internal artifacts] Publishing 1 file using [WebPublisher]
[12:03:02] :	 [Publishing internal artifacts] Publishing 1 file using [ArtifactsCachePublisher]
[12:02:58]W: Publishing artifacts (5s)
[12:02:58] :	 [Publishing artifacts] Collecting files to publish: [+:results/**/junit_results*.xml]
[12:02:58]W:	 [Publishing artifacts] Artifacts path 'results/**/junit_results*.xml' not found
[12:03:03] : Build finished
teamcity added a comment.Nov 15 2020, 12:04
Build Bitcoin ABC Diffs / Diff Testing (build-debug) failed.

Tail of the build log:

[12:04:19] :	 [Step 1/1]  [0m [0;32mwallet_listsinceblock.py                         | ✓ Passed  | 5 s
[12:04:19] :	 [Step 1/1]  [0m [0;32mwallet_listtransactions.py                       | ✓ Passed  | 16 s
[12:04:19] :	 [Step 1/1]  [0m [0;32mwallet_multiwallet.py                            | ✓ Passed  | 14 s
[12:04:19] :	 [Step 1/1]  [0m [0;32mwallet_multiwallet.py --usecli                   | ✓ Passed  | 13 s
[12:04:19] :	 [Step 1/1]  [0m [0;32mwallet_reorgsrestore.py                          | ✓ Passed  | 3 s
[12:04:19] :	 [Step 1/1]  [0m [0;32mwallet_resendwallettransactions.py               | ✓ Passed  | 16 s
[12:04:19] :	 [Step 1/1]  [0m [0;32mwallet_txn_clone.py                              | ✓ Passed  | 2 s
[12:04:19] :	 [Step 1/1]  [0m [0;32mwallet_txn_clone.py --mineblock                  | ✓ Passed  | 3 s
[12:04:19] :	 [Step 1/1]  [0m [0;32mwallet_txn_doublespend.py                        | ✓ Passed  | 2 s
[12:04:19] :	 [Step 1/1]  [0m [0;32mwallet_txn_doublespend.py --mineblock            | ✓ Passed  | 3 s
[12:04:19] :	 [Step 1/1]  [0m [0;32mwallet_watchonly.py                              | ✓ Passed  | 1 s
[12:04:19] :	 [Step 1/1]  [0m [0;32mwallet_watchonly.py --usecli                     | ✓ Passed  | 1 s
[12:04:19] :	 [Step 1/1]  [0m [0;32mwallet_zapwallettxes.py                          | ✓ Passed  | 5 s
[12:04:19] :	 [Step 1/1]  [0m [1m
[12:04:19] :	 [Step 1/1] ALL                                              | ✓ Passed  | 941 s (accumulated)
[12:04:19] :	 [Step 1/1]  [0mRuntime: 189 s
[12:04:19] :	 [Step 1/1] 
[12:04:19] :	 [Step 1/1] [162/423] Running secp256k1 test suite
[12:04:19] :	 [Step 1/1] PASSED: secp256k1 test suite
[12:04:19] :	 [Step 1/1] [169/423] Running avalanche test suite
[12:04:19] :	 [Step 1/1] PASSED: avalanche test suite
[12:04:19] :	 [Step 1/1] [172/423] Running seeder test suite
[12:04:19] :	 [Step 1/1] PASSED: seeder test suite
[12:04:19] :	 [Step 1/1] [178/423] Test Bitcoin RPC authentication...
[12:04:19] :	 [Step 1/1] ...
[12:04:19] :	 [Step 1/1] ----------------------------------------------------------------------
[12:04:19] :	 [Step 1/1] Ran 3 tests in 0.004s
[12:04:19] :	 [Step 1/1] 
[12:04:19] :	 [Step 1/1] OK
[12:04:19] :	 [Step 1/1] [179/423] cd /work/contrib/devtools/chainparams && /usr/bin/python3.7 ./test_make_chainparams.py
[12:04:19] :	 [Step 1/1] .....
[12:04:19] :	 [Step 1/1] ----------------------------------------------------------------------
[12:04:19] :	 [Step 1/1] Ran 5 tests in 0.001s
[12:04:19] :	 [Step 1/1] 
[12:04:19] :	 [Step 1/1] OK
[12:04:19] :	 [Step 1/1] [394/423] Running pow test suite
[12:04:19] :	 [Step 1/1] PASSED: pow test suite
[12:04:19] :	 [Step 1/1] [413/423] Running bitcoin-qt test suite
[12:04:19] :	 [Step 1/1] PASSED: bitcoin-qt test suite
[12:04:19] :	 [Step 1/1] [422/423] Running bitcoin test suite
[12:04:19] :	 [Step 1/1] PASSED: bitcoin test suite
[12:04:19] :	 [Step 1/1] Build build-debug completed successfully
[12:04:23] :	 [Step 1/1] Process exited with code 0
[12:04:25] :	 [Step 1/1] Waiting for 1 service processes to complete
[12:04:25] :	 [Step 1/1] Ant JUnit report watcher
[12:04:25] :		 [Ant JUnit report watcher] 5 reports found for paths:
[12:04:25] :		 [Ant JUnit report watcher] /home/teamcity/buildAgent/work/jailed-build/results/artifacts/junit/*.xml
[12:04:25] :		 [Ant JUnit report watcher] Successfully parsed
[12:04:25] :			 [Successfully parsed] 5 reports
[12:04:25]E: Ant JUnit report watcher
[12:04:25]E:	 [Ant JUnit report watcher] No reports found for paths:
[12:04:25]E:	 [Ant JUnit report watcher] +:results/test_bitcoin.xml
[12:04:25]E:	 [Ant JUnit report watcher] +:results/**/junit_results*.xml
[12:04:25] : Publishing internal artifacts (5s)
[12:04:30] :	 [Publishing internal artifacts] Publishing 1 file using [WebPublisher]
[12:04:30] :	 [Publishing internal artifacts] Publishing 1 file using [ArtifactsCachePublisher]
[12:04:25]W: Publishing artifacts (5s)
[12:04:25] :	 [Publishing artifacts] Collecting files to publish: [+:results/**/junit_results*.xml]
[12:04:25]W:	 [Publishing artifacts] Artifacts path 'results/**/junit_results*.xml' not found
[12:04:32] : Build finished
majcosta requested changes to this revision.Nov 16 2020, 15:54
majcosta added a subscriber: majcosta.

missing braces

This revision now requires changes to proceed.Nov 16 2020, 15:54
deadalnix updated this revision to Diff 25795.Nov 16 2020, 16:17

rebase

Harbormaster completed remote builds in B14064: Diff 25795.Nov 16 2020, 16:48
majcosta accepted this revision.Nov 16 2020, 17:18
This revision is now accepted and ready to land.Nov 16 2020, 17:18
Closed by commit rABC1390ead60fa8: Implement GetNewDestination for DescriptorScriptPubKeyMan (authored by Andrew Chow <achow101-github@achow101.com>, committed by deadalnix). · Explain WhyNov 16 2020, 20:42
This revision was automatically updated to reflect the committed changes.
deadalnix added a commit: rABC1390ead60fa8: Implement GetNewDestination for DescriptorScriptPubKeyMan.

Revision Contents
Changeset List

PathSize
src/
wallet/
50 lines

Diff 25798

View Options

src/wallet/scriptpubkeyman.cpp

Loading...