Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

multi: support derived public key import #5047

Merged
merged 10 commits into from
Apr 6, 2021
Merged

multi: support derived public key import #5047

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
a620ce3
build: update btcd and btcwallet dependencies
wpaulino Mar 9, 2021
f38bf4d
lnwallet: expose required account parameter for WalletController methods
wpaulino Feb 20, 2021
f91e7cd
lnwallet: expose optional account filter for several WalletController…
wpaulino Feb 20, 2021
a7211b3
rpc: expose account parameter for several wallet RPCs
wpaulino Feb 20, 2021
c7bed34
lncli: add account flag to wallet related commands
wpaulino Feb 20, 2021
2d163b7
lnwallet: expose wallet import related methods to WalletController
wpaulino Feb 20, 2021
5301c7e
walletrpc: expose wallet import related RPCs
wpaulino Feb 20, 2021
4964801
lncli: add wallet import related commands
wpaulino Feb 20, 2021
cb3e179
rpc: break down wallet balance by accounts
wpaulino Feb 20, 2021
983f402
itest: add wallet import cases
wpaulino Feb 20, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions chainntnfs/bitcoindnotify/bitcoind_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ func syncNotifierWithMiner(t *testing.T, notifier *BitcoindNotifier,

t.Helper()

_, minerHeight, err := miner.Node.GetBestBlock()
_, minerHeight, err := miner.Client.GetBestBlock()
if err != nil {
t.Fatalf("unable to retrieve miner's current height: %v", err)
}
Expand Down Expand Up @@ -173,7 +173,7 @@ func TestHistoricalConfDetailsTxIndex(t *testing.T) {
"mempool, but did not: %v", txStatus)
}

if _, err := miner.Node.Generate(1); err != nil {
if _, err := miner.Client.Generate(1); err != nil {
t.Fatalf("unable to generate block: %v", err)
}

Expand Down Expand Up @@ -247,14 +247,14 @@ func TestHistoricalConfDetailsNoTxIndex(t *testing.T) {
// ensured above.
outpoint, output, privKey := chainntnfs.CreateSpendableOutput(t, miner)
spendTx := chainntnfs.CreateSpendTx(t, outpoint, output, privKey)
spendTxHash, err := miner.Node.SendRawTransaction(spendTx, true)
spendTxHash, err := miner.Client.SendRawTransaction(spendTx, true)
if err != nil {
t.Fatalf("unable to broadcast tx: %v", err)
}
if err := chainntnfs.WaitForMempoolTx(miner, spendTxHash); err != nil {
t.Fatalf("tx not relayed to miner: %v", err)
}
if _, err := miner.Node.Generate(1); err != nil {
if _, err := miner.Client.Generate(1); err != nil {
t.Fatalf("unable to generate block: %v", err)
}

Expand Down
6 changes: 3 additions & 3 deletions chainntnfs/btcdnotify/btcd_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ func TestHistoricalConfDetailsTxIndex(t *testing.T) {

// We'll now confirm this transaction and re-attempt to retrieve its
// confirmation details.
if _, err := harness.Node.Generate(1); err != nil {
if _, err := harness.Client.Generate(1); err != nil {
t.Fatalf("unable to generate block: %v", err)
}

Expand Down Expand Up @@ -188,7 +188,7 @@ func TestHistoricalConfDetailsNoTxIndex(t *testing.T) {
// Now, we'll create a test transaction and attempt to retrieve its
// confirmation details. We'll note its broadcast height to use as the
// height hint when manually scanning the chain.
_, currentHeight, err := harness.Node.GetBestBlock()
_, currentHeight, err := harness.Client.GetBestBlock()
if err != nil {
t.Fatalf("unable to retrieve current height: %v", err)
}
Expand Down Expand Up @@ -219,7 +219,7 @@ func TestHistoricalConfDetailsNoTxIndex(t *testing.T) {

// We'll now confirm this transaction and re-attempt to retrieve its
// confirmation details.
if _, err := harness.Node.Generate(1); err != nil {
if _, err := harness.Client.Generate(1); err != nil {
t.Fatalf("unable to generate block: %v", err)
}

Expand Down
Loading