From: Ovidiu Constantin <ovidiu.constantin@livigent.com>
Date: Wed, 23 Nov 2011 14:21:29 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Url: https://git.novaco.in/?a=commitdiff_plain;h=25204beba2ee0c96e7e52684ded43455dfbb81af;hp=-c;p=electrum-server.git

Merge remote-tracking branch 'upstream/master'
---

25204beba2ee0c96e7e52684ded43455dfbb81af
diff --combined server.py
index d0aa41d,fd13130..bb939f5
--- a/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: