Skip to content

Commit deec719

Browse files
guggeroguggero
authored
Merge pull request #472 from lightninglabs/btcec-v2-btcutil-bump
multi: bump btcec/v2 and btcutil to new versions
2 parents d1ba70e + 5f46d0b commit deec719

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+269
-414
lines changed

‎.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ git:
1313
depth: false
1414

1515
go:
16-
- "1.15.x"
16+
- "1.17.x"
1717

1818
env:
1919
global:

‎Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.15-alpine as builder
1+
FROM golang:1.17-alpine as builder
22

33
# Copy in the local repository to build from.
44
COPY . /go/src/github.com/lightningnetwork/loop

‎client.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"sync/atomic"
1010
"time"
1111

12-
"github.com/btcsuite/btcutil"
12+
"github.com/btcsuite/btcd/btcutil"
1313
"github.com/lightninglabs/aperture/lsat"
1414
"github.com/lightninglabs/lndclient"
1515
"github.com/lightninglabs/loop/loopdb"

‎client_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ import (
77
"errors"
88
"testing"
99

10+
"github.com/btcsuite/btcd/btcutil"
1011
"github.com/btcsuite/btcd/chaincfg"
1112
"github.com/btcsuite/btcd/chaincfg/chainhash"
12-
"github.com/btcsuite/btcutil"
1313
"github.com/lightninglabs/lndclient"
1414
"github.com/lightninglabs/loop/loopdb"
1515
"github.com/lightninglabs/loop/swap"

‎cmd/loop/loopout.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"strings"
88
"time"
99

10-
"github.com/btcsuite/btcutil"
10+
"github.com/btcsuite/btcd/btcutil"
1111
"github.com/lightninglabs/loop"
1212
"github.com/lightninglabs/loop/labels"
1313
"github.com/lightninglabs/loop/loopdb"

‎cmd/loop/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
"github.com/lightningnetwork/lnd/lncfg"
2323
"github.com/lightningnetwork/lnd/macaroons"
2424

25-
"github.com/btcsuite/btcutil"
25+
"github.com/btcsuite/btcd/btcutil"
2626

2727
"github.com/urfave/cli"
2828
"google.golang.org/grpc"

‎cmd/loop/terms.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"context"
55
"fmt"
66

7-
"github.com/btcsuite/btcutil"
7+
"github.com/btcsuite/btcd/btcutil"
88
"github.com/lightninglabs/loop/looprpc"
99
"github.com/urfave/cli"
1010
)

‎go.mod

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,35 @@
11
module github.com/lightninglabs/loop
22

33
require (
4-
github.com/btcsuite/btcd v0.22.0-beta.0.20211005184431-e3449998be39
4+
github.com/btcsuite/btcd v0.22.0-beta.0.20220207191057-4dc4ff7963b4
5+
github.com/btcsuite/btcd/btcec/v2 v2.1.0
6+
github.com/btcsuite/btcd/btcutil v1.1.0
57
github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f
6-
github.com/btcsuite/btcutil v1.0.3-0.20210527170813-e2ba6805a890
7-
github.com/btcsuite/btcwallet/wtxmgr v1.3.1-0.20210822222949-9b5a201c344c
8+
github.com/btcsuite/btcwallet/wtxmgr v1.5.0
89
github.com/coreos/bbolt v1.3.3
910
github.com/davecgh/go-spew v1.1.1
1011
github.com/fortytw2/leaktest v1.3.0
1112
github.com/grpc-ecosystem/grpc-gateway/v2 v2.5.0
1213
github.com/jessevdk/go-flags v1.4.0
13-
github.com/lightninglabs/aperture v0.1.6-beta
14-
github.com/lightninglabs/lndclient v0.14.2-3
14+
github.com/lightninglabs/aperture v0.1.17-beta.0.20220325093943-42b9d4c1be7f
15+
github.com/lightninglabs/lndclient v0.15.0-0
1516
github.com/lightninglabs/loop/swapserverrpc v1.0.0
1617
github.com/lightninglabs/protobuf-hex-display v1.4.3-hex-display
17-
github.com/lightningnetwork/lnd v0.14.2-beta
18-
github.com/lightningnetwork/lnd/cert v1.1.0
18+
github.com/lightningnetwork/lnd v0.14.1-beta.0.20220324135938-0dcaa511a249
19+
github.com/lightningnetwork/lnd/cert v1.1.1
1920
github.com/lightningnetwork/lnd/clock v1.1.0
2021
github.com/lightningnetwork/lnd/queue v1.1.0
2122
github.com/lightningnetwork/lnd/ticker v1.1.0
23+
github.com/lightningnetwork/lnd/tor v1.0.0
2224
github.com/stretchr/testify v1.7.0
2325
github.com/urfave/cli v1.22.4
24-
golang.org/x/net v0.0.0-20210913180222-943fd674d43e
25-
google.golang.org/grpc v1.38.0
26-
google.golang.org/protobuf v1.26.0
26+
golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f
27+
google.golang.org/grpc v1.39.0
28+
google.golang.org/protobuf v1.27.1
2729
gopkg.in/macaroon-bakery.v2 v2.0.1
2830
gopkg.in/macaroon.v2 v2.1.0
2931
)
3032

