Add segwit support to the BTC wallet #4568

oscarguindzberg · 2020-09-29T00:24:21Z

This is just the BTC wallet.
Trade protocol keeps using legacy addresses.
This PR does not require a hardfork.

ripcurlx · 2020-09-29T07:48:49Z

@oscarguindzberg If you run into Codacy issues please let me know upfront, so you don't need to create unnecessary workarounds. I just checked the current complaints and removed the pattern for comment intention as IntelliJ is doing it differently by default. The other remaining two are legit (formatting issue and unused import)

chimp1984

utACK

oscarguindzberg · 2020-10-05T15:53:41Z

Finished reviewing the source code to make sure this brings no bugs to the dao.
Tested DAO txs (compensation requests, voting, etc) and trading. I tested both pre-segwit and post-segwit nodes.
Removed the WIP tag from this PR title.

This PR is ready to be merged IMHO.

oscarguindzberg · 2020-10-05T16:14:04Z

@ripcurlx @sqrrm @chimp1984 Just bringing you attention in case you are in charge of approving/merging this PR.

chimp1984 · 2020-10-05T17:30:48Z

core/src/main/java/bisq/core/btc/wallet/BtcWalletService.java

@@ -584,23 +584,13 @@ public AddressEntry getOrCreateAddressEntry(String offerId, AddressEntry.Context
            if (emptyAvailableAddressEntry.isPresent()) {
                return addressEntryList.swapAvailableToAddressEntryWithOfferId(emptyAvailableAddressEntry.get(), context, offerId);
            } else {
-                AddressEntry entry = new AddressEntry(wallet.freshReceiveKey(), context, offerId);
+                AddressEntry entry = new AddressEntry(wallet.freshReceiveKey(), context, offerId, true);


Is that never called from a trade protocol entry? e.g. the one for the multisig.

It seems you commented on outdated code.

chimp1984 · 2020-10-05T17:37:09Z

core/src/main/java/bisq/core/btc/wallet/TradeWalletService.java

@@ -601,6 +603,9 @@ public Transaction takerSignsDepositTx(boolean takerIsSeller,
            for (int i = 0; i < buyerInputs.size(); i++) {
                TransactionInput transactionInput = makersDepositTx.getInputs().get(i);
                depositTx.addInput(getTransactionInput(depositTx, getMakersScriptSigProgram(transactionInput), buyerInputs.get(i)));
+                if (!TransactionWitness.EMPTY.equals(transactionInput.getWitness())) {
+                    depositTx.getInput(depositTx.getInputs().size()-1).setWitness(transactionInput.getWitness());


Instead of depositTx.getInputs().size()-1) I would suggest to make a local var from the getTransactionInput(depositTx, getMakersScriptSigProgram(transactionInput), buyerInputs.get(i)) we add earlier so its more clear. Maybe even do the check before adding, technically no difference but somehow more clean if the input gets completely defined before added.

As we do not support now segwit in the trade process, is that change needed at all? I dont see a risk to have it there but maybe better to leave all that out until we start adding segwit support to the trade protocol? Not sure if you started already in more pleaces to add support which do not interfere (as we discussed it is our strategy to add as much as possible without activating segwit in trade protocol...), so if you have started that process already all find, otherwise if its a single change it would be maybe more clear to start after the release with that process...

You seem to be right. In any case, it causes no harm.

oscarguindzberg · 2020-10-07T18:43:37Z

@ripcurlx Found a bug migrating encrypted wallets, added WIP tag. Will remove WIP once the bug is fixed.

Segwit is not used for BSQ

Use P2WPKH for AVAILABLE context and P2PKH for the rest. Disable reusing unused AVAILABLE entries until segwit support is mandatory in Bisq.

This is for backwards compatibility with bisq nodes that have not upgraded to bitcoinj 0.15.

chimp1984

utACK

See small suggestion in comment...

chimp1984 · 2020-10-08T20:10:50Z

core/src/main/java/bisq/core/btc/setup/WalletConfig.java

+            if (migratedWalletToSegwit.get()) {
+                startPeerGroup();
+            } else {
+                migratedWalletToSegwit.addListener((observable, oldValue, newValue) -> startPeerGroup());


I think we should add a if(newValue) to make it more clear/safe. As we change only once from false to true it would not matter but feels more correct.

Fixed 261e0ec

chimp1984

utACK

wiz · 2020-10-09T06:25:13Z

post merge ACK - tested OK on mainnet using encrypted wallet for send and receive, and also using mixed segwit/legacy inputs/outputs all worked fine

oscarguindzberg force-pushed the segwitWallet branch 3 times, most recently from f09d829 to 40d67ba Compare October 1, 2020 16:05

chimp1984 reviewed Oct 1, 2020

View reviewed changes

oscarguindzberg force-pushed the segwitWallet branch 3 times, most recently from 778a7aa to d1e3e09 Compare October 5, 2020 15:49

oscarguindzberg changed the title ~~[WIP] Add segwit support to the BTC wallet~~ Add segwit support to the BTC wallet Oct 5, 2020

chimp1984 suggested changes Oct 5, 2020

View reviewed changes

sqrrm mentioned this pull request Oct 6, 2020

Improve bisq setup #4592

Merged

oscarguindzberg changed the title ~~Add segwit support to the BTC wallet~~ [WIP] Add segwit support to the BTC wallet Oct 7, 2020

oscarguindzberg force-pushed the segwitWallet branch from 3b772f6 to 4fabbdf Compare October 8, 2020 19:26

oscarguindzberg added 14 commits October 8, 2020 16:33

Create a P2WPKH keychain for new btc wallets

f13a7b1

Add a P2WPKH keychain for existing wallets

cd28660

AddressEntry: Add boolean segwit flag

ced357c

Stop using LegacyAddress for btc addresses

e85c66b

Fix log msg in BtcCoinSelector

0c7f345

Comment out segwit BSQ account path

0f4c66f

Segwit is not used for BSQ

TradeWalletService: adapt to segwit wallet

2551571

WalletService: adapt to segwit wallet

d8b7557

New AddressEntry: use different script types

a370848

Use P2WPKH for AVAILABLE context and P2PKH for the rest. Disable reusing unused AVAILABLE entries until segwit support is mandatory in Bisq.

AddressEntryList: arbitrator entry use P2PKH

a9cc28f

Add segwit/legacy checbox for address creation

f9f5d92

Serialize tx without segwit

1f3c585

This is for backwards compatibility with bisq nodes that have not upgraded to bitcoinj 0.15.

Don't create an extra address at startup

58afc00

Don't create a wallet address when not needed

e2f74f0

oscarguindzberg added 15 commits October 8, 2020 16:33

Remove unused WalletService.findKeyFromPubKeyHash()

d1aeedd

Remove unused import

78a2a43

Enable reusing unused AVAILABLE entries

01455d2

Make codacy happy

4a2c0ad

Validate AddressEntry.segwit

86ddd06

Make it clear segwit is not used for the trade protocol yet.

b9e404f

BtcWalletService.getFreshAddressEntry(): code clean up

5524ba3

Construct dummy outputs with LegacyAddress

d1aaf3e

setWitness(): Code clean up

3554e19

Use try-with-resources

499d7b7

Improve error handling for P2WPKH

1d82c01

Switch back to LegacyAddress for fee estimation

694446c

Fix add segwit keychain for encrypted wallet

a747e83

Use bitcoinj 0.15.8 (commit a733034)

417daf5

Do a backup of the wallet before segwit migration

87da2ae

oscarguindzberg force-pushed the segwitWallet branch from 4fabbdf to 87da2ae Compare October 8, 2020 19:34

oscarguindzberg changed the base branch from master to release/v1.4.0 October 8, 2020 19:34

chimp1984 reviewed Oct 8, 2020

View reviewed changes

chimp1984 approved these changes Oct 8, 2020

View reviewed changes

oscarguindzberg changed the title ~~[WIP] Add segwit support to the BTC wallet~~ Add segwit support to the BTC wallet Oct 8, 2020

Check migratedWalletToSegwit is true

261e0ec

chimp1984 reviewed Oct 8, 2020

View reviewed changes

sqrrm approved these changes Oct 8, 2020

View reviewed changes

sqrrm merged commit 35e0c34 into bisq-network:release/v1.4.0 Oct 8, 2020

oscarguindzberg mentioned this pull request Oct 21, 2020

For Cycle 18 bisq-network/compensation#687

Closed

oscarguindzberg deleted the segwitWallet branch October 21, 2020 20:03

stejbac mentioned this pull request Jan 23, 2021

Wallet changes for Segwit BSQ implementation #5109

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add segwit support to the BTC wallet #4568

Add segwit support to the BTC wallet #4568

oscarguindzberg commented Sep 29, 2020

ripcurlx commented Sep 29, 2020

chimp1984 left a comment

oscarguindzberg commented Oct 5, 2020

oscarguindzberg commented Oct 5, 2020

chimp1984 Oct 5, 2020

oscarguindzberg Oct 5, 2020

chimp1984 Oct 5, 2020

chimp1984 Oct 5, 2020

oscarguindzberg Oct 5, 2020

oscarguindzberg commented Oct 7, 2020

chimp1984 left a comment

chimp1984 Oct 8, 2020

oscarguindzberg Oct 8, 2020

chimp1984 left a comment

wiz commented Oct 9, 2020

Add segwit support to the BTC wallet #4568

Add segwit support to the BTC wallet #4568

Conversation

oscarguindzberg commented Sep 29, 2020

ripcurlx commented Sep 29, 2020

chimp1984 left a comment

Choose a reason for hiding this comment

oscarguindzberg commented Oct 5, 2020

oscarguindzberg commented Oct 5, 2020

chimp1984 Oct 5, 2020

Choose a reason for hiding this comment

oscarguindzberg Oct 5, 2020

Choose a reason for hiding this comment

chimp1984 Oct 5, 2020

Choose a reason for hiding this comment

chimp1984 Oct 5, 2020

Choose a reason for hiding this comment

oscarguindzberg Oct 5, 2020

Choose a reason for hiding this comment

oscarguindzberg commented Oct 7, 2020

chimp1984 left a comment

Choose a reason for hiding this comment

chimp1984 Oct 8, 2020

Choose a reason for hiding this comment

oscarguindzberg Oct 8, 2020

Choose a reason for hiding this comment

chimp1984 left a comment

Choose a reason for hiding this comment

wiz commented Oct 9, 2020