AaronFiore/electrum
1
0
Fork 0
Code Activity

lightning: do not require lock for broadcast tx, it is thread-safe

Browse Source
This commit is contained in:
Janus
2018-03-20 14:51:55 +01:00
committed by ThomasV
parent 311c53ef1d
commit 76bd120bdf
1 changed files with 11 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
lib/lightning.py
View File

@@ -197,12 +197,7 @@ def SendOutputs(json):
m.resultHash = "" m.resultHash = ""
return json_format.MessageToJson(m) return json_format.MessageToJson(m)
suc, has = NETWORK.broadcast(tx) publishTxThread(tx)
if not suc:
m.success = False
m.error = "electrum/lightning/SendOutputs: Could not broadcast: " + str(has)
m.resultHash = ""
return json_format.MessageToJson(m)
m.success = True m.success = True
m.error = "" m.error = ""
m.resultHash = tx.txid() m.resultHash = tx.txid()
@@ -475,21 +470,21 @@ def signOutputRaw(tx, signDesc):
signDesc.output.value, signDesc.witnessScript, sigHashAll, pri2) signDesc.output.value, signDesc.witnessScript, sigHashAll, pri2)
return sig[:len(sig) - 1] return sig[:len(sig) - 1]
async def PublishTransaction(json): def publishTxThread(tx):
req = rpc_pb2.PublishTransactionRequest() global NETWORK
json_format.Parse(json, req) def target(tx, NETWORK):
global NETWORK, globLock
tx = transaction.Transaction(binascii.hexlify(req.tx).decode("utf-8"))
def target(tx, NETWORK, globLock):
globLock.acquire()
try: try:
res = NETWORK.broadcast(tx) res = NETWORK.broadcast(tx)
print("PUBLISH TRANSACTION IN SEPARATE THREAD PRODUCED", res) print("PUBLISH TRANSACTION IN SEPARATE THREAD PRODUCED", res)
except: except:
traceback.print_exc() traceback.print_exc()
finally: threading.Thread(target=target, args=(tx, NETWORK)).start()
globLock.release()
threading.Thread(target=target, args=(tx, NETWORK, globLock)).start() async def PublishTransaction(json):
req = rpc_pb2.PublishTransactionRequest()
json_format.Parse(json, req)
tx = transaction.Transaction(binascii.hexlify(req.tx).decode("utf-8"))
publishTxThread(tx)
m = rpc_pb2.PublishTransactionResponse() m = rpc_pb2.PublishTransactionResponse()
m.success = True m.success = True
m.error = "" m.error = ""