Merge commit 'refs/merge-requests/2' of git://gitorious.org/electrum/electrum into...

diff --combined server.py
index fd13130,d0aa41d..bb939f5
--- 1/server.py
--- 2/server.py
+++ b/server.py
@@@ -24,7 -24,7 +24,7 @@@ Todo
  
  import time, socket, operator, thread, ast, sys,re
  import psycopg2, binascii
- import bitcoin
+ import bitcoinrpc
  
  from Abe.abe import hash_to_address, decode_check_address
  from Abe.DataStore import DataStore as Datastore_class
@@@ -60,10 -60,10 +60,10 @@@ peer_list = {
  
  class MyStore(Datastore_class):
  
 -    def safe_sql(self,sql):
 +    def safe_sql(self,sql, params=()):
          try:
              dblock.acquire()
 -            ret = self.selectall(sql)
 +            ret = self.selectall(sql,params)
              dblock.release()
              return ret
          except:
@@@ -123,8 -123,8 +123,8 @@@
                JOIN txin ON (txin.tx_id = tx.tx_id)
                JOIN txout prevout ON (txin.txout_id = prevout.txout_id)
                JOIN pubkey ON (pubkey.pubkey_id = prevout.pubkey_id)
 -             WHERE pubkey.pubkey_hash = '%s'
 -               AND cc.in_longest = 1"""%dbhash)
 +             WHERE pubkey.pubkey_hash = ?
 +               AND cc.in_longest = 1""", (dbhash,))
  
      def get_address_out_rows_memorypool(self, dbhash):
          return self.safe_sql(""" SELECT
@@@ -137,7 -137,7 +137,7 @@@
                JOIN txin ON (txin.tx_id = tx.tx_id)
                JOIN txout prevout ON (txin.txout_id = prevout.txout_id)
                JOIN pubkey ON (pubkey.pubkey_id = prevout.pubkey_id)
 -             WHERE pubkey.pubkey_hash ='%s' """%(dbhash))
 +             WHERE pubkey.pubkey_hash = ? """, (dbhash,))
  
      def get_address_in_rows(self, dbhash):
          return self.safe_sql(""" SELECT
@@@ -156,8 -156,8 +156,8 @@@
                JOIN tx ON (tx.tx_id = block_tx.tx_id)
                JOIN txout ON (txout.tx_id = tx.tx_id)
                JOIN pubkey ON (pubkey.pubkey_id = txout.pubkey_id)
 -             WHERE pubkey.pubkey_hash = '%s'
 -               AND cc.in_longest = 1"""%(dbhash))
 +             WHERE pubkey.pubkey_hash = ?
 +               AND cc.in_longest = 1""", (dbhash,))
  
      def get_address_in_rows_memorypool(self, dbhash):
          return self.safe_sql( """ SELECT
@@@ -169,7 -169,7 +169,7 @@@
                FROM tx
                JOIN txout ON (txout.tx_id = tx.tx_id)
                JOIN pubkey ON (pubkey.pubkey_id = txout.pubkey_id)
 -             WHERE pubkey.pubkey_hash = '%s' """%(dbhash))
 +             WHERE pubkey.pubkey_hash = ? """, (dbhash,))
  
      def get_txpoints(self, addr):
          version, binaddr = decode_check_address(addr)
@@@ -278,8 -278,8 +278,8 @@@
  
  
  def send_tx(tx):
-     import bitcoin
-     conn = bitcoin.connect_to_local()
+     import bitcoinrpc
+     conn = bitcoinrpc.connect_to_local()
      try:
          v = conn.importtransaction(tx)
      except:
@@@ -401,7 -401,7 +401,7 @@@ ds = BCDataStream.BCDataStream(
  
  def memorypool_update(store):
  
-     conn = bitcoin.connect_to_local()
+     conn = bitcoinrpc.connect_to_local()
      try:
          v = conn.getmemorypool()
      except: