highperfocused/lnbits
1
0
Fork 0
mirror of https://github.com/lnbits/lnbits.git synced 2025-07-12 22:12:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix: address type selection

Browse Source
This commit is contained in:
Vlad Stan
2022-08-04 11:05:27 +03:00
parent 4ab43e0743
commit 48ab496cb4
2 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lnbits/extensions/watchonly/static/components/wallet-list/wallet-list.html
View File

@ -191,7 +191,6 @@
label="Account Extended Public Key; xpub, ypub, zpub; Bitcoin Descriptor" label="Account Extended Public Key; xpub, ypub, zpub; Bitcoin Descriptor"
></q-input> ></q-input>
<q-select <q-select
v-if="formDialog.useSerialPort"
filled filled
dense dense
emit-value emit-value

24
lnbits/extensions/watchonly/static/components/wallet-list/wallet-list.js
View File

@ -19,7 +19,12 @@ async function walletList(path) {
formDialog: { formDialog: {
show: false, show: false,
addressType: [], addressType: {
label: 'Segwit (P2WPKH)',
id: 'wpkh',
pathMainnet: "m/84'/0'/0'",
pathTestnet: "m/84'/1'/0'"
},
useSerialPort: false, useSerialPort: false,
data: { data: {
title: '', title: '',
@ -32,25 +37,25 @@ async function walletList(path) {
addressTypeOptions: [ addressTypeOptions: [
{ {
label: 'Legacy (P2PKH)', label: 'Legacy (P2PKH)',
value: 'pkh', id: 'pkh',
pathMainnet: "m/44'/0'/0'", pathMainnet: "m/44'/0'/0'",
pathTestnet: "m/44'/1'/0'" pathTestnet: "m/44'/1'/0'"
}, },
{ {
label: 'Segwit (P2WPKH)', label: 'Segwit (P2WPKH)',
value: 'wpkh', id: 'wpkh',
pathMainnet: "m/84'/0'/0'", pathMainnet: "m/84'/0'/0'",
pathTestnet: "m/84'/1'/0'" pathTestnet: "m/84'/1'/0'"
}, },
{ {
label: 'Wrapped Segwit (P2SH-P2WPKH)', label: 'Wrapped Segwit (P2SH-P2WPKH)',
value: 'sh', id: 'sh',
pathMainnet: "m/49'/0'/0'", pathMainnet: "m/49'/0'/0'",
pathTestnet: "m/49'/1'/0'" pathTestnet: "m/49'/1'/0'"
}, },
{ {
label: 'Taproot (P2TR)', label: 'Taproot (P2TR)',
value: 'tr', id: 'tr',
pathMainnet: "m/86'/0'/0'", pathMainnet: "m/86'/0'/0'",
pathTestnet: "m/86'/1'/0'" pathTestnet: "m/86'/1'/0'"
} }
@ -116,13 +121,12 @@ async function walletList(path) {
const {xpub, fingerprint} = await this.fetchXpubFromHww() const {xpub, fingerprint} = await this.fetchXpubFromHww()
if (!xpub) return if (!xpub) return
const path = this.accountPath.substring(2) const path = this.accountPath.substring(2)
const outputType = this.formDialog.addressType const outputType = this.formDialog.addressType.id
if (outputType === 'sh') { if (outputType === 'sh') {
data.masterpub = `${outputType}(wpkh([${fingerprint}/${path}]${xpub}/{0,1}/*))` data.masterpub = `${outputType}(wpkh([${fingerprint}/${path}]${xpub}/{0,1}/*))`
} else { } else {
data.masterpub = `${outputType}([${fingerprint}/${path}]${xpub}/{0,1}/*)` data.masterpub = `${outputType}([${fingerprint}/${path}]${xpub}/{0,1}/*)`
} }
console.log('### data.masterpub', data.masterpub)
} }
const response = await LNbits.api.request( const response = await LNbits.api.request(
'POST', 'POST',
@ -270,16 +274,16 @@ async function walletList(path) {
}) })
} }
}, },
handleAddressTypeChanged: function (value) { handleAddressTypeChanged: function (value = {}) {
const addressType = const addressType =
this.addressTypeOptions.find(t => t.value === value) || {} this.addressTypeOptions.find(t => t.id === value.id) || {}
this.accountPath = addressType[`path${this.network}`] this.accountPath = addressType[`path${this.network}`]
} }
}, },
created: async function () { created: async function () {
if (this.inkey) { if (this.inkey) {
await this.refreshWalletAccounts() await this.refreshWalletAccounts()
this.handleAddressTypeChanged('wpkh') this.handleAddressTypeChanged(this.addressTypeOptions[1])
} }
} }
}) })