Skip to content

Commit

Permalink
multi: update to lnd v0.11.1-beta
Browse files Browse the repository at this point in the history
  • Loading branch information
@guggero
guggero committed Dec 14, 2020
1 parent 8e8d342 commit 7eee3cd
Show file tree
Hide file tree
Showing 12 changed files with 570 additions and 62 deletions.
8 changes: 1 addition & 7 deletions cmd/chantools/chanbackup.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,10 @@ package main

import (
"fmt"
"path"

"github.com/btcsuite/btcutil/hdkeychain"
"github.com/guggero/chantools/lnd"
"github.com/lightningnetwork/lnd/chanbackup"
"github.com/lightningnetwork/lnd/channeldb"
)

type chanBackupCommand struct {
Expand Down Expand Up @@ -45,11 +43,7 @@ func (c *chanBackupCommand) Execute(_ []string) error {
if c.ChannelDB == "" {
return fmt.Errorf("channel DB is required")
}
db, err := channeldb.Open(
path.Dir(c.ChannelDB), path.Base(c.ChannelDB),
channeldb.OptionSetSyncFreelist(true),
channeldb.OptionReadOnly(true),
)
db, err := lnd.OpenDB(c.ChannelDB, true)
if err != nil {
return fmt.Errorf("error opening rescue DB: %v", err)
}
Expand Down
12 changes: 4 additions & 8 deletions cmd/chantools/dumpchannels.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ package main

import (
"fmt"
"path"

"github.com/davecgh/go-spew/spew"
"github.com/guggero/chantools/dump"
"github.com/guggero/chantools/lnd"
"github.com/lightningnetwork/lnd/channeldb"
)

Expand All @@ -21,15 +21,11 @@ func (c *dumpChannelsCommand) Execute(_ []string) error {
if c.ChannelDB == "" {
return fmt.Errorf("channel DB is required")
}
db, err := channeldb.Open(
path.Dir(c.ChannelDB), path.Base(c.ChannelDB),
channeldb.OptionSetSyncFreelist(true),
channeldb.OptionReadOnly(true),
)
db, err := lnd.OpenDB(c.ChannelDB, true)
if err != nil {
return fmt.Errorf("error opening rescue DB: %v", err)
}

if c.Closed {
return dumpClosedChannelInfo(db)
}
Expand Down Expand Up @@ -64,4 +60,4 @@ func dumpClosedChannelInfo(chanDb *channeldb.DB) error {

spew.Dump(dumpChannels)
return nil
}
}
7 changes: 1 addition & 6 deletions cmd/chantools/forceclose.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import (
"fmt"
"io"
"io/ioutil"
"path"
"time"

"github.com/btcsuite/btcd/txscript"
Expand Down Expand Up @@ -49,11 +48,7 @@ func (c *forceCloseCommand) Execute(_ []string) error {
if c.ChannelDB == "" {
return fmt.Errorf("rescue DB is required")
}
db, err := channeldb.Open(
path.Dir(c.ChannelDB), path.Base(c.ChannelDB),
channeldb.OptionSetSyncFreelist(true),
channeldb.OptionReadOnly(true),
)
db, err := lnd.OpenDB(c.ChannelDB, true)
if err != nil {
return fmt.Errorf("error opening rescue DB: %v", err)
}
Expand Down
8 changes: 2 additions & 6 deletions cmd/chantools/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ import (
"fmt"
"io/ioutil"
"os"
"path"
"strings"
"syscall"

"github.com/btcsuite/btcd/chaincfg"
"github.com/btcsuite/btclog"
"github.com/guggero/chantools/dataformat"
"github.com/guggero/chantools/lnd"
"github.com/jessevdk/go-flags"
"github.com/lightningnetwork/lnd/build"
"github.com/lightningnetwork/lnd/chanbackup"
Expand Down Expand Up @@ -182,11 +182,7 @@ func parseInputType(cfg *config) ([]*dataformat.SummaryEntry, error) {
target = &dataformat.SummaryEntryFile{}

case cfg.FromChannelDB != "":
db, err := channeldb.Open(
path.Dir(cfg.FromChannelDB), path.Base(cfg.FromChannelDB),
channeldb.OptionSetSyncFreelist(true),
channeldb.OptionReadOnly(true),
)
db, err := lnd.OpenDB(cfg.FromChannelDB, true)
if err != nil {
return nil, fmt.Errorf("error opening channel DB: %v",
err)
Expand Down
7 changes: 1 addition & 6 deletions cmd/chantools/rescueclosed.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import (
"errors"
"fmt"
"io/ioutil"
"path"
"time"

"github.com/btcsuite/btcd/btcec"
Expand Down Expand Up @@ -60,11 +59,7 @@ func (c *rescueClosedCommand) Execute(_ []string) error {
if c.ChannelDB == "" {
return fmt.Errorf("rescue DB is required")
}
db, err := channeldb.Open(
path.Dir(c.ChannelDB), path.Base(c.ChannelDB),
channeldb.OptionSetSyncFreelist(true),
channeldb.OptionReadOnly(true),
)
db, err := lnd.OpenDB(c.ChannelDB, true)
if err != nil {
return fmt.Errorf("error opening rescue DB: %v", err)
}
Expand Down
8 changes: 2 additions & 6 deletions cmd/chantools/rescuefunding.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package main
import (
"bytes"
"fmt"

"github.com/btcsuite/btcd/wire"
"github.com/btcsuite/btcutil"
"github.com/btcsuite/btcutil/hdkeychain"
Expand All @@ -11,7 +12,6 @@ import (
"github.com/lightningnetwork/lnd/channeldb"
"github.com/lightningnetwork/lnd/input"
"github.com/lightningnetwork/lnd/lnwallet/chainfee"
"path"
)

const (
Expand Down Expand Up @@ -74,11 +74,7 @@ func (c *rescueFundingCommand) Execute(_ []string) error {
if c.ChannelDB == "" {
return fmt.Errorf("channel DB is required")
}
db, err := channeldb.Open(
path.Dir(c.ChannelDB), path.Base(c.ChannelDB),
channeldb.OptionSetSyncFreelist(true),
channeldb.OptionReadOnly(true),
)
db, err := lnd.OpenDB(c.ChannelDB, true)
if err != nil {
return fmt.Errorf("error opening rescue DB: %v", err)
}
Expand Down
2 changes: 1 addition & 1 deletion cmd/chantools/sweeptimelock.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ func sweepTimeLock(extendedKey *hdkeychain.ExtendedKey, apiURL string,
Value: totalOutputValue - int64(totalFee),
PkScript: sweepScript,
}}

// Sign the transaction now.
sigHashes := txscript.NewTxSigHashes(sweepTx)
for idx, desc := range signDescs {
Expand Down
22 changes: 9 additions & 13 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,29 +3,25 @@ module github.com/guggero/chantools
require (
git.schwanenlied.me/yawning/bsaes.git v0.0.0-20190320102049-26d1add596b6 // indirect
github.com/Yawning/aez v0.0.0-20180408160647-ec7426b44926 // indirect
github.com/btcsuite/btcd v0.20.1-beta
github.com/btcsuite/btcd v0.21.0-beta.0.20201208033208-6bd4c64a54fa
github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f
github.com/btcsuite/btcutil v0.0.0-20191219182022-e17c9730c422
github.com/btcsuite/btcutil/psbt v0.0.0-00010101000000-000000000000
github.com/btcsuite/btcwallet v0.11.1-0.20200219004649-ae9416ad7623
github.com/btcsuite/btcwallet/walletdb v1.2.0
github.com/btcsuite/btcutil v1.0.2
github.com/btcsuite/btcutil/psbt v1.0.3-0.20200826194809-5f93e33af2b0
github.com/btcsuite/btcwallet v0.11.1-0.20201207233335-415f37ff11a1
github.com/btcsuite/btcwallet/walletdb v1.3.4
github.com/coreos/bbolt v1.3.3
github.com/davecgh/go-spew v1.1.1
github.com/golang/protobuf v1.3.2 // indirect
github.com/jessevdk/go-flags v1.4.0
github.com/lightningnetwork/lnd v0.8.0-beta-rc3.0.20191224233846-f289a39c1a00
github.com/lightningnetwork/lnd v0.11.1-beta
github.com/ltcsuite/ltcd v0.0.0-20191228044241-92166e412499 // indirect
github.com/miekg/dns v1.1.26 // indirect
golang.org/x/crypto v0.0.0-20200115085410-6d4e4cb37c7d
go.etcd.io/bbolt v1.3.5-0.20200615073812-232d8fc87f50
golang.org/x/crypto v0.0.0-20200709230013-948cd5f35899
golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553 // indirect
golang.org/x/sys v0.0.0-20191224085550-c709ea063b76 // indirect
gopkg.in/yaml.v2 v2.2.3 // indirect
)

replace github.com/lightningnetwork/lnd => github.com/guggero/lnd v0.9.0-beta-rc4.0.20200826102054-8c9171307182

replace github.com/btcsuite/btcutil => github.com/btcsuite/btcutil v1.0.2

replace github.com/btcsuite/btcutil/psbt => github.com/btcsuite/btcutil/psbt v1.0.2
replace github.com/lightningnetwork/lnd => github.com/guggero/lnd v0.11.0-beta.rc4.0.20201214215106-06bde4fb8ccf

go 1.13
Loading

0 comments on commit 7eee3cd

Please sign in to comment.