Skip to content

Commit 79430a8

Browse files
RoasbeefRoasbeef
authored
Merge pull request #31 from joostjager/decodeaddress
multi: always supply chain params when decoding addresses
2 parents ec40647 + 9a1b60b commit 79430a8

File tree

8 files changed

+35
-22
lines changed

8 files changed

+35
-22
lines changed

‎client.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ type Client struct {
6767
func NewClient(dbDir string, serverAddress string, insecure bool,
6868
lnd *lndclient.LndServices) (*Client, func(), error) {
6969

70-
store, err := loopdb.NewBoltSwapStore(dbDir)
70+
store, err := loopdb.NewBoltSwapStore(dbDir, lnd.ChainParams)
7171
if err != nil {
7272
return nil, nil, err
7373
}

‎client_test.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import (
77
"errors"
88
"testing"
99

10+
"github.com/btcsuite/btcd/chaincfg"
1011
"github.com/btcsuite/btcutil"
1112
"github.com/lightninglabs/loop/lndclient"
1213
"github.com/lightninglabs/loop/loopdb"
@@ -15,8 +16,9 @@ import (
1516
)
1617

1718
var (
18-
testAddr, _ = btcutil.DecodeAddress(
19-
"rbsHiPKwAgxeo1EQYiyzJTkA8XEmWSVAKx", nil)
19+
testAddr, _ = btcutil.NewAddressScriptHash(
20+
[]byte{123}, &chaincfg.TestNet3Params,
21+
)
2022

2123
testRequest = &OutRequest{
2224
Amount: btcutil.Amount(50000),

‎cmd/loopd/swapclient_server.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,9 @@ func (s *swapClientServer) LoopOut(ctx context.Context,
4444
}
4545
} else {
4646
var err error
47-
sweepAddr, err = btcutil.DecodeAddress(in.Dest, nil)
47+
sweepAddr, err = btcutil.DecodeAddress(
48+
in.Dest, s.lnd.ChainParams,
49+
)
4850
if err != nil {
4951
return nil, fmt.Errorf("decode address: %v", err)
5052
}

‎go.mod

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,13 @@ module github.com/lightninglabs/loop
33
require (
44
github.com/btcsuite/btcd v0.0.0-20190315201642-aa6e0f35703c
55
github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f
6-
github.com/btcsuite/btcutil v0.0.0-20190207003914-4c204d697803
6+
github.com/btcsuite/btcutil v0.0.0-20190316010144-3ac1210f4b38
77
github.com/coreos/bbolt v1.3.2
88
github.com/fortytw2/leaktest v1.3.0
99
github.com/golang/protobuf v1.3.1
1010
github.com/grpc-ecosystem/grpc-gateway v1.8.5
1111
github.com/jessevdk/go-flags v1.4.0
12-
github.com/lightninglabs/neutrino v0.0.0-20190314214430-643615b8c132 // indirect
13-
github.com/lightningnetwork/lnd v0.0.0-20190314214430-b4a1024ac74fc576c65c8074288a5ffaf6bd1ec4
12+
github.com/lightningnetwork/lnd v0.5.1-beta.0.20190322220528-6ad8be25e1aa
1413
github.com/lightningnetwork/lnd/queue v1.0.1
1514
github.com/urfave/cli v1.20.0
1615
golang.org/x/net v0.0.0-20190313220215-9f648a60d977

‎go.sum

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,12 @@ github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f/go.mod h1:TdznJufo
2323
github.com/btcsuite/btcutil v0.0.0-20180706230648-ab6388e0c60a/go.mod h1:+5NJ2+qvTyV9exUAL/rxXi3DcLg2Ts+ymUAY5y4NvMg=
2424
github.com/btcsuite/btcutil v0.0.0-20190207003914-4c204d697803 h1:j3AgPKKZtZStM2nyhrDSLSYgT7YHrZKdSkq1OYeLjvM=
2525
github.com/btcsuite/btcutil v0.0.0-20190207003914-4c204d697803/go.mod h1:+5NJ2+qvTyV9exUAL/rxXi3DcLg2Ts+ymUAY5y4NvMg=
26+
github.com/btcsuite/btcutil v0.0.0-20190316010144-3ac1210f4b38 h1:GbQHMJ2u/geMPV1tbN7i7zARSoPAPuXWa44V0KYvJXU=
27+
github.com/btcsuite/btcutil v0.0.0-20190316010144-3ac1210f4b38/go.mod h1:+5NJ2+qvTyV9exUAL/rxXi3DcLg2Ts+ymUAY5y4NvMg=
2628
github.com/btcsuite/btcwallet v0.0.0-20180904010540-284e2e0e696e33d5be388f7f3d9a26db703e0c06/go.mod h1:/d7QHZsfUAruXuBhyPITqoYOmJ+nq35qPsJjz/aSpCg=
2729
github.com/btcsuite/btcwallet v0.0.0-20190313032608-acf3b04b0273/go.mod h1:mkOYY8/psBiL5E+Wb0V7M0o+N7NXi2SZJz6+RKkncIc=
28-
github.com/btcsuite/btcwallet v0.0.0-20190313041134-68fc7c82e131 h1:BhBlN90EcFIWGSduKOGckSwBQC1kBeavQ16DqzFj+gw=
29-
github.com/btcsuite/btcwallet v0.0.0-20190313041134-68fc7c82e131/go.mod h1:qMi4jGpAO6YRsd81RYDG7o5pBIGqN9faCioJdagLu64=
30+
github.com/btcsuite/btcwallet v0.0.0-20190319010515-89ab2044f962 h1:/6EtNbubaGgo10bFyYyE6S6yXfxtc3dxKpvLHxMt5rg=
31+
github.com/btcsuite/btcwallet v0.0.0-20190319010515-89ab2044f962/go.mod h1:qMi4jGpAO6YRsd81RYDG7o5pBIGqN9faCioJdagLu64=
3032
github.com/btcsuite/fastsha256 v0.0.0-20160815193821-637e65642941 h1:kij1x2aL7VE6gtx8KMIt8PGPgI5GV9LgtHFG5KaEMPY=
3133
github.com/btcsuite/fastsha256 v0.0.0-20160815193821-637e65642941/go.mod h1:QcFA8DZHtuIAdYKCq/BzELOaznRsCvwf4zTPmaYwaig=
3234
github.com/btcsuite/go-socks v0.0.0-20170105172521-4720035b7bfd h1:R/opQEbFEy9JGkIguV40SvRY1uliPX8ifOvi6ICsFCw=
@@ -112,13 +114,12 @@ github.com/lightninglabs/gozmq v0.0.0-20180324010646-462a8a753885/go.mod h1:KUh1
112114
github.com/lightninglabs/neutrino v0.0.0-20181017011010-4d6069299130/go.mod h1:KJq43Fu9ceitbJsSXMILcT4mGDNI/crKmPIkDOZXFyM=
113115
github.com/lightninglabs/neutrino v0.0.0-20190213031021-ae4583a89cfb/go.mod h1:g6cMQd+hfAU8pQTJAdjm6/EQREhupyd22f+CL0qYFOE=
114116
github.com/lightninglabs/neutrino v0.0.0-20190313035638-e1ad4c33fb18/go.mod h1:v6tz6jbuAubTrRpX8ke2KH9sJxml8KlPQTKgo9mAp1Q=
115-
github.com/lightninglabs/neutrino v0.0.0-20190313220016-a6cc2a8361d5/go.mod h1:NXpKUhcszEdn7v7ze5vsnSHI1KX6HqFdNRu0eqhkJzk=
116-
github.com/lightninglabs/neutrino v0.0.0-20190314214430-643615b8c132 h1:yaKXc3D/qeEy2wv+bIQwmrq+kThdbWg0p2ggea3RAsg=
117-
github.com/lightninglabs/neutrino v0.0.0-20190314214430-643615b8c132/go.mod h1:NXpKUhcszEdn7v7ze5vsnSHI1KX6HqFdNRu0eqhkJzk=
117+
github.com/lightninglabs/neutrino v0.0.0-20190321023416-6dac90b98052 h1:YVi5x7xCumfIVtEejy3zBAej+NqY9EONy/fRim2+azQ=
118+
github.com/lightninglabs/neutrino v0.0.0-20190321023416-6dac90b98052/go.mod h1:IcX2/lKnXpLkF4XzefhiJOPn5he2+kZyJE32dxX4F4E=
118119
github.com/lightningnetwork/lightning-onion v0.0.0-20180605012408-ac4d9da8f1d6 h1:ONLGrYJVQdbtP6CE/ff1KNWZtygRGEh12RzonTiCzPs=
119120
github.com/lightningnetwork/lightning-onion v0.0.0-20180605012408-ac4d9da8f1d6/go.mod h1:8EgEt4a/NUOVQd+3kk6n9aZCJ1Ssj96Pb6lCrci+6oc=
120-
github.com/lightningnetwork/lnd v0.0.0-20190314214430-b4a1024ac74fc576c65c8074288a5ffaf6bd1ec4 h1:p0q8uatpsCBEy5ButuHg48Pnd9hEW7taNgg1vAU4TWA=
121-
github.com/lightningnetwork/lnd v0.0.0-20190314214430-b4a1024ac74fc576c65c8074288a5ffaf6bd1ec4/go.mod h1:j+mj4paxWE0RR/nJrMCBPlDHhaxVXwttXizKuhmc6IQ=
121+
github.com/lightningnetwork/lnd v0.5.1-beta.0.20190322220528-6ad8be25e1aa h1:nYDuZ0vMAZ2DVIMmc/B8dNrmZ3YGxe7pwD/4DxG4rxQ=
122+
github.com/lightningnetwork/lnd v0.5.1-beta.0.20190322220528-6ad8be25e1aa/go.mod h1:Xwk2vsL5uUgfMDQ7oHfltFZIYX5T74Htk0AA8NPzXlE=
122123
github.com/lightningnetwork/lnd/queue v1.0.1 h1:jzJKcTy3Nj5lQrooJ3aaw9Lau3I0IwvQR5sqtjdv2R0=
123124
github.com/lightningnetwork/lnd/queue v1.0.1/go.mod h1:vaQwexir73flPW43Mrm7JOgJHmcEFBWWSl9HlyASoms=
124125
github.com/lightningnetwork/lnd/ticker v1.0.0 h1:S1b60TEGoTtCe2A0yeB+ecoj/kkS4qpwh6l+AkQEZwU=

‎loopdb/loopout.go

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import (
77
"io"
88
"time"
99

10+
"github.com/btcsuite/btcd/chaincfg"
1011
"github.com/btcsuite/btcd/wire"
1112
"github.com/btcsuite/btcutil"
1213
"github.com/lightningnetwork/lnd/lntypes"
@@ -139,7 +140,9 @@ func (s *LoopOut) LastUpdateTime() time.Time {
139140
return lastUpdate.Time
140141
}
141142

142-
func deserializeLoopOutContract(value []byte) (*LoopOutContract, error) {
143+
func deserializeLoopOutContract(value []byte, chainParams *chaincfg.Params) (
144+
*LoopOutContract, error) {
145+
143146
r := bytes.NewReader(value)
144147

145148
contract, err := deserializeContract(r)
@@ -155,7 +158,7 @@ func deserializeLoopOutContract(value []byte) (*LoopOutContract, error) {
155158
if err != nil {
156159
return nil, err
157160
}
158-
swap.DestAddr, err = btcutil.DecodeAddress(addr, nil)
161+
swap.DestAddr, err = btcutil.DecodeAddress(addr, chainParams)
159162
if err != nil {
160163
return nil, err
161164
}

‎loopdb/store.go

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import (
88
"path/filepath"
99
"time"
1010

11+
"github.com/btcsuite/btcd/chaincfg"
1112
"github.com/coreos/bbolt"
1213
"github.com/lightningnetwork/lnd/lntypes"
1314
)
@@ -60,15 +61,18 @@ func fileExists(path string) bool {
6061

6162
// boltSwapStore stores swap data in boltdb.
6263
type boltSwapStore struct {
63-
db *bbolt.DB
64+
db *bbolt.DB
65+
chainParams *chaincfg.Params
6466
}
6567

6668
// A compile-time flag to ensure that boltSwapStore implements the SwapStore
6769
// interface.
6870
var _ = (*boltSwapStore)(nil)
6971

7072
// NewBoltSwapStore creates a new client swap store.
71-
func NewBoltSwapStore(dbPath string) (*boltSwapStore, error) {
73+
func NewBoltSwapStore(dbPath string, chainParams *chaincfg.Params) (
74+
*boltSwapStore, error) {
75+
7276
// If the target path for the swap store doesn't exist, then we'll
7377
// create it now before we proceed.
7478
if !fileExists(dbPath) {
@@ -114,7 +118,8 @@ func NewBoltSwapStore(dbPath string) (*boltSwapStore, error) {
114118
}
115119

116120
return &boltSwapStore{
117-
db: bdb,
121+
db: bdb,
122+
chainParams: chainParams,
118123
}, nil
119124
}
120125

@@ -155,7 +160,7 @@ func (s *boltSwapStore) FetchLoopOutSwaps() ([]*LoopOut, error) {
155160
return errors.New("contract not found")
156161
}
157162
contract, err := deserializeLoopOutContract(
158-
contractBytes,
163+
contractBytes, s.chainParams,
159164
)
160165
if err != nil {
161166
return err

‎loopdb/store_test.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import (
88
"testing"
99
"time"
1010

11+
"github.com/btcsuite/btcd/chaincfg"
1112
"github.com/lightninglabs/loop/test"
1213
"github.com/lightningnetwork/lnd/lntypes"
1314
)
@@ -42,7 +43,7 @@ func TestBoltSwapStore(t *testing.T) {
4243
}
4344
defer os.RemoveAll(tempDirName)
4445

45-
store, err := NewBoltSwapStore(tempDirName)
46+
store, err := NewBoltSwapStore(tempDirName, &chaincfg.MainNetParams)
4647
if err != nil {
4748
t.Fatal(err)
4849
}
@@ -150,7 +151,7 @@ func TestBoltSwapStore(t *testing.T) {
150151

151152
// If we re-open the same store, then the state of the current swap
152153
// should be the same.
153-
store, err = NewBoltSwapStore(tempDirName)
154+
store, err = NewBoltSwapStore(tempDirName, &chaincfg.MainNetParams)
154155
if err != nil {
155156
t.Fatal(err)
156157
}

0 commit comments

Comments
 (0)