Skip to content

Nifty/guess to remote anchors #6

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

Open
wants to merge 2 commits into
base: nifty/guess_to_remote_anchors
Choose a base branch
from
Open

Nifty/guess to remote anchors #6

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
f4d603a
Guess to remote: fix whitespace, spelling, reference BOLT PR 878
endothermicdev Mar 28, 2022
30fe315
Guess to remote: extract address and spelling.
endothermicdev Mar 28, 2022
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
66 changes: 33 additions & 33 deletions bitcoin/psbt.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -445,42 +445,42 @@ bool psbt_input_set_redeemscript(struct wally_psbt *psbt, size_t in,
void psbt_input_hash_for_sig(struct wally_psbt *psbt, size_t in,
struct sha256_double *dest)
{
int ret;
u8 value[9];
u64 input_val_sats;
struct amount_sat input_amt;
int flags = WALLY_TX_FLAG_USE_WITNESS;
int ret;
u8 value[9];
u64 input_val_sats;
struct amount_sat input_amt;
int flags = WALLY_TX_FLAG_USE_WITNESS;

input_amt = psbt_input_get_amount(psbt, in);
input_val_sats = input_amt.satoshis; /* Raw: type conversion */
input_amt = psbt_input_get_amount(psbt, in);
input_val_sats = input_amt.satoshis; /* Raw: type conversion */

/* Wally can allocate here, iff tx doesn't fit on stack */
tal_wally_start();
if (is_elements(chainparams)) {
ret = wally_tx_confidential_value_from_satoshi(input_val_sats, value, sizeof(value));
assert(ret == WALLY_OK);
ret = wally_tx_get_elements_signature_hash(
psbt->tx, in,
/* assume segwit */
psbt->inputs[in].witness_script,
psbt->inputs[in].witness_script_len,
value, sizeof(value),
psbt->inputs[in].sighash,
flags, dest->sha.u.u8,
sizeof(*dest));
assert(ret == WALLY_OK);
} else {
ret = wally_tx_get_btc_signature_hash(
psbt->tx, in,
/* assume segwit */
psbt->inputs[in].witness_script,
psbt->inputs[in].witness_script_len,
input_val_sats,
psbt->inputs[in].sighash,
flags, dest->sha.u.u8, sizeof(*dest));
assert(ret == WALLY_OK);
}
tal_wally_end(psbt);
tal_wally_start();
if (is_elements(chainparams)) {
ret = wally_tx_confidential_value_from_satoshi(input_val_sats, value, sizeof(value));
assert(ret == WALLY_OK);
ret = wally_tx_get_elements_signature_hash(
psbt->tx, in,
/* assume segwit */
psbt->inputs[in].witness_script,
psbt->inputs[in].witness_script_len,
value, sizeof(value),
psbt->inputs[in].sighash,
flags, dest->sha.u.u8,
sizeof(*dest));
assert(ret == WALLY_OK);
} else {
ret = wally_tx_get_btc_signature_hash(
psbt->tx, in,
/* assume segwit */
psbt->inputs[in].witness_script,
psbt->inputs[in].witness_script_len,
input_val_sats,
psbt->inputs[in].sighash,
flags, dest->sha.u.u8, sizeof(*dest));
assert(ret == WALLY_OK);
}
tal_wally_end(psbt);
}

struct amount_sat psbt_input_get_amount(const struct wally_psbt *psbt,
Expand Down
4 changes: 2 additions & 2 deletions tests/test_wallet.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1218,7 +1218,7 @@ def test_hsmtool_guess_to_remote_non_anchor(node_factory, bitcoind):
sync_blockheight(bitcoind, [l2])
log = l2.daemon.wait_for_log(r'Script to-them: ')
m = re.search(r'Script to-them: ([a-f0-9]{44})', log)
onchain_addr = bitcoind.rpc.decodescript(m.group(1))['address']
onchain_addr = bitcoind.rpc.decodescript(m.group(1))['segwit']['address']

# Now try using the hsmtool to find the thing
hsm_path = os.path.join(l1.daemon.lightning_dir, TEST_NETWORK, "hsm_secret")
Expand All @@ -1234,7 +1234,7 @@ def test_hsmtool_guess_to_remote_non_anchor(node_factory, bitcoind):

@unittest.skipIf(TEST_NETWORK == 'liquid-regtest', 'v2 channels not available')
@pytest.mark.openchannel('v2')
@pytest.mark.developer("requres 'dev-queryrates'")
@pytest.mark.developer("requires 'dev-queryrates'")
def test_hsmtool_guess_to_remote_anchor(node_factory, bitcoind):
opts = {'funder-policy': 'match', 'funder-policy-mod': 100,
'lease-fee-base-msat': '100sat', 'lease-fee-basis': 100,
Expand Down
4 changes: 2 additions & 2 deletions tools/hsmtool.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -432,7 +432,7 @@ static int guess_to_remote(const char *address, struct node_id *node_id,
* block csv lock.
* <remote_pubkey> OP_CHECKSIGVERIFY 1 OP_CHECKSEQUENCEVERIFY
*/
/* BOLT- #3
/* BOLT-cb691777fb4263eadb68e6a8331ccadd14aa9793 #3
* ##### Leased channel (`option_will_fund`)
*
* If a `lease` applies to the channel, the `to_remote` output
Expand Down Expand Up @@ -464,7 +464,7 @@ static int guess_to_remote(const char *address, struct node_id *node_id,
}
}

printf("Could not find any basepoint matching the provided witness programm.\n"
printf("Could not find any basepoint matching the provided witness program.\n"
"Are you sure that the channel used `option_static_remotekey` ?\n");
return 1;
}
Expand Down