mmgen/mmgen-wallet
1
Fork 0
Code Releases 29 Wiki Activity

tx.info: improve header display for memoless swap transactions

Browse source
This commit is contained in:
The MMGen Project 2026-10-15 09:35:47 +00:00
commit c29fd6a828
Signed by: mmgen
GPG key ID: 3F8B1861E32B7DA2
3 changed files with 18 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
mmgen/tx/base_swap.py
View file

@ -15,6 +15,8 @@ from ..addr import CoinAddr
class BaseSwapMethods:
memoless_memo = None
@property
def data_desc(self):
def gen():

31
mmgen/tx/info.py
View file

@ -70,22 +70,21 @@ class TxInfo:
if tx.coin_txid:
yield f' {tx.coin} TxID: {tx.coin_txid.hl()}\n'
if tx.is_swap and not tx.is_memoless:
from ..swap.proto.thorchain import Memo, name
data = (
tx.memoless_memo.encode() if tx.is_memoless else
tx.swap_memo.encode() if tx.proto.is_vm else
tx.data_output.data)
if Memo.is_partial_memo(data):
recv_mmid = getattr(tx, 'swap_recv_addr_mmid', None)
p = Memo.parse(data.decode('ascii'))
yield ' {} {}\n'.format(magenta('DEX Protocol:'), blue(name))
yield ' Swap: {}\n'.format(orange(f'{tx.send_asset.name} => {tx.recv_asset.name}'))
yield ' Dest: {}{}\n'.format(
cyan(p.address),
orange(f' {recv_mmid}') if recv_mmid else '')
if not recv_mmid:
yield yellow(' Warning: swap destination address is not a wallet address!\n')
if tx.is_swap:
yield ' {} {}\n'.format(magenta('DEX Protocol:'), blue(tx.swap_proto_mod.name))
yield ' Swap: {}\n'.format(orange(f'{tx.send_asset.name} => {tx.recv_asset.name}'))
recv_mmid = getattr(tx, 'swap_recv_addr_mmid', None)
if (not tx.is_memoless) or tx.memoless_memo:
data = (
tx.memoless_memo.encode() if tx.is_memoless else
tx.swap_memo.encode() if tx.proto.is_vm else
tx.data_output.data)
if tx.swap_proto_mod.Memo.is_partial_memo(data):
yield ' Dest: {}{}\n'.format(
cyan(tx.swap_proto_mod.Memo.parse(data.decode('ascii')).address),
orange(f' {recv_mmid}') if recv_mmid else '')
if not recv_mmid:
yield yellow(' Warning: swap destination address is not a wallet address!\n')
enl = ('\n', '')[bool(terse)]
yield enl

1
mmgen/tx/online.py
View file

@ -38,6 +38,7 @@ class OnlineSigned(Signed):
die(3, f'registered reference number ({data["reference"]}) does not match ours ({self.refnum})')
if not data['available']:
die(3, f'reference number {self.refnum} is not available')
self.memoless_memo = data['memo']
await self.parse_network_memo(
data = data,
recv_asset_spec = self.swap_recv_asset_spec,