From 5744131e186c8b3b580e424f5f71ede45e028dd4 Mon Sep 17 00:00:00 2001
From: ThomasV <thomasv@gitorious>
Date: Sat, 7 Apr 2012 15:13:18 +0200
Subject: [PATCH] callbacks

---
 client/electrum4a.py         |  70 +++++++++++++++++++++--------------
 client/electrum_text_320.png | Bin 4882 -> 4634 bytes
 client/gui_qt.py             |  14 +++++--
 client/interface.py          |  39 +++++++++++--------
 client/wallet.py             |   3 +-
 5 files changed, 77 insertions(+), 49 deletions(-)

diff --git a/client/electrum4a.py b/client/electrum4a.py
index f670ccb79..6ec8fe98c 100755
--- a/client/electrum4a.py
+++ b/client/electrum4a.py
@@ -152,19 +152,18 @@ def main_layout():
     return make_layout("""
         <TextView android:id="@+id/balanceTextView" 
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content" 
+                android:layout_height="70" 
                 android:text=""
+                android:textColor="#ffffffff"
                 android:textAppearance="?android:attr/textAppearanceLarge" 
-                android:gravity="left"
-                android:textColor="0xffffffff"
                 android:padding="10"
-                android:textSize="18" >
+                android:textSize="6pt"
+                android:gravity="center_vertical|center_horizontal|left">
         </TextView>
 
-
         <TextView android:id="@+id/historyTextView" 
                 android:layout_width="match_parent"
-                android:layout_height="70" 
+                android:layout_height="wrap_content" 
                 android:text="Recent transactions"
                 android:textAppearance="?android:attr/textAppearanceLarge" 
                 android:gravity="center_vertical|center_horizontal|center">
@@ -346,7 +345,7 @@ def get_history_layout(n):
     values = get_history_values(n)
     for v in values:
         a,b,c,d = v
-        color = "0xff00ff00" if a == 'v' else "0xffff0000"
+        color = "#ff00ff00" if a == 'v' else "#ffff0000"
         rows += """
         <TableRow>
           <TextView
@@ -391,9 +390,9 @@ def set_history_layout(n):
         droid.fullSetProperty("hl_%d_col1"%i,"text", a)
 
         if a == 'v':
-            droid.fullSetProperty("hl_%d_col1"%i, "textColor","0xff00ff00")
+            droid.fullSetProperty("hl_%d_col1"%i, "textColor","#ff00ff00")
         else:
-            droid.fullSetProperty("hl_%d_col1"%i, "textColor","0xffff0000")
+            droid.fullSetProperty("hl_%d_col1"%i, "textColor","#ffff0000")
 
         droid.fullSetProperty("hl_%d_col2"%i,"text", b)
         droid.fullSetProperty("hl_%d_col3"%i,"text", c)
@@ -402,8 +401,10 @@ def set_history_layout(n):
 
 
 
-def update_layout():
 
+status_text = ''
+def update_layout():
+    global status_text
     if not wallet.interface.is_connected:
         text = "Not connected..."
     elif wallet.blocks == 0:
@@ -415,15 +416,16 @@ def update_layout():
         text = "Balance:"+format_satoshis(c) 
         if u : text += '   [' + format_satoshis(u,True).strip() + ']'
 
-    droid.fullSetProperty("balanceTextView", "text", text)
 
-    if wallet.was_updated and wallet.up_to_date:
-        global first_time_update
-        if not first_time_update:
+    # vibrate if status changed
+    if text != status_text:
+        if status_text and wallet.interface.is_connected and wallet.up_to_date:
             droid.vibrate()
-        else:
-            first_time_update = False
-        wallet.was_updated = False
+        status_text = text
+
+    droid.fullSetProperty("balanceTextView", "text", status_text)
+
+    if wallet.up_to_date:
         set_history_layout(15)
 
 
@@ -513,18 +515,34 @@ def make_new_contact():
             modal_dialog('Invalid address', address)
 
 
+do_refresh = False
+
+def update_callback():
+    global do_refresh
+    print "gui callback", wallet.interface.is_connected, wallet.up_to_date
+    do_refresh = True
+    droid.eventPost("refresh",'z')
+
 def main_loop():
+    global do_refresh
+
     update_layout()
     out = None
     quitting = False
     while out is None:
 
-        event = droid.eventWait(1000).result  # wait for 1 second
-        if not event:
-            update_layout()
+        event = droid.eventWait(1000).result
+        if event is None:
+            if do_refresh: 
+                update_layout()
+                do_refresh = False
             continue
 
-        print "got event in main loop", event
+        print "got event in main loop", repr(event)
+        if event == 'OK': continue
+        if event is None: continue
+        #if event["name"]=="refresh":
+
 
         # request 2 taps before we exit
         if event["name"]=="key":
@@ -578,15 +596,13 @@ def payto_loop():
                 recipient = droid.fullQueryDetail("recipient").result.get('text')
                 label  = droid.fullQueryDetail("label").result.get('text')
                 amount = droid.fullQueryDetail('amount').result.get('text')
-                fee    = '0.001'
                 try:
                     amount = int( 100000000 * Decimal(amount) )
                 except:
                     modal_dialog('Error','invalid amount')
                     continue
 
-                fee    = int( 100000000 * Decimal(fee) )
-                result = pay_to(recipient, amount, fee, label)
+                result = pay_to(recipient, amount, wallet.fee, label)
                 if result:
                     out = 'main'
 
@@ -771,14 +787,12 @@ def settings_loop():
 
     return out
 
-                
 
-menu_commands = ["send", "receive", "settings", "contacts", "main"]
 
 
-first_time_update = True
+menu_commands = ["send", "receive", "settings", "contacts", "main"]
 droid = android.Android()
-wallet = Wallet()
+wallet = Wallet(update_callback)
 
 wallet.set_path("/sdcard/electrum.dat")
 wallet.read()
diff --git a/client/electrum_text_320.png b/client/electrum_text_320.png
index dc6f086440b839c2323ba8692ce8cb13e1f7e310..4a8f8375d22649ba464aec1f98fd196d7d415f42 100644
GIT binary patch
delta 4559
zcmZvgX*|^L*T-kE4B3~TecvJ?%V<y{l&o2Xv5vAck&=DBw$ftDl9Vx#rDn*~m{hi*
zvPAYRiV+fFMumyNJx}gu|0mbObG^<v@6YEt*C|kcq?#|ms}JJ>fj~O^kg@wp<}hwP
zDXrVHS2ga3Y5>BqwpJEy@zd+Ll&?P4vEA)|7>k?<I_DFP@m8x2o#D5Negew_hbtPj
zxSbHDq_^0r@PW;hJcS?_NV*h9j@Tz}PO)Pgdg?9WF4D4o9L4!!BD}X!ozKF+khI0p
zgA>cUK26PW^o`kXt<8g{@PpVJ^ly9m2Fv|X1Bh!s_y93CXA4g8|8Xp3Hg4*?)#%%6
zuHbhybB(?9*7T+XWvo?d(Egg!v44d@2)AMhIYFNi(F7DEc?7lf4t@|y+ZNj~`&lPF
zgFYL@XU4l$TzKQ;C@LtTK8wtYN!E>)jXuh_N_*<kZWCsQj>YY40NiF9bp+&gecGS2
zLFmj4y^VSaRGZ+N2^2+@a2axVTEMLQ`<FjB_pC`p33IMohpQ{KW$uDu3r!pkppT1L
zhh^mOKuTgDCstW-5TbJ70DEMr7qt~Uy}YH`5*m|B6-29&T(ENje`^EE;0Ni6{zv<L
zj%0tjXxcy0<wU#+RLNH4v>#!D-hi3Pq$DnyL@SN>a*pC`&hX@AJXUKlKLus{iZVD%
z4AR3vv?sdEg?l~Hw|~cfipe8dz}p^(uy)h9mv+8TYl2=#u|qk<kMlB`+xeJEL3=j!
z{m-nt`*sim1iKjY@uJs}dE^UfKIY;NQ6b$`58@~!exTBX-+>2vwsF%KEP8pJWW)8k
z+4@i7F=%<DP(-CVO7s2b$nU7?oI`%n(=tDh&#_1QeR7ezxscOG?4eztdySiOu}Iwg
zC)U-)I~AJuPWZIxUPa;x3(hIP@U;kHaMz1}r=p+155hynH9v<NgWHK|XH(-+<y0`b
z$V0*KRba}<(5-fuVHk|fn$YB5*R|BYn2U!9#3C{Cbta<BJR535=__U0P6#yuf<2ac
z3g@0e6*QG%RjHUS)V&)*8Obtp%TD{s9C|{%+**I1uF8$$KQ=#pg=#_z#IR5fvL^>1
zj=8AJD7aSAsq4B4T$*?Gz6%R)P^j|*gcDQ%s`evAzE6OmL_@rE-iSr6bC?w_#~7nW
zaB3Oi)V67+#wtgLS5!}x(oF^8$7)D)DI9AlI=y<HrjL;2Zz;Q}{g)47=FF!of?qC<
ziN}+}MbX&W)U2YbY1u!I;N0<7ZeDB6iT#LLl4OMC40rhtpGk>m9S*rD7&3m3+6Kg|
zI$~HqwOMJ?@r|2L(-1MM(IMjv<bte@Ctv|-&{!9qH`z`g#DsWIGfF)xV}4)n?EdL!
zbW^&&ln{#d@5lc6`$mxS-iFiy6EkqKjR2nGbp!{;((L-j6lnA-aya%u&_>0R7kbr=
zn@Lde(wH&Mebi(uFgy8D$nD@0p#bw|ofpVQH*2neyg}&tmE0A}l!|_2c8Eg9Lr-MA
zUy=eDl(|m^e*1BgYl@SmAs19p_HGunHK>_Ml=|zJ5&Om6Cb`Vrqp5<G0O}B3T=vAU
zYIO4B<}ywCxsHS3+z-Z9N3(nXUb5_;&nt6ZhCgjhB4!K8|LjYnj*q_72RP4^21o5=
z$K%I{8XEw+K6bZPl4en{mb~Q6_tVUKX)0;!(z1bKr2DM$=Q()P`~7{jjA%nC#u>^0
z8}~e+p>OpWO^{p&c1krNig1ZmXL3&F@FKbrj;$cCHjKV8xWw{>twGGz>K=`0dz=>m
z4R8-|3grG%pRWJx`vtfaH^*rY3SP8&oD6-VR>QM?9%jYG3{<nY!!sd9`|YU_ky*Ld
z!0A|#934*Ci_0rU+&z_|RdJbpcg4L9-PspUBS2J}J*0tlq3twNE;WO#BvWFp9k?uX
zA&N^tu}%;1tQ1R|%}hUuVRcax8qKS$z(?2?^4bMjbjuuYkufjVdq2K$<7XVwS1fE%
zS=*xrC^02sJ%Zd?rI_hueh_<Z>};sn6SyCOXaf)J?Do}<@(|vACU6cx+^BkD7M>~`
zB{<Qg%hmQI2be$^wca&LwqrJnNRF@Bl4iAvr$9bK^N?X7(WRv0ddBClmFGQgK>>~0
z_KUWjR)AzfHn`iP%-uLx&1XPsF4T9VTtZrTQjF%&-eMdiQY8z6BtaTL65$IaCd4cC
zAZ#H=)P!(4and+Rr0yYyZAHamnpV+*;lBfkkYXoKS5tw9+8F&$sMyQA`C+vyB{H*C
z^q)`el)QFIFOurn<s6#jyfWPNOMkruSeyoL10ZCR<>@4%9^g{vtYf^>6U_f2+?kmb
zx}d;)dO}@jC$(4{T5R9(m=Jm`u4m_D$oTgwQuC`Tik+iS$%jTxmA}f|{d2+$;)K-I
zy_EN;eggz+hY65(rv`@Q&7rVqN7ZfIG=;Vo+ucyF^MNok$*VV!#X6cY{dX`N?YAv}
zh!`}a-C@rqKy!Y$l2^J%QggYJW1Sw^xwhpyKuBt~PkLTbd&IWHcZmbT>K)1Tj}m6?
zSIC8f+7q?QYaUap*Ej0Cz-v0S4}?aZVQgV>;FDdbEze_|$8Dk6`q7PMGTCsfwvyN-
ztbob5a{#(;-5SICL&Zb?TmU=9d;q|1zf>>Q<n?9*xm!<nm<Qb`USAqR*8dcoX5wIo
zo$?hf(KmcT2N!(w|D=(tT4bQEW$tl}Ua&-0pV8c@rla%A{QTFab8{YuW9W+D_UZwG
zN1xB@tmH%Wc|^0YrQHJr(Qh@Cu*`$YYI<&NMc$n>M9t1jOt5pa>YD5Z20n+MLnU6D
z`loTb_w6*wsG-lqU5g=#?{$a?4;JT73F=%BD4=u7x$IjI%Xt;oIAwKe+h%g4(X-Et
zLm(ss^!Y}uA+skpur3v^Rz>t*uX}gA*HGh&lXPiRgV=vj8yyYY%)!thqDtel%Z5~+
ze-<%Z*uE-zCsX2!K^O>d=Z=LmZZ1PYdRBON<|T%IQyoO)_iXM)@bZ)PlNGqk1S7$9
zF-V69MFq6C5!KPV_S?*rANK&dP`Ybl7U^X#R?1|J9pn}wbL%b073VIf;Ugc0ol*56
zTea<IcJ21}geX0J86pe%>cr4Vq%}w<W1GnxioZH0MJH}Y0ah@dJnW9hYv-ewyg!R9
zuD4BJ>Ha1}?6`wEBNW4`rUt~Y^cf}8B&k&Y<5`t1^AlZBRxp<~!{7-=+j%iR^*P&L
zQ7WMI(XJh#2P5Lr=>3$B(93L-H2`(wg)JQNNa}V+i6HG;zH$~~U2U5tk}+#Lf5irI
z0*j&`$|hj&tej#ER^U2Fr#;D|Ux4?ajH-Dmq;-C|O*7r@s08M02~?JTj4SgNu#ZOW
zn|%CL8L{mknPWcGWo~`Db@#?i^lJLZ@O4@|4UJ)$g^bVJz9Qt9TLqfkHC_|`GRJ?C
zWVPLJ1BrWde{ES!z<FHAWP4p}KS)bS%JzrpZV>PsTwWMc<f0b*l|sEaKroWZ@Hb6P
zO&M#tu^T`$9UvgWQjQJ~=IpNT2eXM(Q%gVq{Xx{vR56qw>ryU-Y8H{IAk<mlryOaH
zm_!-1mGysm%gt`6UOuJ9ZF^32Z6NL?IozG=6`mLflNu!j7aK>2#)~VBkK||C08k)4
zjik0fza(cA@wow~-l3D}kfJr5*xA3P95TMZ-`F8XElC?Jma$$!HH9wdDrJ5)bLioG
zbG%mZ;f$kZTm23XVigHG7rH=aGjf!(!Bf5HedFezG^alQ+B**p*>b0-f5LV*-}Q3u
z>Iaj&;NLHFjtAjZk+%G^jqv<j;94<=rdiw%d%J<|)Lu}h9*U$tyEpW3_e``-!1^jL
z&0v~2gLCgzO{KB@+lL10EdMX5o5F&7nO*E$u;5S42yn`;_%<zNo#Z31M#!0KF8ilF
zxi6^an29x@1)UgVW8Bt}n3GCtrVdXt@kMrf^3aaW%$%R+A{OvrXn;Pay_9mEyR=j8
zDR{diRQ`RYQuW-~2v*cdy-C!T8-LIpxa&Xe&EoL_Bmj%PPY(CRt&`vr0<BV%4!spO
zgUdu~#eT&(P9OHTbhKh&_Gu0sDqrAgpsI6#p}MTb=?Uh+(b9pBXj<t`(Fg_#!(u<f
zqN0W!JnY0c^#DB7CVU~~mNf0!i3FgKMD#28{>R~8Ya@ud7MclfL)~mWFVjv8H4uIi
zxm4%nZgC!XkprZYK7JpQK4;=Im3H9tD{un(S$dwbdAZCTe=kfWE@DAKcw}Ay#`3T%
z80MU224wO_IEtciW2w$Ix}SJKrd=m=soPqlV+>^mkbq%vg^XY2QH;-qAHdTGw>gKu
z8drfjVySu<)(<w2;-3tR;S1*V7rbpc-;SYTucg;vN(+B%L``InIjE(EZ;p9FS~Ujq
zkaxAYPeWu0Iqf<Dg4rpQO$}jnP;w4^x+XW~^jM(9Pf^U}SL9W~!<tj&`QDgvayVJb
z;4VNnB@S>5jCIj%r*4P3uIMeDKE-qBOI1_{zb=8jeAovIo0~Kx9-Ibq<c)XD@!E?a
zX02rovEo8LHn0+DVh+Agk-pb6J2X>s^x)S3fmpDe5AOOjfA`8#K-8_yAvc5bm3=CX
z-*}Scn2*S-uQ~krx7O6W76yWWs(|4S9{{LwQ3_wAyx91)x9|gd^aJ?8Y!&~ooyn3i
zp?36wmeT}i>Z;v*)hYaBSDtbeY4=rVtOgrKRSYYUb}y6k2uInZtEbYwK~gmk#2;?=
zcNE4h9$cVd3yuoJ#SwYFJ}*=pw!emlW8IADqTU&b-koh~Sz!we5wD)MJ~^BN4(>^L
z#>BV44<2cWs`x{$h#B|sTAGDacl&G2v1Jt(2KT3I4$FTY{_rIm-sb{NRkQr7r8Fx<
zYpWz5c5v)^(`;8#<F2EduV2^aD6P7;4L^NR#=MyqhUH{>SiTw;r{din_5v9sk;;|d
z@}pk#5?3<LU6+Em!bVKr9x(CF3^v8ER5Ii^F5|-a0)l!kPBSI)Thio4;DjSgnj`~<
zWA~K63oD2DIP~0VgiO^yVC8*hdPZA<dy=%@(flkQ4zeph8l!0H@R(y|WpO}Y&9O(G
z+zvlz=UK_*72=!M^SCS2Fw`}u9Qgfc|Mv;TyoDvrAd@8am<0H04iH?^=wJn9CP$O*
zQlTu};<klsZ4QvVcG)M(cJV_%X6dpp;)_ki5U7twkRhP-Uxavo`V|WNz>;T6a!oP*
zU8r&tl*_Xr2hX3az2cTI21=1&1js{^;CS|sSjXG0E;=$VDC$602|{Mqsbzj^v4GLN
zYIE=|Tt{7juq3r^SD3KS-iKMTmWG}Bj0pFe`z>#Dx#gBxIpz~^ddH-7j7=0y`pX;|
zGL9;JM7Ad<ueq);egE<42<Ja<3;~KxZrMs@)kw;M<cmlT|G>W3JBpJd)flccET*OK
z+q>V8R6oNq9T<YPYj--r!0=x|yfh^?3aS|23_k$usO{ho_ILKFCGF+kmmZ7cQ;eCB
zNG)ahF&<RVhLWn+8y^_}!H{Iw(J0bqqP;r@()T_(9zvL6N<IV;$*t=1V>5i#IxDRy
zTcDtk7oN?q)X2h&Tw%^{<<7@lulL7Yg)yL(@9LQ;TSGGtc>`GK73l=zgGN5d^}58`
zTtEO&R-z`&Y5yx2&rO(SI)RP{c^`g2#YW=j35`{w9)!o-uVaz*kt9D2QC6~1uXFW{
zoZdZQYNVxo<f-5C?Fa5?wyJA+UZyRi;j5De^KkB>1_k%ztnS+;M*W@R2pRu|0-?ux
zmY1k*NNVc<;T+-lmdlU(-@B*Yfj=_=UUan?9W5n3Q_mX}jr1+MX!Cs^_Lvd*Sz)<`
zSgh~MTbncYIA6TkZST*^Il2ikcyd(Wgj6Zgx)7NeKU(`r4@%kW)+ZJEOG|&R+wCrj
z{bKi3ZmaIACsaEcd8+i4yr|^VOp`JxxXAFen_u3u5pMid<i6?uuRM<b@9jqh?m*BX
X>{n9x)s;o|;s#`E?P&GF5}p2kHxsIR

literal 4882
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
A@&Et;

diff --git a/client/gui_qt.py b/client/gui_qt.py
index 66f61cefc..9c2dc7524 100644
--- a/client/gui_qt.py
+++ b/client/gui_qt.py
@@ -144,6 +144,8 @@ class ElectrumWindow(QMainWindow):
     def __init__(self, wallet):
         QMainWindow.__init__(self)
         self.wallet = wallet
+        self.wallet.gui_callback = self.update_callback
+
         self.funds_error = False
 
         self.tabs = tabs = QTabWidget(self)
@@ -164,11 +166,11 @@ class ElectrumWindow(QMainWindow):
         QShortcut(QKeySequence("Ctrl+Q"), self, self.close)
         QShortcut(QKeySequence("Ctrl+PgUp"), self, lambda: tabs.setCurrentIndex( (tabs.currentIndex() - 1 )%tabs.count() ))
         QShortcut(QKeySequence("Ctrl+PgDown"), self, lambda: tabs.setCurrentIndex( (tabs.currentIndex() + 1 )%tabs.count() ))
-
+        
+        self.connect(self, QtCore.SIGNAL('updatesignal'), self.update_wallet)
 
 
     def connect_slots(self, sender):
-        self.connect(sender, QtCore.SIGNAL('timersignal'), self.update_wallet)
         self.connect(sender, QtCore.SIGNAL('timersignal'), self.check_recipient)
         self.previous_payto_e=''
 
@@ -189,6 +191,9 @@ class ElectrumWindow(QMainWindow):
                     self.payto_e.setText(s)
 
 
+    def update_callback(self):
+        self.emit(QtCore.SIGNAL('updatesignal'))
+
     def update_wallet(self):
         if self.wallet.interface.is_connected:
             if self.wallet.blocks == -1:
@@ -215,8 +220,7 @@ class ElectrumWindow(QMainWindow):
         self.statusBar().showMessage(text)
         self.status_button.setIcon( icon )
 
-        if self.wallet.was_updated and self.wallet.up_to_date:
-            self.wallet.was_updated = False
+        if self.wallet.up_to_date:
             self.textbox.setText( self.wallet.banner )
             self.update_history_tab()
             self.update_receive_tab()
@@ -1059,4 +1063,6 @@ class ElectrumGui():
         if url: w.set_url(url)
         w.app = self.app
         w.connect_slots(s)
+        w.update_wallet()
+
         self.app.exec_()
diff --git a/client/interface.py b/client/interface.py
index 56ad9e612..bdba222dd 100644
--- a/client/interface.py
+++ b/client/interface.py
@@ -316,6 +316,7 @@ class TcpStratumInterface(Interface):
             traceback.print_exc(file=sys.stdout)
 
         self.is_connected = False
+        print "poking"
         self.poke()
 
     def send(self, messages):
@@ -448,27 +449,33 @@ class WalletSynchronizer(threading.Thread):
     def run(self):
         import socket, time
         while True:
-            try:
-                while self.interface.is_connected:
-                    new_addresses = self.wallet.synchronize()
-                    if new_addresses:
-                        self.interface.subscribe(new_addresses)
-                        for addr in new_addresses:
-                            with self.wallet.lock:
-                                self.wallet.addresses_waiting_for_status.append(addr)
-
-                    if self.wallet.is_up_to_date():
+            while self.interface.is_connected:
+                new_addresses = self.wallet.synchronize()
+                if new_addresses:
+                    self.interface.subscribe(new_addresses)
+                    for addr in new_addresses:
+                        with self.wallet.lock:
+                            self.wallet.addresses_waiting_for_status.append(addr)
+
+                if self.wallet.is_up_to_date():
+                    if not self.wallet.up_to_date:
                         self.wallet.up_to_date = True
+                        self.wallet.was_updated = True
                         self.wallet.up_to_date_event.set()
-                    else:
+                else:
+                    if self.wallet.up_to_date:
                         self.wallet.up_to_date = False
+                        self.wallet.was_updated = True
 
-                    response = self.interface.responses.get()#True,100000000000) # workaround so that it can be keyboard interrupted
-                    self.handle_response(response)
-            except socket.error:
-                print "socket error"
-                wallet.interface.is_connected = False
+                if self.wallet.was_updated:
+                    self.wallet.gui_callback()
+                    self.wallet.was_updated = False
+
+                response = self.interface.responses.get()
+                self.handle_response(response)
 
+            print "disconnected, gui callback"
+            self.wallet.gui_callback()
             if self.loop:
                 time.sleep(5)
                 self.start_interface()
diff --git a/client/wallet.py b/client/wallet.py
index d0418ebef..906b53677 100644
--- a/client/wallet.py
+++ b/client/wallet.py
@@ -242,10 +242,11 @@ from interface import DEFAULT_SERVERS
 
 
 class Wallet:
-    def __init__(self):
+    def __init__(self, gui_callback = lambda: None):
 
         self.electrum_version = ELECTRUM_VERSION
         self.seed_version = SEED_VERSION
+        self.gui_callback = gui_callback
 
         self.gap_limit = 5           # configuration
         self.fee = 100000