31-
go 1.15
33+
go 1.16
3234

3335
replace github.com/lightninglabs/loop/swapserverrpc => ./swapserverrpc
34-
35-
// TODO(bhandras): remove once v0.14.3-beta or v0.15.0-beta is tagged.
36-
replace github.com/lightningnetwork/lnd => github.com/lightningnetwork/lnd v0.14.1-beta.0.20220131141659-60625b6c1a0b

‎go.sum

Lines changed: 157 additions & 302 deletions
Large diffs are not rendered by default.

‎interface.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package loop
33
import (
44
"time"
55

6-
"github.com/btcsuite/btcutil"
6+
"github.com/btcsuite/btcd/btcutil"
77
"github.com/lightninglabs/loop/loopdb"
88
"github.com/lightninglabs/loop/swap"
99
"github.com/lightningnetwork/lnd/lntypes"

‎liquidity/autoloop_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"testing"
55
"time"
66

7-
"github.com/btcsuite/btcutil"
7+
"github.com/btcsuite/btcd/btcutil"
88
"github.com/lightninglabs/lndclient"
99
"github.com/lightninglabs/loop"
1010
"github.com/lightninglabs/loop/labels"

‎liquidity/autoloop_testcontext_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"context"
55
"testing"
66

7-
"github.com/btcsuite/btcutil"
7+
"github.com/btcsuite/btcd/btcutil"
88
"github.com/lightninglabs/lndclient"
99
"github.com/lightninglabs/loop"
1010
"github.com/lightninglabs/loop/loopdb"

‎liquidity/balances.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package liquidity
22

33
import (
4-
"github.com/btcsuite/btcutil"
4+
"github.com/btcsuite/btcd/btcutil"
55
"github.com/lightninglabs/lndclient"
66
"github.com/lightningnetwork/lnd/lnwire"
77
"github.com/lightningnetwork/lnd/routing/route"

‎liquidity/fees.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"errors"
55
"fmt"
66

7-
"github.com/btcsuite/btcutil"
7+
"github.com/btcsuite/btcd/btcutil"
88
"github.com/lightninglabs/loop"
99
"github.com/lightningnetwork/lnd/lnwallet/chainfee"
1010
)

‎liquidity/interface.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package liquidity
33
import (
44
"context"
55

6-
"github.com/btcsuite/btcutil"
6+
"github.com/btcsuite/btcd/btcutil"
77
"github.com/lightninglabs/loop"
88
"github.com/lightninglabs/loop/swap"
99
"github.com/lightningnetwork/lnd/lnwallet/chainfee"

‎liquidity/liquidity.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ import (
4141
"sync"
4242
"time"
4343

44-
"github.com/btcsuite/btcutil"
44+
"github.com/btcsuite/btcd/btcutil"
4545
"github.com/lightninglabs/lndclient"
4646
"github.com/lightninglabs/loop"
4747
"github.com/lightninglabs/loop/labels"

‎liquidity/liquidity_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"testing"
66
"time"
77

8-
"github.com/btcsuite/btcutil"
8+
"github.com/btcsuite/btcd/btcutil"
99
"github.com/lightninglabs/lndclient"
1010
"github.com/lightninglabs/loop"
1111
"github.com/lightninglabs/loop/labels"

‎liquidity/loopin.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package liquidity
22

33
import (
4-
"github.com/btcsuite/btcutil"
4+
"github.com/btcsuite/btcd/btcutil"
55
"github.com/lightninglabs/loop"
66
"github.com/lightninglabs/loop/swap"
77
"github.com/lightningnetwork/lnd/input"

‎liquidity/loopin_builder.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package liquidity
33
import (
44
"context"
55

6-
"github.com/btcsuite/btcutil"
6+
"github.com/btcsuite/btcd/btcutil"
77
"github.com/lightninglabs/loop"
88
"github.com/lightninglabs/loop/labels"
99
"github.com/lightninglabs/loop/swap"

‎liquidity/loopin_builder_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"errors"
66
"testing"
77

8-
"github.com/btcsuite/btcutil"
8+
"github.com/btcsuite/btcd/btcutil"
99
"github.com/lightninglabs/loop"
1010
"github.com/lightningnetwork/lnd/lnwire"
1111
"github.com/lightningnetwork/lnd/routing/route"

‎liquidity/loopout.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package liquidity
22

33
import (
4-
"github.com/btcsuite/btcutil"
4+
"github.com/btcsuite/btcd/btcutil"
55
"github.com/lightninglabs/loop"
66
"github.com/lightningnetwork/lnd/lnwire"
77
"github.com/lightningnetwork/lnd/routing/route"

‎liquidity/loopout_builder.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package liquidity
33
import (
44
"context"
55

6-
"github.com/btcsuite/btcutil"
6+
"github.com/btcsuite/btcd/btcutil"
77
"github.com/lightninglabs/loop"
88
"github.com/lightninglabs/loop/labels"
99
"github.com/lightninglabs/loop/loopdb"

‎liquidity/restrictions.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package liquidity
33
import (
44
"fmt"
55

6-
"github.com/btcsuite/btcutil"
6+
"github.com/btcsuite/btcd/btcutil"
77
)
88

99
// Restrictions indicates the restrictions placed on a swap.

‎liquidity/threshold_rule.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"errors"
55
"fmt"
66

7-
"github.com/btcsuite/btcutil"
7+
"github.com/btcsuite/btcd/btcutil"
88
"github.com/lightninglabs/loop/swap"
99
)
1010

‎liquidity/threshold_rule_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package liquidity
33
import (
44
"testing"
55

6-
"github.com/btcsuite/btcutil"
6+
"github.com/btcsuite/btcd/btcutil"
77
"github.com/lightninglabs/loop/swap"
88
"github.com/stretchr/testify/require"
99
)

‎loopd/config.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"path/filepath"
1010
"time"
1111

12-
"github.com/btcsuite/btcutil"
12+
"github.com/btcsuite/btcd/btcutil"
1313
"github.com/lightninglabs/aperture/lsat"
1414
"github.com/lightningnetwork/lnd/cert"
1515
"github.com/lightningnetwork/lnd/lncfg"

‎loopd/swapclient_server.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ import (
99
"sync"
1010
"time"
1111

12-
"github.com/btcsuite/btcd/btcec"
12+
"github.com/btcsuite/btcd/btcec/v2"
13+
"github.com/btcsuite/btcd/btcutil"
1314
"github.com/btcsuite/btcd/chaincfg"
14-
"github.com/btcsuite/btcutil"
1515
"github.com/lightninglabs/lndclient"
1616
"github.com/lightninglabs/loop"
1717
"github.com/lightninglabs/loop/labels"
@@ -555,7 +555,7 @@ func unmarshallHopHint(rpcHint *looprpc.HopHint) (zpay32.HopHint, error) {
555555
return zpay32.HopHint{}, err
556556
}
557557

558-
pubkey, err := btcec.ParsePubKey(pubBytes, btcec.S256())
558+
pubkey, err := btcec.ParsePubKey(pubBytes)
559559
if err != nil {
560560
return zpay32.HopHint{}, err
561561
}

‎loopd/swapclient_server_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import (
55
"errors"
66
"testing"
77

8+
"github.com/btcsuite/btcd/btcutil"
89
"github.com/btcsuite/btcd/chaincfg"
9-
"github.com/btcsuite/btcutil"
1010
"github.com/lightninglabs/lndclient"
1111
"github.com/lightninglabs/loop"
1212
"github.com/lightninglabs/loop/labels"

‎loopd/utils.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package loopd
33
import (
44
"context"
55

6-
"github.com/btcsuite/btcutil"
6+
"github.com/btcsuite/btcd/btcutil"
77
"github.com/lightninglabs/lndclient"
88
"github.com/lightninglabs/loop"
99
"github.com/lightninglabs/loop/liquidity"

‎loopdb/loop.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"encoding/binary"
66
"time"
77

8-
"github.com/btcsuite/btcutil"
8+
"github.com/btcsuite/btcd/btcutil"
99
"github.com/lightningnetwork/lnd/lntypes"
1010
)
1111

‎loopdb/loopout.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ import (
88
"strings"
99
"time"
1010

11+
"github.com/btcsuite/btcd/btcutil"
1112
"github.com/btcsuite/btcd/chaincfg"
1213
"github.com/btcsuite/btcd/wire"
13-
"github.com/btcsuite/btcutil"
1414
)
1515

1616
// LoopOutContract contains the data that is serialized to persistent storage

‎loopdb/swapstate.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package loopdb
22

33
import (
4+
"github.com/btcsuite/btcd/btcutil"
45
"github.com/btcsuite/btcd/chaincfg/chainhash"
5-
"github.com/btcsuite/btcutil"
66
)
77

88
// SwapState indicates the current state of a swap. This enumeration is the

‎loopin.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ import (
99
"sync"
1010
"time"
1111

12+
"github.com/btcsuite/btcd/btcutil"
1213
"github.com/btcsuite/btcd/chaincfg/chainhash"
1314
"github.com/btcsuite/btcd/mempool"
1415
"github.com/btcsuite/btcd/wire"
15-
"github.com/btcsuite/btcutil"
1616
"github.com/lightninglabs/lndclient"
1717
"github.com/lightninglabs/loop/labels"
1818
"github.com/lightninglabs/loop/loopdb"

‎loopin_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import (
44
"context"
55
"testing"
66

7+
"github.com/btcsuite/btcd/btcutil"
78
"github.com/btcsuite/btcd/wire"
8-
"github.com/btcsuite/btcutil"
99
"github.com/lightninglabs/loop/loopdb"
1010
"github.com/lightninglabs/loop/swap"
1111
"github.com/lightninglabs/loop/test"

‎loopin_testcontext_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"testing"
55
"time"
66

7-
"github.com/btcsuite/btcutil"
7+
"github.com/btcsuite/btcd/btcutil"
88
"github.com/lightninglabs/lndclient"
99
"github.com/lightninglabs/loop/loopdb"
1010
"github.com/lightninglabs/loop/sweep"

‎loopout.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ import (
1010
"sync"
1111
"time"
1212

13+
"github.com/btcsuite/btcd/btcutil"
1314
"github.com/btcsuite/btcd/chaincfg/chainhash"
1415
"github.com/btcsuite/btcd/wire"
15-
"github.com/btcsuite/btcutil"
1616
"github.com/lightninglabs/lndclient"
1717
"github.com/lightninglabs/loop/labels"
1818
"github.com/lightninglabs/loop/loopdb"

‎loopout_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import (
99
"time"
1010

1111
"github.com/btcsuite/btcd/blockchain"
12+
"github.com/btcsuite/btcd/btcutil"
1213
"github.com/btcsuite/btcd/wire"
13-
"github.com/btcsuite/btcutil"
1414
"github.com/lightninglabs/lndclient"
1515
"github.com/lightninglabs/loop/loopdb"
1616
"github.com/lightninglabs/loop/sweep"

‎looprpc/client.pb.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)