Browse Source

bugfix for checkoffers

master
Adam Gibson 9 years ago
parent
commit
12ffe32adc
No known key found for this signature in database
GPG Key ID: B3AE09F1E9A3197A
  1. 4
      scripts/joinmarket-qt.py
  2. 3
      scripts/qtsupport.py

4
scripts/joinmarket-qt.py

@ -21,7 +21,7 @@ Some widgets copied and modified from https://github.com/spesmilo/electrum
''' '''
import sys, base64, textwrap, datetime, os, logging import sys, base64, textwrap, datetime, os, logging
import Queue, platform, csv, threading, time import platform, csv, threading, time
from decimal import Decimal from decimal import Decimal
from functools import partial from functools import partial
@ -592,7 +592,7 @@ class SpendTab(QWidget):
mbinfo.append(" ") mbinfo.append(" ")
""" """
mbinfo.append("Sending amount: " + btc_amount_str) mbinfo.append("Sending amount: " + btc_amount_str)
mbinfo.append("to address: " + self.destaddr) mbinfo.append("to address: " + self.taker.my_cj_addr)
mbinfo.append(" ") mbinfo.append(" ")
mbinfo.append("Counterparties chosen:") mbinfo.append("Counterparties chosen:")
mbinfo.append('Name, Order id, Coinjoin fee (sat.)') mbinfo.append('Name, Order id, Coinjoin fee (sat.)')

3
scripts/qtsupport.py

@ -572,9 +572,12 @@ class SchDynamicPage2(QWizardPage):
#by default create three address fields #by default create three address fields
addrLEs = [] addrLEs = []
#for testing #for testing
if jm_single().config.get("BLOCKCHAIN", "blockchain_source") == "regtest":
testaddrs = ["mteaYsGsLCL9a4cftZFTpGEWXNwZyDt5KS", testaddrs = ["mteaYsGsLCL9a4cftZFTpGEWXNwZyDt5KS",
"msFGHeut3rfJk5sKuoZNfpUq9MeVMqmido", "msFGHeut3rfJk5sKuoZNfpUq9MeVMqmido",
"mkZfBXCRPs8fCmwWLrspjCvYozDhK6Eepz"] "mkZfBXCRPs8fCmwWLrspjCvYozDhK6Eepz"]
else:
testaddrs = ["","",""]
for i in range(3): for i in range(3):
layout.addWidget(QLabel("Destination address: " + str(i)), i, 0) layout.addWidget(QLabel("Destination address: " + str(i)), i, 0)
addrLEs.append(QLineEdit(testaddrs[i])) addrLEs.append(QLineEdit(testaddrs[i]))

Loading…
Cancel
Save