https://github.com/bitcoin/bitcoin/pull/17237/commits/3958295bc8a3787b66b0269190218a3764088f79
Depends on D7689
Concludes backport of Core PR17237
Details
Details
- Reviewers
deadalnix jasonbcox - Group Reviewers
Restricted Project - Commits
- rABC61d4ae5b7551: [backport#17237 2/2] wallet: LearnRelatedScripts only if KeepDestination
ninja check check-functional
Diff Detail
Diff Detail
- Repository
- rABC Bitcoin ABC
- Lint
Lint Not Applicable - Unit
Tests Not Applicable
Event Timeline
Comment Actions
[Bot Message]
One or more PR numbers were detected in the summary.
Links to those PRs have been inserted into the summary for reference.
Comment Actions
Build Bitcoin ABC Diffs / Diff Testing (build-diff) failed.
Snippet of first build failure:
CWallet *const pwallet;
^~~~~~~
cc1plus: all warnings being treated as errors
[365/484] Building CXX object src/wallet/CMakeFiles/wallet.dir/rpcdump.cpp.o
FAILED: src/wallet/CMakeFiles/wallet.dir/rpcdump.cpp.o
/usr/bin/ccache /usr/bin/c++ -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 -Werror -g -O2 -fPIC -fvisibility=hidden -fstack-reuse=none -fstack-protector-all -Wstack-protector -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -Wall -Wextra -Wformat -Wvla -Wcast-align -Wunused-parameter -Wmissing-braces -Wshadow -Wredundant-decls -Wformat-security -Wno-unused-parameter -Wno-implicit-fallthrough -pthread -std=gnu++14 -MD -MT src/wallet/CMakeFiles/wallet.dir/rpcdump.cpp.o -MF src/wallet/CMakeFiles/wallet.dir/rpcdump.cpp.o.d -o src/wallet/CMakeFiles/wallet.dir/rpcdump.cpp.o -c ../../src/wallet/rpcdump.cpp
In file included from ../../src/wallet/rpcdump.cpp:22:
../../src/./wallet/wallet.h: In constructor ‘ReserveDestination::ReserveDestination(CWallet*, OutputType)’:
../../src/./wallet/wallet.h:156:9: error: declaration of ‘type’ shadows a member of ‘ReserveDestination’ [-Werror=shadow]
: pwallet(pwallet), type(type) {}
^
../../src/./wallet/wallet.h:142:22: note: shadowed declaration is here
OutputType const type;
^~~~
../../src/./wallet/wallet.h:156:9: error: declaration of ‘pwallet’ shadows a member of ‘ReserveDestination’ [-Werror=shadow]
: pwallet(pwallet), type(type) {}
^
../../src/./wallet/wallet.h:140:20: note: shadowed declaration is here
CWallet *const pwallet;
^~~~~~~
cc1plus: all warnings being treated as errors
[366/484] Building CXX object src/wallet/CMakeFiles/wallet.dir/wallet.cpp.o
FAILED: src/wallet/CMakeFiles/wallet.dir/wallet.cpp.o
/usr/bin/ccache /usr/bin/c++ -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 -Werror -g -O2 -fPIC -fvisibility=hidden -fstack-reuse=none -fstack-protector-all -Wstack-protector -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -Wall -Wextra -Wformat -Wvla -Wcast-align -Wunused-parameter -Wmissing-braces -Wshadow -Wredundant-decls -Wformat-security -Wno-unused-parameter -Wno-implicit-fallthrough -pthread -std=gnu++14 -MD -MT src/wallet/CMakeFiles/wallet.dir/wallet.cpp.o -MF src/wallet/CMakeFiles/wallet.dir/wallet.cpp.o.d -o src/wallet/CMakeFiles/wallet.dir/wallet.cpp.o -c ../../src/wallet/wallet.cpp
In file included from ../../src/wallet/wallet.cpp:6:
../../src/./wallet/wallet.h: In constructor ‘ReserveDestination::ReserveDestination(CWallet*, OutputType)’:
../../src/./wallet/wallet.h:156:9: error: declaration of ‘type’ shadows a member of ‘ReserveDestination’ [-Werror=shadow]
: pwallet(pwallet), type(type) {}
^
../../src/./wallet/wallet.h:142:22: note: shadowed declaration is here
OutputType const type;
^~~~
../../src/./wallet/wallet.h:156:9: error: declaration of ‘pwallet’ shadows a member of ‘ReserveDestination’ [-Werror=shadow]
: pwallet(pwallet), type(type) {}
^
../../src/./wallet/wallet.h:140:20: note: shadowed declaration is here
CWallet *const pwallet;
^~~~~~~
cc1plus: all warnings being treated as errors
[367/484] Building CXX object src/wallet/CMakeFiles/wallet.dir/rpcwallet.cpp.o
FAILED: src/wallet/CMakeFiles/wallet.dir/rpcwallet.cpp.o
/usr/bin/ccache /usr/bin/c++ -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 -Werror -g -O2 -fPIC -fvisibility=hidden -fstack-reuse=none -fstack-protector-all -Wstack-protector -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -Wall -Wextra -Wformat -Wvla -Wcast-align -Wunused-parameter -Wmissing-braces -Wshadow -Wredundant-decls -Wformat-security -Wno-unused-parameter -Wno-implicit-fallthrough -pthread -std=gnu++14 -MD -MT src/wallet/CMakeFiles/wallet.dir/rpcwallet.cpp.o -MF src/wallet/CMakeFiles/wallet.dir/rpcwallet.cpp.o.d -o src/wallet/CMakeFiles/wallet.dir/rpcwallet.cpp.o -c ../../src/wallet/rpcwallet.cpp
In file included from ../../src/./wallet/coincontrol.h:10,
from ../../src/wallet/rpcwallet.cpp:29:
../../src/./wallet/wallet.h: In constructor ‘ReserveDestination::ReserveDestination(CWallet*, OutputType)’:
../../src/./wallet/wallet.h:156:9: error: declaration of ‘type’ shadows a member of ‘ReserveDestination’ [-Werror=shadow]
: pwallet(pwallet), type(type) {}
^
../../src/./wallet/wallet.h:142:22: note: shadowed declaration is here
OutputType const type;
^~~~
../../src/./wallet/wallet.h:156:9: error: declaration of ‘pwallet’ shadows a member of ‘ReserveDestination’ [-Werror=shadow]
: pwallet(pwallet), type(type) {}
^
../../src/./wallet/wallet.h:140:20: note: shadowed declaration is here
CWallet *const pwallet;
^~~~~~~
cc1plus: all warnings being treated as errors
ninja: build stopped: cannot make progress due to previous errors.
Build build-diff failed with exit code 1