Txs with electrumx ok

cryptos/blocks.py

@@ -27,7 +27,10 @@ def deserialize_header(inp):
 
 
 def mk_merkle_proof(merkle_root, hashes, index):
-    hash = hashes['index']
+    print(merkle_root)
+    print(hashes)
+    print(index)
+    hash = hashes[index]
     try:
         nodes = [safe_from_hex(h)[::-1] for h in hashes]
         if len(nodes) % 2 and len(nodes) > 2:

cryptos/coins/base.py

@@ -126,8 +126,9 @@ def tx_size(self, txobj):
         """
         tx = serialize(txobj)
         size = len(tx) / 2
-        for input in txobj['inputs']:
-            if input.get('new_segwit', False):
+        addresses = txobj.get('addresses', [])
+        for i, input in enumerate(txobj['ins']):
+            if addresses and self.is_new_segwit(addresses[i]):
                 size += self.signature_sizes['p2wpkh']
             elif input.get('segwit', False):
                 size += self.signature_sizes['p2w_p2sh']
@@ -142,7 +143,7 @@ def estimate_fee(self, txobj, numblocks=1, cache=None):
         """
         num_bytes = self.tx_size(txobj)
         per_kb = self.estimate_fee_per_kb(numblocks=numblocks, cache=cache)
-        return num_bytes / 1000 * per_kb
+        return int(num_bytes * per_kb * 100000000)
 
     def block_header(self, *heights):
         """
@@ -230,7 +231,7 @@ def get_merkle(self, *txs):
         return self.rpc_client.get_merkle(*txs)
 
     def get_all_merkle_info(self, *txinfos):
-        return self.rpc_client.get_all_merkle_data(txinfos)
+        return self.rpc_client.get_all_merkle_data(*txinfos)
 
     def merkle_prove(self, *txinfos):
         """
@@ -245,6 +246,10 @@ def merkle_prove(self, *txinfos):
                 proofs.append(proof)
         return proofs
 
+    def merkle_prove_txids(self, *txhashes):
+        txs = self.get_txs(*txhashes)
+        return self.merkle_prove(*txs)
+
     def pushtx(self, tx):
         """
         Push/ Broadcast a transaction to the blockchain
@@ -509,16 +514,17 @@ def mktx_with_change(self, ins, outs, change=None, fee=50000, fee_for_blocks=0,
             raise Exception("Not enough money")
         elif isum > osum + fee + 5430:
             outs += [{"address": change, "value": isum - osum - fee}]
-
+        orig_outs = [out.copy() for out in outs]
+        orig_ins = [inp.copy() for inp in ins]
         txobj = self.mktx(ins, outs, locktime=locktime, sequence=sequence)
 
         if fee_for_blocks:
             fee = self.estimate_fee(txobj, numblocks=fee_for_blocks)
-            for out in txobj['outs']:
+            for out in orig_outs:
                 if out['address'] == change:
                     out['value'] = isum - osum - fee
 
-        return self.mktx(ins, outs)
+        return self.mktx(orig_ins, orig_outs, locktime=locktime, sequence=sequence)
 
     def preparemultitx(self, frm, outs, fee=50000, change_addr=None, fee_for_blocks=0, segwit=False):
         """
