Merge remote-tracking branch 'upstream/master'

Author: Tom Galloway

market/network.py

@@ -822,33 +822,32 @@ def history_fetched(ec, history):
                                 outpoints.append(o)
 
                     satoshis -= TRANSACTION_FEE
-                    moderator_fee = round(float(moderator_percentage * satoshis))
+                    moderator_fee = int(float(moderator_percentage) * satoshis)
                     satoshis -= moderator_fee
 
                     outputs.append({'value': moderator_fee, 'address': moderator_address})
                     dispute_json["dispute_resolution"]["resolution"]["moderator_address"] = moderator_address
                     dispute_json["dispute_resolution"]["resolution"]["moderator_fee"] = moderator_fee
                     dispute_json["dispute_resolution"]["resolution"]["transaction_fee"] = TRANSACTION_FEE
                     if float(buyer_percentage) > 0:
-                        amt = round(float(buyer_percentage * satoshis))
+                        amt = int(float(buyer_percentage) * satoshis)
                         dispute_json["dispute_resolution"]["resolution"]["buyer_payout"] = amt
                         outputs.append({'value': amt,
                                         'address': buyer_address})
                     if float(vendor_percentage) > 0:
-                        amt = round(float(vendor_percentage * satoshis))
+                        amt = int(float(vendor_percentage) * satoshis)
                         dispute_json["dispute_resolution"]["resolution"]["vendor_payout"] = amt
                         outputs.append({'value': amt,
                                         'address': vendor_address})
-                    # FIXME: transactions need to take in multipe outputs now
-                    tx = BitcoinTransaction.make_unsigned(outpoints, payment_address)
+
+                    tx = BitcoinTransaction.make_unsigned(outpoints, outputs,
+                                                          testnet=self.protocol.multiplexer.testnet)
                     chaincode = contract["buyer_order"]["order"]["payment"]["chaincode"]
                     redeem_script = str(contract["buyer_order"]["order"]["payment"]["redeem_script"])
                     masterkey_m = bitcointools.bip32_extract_key(KeyChain(self.db).bitcoin_master_privkey)
                     moderator_priv = derive_childkey(masterkey_m, chaincode, bitcointools.MAINNET_PRIVATE)
-                    signatures = []
-                    for index in range(0, len(outpoints)):
-                        sig = bitcointools.multisign(tx, index, redeem_script, moderator_priv)
-                        signatures.append({"input_index": index, "signature": sig})
+
+                    signatures = tx.create_signature(moderator_priv, redeem_script)
                     dispute_json["dispute_resolution"]["resolution"]["order_id"] = order_id
                     dispute_json["dispute_resolution"]["resolution"]["tx_signatures"] = signatures
                     dispute_json["dispute_resolution"]["resolution"]["claim"] = self.db.Cases().get_claim(order_id)

market/transactions.py

@@ -14,10 +14,7 @@
 
 class BitcoinTransaction(object):
     """
-    A Bitcoin transaction object which is used for building, signing, and broadcasting
-    Bitcoin transactions. It is designed primarily to take in a list of outpoints
-    (all paid to the same address) and payout to a single address. At present this is the
-    only way we make transactions in OpenBazaar so more advanced functionality is not needed.
+    A Bitcoin transaction object which is used for building, signing, and broadcasting Bitcoin transactions.
     """
     def __init__(self, tx, testnet=False):
         """
@@ -31,13 +28,14 @@ def __init__(self, tx, testnet=False):
         self.log = Logger(system=self)
 
     @classmethod
-    def make_unsigned(cls, outpoints, output_address, tx_fee=TRANSACTION_FEE, testnet=False, out_value=None):
+    def make_unsigned(cls, outpoints, outputs, tx_fee=TRANSACTION_FEE, testnet=False, out_value=None):
         """
         Build an unsigned transaction.
 
         Args:
             outpoints: A `list` of `dict` objects which contain a txid, vout, value, and scriptPubkey.
-            output_address: The address to send the full value (minus the tx fee) of the inputs to.
+            outputs: If a single address the full value of the inputs (minus the tx fee) will be sent there.
+                Otherwise it should be a `list` of `dict` objects containing address and value.
             tx_fee: The Bitcoin network fee to be paid on this transaction.
             testnet: Should this transaction be built for testnet?
             out_value: used if you want to specify a specific output value otherwise the full value
@@ -53,12 +51,19 @@ def make_unsigned(cls, outpoints, output_address, tx_fee=TRANSACTION_FEE, testne
             txin.scriptSig = CScript(x(outpoint["scriptPubKey"]))
             txins.append(txin)
 
-        # build the output
-        value = out_value if out_value is not None else (in_value - tx_fee)
-        txout = CMutableTxOut(value, CBitcoinAddress(output_address).to_scriptPubKey())
+        # build the outputs
+        txouts = []
+        if isinstance(outputs, list):
+            for output in outputs:
+                value = output["value"]
+                address = output["address"]
+                txouts.append(CMutableTxOut(value, CBitcoinAddress(address).to_scriptPubKey()))
+        else:
+            value = out_value if out_value is not None else (in_value - tx_fee)
+            txouts.append(CMutableTxOut(value, CBitcoinAddress(outputs).to_scriptPubKey()))
 
         # make the transaction
-        tx = CMutableTransaction(txins, [txout])
+        tx = CMutableTransaction(txins, txouts)
 
         return BitcoinTransaction(tx)