Archives
/
loop
mirror of https://github.com/lightninglabs/loop
2
0
Fork 0
Code Issues Releases Wiki Activity

multi: bump btcd/btcec => btcd/btcec/v2

Browse Source
pull/467/head
Harsha Goli 2 years ago
parent a6350905d7
commit 3e9d819d36
No known key found for this signature in database
GPG Key ID: 90E00CCB1C74C611
55 changed files with 281 additions and 410 deletions
Show Stats Download Patch File Download Diff File

2
client.go
Unescape Escape View File

@ -9,7 +9,7 @@ import (
"sync/atomic"
"time"
"github.com/btcsuite/btcutil"
"github.com/btcsuite/btcd/btcutil"
"github.com/lightninglabs/aperture/lsat"
"github.com/lightninglabs/lndclient"
"github.com/lightninglabs/loop/loopdb"

2
client_test.go
Unescape Escape View File

@ -7,9 +7,9 @@ import (
"errors"
"testing"
"github.com/btcsuite/btcd/btcutil"
"github.com/btcsuite/btcd/chaincfg"
"github.com/btcsuite/btcd/chaincfg/chainhash"
"github.com/btcsuite/btcutil"
"github.com/lightninglabs/lndclient"
"github.com/lightninglabs/loop/loopdb"
"github.com/lightninglabs/loop/swap"

2
cmd/loop/loopout.go
Unescape Escape View File

@ -7,7 +7,7 @@ import (
"strings"
"time"
"github.com/btcsuite/btcutil"
"github.com/btcsuite/btcd/btcutil"
"github.com/lightninglabs/loop"
"github.com/lightninglabs/loop/labels"
"github.com/lightninglabs/loop/loopdb"

2
cmd/loop/main.go
Unescape Escape View File

@ -22,7 +22,7 @@ import (
"github.com/lightningnetwork/lnd/lncfg"
"github.com/lightningnetwork/lnd/macaroons"
"github.com/btcsuite/btcutil"
"github.com/btcsuite/btcd/btcutil"
"github.com/urfave/cli"
"google.golang.org/grpc"

2
cmd/loop/terms.go
Unescape Escape View File

@ -4,7 +4,7 @@ import (
"context"
"fmt"
"github.com/btcsuite/btcutil"
"github.com/btcsuite/btcd/btcutil"
"github.com/lightninglabs/loop/looprpc"
"github.com/urfave/cli"
)

27
go.mod
Unescape Escape View File

@ -1,10 +1,13 @@
module github.com/lightninglabs/loop
require (
github.com/btcsuite/btcd v0.22.0-beta.0.20211005184431-e3449998be39
github.com/btcsuite/btcd v0.22.0-beta.0.20220316175102-8d5c75c28923
github.com/btcsuite/btcd/btcec/v2 v2.1.3
github.com/btcsuite/btcd/btcutil v1.1.1
// github.com/btcsuite/btcd/txscript v1.1.0
github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1
github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f
github.com/btcsuite/btcutil v1.0.3-0.20210527170813-e2ba6805a890
github.com/btcsuite/btcwallet/wtxmgr v1.3.1-0.20210822222949-9b5a201c344c
github.com/btcsuite/btcwallet/wtxmgr v1.5.0
github.com/coreos/bbolt v1.3.3
github.com/davecgh/go-spew v1.1.1
github.com/fortytw2/leaktest v1.3.0
@ -14,16 +17,17 @@ require (
github.com/lightninglabs/lndclient v0.14.2-3
github.com/lightninglabs/loop/swapserverrpc v1.0.0
github.com/lightninglabs/protobuf-hex-display v1.4.3-hex-display
github.com/lightningnetwork/lnd v0.14.2-beta
github.com/lightningnetwork/lnd/cert v1.1.0
github.com/lightningnetwork/lnd v0.14.2-beta.rc1
github.com/lightningnetwork/lnd/cert v1.1.1
github.com/lightningnetwork/lnd/clock v1.1.0
github.com/lightningnetwork/lnd/queue v1.1.0
github.com/lightningnetwork/lnd/ticker v1.1.0
github.com/lightningnetwork/lnd/tor v1.0.0
github.com/stretchr/testify v1.7.0
github.com/urfave/cli v1.22.4
golang.org/x/net v0.0.0-20210913180222-943fd674d43e
google.golang.org/grpc v1.38.0
google.golang.org/protobuf v1.26.0
golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f
google.golang.org/grpc v1.39.0
google.golang.org/protobuf v1.27.1
gopkg.in/macaroon-bakery.v2 v2.0.1
gopkg.in/macaroon.v2 v2.1.0
)
@ -32,5 +36,8 @@ go 1.15
replace github.com/lightninglabs/loop/swapserverrpc => ./swapserverrpc
// TODO(bhandras): remove once v0.14.3-beta or v0.15.0-beta is tagged.
replace github.com/lightningnetwork/lnd => github.com/lightningnetwork/lnd v0.14.1-beta.0.20220131141659-60625b6c1a0b
replace github.com/lightningnetwork/lnd => github.com/guggero/lnd v0.11.0-beta.rc4.0.20220322204826-af4562a8b1b2
replace github.com/lightninglabs/lndclient => github.com/lightninglabs/lndclient v1.0.1-0.20220316193259-eeb62a615ee6
replace github.com/lightninglabs/aperture => github.com/positiveblue/aperture v0.1.17-beta.0.20220311010926-8edab73a0ccc

476
go.sum
View File

File diff suppressed because it is too large Load Diff

2
interface.go
Unescape Escape View File

@ -3,7 +3,7 @@ package loop
import (
"time"
"github.com/btcsuite/btcutil"
"github.com/btcsuite/btcd/btcutil"
"github.com/lightninglabs/loop/loopdb"
"github.com/lightninglabs/loop/swap"
"github.com/lightningnetwork/lnd/lntypes"

2
liquidity/autoloop_test.go
Unescape Escape View File

@ -4,7 +4,7 @@ import (
"testing"
"time"
"github.com/btcsuite/btcutil"
"github.com/btcsuite/btcd/btcutil"
"github.com/lightninglabs/lndclient"
"github.com/lightninglabs/loop"
"github.com/lightninglabs/loop/labels"

2
liquidity/autoloop_testcontext_test.go
Unescape Escape View File

@ -4,7 +4,7 @@ import (
"context"
"testing"
"github.com/btcsuite/btcutil"
"github.com/btcsuite/btcd/btcutil"
"github.com/lightninglabs/lndclient"
"github.com/lightninglabs/loop"
"github.com/lightninglabs/loop/loopdb"

2
liquidity/balances.go
Unescape Escape View File

@ -1,7 +1,7 @@
package liquidity
import (
"github.com/btcsuite/btcutil"
"github.com/btcsuite/btcd/btcutil"
"github.com/lightninglabs/lndclient"
"github.com/lightningnetwork/lnd/lnwire"
"github.com/lightningnetwork/lnd/routing/route"

2
liquidity/fees.go
Unescape Escape View File

@ -4,7 +4,7 @@ import (
"errors"
"fmt"
"github.com/btcsuite/btcutil"
"github.com/btcsuite/btcd/btcutil"
"github.com/lightninglabs/loop"
"github.com/lightningnetwork/lnd/lnwallet/chainfee"
)

2
liquidity/interface.go
Unescape Escape View File

@ -3,7 +3,7 @@ package liquidity
import (
"context"
"github.com/btcsuite/btcutil"
"github.com/btcsuite/btcd/btcutil"
"github.com/lightninglabs/loop"
"github.com/lightninglabs/loop/swap"
"github.com/lightningnetwork/lnd/lnwallet/chainfee"

2
liquidity/liquidity.go
Unescape Escape View File

@ -41,7 +41,7 @@ import (
"sync"
"time"
"github.com/btcsuite/btcutil"
"github.com/btcsuite/btcd/btcutil"
"github.com/lightninglabs/lndclient"
"github.com/lightninglabs/loop"
"github.com/lightninglabs/loop/labels"

2
liquidity/liquidity_test.go
Unescape Escape View File

@ -5,7 +5,7 @@ import (
"testing"
"time"
"github.com/btcsuite/btcutil"
"github.com/btcsuite/btcd/btcutil"
"github.com/lightninglabs/lndclient"
"github.com/lightninglabs/loop"
"github.com/lightninglabs/loop/labels"

2
liquidity/loopin.go
Unescape Escape View File

@ -1,7 +1,7 @@
package liquidity
import (
"github.com/btcsuite/btcutil"
"github.com/btcsuite/btcd/btcutil"
"github.com/lightninglabs/loop"
"github.com/lightninglabs/loop/swap"
"github.com/lightningnetwork/lnd/input"

2
liquidity/loopin_builder.go
Unescape Escape View File

@ -3,7 +3,7 @@ package liquidity
import (
"context"
"github.com/btcsuite/btcutil"
"github.com/btcsuite/btcd/btcutil"
"github.com/lightninglabs/loop"
"github.com/lightninglabs/loop/labels"
"github.com/lightninglabs/loop/swap"

2
liquidity/loopin_builder_test.go
Unescape Escape View File

@ -5,7 +5,7 @@ import (
"errors"
"testing"
"github.com/btcsuite/btcutil"
"github.com/btcsuite/btcd/btcutil"
"github.com/lightninglabs/loop"
"github.com/lightningnetwork/lnd/lnwire"
"github.com/lightningnetwork/lnd/routing/route"

2
liquidity/loopout.go
Unescape Escape View File

@ -1,7 +1,7 @@
package liquidity
import (
"github.com/btcsuite/btcutil"
"github.com/btcsuite/btcd/btcutil"
"github.com/lightninglabs/loop"
"github.com/lightningnetwork/lnd/lnwire"
"github.com/lightningnetwork/lnd/routing/route"

2
liquidity/loopout_builder.go
Unescape Escape View File

@ -3,7 +3,7 @@ package liquidity
import (
"context"
"github.com/btcsuite/btcutil"
"github.com/btcsuite/btcd/btcutil"
"github.com/lightninglabs/loop"
"github.com/lightninglabs/loop/labels"
"github.com/lightninglabs/loop/loopdb"

2
liquidity/restrictions.go
Unescape Escape View File

@ -3,7 +3,7 @@ package liquidity
import (
"fmt"
"github.com/btcsuite/btcutil"
"github.com/btcsuite/btcd/btcutil"
)
// Restrictions indicates the restrictions placed on a swap.

2
liquidity/threshold_rule.go
Unescape Escape View File

@ -4,7 +4,7 @@ import (
"errors"
"fmt"
"github.com/btcsuite/btcutil"
"github.com/btcsuite/btcd/btcutil"
"github.com/lightninglabs/loop/swap"
)

2
liquidity/threshold_rule_test.go
Unescape Escape View File

@ -3,7 +3,7 @@ package liquidity
import (
"testing"
"github.com/btcsuite/btcutil"
"github.com/btcsuite/btcd/btcutil"
"github.com/lightninglabs/loop/swap"
"github.com/stretchr/testify/require"
)

2
loopd/config.go
Unescape Escape View File

@ -9,7 +9,7 @@ import (
"path/filepath"
"time"
"github.com/btcsuite/btcutil"
"github.com/btcsuite/btcd/btcutil"
"github.com/lightninglabs/aperture/lsat"
"github.com/lightningnetwork/lnd/cert"
"github.com/lightningnetwork/lnd/lncfg"

6
loopd/swapclient_server.go
Unescape Escape View File

@ -9,9 +9,9 @@ import (
"sync"
"time"
"github.com/btcsuite/btcd/btcec"
"github.com/btcsuite/btcd/btcec/v2"
"github.com/btcsuite/btcd/btcutil"
"github.com/btcsuite/btcd/chaincfg"
"github.com/btcsuite/btcutil"
"github.com/lightninglabs/lndclient"
"github.com/lightninglabs/loop"
"github.com/lightninglabs/loop/labels"
@ -555,7 +555,7 @@ func unmarshallHopHint(rpcHint *looprpc.HopHint) (zpay32.HopHint, error) {
return zpay32.HopHint{}, err
}
pubkey, err := btcec.ParsePubKey(pubBytes, btcec.S256())
pubkey, err := btcec.ParsePubKey(pubBytes)
if err != nil {
return zpay32.HopHint{}, err
}

2
loopd/swapclient_server_test.go
Unescape Escape View File

@ -5,8 +5,8 @@ import (
"errors"
"testing"
"github.com/btcsuite/btcd/btcutil"
"github.com/btcsuite/btcd/chaincfg"
"github.com/btcsuite/btcutil"
"github.com/lightninglabs/lndclient"
"github.com/lightninglabs/loop"
"github.com/lightninglabs/loop/labels"

2
loopd/utils.go
Unescape Escape View File

@ -3,7 +3,7 @@ package loopd
import (
"context"
"github.com/btcsuite/btcutil"
"github.com/btcsuite/btcd/btcutil"
"github.com/lightninglabs/lndclient"
"github.com/lightninglabs/loop"
"github.com/lightninglabs/loop/liquidity"

2
loopdb/loop.go
Unescape Escape View File

@ -5,7 +5,7 @@ import (
"encoding/binary"
"time"
"github.com/btcsuite/btcutil"
"github.com/btcsuite/btcd/btcutil"
"github.com/lightningnetwork/lnd/lntypes"
)

2
loopdb/loopout.go
Unescape Escape View File

@ -8,9 +8,9 @@ import (
"strings"
"time"
"github.com/btcsuite/btcd/btcutil"
"github.com/btcsuite/btcd/chaincfg"
"github.com/btcsuite/btcd/wire"
"github.com/btcsuite/btcutil"
)
// LoopOutContract contains the data that is serialized to persistent storage

2
loopdb/swapstate.go
Unescape Escape View File

@ -1,8 +1,8 @@
package loopdb
import (
"github.com/btcsuite/btcd/btcutil"
"github.com/btcsuite/btcd/chaincfg/chainhash"
"github.com/btcsuite/btcutil"
)
// SwapState indicates the current state of a swap. This enumeration is the

2
loopin.go
Unescape Escape View File

@ -9,10 +9,10 @@ import (
"sync"
"time"
"github.com/btcsuite/btcd/btcutil"
"github.com/btcsuite/btcd/chaincfg/chainhash"
"github.com/btcsuite/btcd/mempool"
"github.com/btcsuite/btcd/wire"
"github.com/btcsuite/btcutil"
"github.com/lightninglabs/lndclient"
"github.com/lightninglabs/loop/labels"
"github.com/lightninglabs/loop/loopdb"

2
loopin_test.go
Unescape Escape View File

@ -4,8 +4,8 @@ import (
"context"
"testing"
"github.com/btcsuite/btcd/btcutil"
"github.com/btcsuite/btcd/wire"
"github.com/btcsuite/btcutil"
"github.com/lightninglabs/loop/loopdb"
"github.com/lightninglabs/loop/swap"
"github.com/lightninglabs/loop/test"

2
loopin_testcontext_test.go
Unescape Escape View File

@ -4,7 +4,7 @@ import (
"testing"
"time"
"github.com/btcsuite/btcutil"
"github.com/btcsuite/btcd/btcutil"
"github.com/lightninglabs/lndclient"
"github.com/lightninglabs/loop/loopdb"
"github.com/lightninglabs/loop/sweep"

2
loopout.go
Unescape Escape View File

@ -10,9 +10,9 @@ import (
"sync"
"time"
"github.com/btcsuite/btcd/btcutil"
"github.com/btcsuite/btcd/chaincfg/chainhash"
"github.com/btcsuite/btcd/wire"
"github.com/btcsuite/btcutil"
"github.com/lightninglabs/lndclient"
"github.com/lightninglabs/loop/labels"
"github.com/lightninglabs/loop/loopdb"

2
loopout_test.go
Unescape Escape View File

@ -9,8 +9,8 @@ import (
"time"
"github.com/btcsuite/btcd/blockchain"
"github.com/btcsuite/btcd/btcutil"
"github.com/btcsuite/btcd/wire"
"github.com/btcsuite/btcutil"
"github.com/lightninglabs/lndclient"
"github.com/lightninglabs/loop/loopdb"
"github.com/lightninglabs/loop/sweep"

2
looprpc/client.pb.go
Unescape Escape View File

@ -1,6 +1,6 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
// protoc-gen-go v1.26.0
// protoc-gen-go v1.27.1
// protoc v3.6.1
// source: client.proto

2
looprpc/debug.pb.go
Unescape Escape View File

@ -1,6 +1,6 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
// protoc-gen-go v1.26.0
// protoc-gen-go v1.27.1
// protoc v3.6.1
// source: debug.proto

6
routing_plugin.go
Unescape Escape View File

@ -6,8 +6,8 @@ import (
"sort"
"sync"
"github.com/btcsuite/btcd/btcutil"
"github.com/btcsuite/btclog"
"github.com/btcsuite/btcutil"
"github.com/davecgh/go-spew/spew"
"github.com/lightninglabs/lndclient"
"github.com/lightningnetwork/lnd/clock"
@ -562,7 +562,7 @@ func (r *lowToHighRoutingPlugin) BeforePayment(ctx context.Context,
return ErrRoutingPluginNoMoreRetries
}
err := r.lnd.Router.ImportMissionControl(ctx, entries, true)
err := r.lnd.Router.ImportMissionControl(ctx, entries)
if err != nil {
return err
}
@ -643,7 +643,7 @@ func (r *lowToHighRoutingPlugin) Done(ctx context.Context) error {
}
}
err := r.lnd.Router.ImportMissionControl(ctx, entries, true)
err := r.lnd.Router.ImportMissionControl(ctx, entries)
if err != nil {
return err
}

8
routing_plugin_test.go
Unescape Escape View File

@ -5,8 +5,8 @@ import (
"testing"
"time"
"github.com/btcsuite/btcd/btcec"
"github.com/btcsuite/btcutil"
"github.com/btcsuite/btcd/btcec/v2"
"github.com/btcsuite/btcd/btcutil"
"github.com/lightninglabs/lndclient"
"github.com/lightninglabs/loop/test"
"github.com/lightningnetwork/lnd/clock"
@ -23,11 +23,11 @@ var (
eugene = route.Vertex{5}
loopNode = route.Vertex{99}
privFrank, _ = btcec.NewPrivateKey(btcec.S256())
privFrank, _ = btcec.NewPrivateKey()
frankPubKey = privFrank.PubKey()
frank = route.NewVertex(frankPubKey)
privGeorge, _ = btcec.NewPrivateKey(btcec.S256())
privGeorge, _ = btcec.NewPrivateKey()
georgePubKey = privGeorge.PubKey()
george = route.NewVertex(georgePubKey)
)

2
server_mock_test.go
Unescape Escape View File

@ -7,8 +7,8 @@ import (
"time"
"github.com/btcsuite/btcd/btcutil"
"github.com/btcsuite/btcd/chaincfg"
"github.com/btcsuite/btcutil"
"github.com/lightninglabs/lndclient"
"github.com/lightninglabs/loop/test"
"github.com/lightningnetwork/lnd/channeldb"

2
swap/fees.go
Unescape Escape View File

@ -3,8 +3,8 @@ package swap
import (
"errors"
"github.com/btcsuite/btcd/btcutil"
"github.com/btcsuite/btcd/chaincfg"
"github.com/btcsuite/btcutil"
"github.com/lightningnetwork/lnd/lntypes"
"github.com/lightningnetwork/lnd/routing/route"
"github.com/lightningnetwork/lnd/zpay32"

2
swap/htlc.go
Unescape Escape View File

@ -6,10 +6,10 @@ import (
"errors"
"fmt"
"github.com/btcsuite/btcd/btcutil"
"github.com/btcsuite/btcd/chaincfg"
"github.com/btcsuite/btcd/txscript"
"github.com/btcsuite/btcd/wire"
"github.com/btcsuite/btcutil"
"github.com/lightningnetwork/lnd/input"
"github.com/lightningnetwork/lnd/lntypes"
)

16
swap/htlc_test.go
Unescape Escape View File

@ -6,12 +6,12 @@ import (
"fmt"
"testing"
"github.com/btcsuite/btcd/btcec"
"github.com/btcsuite/btcd/btcec/v2"
"github.com/btcsuite/btcd/btcutil"
"github.com/btcsuite/btcd/chaincfg"
"github.com/btcsuite/btcd/chaincfg/chainhash"
"github.com/btcsuite/btcd/txscript"
"github.com/btcsuite/btcd/wire"
"github.com/btcsuite/btcutil"
"github.com/lightninglabs/loop/test"
"github.com/lightningnetwork/lnd/input"
"github.com/lightningnetwork/lnd/keychain"
@ -156,6 +156,10 @@ func TestHtlcV2(t *testing.T) {
Privkeys: []*btcec.PrivateKey{receiverPrivKey},
}
prevOutFetcher := txscript.NewCannedPrevOutputFetcher(
htlc.PkScript, int64(htlcValue),
)
signTx := func(tx *wire.MsgTx, pubkey *btcec.PublicKey,
signer *input.MockSigner) (input.Signature, error) {
@ -167,8 +171,10 @@ func TestHtlcV2(t *testing.T) {
WitnessScript: htlc.Script(),
Output: htlcOutput,
HashType: txscript.SigHashAll,
SigHashes: txscript.NewTxSigHashes(tx),
InputIndex: 0,
SigHashes: txscript.NewTxSigHashes(
tx, prevOutFetcher,
),
InputIndex: 0,
}
return signer.SignOutputRaw(tx, signDesc)
@ -306,7 +312,7 @@ func TestHtlcV2(t *testing.T) {
return txscript.NewEngine(
htlc.PkScript, sweepTx, 0,
txscript.StandardVerifyFlags, nil,
nil, int64(htlcValue))
nil, int64(htlcValue), prevOutFetcher)
}
assertEngineExecution(t, testCase.valid, newEngine)

2
swap/tx.go
Unescape Escape View File

@ -5,8 +5,8 @@ import (
"errors"
"fmt"
"github.com/btcsuite/btcd/btcutil"
"github.com/btcsuite/btcd/wire"
"github.com/btcsuite/btcutil"
)
// GetScriptOutput locates the given script in the outputs of a transaction and

8
swap_server_client.go
Unescape Escape View File

@ -12,8 +12,8 @@ import (
"sync"
"time"
"github.com/btcsuite/btcd/btcec"
"github.com/btcsuite/btcutil"
"github.com/btcsuite/btcd/btcec/v2"
"github.com/btcsuite/btcd/btcutil"
"github.com/lightninglabs/aperture/lsat"
"github.com/lightninglabs/loop/loopdb"
looprpc "github.com/lightninglabs/loop/swapserverrpc"
@ -381,7 +381,7 @@ func (s *grpcSwapServerClient) NewLoopOutSwap(ctx context.Context,
copy(senderKey[:], swapResp.SenderKey)
// Validate sender key.
_, err = btcec.ParsePubKey(senderKey[:], btcec.S256())
_, err = btcec.ParsePubKey(senderKey[:])
if err != nil {
return nil, fmt.Errorf("invalid sender key: %v", err)
}
@ -441,7 +441,7 @@ func (s *grpcSwapServerClient) NewLoopInSwap(ctx context.Context,
copy(receiverKey[:], swapResp.ReceiverKey)
// Validate receiver key.
_, err = btcec.ParsePubKey(receiverKey[:], btcec.S256())
_, err = btcec.ParsePubKey(receiverKey[:])
if err != nil {
return nil, fmt.Errorf("invalid sender key: %v", err)
}

6
sweep/sweeper.go
Unescape Escape View File

@ -4,10 +4,10 @@ import (
"context"
"fmt"
"github.com/btcsuite/btcd/btcec"
"github.com/btcsuite/btcd/btcec/v2"
"github.com/btcsuite/btcd/btcutil"
"github.com/btcsuite/btcd/txscript"
"github.com/btcsuite/btcd/wire"
"github.com/btcsuite/btcutil"
"github.com/lightninglabs/lndclient"
"github.com/lightninglabs/loop/swap"
"github.com/lightningnetwork/lnd/input"
@ -53,7 +53,7 @@ func (s *Sweeper) CreateSweepTx(
// Generate a signature for the swap htlc transaction.
key, err := btcec.ParsePubKey(keyBytes[:], btcec.S256())
key, err := btcec.ParsePubKey(keyBytes[:])
if err != nil {
return nil, err
}

11
test/invoices_mock.go
Unescape Escape View File

@ -6,7 +6,8 @@ import (
"sync"
"time"
"github.com/btcsuite/btcd/btcec"
"github.com/btcsuite/btcd/btcec/v2"
"github.com/btcsuite/btcd/btcec/v2/ecdsa"
"github.com/lightninglabs/lndclient"
"github.com/lightningnetwork/lnd/lnrpc/invoicesrpc"
"github.com/lightningnetwork/lnd/lntypes"
@ -82,7 +83,7 @@ func (s *mockInvoices) AddHoldInvoice(ctx context.Context,
return "", err
}
privKey, err := btcec.NewPrivateKey(btcec.S256())
privKey, err := btcec.NewPrivateKey()
if err != nil {
return "", err
}
@ -90,9 +91,9 @@ func (s *mockInvoices) AddHoldInvoice(ctx context.Context,
payReqString, err := payReq.Encode(
zpay32.MessageSigner{
SignCompact: func(hash []byte) ([]byte, error) {
// btcec.SignCompact returns a pubkey-recoverable signature
sig, err := btcec.SignCompact(
btcec.S256(), privKey, hash, true,
// ecdsa.SignCompact returns a pubkey-recoverable signature
sig, err := ecdsa.SignCompact(
privKey, hash, true,
)
if err != nil {
return nil, fmt.Errorf("can't sign the hash: %v", err)

4
test/keys.go
Unescape Escape View File

@ -1,13 +1,13 @@
package test
import (
"github.com/btcsuite/btcd/btcec"
"github.com/btcsuite/btcd/btcec/v2"
)
// CreateKey returns a deterministically generated key pair.
func CreateKey(index int32) (*btcec.PrivateKey, *btcec.PublicKey) {
// Avoid all zeros, because it results in an invalid key.
privKey, pubKey := btcec.PrivKeyFromBytes(btcec.S256(),
privKey, pubKey := btcec.PrivKeyFromBytes(
[]byte{0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,

13
test/lightning_client_mock.go
Unescape Escape View File

@ -7,9 +7,10 @@ import (
"sync"
"time"
"github.com/btcsuite/btcd/btcec"
"github.com/btcsuite/btcd/btcec/v2"
"github.com/btcsuite/btcd/btcec/v2/ecdsa"
"github.com/btcsuite/btcd/btcutil"
"github.com/btcsuite/btcd/wire"
"github.com/btcsuite/btcutil"
"github.com/lightninglabs/lndclient"
"github.com/lightningnetwork/lnd/channeldb"
"github.com/lightningnetwork/lnd/lnrpc/invoicesrpc"
@ -114,7 +115,7 @@ func (h *mockLightningClient) AddInvoice(ctx context.Context,
return lntypes.Hash{}, "", err
}
privKey, err := btcec.NewPrivateKey(btcec.S256())
privKey, err := btcec.NewPrivateKey()
if err != nil {
return lntypes.Hash{}, "", err
}
@ -122,9 +123,9 @@ func (h *mockLightningClient) AddInvoice(ctx context.Context,
payReqString, err := payReq.Encode(
zpay32.MessageSigner{
SignCompact: func(hash []byte) ([]byte, error) {
// btcec.SignCompact returns a pubkey-recoverable signature
sig, err := btcec.SignCompact(
btcec.S256(), privKey, hash, true,
// ecdsa.SignCompact returns a pubkey-recoverable signature
sig, err := ecdsa.SignCompact(
privKey, hash, true,
)
if err != nil {
return nil, fmt.Errorf("can't sign the hash: %v", err)

11
test/router_mock.go
Unescape Escape View File

@ -52,7 +52,7 @@ func (r *mockRouter) QueryMissionControl(ctx context.Context) (
// ImpotMissionControl is a mocked reimplementation of the pair import.
// Reference: lnd/router/missioncontrol_state.go:importSnapshot().
func (r *mockRouter) ImportMissionControl(ctx context.Context,
entries []lndclient.MissionControlEntry, force bool) error {
entries []lndclient.MissionControlEntry) error {
for _, entry := range entries {
found := false
@ -79,17 +79,10 @@ func (r *mockRouter) ImportMissionControl(ctx context.Context,
// Import success result second.
current.SuccessTime = entry.SuccessTime
if force ||
entry.SuccessAmt > current.SuccessAmt {
if entry.SuccessAmt > current.SuccessAmt {
current.SuccessAmt = entry.SuccessAmt
}
if !force && (!current.FailTime.IsZero() &&
entry.SuccessAmt >= current.FailAmt) {
current.FailAmt = entry.SuccessAmt + 1
}
}
}

2
test/signer_mock.go
Unescape Escape View File

@ -5,7 +5,7 @@ import (
"context"
"fmt"
"github.com/btcsuite/btcd/btcec"
"github.com/btcsuite/btcd/btcec/v2"
"github.com/btcsuite/btcd/wire"
"github.com/lightninglabs/lndclient"
"github.com/lightningnetwork/lnd/input"

9
test/testutils.go
Unescape Escape View File

@ -8,9 +8,9 @@ import (
"testing"
"time"
"github.com/btcsuite/btcd/btcec"
"github.com/btcsuite/btcd/btcec/v2/ecdsa"
"github.com/btcsuite/btcd/btcutil"
"github.com/btcsuite/btcd/chaincfg"
"github.com/btcsuite/btcutil"
"github.com/lightningnetwork/lnd/lntypes"
"github.com/lightningnetwork/lnd/lnwire"
"github.com/lightningnetwork/lnd/zpay32"
@ -44,10 +44,9 @@ func EncodePayReq(payReq *zpay32.Invoice) (string, error) {
reqString, err := payReq.Encode(
zpay32.MessageSigner{
SignCompact: func(hash []byte) ([]byte, error) {
// btcec.SignCompact returns a
// ecdsa.SignCompact returns a
// pubkey-recoverable signature
sig, err := btcec.SignCompact(
btcec.S256(),
sig, err := ecdsa.SignCompact(
privKey,
payReq.PaymentHash[:],
true,

2
test/walletkit_mock.go
Unescape Escape View File

@ -6,10 +6,10 @@ import (
"sync"
"time"
"github.com/btcsuite/btcd/btcutil"
"github.com/btcsuite/btcd/chaincfg"
"github.com/btcsuite/btcd/chaincfg/chainhash"
"github.com/btcsuite/btcd/wire"
"github.com/btcsuite/btcutil"
"github.com/btcsuite/btcwallet/wtxmgr"
"github.com/lightninglabs/lndclient"
"github.com/lightningnetwork/lnd/keychain"

2
testcontext_test.go
Unescape Escape View File

@ -5,8 +5,8 @@ import (
"testing"
"time"
"github.com/btcsuite/btcd/btcutil"
"github.com/btcsuite/btcd/wire"
"github.com/btcsuite/btcutil"
"github.com/lightninglabs/lndclient"
"github.com/lightninglabs/loop/loopdb"
"github.com/lightninglabs/loop/swap"

8
utils.go
Unescape Escape View File

@ -6,10 +6,10 @@ import (
"strconv"
"strings"
"github.com/btcsuite/btcd/btcec"
"github.com/btcsuite/btcd/btcec/v2"
"github.com/btcsuite/btcd/btcutil"
"github.com/btcsuite/btcd/chaincfg/chainhash"
"github.com/btcsuite/btcd/wire"
"github.com/btcsuite/btcutil"
"github.com/lightninglabs/lndclient"
"github.com/lightningnetwork/lnd/channeldb"
"github.com/lightningnetwork/lnd/lnrpc/invoicesrpc"
@ -142,9 +142,7 @@ func SelectHopHints(ctx context.Context, lnd *lndclient.LndServices,
return nil, err
}
remotePubkey, err := btcec.ParsePubKey(
channel.PubKeyBytes[:], btcec.S256(),
)
remotePubkey, err := btcec.ParsePubKey(channel.PubKeyBytes[:])
if err != nil {
return nil, err
}

Write Preview
Loading…
Cancel
Save