Skip to content

Commit 7eee3cd

Browse files
guggeroguggero
committed
multi: update to lnd v0.11.1-beta
1 parent 8e8d342 commit 7eee3cd

File tree

12 files changed

+570
-62
lines changed

12 files changed

+570
-62
lines changed

‎cmd/chantools/chanbackup.go‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,10 @@ package main
22

33
import (
44
"fmt"
5-
"path"
65

76
"github.com/btcsuite/btcutil/hdkeychain"
87
"github.com/guggero/chantools/lnd"
98
"github.com/lightningnetwork/lnd/chanbackup"
10-
"github.com/lightningnetwork/lnd/channeldb"
119
)
1210

1311
type chanBackupCommand struct {
@@ -45,11 +43,7 @@ func (c *chanBackupCommand) Execute(_ []string) error {
4543
if c.ChannelDB == "" {
4644
return fmt.Errorf("channel DB is required")
4745
}
48-
db, err := channeldb.Open(
49-
path.Dir(c.ChannelDB), path.Base(c.ChannelDB),
50-
channeldb.OptionSetSyncFreelist(true),
51-
channeldb.OptionReadOnly(true),
52-
)
46+
db, err := lnd.OpenDB(c.ChannelDB, true)
5347
if err != nil {
5448
return fmt.Errorf("error opening rescue DB: %v", err)
5549
}

‎cmd/chantools/dumpchannels.go‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ package main
22

33
import (
44
"fmt"
5-
"path"
65

76
"github.com/davecgh/go-spew/spew"
87
"github.com/guggero/chantools/dump"
8+
"github.com/guggero/chantools/lnd"
99
"github.com/lightningnetwork/lnd/channeldb"
1010
)
1111

@@ -21,15 +21,11 @@ func (c *dumpChannelsCommand) Execute(_ []string) error {
2121
if c.ChannelDB == "" {
2222
return fmt.Errorf("channel DB is required")
2323
}
24-
db, err := channeldb.Open(
25-
path.Dir(c.ChannelDB), path.Base(c.ChannelDB),
26-
channeldb.OptionSetSyncFreelist(true),
27-
channeldb.OptionReadOnly(true),
28-
)
24+
db, err := lnd.OpenDB(c.ChannelDB, true)
2925
if err != nil {
3026
return fmt.Errorf("error opening rescue DB: %v", err)
3127
}
32-
28+
3329
if c.Closed {
3430
return dumpClosedChannelInfo(db)
3531
}
@@ -64,4 +60,4 @@ func dumpClosedChannelInfo(chanDb *channeldb.DB) error {
6460

6561
spew.Dump(dumpChannels)
6662
return nil
67-
}
63+
}

‎cmd/chantools/forceclose.go‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import (
77
"fmt"
88
"io"
99
"io/ioutil"
10-
"path"
1110
"time"
1211

1312
"github.com/btcsuite/btcd/txscript"
@@ -49,11 +48,7 @@ func (c *forceCloseCommand) Execute(_ []string) error {
4948
if c.ChannelDB == "" {
5049
return fmt.Errorf("rescue DB is required")
5150
}
52-
db, err := channeldb.Open(
53-
path.Dir(c.ChannelDB), path.Base(c.ChannelDB),
54-
channeldb.OptionSetSyncFreelist(true),
55-
channeldb.OptionReadOnly(true),
56-
)
51+
db, err := lnd.OpenDB(c.ChannelDB, true)
5752
if err != nil {
5853
return fmt.Errorf("error opening rescue DB: %v", err)
5954
}

‎cmd/chantools/main.go‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ import (
77
"fmt"
88
"io/ioutil"
99
"os"
10-
"path"
1110
"strings"
1211
"syscall"
1312

1413
"github.com/btcsuite/btcd/chaincfg"
1514
"github.com/btcsuite/btclog"
1615
"github.com/guggero/chantools/dataformat"
16+
"github.com/guggero/chantools/lnd"
1717
"github.com/jessevdk/go-flags"
1818
"github.com/lightningnetwork/lnd/build"
1919
"github.com/lightningnetwork/lnd/chanbackup"
@@ -182,11 +182,7 @@ func parseInputType(cfg *config) ([]*dataformat.SummaryEntry, error) {
182182
target = &dataformat.SummaryEntryFile{}
183183

184184
case cfg.FromChannelDB != "":
185-
db, err := channeldb.Open(
186-
path.Dir(cfg.FromChannelDB), path.Base(cfg.FromChannelDB),
187-
channeldb.OptionSetSyncFreelist(true),
188-
channeldb.OptionReadOnly(true),
189-
)
185+
db, err := lnd.OpenDB(cfg.FromChannelDB, true)
190186
if err != nil {
191187
return nil, fmt.Errorf("error opening channel DB: %v",
192188
err)

‎cmd/chantools/rescueclosed.go‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import (
66
"errors"
77
"fmt"
88
"io/ioutil"
9-
"path"
109
"time"
1110

1211
"github.com/btcsuite/btcd/btcec"
@@ -60,11 +59,7 @@ func (c *rescueClosedCommand) Execute(_ []string) error {
6059
if c.ChannelDB == "" {
6160
return fmt.Errorf("rescue DB is required")
6261
}
63-
db, err := channeldb.Open(
64-
path.Dir(c.ChannelDB), path.Base(c.ChannelDB),
65-
channeldb.OptionSetSyncFreelist(true),
66-
channeldb.OptionReadOnly(true),
67-
)
62+
db, err := lnd.OpenDB(c.ChannelDB, true)
6863
if err != nil {
6964
return fmt.Errorf("error opening rescue DB: %v", err)
7065
}

‎cmd/chantools/rescuefunding.go‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package main
33
import (
44
"bytes"
55
"fmt"
6+
67
"github.com/btcsuite/btcd/wire"
78
"github.com/btcsuite/btcutil"
89
"github.com/btcsuite/btcutil/hdkeychain"
@@ -11,7 +12,6 @@ import (
1112
"github.com/lightningnetwork/lnd/channeldb"
1213
"github.com/lightningnetwork/lnd/input"
1314
"github.com/lightningnetwork/lnd/lnwallet/chainfee"
14-
"path"
1515
)
1616

1717
const (
@@ -74,11 +74,7 @@ func (c *rescueFundingCommand) Execute(_ []string) error {
7474
if c.ChannelDB == "" {
7575
return fmt.Errorf("channel DB is required")
7676
}
77-
db, err := channeldb.Open(
78-
path.Dir(c.ChannelDB), path.Base(c.ChannelDB),
79-
channeldb.OptionSetSyncFreelist(true),
80-
channeldb.OptionReadOnly(true),
81-
)
77+
db, err := lnd.OpenDB(c.ChannelDB, true)
8278
if err != nil {
8379
return fmt.Errorf("error opening rescue DB: %v", err)
8480
}

‎cmd/chantools/sweeptimelock.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ func sweepTimeLock(extendedKey *hdkeychain.ExtendedKey, apiURL string,
216216
Value: totalOutputValue - int64(totalFee),
217217
PkScript: sweepScript,
218218
}}
219-
219+
220220
// Sign the transaction now.
221221
sigHashes := txscript.NewTxSigHashes(sweepTx)
222222
for idx, desc := range signDescs {

‎go.mod‎

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,29 +3,25 @@ module github.com/guggero/chantools
33
require (
44
git.schwanenlied.me/yawning/bsaes.git v0.0.0-20190320102049-26d1add596b6 // indirect
55
github.com/Yawning/aez v0.0.0-20180408160647-ec7426b44926 // indirect
6-
github.com/btcsuite/btcd v0.20.1-beta
6+
github.com/btcsuite/btcd v0.21.0-beta.0.20201208033208-6bd4c64a54fa
77
github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f
8-
github.com/btcsuite/btcutil v0.0.0-20191219182022-e17c9730c422
9-
github.com/btcsuite/btcutil/psbt v0.0.0-00010101000000-000000000000
10-
github.com/btcsuite/btcwallet v0.11.1-0.20200219004649-ae9416ad7623
11-
github.com/btcsuite/btcwallet/walletdb v1.2.0
8+
github.com/btcsuite/btcutil v1.0.2
9+
github.com/btcsuite/btcutil/psbt v1.0.3-0.20200826194809-5f93e33af2b0
10+
github.com/btcsuite/btcwallet v0.11.1-0.20201207233335-415f37ff11a1
11+
github.com/btcsuite/btcwallet/walletdb v1.3.4
1212
github.com/coreos/bbolt v1.3.3
1313
github.com/davecgh/go-spew v1.1.1
1414
github.com/golang/protobuf v1.3.2 // indirect
1515
github.com/jessevdk/go-flags v1.4.0
16-
github.com/lightningnetwork/lnd v0.8.0-beta-rc3.0.20191224233846-f289a39c1a00
16+
github.com/lightningnetwork/lnd v0.11.1-beta
1717
github.com/ltcsuite/ltcd v0.0.0-20191228044241-92166e412499 // indirect
1818
github.com/miekg/dns v1.1.26 // indirect
19-
golang.org/x/crypto v0.0.0-20200115085410-6d4e4cb37c7d
19+
go.etcd.io/bbolt v1.3.5-0.20200615073812-232d8fc87f50
20+
golang.org/x/crypto v0.0.0-20200709230013-948cd5f35899
2021
golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553 // indirect
21-
golang.org/x/sys v0.0.0-20191224085550-c709ea063b76 // indirect
2222
gopkg.in/yaml.v2 v2.2.3 // indirect
2323
)
2424

25-
replace github.com/lightningnetwork/lnd => github.com/guggero/lnd v0.9.0-beta-rc4.0.20200826102054-8c9171307182
26-
27-
replace github.com/btcsuite/btcutil => github.com/btcsuite/btcutil v1.0.2
28-
29-
replace github.com/btcsuite/btcutil/psbt => github.com/btcsuite/btcutil/psbt v1.0.2
25+
replace github.com/lightningnetwork/lnd => github.com/guggero/lnd v0.11.0-beta.rc4.0.20201214215106-06bde4fb8ccf
3026

3127
go 1.13

0 commit comments

Comments
 (0)