bug fixes related to cross-account / wallet operations

This commit is contained in:
Lex Berezhny 2019-10-02 09:32:27 -04:00
parent 27bbd91635
commit 9e873f77f9

View file

@ -1518,7 +1518,12 @@ class Daemon(metaclass=JSONRPCServerType):
Returns: {Transaction} Returns: {Transaction}
""" """
wallet = self.wallet_manager.get_wallet_or_default(wallet_id) wallet = self.wallet_manager.get_wallet_or_default(wallet_id)
account = wallet.get_account_or_default(account_id) if account_id:
account = wallet.get_account_or_error(account_id)
accounts = [account]
else:
account = wallet.default_account
accounts = wallet.accounts
amount = self.get_dewies_or_error("amount", amount) amount = self.get_dewies_or_error("amount", amount)
if not amount: if not amount:
@ -1539,14 +1544,14 @@ class Daemon(metaclass=JSONRPCServerType):
) )
tx = await Transaction.create( tx = await Transaction.create(
[], outputs, [account], account [], outputs, accounts, account
) )
if not preview: if not preview:
await self.ledger.broadcast(tx) await self.ledger.broadcast(tx)
await self.analytics_manager.send_credits_sent() await self.analytics_manager.send_credits_sent()
else: else:
await account.ledger.release_tx(tx) await self.ledger.release_tx(tx)
return tx return tx