Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[0.18 backport] sendtomainchain with pak and subtract fee from output fix #699

Merged
merged 2 commits into from
Sep 3, 2019
Merged

[0.18 backport] sendtomainchain with pak and subtract fee from output fix #699

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e3b750d
Fix sendtomainchain with pak when subtracting fee from output
instagibbs Aug 30, 2019
299c3fc
fix HelpExamplRPC port for liquidv1 vs bitcoin mainnet
instagibbs Aug 30, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/rpc/server.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -590,7 +590,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";
}

void RPCSetTimerInterfaceIfUnset(RPCTimerInterface *iface)
Expand Down
2 changes: 1 addition & 1 deletion src/wallet/rpcwallet.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5190,7 +5190,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;
Expand Down
4 changes: 4 additions & 0 deletions test/functional/feature_pak.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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__':
Expand Down