mirror of
https://github.com/lnbits/lnbits.git
synced 2025-07-25 20:22:26 +02:00
fix: output address on confirmation based on selected network
This commit is contained in:
@@ -80,6 +80,7 @@ class CreatePsbt(BaseModel):
|
|||||||
class ExtractPsbt(BaseModel):
|
class ExtractPsbt(BaseModel):
|
||||||
psbtBase64 = "" # // todo snake case
|
psbtBase64 = "" # // todo snake case
|
||||||
inputs: List[TransactionInput]
|
inputs: List[TransactionInput]
|
||||||
|
network = "Mainnet"
|
||||||
|
|
||||||
|
|
||||||
class SignedTransaction(BaseModel):
|
class SignedTransaction(BaseModel):
|
||||||
|
@@ -11,7 +11,8 @@ async function payment(path) {
|
|||||||
'mempool-endpoint',
|
'mempool-endpoint',
|
||||||
'sats-denominated',
|
'sats-denominated',
|
||||||
'serial-signer-ref',
|
'serial-signer-ref',
|
||||||
'adminkey'
|
'adminkey',
|
||||||
|
'network'
|
||||||
],
|
],
|
||||||
watch: {
|
watch: {
|
||||||
immediate: true,
|
immediate: true,
|
||||||
@@ -279,7 +280,8 @@ async function payment(path) {
|
|||||||
this.adminkey,
|
this.adminkey,
|
||||||
{
|
{
|
||||||
psbtBase64,
|
psbtBase64,
|
||||||
inputs: this.tx.inputs
|
inputs: this.tx.inputs,
|
||||||
|
network: this.network
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
return data
|
return data
|
||||||
|
@@ -136,6 +136,7 @@
|
|||||||
:adminkey="g.user.wallets[0].adminkey"
|
:adminkey="g.user.wallets[0].adminkey"
|
||||||
:serial-signer-ref="$refs.serialSigner"
|
:serial-signer-ref="$refs.serialSigner"
|
||||||
:sats-denominated="config.sats_denominated"
|
:sats-denominated="config.sats_denominated"
|
||||||
|
:network="config.network"
|
||||||
@broadcast-done="handleBroadcastSuccess"
|
@broadcast-done="handleBroadcastSuccess"
|
||||||
></payment>
|
></payment>
|
||||||
<!-- todo: no more utxos.data -->
|
<!-- todo: no more utxos.data -->
|
||||||
|
@@ -4,6 +4,7 @@ from http import HTTPStatus
|
|||||||
import httpx
|
import httpx
|
||||||
from embit import finalizer, script
|
from embit import finalizer, script
|
||||||
from embit.ec import PublicKey
|
from embit.ec import PublicKey
|
||||||
|
from embit.networks import NETWORKS
|
||||||
from embit.psbt import PSBT, DerivationPath
|
from embit.psbt import PSBT, DerivationPath
|
||||||
from embit.transaction import Transaction, TransactionInput, TransactionOutput
|
from embit.transaction import Transaction, TransactionInput, TransactionOutput
|
||||||
from fastapi import Query, Request
|
from fastapi import Query, Request
|
||||||
@@ -295,6 +296,7 @@ async def api_psbt_create(
|
|||||||
async def api_psbt_extract_tx(
|
async def api_psbt_extract_tx(
|
||||||
data: ExtractPsbt, w: WalletTypeInfo = Depends(require_admin_key)
|
data: ExtractPsbt, w: WalletTypeInfo = Depends(require_admin_key)
|
||||||
):
|
):
|
||||||
|
network = NETWORKS["main"] if data.network == "Mainnet" else NETWORKS["test"]
|
||||||
res = SignedTransaction()
|
res = SignedTransaction()
|
||||||
try:
|
try:
|
||||||
psbt = PSBT.from_base64(data.psbtBase64)
|
psbt = PSBT.from_base64(data.psbtBase64)
|
||||||
@@ -316,7 +318,7 @@ async def api_psbt_extract_tx(
|
|||||||
|
|
||||||
for out in transaction.vout:
|
for out in transaction.vout:
|
||||||
tx["outputs"].append(
|
tx["outputs"].append(
|
||||||
{"amount": out.value, "address": out.script_pubkey.address()}
|
{"amount": out.value, "address": out.script_pubkey.address(network)}
|
||||||
)
|
)
|
||||||
res.tx_json = json.dumps(tx)
|
res.tx_json = json.dumps(tx)
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
|
Reference in New Issue
Block a user