Merge branch 'master' of github.com:spesmilo/electrum

This commit is contained in:
ThomasV 2019-11-18 05:12:25 +01:00
commit ade47e331a

View file

@ -34,6 +34,7 @@ import operator
import asyncio import asyncio
import inspect import inspect
from functools import wraps, partial from functools import wraps, partial
from itertools import repeat
from decimal import Decimal from decimal import Decimal
from typing import Optional, TYPE_CHECKING, Dict, List from typing import Optional, TYPE_CHECKING, Dict, List
@ -549,7 +550,7 @@ class Commands:
raise Exception("Cannot specify both 'fee' and 'feerate' at the same time!") raise Exception("Cannot specify both 'fee' and 'feerate' at the same time!")
self.nocheck = nocheck self.nocheck = nocheck
change_addr = self._resolver(change_addr, wallet) change_addr = self._resolver(change_addr, wallet)
domain_addr = None if domain_addr is None else map(self._resolver, domain_addr) domain_addr = None if domain_addr is None else map(self._resolver, domain_addr, repeat(wallet))
final_outputs = [] final_outputs = []
for address, amount in outputs: for address, amount in outputs:
address = self._resolver(address, wallet) address = self._resolver(address, wallet)