diff options
| author | Andrew Chow <achow101-github@achow101.com> | 2022-04-28 15:51:48 -0400 |
|---|---|---|
| committer | Andrew Chow <achow101-github@achow101.com> | 2022-04-28 15:59:47 -0400 |
| commit | 606ce05ec2254e3e0e425a7526502e58e0ed89dc (patch) | |
| tree | 537bf774d0f4256116b223d2357c29fa879e25b2 /src/wallet/init.cpp | |
| parent | 4cf9fa0b662a3532ae97e3acf9624327dcc9862a (diff) | |
| parent | 5f213213cb17429353ef7ec3e97b185af06d236f (diff) | |
| download | bitcoin-606ce05ec2254e3e0e425a7526502e58e0ed89dc.tar.xz | |
Merge bitcoin/bitcoin#18554: wallet: ensure wallet files are not reused across chains
5f213213cb17429353ef7ec3e97b185af06d236f tests: add tests for cross-chain wallet use prevention (Seibart Nedor)
968765973b5bfde1ee4ad2fb5c19e24bce63ad0e wallet: ensure wallet files are not reused across chains (Seibart Nedor)
Pull request description:
This implements a proposal in #12805 and is a rebase of #14533.
This seems to be a working approach, but I'm not sure why the `p2p_segwit.py` functional test needed a change, so I'll look into it more.
ACKs for top commit:
achow101:
ACK 5f213213cb17429353ef7ec3e97b185af06d236f
dongcarl:
Code Review ACK 5f213213cb17429353ef7ec3e97b185af06d236f
[deleted]:
tACK https://github.com/bitcoin/bitcoin/pull/18554/commits/5f213213cb17429353ef7ec3e97b185af06d236f
Tree-SHA512: 2c934300f113e772fc31c16ef5588526300bbc36e4dcef7d77bd0760c5c8f0ec77f766b1bed5503eb0157fa26dc900ed54d2ad1b41863c1f736ce5c1f3b67bec
Diffstat (limited to 'src/wallet/init.cpp')
| -rw-r--r-- | src/wallet/init.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/wallet/init.cpp b/src/wallet/init.cpp index 7e21126298..7f038eda84 100644 --- a/src/wallet/init.cpp +++ b/src/wallet/init.cpp @@ -94,6 +94,7 @@ void WalletInit::AddWalletOptions(ArgsManager& argsman) const #endif argsman.AddArg("-walletrejectlongchains", strprintf("Wallet will not create transactions that violate mempool chain limits (default: %u)", DEFAULT_WALLET_REJECT_LONG_CHAINS), ArgsManager::ALLOW_ANY | ArgsManager::DEBUG_ONLY, OptionsCategory::WALLET_DEBUG_TEST); + argsman.AddArg("-walletcrosschain", strprintf("Allow reusing wallet files across chains (default: %u)", DEFAULT_WALLETCROSSCHAIN), ArgsManager::ALLOW_ANY | ArgsManager::DEBUG_ONLY, OptionsCategory::WALLET_DEBUG_TEST); argsman.AddHiddenArgs({"-zapwallettxes"}); } |