heierbtc/lnbits
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor: extract refreshAddresses

Browse Source
This commit is contained in:
Vlad Stan 2022-07-28 18:05:26 +03:00
parent 5e20c4314b
commit 6de8b0b06d
3 changed files with 53 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
lnbits/extensions/watchonly/static/components/address-list/address-list.js
View File

@ -5,30 +5,12 @@ async function addressList(path) {
template,
props: [
'data',
'addresses',
'accounts',
'mempool_endpoint',
'inkey',
'sats-denominated'
],
watch: {
immediate: true,
accounts(newVal, oldVal) {
if ((newVal || []).length !== (oldVal || []).length) {
this.refreshAddresses() // todo await
}
}
},
computed: {
addresses: {
get: function () {
return this.data
},
set: function (value) {
this.$emit('update:data', value)
}
}
},
data: function () {
return {
show: false,
@ -119,49 +101,8 @@ async function addressList(path) {
)
return fAddresses
},
getAddressesForWallet: async function (walletId) {
try {
const {data} = await LNbits.api.request(
'GET',
'/watchonly/api/v1/addresses/' + walletId,
this.inkey
)
return data.map(mapAddressesData)
} catch (err) {
this.$q.notify({
type: 'warning',
message: `Failed to fetch addresses for wallet with id ${walletId}.`,
timeout: 10000
})
LNbits.utils.notifyApiError(err)
}
return []
},
refreshAddresses: async function () {
if (!this.accounts) return
this.addresses = []
for (const {id, type} of this.accounts) {
const newAddresses = await this.getAddressesForWallet(id)
const uniqueAddresses = newAddresses.filter(
newAddr => !this.addresses.find(a => a.address === newAddr.address)
)
const lastAcctiveAddress =
uniqueAddresses.filter(a => !a.isChange && a.hasActivity).pop() ||
{}
uniqueAddresses.forEach(a => {
a.expanded = false
a.accountType = type
a.gapLimitExceeded =
!a.isChange &&
a.addressIndex >
lastAcctiveAddress.addressIndex + DEFAULT_RECEIVE_GAP_LIMIT
})
this.addresses.push(...uniqueAddresses)
}
this.$emit('update:addresses', this.addresses)
},
scanAddress: async function (addressData) {
this.$emit('scan:address', addressData)
},
@ -171,7 +112,7 @@ async function addressList(path) {
},
created: async function () {
await this.refreshAddresses()
}
})
}

53
lnbits/extensions/watchonly/static/js/index.js
View File

@ -150,7 +150,7 @@ const watchOnly = async () => {
initPaymentData: async function () {
if (!this.payment.show) return
await this.$refs.addressList.refreshAddresses()
await this.refreshAddresses()
},
goToPaymentView: async function () {
@ -171,7 +171,7 @@ const watchOnly = async () => {
//################### UTXOs ###################
scanAllAddresses: async function () {
await this.$refs.addressList.refreshAddresses()
await this.refreshAddresses()
this.history = []
let addresses = this.addresses
this.utxos.data = []
@ -181,7 +181,7 @@ const watchOnly = async () => {
for (let i = 0; i < 1000 && addresses.length; i++) {
await this.updateUtxosForAddresses(addresses)
const oldAddresses = this.addresses.slice()
await this.$refs.addressList.refreshAddresses()
await this.refreshAddresses()
const newAddresses = this.addresses.slice()
// check if gap addresses have been extended
addresses = newAddresses.filter(
@ -211,6 +211,50 @@ const watchOnly = async () => {
timeout: 10000
})
},
refreshAddresses: async function () {
if (!this.walletAccounts) return
this.addresses = []
for (const {id, type} of this.walletAccounts) {
const newAddresses = await this.getAddressesForWallet(id)
const uniqueAddresses = newAddresses.filter(
newAddr => !this.addresses.find(a => a.address === newAddr.address)
)
const lastAcctiveAddress =
uniqueAddresses.filter(a => !a.isChange && a.hasActivity).pop() ||
{}
uniqueAddresses.forEach(a => {
a.expanded = false
a.accountType = type
a.gapLimitExceeded =
!a.isChange &&
a.addressIndex >
lastAcctiveAddress.addressIndex + DEFAULT_RECEIVE_GAP_LIMIT
})
this.addresses.push(...uniqueAddresses)
}
console.log('### refreshAddresses', this.addresses)
this.$emit('update:addresses', this.addresses)
},
getAddressesForWallet: async function (walletId) {
try {
const {data} = await LNbits.api.request(
'GET',
'/watchonly/api/v1/addresses/' + walletId,
this.g.user.wallets[0].inkey
)
return data.map(mapAddressesData)
} catch (error) {
this.$q.notify({
type: 'warning',
message: `Failed to fetch addresses for wallet with id ${walletId}.`,
timeout: 10000
})
LNbits.utils.notifyApiError(error)
}
return []
},
updateUtxosForAddresses: async function (addresses = []) {
this.scan = {scanning: true, scanCount: addresses.length, scanIndex: 0}
@ -315,7 +359,7 @@ const watchOnly = async () => {
updateAccounts: async function (accounts) {
this.walletAccounts = accounts
// await this.refreshAddressesxx() // todo: automatic now?
await this.refreshAddresses()
await this.scanAddressWithAmount()
},
showAddressDetails: function (addressData) {
@ -331,6 +375,7 @@ const watchOnly = async () => {
},
created: async function () {
if (this.g.user.wallets.length) {
await this.refreshAddresses()
await this.scanAddressWithAmount()
}
}

2
lnbits/extensions/watchonly/templates/watchonly/index.html
View File

@ -87,7 +87,7 @@
<q-tab-panel name="addresses">
<address-list
ref="addressList"
:data.sync="addresses"
:addresses="addresses"
:accounts="walletAccounts"
:mempool_endpoint="config.data.mempool_endpoint"
:sats-denominated="config.data.sats_denominated"