updated python-obelisk for changed to libbitcoin-server wire format.

Author: genjix

examples/chain-test.py

@@ -21,16 +21,21 @@ def txhashes_fetched(ec, hashes):
 def height_fetched(ec, height):
     print "Height:", height
 
+def history_fetched(ec, history):
+    print "History:"
+    for id, hash, index, height, value in history:
+        print id, hash.encode("hex") + ":" + str(index), height, value
 
 def stealth_fetched(ec, result):
     print "Stealth:"
     for ephemkey, address, tx_hash in result:
-        print "  ephemkey:", ephemkey.encode("hex"), "address:", address, \
+        print "  ephemkey:", ephemkey.encode("hex"), \
+            "address:", address.encode("hex"), \
             "tx_hash:", tx_hash.encode("hex")
 
 
 if __name__ == '__main__':
-    client = obelisk.ObeliskOfLightClient("tcp://85.25.198.97:9091")
+    client = obelisk.ObeliskOfLightClient("tcp://localhost:9091")
     tx_hash = "e9a66845e05d5abc0ad04ec80f774a7e" \
               "585c6e8db975962d069a522137b80c1d".decode("hex")
     client.fetch_transaction(tx_hash, tx_fetched)
@@ -40,10 +45,14 @@ def stealth_fetched(ec, result):
     outpoint.index = 0
     client.fetch_spend(outpoint, spend_fetched)
     client.fetch_transaction_index(outpoint.hash, txidx_fetched)
-    client.fetch_block_transaction_hashes(100000, txhashes_fetched)
+    client.fetch_block_transaction_hashes(tx_hash, txhashes_fetched)
     blk_hash = "000000000003ba27aa200b1cecaad478" \
                "d2b00432346c3f1f3986da1afd33e506".decode("hex")
     client.fetch_block_height(blk_hash, height_fetched)
     client.fetch_last_height(height_fetched)
-    client.fetch_stealth((2, 1763505291), stealth_fetched)
+    client.fetch_history("13cbkpKW2DdhEUmeGC2h9HyxbBdtc7Wcth", history_fetched)
+    # You can compare with blockchain db using libbitcoin-blockchain/tools/
+    #  $ stealth_db scan stealth_index stealth_rows 101010101 0
+    client.fetch_stealth("101010101", stealth_fetched)
     reactor.run()
+

examples/fetch_block_header.py

@@ -2,7 +2,7 @@
 from twisted.internet import reactor
 
 if __name__ == '__main__':
-    c = obelisk.ObeliskOfLightClient("tcp://obelisk.unsystem.net:9091")
+    c = obelisk.ObeliskOfLightClient("tcp://localhost:9091")
     h = "000000000019d6689c085ae165831e934ff763ae46a2a6c172b3f1b60a8ce26f"
 
     def cb(*args):

examples/query-blockchain.py

@@ -70,7 +70,7 @@ def header_fetched(ec, header):
 
 
 if __name__ == '__main__':
-    c = obelisk.ObeliskOfLightClient('tcp://85.25.198.97:8081')
+    c = obelisk.ObeliskOfLightClient('tcp://localhost:9091')
     #c.fetch_last_height(print_height)
     #blk_hash = "000000000000000471988cc24941335b" \
     #           "91d35d646971b7de682b4236dc691919".decode("hex")

obelisk/client.py

@@ -21,6 +21,16 @@ def pack_block_index(index):
     else:
         raise ValueError("Unknown index type")
 
+def binary_str_to_bytes(str):
+    split = lambda str: [str[x:x + 8] for x in range(0, len(str), 8)]
+    add_padding = lambda str: str + ((8 - len(str)) * "0")
+    result = []
+    for bin_byte in split(str):
+        bin_byte = add_padding(bin_byte)
+        value = int(bin_byte, 2)
+        assert value < 256
+        result.append(value)
+    return tuple(result)
 
 class ObeliskOfLightClient(ClientBase):
     valid_messages = [
@@ -135,9 +145,9 @@ def fetch_transaction_index(self, tx_hash, cb):
             'blockchain.fetch_transaction_index', data, cb
         )
 
-    def fetch_block_transaction_hashes(self, index, cb):
+    def fetch_block_transaction_hashes(self, tx_hash, cb):
         """Fetches list of transaction hashes in a block by block hash."""
-        data = pack_block_index(index)
+        data = serialize.ser_hash(tx_hash)
         self.send_command(
             'blockchain.fetch_block_transaction_hashes', data, cb
         )
@@ -159,9 +169,12 @@ def fetch_stealth(self, prefix, cb, from_height=0):
         height, and may also include results from earlier blocks.
         It is provided as an optimisation. All results at and after
         from_height are guaranteed to be returned however."""
-        number_bits, bitfield = prefix
-        data = struct.pack('<BII', number_bits, bitfield, from_height)
-        assert len(data) == 9
+        values = binary_str_to_bytes(prefix)
+        number_bits = len(prefix)
+        data = struct.pack('<B', number_bits)
+        for value in values:
+            data += struct.pack('<B', value)
+        data += struct.pack('<I', from_height)
         self.send_command('blockchain.fetch_stealth', data, cb)
 
     # receive handlers
@@ -174,18 +187,15 @@ def _on_fetch_block_header(self, data):
     def _on_fetch_history(self, data):
         error = unpack_error(data)
         # parse results
-        rows = self.unpack_table("<32sIIQ32sII", data, 4)
+        rows = self.unpack_table("<B32sIIQ", data, 4)
         history = []
-        for row in rows:
-            o_hash, o_index, o_height, value, s_hash, s_index, s_height = row
-            o_hash = o_hash[::-1]
-            s_hash = s_hash[::-1]
-            if s_index == 4294967295:
-                s_hash = None
-                s_index = None
-                s_height = None
-            history.append(
-                (o_hash, o_index, o_height, value, s_hash, s_index, s_height))
+        for id, hash, index, height, value in rows:
+            if id == 0:
+                id = False
+            else:
+                id = True
+            hash = hash[::-1]
+            history.append((id, hash, index, height, value))
         return (error, history)
 
     def _on_fetch_last_height(self, data):
@@ -221,11 +231,11 @@ def _on_fetch_block_height(self, data):
 
     def _on_fetch_stealth(self, data):
         error = unpack_error(data)
-        raw_rows = self.unpack_table("<33sB20s32s", data, 4)
+        raw_rows = self.unpack_table("<32s20s32s", data, 4)
         rows = []
-        for ephemkey, address_version, address_hash, tx_hash in raw_rows:
-            address = bitcoin.hash_160_to_bc_address(
-                address_hash[::-1], address_version)
+        for ephemkey, address, tx_hash in raw_rows:
+            ephemkey = ephemkey[::-1]
+            address = address[::-1]
             tx_hash = tx_hash[::-1]
             rows.append((ephemkey, address, tx_hash))
         return (error, rows)