From 4e0c5ada6332397cb979357a38ec045037dd1df8 Mon Sep 17 00:00:00 2001 From: Oliver Gugger Date: Wed, 31 May 2023 11:12:42 +0200 Subject: [PATCH] multi: update repo/module from github.com/{guggero => lightninglabs}/chantools --- Makefile | 2 +- README.md | 8 +++--- btc/bip39.go | 2 +- btc/bitcoind.go | 2 +- btc/summary.go | 2 +- cmd/chantools/chanbackup.go | 2 +- cmd/chantools/closepoolaccount.go | 4 +-- cmd/chantools/closepoolaccount_test.go | 2 +- cmd/chantools/deletepayments.go | 2 +- cmd/chantools/derivekey.go | 2 +- cmd/chantools/derivekey_test.go | 4 +-- cmd/chantools/doublespendinputs.go | 4 +-- cmd/chantools/dropchannelgraph.go | 2 +- cmd/chantools/dumpbackup.go | 4 +-- cmd/chantools/dumpchannels.go | 4 +-- cmd/chantools/fakechanbackup.go | 2 +- cmd/chantools/filterbackup.go | 2 +- cmd/chantools/fixoldbackup.go | 2 +- cmd/chantools/forceclose.go | 6 ++--- cmd/chantools/genimportscript.go | 4 +-- cmd/chantools/migratedb.go | 2 +- cmd/chantools/recoverloopin.go | 4 +-- cmd/chantools/removechannel.go | 2 +- cmd/chantools/rescueclosed.go | 4 +-- cmd/chantools/rescuefunding.go | 4 +-- cmd/chantools/rescuetweakedkey.go | 2 +- cmd/chantools/root.go | 8 +++--- cmd/chantools/showrootkey_test.go | 4 +-- cmd/chantools/signrescuefunding.go | 2 +- cmd/chantools/summary.go | 4 +-- cmd/chantools/sweepremoteclosed.go | 4 +-- cmd/chantools/sweeptimelock.go | 6 ++--- cmd/chantools/sweeptimelockmanual.go | 4 +-- cmd/chantools/sweeptimelockmanual_test.go | 2 +- cmd/chantools/triggerforceclose.go | 4 +-- cmd/chantools/vanitygen.go | 4 +-- cmd/chantools/walletinfo.go | 2 +- cmd/chantools/zombierecovery_findmatches.go | 4 +-- cmd/chantools/zombierecovery_makeoffer.go | 2 +- cmd/chantools/zombierecovery_preparekeys.go | 2 +- cmd/chantools/zombierecovery_root.go | 2 +- cmd/chantools/zombierecovery_signoffer.go | 2 +- doc/chantools.md | 2 +- doc/chantools_zombierecovery.md | 2 +- doc/zombierecovery.md | 2 +- go.mod | 10 +------ go.sum | 29 ++++++--------------- release.sh | 2 +- tools/go.mod | 2 +- 49 files changed, 82 insertions(+), 103 deletions(-) diff --git a/Makefile b/Makefile index d350904..5e7eb8f 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -PKG := github.com/guggero/chantools +PKG := github.com/lightninglabs/chantools TOOLS_DIR := tools GOTEST := GO111MODULE=on go test -v diff --git a/README.md b/README.md index 4baf66a..cdda83d 100644 --- a/README.md +++ b/README.md @@ -24,13 +24,13 @@ a private API URL with `--apiurl`. The easiest way to install `chantools` is to [download a pre-built binary for your operating system and -architecture](https://github.com/guggero/chantools/releases). +architecture](https://github.com/lightninglabs/chantools/releases). Example (make sure you always use the latest version!): ```shell $ cd /tmp -$ wget -O chantools.tar.gz https://github.com/guggero/chantools/releases/download/v0.10.7/chantools-linux-amd64-v0.10.7.tar.gz +$ wget -O chantools.tar.gz https://github.com/lightninglabs/chantools/releases/download/v0.10.7/chantools-linux-amd64-v0.10.7.tar.gz $ tar -zxvf chantools.tar.gz $ sudo mv chantools-*/chantools /usr/local/bin/ ``` @@ -43,7 +43,7 @@ need to make sure you have `go 1.19.x` (or later) and `make` installed and can then run the following commands: ```bash -git clone https://github.com/guggero/chantools.git +git clone https://github.com/lightninglabs/chantools.git cd chantools make install ``` @@ -401,7 +401,7 @@ run them on a computer with a firewall that blocks outgoing connections. ```text This tool provides helper functions that can be used rescue funds locked in lnd channels in case lnd itself cannot run properly anymore. -Complete documentation is available at https://github.com/guggero/chantools/. +Complete documentation is available at https://github.com/lightninglabs/chantools/. Usage: chantools [command] diff --git a/btc/bip39.go b/btc/bip39.go index b3695be..42bdbce 100644 --- a/btc/bip39.go +++ b/btc/bip39.go @@ -12,7 +12,7 @@ import ( "github.com/btcsuite/btcd/btcutil/hdkeychain" "github.com/btcsuite/btcd/chaincfg" - "github.com/guggero/chantools/bip39" + "github.com/lightninglabs/chantools/bip39" "golang.org/x/crypto/pbkdf2" "golang.org/x/crypto/ssh/terminal" ) diff --git a/btc/bitcoind.go b/btc/bitcoind.go index 7409245..98dd5a0 100644 --- a/btc/bitcoind.go +++ b/btc/bitcoind.go @@ -10,7 +10,7 @@ import ( "github.com/btcsuite/btcd/btcutil/hdkeychain" "github.com/btcsuite/btcd/chaincfg" "github.com/btcsuite/btcd/wire" - "github.com/guggero/chantools/lnd" + "github.com/lightninglabs/chantools/lnd" ) const ( diff --git a/btc/summary.go b/btc/summary.go index a3c1389..17638c6 100644 --- a/btc/summary.go +++ b/btc/summary.go @@ -4,7 +4,7 @@ import ( "errors" "github.com/btcsuite/btclog" - "github.com/guggero/chantools/dataformat" + "github.com/lightninglabs/chantools/dataformat" ) func SummarizeChannels(apiURL string, channels []*dataformat.SummaryEntry, diff --git a/cmd/chantools/chanbackup.go b/cmd/chantools/chanbackup.go index 100f234..f8f3835 100644 --- a/cmd/chantools/chanbackup.go +++ b/cmd/chantools/chanbackup.go @@ -3,7 +3,7 @@ package main import ( "fmt" - "github.com/guggero/chantools/lnd" + "github.com/lightninglabs/chantools/lnd" "github.com/lightningnetwork/lnd/chanbackup" "github.com/spf13/cobra" ) diff --git a/cmd/chantools/closepoolaccount.go b/cmd/chantools/closepoolaccount.go index 4321064..dc85a28 100644 --- a/cmd/chantools/closepoolaccount.go +++ b/cmd/chantools/closepoolaccount.go @@ -10,8 +10,8 @@ import ( "github.com/btcsuite/btcd/btcutil/hdkeychain" "github.com/btcsuite/btcd/txscript" "github.com/btcsuite/btcd/wire" - "github.com/guggero/chantools/btc" - "github.com/guggero/chantools/lnd" + "github.com/lightninglabs/chantools/btc" + "github.com/lightninglabs/chantools/lnd" "github.com/lightninglabs/pool/account" "github.com/lightninglabs/pool/poolscript" "github.com/lightningnetwork/lnd/input" diff --git a/cmd/chantools/closepoolaccount_test.go b/cmd/chantools/closepoolaccount_test.go index edade66..fac5ddd 100644 --- a/cmd/chantools/closepoolaccount_test.go +++ b/cmd/chantools/closepoolaccount_test.go @@ -7,7 +7,7 @@ import ( "github.com/btcsuite/btcd/btcec/v2" "github.com/btcsuite/btcd/btcutil/hdkeychain" "github.com/btcsuite/btcd/chaincfg" - "github.com/guggero/chantools/lnd" + "github.com/lightninglabs/chantools/lnd" "github.com/lightninglabs/pool/poolscript" "github.com/lightningnetwork/lnd/keychain" "github.com/stretchr/testify/require" diff --git a/cmd/chantools/deletepayments.go b/cmd/chantools/deletepayments.go index 1c2eb31..6dd3c33 100644 --- a/cmd/chantools/deletepayments.go +++ b/cmd/chantools/deletepayments.go @@ -3,7 +3,7 @@ package main import ( "fmt" - "github.com/guggero/chantools/lnd" + "github.com/lightninglabs/chantools/lnd" "github.com/spf13/cobra" ) diff --git a/cmd/chantools/derivekey.go b/cmd/chantools/derivekey.go index 39bbe6f..e7edc1f 100644 --- a/cmd/chantools/derivekey.go +++ b/cmd/chantools/derivekey.go @@ -5,7 +5,7 @@ import ( "github.com/btcsuite/btcd/btcutil" "github.com/btcsuite/btcd/btcutil/hdkeychain" - "github.com/guggero/chantools/lnd" + "github.com/lightninglabs/chantools/lnd" "github.com/spf13/cobra" ) diff --git a/cmd/chantools/derivekey_test.go b/cmd/chantools/derivekey_test.go index 84263de..e99a926 100644 --- a/cmd/chantools/derivekey_test.go +++ b/cmd/chantools/derivekey_test.go @@ -3,8 +3,8 @@ package main import ( "testing" - "github.com/guggero/chantools/btc" - "github.com/guggero/chantools/lnd" + "github.com/lightninglabs/chantools/btc" + "github.com/lightninglabs/chantools/lnd" "github.com/stretchr/testify/require" ) diff --git a/cmd/chantools/doublespendinputs.go b/cmd/chantools/doublespendinputs.go index 2ad4ffd..a7ea4e1 100644 --- a/cmd/chantools/doublespendinputs.go +++ b/cmd/chantools/doublespendinputs.go @@ -13,8 +13,8 @@ import ( "github.com/btcsuite/btcd/txscript" "github.com/btcsuite/btcd/wire" "github.com/decred/dcrd/dcrec/secp256k1/v4" - "github.com/guggero/chantools/btc" - "github.com/guggero/chantools/lnd" + "github.com/lightninglabs/chantools/btc" + "github.com/lightninglabs/chantools/lnd" "github.com/lightningnetwork/lnd/input" "github.com/lightningnetwork/lnd/lnwallet/chainfee" "github.com/spf13/cobra" diff --git a/cmd/chantools/dropchannelgraph.go b/cmd/chantools/dropchannelgraph.go index 2f42ff1..81d4d4f 100644 --- a/cmd/chantools/dropchannelgraph.go +++ b/cmd/chantools/dropchannelgraph.go @@ -9,7 +9,7 @@ import ( "github.com/btcsuite/btcd/btcec/v2" "github.com/btcsuite/btcd/btcutil" "github.com/btcsuite/btcd/wire" - "github.com/guggero/chantools/lnd" + "github.com/lightninglabs/chantools/lnd" "github.com/lightningnetwork/lnd/chainreg" "github.com/lightningnetwork/lnd/channeldb" "github.com/lightningnetwork/lnd/keychain" diff --git a/cmd/chantools/dumpbackup.go b/cmd/chantools/dumpbackup.go index e44f47f..9e3e76f 100644 --- a/cmd/chantools/dumpbackup.go +++ b/cmd/chantools/dumpbackup.go @@ -4,8 +4,8 @@ import ( "fmt" "github.com/davecgh/go-spew/spew" - "github.com/guggero/chantools/dump" - "github.com/guggero/chantools/lnd" + "github.com/lightninglabs/chantools/dump" + "github.com/lightninglabs/chantools/lnd" "github.com/lightningnetwork/lnd/chanbackup" "github.com/lightningnetwork/lnd/keychain" "github.com/spf13/cobra" diff --git a/cmd/chantools/dumpchannels.go b/cmd/chantools/dumpchannels.go index 5bec361..5c4db4d 100644 --- a/cmd/chantools/dumpchannels.go +++ b/cmd/chantools/dumpchannels.go @@ -4,8 +4,8 @@ import ( "fmt" "github.com/davecgh/go-spew/spew" - "github.com/guggero/chantools/dump" - "github.com/guggero/chantools/lnd" + "github.com/lightninglabs/chantools/dump" + "github.com/lightninglabs/chantools/lnd" "github.com/lightningnetwork/lnd/channeldb" "github.com/spf13/cobra" ) diff --git a/cmd/chantools/fakechanbackup.go b/cmd/chantools/fakechanbackup.go index 6b30a12..e935e64 100644 --- a/cmd/chantools/fakechanbackup.go +++ b/cmd/chantools/fakechanbackup.go @@ -14,7 +14,7 @@ import ( "github.com/btcsuite/btcd/btcutil" "github.com/btcsuite/btcd/wire" "github.com/gogo/protobuf/jsonpb" - "github.com/guggero/chantools/lnd" + "github.com/lightninglabs/chantools/lnd" "github.com/lightningnetwork/lnd/chanbackup" "github.com/lightningnetwork/lnd/channeldb" "github.com/lightningnetwork/lnd/keychain" diff --git a/cmd/chantools/filterbackup.go b/cmd/chantools/filterbackup.go index f1b6500..46d8b24 100644 --- a/cmd/chantools/filterbackup.go +++ b/cmd/chantools/filterbackup.go @@ -6,7 +6,7 @@ import ( "strings" "time" - "github.com/guggero/chantools/lnd" + "github.com/lightninglabs/chantools/lnd" "github.com/lightningnetwork/lnd/chanbackup" "github.com/lightningnetwork/lnd/keychain" "github.com/spf13/cobra" diff --git a/cmd/chantools/fixoldbackup.go b/cmd/chantools/fixoldbackup.go index d42f16a..39e000b 100644 --- a/cmd/chantools/fixoldbackup.go +++ b/cmd/chantools/fixoldbackup.go @@ -6,7 +6,7 @@ import ( "os" "time" - "github.com/guggero/chantools/lnd" + "github.com/lightninglabs/chantools/lnd" "github.com/lightningnetwork/lnd/chanbackup" "github.com/lightningnetwork/lnd/keychain" "github.com/spf13/cobra" diff --git a/cmd/chantools/forceclose.go b/cmd/chantools/forceclose.go index c214b0a..90ea393 100644 --- a/cmd/chantools/forceclose.go +++ b/cmd/chantools/forceclose.go @@ -11,9 +11,9 @@ import ( "github.com/btcsuite/btcd/btcutil/hdkeychain" "github.com/btcsuite/btcd/txscript" - "github.com/guggero/chantools/btc" - "github.com/guggero/chantools/dataformat" - "github.com/guggero/chantools/lnd" + "github.com/lightninglabs/chantools/btc" + "github.com/lightninglabs/chantools/dataformat" + "github.com/lightninglabs/chantools/lnd" "github.com/lightningnetwork/lnd/channeldb" "github.com/lightningnetwork/lnd/input" "github.com/spf13/cobra" diff --git a/cmd/chantools/genimportscript.go b/cmd/chantools/genimportscript.go index b8bf72d..eb84ffc 100644 --- a/cmd/chantools/genimportscript.go +++ b/cmd/chantools/genimportscript.go @@ -5,8 +5,8 @@ import ( "os" "time" - "github.com/guggero/chantools/btc" - "github.com/guggero/chantools/lnd" + "github.com/lightninglabs/chantools/btc" + "github.com/lightninglabs/chantools/lnd" "github.com/spf13/cobra" ) diff --git a/cmd/chantools/migratedb.go b/cmd/chantools/migratedb.go index 0a080a0..37695e8 100644 --- a/cmd/chantools/migratedb.go +++ b/cmd/chantools/migratedb.go @@ -3,7 +3,7 @@ package main import ( "fmt" - "github.com/guggero/chantools/lnd" + "github.com/lightninglabs/chantools/lnd" "github.com/spf13/cobra" ) diff --git a/cmd/chantools/recoverloopin.go b/cmd/chantools/recoverloopin.go index 211a8b3..52330c3 100644 --- a/cmd/chantools/recoverloopin.go +++ b/cmd/chantools/recoverloopin.go @@ -9,8 +9,8 @@ import ( "github.com/btcsuite/btcd/chaincfg/chainhash" "github.com/btcsuite/btcd/txscript" "github.com/btcsuite/btcd/wire" - "github.com/guggero/chantools/btc" - "github.com/guggero/chantools/lnd" + "github.com/lightninglabs/chantools/btc" + "github.com/lightninglabs/chantools/lnd" "github.com/lightninglabs/loop" "github.com/lightninglabs/loop/loopdb" "github.com/lightninglabs/loop/swap" diff --git a/cmd/chantools/removechannel.go b/cmd/chantools/removechannel.go index 3e331c9..dc8a942 100644 --- a/cmd/chantools/removechannel.go +++ b/cmd/chantools/removechannel.go @@ -7,7 +7,7 @@ import ( "github.com/btcsuite/btcd/chaincfg/chainhash" "github.com/btcsuite/btcd/wire" - "github.com/guggero/chantools/lnd" + "github.com/lightninglabs/chantools/lnd" "github.com/lightningnetwork/lnd/channeldb" "github.com/spf13/cobra" ) diff --git a/cmd/chantools/rescueclosed.go b/cmd/chantools/rescueclosed.go index c991a09..3bfa38f 100644 --- a/cmd/chantools/rescueclosed.go +++ b/cmd/chantools/rescueclosed.go @@ -13,8 +13,8 @@ import ( "github.com/btcsuite/btcd/btcec/v2" "github.com/btcsuite/btcd/btcutil" "github.com/btcsuite/btcd/btcutil/hdkeychain" - "github.com/guggero/chantools/dataformat" - "github.com/guggero/chantools/lnd" + "github.com/lightninglabs/chantools/dataformat" + "github.com/lightninglabs/chantools/lnd" "github.com/lightningnetwork/lnd/channeldb" "github.com/lightningnetwork/lnd/input" "github.com/lightningnetwork/lnd/keychain" diff --git a/cmd/chantools/rescuefunding.go b/cmd/chantools/rescuefunding.go index 9cb17cb..9e4e4cd 100644 --- a/cmd/chantools/rescuefunding.go +++ b/cmd/chantools/rescuefunding.go @@ -9,8 +9,8 @@ import ( "github.com/btcsuite/btcd/btcutil" "github.com/btcsuite/btcd/btcutil/psbt" "github.com/btcsuite/btcd/wire" - "github.com/guggero/chantools/btc" - "github.com/guggero/chantools/lnd" + "github.com/lightninglabs/chantools/btc" + "github.com/lightninglabs/chantools/lnd" "github.com/lightningnetwork/lnd/input" "github.com/lightningnetwork/lnd/keychain" "github.com/lightningnetwork/lnd/lnwallet/chainfee" diff --git a/cmd/chantools/rescuetweakedkey.go b/cmd/chantools/rescuetweakedkey.go index 1c24404..08507b1 100644 --- a/cmd/chantools/rescuetweakedkey.go +++ b/cmd/chantools/rescuetweakedkey.go @@ -10,7 +10,7 @@ import ( "github.com/btcsuite/btcd/chaincfg/chainhash" "github.com/btcsuite/btcd/txscript" "github.com/decred/dcrd/dcrec/secp256k1/v4" - "github.com/guggero/chantools/lnd" + "github.com/lightninglabs/chantools/lnd" "github.com/spf13/cobra" ) diff --git a/cmd/chantools/root.go b/cmd/chantools/root.go index ec39d07..383f1c7 100644 --- a/cmd/chantools/root.go +++ b/cmd/chantools/root.go @@ -14,9 +14,9 @@ import ( "github.com/btcsuite/btcd/btcutil/hdkeychain" "github.com/btcsuite/btcd/chaincfg" "github.com/btcsuite/btclog" - "github.com/guggero/chantools/btc" - "github.com/guggero/chantools/dataformat" - "github.com/guggero/chantools/lnd" + "github.com/lightninglabs/chantools/btc" + "github.com/lightninglabs/chantools/dataformat" + "github.com/lightninglabs/chantools/lnd" "github.com/lightningnetwork/lnd/build" "github.com/lightningnetwork/lnd/chanbackup" "github.com/lightningnetwork/lnd/channeldb" @@ -47,7 +47,7 @@ var rootCmd = &cobra.Command{ Short: "Chantools helps recover funds from lightning channels", Long: `This tool provides helper functions that can be used rescue funds locked in lnd channels in case lnd itself cannot run properly anymore. -Complete documentation is available at https://github.com/guggero/chantools/.`, +Complete documentation is available at https://github.com/lightninglabs/chantools/.`, Version: fmt.Sprintf("v%s, commit %s", version, Commit), PersistentPreRun: func(cmd *cobra.Command, args []string) { switch { diff --git a/cmd/chantools/showrootkey_test.go b/cmd/chantools/showrootkey_test.go index e759553..2468924 100644 --- a/cmd/chantools/showrootkey_test.go +++ b/cmd/chantools/showrootkey_test.go @@ -3,8 +3,8 @@ package main import ( "testing" - "github.com/guggero/chantools/btc" - "github.com/guggero/chantools/lnd" + "github.com/lightninglabs/chantools/btc" + "github.com/lightninglabs/chantools/lnd" "github.com/stretchr/testify/require" ) diff --git a/cmd/chantools/signrescuefunding.go b/cmd/chantools/signrescuefunding.go index 1d09dc2..9380ae3 100644 --- a/cmd/chantools/signrescuefunding.go +++ b/cmd/chantools/signrescuefunding.go @@ -7,7 +7,7 @@ import ( "github.com/btcsuite/btcd/btcec/v2" "github.com/btcsuite/btcd/btcutil/hdkeychain" "github.com/btcsuite/btcd/btcutil/psbt" - "github.com/guggero/chantools/lnd" + "github.com/lightninglabs/chantools/lnd" "github.com/lightningnetwork/lnd/keychain" "github.com/spf13/cobra" ) diff --git a/cmd/chantools/summary.go b/cmd/chantools/summary.go index 60ea62f..c1b9e3d 100644 --- a/cmd/chantools/summary.go +++ b/cmd/chantools/summary.go @@ -6,8 +6,8 @@ import ( "io/ioutil" "time" - "github.com/guggero/chantools/btc" - "github.com/guggero/chantools/dataformat" + "github.com/lightninglabs/chantools/btc" + "github.com/lightninglabs/chantools/dataformat" "github.com/spf13/cobra" ) diff --git a/cmd/chantools/sweepremoteclosed.go b/cmd/chantools/sweepremoteclosed.go index 1220829..a94cdad 100644 --- a/cmd/chantools/sweepremoteclosed.go +++ b/cmd/chantools/sweepremoteclosed.go @@ -11,8 +11,8 @@ import ( "github.com/btcsuite/btcd/chaincfg/chainhash" "github.com/btcsuite/btcd/txscript" "github.com/btcsuite/btcd/wire" - "github.com/guggero/chantools/btc" - "github.com/guggero/chantools/lnd" + "github.com/lightninglabs/chantools/btc" + "github.com/lightninglabs/chantools/lnd" "github.com/lightningnetwork/lnd/input" "github.com/lightningnetwork/lnd/keychain" "github.com/lightningnetwork/lnd/lnwallet/chainfee" diff --git a/cmd/chantools/sweeptimelock.go b/cmd/chantools/sweeptimelock.go index 74a29a4..d4cd932 100644 --- a/cmd/chantools/sweeptimelock.go +++ b/cmd/chantools/sweeptimelock.go @@ -10,9 +10,9 @@ import ( "github.com/btcsuite/btcd/chaincfg/chainhash" "github.com/btcsuite/btcd/txscript" "github.com/btcsuite/btcd/wire" - "github.com/guggero/chantools/btc" - "github.com/guggero/chantools/dataformat" - "github.com/guggero/chantools/lnd" + "github.com/lightninglabs/chantools/btc" + "github.com/lightninglabs/chantools/dataformat" + "github.com/lightninglabs/chantools/lnd" "github.com/lightningnetwork/lnd/input" "github.com/lightningnetwork/lnd/keychain" "github.com/lightningnetwork/lnd/lnwallet/chainfee" diff --git a/cmd/chantools/sweeptimelockmanual.go b/cmd/chantools/sweeptimelockmanual.go index 25004c9..ca6935c 100644 --- a/cmd/chantools/sweeptimelockmanual.go +++ b/cmd/chantools/sweeptimelockmanual.go @@ -10,8 +10,8 @@ import ( "github.com/btcsuite/btcd/chaincfg/chainhash" "github.com/btcsuite/btcd/txscript" "github.com/btcsuite/btcd/wire" - "github.com/guggero/chantools/btc" - "github.com/guggero/chantools/lnd" + "github.com/lightninglabs/chantools/btc" + "github.com/lightninglabs/chantools/lnd" "github.com/lightningnetwork/lnd/input" "github.com/lightningnetwork/lnd/keychain" "github.com/lightningnetwork/lnd/lnwallet/chainfee" diff --git a/cmd/chantools/sweeptimelockmanual_test.go b/cmd/chantools/sweeptimelockmanual_test.go index faf2163..9c0323c 100644 --- a/cmd/chantools/sweeptimelockmanual_test.go +++ b/cmd/chantools/sweeptimelockmanual_test.go @@ -7,7 +7,7 @@ import ( "github.com/btcsuite/btcd/btcec/v2" "github.com/btcsuite/btcd/btcutil/hdkeychain" "github.com/btcsuite/btcd/chaincfg" - "github.com/guggero/chantools/lnd" + "github.com/lightninglabs/chantools/lnd" "github.com/stretchr/testify/require" ) diff --git a/cmd/chantools/triggerforceclose.go b/cmd/chantools/triggerforceclose.go index e0d841b..c1775fe 100644 --- a/cmd/chantools/triggerforceclose.go +++ b/cmd/chantools/triggerforceclose.go @@ -10,8 +10,8 @@ import ( "github.com/btcsuite/btcd/chaincfg/chainhash" "github.com/btcsuite/btcd/connmgr" "github.com/btcsuite/btcd/wire" - "github.com/guggero/chantools/btc" - "github.com/guggero/chantools/lnd" + "github.com/lightninglabs/chantools/btc" + "github.com/lightninglabs/chantools/lnd" "github.com/lightningnetwork/lnd/brontide" "github.com/lightningnetwork/lnd/keychain" "github.com/lightningnetwork/lnd/lncfg" diff --git a/cmd/chantools/vanitygen.go b/cmd/chantools/vanitygen.go index bca9fe5..ff1da21 100644 --- a/cmd/chantools/vanitygen.go +++ b/cmd/chantools/vanitygen.go @@ -11,8 +11,8 @@ import ( "sync" "time" - "github.com/guggero/chantools/btc/fasthd" - "github.com/guggero/chantools/lnd" + "github.com/lightninglabs/chantools/btc/fasthd" + "github.com/lightninglabs/chantools/lnd" "github.com/lightningnetwork/lnd/aezeed" "github.com/lightningnetwork/lnd/keychain" "github.com/spf13/cobra" diff --git a/cmd/chantools/walletinfo.go b/cmd/chantools/walletinfo.go index e79c2ec..0d2c519 100644 --- a/cmd/chantools/walletinfo.go +++ b/cmd/chantools/walletinfo.go @@ -12,7 +12,7 @@ import ( "github.com/btcsuite/btcwallet/wallet" "github.com/btcsuite/btcwallet/walletdb" _ "github.com/btcsuite/btcwallet/walletdb/bdb" - "github.com/guggero/chantools/lnd" + "github.com/lightninglabs/chantools/lnd" "github.com/lightningnetwork/lnd/keychain" "github.com/lightningnetwork/lnd/lncfg" "github.com/lightningnetwork/lnd/lnwallet" diff --git a/cmd/chantools/zombierecovery_findmatches.go b/cmd/chantools/zombierecovery_findmatches.go index 0822af1..50cb849 100644 --- a/cmd/chantools/zombierecovery_findmatches.go +++ b/cmd/chantools/zombierecovery_findmatches.go @@ -13,8 +13,8 @@ import ( "time" "github.com/btcsuite/btcd/btcec/v2" - "github.com/guggero/chantools/btc" "github.com/hasura/go-graphql-client" + "github.com/lightninglabs/chantools/btc" "github.com/spf13/cobra" "golang.org/x/oauth2" ) @@ -52,7 +52,7 @@ Contact: {{$peer.Contact}} {{end}} The document that describes what to do exactly is located here: -https://github.com/guggero/chantools/blob/master/doc/zombierecovery.md +https://github.com/lightninglabs/chantools/blob/master/doc/zombierecovery.md Good luck! diff --git a/cmd/chantools/zombierecovery_makeoffer.go b/cmd/chantools/zombierecovery_makeoffer.go index 7464e25..0683af3 100644 --- a/cmd/chantools/zombierecovery_makeoffer.go +++ b/cmd/chantools/zombierecovery_makeoffer.go @@ -16,7 +16,7 @@ import ( "github.com/btcsuite/btcd/chaincfg" "github.com/btcsuite/btcd/wire" "github.com/btcsuite/btcwallet/wallet/txrules" - "github.com/guggero/chantools/lnd" + "github.com/lightninglabs/chantools/lnd" "github.com/lightningnetwork/lnd/input" "github.com/lightningnetwork/lnd/keychain" "github.com/lightningnetwork/lnd/lnwallet/chainfee" diff --git a/cmd/chantools/zombierecovery_preparekeys.go b/cmd/chantools/zombierecovery_preparekeys.go index 10c33d7..6485fff 100644 --- a/cmd/chantools/zombierecovery_preparekeys.go +++ b/cmd/chantools/zombierecovery_preparekeys.go @@ -8,7 +8,7 @@ import ( "io/ioutil" "time" - "github.com/guggero/chantools/lnd" + "github.com/lightninglabs/chantools/lnd" "github.com/spf13/cobra" ) diff --git a/cmd/chantools/zombierecovery_root.go b/cmd/chantools/zombierecovery_root.go index d081b61..fbf9e3d 100644 --- a/cmd/chantools/zombierecovery_root.go +++ b/cmd/chantools/zombierecovery_root.go @@ -18,7 +18,7 @@ func newZombieRecoveryCommand() *cobra.Command { Long: `A sub command that hosts a set of further sub commands to help with recovering funds tuck in zombie channels. -Please visit https://github.com/guggero/chantools/blob/master/doc/zombierecovery.md +Please visit https://github.com/lightninglabs/chantools/blob/master/doc/zombierecovery.md for more information on how to use these commands.`, Run: func(cmd *cobra.Command, args []string) { if len(args) == 0 { diff --git a/cmd/chantools/zombierecovery_signoffer.go b/cmd/chantools/zombierecovery_signoffer.go index 43f2b45..9298038 100644 --- a/cmd/chantools/zombierecovery_signoffer.go +++ b/cmd/chantools/zombierecovery_signoffer.go @@ -10,7 +10,7 @@ import ( "github.com/btcsuite/btcd/btcutil/hdkeychain" "github.com/btcsuite/btcd/btcutil/psbt" "github.com/btcsuite/btcd/txscript" - "github.com/guggero/chantools/lnd" + "github.com/lightninglabs/chantools/lnd" "github.com/lightningnetwork/lnd/keychain" "github.com/spf13/cobra" ) diff --git a/doc/chantools.md b/doc/chantools.md index 00ccb3d..4c6b1a3 100644 --- a/doc/chantools.md +++ b/doc/chantools.md @@ -6,7 +6,7 @@ Chantools helps recover funds from lightning channels This tool provides helper functions that can be used rescue funds locked in lnd channels in case lnd itself cannot run properly anymore. -Complete documentation is available at https://github.com/guggero/chantools/. +Complete documentation is available at https://github.com/lightninglabs/chantools/. ### Options diff --git a/doc/chantools_zombierecovery.md b/doc/chantools_zombierecovery.md index 322db7a..90b4a15 100644 --- a/doc/chantools_zombierecovery.md +++ b/doc/chantools_zombierecovery.md @@ -7,7 +7,7 @@ Try rescuing funds stuck in channels with zombie nodes A sub command that hosts a set of further sub commands to help with recovering funds tuck in zombie channels. -Please visit https://github.com/guggero/chantools/blob/master/doc/zombierecovery.md +Please visit https://github.com/lightninglabs/chantools/blob/master/doc/zombierecovery.md for more information on how to use these commands. ``` diff --git a/doc/zombierecovery.md b/doc/zombierecovery.md index 9baebb3..e4ca451 100644 --- a/doc/zombierecovery.md +++ b/doc/zombierecovery.md @@ -46,7 +46,7 @@ Below image is a simplified version of the steps described below the image. node, continue: 3. Send/upload the JSON file(s) to your node. If you open the JSON file(s), you will see your own node ID (and contact info) and the peers'. [Download or - install chantools](https://github.com/guggero/chantools#installation). + install chantools](https://github.com/lightninglabs/chantools#installation). Technically, you do not _need_ to install `chantools` on the same machine as your node. Maybe you do not feel confident entering your seed words on your node and want to do this someplace else. diff --git a/go.mod b/go.mod index 8b98594..1960706 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/guggero/chantools +module github.com/lightninglabs/chantools go 1.19 @@ -53,7 +53,6 @@ require ( github.com/dsnet/compress v0.0.1 // indirect github.com/dustin/go-humanize v1.0.0 // indirect github.com/fergusstrange/embedded-postgres v1.10.0 // indirect - github.com/frankban/quicktest v1.11.2 // indirect github.com/go-errors/errors v1.0.1 // indirect github.com/go-logr/logr v1.2.3 // indirect github.com/go-logr/stdr v1.2.2 // indirect @@ -81,14 +80,7 @@ require ( github.com/jonboulle/clockwork v0.2.2 // indirect github.com/jrick/logrotate v1.0.0 // indirect github.com/json-iterator/go v1.1.11 // indirect - github.com/juju/clock v1.0.0 // indirect - github.com/juju/collections v1.0.0 // indirect - github.com/juju/errors v1.0.0 // indirect github.com/juju/loggo v0.0.0-20210728185423-eebad3a902c4 // indirect - github.com/juju/mgo/v2 v2.0.0 // indirect - github.com/juju/retry v1.0.0 // indirect - github.com/juju/utils/v3 v3.0.0 // indirect - github.com/juju/version/v2 v2.0.0 // indirect github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect github.com/kkdai/bstream v1.0.0 // indirect github.com/klauspost/compress v1.16.0 // indirect diff --git a/go.sum b/go.sum index 1729569..a28fd29 100644 --- a/go.sum +++ b/go.sum @@ -179,9 +179,8 @@ github.com/fergusstrange/embedded-postgres v1.10.0 h1:YnwF6xAQYmKLAXXrrRx4rHDLih github.com/fergusstrange/embedded-postgres v1.10.0/go.mod h1:a008U8/Rws5FtIOTGYDYa7beVWsT3qVKyqExqYYjL+c= github.com/fortytw2/leaktest v1.3.0 h1:u8491cBMTQ8ft8aeV+adlcytMZylmA5nnwwkRZjI8vw= github.com/frankban/quicktest v1.0.0/go.mod h1:R98jIehRai+d1/3Hv2//jOVCTJhW1VBavT6B6CuGq2k= +github.com/frankban/quicktest v1.2.2 h1:xfmOhhoH5fGPgbEAlhLpJH9p0z/0Qizio9osmvn9IUY= github.com/frankban/quicktest v1.2.2/go.mod h1:Qh/WofXFeiAFII1aEBu529AtJo6Zg2VHscnEsbBnJ20= -github.com/frankban/quicktest v1.11.2 h1:mjwHjStlXWibxOohM7HYieIViKyh56mmt3+6viyhDDI= -github.com/frankban/quicktest v1.11.2/go.mod h1:K+q6oSqb0W0Ininfk863uOk1lMy69l/P6txr3mVT54s= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= @@ -278,7 +277,6 @@ github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= @@ -408,23 +406,16 @@ github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1 github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= github.com/juju/ansiterm v0.0.0-20180109212912-720a0952cc2a/go.mod h1:UJSiEoRfvx3hP73CvoARgeLjaIOjybY9vj8PUPPFGeU= -github.com/juju/clock v1.0.0 h1:9U1jPr/FT0DfZjl8qh9dSACAXUodjPOz+uZBdeVv/N8= -github.com/juju/clock v1.0.0/go.mod h1:GZ/FY8Cqw3KHG6DwRVPUKbSPTAwyrU28xFi5cqZnLsc= -github.com/juju/collections v1.0.0 h1:iuWddKN/SMbjLoyOpcnAl8XyBCavZm6coeFBcXQldbw= -github.com/juju/collections v1.0.0/go.mod h1:JWeZdyttIEbkR51z2S13+J+aCuHVe0F6meRy+P0YGDo= -github.com/juju/errors v1.0.0 h1:yiq7kjCLll1BiaRuNY53MGI0+EQ3rF6GB+wvboZDefM= -github.com/juju/errors v1.0.0/go.mod h1:B5x9thDqx0wIMH3+aLIMP9HjItInYWObRovoCFM5Qe8= +github.com/juju/clock v0.0.0-20220203021603-d9deb868a28a h1:Az/6CM/P5guGHNy7r6TkOCctv3lDmN3W1uhku7QMupk= +github.com/juju/collections v0.0.0-20220203020748-febd7cad8a7a h1:d7eZO8OS/ZXxdP0uq3E8CdoA1qNFaecAv90UxrxaY2k= +github.com/juju/errors v0.0.0-20220331221717-b38fca44723b h1:AxFeSQJfcm2O3ov1wqAkTKYFsnMw2g1B4PkYujfAdkY= github.com/juju/loggo v0.0.0-20210728185423-eebad3a902c4 h1:NO5tuyw++EGLnz56Q8KMyDZRwJwWO8jQnj285J3FOmY= github.com/juju/loggo v0.0.0-20210728185423-eebad3a902c4/go.mod h1:NIXFioti1SmKAlKNuUwbMenNdef59IF52+ZzuOmHYkg= -github.com/juju/mgo/v2 v2.0.0 h1:gUhskkN5WpxFEWYzX4pTkX55D7vYKwVJAWjXDFEZHyw= -github.com/juju/mgo/v2 v2.0.0/go.mod h1:N614SE0a4e+ih2rg96Vi2PeC3cTpUOWgCTv3Cgk974c= -github.com/juju/retry v1.0.0 h1:Tb1hFdDSPGLH/BGdYQOF7utQ9lA0ouVJX2imqgJK6tk= -github.com/juju/retry v1.0.0/go.mod h1:SssN1eYeK3A2qjnFGTiVMbdzGJ2BfluaJblJXvuvgqA= +github.com/juju/mgo/v2 v2.0.0-20220111072304-f200228f1090 h1:zX5GoH3Jp8k1EjUFkApu/YZAYEn0PYQfg/U6IDyNyYs= +github.com/juju/retry v0.0.0-20220204093819-62423bf33287 h1:U+7oMWEglXfiikIppNexButZRwKPlzLBGKYSNCXzXf8= github.com/juju/testing v0.0.0-20220203020004-a0ff61f03494 h1:XEDzpuZb8Ma7vLja3+5hzUqVTvAqm5Y+ygvnDs5iTMM= -github.com/juju/utils/v3 v3.0.0 h1:Gg3n63mGPbBuoXCo+EPJuMi44hGZfloI8nlCIebHu2Q= -github.com/juju/utils/v3 v3.0.0/go.mod h1:8csUcj1VRkfjNIRzBFWzLFCMLwLqsRWvkmhfVAUwbC4= -github.com/juju/version/v2 v2.0.0 h1:0OjCOlgA2UBbB8fSCgd8fmGsntrSbAWXEJil47bQptY= -github.com/juju/version/v2 v2.0.0/go.mod h1:ZeFjNy+UFEWJDDPdzW7Cm9NeU6dsViGaFYhXzycLQrw= +github.com/juju/utils/v3 v3.0.0-20220203023959-c3fbc78a33b0 h1:bn+2Adl1yWqYjm3KSFlFqsvfLg2eq+XNL7GGMYApdVw= +github.com/juju/version/v2 v2.0.0-20220204124744-fc9915e3d935 h1:6YoyzXVW1XkqN86y2s/rz365Jm7EiAy39v2G5ikzvHU= github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM= github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 h1:Z9n2FFNUXsshfwJMBgNA0RU6/i7WVaAegv3PtuIHPMs= @@ -450,7 +441,6 @@ github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxv github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI= -github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/pty v1.1.8/go.mod h1:O1sed60cT9XZ5uDucP5qwvh+TE3NnUj51EiZO/lmSfw= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= @@ -667,7 +657,6 @@ github.com/ulikunitz/xz v0.5.6/go.mod h1:2bypXElzHzzJZwzH67Y6wb67pO62Rzfn7BSiF4A github.com/ulikunitz/xz v0.5.7/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14= 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/xdg-go/stringprep v1.0.2/go.mod h1:8F9zXuvzgwmyT5DUm4GUfZGDdT3W+LCvS6+da4O5kxM= github.com/xdg-go/stringprep v1.0.4 h1:XLI/Ng3O1Atzq0oBs3TWm+5ZVgkq2aqdlvP9JtoZ6c8= github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 h1:nIPpBwaJSVYIxUFsDv3M8ofmx9yWTog9BfvIu0q41lo= github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8/go.mod h1:HUYIGzjTL3rfEspMxjDjgmT5uz5wzYJKVo23qUhYTos= @@ -1093,7 +1082,6 @@ gopkg.in/check.v1 v1.0.0-20160105164936-4f90aeace3a2/go.mod h1:Co6ibVJAznAaIkqp8 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= -gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= gopkg.in/errgo.v1 v1.0.1 h1:oQFRXzZ7CkBGdm1XZm/EbQYaYNNEElNBOd09M6cqNso= gopkg.in/errgo.v1 v1.0.1/go.mod h1:3NjfXwocQRYAPTq4/fzX+CwUhPRcR/azYRhj8G+LqMo= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= @@ -1109,7 +1097,6 @@ gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24 gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= -gopkg.in/tomb.v2 v2.0.0-20161208151619-d5d1b5820637/go.mod h1:BHsqpu/nsuzkT5BpiH1EMZPLyqSMM8JbIavyFACoFNk= gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74= gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= diff --git a/release.sh b/release.sh index 9913722..0ddaf6a 100755 --- a/release.sh +++ b/release.sh @@ -9,7 +9,7 @@ set -e -PKG="github.com/guggero/chantools" +PKG="github.com/lightninglabs/chantools" PACKAGE=chantools # green prints one line of green text (if the terminal supports it). diff --git a/tools/go.mod b/tools/go.mod index cfa82a7..1f524bc 100644 --- a/tools/go.mod +++ b/tools/go.mod @@ -1,4 +1,4 @@ -module github.com/guggero/chantools/tools +module github.com/lightninglabs/chantools/tools go 1.18