Merge petertodd#89: Adds sendtoaddress options comments, subtractfeefromamount

bd200a0 Adds subtractfeefromamount to sendmany and sendtoaddress calls (ddrager)

Author: petertodd

bitcoin/rpc.py

@@ -545,18 +545,18 @@ def sendrawtransaction(self, tx, allowhighfees=False):
             r = self._call('sendrawtransaction', hextx)
         return lx(r)
 
-    def sendmany(self, fromaccount, payments, minconf=1, comment=''):
+    def sendmany(self, fromaccount, payments, minconf=1, comment='', subtractfeefromamount=False):
         """Sent amount to a given address"""
         json_payments = {str(addr):float(amount)/COIN
                          for addr, amount in payments.items()}
-        r = self._call('sendmany', fromaccount, json_payments, minconf, comment)
+        r = self._call('sendmany', fromaccount, json_payments, minconf, comment, subtractfeefromamount)
         return lx(r)
 
-    def sendtoaddress(self, addr, amount):
+    def sendtoaddress(self, addr, amount, comment='', commentto='', subtractfeefromamount=False):
         """Sent amount to a given address"""
         addr = str(addr)
         amount = float(amount)/COIN
-        r = self._call('sendtoaddress', addr, amount)
+        r = self._call('sendtoaddress', addr, amount, comment, commentto, subtractfeefromamount)
         return lx(r)
 
     def signrawtransaction(self, tx, *args):