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.

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

[WIP] add Groestl support for c-lightning #3

Merged
merged 14 commits into from
Sep 20, 2018
2 changes: 1 addition & 1 deletion lightningd/chaintopology.c
Original file line number Diff line number Diff line change
Expand Up @@ -526,7 +526,7 @@ static void json_feerates(struct command *cmd,
static const struct json_command feerates_command = {
"feerates",
json_feerates,
"Return feerate estimates, either satoshi-per-kw ({style} perkw) or satoshi-per-kb ({style} perkb)."
"Return feerate estimates, either groshi-per-kw ({style} perkw) or groshi-per-kb ({style} perkb)."
gruve-p marked this conversation as resolved.
Show resolved Hide resolved
};
AUTODATA(json_command, &feerates_command);

Expand Down
2 changes: 1 addition & 1 deletion lightningd/gossip_control.c
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,7 @@ static void json_getroute(struct command *cmd, const char *buffer, const jsmntok
static const struct json_command getroute_command = {
"getroute",
json_getroute,
"Show route to {id} for {msatoshi}, using {riskfactor} and optional {cltv} (default 9). "
"Show route to {id} for {mgro}, using {riskfactor} and optional {cltv} (default 9). "
"If specified search from {fromid} otherwise use this node as source. "
"Randomize the route with up to {fuzzpercent} (0.0 -> 100.0, default 5.0) "
"using {seed} as an arbitrary-size string seed."
Expand Down
2 changes: 1 addition & 1 deletion lightningd/invoice.c
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ static void json_invoice(struct command *cmd,
}

static const struct json_command invoice_command = {
"invoice", json_invoice, "Create an invoice for {msatoshi} with {label} "
"invoice", json_invoice, "Create an invoice for {mgro} with {label} "
"and {description} with optional {expiry} seconds "
"(default 1 hour) and optional {preimage} "
"(default autogenerated)"};
Expand Down
2 changes: 1 addition & 1 deletion lightningd/opening_control.c
Original file line number Diff line number Diff line change
Expand Up @@ -844,6 +844,6 @@ static void json_fund_channel(struct command *cmd,
static const struct json_command fund_channel_command = {
"fundchannel",
json_fund_channel,
"Fund channel with {id} using {satoshi} (or 'all') satoshis, at optional {feerate}"
"Fund channel with {id} using {gro} (or 'all') groshis, at optional {feerate}"
gruve-p marked this conversation as resolved.
Show resolved Hide resolved
};
AUTODATA(json_command, &fund_channel_command);
2 changes: 1 addition & 1 deletion lightningd/payalgo.c
Original file line number Diff line number Diff line change
Expand Up @@ -700,7 +700,7 @@ static void json_pay(struct command *cmd,
static const struct json_command pay_command = {
"pay",
json_pay,
"Send payment specified by {bolt11} with optional {msatoshi} "
"Send payment specified by {bolt11} with optional {mgro} "
"(if and only if {bolt11} does not have amount), "
"{description} (required if {bolt11} uses description hash), "
"{riskfactor} (default 1.0), "
Expand Down
8 changes: 4 additions & 4 deletions wallet/walletrpc.c
Original file line number Diff line number Diff line change
Expand Up @@ -162,8 +162,8 @@ static void json_withdraw(struct command *cmd,
static const struct json_command withdraw_command = {
"withdraw",
json_withdraw,
"Send to {destination} address {satoshi} (or 'all') amount via Bitcoin transaction, at optional {feerate}",
false, "Send funds from the internal wallet to the specified address. Either specify a number of satoshis to send or 'all' to sweep all funds in the internal wallet to the address."
"Send to {destination} address {gro} (or 'all') amount via Groestlcoin transaction, at optional {feerate}",
false, "Send funds from the internal wallet to the specified address. Either specify a number of groshis to send or 'all' to sweep all funds in the internal wallet to the address."
gruve-p marked this conversation as resolved.
Show resolved Hide resolved
};
AUTODATA(json_command, &withdraw_command);

Expand Down Expand Up @@ -435,9 +435,9 @@ static void json_listfunds(struct command *cmd, const char *buffer UNUSED,
c->scid);

/* Poor man's rounding to satoshis to match the unit for outputs */
json_add_u64(response, "channel_sat",
json_add_u64(response, "channel_gros",
gruve-p marked this conversation as resolved.
Show resolved Hide resolved
(c->our_msatoshi + 500)/1000);
json_add_u64(response, "channel_total_sat",
json_add_u64(response, "channel_total_gros",
gruve-p marked this conversation as resolved.
Show resolved Hide resolved
c->funding_satoshi);
json_add_txid(response, "funding_txid",
&c->funding_txid);
Expand Down