-
Notifications
You must be signed in to change notification settings - Fork 1.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add wallet info view with balance, xpub keys,
hd paths and button to open wallet details
- Loading branch information
Showing
6 changed files
with
245 additions
and
9 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
36 changes: 36 additions & 0 deletions
36
desktop/src/main/java/bisq/desktop/main/account/content/walletinfo/WalletInfoView.fxml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
|
|
||
| <!-- | ||
| ~ This file is part of Bisq. | ||
| ~ | ||
| ~ Bisq is free software: you can redistribute it and/or modify it | ||
| ~ under the terms of the GNU Affero General Public License as published by | ||
| ~ the Free Software Foundation, either version 3 of the License, or (at | ||
| ~ your option) any later version. | ||
| ~ | ||
| ~ Bisq is distributed in the hope that it will be useful, but WITHOUT | ||
| ~ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
| ~ FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public | ||
| ~ License for more details. | ||
| ~ | ||
| ~ You should have received a copy of the GNU Affero General Public License | ||
| ~ along with Bisq. If not, see <http://www.gnu.org/licenses/>. | ||
| --> | ||
|
|
||
| <?import javafx.scene.layout.AnchorPane?> | ||
| <?import javafx.scene.layout.ColumnConstraints?> | ||
| <?import javafx.scene.layout.GridPane?> | ||
| <?import javafx.geometry.Insets?> | ||
| <GridPane fx:id="root" fx:controller="bisq.desktop.main.account.content.walletinfo.WalletInfoView" | ||
| hgap="5.0" vgap="5.0" | ||
| AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" | ||
| AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0" | ||
| xmlns:fx="http://javafx.com/fxml"> | ||
| <padding> | ||
| <Insets bottom="15.0" left="15.0" right="15.0" top="15.0"/> | ||
| </padding> | ||
| <columnConstraints> | ||
| <ColumnConstraints hgrow="ALWAYS"/> | ||
| </columnConstraints> | ||
|
|
||
| </GridPane> |
170 changes: 170 additions & 0 deletions
170
desktop/src/main/java/bisq/desktop/main/account/content/walletinfo/WalletInfoView.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,170 @@ | ||
| /* | ||
| * This file is part of Bisq. | ||
| * | ||
| * Bisq is free software: you can redistribute it and/or modify it | ||
| * under the terms of the GNU Affero General Public License as published by | ||
| * the Free Software Foundation, either version 3 of the License, or (at | ||
| * your option) any later version. | ||
| * | ||
| * Bisq is distributed in the hope that it will be useful, but WITHOUT | ||
| * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
| * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public | ||
| * License for more details. | ||
| * | ||
| * You should have received a copy of the GNU Affero General Public License | ||
| * along with Bisq. If not, see <http://www.gnu.org/licenses/>. | ||
| */ | ||
|
|
||
| package bisq.desktop.main.account.content.walletinfo; | ||
|
|
||
| import bisq.desktop.common.view.ActivatableView; | ||
| import bisq.desktop.common.view.FxmlView; | ||
| import bisq.desktop.main.overlays.popups.Popup; | ||
| import bisq.desktop.main.overlays.windows.ShowWalletDataWindow; | ||
| import bisq.desktop.util.Layout; | ||
|
|
||
| import bisq.core.btc.listeners.BalanceListener; | ||
| import bisq.core.btc.wallet.BsqWalletService; | ||
| import bisq.core.btc.wallet.BtcWalletService; | ||
| import bisq.core.btc.wallet.WalletService; | ||
| import bisq.core.btc.wallet.WalletsManager; | ||
| import bisq.core.locale.Res; | ||
| import bisq.core.util.FormattingUtils; | ||
| import bisq.core.util.coin.BsqFormatter; | ||
| import bisq.core.util.coin.CoinFormatter; | ||
|
|
||
| import bisq.common.config.Config; | ||
|
|
||
| import org.bitcoinj.core.Coin; | ||
| import org.bitcoinj.core.Transaction; | ||
| import org.bitcoinj.script.Script; | ||
| import org.bitcoinj.wallet.DeterministicKeyChain; | ||
|
|
||
| import javax.inject.Inject; | ||
| import javax.inject.Named; | ||
|
|
||
| import javafx.scene.control.Button; | ||
| import javafx.scene.control.TextField; | ||
| import javafx.scene.layout.GridPane; | ||
|
|
||
| import static bisq.desktop.util.FormBuilder.addButtonAfterGroup; | ||
| import static bisq.desktop.util.FormBuilder.addMultilineLabel; | ||
| import static bisq.desktop.util.FormBuilder.addTitledGroupBg; | ||
| import static bisq.desktop.util.FormBuilder.addTopLabelTextField; | ||
| import static org.bitcoinj.wallet.Wallet.BalanceType.ESTIMATED_SPENDABLE; | ||
|
|
||
| @FxmlView | ||
| public class WalletInfoView extends ActivatableView<GridPane, Void> { | ||
|
|
||
| private final WalletsManager walletsManager; | ||
| private final BtcWalletService btcWalletService; | ||
| private final BsqWalletService bsqWalletService; | ||
| private final CoinFormatter btcFormatter; | ||
| private final BsqFormatter bsqFormatter; | ||
| private int gridRow = 0; | ||
| private Button openDetailsButton; | ||
| private TextField btcTextField, bsqTextField; | ||
| private BalanceListener btcWalletBalanceListener; | ||
| private BalanceListener bsqWalletBalanceListener; | ||
|
|
||
|
|
||
| /////////////////////////////////////////////////////////////////////////////////////////// | ||
| // Constructor, lifecycle | ||
| /////////////////////////////////////////////////////////////////////////////////////////// | ||
|
|
||
| @Inject | ||
| private WalletInfoView(WalletsManager walletsManager, | ||
| BtcWalletService btcWalletService, | ||
| BsqWalletService bsqWalletService, | ||
| @Named(FormattingUtils.BTC_FORMATTER_KEY) CoinFormatter btcFormatter, | ||
| BsqFormatter bsqFormatter) { | ||
| this.walletsManager = walletsManager; | ||
| this.btcWalletService = btcWalletService; | ||
| this.bsqWalletService = bsqWalletService; | ||
| this.btcFormatter = btcFormatter; | ||
| this.bsqFormatter = bsqFormatter; | ||
| } | ||
|
|
||
| @Override | ||
| public void initialize() { | ||
| addTitledGroupBg(root, gridRow, 3, Res.get("account.menu.walletInfo.balance.headLine")); | ||
| addMultilineLabel(root, gridRow, Res.get("account.menu.walletInfo.balance.info"), Layout.FIRST_ROW_DISTANCE, Double.MAX_VALUE); | ||
| btcTextField = addTopLabelTextField(root, ++gridRow, "BTC", -Layout.FLOATING_LABEL_DISTANCE).second; | ||
| bsqTextField = addTopLabelTextField(root, ++gridRow, "BSQ", -Layout.FLOATING_LABEL_DISTANCE).second; | ||
|
|
||
| addTitledGroupBg(root, ++gridRow, 3, 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); | ||
|
|
||
| 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"), "44'/0'/0'", -Layout.FLOATING_LABEL_DISTANCE); | ||
| addTopLabelTextField(root, ++gridRow, Res.get("account.menu.walletInfo.walletSelector", "BTC", "segwit"), "44'/0'/1'", -Layout.FLOATING_LABEL_DISTANCE); | ||
| addTopLabelTextField(root, ++gridRow, Res.get("account.menu.walletInfo.walletSelector", "BSQ", ""), "44'/142'/0'", -Layout.FLOATING_LABEL_DISTANCE); | ||
|
|
||
| openDetailsButton = addButtonAfterGroup(root, ++gridRow, Res.get("account.menu.walletInfo.openDetails")); | ||
|
|
||
| btcWalletBalanceListener = new BalanceListener() { | ||
| @Override | ||
| public void onBalanceChanged(Coin balanceAsCoin, Transaction tx) { | ||
| updateBalances(btcWalletService); | ||
| } | ||
| }; | ||
| bsqWalletBalanceListener = new BalanceListener() { | ||
| @Override | ||
| public void onBalanceChanged(Coin balanceAsCoin, Transaction tx) { | ||
| updateBalances(bsqWalletService); | ||
| } | ||
| }; | ||
| } | ||
|
|
||
|
|
||
| @Override | ||
| protected void activate() { | ||
| btcWalletService.addBalanceListener(btcWalletBalanceListener); | ||
| bsqWalletService.addBalanceListener(bsqWalletBalanceListener); | ||
| updateBalances(btcWalletService); | ||
| updateBalances(bsqWalletService); | ||
|
|
||
| openDetailsButton.setOnAction(e -> { | ||
| if (walletsManager.areWalletsAvailable()) { | ||
| new ShowWalletDataWindow(walletsManager).width(root.getWidth()).show(); | ||
| } else { | ||
| new Popup().warning(Res.get("popup.warning.walletNotInitialized")).show(); | ||
| } | ||
| }); | ||
| } | ||
|
|
||
| @Override | ||
| protected void deactivate() { | ||
| btcWalletService.removeBalanceListener(btcWalletBalanceListener); | ||
| bsqWalletService.removeBalanceListener(bsqWalletBalanceListener); | ||
| openDetailsButton.setOnAction(null); | ||
| } | ||
|
|
||
| private void addXpubKeys(WalletService walletService, String currency, int gridRow, double top) { | ||
| int row = gridRow; | ||
| 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), | ||
| key, topDist); | ||
| row++; | ||
| topDist = -Layout.FLOATING_LABEL_DISTANCE; | ||
| } | ||
| } | ||
|
|
||
| private void updateBalances(WalletService walletService) { | ||
| if (walletService instanceof BtcWalletService) { | ||
| btcTextField.setText(btcFormatter.formatCoinWithCode(walletService.getBalance(ESTIMATED_SPENDABLE))); | ||
| } else { | ||
| bsqTextField.setText(bsqFormatter.formatCoinWithCode(walletService.getBalance(ESTIMATED_SPENDABLE))); | ||
| } | ||
| } | ||
|
|
||
| } | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters