mirrors/core-lightning
1
0
Fork 0
mirror of https://github.com/ElementsProject/lightning.git synced 2025-02-23 06:55:13 +01:00
Code Issues Projects Releases Wiki Activity

wallet: save and restore htlc_basepoint for remote side.

Browse source 
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell 2017-11-15 16:47:39 +10:30 • committed by Christian Decker
parent fe5614a489
commit f71a18241a
3 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
wallet/db.c
View file

@ -58,6 +58,7 @@ char *dbmigrations[] = {
" fundingkey_remote BLOB," " fundingkey_remote BLOB,"
" revocation_basepoint_remote BLOB," " revocation_basepoint_remote BLOB,"
" payment_basepoint_remote BLOB," " payment_basepoint_remote BLOB,"
" htlc_basepoint_remote BLOB,"
" delayed_payment_basepoint_remote BLOB," " delayed_payment_basepoint_remote BLOB,"
" per_commit_remote BLOB," " per_commit_remote BLOB,"
" old_per_commit_remote BLOB," " old_per_commit_remote BLOB,"

21
wallet/wallet.c
View file

@ -434,6 +434,7 @@ static bool wallet_stmt2channel(struct wallet *w, sqlite3_stmt *stmt,
ok &= sqlite3_column_pubkey(stmt, col++, &chan->peer->channel_info->remote_fundingkey); ok &= sqlite3_column_pubkey(stmt, col++, &chan->peer->channel_info->remote_fundingkey);
ok &= sqlite3_column_pubkey(stmt, col++, &channel_info->theirbase.revocation); ok &= sqlite3_column_pubkey(stmt, col++, &channel_info->theirbase.revocation);
ok &= sqlite3_column_pubkey(stmt, col++, &channel_info->theirbase.payment); ok &= sqlite3_column_pubkey(stmt, col++, &channel_info->theirbase.payment);
ok &= sqlite3_column_pubkey(stmt, col++, &channel_info->theirbase.htlc);
ok &= sqlite3_column_pubkey(stmt, col++, &channel_info->theirbase.delayed_payment); ok &= sqlite3_column_pubkey(stmt, col++, &channel_info->theirbase.delayed_payment);
ok &= sqlite3_column_pubkey(stmt, col++, &channel_info->remote_per_commit); ok &= sqlite3_column_pubkey(stmt, col++, &channel_info->remote_per_commit);
ok &= sqlite3_column_pubkey(stmt, col++, &channel_info->old_remote_per_commit); ok &= sqlite3_column_pubkey(stmt, col++, &channel_info->old_remote_per_commit);
@ -441,7 +442,7 @@ static bool wallet_stmt2channel(struct wallet *w, sqlite3_stmt *stmt,
wallet_channel_config_load(w, remote_config_id, &chan->peer->channel_info->their_config); wallet_channel_config_load(w, remote_config_id, &chan->peer->channel_info->their_config);
} else { } else {
/* No channel_info, skip positions in the result */ /* No channel_info, skip positions in the result */
col += 7; col += 8;
} }
/* Load shachain */ /* Load shachain */
@ -482,7 +483,7 @@ static bool wallet_stmt2channel(struct wallet *w, sqlite3_stmt *stmt,
col += 2; col += 2;
} }
assert(col == 32); assert(col == 33);
chan->peer->channel = chan; chan->peer->channel = chan;
@ -499,7 +500,7 @@ const char *channel_fields =
"next_htlc_id, funding_tx_id, funding_tx_outnum, funding_satoshi, " "next_htlc_id, funding_tx_id, funding_tx_outnum, funding_satoshi, "
"funding_locked_remote, push_msatoshi, msatoshi_local, " "funding_locked_remote, push_msatoshi, msatoshi_local, "
"fundingkey_remote, revocation_basepoint_remote, " "fundingkey_remote, revocation_basepoint_remote, "
"payment_basepoint_remote, " "payment_basepoint_remote, htlc_basepoint_remote, "
"delayed_payment_basepoint_remote, per_commit_remote, " "delayed_payment_basepoint_remote, per_commit_remote, "
"old_per_commit_remote, feerate_per_kw, shachain_remote_id, " "old_per_commit_remote, feerate_per_kw, shachain_remote_id, "
"shutdown_scriptpubkey_remote, shutdown_keyidx_local, " "shutdown_scriptpubkey_remote, shutdown_keyidx_local, "
@ -696,6 +697,7 @@ void wallet_channel_save(struct wallet *w, struct wallet_channel *chan){
" fundingkey_remote=?," " fundingkey_remote=?,"
" revocation_basepoint_remote=?," " revocation_basepoint_remote=?,"
" payment_basepoint_remote=?," " payment_basepoint_remote=?,"
" htlc_basepoint_remote=?,"
" delayed_payment_basepoint_remote=?," " delayed_payment_basepoint_remote=?,"
" per_commit_remote=?," " per_commit_remote=?,"
" old_per_commit_remote=?," " old_per_commit_remote=?,"
@ -705,12 +707,13 @@ void wallet_channel_save(struct wallet *w, struct wallet_channel *chan){
sqlite3_bind_pubkey(stmt, 1, &p->channel_info->remote_fundingkey); sqlite3_bind_pubkey(stmt, 1, &p->channel_info->remote_fundingkey);
sqlite3_bind_pubkey(stmt, 2, &p->channel_info->theirbase.revocation); sqlite3_bind_pubkey(stmt, 2, &p->channel_info->theirbase.revocation);
sqlite3_bind_pubkey(stmt, 3, &p->channel_info->theirbase.payment); sqlite3_bind_pubkey(stmt, 3, &p->channel_info->theirbase.payment);
sqlite3_bind_pubkey(stmt, 4, &p->channel_info->theirbase.delayed_payment); sqlite3_bind_pubkey(stmt, 4, &p->channel_info->theirbase.htlc);
sqlite3_bind_pubkey(stmt, 5, &p->channel_info->remote_per_commit); sqlite3_bind_pubkey(stmt, 5, &p->channel_info->theirbase.delayed_payment);
sqlite3_bind_pubkey(stmt, 6, &p->channel_info->old_remote_per_commit); sqlite3_bind_pubkey(stmt, 6, &p->channel_info->remote_per_commit);
sqlite3_bind_int(stmt, 7, p->channel_info->feerate_per_kw); sqlite3_bind_pubkey(stmt, 7, &p->channel_info->old_remote_per_commit);
sqlite3_bind_int64(stmt, 8, p->channel_info->their_config.id); sqlite3_bind_int(stmt, 8, p->channel_info->feerate_per_kw);
sqlite3_bind_int64(stmt, 9, chan->id); sqlite3_bind_int64(stmt, 9, p->channel_info->their_config.id);
sqlite3_bind_int64(stmt, 10, chan->id);
db_exec_prepared(w->db, stmt); db_exec_prepared(w->db, stmt);
} }

1
wallet/wallet_tests.c
View file

@ -269,6 +269,7 @@ static bool test_channel_crud(const tal_t *ctx)
ci.remote_fundingkey = pk; ci.remote_fundingkey = pk;
ci.theirbase.revocation = pk; ci.theirbase.revocation = pk;
ci.theirbase.payment = pk; ci.theirbase.payment = pk;
ci.theirbase.htlc = pk;
ci.theirbase.delayed_payment = pk; ci.theirbase.delayed_payment = pk;
ci.remote_per_commit = pk; ci.remote_per_commit = pk;
ci.old_remote_per_commit = pk; ci.old_remote_per_commit = pk;