@@ -533,12 +539,12 @@ def preparemultitx(self, frm, outs, fee=50000, change_addr=None, fee_for_blocks=
         change_addr = change_addr or frm
         return self.mktx_with_change(unspents2, outs, fee=fee, change=change_addr, fee_for_blocks=fee_for_blocks)
 
-    def preparetx(self, frm, to, value, fee=50000, change_addr=None, segwit=False):
+    def preparetx(self, frm, to, value, fee=50000, fee_for_blocks=0, change_addr=None, segwit=False):
         """
         Prepare a transaction using from and to address_derivations, value and a fee, with change sent back to from address
         """
         outs = [{'address': to, 'value': value}]
-        return self.preparemultitx(frm, outs, fee=fee, change_addr=change_addr, segwit=segwit)
+        return self.preparemultitx(frm, outs, fee=fee, fee_for_blocks=fee_for_blocks, change_addr=change_addr, segwit=segwit)
 
     def preparesignedmultitx(self, privkey, frm, outs, fee=50000, change_addr=None, fee_for_blocks=0):
         """

cryptos/electrumx_client/rpc_async.py

@@ -211,11 +211,15 @@ def get_all_merkle_data(self, *txs):
         get_merkle_requests = self._get_merkle(*txs)
         results = self.rpc_multiple_send_and_wait(block_header_requests + get_merkle_requests)
         merkles = []
-        for result in results:
-            if 'merkle' in result.keys():
-                block_header = next(r for r in results if r['height'] == results['block_height'])
+        block_header_responses = [r['data'] for r in results if 'merkle_root' in r['data'].keys()]
+        merkle_responses = [r['data'] for r in results if 'merkle' in r['data'].keys()]
+        for result in merkle_responses:
+            block_headers = [r for r in block_header_responses if r['block_height'] == result['block_height']]
+            if block_headers:
+                block_header = block_headers[0]
                 result['merkle_root'] = block_header['merkle_root']
                 merkles.append(result)
+                break
         return merkles
 
     def run_command(self, request):

cryptos/transaction.py

@@ -218,7 +218,7 @@ def signature_form(tx, i, script, hashcode=SIGHASH_ALL, segwit=False):
         if j == i:
             newtx['ins'][j]['script'] = script
         else:
-            newtx['ins'][i]['script'] = ""
+            newtx['ins'][j]['script'] = ""
     if segwit or hashcode & 255 == SIGHASH_ALL + SIGHASH_FORKID:
         return uahf_digest(newtx, i)
     elif hashcode == SIGHASH_NONE:
@@ -230,8 +230,7 @@ def signature_form(tx, i, script, hashcode=SIGHASH_ALL, segwit=False):
             out['script'] = ""
     elif hashcode == SIGHASH_ANYONECANPAY:
         newtx["ins"] = [newtx["ins"][i]]
-    else:
-        pass
+
     return serialize(newtx, include_witness=False)
 
 # Making the actual signatures

test_coins.py

@@ -14,10 +14,12 @@ class BaseCoinCase(unittest.TestCase):
     addresses = []
     segwit_addresses = []
     new_segwit_addresses = []
+    txheight = None
     multisig_address = ""
     privkeys = []
     txid = None
-    txheight = None
+    merkle_txhash = None
+    merkle_txheight = None
     tx = None
     txinputs = None
     min_latest_height = 99999999999
@@ -301,7 +303,6 @@ def assertTransactionOK(self):
         #Arbitrarily set send value, change value, receiver and change address
         outputs_value = max_value - self.fee
         send_value = int(outputs_value * 0.1)
-        change_value = int(outputs_value - send_value)
 
         if sender == self.addresses[0]:
             receiver = self.addresses[1]
@@ -313,11 +314,10 @@ def assertTransactionOK(self):
             receiver = self.addresses[0]
             change_address = self.addresses[1]
 
-        outs = [{'value': send_value, 'address': receiver},
-                {'value': change_value, 'address': change_address}]
+        outs = [{'value': send_value, 'address': receiver}]
 
         #Create the transaction using all available unspents as inputs
-        tx = c.mktx(unspents, outs)
+        tx = c.mktx_with_change(unspents, outs, change=change_address, fee_for_blocks=1)
 
         #For testnets, private keys are already available. For live networks, private keys need to be entered manually at this point
         try:
@@ -335,7 +335,9 @@ def assertTransactionOK(self):
         tx = serialize(tx)
         #Push the transaction to the network
         result = c.pushtx(tx)
-        self.assertPushTxOK(result)
+        tx_hash = public_txhash(tx, self.coin.hashcode)
+        self.assertEqual(result, tx_hash)
+        #self.assertPushTxOK(result)
 
     def assertPushTxOK(self, result):
         #For chain.so. Override for other explorers.
@@ -401,8 +403,9 @@ def assertBlockHeadersOK(self):
 
     def assertMerkleProofOK(self):
         coin = self.coin(testnet=self.testnet)
-        proof = coin.merkle_prove(self.txid)
-        self.assertEqual(self.num_merkle_siblings, len(proof['siblings']))
+        proof = coin.merkle_prove({'tx_hash': self.merkle_txhash, 'height': self.merkle_txheight})
+        self.assertEqual(len(proof), 1)
+        #self.assertEqual(self.num_merkle_siblings, len(proof[0]['siblings']))
 
 
 class TestBitcoin(BaseCoinCase):
@@ -436,7 +439,8 @@ class TestBitcoin(BaseCoinCase):
          'value': 100000, 'address': '1A7hMTCfHbQJ1RAtBAVNcUtVsh8i8yFdmT'}]
     min_latest_height = 503351
     txid = "fd3c66b9c981a3ccc40ae0f631f45286e7b31cf6d9afa1acaf8be1261f133690"
-    txheight = 135235
+    merkle_txhash = "8b712b86b4882a61b1031b828a3e1cde5c62ee8896961a513c744588486cc903"
+    merkle_txheight = 509045
     txinputs = [{"output": "7a905da948f1e174c43c6f41b0a0ee338119191de7b92bd1ca3c79f899e5d583:1", 'value': 1000000},
                 {"output": "da1ad82b777c51105d3a24cef253e0301dd08153115013a49e0edf69fd7cdadf:1", 'value': 100000}]
     tx = {'txid': 'fd3c66b9c981a3ccc40ae0f631f45286e7b31cf6d9afa1acaf8be1261f133690'}
@@ -539,6 +543,12 @@ class TestBitcoinTestnet(BaseCoinCase):
     txinputs = [{'output': '1b8ae7a7a9629bbcbc13339bc29b258122c8d8670c54e6883d35c6a699e23a33:1', 'value': 190453372316}]
     tx = {'txid': '1d69dd7a23f18d86f514ff7d8ef85894ad00c61fb29f3f7597e9834ac2569c8c'}
 
+    def test_tx(self):
+        coin = self.coin(testnet=self.testnet, client_kwargs = {'use_ssl': False})
+        tx = coin.preparetx('myLktRdRh3dkK3gnShNj5tZsig6J1oaaJW', 'mnjBtsvoSo6dMvMaeyfaCCRV4hAF8WA2cu', 550000, fee_for_blocks=1)
+        signed_tx = coin.sign(tx, 0, 'cUdNKzomacP2631fa5Q4yHv2fADc8Ueymr5Z5NUSJjVM13igcVJk')
+        result = coin.pushtx(serialize(signed_tx))
+
     def test_subscribe_block_headers(self):
         coin = self.coin(testnet=self.testnet, client_kwargs={'use_ssl': False})
         coin.subscribe_to_block_headers(callback=print)