Merge a6878b8 into merged_master (Elements PR ElementsProject#696)

Author: apoelstra

src/rpc/util.cpp

@@ -119,7 +119,7 @@ std::string HelpExampleCli(const std::string& methodname, const std::string& arg
 std::string HelpExampleRpc(const std::string& methodname, const std::string& args)
 {
     return "> curl --user myusername --data-binary '{\"jsonrpc\": \"1.0\", \"id\":\"curltest\", "
-        "\"method\": \"" + methodname + "\", \"params\": [" + args + "] }' -H 'content-type: text/plain;' http://127.0.0.1:8332/\n";
+        "\"method\": \"" + methodname + "\", \"params\": [" + args + "] }' -H 'content-type: text/plain;' http://127.0.0.1:7041/\n";
 }
 
 // Converts a hex string to a public key if possible

src/wallet/rpcwallet.cpp

@@ -5183,7 +5183,7 @@ UniValue sendtomainchain_pak(const JSONRPCRequest& request)
 
     bool subtract_fee = false;
     if (request.params.size() > 2) {
-        subtract_fee = request.params[1].get_bool();
+        subtract_fee = request.params[2].get_bool();
     }
 
     CPAKList paklist = g_paklist_blockchain;

test/functional/feature_pak.py

@@ -410,6 +410,10 @@ def compare(actual, expected):
                     raise Exception("Found unexpected peg-out output")
         assert peg_out_found
 
+        # Test that subtracting fee from output works
+        self.nodes[i_pak1].sendtomainchain("", self.nodes[i_pak1].getbalance()["bitcoin"], True)
+        assert_equal(self.nodes[i_pak1].getbalance()["bitcoin"], 0)
+
         # TODO: create rawsendtomainchain to do transaction surgery for testing
 
 if __name__ == '__main__':