Skip to content

wallet: don't panic, retry instead #81

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

Open
buck54321 wants to merge 3 commits into
base: master
Choose a base branch
from
Open

wallet: don't panic, retry instead #81

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8df8ea0
use dcrlabs
buck54321 Jan 14, 2024
413daab
Merge pull request #1 from buck54321/rerepo
buck54321 Jan 14, 2024
d223d5c
wallet: don't panic, retry instead
Roasbeef May 30, 2023
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
2 changes: 1 addition & 1 deletion bchwallet.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
package main

import (
"github.com/gcash/bchwallet/boot"
"github.com/dcrlabs/bchwallet/boot"

_ "net/http/pprof"
"os"
Expand Down
18 changes: 9 additions & 9 deletions boot/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ import (
"strings"
"time"

"github.com/dcrlabs/bchwallet/internal/cfgutil"
"github.com/dcrlabs/bchwallet/internal/legacy/keystore"
"github.com/dcrlabs/bchwallet/netparams"
"github.com/dcrlabs/bchwallet/wallet"
neutrino "github.com/dcrlabs/neutrino-bch"
"github.com/gcash/bchutil"
"github.com/gcash/bchwallet/internal/cfgutil"
"github.com/gcash/bchwallet/internal/legacy/keystore"
"github.com/gcash/bchwallet/netparams"
"github.com/gcash/bchwallet/wallet"
"github.com/gcash/neutrino"
flags "github.com/jessevdk/go-flags"
)

Expand Down Expand Up @@ -248,10 +248,10 @@ func parseAndSetDebugLevels(debugLevel string) error {
// line options.
//
// The configuration proceeds as follows:
// 1) Start with a default config with sane settings
// 2) Pre-parse the command line to check for an alternative config file
// 3) Load configuration file overwriting defaults with any specified options
// 4) Parse CLI options and overwrite/add any specified options
// 1. Start with a default config with sane settings
// 2. Pre-parse the command line to check for an alternative config file
// 3. Load configuration file overwriting defaults with any specified options
// 4. Parse CLI options and overwrite/add any specified options
//
// The above results in bchwallet functioning properly without any config
// settings while still allowing the user to override settings with config files
Expand Down
12 changes: 6 additions & 6 deletions boot/log.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@ import (
"os"
"path/filepath"

"github.com/dcrlabs/bchwallet/chain"
"github.com/dcrlabs/bchwallet/rpc/legacyrpc"
"github.com/dcrlabs/bchwallet/rpc/rpcserver"
"github.com/dcrlabs/bchwallet/wallet"
"github.com/dcrlabs/bchwallet/wtxmgr"
neutrino "github.com/dcrlabs/neutrino-bch"
"github.com/gcash/bchd/rpcclient"
"github.com/gcash/bchlog"
"github.com/gcash/bchwallet/chain"
"github.com/gcash/bchwallet/rpc/legacyrpc"
"github.com/gcash/bchwallet/rpc/rpcserver"
"github.com/gcash/bchwallet/wallet"
"github.com/gcash/bchwallet/wtxmgr"
"github.com/gcash/neutrino"
"github.com/jrick/logrotate/rotator"
)

Expand Down
12 changes: 6 additions & 6 deletions boot/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ import (

"golang.org/x/net/proxy"

"github.com/gcash/bchwallet/chain"
"github.com/gcash/bchwallet/rpc/legacyrpc"
"github.com/gcash/bchwallet/rpc/rpcserver"
"github.com/gcash/bchwallet/wallet"
"github.com/gcash/bchwallet/walletdb"
"github.com/gcash/neutrino"
"github.com/dcrlabs/bchwallet/chain"
"github.com/dcrlabs/bchwallet/rpc/legacyrpc"
"github.com/dcrlabs/bchwallet/rpc/rpcserver"
"github.com/dcrlabs/bchwallet/wallet"
"github.com/dcrlabs/bchwallet/walletdb"
neutrino "github.com/dcrlabs/neutrino-bch"
"github.com/miekg/dns"
)

Expand Down
2 changes: 1 addition & 1 deletion boot/params.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@

package boot

import "github.com/gcash/bchwallet/netparams"
import "github.com/dcrlabs/bchwallet/netparams"

var activeNet = &netparams.MainNetParams
9 changes: 5 additions & 4 deletions boot/rpcserver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import (
"crypto/tls"
"errors"
"fmt"
"google.golang.org/grpc/metadata"
"io/ioutil"
"net"
"os"
Expand All @@ -18,10 +17,12 @@ import (
"strings"
"time"

"google.golang.org/grpc/metadata"

"github.com/dcrlabs/bchwallet/rpc/legacyrpc"
"github.com/dcrlabs/bchwallet/rpc/rpcserver"
"github.com/dcrlabs/bchwallet/wallet"
"github.com/gcash/bchutil"
"github.com/gcash/bchwallet/rpc/legacyrpc"
"github.com/gcash/bchwallet/rpc/rpcserver"
"github.com/gcash/bchwallet/wallet"
"google.golang.org/grpc"
"google.golang.org/grpc/credentials"
"google.golang.org/grpc/peer"
Expand Down
12 changes: 6 additions & 6 deletions boot/walletsetup.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,19 +11,19 @@ import (
"path/filepath"
"time"

"github.com/dcrlabs/bchwallet/internal/legacy/keystore"
"github.com/dcrlabs/bchwallet/internal/prompt"
"github.com/dcrlabs/bchwallet/waddrmgr"
"github.com/dcrlabs/bchwallet/wallet"
"github.com/dcrlabs/bchwallet/walletdb"
"github.com/gcash/bchd/chaincfg"
"github.com/gcash/bchd/wire"
"github.com/gcash/bchutil"
"github.com/gcash/bchwallet/internal/legacy/keystore"
"github.com/gcash/bchwallet/internal/prompt"
"github.com/gcash/bchwallet/waddrmgr"
"github.com/gcash/bchwallet/wallet"
"github.com/gcash/bchwallet/walletdb"

// Normally a blank import is only used in the main package but since
// we need to use the boot package from both main and mobile we will
// use it here.
_ "github.com/gcash/bchwallet/walletdb/bdb"
_ "github.com/dcrlabs/bchwallet/walletdb/bdb"
)

// networkDir returns the directory name of a network directory to hold wallet
Expand Down
5 changes: 3 additions & 2 deletions chain/bitcoind_client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@ import (
"sync/atomic"
"time"

"github.com/dcrlabs/bchwallet/waddrmgr"
"github.com/dcrlabs/bchwallet/wtxmgr"
"github.com/gcash/bchd/btcjson"
"github.com/gcash/bchd/chaincfg"
"github.com/gcash/bchd/chaincfg/chainhash"
"github.com/gcash/bchd/txscript"
"github.com/gcash/bchd/wire"
"github.com/gcash/bchutil"
"github.com/gcash/bchwallet/waddrmgr"
"github.com/gcash/bchwallet/wtxmgr"
)

var (
Expand Down Expand Up @@ -315,6 +315,7 @@ func (c *BitcoindClient) shouldNotifyBlocks() bool {
// is used to reset the current filters.
//
// The current filters supported are of the following types:
//
// []bchutil.Address
// []wire.OutPoint
// []*wire.OutPoint
Expand Down
2 changes: 1 addition & 1 deletion chain/block_filterer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package chain

import (
"github.com/dcrlabs/bchwallet/waddrmgr"
"github.com/gcash/bchd/chaincfg"
"github.com/gcash/bchd/chaincfg/chainhash"
"github.com/gcash/bchd/txscript"
"github.com/gcash/bchd/wire"
"github.com/gcash/bchutil"
"github.com/gcash/bchwallet/waddrmgr"
)

// BlockFilterer is used to iteratively scan blocks for a set of addresses of
Expand Down
4 changes: 2 additions & 2 deletions chain/block_filterer_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ import (
"testing"
"time"

"github.com/dcrlabs/bchwallet/chain"
"github.com/dcrlabs/bchwallet/waddrmgr"
"github.com/gcash/bchd/chaincfg"
"github.com/gcash/bchd/chaincfg/chainhash"
"github.com/gcash/bchd/wire"
"github.com/gcash/bchutil"
"github.com/gcash/bchwallet/chain"
"github.com/gcash/bchwallet/waddrmgr"
)

var Block100000 = wire.MsgBlock{
Expand Down
4 changes: 2 additions & 2 deletions chain/interface.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ import (
"errors"
"time"

"github.com/dcrlabs/bchwallet/waddrmgr"
"github.com/dcrlabs/bchwallet/wtxmgr"
"github.com/gcash/bchd/chaincfg/chainhash"
"github.com/gcash/bchd/wire"
"github.com/gcash/bchutil"
"github.com/gcash/bchwallet/waddrmgr"
"github.com/gcash/bchwallet/wtxmgr"
)

// isCurrentDelta is the delta duration we'll use from the present time to
Expand Down
6 changes: 3 additions & 3 deletions chain/neutrino.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ import (

"github.com/gcash/bchd/btcjson"

"github.com/dcrlabs/bchwallet/waddrmgr"
"github.com/dcrlabs/bchwallet/wtxmgr"
neutrino "github.com/dcrlabs/neutrino-bch"
"github.com/gcash/bchd/chaincfg"
"github.com/gcash/bchd/chaincfg/chainhash"
"github.com/gcash/bchd/rpcclient"
Expand All @@ -17,9 +20,6 @@ import (
"github.com/gcash/bchutil"
"github.com/gcash/bchutil/gcs"
"github.com/gcash/bchutil/gcs/builder"
"github.com/gcash/bchwallet/waddrmgr"
"github.com/gcash/bchwallet/wtxmgr"
"github.com/gcash/neutrino"
)

// NeutrinoClient is an implementation of the bchwalet chain.Interface interface.
Expand Down
4 changes: 2 additions & 2 deletions chain/rpc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ import (
"sync"
"time"

"github.com/dcrlabs/bchwallet/waddrmgr"
"github.com/dcrlabs/bchwallet/wtxmgr"
"github.com/gcash/bchd/btcjson"
"github.com/gcash/bchd/chaincfg"
"github.com/gcash/bchd/chaincfg/chainhash"
Expand All @@ -17,8 +19,6 @@ import (
"github.com/gcash/bchutil"
"github.com/gcash/bchutil/gcs"
"github.com/gcash/bchutil/gcs/builder"
"github.com/gcash/bchwallet/waddrmgr"
"github.com/gcash/bchwallet/wtxmgr"
)

// RPCClient represents a persistent client connection to a bitcoin RPC server
Expand Down
8 changes: 4 additions & 4 deletions cmd/dropwtxmgr/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ import (
"os"
"path/filepath"

"github.com/dcrlabs/bchwallet/waddrmgr"
"github.com/dcrlabs/bchwallet/walletdb"
_ "github.com/dcrlabs/bchwallet/walletdb/bdb"
"github.com/dcrlabs/bchwallet/wtxmgr"
"github.com/gcash/bchutil"
"github.com/gcash/bchwallet/waddrmgr"
"github.com/gcash/bchwallet/walletdb"
_ "github.com/gcash/bchwallet/walletdb/bdb"
"github.com/gcash/bchwallet/wtxmgr"
"github.com/jessevdk/go-flags"
)

Expand Down
8 changes: 4 additions & 4 deletions cmd/sweepaccount/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,16 @@ import (

"golang.org/x/crypto/ssh/terminal"

"github.com/dcrlabs/bchwallet/internal/cfgutil"
"github.com/dcrlabs/bchwallet/netparams"
"github.com/dcrlabs/bchwallet/wallet/txauthor"
"github.com/dcrlabs/bchwallet/wallet/txrules"
"github.com/gcash/bchd/btcjson"
"github.com/gcash/bchd/chaincfg/chainhash"
"github.com/gcash/bchd/rpcclient"
"github.com/gcash/bchd/txscript"
"github.com/gcash/bchd/wire"
"github.com/gcash/bchutil"
"github.com/gcash/bchwallet/internal/cfgutil"
"github.com/gcash/bchwallet/netparams"
"github.com/gcash/bchwallet/wallet/txauthor"
"github.com/gcash/bchwallet/wallet/txrules"
"github.com/jessevdk/go-flags"
)

Expand Down
23 changes: 3 additions & 20 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,41 +1,24 @@
module github.com/gcash/bchwallet
module github.com/dcrlabs/bchwallet

go 1.16

require (
github.com/btcsuite/golangcrypto v0.0.0-20150304025918-53f62d9b43e8
github.com/btcsuite/websocket v0.0.0-20150119174127-31079b680792
github.com/cenkalti/backoff/v4 v4.1.3 // indirect
github.com/davecgh/go-spew v1.1.1
github.com/dchest/siphash v1.2.3 // indirect
github.com/dcrlabs/neutrino-bch v0.0.0-20240114121828-d656bce11095
github.com/gcash/bchd v0.19.0
github.com/gcash/bchlog v0.0.0-20180913005452-b4f036f92fa6
github.com/gcash/bchutil v0.0.0-20210113190856-6ea28dff4000
github.com/gcash/bchwallet/walletdb v0.0.0-20210524114850-4837f9798568
github.com/gcash/neutrino v0.0.0-20210524114821-3b1878290cf9
github.com/golang/protobuf v1.5.2
github.com/grpc-ecosystem/grpc-gateway/v2 v2.10.0 // indirect
github.com/improbable-eng/grpc-web v0.15.0 // indirect
github.com/jarcoal/httpmock v1.0.8
github.com/jessevdk/go-flags v1.5.0
github.com/jrick/logrotate v1.0.0
github.com/klauspost/compress v1.15.2 // indirect
github.com/lightninglabs/gozmq v0.0.0-20191113021534-d20a764486bf
github.com/miekg/dns v1.1.48
github.com/prometheus/common v0.34.0 // indirect
github.com/rs/cors v1.8.2 // indirect
github.com/simpleledgerinc/goslp v0.0.0-20210423125905-3c2e5f2ef33f // indirect
github.com/tyler-smith/go-bip39 v1.1.0
go.etcd.io/bbolt v1.3.6 // indirect
go.etcd.io/bbolt v1.3.6
golang.org/x/crypto v0.0.0-20220427172511-eb4f295cb31f
golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4
golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6 // indirect
golang.org/x/term v0.0.0-20220411215600-e5f449aeb171 // indirect
golang.org/x/tools v0.1.10 // indirect
golang.org/x/xerrors v0.0.0-20220411194840-2f41105eb62f // indirect
google.golang.org/genproto v0.0.0-20220505152158-f39f71e6c8f3 // indirect
google.golang.org/grpc v1.46.0
nhooyr.io/websocket v1.8.7 // indirect
)

replace github.com/gcash/bchwallet/walletdb => ./walletdb
Loading