From 3d4c5c359ed9aceb0cbccf039a5d1c6ae755a76a Mon Sep 17 00:00:00 2001 From: Oliver Gugger Date: Sun, 11 Sep 2022 19:21:18 +0200 Subject: [PATCH] multi: bump lnd channeldb version to v0.15.1-beta --- cmd/chantools/deletepayments.go | 2 +- cmd/chantools/dropchannelgraph.go | 4 ++-- cmd/chantools/migratedb.go | 2 +- cmd/chantools/removechannel.go | 2 +- doc/chantools_deletepayments.md | 2 +- doc/chantools_dropchannelgraph.md | 14 +++++++++----- doc/chantools_dumpchannels.md | 2 ++ doc/chantools_fakechanbackup.md | 2 +- doc/chantools_migratedb.md | 2 +- doc/chantools_removechannel.md | 2 +- doc/chantools_sweeptimelockmanual.md | 2 ++ doc/chantools_zombierecovery_findmatches.md | 4 +++- go.mod | 9 +++++---- go.sum | 13 +++++++++---- 14 files changed, 39 insertions(+), 23 deletions(-) diff --git a/cmd/chantools/deletepayments.go b/cmd/chantools/deletepayments.go index 943a901..57556af 100644 --- a/cmd/chantools/deletepayments.go +++ b/cmd/chantools/deletepayments.go @@ -25,7 +25,7 @@ If only the failed payments should be deleted (and not the successful ones), the CAUTION: Running this command will make it impossible to use the channel DB with an older version of lnd. Downgrading is not possible and you'll need to -run lnd v0.14.1-beta or later after using this command!'`, +run lnd v0.15.1-beta or later after using this command!'`, Example: `chantools deletepayments --failedonly \ --channeldb ~/.lnd/data/graph/mainnet/channel.db`, RunE: cc.Execute, diff --git a/cmd/chantools/dropchannelgraph.go b/cmd/chantools/dropchannelgraph.go index bf33d48..d8743b0 100644 --- a/cmd/chantools/dropchannelgraph.go +++ b/cmd/chantools/dropchannelgraph.go @@ -46,7 +46,7 @@ without removing any other data. CAUTION: Running this command will make it impossible to use the channel DB with an older version of lnd. Downgrading is not possible and you'll need to -run lnd v0.14.1-beta or later after using this command!'`, +run lnd v0.15.1-beta or later after using this command!'`, Example: `chantools dropchannelgraph \ --channeldb ~/.lnd/data/graph/mainnet/channel.db \ --node_identity_key 03...... @@ -106,7 +106,7 @@ func (c *dropChannelGraphCommand) Execute(_ *cobra.Command, _ []string) error { if c.SingleChannel != 0 { log.Infof("Removing single channel %d", c.SingleChannel) return db.ChannelGraph().DeleteChannelEdges( - true, c.SingleChannel, + true, false, c.SingleChannel, ) } diff --git a/cmd/chantools/migratedb.go b/cmd/chantools/migratedb.go index 44f4c96..a7caf63 100644 --- a/cmd/chantools/migratedb.go +++ b/cmd/chantools/migratedb.go @@ -25,7 +25,7 @@ needs to read the database content. CAUTION: Running this command will make it impossible to use the channel DB with an older version of lnd. Downgrading is not possible and you'll need to -run lnd v0.14.1-beta or later after using this command!'`, +run lnd v0.15.1-beta or later after using this command!'`, Example: `chantools migratedb \ --channeldb ~/.lnd/data/graph/mainnet/channel.db`, RunE: cc.Execute, diff --git a/cmd/chantools/removechannel.go b/cmd/chantools/removechannel.go index ebc3311..27b099b 100644 --- a/cmd/chantools/removechannel.go +++ b/cmd/chantools/removechannel.go @@ -31,7 +31,7 @@ channel was never confirmed on chain! CAUTION: Running this command will make it impossible to use the channel DB with an older version of lnd. Downgrading is not possible and you'll need to -run lnd v0.14.1-beta or later after using this command!`, +run lnd v0.15.1-beta or later after using this command!`, Example: `chantools removechannel \ --channeldb ~/.lnd/data/graph/mainnet/channel.db \ --channel 3149764effbe82718b280de425277e5e7b245a4573aa4a0203ac12cee1c37816:0`, diff --git a/doc/chantools_deletepayments.md b/doc/chantools_deletepayments.md index 995f2be..87bca28 100644 --- a/doc/chantools_deletepayments.md +++ b/doc/chantools_deletepayments.md @@ -10,7 +10,7 @@ If only the failed payments should be deleted (and not the successful ones), the CAUTION: Running this command will make it impossible to use the channel DB with an older version of lnd. Downgrading is not possible and you'll need to -run lnd v0.14.1-beta or later after using this command!' +run lnd v0.15.1-beta or later after using this command!' ``` chantools deletepayments [flags] diff --git a/doc/chantools_dropchannelgraph.md b/doc/chantools_dropchannelgraph.md index 8fab918..9fa5346 100644 --- a/doc/chantools_dropchannelgraph.md +++ b/doc/chantools_dropchannelgraph.md @@ -12,7 +12,7 @@ without removing any other data. CAUTION: Running this command will make it impossible to use the channel DB with an older version of lnd. Downgrading is not possible and you'll need to -run lnd v0.14.1-beta or later after using this command!' +run lnd v0.15.1-beta or later after using this command!' ``` chantools dropchannelgraph [flags] @@ -22,19 +22,23 @@ chantools dropchannelgraph [flags] ``` chantools dropchannelgraph \ - --channeldb ~/.lnd/data/graph/mainnet/channel.db + --channeldb ~/.lnd/data/graph/mainnet/channel.db \ + --node_identity_key 03...... chantools dropchannelgraph \ --channeldb ~/.lnd/data/graph/mainnet/channel.db \ --single_channel 726607861215512345 + --node_identity_key 03...... ``` ### Options ``` - --channeldb string lnd channel.db file to dump channels from - -h, --help help for dropchannelgraph - --single_channel uint the single channel identified by its short channel ID (CID) to remove from the graph + --channeldb string lnd channel.db file to dump channels from + --fix_only fix an already empty graph by re-adding the own node's channels + -h, --help help for dropchannelgraph + --node_identity_key string your node's identity public key + --single_channel uint the single channel identified by its short channel ID (CID) to remove from the graph ``` ### Options inherited from parent commands diff --git a/doc/chantools_dumpchannels.md b/doc/chantools_dumpchannels.md index 9eeaa42..859be84 100644 --- a/doc/chantools_dumpchannels.md +++ b/doc/chantools_dumpchannels.md @@ -24,6 +24,8 @@ chantools dumpchannels \ --channeldb string lnd channel.db file to dump channels from --closed dump closed channels instead of open -h, --help help for dumpchannels + --pending dump pending channels instead of open + --waiting_close dump waiting close channels instead of open ``` ### Options inherited from parent commands diff --git a/doc/chantools_fakechanbackup.md b/doc/chantools_fakechanbackup.md index 3646b93..e72b873 100644 --- a/doc/chantools_fakechanbackup.md +++ b/doc/chantools_fakechanbackup.md @@ -61,7 +61,7 @@ chantools fakechanbackup --from_channel_graph lncli_describegraph.json \ --channelpoint string funding transaction outpoint of the channel to rescue (:) as it is displayed on 1ml.com --from_channel_graph string the full LN channel graph in the JSON format that the 'lncli describegraph' returns -h, --help help for fakechanbackup - --multi_file string the fake channel backup file to create (default "results/fake-2021-12-13-10-34-21.backup") + --multi_file string the fake channel backup file to create (default "results/fake-2022-09-11-19-20-32.backup") --remote_node_addr string the remote node connection information in the format pubkey@host:port --rootkey string BIP32 HD root key of the wallet to use for encrypting the backup; leave empty to prompt for lnd 24 word aezeed --short_channel_id string the short channel ID in the format xx diff --git a/doc/chantools_migratedb.md b/doc/chantools_migratedb.md index 8f122f0..d1d322e 100644 --- a/doc/chantools_migratedb.md +++ b/doc/chantools_migratedb.md @@ -11,7 +11,7 @@ needs to read the database content. CAUTION: Running this command will make it impossible to use the channel DB with an older version of lnd. Downgrading is not possible and you'll need to -run lnd v0.14.1-beta or later after using this command!' +run lnd v0.15.1-beta or later after using this command!' ``` chantools migratedb [flags] diff --git a/doc/chantools_removechannel.md b/doc/chantools_removechannel.md index 701f99d..38f092f 100644 --- a/doc/chantools_removechannel.md +++ b/doc/chantools_removechannel.md @@ -11,7 +11,7 @@ channel was never confirmed on chain! CAUTION: Running this command will make it impossible to use the channel DB with an older version of lnd. Downgrading is not possible and you'll need to -run lnd v0.14.1-beta or later after using this command! +run lnd v0.15.1-beta or later after using this command! ``` chantools removechannel [flags] diff --git a/doc/chantools_sweeptimelockmanual.md b/doc/chantools_sweeptimelockmanual.md index ab97b67..d5813eb 100644 --- a/doc/chantools_sweeptimelockmanual.md +++ b/doc/chantools_sweeptimelockmanual.md @@ -42,6 +42,8 @@ chantools sweeptimelockmanual \ -h, --help help for sweeptimelockmanual --listchannels string channel input is in the format of lncli's listchannels format; specify '-' to read from stdin --maxcsvlimit uint16 maximum CSV limit to use (default 2016) + --maxnumchanstotal uint16 maximum number of keys to try, set to maximum number of channels the local node potentially has or had (default 500) + --maxnumchanupdates uint maximum number of channel updates to try, set to maximum number of times the channel was used (default 500) --pendingchannels string channel input is in the format of lncli's pendingchannels format; specify '-' to read from stdin --publish publish sweep TX to the chain API instead of just printing the TX --remoterevbasepoint string remote node's revocation base point, can be found in a channel.backup file diff --git a/doc/chantools_zombierecovery_findmatches.md b/doc/chantools_zombierecovery_findmatches.md index b0d0321..4da1a92 100644 --- a/doc/chantools_zombierecovery_findmatches.md +++ b/doc/chantools_zombierecovery_findmatches.md @@ -20,7 +20,8 @@ chantools zombierecovery findmatches [flags] ``` chantools zombierecovery findmatches \ --registrations data.txt \ - --channel_graph lncli_describegraph.json + --channel_graph lncli_describegraph.json \ + --pairs_done pairs-done.json ``` ### Options @@ -29,6 +30,7 @@ chantools zombierecovery findmatches \ --apiurl string API URL to use (must be esplora compatible) (default "https://blockstream.info/api") --channel_graph string the full LN channel graph in the JSON format that the 'lncli describegraph' returns -h, --help help for findmatches + --pairs_done string an optional file containing all pairs that have already been contacted and shouldn't be matched again --registrations string the raw data.txt where the registrations are stored in ``` diff --git a/go.mod b/go.mod index 66589b9..e60f6fb 100644 --- a/go.mod +++ b/go.mod @@ -2,9 +2,9 @@ module github.com/guggero/chantools require ( github.com/btcsuite/btcd v0.23.1 - github.com/btcsuite/btcd/btcec/v2 v2.2.0 - github.com/btcsuite/btcd/btcutil v1.1.1 - github.com/btcsuite/btcd/btcutil/psbt v1.1.4 + github.com/btcsuite/btcd/btcec/v2 v2.2.1 + github.com/btcsuite/btcd/btcutil v1.1.2 + github.com/btcsuite/btcd/btcutil/psbt v1.1.5 github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1 github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f github.com/btcsuite/btcwallet v0.15.1 @@ -14,7 +14,7 @@ require ( github.com/davecgh/go-spew v1.1.1 github.com/gogo/protobuf v1.3.2 github.com/lightninglabs/pool v0.5.7-alpha.0.20220715160511-f7c1ef26af2b - github.com/lightningnetwork/lnd v0.15.0-beta + github.com/lightningnetwork/lnd v0.15.1-beta github.com/lightningnetwork/lnd/kvdb v1.3.1 github.com/lightningnetwork/lnd/tor v1.0.1 github.com/spf13/cobra v1.1.3 @@ -110,6 +110,7 @@ require ( github.com/sirupsen/logrus v1.7.0 // indirect github.com/soheilhy/cmux v0.1.5 // indirect github.com/spf13/pflag v1.0.5 // indirect + github.com/stretchr/objx v0.2.0 // indirect github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 // indirect github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802 // indirect github.com/ulikunitz/xz v0.5.10 // indirect diff --git a/go.sum b/go.sum index 9e8b9fb..a92bbc8 100644 --- a/go.sum +++ b/go.sum @@ -81,15 +81,18 @@ github.com/btcsuite/btcd v0.23.1/go.mod h1:0QJIIN1wwIXF/3G/m87gIwGniDMDQqjVn4SZg github.com/btcsuite/btcd/btcec/v2 v2.1.0/go.mod h1:2VzYrv4Gm4apmbVVsSq5bqf1Ec8v56E48Vt0Y/umPgA= github.com/btcsuite/btcd/btcec/v2 v2.1.1/go.mod h1:ctjw4H1kknNJmRN4iP1R7bTQ+v3GJkZBd6mui8ZsAZE= github.com/btcsuite/btcd/btcec/v2 v2.1.3/go.mod h1:ctjw4H1kknNJmRN4iP1R7bTQ+v3GJkZBd6mui8ZsAZE= -github.com/btcsuite/btcd/btcec/v2 v2.2.0 h1:fzn1qaOt32TuLjFlkzYSsBC35Q3KUjT1SwPxiMSCF5k= github.com/btcsuite/btcd/btcec/v2 v2.2.0/go.mod h1:U7MHm051Al6XmscBQ0BoNydpOTsFAn707034b5nY8zU= +github.com/btcsuite/btcd/btcec/v2 v2.2.1 h1:xP60mv8fvp+0khmrN0zTdPC3cNm24rfeE6lh2R/Yv3E= +github.com/btcsuite/btcd/btcec/v2 v2.2.1/go.mod h1:9/CSmJxmuvqzX9Wh2fXMWToLOHhPd11lSPuIupwTkI8= github.com/btcsuite/btcd/btcutil v1.0.0/go.mod h1:Uoxwv0pqYWhD//tfTiipkxNfdhG9UrLwaeswfjfdF0A= github.com/btcsuite/btcd/btcutil v1.1.0/go.mod h1:5OapHB7A2hBBWLm48mmw4MOHNJCcUBTwmWH/0Jn8VHE= -github.com/btcsuite/btcd/btcutil v1.1.1 h1:hDcDaXiP0uEzR8Biqo2weECKqEw0uHDZ9ixIWevVQqY= github.com/btcsuite/btcd/btcutil v1.1.1/go.mod h1:nbKlBMNm9FGsdvKvu0essceubPiAcI57pYBNnsLAa34= +github.com/btcsuite/btcd/btcutil v1.1.2 h1:XLMbX8JQEiwMcYft2EGi8zPUkoa0abKIU6/BJSRsjzQ= +github.com/btcsuite/btcd/btcutil v1.1.2/go.mod h1:UR7dsSJzJUfMmFiiLlIrMq1lS9jh9EdCV7FStZSnpi0= github.com/btcsuite/btcd/btcutil/psbt v1.1.0/go.mod h1:xMuACsIKDzcE3kWMxqK+aLrAWZ8bMdn7YjYEwNs5q8k= -github.com/btcsuite/btcd/btcutil/psbt v1.1.4 h1:Edx4AfBn+YPam2KP5AobDitulGp4r1Oibm8oruzkMdI= github.com/btcsuite/btcd/btcutil/psbt v1.1.4/go.mod h1:9AyU6EQVJ9Iw9zPyNT1lcdHd6cnEZdno5wLu5FY74os= +github.com/btcsuite/btcd/btcutil/psbt v1.1.5 h1:x0ZRrYY8j75ThV6xBz86CkYAG82F5bzay4H5D1c8b/U= +github.com/btcsuite/btcd/btcutil/psbt v1.1.5/go.mod h1:kA6FLH/JfUx++j9pYU0pyu+Z8XGBQuuTmuKYUf6q7/U= github.com/btcsuite/btcd/chaincfg/chainhash v1.0.0/go.mod h1:7SFka0XMvUgj3hfZtydOrQY2mwhPclbT2snogU7SQQc= github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1 h1:q0rUy8C/TYNBQS1+CGKw68tLOFYSNEs0TFnxxnS9+4U= github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1/go.mod h1:7SFka0XMvUgj3hfZtydOrQY2mwhPclbT2snogU7SQQc= @@ -527,8 +530,9 @@ github.com/lightninglabs/protobuf-hex-display v1.4.3-hex-display/go.mod h1:2oKOB github.com/lightningnetwork/lightning-onion v1.0.2-0.20220211021909-bb84a1ccb0c5 h1:TkKwqFcQTGYoI+VEqyxA8rxpCin8qDaYX0AfVRinT3k= github.com/lightningnetwork/lightning-onion v1.0.2-0.20220211021909-bb84a1ccb0c5/go.mod h1:7dDx73ApjEZA0kcknI799m2O5kkpfg4/gr7N092ojNo= github.com/lightningnetwork/lnd v0.14.1-beta.0.20220324135938-0dcaa511a249/go.mod h1:Tp3ZxsfioUl6kQ30RrbMqWoZyZ4K+fv/o1lMEU8U7rA= -github.com/lightningnetwork/lnd v0.15.0-beta h1:smzYjJqL4nGuj4qrAWdikrPzPJ8fcPRFHQ86S2tHR1M= github.com/lightningnetwork/lnd v0.15.0-beta/go.mod h1:Tm7LZrYeR2JQH1gEOKmd0NTCgjJ1Bnujkx4lcz9b5+A= +github.com/lightningnetwork/lnd v0.15.1-beta h1:XR6L/TM3IzWqziS8DgsXLlDsu2/4EMK4WzvZpyYhrdM= +github.com/lightningnetwork/lnd v0.15.1-beta/go.mod h1:21UpSyTj8n94nsaJ0OFRXk4yOEkE7xA9JEX5QS4oMy4= github.com/lightningnetwork/lnd/cert v1.1.1/go.mod h1:1P46svkkd73oSoeI4zjkVKgZNwGq8bkGuPR8z+5vQUs= github.com/lightningnetwork/lnd/clock v1.0.1/go.mod h1:KnQudQ6w0IAMZi1SgvecLZQZ43ra2vpDNj7H/aasemg= github.com/lightningnetwork/lnd/clock v1.1.0 h1:/yfVAwtPmdx45aQBoXQImeY7sOIEr7IXlImRMBOZ7GQ= @@ -717,6 +721,7 @@ github.com/ulikunitz/xz v0.5.7/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oW github.com/ulikunitz/xz v0.5.10 h1:t92gobL9l3HE202wg3rlk19F6X+JOxl9BBrCCMYEYd8= github.com/ulikunitz/xz v0.5.10/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14= github.com/urfave/cli v1.22.4/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= +github.com/urfave/cli v1.22.9/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= github.com/xdg-go/stringprep v1.0.2/go.mod h1:8F9zXuvzgwmyT5DUm4GUfZGDdT3W+LCvS6+da4O5kxM= github.com/xdg-go/stringprep v1.0.3 h1:kdwGpVNwPFtjs98xCGkHjQtGKh86rDcRZN17QEMCOIs= github.com/xdg-go/stringprep v1.0.3/go.mod h1:W3f5j4i+9rC0kuIEJL0ky1VpHXQU3ocBgklLGvcBnW8=