From 978950600c6b94cf28abb5437d4fdb963be5e33c Mon Sep 17 00:00:00 2001 From: Oliver Gugger Date: Mon, 10 Aug 2020 11:53:57 +0200 Subject: [PATCH] multi: update aperture, use lndclient, remove loop To get rid of the loop dependency, we update aperture (which now houses all the LSAT code) and use the standalone lndclient repository. --- account/interface.go | 11 ++++-- account/manager.go | 43 ++++++++++---------- account/mock_test.go | 14 ++++--- account/recovery.go | 2 +- account/watcher/mock_test.go | 2 +- account/watcher/watcher.go | 2 +- auctioneer/account_subscription.go | 2 +- auctioneer/client.go | 2 +- chaninfo/channel_info.go | 2 +- cmd/llm/auth.go | 2 +- go.mod | 4 +- go.sum | 63 +++++++++++------------------- internal/test/signer_mock.go | 8 ++-- internal/test/walletkit_mock.go | 2 +- log.go | 4 +- order/batch_signer.go | 9 ++--- order/batch_verifier.go | 2 +- order/manager.go | 2 +- rpcserver.go | 2 +- server.go | 13 +++--- 20 files changed, 88 insertions(+), 103 deletions(-) diff --git a/account/interface.go b/account/interface.go index 8979f02..e4aea53 100644 --- a/account/interface.go +++ b/account/interface.go @@ -10,6 +10,7 @@ import ( "github.com/btcsuite/btcutil" "github.com/btcsuite/btcwallet/wtxmgr" "github.com/lightninglabs/llm/clmscript" + "github.com/lightninglabs/lndclient" "github.com/lightningnetwork/lnd/keychain" ) @@ -362,9 +363,13 @@ type Auctioneer interface { // TxSource is a source that provides us with transactions previously broadcast // by us. type TxSource interface { - // ListTransactions returns a list of transactions previously broadcast - // by us. - ListTransactions(ctx context.Context) ([]*wire.MsgTx, error) + // ListTransactions returns all known transactions of the backing lnd + // node. It takes a start and end block height which can be used to + // limit the block range that we query over. These values can be left + // as zero to include all blocks. To include unconfirmed transactions + // in the query, endHeight must be set to -1. + ListTransactions(ctx context.Context, startHeight, + endHeight int32) ([]lndclient.Transaction, error) } // TxFeeEstimator is a type that provides us with a realistic fee estimation to diff --git a/account/manager.go b/account/manager.go index 3fdb4c2..2c411e3 100644 --- a/account/manager.go +++ b/account/manager.go @@ -17,7 +17,7 @@ import ( "github.com/btcsuite/btcwallet/wallet/txrules" "github.com/lightninglabs/llm/account/watcher" "github.com/lightninglabs/llm/clmscript" - "github.com/lightninglabs/loop/lndclient" + "github.com/lightninglabs/lndclient" "github.com/lightningnetwork/lnd/chainntnfs" "github.com/lightningnetwork/lnd/input" "github.com/lightningnetwork/lnd/lnwallet/chainfee" @@ -567,18 +567,20 @@ func (m *Manager) resumeAccount(ctx context.Context, account *Account, // nolint func (m *Manager) locateTxByOutput(ctx context.Context, output *wire.TxOut) (*wire.MsgTx, error) { - txs, err := m.cfg.TxSource.ListTransactions(ctx) + // Get all transactions, starting from block 0 and including unconfirmed + // TXes (end block = -1). + txs, err := m.cfg.TxSource.ListTransactions(ctx, 0, -1) if err != nil { return nil, err } for _, tx := range txs { - idx, ok := clmscript.LocateOutputScript(tx, output.PkScript) + idx, ok := clmscript.LocateOutputScript(tx.Tx, output.PkScript) if !ok { continue } - if tx.TxOut[idx].Value == output.Value { - return tx, nil + if tx.Tx.TxOut[idx].Value == output.Value { + return tx.Tx, nil } } @@ -590,14 +592,16 @@ func (m *Manager) locateTxByOutput(ctx context.Context, func (m *Manager) locateTxByHash(ctx context.Context, hash chainhash.Hash) (*wire.MsgTx, error) { - txs, err := m.cfg.TxSource.ListTransactions(ctx) + // Get all transactions, starting from block 0 and including unconfirmed + // TXes (end block = -1). + txs, err := m.cfg.TxSource.ListTransactions(ctx, 0, -1) if err != nil { return nil, err } for _, tx := range txs { - if tx.TxHash() == hash { - return tx, nil + if tx.Tx.TxHash() == hash { + return tx.Tx, nil } } @@ -1215,7 +1219,6 @@ func (m *Manager) createSpendTx(ctx context.Context, account *Account, // Gather the remaining components required to sign the transaction // fully. This includes signing the account input and any additional // ones. - sigHashes := txscript.NewTxSigHashes(tx) sigHashType := txscript.SigHashAll for i, txIn := range tx.TxIn { if i == accountInputIdx { @@ -1224,7 +1227,7 @@ func (m *Manager) createSpendTx(ctx context.Context, account *Account, inputScript, err := m.signInput( ctx, tx, inputMap[txIn.PreviousOutPoint], i, - sigHashType, sigHashes, + sigHashType, ) if err != nil { return nil, err @@ -1237,7 +1240,7 @@ func (m *Manager) createSpendTx(ctx context.Context, account *Account, // Our account input signature isn't always all that's required to spend // it, so we'll take care of forming a proper signature later. witnessScript, ourSig, err := m.signAccountInput( - ctx, tx, account, accountInputIdx, sigHashType, sigHashes, + ctx, tx, account, accountInputIdx, sigHashType, ) if err != nil { return nil, err @@ -1510,20 +1513,19 @@ func locateAccountInput(tx *wire.MsgTx, account *Account) (int, error) { // signInput signs a P2WKH or NP2WKH input of a transaction. func (m *Manager) signInput(ctx context.Context, tx *wire.MsgTx, - in chanfunding.Coin, idx int, sigHashType txscript.SigHashType, - sigHashes *txscript.TxSigHashes) (*input.Script, error) { + in chanfunding.Coin, idx int, + sigHashType txscript.SigHashType) (*input.Script, error) { - signDesc := &input.SignDescriptor{ + signDesc := &lndclient.SignDescriptor{ Output: &wire.TxOut{ Value: in.Value, PkScript: in.PkScript, }, HashType: sigHashType, InputIndex: idx, - SigHashes: sigHashes, } inputScripts, err := m.cfg.Signer.ComputeInputScript( - ctx, tx, []*input.SignDescriptor{signDesc}, + ctx, tx, []*lndclient.SignDescriptor{signDesc}, ) if err != nil { return nil, err @@ -1536,8 +1538,8 @@ func (m *Manager) signInput(ctx context.Context, tx *wire.MsgTx, // account. If the account is being spent with cooperation of the auctioneer, // their signature will be required as well. func (m *Manager) signAccountInput(ctx context.Context, tx *wire.MsgTx, - account *Account, idx int, sigHashType txscript.SigHashType, - sigHashes *txscript.TxSigHashes) ([]byte, []byte, error) { + account *Account, idx int, sigHashType txscript.SigHashType) ([]byte, + []byte, error) { traderKeyTweak := clmscript.TraderKeyTweak( account.BatchKey, account.Secret, account.TraderKey.PubKey, @@ -1555,17 +1557,16 @@ func (m *Manager) signAccountInput(ctx context.Context, tx *wire.MsgTx, return nil, nil, err } - signDesc := &input.SignDescriptor{ + signDesc := &lndclient.SignDescriptor{ KeyDesc: *account.TraderKey, SingleTweak: traderKeyTweak, WitnessScript: witnessScript, Output: accountOutput, HashType: sigHashType, InputIndex: idx, - SigHashes: sigHashes, } sigs, err := m.cfg.Signer.SignOutputRaw( - ctx, tx, []*input.SignDescriptor{signDesc}, + ctx, tx, []*lndclient.SignDescriptor{signDesc}, ) if err != nil { return nil, nil, err diff --git a/account/mock_test.go b/account/mock_test.go index 27f2a82..a1c01bc 100644 --- a/account/mock_test.go +++ b/account/mock_test.go @@ -14,7 +14,7 @@ import ( "github.com/btcsuite/btcutil" "github.com/btcsuite/btcwallet/wtxmgr" "github.com/lightninglabs/llm/clmscript" - "github.com/lightninglabs/loop/lndclient" + "github.com/lightninglabs/lndclient" "github.com/lightningnetwork/lnd/chainntnfs" "github.com/lightningnetwork/lnd/input" "github.com/lightningnetwork/lnd/keychain" @@ -216,7 +216,7 @@ type mockWallet struct { lndclient.WalletKitClient lndclient.SignerClient - txs []*wire.MsgTx + txs []lndclient.Transaction publishChan chan *wire.MsgTx utxos []*lnwallet.Utxo @@ -270,12 +270,14 @@ func (w *mockWallet) NextAddr(ctx context.Context) (btcutil.Address, error) { ) } -func (w *mockWallet) ListTransactions(ctx context.Context) ([]*wire.MsgTx, error) { +func (w *mockWallet) ListTransactions(context.Context, int32, + int32) ([]lndclient.Transaction, error) { + return w.txs, nil } func (w *mockWallet) addTx(tx *wire.MsgTx) { - w.txs = append(w.txs, tx) + w.txs = append(w.txs, lndclient.Transaction{Tx: tx}) } func (w *mockWallet) interceptSendOutputs(f func(context.Context, []*wire.TxOut, @@ -303,13 +305,13 @@ func (w *mockWallet) ReleaseOutput(_ context.Context, lockID wtxmgr.LockID, } func (w *mockWallet) SignOutputRaw(context.Context, *wire.MsgTx, - []*input.SignDescriptor) ([][]byte, error) { + []*lndclient.SignDescriptor) ([][]byte, error) { return [][]byte{[]byte("trader sig")}, nil } func (w *mockWallet) ComputeInputScript(context.Context, *wire.MsgTx, - []*input.SignDescriptor) ([]*input.Script, error) { + []*lndclient.SignDescriptor) ([]*input.Script, error) { return []*input.Script{{ SigScript: []byte("input sig script"), diff --git a/account/recovery.go b/account/recovery.go index fc2ab92..fd74997 100644 --- a/account/recovery.go +++ b/account/recovery.go @@ -4,7 +4,7 @@ import ( "context" "github.com/lightninglabs/llm/clmscript" - "github.com/lightninglabs/loop/lndclient" + "github.com/lightninglabs/lndclient" "github.com/lightningnetwork/lnd/keychain" ) diff --git a/account/watcher/mock_test.go b/account/watcher/mock_test.go index 422aa3a..14b80f0 100644 --- a/account/watcher/mock_test.go +++ b/account/watcher/mock_test.go @@ -5,7 +5,7 @@ import ( "github.com/btcsuite/btcd/chaincfg/chainhash" "github.com/btcsuite/btcd/wire" - "github.com/lightninglabs/loop/lndclient" + "github.com/lightninglabs/lndclient" "github.com/lightningnetwork/lnd/chainntnfs" ) diff --git a/account/watcher/watcher.go b/account/watcher/watcher.go index 4f23fb0..4458bdb 100644 --- a/account/watcher/watcher.go +++ b/account/watcher/watcher.go @@ -8,7 +8,7 @@ import ( "github.com/btcsuite/btcd/btcec" "github.com/btcsuite/btcd/chaincfg/chainhash" "github.com/btcsuite/btcd/wire" - "github.com/lightninglabs/loop/lndclient" + "github.com/lightninglabs/lndclient" "github.com/lightningnetwork/lnd/chainntnfs" ) diff --git a/auctioneer/account_subscription.go b/auctioneer/account_subscription.go index a2fbc9c..558de4a 100644 --- a/auctioneer/account_subscription.go +++ b/auctioneer/account_subscription.go @@ -8,7 +8,7 @@ import ( "github.com/lightninglabs/llm/account" "github.com/lightninglabs/llm/clmrpc" "github.com/lightninglabs/llm/order" - "github.com/lightninglabs/loop/lndclient" + "github.com/lightninglabs/lndclient" "github.com/lightningnetwork/lnd/keychain" ) diff --git a/auctioneer/client.go b/auctioneer/client.go index e49c306..bee4809 100644 --- a/auctioneer/client.go +++ b/auctioneer/client.go @@ -18,7 +18,7 @@ import ( "github.com/lightninglabs/llm/account" "github.com/lightninglabs/llm/clmrpc" "github.com/lightninglabs/llm/order" - "github.com/lightninglabs/loop/lndclient" + "github.com/lightninglabs/lndclient" "github.com/lightningnetwork/lnd/keychain" "google.golang.org/grpc" "google.golang.org/grpc/codes" diff --git a/chaninfo/channel_info.go b/chaninfo/channel_info.go index 8328951..20ea52f 100644 --- a/chaninfo/channel_info.go +++ b/chaninfo/channel_info.go @@ -7,7 +7,7 @@ import ( "github.com/btcsuite/btcd/btcec" "github.com/btcsuite/btcd/wire" - "github.com/lightninglabs/loop/lndclient" + "github.com/lightninglabs/lndclient" "github.com/lightningnetwork/lnd/chanbackup" ) diff --git a/cmd/llm/auth.go b/cmd/llm/auth.go index e31f153..5eeef3f 100644 --- a/cmd/llm/auth.go +++ b/cmd/llm/auth.go @@ -7,8 +7,8 @@ import ( "fmt" "time" + "github.com/lightninglabs/aperture/lsat" "github.com/lightninglabs/llm/clmrpc" - "github.com/lightninglabs/loop/lsat" "github.com/urfave/cli" "gopkg.in/macaroon.v2" ) diff --git a/go.mod b/go.mod index 3b35136..b499aaf 100644 --- a/go.mod +++ b/go.mod @@ -12,8 +12,8 @@ require ( github.com/golang/protobuf v1.3.3 github.com/grpc-ecosystem/grpc-gateway v1.14.6 github.com/jessevdk/go-flags v1.4.0 - github.com/lightninglabs/kirin v0.0.0-20200217235049-34b4e1f6a585 - github.com/lightninglabs/loop v0.6.4-beta.0.20200617020450-0d67b3987a63 + github.com/lightninglabs/aperture v0.0.0-20200811173827-537716305eba + github.com/lightninglabs/lndclient v1.0.1-0.20200811080044-d1a60f30cf60 github.com/lightninglabs/protobuf-hex-display v1.3.3-0.20191212020323-b444784ce75d github.com/lightningnetwork/lnd v0.11.0-beta.rc2 github.com/stretchr/testify v1.5.1 diff --git a/go.sum b/go.sum index 0b81f16..e71c1db 100644 --- a/go.sum +++ b/go.sum @@ -35,10 +35,6 @@ github.com/btcsuite/btcutil v1.0.2 h1:9iZ1Terx9fMIOtq1VrwdqfsATL9MC2l8ZrUY6YZ2ut github.com/btcsuite/btcutil v1.0.2/go.mod h1:j9HUFwoQRsZL3V4n+qG+CUnEGHOarIxfC3Le2Yhbcts= github.com/btcsuite/btcutil/psbt v1.0.2 h1:gCVY3KxdoEVU7Q6TjusPO+GANIwVgr9yTLqM+a6CZr8= github.com/btcsuite/btcutil/psbt v1.0.2/go.mod h1:LVveMu4VaNSkIRTZu2+ut0HDBRuYjqGocxDMNS1KuGQ= -github.com/btcsuite/btcwallet v0.11.0 h1:XhwqdhEchy5a0q6R+y3F82roD2hYycPCHovgNyJS08w= -github.com/btcsuite/btcwallet v0.11.0/go.mod h1:qtPAohN1ioo0pvJt/j7bZM8ANBWlYWVCVFL0kkijs7s= -github.com/btcsuite/btcwallet v0.11.1-0.20200604005347-6390f167e5f8 h1:wyooGuOeqcpJDK9+KgO5/yfb3nmEhakbdKHERhEylNE= -github.com/btcsuite/btcwallet v0.11.1-0.20200604005347-6390f167e5f8/go.mod h1:9+AH3V5mcTtNXTKe+fe63fDLKGOwQbZqmvOVUef+JFE= github.com/btcsuite/btcwallet v0.11.1-0.20200612012534-48addcd5591a h1:AZ1Mf0gd9mgJqrTTIFUc17ep9EKUbQusVAIzJ6X+x3Q= github.com/btcsuite/btcwallet v0.11.1-0.20200612012534-48addcd5591a/go.mod h1:9+AH3V5mcTtNXTKe+fe63fDLKGOwQbZqmvOVUef+JFE= github.com/btcsuite/btcwallet/wallet/txauthor v1.0.0 h1:KGHMW5sd7yDdDMkCZ/JpP0KltolFsQcB973brBnfj4c= @@ -48,7 +44,6 @@ github.com/btcsuite/btcwallet/wallet/txrules v1.0.0/go.mod h1:UwQE78yCerZ313EXZw github.com/btcsuite/btcwallet/wallet/txsizes v1.0.0 h1:6DxkcoMnCPY4E9cUDPB5tbuuf40SmmMkSQkoE8vCT+s= github.com/btcsuite/btcwallet/wallet/txsizes v1.0.0/go.mod h1:pauEU8UuMFiThe5PB3EO+gO5kx87Me5NvdQDsTuq6cs= github.com/btcsuite/btcwallet/walletdb v1.0.0/go.mod h1:bZTy9RyYZh9fLnSua+/CD48TJtYJSHjjYcSaszuxCCk= -github.com/btcsuite/btcwallet/walletdb v1.1.0/go.mod h1:bZTy9RyYZh9fLnSua+/CD48TJtYJSHjjYcSaszuxCCk= github.com/btcsuite/btcwallet/walletdb v1.2.0/go.mod h1:9cwc1Yyg4uvd4ZdfdoMnALji+V9gfWSMfxEdLdR5Vwc= github.com/btcsuite/btcwallet/walletdb v1.3.1/go.mod h1:9cwc1Yyg4uvd4ZdfdoMnALji+V9gfWSMfxEdLdR5Vwc= github.com/btcsuite/btcwallet/walletdb v1.3.2 h1:nFnMBVgkqoVOx08Z756oDwNc9sdVgYR52T1ONSXs90w= @@ -56,10 +51,8 @@ github.com/btcsuite/btcwallet/walletdb v1.3.2/go.mod h1:GZCMPNpUu5KE3ASoVd+k06p/ github.com/btcsuite/btcwallet/walletdb v1.3.3 h1:u6e7vRIKBF++cJy+hOHaMGg+88ZTwvpaY27AFvtB668= github.com/btcsuite/btcwallet/walletdb v1.3.3/go.mod h1:oJDxAEUHVtnmIIBaa22wSBPTVcs6hUp5NKWmI8xDwwU= github.com/btcsuite/btcwallet/wtxmgr v1.0.0/go.mod h1:vc4gBprll6BP0UJ+AIGDaySoc7MdAmZf8kelfNb8CFY= -github.com/btcsuite/btcwallet/wtxmgr v1.1.1-0.20200604005347-6390f167e5f8/go.mod h1:cJGqxXtqQbmXuL7RlXjIM18x0bGHy1407/85mQCLca4= github.com/btcsuite/btcwallet/wtxmgr v1.2.0 h1:ZUYPsSv8GjF9KK7lboB2OVHF0uYEcHxgrCfFWqPd9NA= github.com/btcsuite/btcwallet/wtxmgr v1.2.0/go.mod h1:h8hkcKUE3X7lMPzTUoGnNiw5g7VhGrKEW3KpR2r0VnY= -github.com/btcsuite/fastsha256 v0.0.0-20160815193821-637e65642941/go.mod h1:QcFA8DZHtuIAdYKCq/BzELOaznRsCvwf4zTPmaYwaig= github.com/btcsuite/go-socks v0.0.0-20170105172521-4720035b7bfd h1:R/opQEbFEy9JGkIguV40SvRY1uliPX8ifOvi6ICsFCw= github.com/btcsuite/go-socks v0.0.0-20170105172521-4720035b7bfd/go.mod h1:HHNXQzUsZCxOoE+CPiyCTO6x34Zs86zZUiwtpXoGdtg= github.com/btcsuite/golangcrypto v0.0.0-20150304025918-53f62d9b43e8/go.mod h1:tYvUd8KLhm/oXvUeSEs2VlLghFjQt9+ZaF9ghH0JNjc= @@ -78,12 +71,10 @@ github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDk github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/coreos/bbolt v1.3.3 h1:n6AiVyVRKQFNb6mJlwESEvvLoDyiTzXX7ORAUlkeBdY= github.com/coreos/bbolt v1.3.3/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= -github.com/coreos/etcd v3.3.17+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= github.com/coreos/etcd v3.3.22+incompatible h1:AnRMUyVdVvh1k7lHe61YEd227+CLoNogQuAypztGSK4= github.com/coreos/etcd v3.3.22+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= github.com/coreos/go-semver v0.3.0 h1:wkHLiw0WNATZnSG7epLsujiMCgPAc9xhjJ4tgnAxmfM= github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= -github.com/coreos/go-systemd v0.0.0-20190212144455-93d5ec2c7f76/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf h1:iW4rZ826su+pqaw19uhpSCzhj44qo35pNgKFGqzDKkU= github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f h1:lBNOc5arjvs8E5mO2tbpBpLoyyu8B6e44T7hJy6potg= @@ -122,7 +113,6 @@ github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/me github.com/gogo/protobuf v1.1.1 h1:72R+M5VuhED/KujmZVcIquuo8mBgX4oVda//DQb3PXo= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= -github.com/golang/groupcache v0.0.0-20191027212112-611e8accdfc9/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e h1:1r7pUrabqp18hOBcwBwiTsbnFeTZHV9eER/QT5JVZxY= github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:tluoj9z5200jBnyusfRPU2LqT6J+DAorxEvtC7LHB+E= @@ -136,15 +126,12 @@ github.com/google/btree v1.0.0 h1:0udJVsspx3VBr5FwtLhQQtuAsVc79tTq0ocGIPAU6qo= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.2.1-0.20190312032427-6f77996f0c42/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +github.com/google/go-cmp v0.3.0 h1:crn/baboCvb5fXaQ0IJ1SGTsTVrWpDsCWC8EGETZijY= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -github.com/google/go-cmp v0.3.1 h1:Xye71clBPdm5HgqGwUkwhbynsUJZhDbS20FvLhQ2izg= -github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/uuid v1.1.1 h1:Gkbcsh/GbpXz7lPftLA3P6TYMwjCLYm83jiFQZF/3gY= github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/gorilla/websocket v1.4.1 h1:q7AeDBpnBk8AogcD4DSag/Ukw/KV+YhzLj2bP5HvKCM= -github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc= github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/grpc-ecosystem/go-grpc-middleware v1.0.0 h1:Iju5GlWwrvL6UBg4zJJt3btmonfrMlCDdsejg4CZE7c= @@ -152,7 +139,6 @@ github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmg github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 h1:Ovs26xHkKqVztRpIrF/92BcuyuQ/YW4NSIpoGtfXNho= github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= github.com/grpc-ecosystem/grpc-gateway v1.8.6/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= -github.com/grpc-ecosystem/grpc-gateway v1.10.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= github.com/grpc-ecosystem/grpc-gateway v1.14.3/go.mod h1:6CwZWGDSPRJidgKAtJVvND6soZe6fT7iteq8wDPdhb0= github.com/grpc-ecosystem/grpc-gateway v1.14.6 h1:8ERzHx8aj1Sc47mu9n/AksaKCSWrMchFtkdrS4BIj5o= github.com/grpc-ecosystem/grpc-gateway v1.14.6/go.mod h1:zdiPV4Yse/1gnckTHtghG4GkDEdKCRJduHpTxT3/jcw= @@ -166,11 +152,14 @@ github.com/jessevdk/go-flags v1.4.0 h1:4IU2WS7AumrZ/40jfhf4QVDMsQwqA7VEHozFRrGAR github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= github.com/jonboulle/clockwork v0.1.0 h1:VKV+ZcuP6l3yW9doeqz6ziZGgcynBVQO+obU0+0hcPo= github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= +github.com/jonboulle/clockwork v0.2.0 h1:J2SLSdy7HgElq8ekSl2Mxh6vrRNFxqbXGenYH2I02Vs= +github.com/jonboulle/clockwork v0.2.0/go.mod h1:Pkfl5aHPm1nk2H9h0bjmnJD/BcgbGXUBGnn1kMkgxc8= github.com/jrick/logrotate v1.0.0 h1:lQ1bL/n9mBNeIXoTUoYRlK4dHuNJVofX9oWqBtPnSzI= github.com/jrick/logrotate v1.0.0/go.mod h1:LNinyqDIJnpAur+b8yyulnQw/wDuN1+BYKlTRt3OuAQ= -github.com/json-iterator/go v1.1.8/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.9 h1:9yzud/Ht36ygwatGx56VwCZtlI/2AD15T1X2sjSuGns= github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= +github.com/json-iterator/go v1.1.10 h1:Kz6Cvnvv2wGdaG/V8yMvfkmNiXq9Ya2KUv4rouJJr68= +github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/juju/clock v0.0.0-20190205081909-9c5c9712527c h1:3UvYABOQRhJAApj9MdCN+Ydv841ETSoy6xLzdmmr/9A= github.com/juju/clock v0.0.0-20190205081909-9c5c9712527c/go.mod h1:nD0vlnrUjcjJhqN5WuCWZyzfd5AHZAC9/ajvbSx69xA= github.com/juju/errors v0.0.0-20190806202954-0232dcc7464d h1:hJXjZMxj0SWlMoQkzeZDLi2cmeiWKa7y1B8Rg+qaoEc= @@ -198,32 +187,28 @@ github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORN github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= +github.com/lightninglabs/aperture v0.0.0-20200811173827-537716305eba h1:rEI6XdRGvG4myoSzQJ1LikYEHVv1+p60L/5hejCDBjw= +github.com/lightninglabs/aperture v0.0.0-20200811173827-537716305eba/go.mod h1:LbxSjvNlM3RAB7vBhIW8TKkH4Qm2WNIT03iJ+iZqlvk= github.com/lightninglabs/gozmq v0.0.0-20191113021534-d20a764486bf h1:HZKvJUHlcXI/f/O0Avg7t8sqkPo78HFzjmeYFl6DPnc= github.com/lightninglabs/gozmq v0.0.0-20191113021534-d20a764486bf/go.mod h1:vxmQPeIQxPf6Jf9rM8R+B4rKBqLA2AjttNxkFBL2Plk= -github.com/lightninglabs/kirin v0.0.0-20200217235049-34b4e1f6a585 h1:NEC1mMh6KvNeUjiRHBuQf/Pptg19rq1CVO4jRUzhj1I= -github.com/lightninglabs/kirin v0.0.0-20200217235049-34b4e1f6a585/go.mod h1:6RzSfM47mAGvnNl8QWWc4NbuDxoEnPGy/KbyM0uWgvs= -github.com/lightninglabs/loop v0.3.0-alpha.0.20200103135410-5e00ce62677a/go.mod h1:VEp7TFUL7Ehq9mjQVUuNVTjpMIeTx8kOHvQ7PdJpLuA= -github.com/lightninglabs/loop v0.6.4-beta.0.20200617020450-0d67b3987a63 h1:R/+aHkygbuxfZsZOByiFUA6f73TNZ3EJQYhWS+hvdoc= -github.com/lightninglabs/loop v0.6.4-beta.0.20200617020450-0d67b3987a63/go.mod h1:5TEpefapLXHYrUpbhVYXP4DenS2H3S6hSYu1koFjfZA= +github.com/lightninglabs/lndclient v1.0.1-0.20200708223031-76709c25d859/go.mod h1:nKEd6j54LxPYuIe3K/BUwQPus24sbvWTdoweoBcHas0= +github.com/lightninglabs/lndclient v1.0.1-0.20200811080044-d1a60f30cf60 h1:V5tXFlWoIqx/ycsQ+dibjuem/cAOboNMbUcroBVwupU= +github.com/lightninglabs/lndclient v1.0.1-0.20200811080044-d1a60f30cf60/go.mod h1:7UNQg6WLBgt+T/KBQjlSXtid7bFlwBRWdOk7ZMLYkrM= github.com/lightninglabs/neutrino v0.11.0/go.mod h1:CuhF0iuzg9Sp2HO6ZgXgayviFTn1QHdSTJlMncK80wg= github.com/lightninglabs/neutrino v0.11.1-0.20200316235139-bffc52e8f200 h1:j4iZ1XlUAPQmW6oSzMcJGILYsRHNs+4O3Gk+2Ms5Dww= github.com/lightninglabs/neutrino v0.11.1-0.20200316235139-bffc52e8f200/go.mod h1:MlZmoKa7CJP3eR1s5yB7Rm5aSyadpKkxqAwLQmog7N0= github.com/lightninglabs/protobuf-hex-display v1.3.3-0.20191212020323-b444784ce75d h1:QWD/5MPnaZfUVP7P8wLa4M8Td2DI7XXHXt2vhVtUgGI= github.com/lightninglabs/protobuf-hex-display v1.3.3-0.20191212020323-b444784ce75d/go.mod h1:KDb67YMzoh4eudnzClmvs2FbiLG9vxISmLApUkCa4uI= -github.com/lightningnetwork/lightning-onion v0.0.0-20191214001659-f34e9dc1651d/go.mod h1:rigfi6Af/KqsF7Za0hOgcyq2PNH4AN70AaMRxcJkff4= +github.com/lightningnetwork/lightning-onion v1.0.1/go.mod h1:rigfi6Af/KqsF7Za0hOgcyq2PNH4AN70AaMRxcJkff4= github.com/lightningnetwork/lightning-onion v1.0.2-0.20200501022730-3c8c8d0b89ea h1:oCj48NQ8u7Vz+MmzHqt0db6mxcFZo3Ho7M5gCJauY/k= github.com/lightningnetwork/lightning-onion v1.0.2-0.20200501022730-3c8c8d0b89ea/go.mod h1:rigfi6Af/KqsF7Za0hOgcyq2PNH4AN70AaMRxcJkff4= -github.com/lightningnetwork/lnd v0.8.0-beta-rc3.0.20200103000305-22e1f006b194/go.mod h1:WHK90FD3m2n6OyWzondS7ho0Uhtgfp30Nxvj24lQYX4= -github.com/lightningnetwork/lnd v0.10.0-beta.rc6.0.20200615174244-103c59a4889f h1:/IS0Gy94ZZ0pJdwMmyb1B8RKszTY1aFm2+r/PItpbvs= -github.com/lightningnetwork/lnd v0.10.0-beta.rc6.0.20200615174244-103c59a4889f/go.mod h1:a2ejAHgjuwQ9YQJBzlMD8ZJHUcyWxXb8HRGe5QlJh9Y= +github.com/lightningnetwork/lnd v0.10.3-beta/go.mod h1:4d02pduRVtZwgTJ+EimKJTsEAY0jDwi0SPE9h5aRneM= github.com/lightningnetwork/lnd v0.11.0-beta.rc2 h1:em+sMbR/RF90RFgig2pWkuzXbpdIDLAUFIoxK68Z6j8= github.com/lightningnetwork/lnd v0.11.0-beta.rc2/go.mod h1:/f/0xJER9MIoFE2LHJljPH6vtHYkrmwYS4KkD1S5wwo= -github.com/lightningnetwork/lnd/cert v1.0.0/go.mod h1:fmtemlSMf5t4hsQmcprSoOykypAPp+9c+0d0iqTScMo= github.com/lightningnetwork/lnd/cert v1.0.2/go.mod h1:fmtemlSMf5t4hsQmcprSoOykypAPp+9c+0d0iqTScMo= github.com/lightningnetwork/lnd/clock v1.0.1 h1:QQod8+m3KgqHdvVMV+2DRNNZS1GRFir8mHZYA+Z2hFo= github.com/lightningnetwork/lnd/clock v1.0.1/go.mod h1:KnQudQ6w0IAMZi1SgvecLZQZ43ra2vpDNj7H/aasemg= github.com/lightningnetwork/lnd/queue v1.0.1/go.mod h1:vaQwexir73flPW43Mrm7JOgJHmcEFBWWSl9HlyASoms= -github.com/lightningnetwork/lnd/queue v1.0.2/go.mod h1:YTkTVZCxz8tAYreH27EO3s8572ODumWrNdYW2E/YKxg= github.com/lightningnetwork/lnd/queue v1.0.4 h1:8Dq3vxAFSACPy+pKN88oPFhuCpCoAAChPBwa4BJxH4k= github.com/lightningnetwork/lnd/queue v1.0.4/go.mod h1:YTkTVZCxz8tAYreH27EO3s8572ODumWrNdYW2E/YKxg= github.com/lightningnetwork/lnd/ticker v1.0.0 h1:S1b60TEGoTtCe2A0yeB+ecoj/kkS4qpwh6l+AkQEZwU= @@ -289,6 +274,8 @@ github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5 github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk= github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5 h1:LnC5Kc/wtumK+WB441p7ynQJzVuNRJiqddSIE3IlSEQ= github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= +github.com/tmc/grpc-websocket-proxy v0.0.0-20200122045848-3419fae592fc h1:yUaosFVTJwnltaHbSNC3i82I92quFs+OFPRl8kNMVwo= +github.com/tmc/grpc-websocket-proxy v0.0.0-20200122045848-3419fae592fc/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/tv42/zbase32 v0.0.0-20160707012821-501572607d02/go.mod h1:tHlrkM198S068ZqfrO6S8HsoJq2bF3ETfTL+kt4tInY= github.com/urfave/cli v1.18.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= github.com/urfave/cli v1.20.0 h1:fDqGv3UG/4jbVl/QkFwEdddtEDjh/5Ov6X+0B/3bPaw= @@ -299,25 +286,22 @@ go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= go.etcd.io/bbolt v1.3.5-0.20200615073812-232d8fc87f50 h1:ASw9n1EHMftwnP3Az4XW6e308+gNsrHzmdhd0Olz9Hs= go.etcd.io/bbolt v1.3.5-0.20200615073812-232d8fc87f50/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ= go.mongodb.org/mongo-driver v1.0.3/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM= -go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= go.uber.org/atomic v1.6.0 h1:Ezj3JGmsOnG1MoRWQkPBsKLe9DwWD9QeXzTRzzldNVk= go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= -go.uber.org/multierr v1.3.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4= go.uber.org/multierr v1.5.0 h1:KCa4XfM8CWFCpxXRGok+Q0SS/0XBhMDbHHGABQLvD2A= go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU= go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee h1:0mgffUl7nfd+FpvXMVz4IDEaUSmT1ysygQC7qYo7sG4= go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA= -go.uber.org/zap v1.13.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM= go.uber.org/zap v1.14.1 h1:nYDKopTbvAPq/NrUVZwT15y2lpROBiLLyoRTbXOYWOo= go.uber.org/zap v1.14.1/go.mod h1:Mb2vm2krFEG5DV0W9qcHBYFtp/Wku1cvYaqPsS/WYfc= +go.uber.org/zap v1.15.0 h1:ZZCA22JRF2gQE5FoNmhmrf7jeJJ2uhqDUNRYKm8dvmM= +go.uber.org/zap v1.15.0/go.mod h1:Mb2vm2krFEG5DV0W9qcHBYFtp/Wku1cvYaqPsS/WYfc= golang.org/x/crypto v0.0.0-20170930174604-9419663f5a44/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20180723164146-c126467f60eb/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190211182817-74369b46fc67/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20190829043050-9756ffdc2472/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20200109152110-61a87790db17/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200115085410-6d4e4cb37c7d h1:2+ZP7EfsZV7Vvmx3TIqSlSzATMkTAKqM14YGFPoSKjI= golang.org/x/crypto v0.0.0-20200115085410-6d4e4cb37c7d/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200510223506-06a226fb4e37 h1:cg5LA/zNPRzIXIWSCxQW10Rvpy94aQh3LT/ShoCpkHw= @@ -345,7 +329,6 @@ golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73r golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20191002035440-2ec189313ef0 h1:2mqDk8w/o6UmeUCu5Qiq2y7iMf6anbx+YA8d1JFoFrs= golang.org/x/net v0.0.0-20191002035440-2ec189313ef0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20191112182307-2180aed22343 h1:00ohfJ4K98s3m6BGUoBd8nyfp4Yl0GoIKvw5abItTjI= @@ -368,19 +351,15 @@ golang.org/x/sys v0.0.0-20190209173611-3b5209105503/go.mod h1:STP8DvDyc/dI5b8T5h golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191112214154-59a1497f0cea/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5 h1:LfCXLvNmTYH9kEmVgqbnsWfruoXZIrh4YBgqVHtDvw0= golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2 h1:z99zHgr7hKfrUcX/KsoJk5FJfjTceCKIp96+biqP4To= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs= -golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2 h1:+DCIGbF/swA92ohVg0//6X2IVY3KZs6p9mix0ziNYJM= golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= @@ -396,7 +375,6 @@ google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoA google.golang.org/genproto v0.0.0-20190201180003-4b09977fb922/go.mod h1:L3J43x8/uS+qIUoksaLKe6OS3nUKxOKuIFz1sl2/jx4= google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= google.golang.org/genproto v0.0.0-20190927181202-20e1ac93f88c/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8= -google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884 h1:fiNLklpBwWK1mth30Hlwk+fcdBmIALlgF5iy77O37Ig= google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/grpc v1.16.0/go.mod h1:0JHn/cJsOMiMfNA9+DeHDlAU7KAAB5GDlYFpa9MZMio= @@ -417,9 +395,8 @@ gopkg.in/errgo.v1 v1.0.1/go.mod h1:3NjfXwocQRYAPTq4/fzX+CwUhPRcR/azYRhj8G+LqMo= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= +gopkg.in/macaroon-bakery.v2 v2.0.1 h1:0N1TlEdfLP4HXNCg7MQUMp5XwvOoxk+oe9Owr2cpvsc= gopkg.in/macaroon-bakery.v2 v2.0.1/go.mod h1:B4/T17l+ZWGwxFSZQmlBwp25x+og7OkhETfr3S9MbIA= -gopkg.in/macaroon-bakery.v2 v2.1.0 h1:9Jw/+9XHBSutkaeVpWhDx38IcSNLJwWUICkOK98DHls= -gopkg.in/macaroon-bakery.v2 v2.1.0/go.mod h1:B4/T17l+ZWGwxFSZQmlBwp25x+og7OkhETfr3S9MbIA= gopkg.in/macaroon.v2 v2.0.0/go.mod h1:+I6LnTMkm/uV5ew/0nsulNjL16SK4+C8yDmRUzHR17I= gopkg.in/macaroon.v2 v2.1.0 h1:HZcsjBCzq9t0eBPMKqTN/uSN6JOm78ZJ2INbqcBQOUI= gopkg.in/macaroon.v2 v2.1.0/go.mod h1:OUb+TQP/OP0WOerC2Jp/3CwhIKyIa9kQjuc7H24e6/o= @@ -433,6 +410,8 @@ gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.3 h1:fvjTMHxHEw/mxHbtzPi3JCcKXQRAnQTBRo6YCJSVHKI= gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10= +gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= @@ -440,3 +419,5 @@ honnef.co/go/tools v0.0.1-2019.2.3 h1:3JgtbtFHMiCmsznwGVTUWbgGov+pVqnlf1dEJTNAXe honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= sigs.k8s.io/yaml v1.1.0 h1:4A07+ZFc2wgJwo8YNlQpr1rVlgUDlxXHhPJciaPY5gs= sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= +sigs.k8s.io/yaml v1.2.0 h1:kr/MCeFWJWTwyaHoR9c8EjH9OumOmoF9YGiZd7lFm/Q= +sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc= diff --git a/internal/test/signer_mock.go b/internal/test/signer_mock.go index f052d91..e4c56d6 100644 --- a/internal/test/signer_mock.go +++ b/internal/test/signer_mock.go @@ -7,7 +7,7 @@ import ( "github.com/btcsuite/btcd/btcec" "github.com/btcsuite/btcd/wire" - "github.com/lightninglabs/loop/lndclient" + "github.com/lightninglabs/lndclient" "github.com/lightningnetwork/lnd/input" "github.com/lightningnetwork/lnd/keychain" ) @@ -23,7 +23,7 @@ var ( // SignOutputRawRequest contains input data for a tx signing request. type SignOutputRawRequest struct { Tx *wire.MsgTx - SignDescriptors []*input.SignDescriptor + SignDescriptors []*lndclient.SignDescriptor } func NewMockSigner() *MockSigner { @@ -48,7 +48,7 @@ type MockSigner struct { var _ lndclient.SignerClient = (*MockSigner)(nil) func (s *MockSigner) SignOutputRaw(_ context.Context, tx *wire.MsgTx, - signDescriptors []*input.SignDescriptor) ([][]byte, error) { + signDescriptors []*lndclient.SignDescriptor) ([][]byte, error) { s.SignOutputRawChannel <- SignOutputRawRequest{ Tx: tx, @@ -61,7 +61,7 @@ func (s *MockSigner) SignOutputRaw(_ context.Context, tx *wire.MsgTx, } func (s *MockSigner) ComputeInputScript(context.Context, *wire.MsgTx, - []*input.SignDescriptor) ([]*input.Script, error) { + []*lndclient.SignDescriptor) ([]*input.Script, error) { return nil, fmt.Errorf("unimplemented") } diff --git a/internal/test/walletkit_mock.go b/internal/test/walletkit_mock.go index 416e416..2bec3a3 100644 --- a/internal/test/walletkit_mock.go +++ b/internal/test/walletkit_mock.go @@ -11,7 +11,7 @@ import ( "github.com/btcsuite/btcd/wire" "github.com/btcsuite/btcutil" "github.com/btcsuite/btcwallet/wtxmgr" - "github.com/lightninglabs/loop/lndclient" + "github.com/lightninglabs/lndclient" "github.com/lightningnetwork/lnd/keychain" "github.com/lightningnetwork/lnd/lnwallet" "github.com/lightningnetwork/lnd/lnwallet/chainfee" diff --git a/log.go b/log.go index fbe4289..52402d4 100644 --- a/log.go +++ b/log.go @@ -6,12 +6,12 @@ import ( "context" "github.com/btcsuite/btclog" + "github.com/lightninglabs/aperture/lsat" "github.com/lightninglabs/llm/account" "github.com/lightninglabs/llm/auctioneer" "github.com/lightninglabs/llm/clientdb" "github.com/lightninglabs/llm/order" - "github.com/lightninglabs/loop/lndclient" - "github.com/lightninglabs/loop/lsat" + "github.com/lightninglabs/lndclient" "github.com/lightningnetwork/lnd/build" "github.com/lightningnetwork/lnd/signal" "google.golang.org/grpc" diff --git a/order/batch_signer.go b/order/batch_signer.go index 6be8fbb..88b2c2b 100644 --- a/order/batch_signer.go +++ b/order/batch_signer.go @@ -8,8 +8,7 @@ import ( "github.com/btcsuite/btcd/txscript" "github.com/lightninglabs/llm/account" "github.com/lightninglabs/llm/clmscript" - "github.com/lightninglabs/loop/lndclient" - "github.com/lightningnetwork/lnd/input" + "github.com/lightninglabs/lndclient" ) // batchSigner is a type that implements the BatchSigner interface and can sign @@ -25,7 +24,6 @@ type batchSigner struct { // NOTE: This method is part of the BatchSigner interface. func (s *batchSigner) Sign(batch *Batch) (BatchSignature, error) { ourSigs := make(BatchSignature) - hashes := txscript.NewTxSigHashes(batch.BatchTX) // At this point we know that the accounts charged are correct. So we // can just go through them, find the corresponding input in the batch @@ -67,18 +65,17 @@ func (s *batchSigner) Sign(batch *Batch) (BatchSignature, error) { if err != nil { return nil, err } - signDesc := &input.SignDescriptor{ + signDesc := &lndclient.SignDescriptor{ KeyDesc: *acct.TraderKey, SingleTweak: traderKeyTweak, WitnessScript: witnessScript, Output: acctOut, HashType: txscript.SigHashAll, InputIndex: inputIndex, - SigHashes: hashes, } sigs, err := s.signer.SignOutputRaw( context.Background(), batch.BatchTX, - []*input.SignDescriptor{signDesc}, + []*lndclient.SignDescriptor{signDesc}, ) if err != nil { return nil, err diff --git a/order/batch_verifier.go b/order/batch_verifier.go index 2ca25b2..eecddde 100644 --- a/order/batch_verifier.go +++ b/order/batch_verifier.go @@ -10,7 +10,7 @@ import ( "github.com/btcsuite/btcd/btcec" "github.com/btcsuite/btcd/wire" "github.com/lightninglabs/llm/account" - "github.com/lightninglabs/loop/lndclient" + "github.com/lightninglabs/lndclient" "github.com/lightningnetwork/lnd/input" ) diff --git a/order/manager.go b/order/manager.go index 1f480f7..8b9cf5c 100644 --- a/order/manager.go +++ b/order/manager.go @@ -10,7 +10,7 @@ import ( "time" "github.com/lightninglabs/llm/account" - "github.com/lightninglabs/loop/lndclient" + "github.com/lightninglabs/lndclient" "github.com/lightningnetwork/lnd/keychain" "github.com/lightningnetwork/lnd/lnwallet/chainfee" ) diff --git a/rpcserver.go b/rpcserver.go index 9de6987..17d2a0c 100644 --- a/rpcserver.go +++ b/rpcserver.go @@ -23,7 +23,7 @@ import ( "github.com/lightninglabs/llm/clientdb" "github.com/lightninglabs/llm/clmrpc" "github.com/lightninglabs/llm/order" - "github.com/lightninglabs/loop/lndclient" + "github.com/lightninglabs/lndclient" "github.com/lightningnetwork/lnd/chanbackup" "github.com/lightningnetwork/lnd/input" "github.com/lightningnetwork/lnd/lnrpc" diff --git a/server.go b/server.go index f6bfb1b..683704a 100644 --- a/server.go +++ b/server.go @@ -12,13 +12,12 @@ import ( "sync" proxy "github.com/grpc-ecosystem/grpc-gateway/runtime" - "github.com/lightninglabs/kirin/auth" + "github.com/lightninglabs/aperture/lsat" "github.com/lightninglabs/llm/auctioneer" "github.com/lightninglabs/llm/clientdb" "github.com/lightninglabs/llm/clmrpc" "github.com/lightninglabs/llm/order" - "github.com/lightninglabs/loop/lndclient" - "github.com/lightninglabs/loop/lsat" + "github.com/lightninglabs/lndclient" "github.com/lightningnetwork/lnd/build" "github.com/lightningnetwork/lnd/lnrpc" "google.golang.org/grpc" @@ -107,7 +106,7 @@ func NewServer(cfg *Config) (*Server, error) { } var interceptor Interceptor = lsat.NewInterceptor( &lndServices.LndServices, fileStore, defaultRPCTimeout, - defaultLsatMaxCost, defaultLsatMaxFee, + defaultLsatMaxCost, defaultLsatMaxFee, false, ) // getIdentity can be used to determine the current LSAT identification @@ -332,7 +331,7 @@ func getLnd(network string, cfg *LndConfig) (*lndclient.GrpcLndServices, error) return lndclient.NewLndServices( &lndclient.LndServicesConfig{ LndAddress: cfg.Host, - Network: network, + Network: lndclient.Network(network), MacaroonDir: cfg.MacaroonDir, TLSPath: cfg.TLSPath, }, @@ -367,7 +366,7 @@ func (i *regtestInterceptor) UnaryInterceptor(ctx context.Context, method string idStr := fmt.Sprintf("LSATID %x", i.id[:]) idCtx := metadata.AppendToOutgoingContext( - ctx, auth.HeaderAuthorization, idStr, + ctx, lsat.HeaderAuthorization, idStr, ) return invoker(idCtx, method, req, reply, cc, opts...) } @@ -381,7 +380,7 @@ func (i *regtestInterceptor) StreamInterceptor(ctx context.Context, idStr := fmt.Sprintf("LSATID %x", i.id[:]) idCtx := metadata.AppendToOutgoingContext( - ctx, auth.HeaderAuthorization, idStr, + ctx, lsat.HeaderAuthorization, idStr, ) return streamer(idCtx, desc, cc, method, opts...) }