Check for minimum price before purchase

Author: cpacia

market/contracts.py

@@ -14,7 +14,7 @@
 from bitcoin.core.script import CScript, OP_2, OP_3, OP_CHECKMULTISIG
 from bitcoin.wallet import P2SHBitcoinAddress, P2PKHBitcoinAddress
 from collections import OrderedDict
-from config import DATA_FOLDER
+from config import DATA_FOLDER, TRANSACTION_FEE
 from copy import deepcopy
 from datetime import datetime
 from dht.utils import digest
@@ -410,6 +410,9 @@ def add_purchase_info(self,
                         shipping_amount = float("{0:.8f}".format(float(price) / float(conversion_rate))) * quantity
                 amount_to_pay += shipping_amount
 
+        if round(amount_to_pay, 8) < round(TRANSACTION_FEE / float(100000000), 8):
+            raise Exception("Contract price is below transaction fee.")
+
         order_json["buyer_order"]["order"]["payment"]["amount"] = round(amount_to_pay, 8)
         self.contract["buyer_order"] = order_json["buyer_order"]
 

market/network.py

@@ -833,16 +833,20 @@ def history_fetched(ec, history):
 
                 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
+                dispute_json["dispute_resolution"]["resolution"]["moderator_fee"] = \
+                    round(moderator_fee / float(100000000), 8)
+                dispute_json["dispute_resolution"]["resolution"]["transaction_fee"] = \
+                    round(TRANSACTION_FEE / float(100000000), 8)
                 if float(buyer_percentage) > 0:
                     amt = int(float(buyer_percentage) * satoshis)
-                    dispute_json["dispute_resolution"]["resolution"]["buyer_payout"] = amt
+                    dispute_json["dispute_resolution"]["resolution"]["buyer_payout"] = \
+                        round(amt / float(100000000), 8)
                     outputs.append({'value': amt,
                                     'address': buyer_address})
                 if float(vendor_percentage) > 0:
                     amt = int(float(vendor_percentage) * satoshis)
-                    dispute_json["dispute_resolution"]["resolution"]["vendor_payout"] = amt
+                    dispute_json["dispute_resolution"]["resolution"]["vendor_payout"] = \
+                        round(amt / float(100000000), 8)
                     outputs.append({'value': amt,
                                     'address': vendor_address})
 
@@ -916,15 +920,18 @@ def release_funds(self, order_id):
 
         outputs = []
 
-        outputs.append({'value': int(contract["dispute_resolution"]["resolution"]["moderator_fee"]),
+        outputs.append({'value': int(float(contract["dispute_resolution"]
+                                           ["resolution"]["moderator_fee"]) * 100000000),
                         'address': contract["dispute_resolution"]["resolution"]["moderator_address"]})
 
         if "buyer_payout" in contract["dispute_resolution"]["resolution"]:
-            outputs.append({'value': int(contract["dispute_resolution"]["resolution"]["buyer_payout"]),
+            outputs.append({'value': int(float(contract["dispute_resolution"]
+                                               ["resolution"]["buyer_payout"]) * 100000000),
                             'address': buyer_address})
 
         if "vendor_payout" in contract["dispute_resolution"]["resolution"]:
-            outputs.append({'value': int(contract["dispute_resolution"]["resolution"]["vendor_payout"]),
+            outputs.append({'value': int(float(contract["dispute_resolution"]
+                                               ["resolution"]["vendor_payout"]) * 100000000),
                             'address': vendor_address})
 
         tx = BitcoinTransaction.make_unsigned(outpoints, outputs)
@@ -1025,7 +1032,7 @@ def refund(self, order_id):
         refund_json["refund"]["order_id"] = order_id
         if "moderator" in contract["buyer_order"]["order"]:
             sigs = tx.create_signature(vendor_priv, redeem_script)
-            refund_json["refund"]["value"] = tx.get_out_value()
+            refund_json["refund"]["value"] = round(tx.get_out_value() / float(100000000), 8)
             refund_json["refund"]["signature(s)"] = sigs
         else:
             tx.sign(vendor_priv)

market/protocol.py

@@ -369,9 +369,10 @@ def rpc_refund(self, sender, pubkey, encrypted):
                 outpoints = pickle.loads(self.db.sales.get_outpoint(order_id))
                 refund_address = order["buyer_order"]["order"]["refund_address"]
                 redeem_script = order["buyer_order"]["order"]["payment"]["redeem_script"]
+                value = int(float(refund_json["refund"]["value"]) * 100000000)
                 tx = BitcoinTransaction.make_unsigned(outpoints, refund_address,
                                                       testnet=self.multiplexer.testnet,
-                                                      out_value=long(refund_json["refund"]["value"]))
+                                                      out_value=value)
                 chaincode = order["buyer_order"]["order"]["payment"]["chaincode"]
                 masterkey_b = bitcointools.bip32_extract_key(KeyChain(self.db).bitcoin_master_privkey)
                 buyer_priv = derive_childkey(masterkey_b, chaincode, bitcointools.MAINNET_PRIVATE)

openbazaard.py

@@ -72,7 +72,7 @@ def start_server(keys, first_startup=False):
 
         def on_bootstrap_complete(resp):
             logger.info("bootstrap complete")
-            mserver.get_messages(mlistener)
+            task.LoopingCall(mserver.get_messages, mlistener).start(3600)
             task.LoopingCall(check_unfunded_for_payment, db, libbitcoin_client, nlistener, TESTNET).start(600)
 
         protocol = OpenBazaarProtocol(db, (ip_address, port), nat_type, testnet=TESTNET,