diff options
| author | Samuel Dobson <dobsonsa68@gmail.com> | 2021-11-16 15:29:17 +1300 |
|---|---|---|
| committer | Samuel Dobson <dobsonsa68@gmail.com> | 2021-11-16 15:32:18 +1300 |
| commit | 0475a2378bbfbc96b60e1bb8e816533e0e7a9e5d (patch) | |
| tree | f5a8917ba264bb140d84887ca10db9b3a58c9c39 /src/wallet/wallettool.cpp | |
| parent | 6780759a01e25c68dd55044c3b9a016f9137910b (diff) | |
| parent | 5b6b5ef5d178bea3c1b2f21e3bd05186312ea191 (diff) | |
Merge bitcoin/bitcoin#23349: util: Use FEATURE_LATEST for wallets created with bitcoin-wallet
5b6b5ef5d178bea3c1b2f21e3bd05186312ea191 util: Use FEATURE_LATEST for wallets created with bitcoin-wallet (Hennadii Stepanov)
Pull request description:
Since the 49d2374acf5845c5f760b5fd241482f292164147 commit was athored by **jonasschnelli** in 2016, the wallet version was bumped twice: in 2017 (bitcoin/bitcoin#11250) and in 2018 (bitcoin/bitcoin#12560).
This PR bumps the version of wallets created with `bitcoin-wallet` offline tool.
On master (04437ee721e66a7b76bef5ec2f88dd1efcd03b84) -- `"walletversion": 139900`:
```
$ src/bitcoin-wallet -signet -wallet=211025-test-master create
Topping up keypool...
Wallet info
===========
Name: 211025-test-master
Format: sqlite
Descriptors: yes
Encrypted: no
HD (hd seed available): yes
Keypool Size: 6000
Transactions: 0
Address Book: 0
$ src/bitcoin-cli -signet -rpcwallet=211025-test-master getwalletinfo
{
"walletname": "211025-test-master",
"walletversion": 139900,
"format": "sqlite",
"balance": 0.00000000,
"unconfirmed_balance": 0.00000000,
"immature_balance": 0.00000000,
"txcount": 0,
"keypoolsize": 3000,
"keypoolsize_hd_internal": 3000,
"paytxfee": 0.00000000,
"private_keys_enabled": true,
"avoid_reuse": false,
"scanning": false,
"descriptors": true
}
```
With this PR -- `"walletversion": 169900`:
```
$ src/bitcoin-wallet -signet -wallet=211025-test-pr create
Topping up keypool...
Wallet info
===========
Name: 211025-test-pr
Format: sqlite
Descriptors: yes
Encrypted: no
HD (hd seed available): yes
Keypool Size: 6000
Transactions: 0
Address Book: 0
$ src/bitcoin-cli -signet -rpcwallet=211025-test-pr getwalletinfo
{
"walletname": "211025-test-pr",
"walletversion": 169900,
"format": "sqlite",
"balance": 0.00000000,
"unconfirmed_balance": 0.00000000,
"immature_balance": 0.00000000,
"txcount": 0,
"keypoolsize": 3000,
"keypoolsize_hd_internal": 3000,
"paytxfee": 0.00000000,
"private_keys_enabled": true,
"avoid_reuse": false,
"scanning": false,
"descriptors": true
}
```
ACKs for top commit:
lsilva01:
Code Review ACK 5b6b5ef
stratospher:
ACK 5b6b5ef.
rajarshimaitra:
ACK https://github.com/bitcoin/bitcoin/pull/23349/commits/5b6b5ef5d178bea3c1b2f21e3bd05186312ea191
meshcollider:
Code review ACK 5b6b5ef5d178bea3c1b2f21e3bd05186312ea191
Tree-SHA512: 0221e76fa8f29037920d0a483c742bf270ecaead45f30230943b78775aaea63ac052e43fe712d15c2326e515dea2d2ac82de0924882598421c1874f2e6f442a6
Diffstat (limited to 'src/wallet/wallettool.cpp')
| -rw-r--r-- | src/wallet/wallettool.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/wallet/wallettool.cpp b/src/wallet/wallettool.cpp index b609ba6881..d6717ebbca 100644 --- a/src/wallet/wallettool.cpp +++ b/src/wallet/wallettool.cpp @@ -26,7 +26,7 @@ static void WalletCreate(CWallet* wallet_instance, uint64_t wallet_creation_flag { LOCK(wallet_instance->cs_wallet); - wallet_instance->SetMinVersion(FEATURE_HD_SPLIT); + wallet_instance->SetMinVersion(FEATURE_LATEST); wallet_instance->AddWalletFlags(wallet_creation_flags); if (!wallet_instance->IsWalletFlagSet(WALLET_FLAG_DESCRIPTORS)) { |