Skip to content

Commit

Permalink
Iterate over wallet keychains instead of using hard coded BIP32 paths
Browse files Browse the repository at this point in the history 
Add private method 'WalletInfoView.addAccountPaths', similar to the
method 'addXpubKeys', to iterate over the active wallet keychains,
formatting & displaying the derivation paths, instead of using the 4
constants defined in BisqKeyChainGroupStructure. Also simplify the code
slightly by updating the 'gridRow' field directly instead of passing it
as a method argument.
  • Loading branch information
@stejbac
stejbac committed Mar 11, 2023
1 parent 1672bb6 commit 4b2c7b1
Showing 1 changed file with 25 additions and 27 deletions.
52 changes: 25 additions & 27 deletions desktop/src/main/java/bisq/desktop/main/account/content/walletinfo/WalletInfoView.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
import bisq.desktop.util.Layout;

import bisq.core.btc.listeners.BalanceListener;
import bisq.core.btc.setup.BisqKeyChainGroupStructure;
import bisq.core.btc.wallet.BsqWalletService;
import bisq.core.btc.wallet.BtcWalletService;
import bisq.core.btc.wallet.WalletService;
Expand Down Expand Up @@ -103,23 +102,15 @@ public void initialize() {
bsqTextField = addTopLabelTextField(root, ++gridRow, "BSQ", -Layout.FLOATING_LABEL_DISTANCE).second;

addTitledGroupBg(root, ++gridRow, 4, Res.get("account.menu.walletInfo.xpub.headLine"), Layout.GROUP_DISTANCE);
addXpubKeys(btcWalletService, "BTC", gridRow, Layout.FIRST_ROW_AND_GROUP_DISTANCE);
++gridRow; // update gridRow
addXpubKeys(bsqWalletService, "BSQ", ++gridRow, -Layout.FLOATING_LABEL_DISTANCE);
++gridRow; // update gridRow

addTitledGroupBg(root, ++gridRow, 4, Res.get("account.menu.walletInfo.path.headLine"), Layout.GROUP_DISTANCE);
addMultilineLabel(root, gridRow, Res.get("account.menu.walletInfo.path.info"), Layout.FIRST_ROW_AND_GROUP_DISTANCE, Double.MAX_VALUE);
addTopLabelTextField(root, ++gridRow, Res.get("account.menu.walletInfo.walletSelector", "BTC", "legacy"),
formatAccountPath(BisqKeyChainGroupStructure.BIP44_BTC_NON_SEGWIT_ACCOUNT_PATH), -Layout.FLOATING_LABEL_DISTANCE);
addTopLabelTextField(root, ++gridRow, Res.get("account.menu.walletInfo.walletSelector", "BTC", "segwit"),
formatAccountPath(BisqKeyChainGroupStructure.BIP44_BTC_SEGWIT_ACCOUNT_PATH), -Layout.FLOATING_LABEL_DISTANCE);
addTopLabelTextField(root, ++gridRow, Res.get("account.menu.walletInfo.walletSelector", "BSQ", "legacy"),
formatAccountPath(BisqKeyChainGroupStructure.BIP44_BSQ_NON_SEGWIT_ACCOUNT_PATH), -Layout.FLOATING_LABEL_DISTANCE);
addTopLabelTextField(root, ++gridRow, Res.get("account.menu.walletInfo.walletSelector", "BSQ", "segwit"),
formatAccountPath(BisqKeyChainGroupStructure.BIP44_BSQ_SEGWIT_ACCOUNT_PATH), -Layout.FLOATING_LABEL_DISTANCE);

openDetailsButton = addButtonAfterGroup(root, ++gridRow, Res.get("account.menu.walletInfo.openDetails"));
addXpubKeys(btcWalletService, "BTC", Layout.FIRST_ROW_AND_GROUP_DISTANCE);
addXpubKeys(bsqWalletService, "BSQ", -Layout.FLOATING_LABEL_DISTANCE);

addTitledGroupBg(root, gridRow, 4, Res.get("account.menu.walletInfo.path.headLine"), Layout.GROUP_DISTANCE);
addMultilineLabel(root, gridRow++, Res.get("account.menu.walletInfo.path.info"), Layout.FIRST_ROW_AND_GROUP_DISTANCE, Double.MAX_VALUE);
addAccountPaths(btcWalletService, "BTC");
addAccountPaths(bsqWalletService, "BSQ");

openDetailsButton = addButtonAfterGroup(root, gridRow, Res.get("account.menu.walletInfo.openDetails"));

btcWalletBalanceListener = new BalanceListener() {
@Override
Expand All @@ -135,10 +126,6 @@ public void onBalanceChanged(Coin balanceAsCoin, Transaction tx) {
};
}

private String formatAccountPath(List<ChildNumber> path) {
return Joiner.on('/').join(path).replace('H', '\'');
}


@Override
protected void activate() {
Expand All @@ -163,21 +150,32 @@ protected void deactivate() {
openDetailsButton.setOnAction(null);
}

private void addXpubKeys(WalletService walletService, String currency, int gridRow, double top) {
int row = gridRow;
private void addXpubKeys(WalletService walletService, String currency, double top) {
double topDist = top;
for (DeterministicKeyChain chain : walletService.getWallet().getActiveKeyChains()) {
Script.ScriptType outputScriptType = chain.getOutputScriptType();
String type = outputScriptType == Script.ScriptType.P2WPKH ? "segwit" : "legacy";
String key = chain.getWatchingKey().serializePubB58(Config.baseCurrencyNetworkParameters(), outputScriptType);
addTopLabelTextField(root, row,
Res.get("account.menu.walletInfo.walletSelector", currency, type),
addTopLabelTextField(root, gridRow++, Res.get("account.menu.walletInfo.walletSelector", currency, type),
key, topDist);
row++;
topDist = -Layout.FLOATING_LABEL_DISTANCE;
}
}

private void addAccountPaths(WalletService walletService, String currency) {
for (DeterministicKeyChain chain : walletService.getWallet().getActiveKeyChains()) {
Script.ScriptType outputScriptType = chain.getOutputScriptType();
String type = outputScriptType == Script.ScriptType.P2WPKH ? "segwit" : "legacy";
String path = formatAccountPath(chain.getAccountPath());
addTopLabelTextField(root, gridRow++, Res.get("account.menu.walletInfo.walletSelector", currency, type),
path, -Layout.FLOATING_LABEL_DISTANCE);
}
}

private String formatAccountPath(List<ChildNumber> path) {
return Joiner.on('/').join(path).replace('H', '\'');
}

private void updateBalances(WalletService walletService) {
if (walletService instanceof BtcWalletService) {
btcTextField.setText(btcFormatter.formatCoinWithCode(walletService.getBalance(ESTIMATED_SPENDABLE)));
Expand Down

0 comments on commit 4b2c7b1

Please sign in to comment.