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: assorted fixes #2929

Merged
merged 2 commits into from
Aug 23, 2024
Merged

multi: assorted fixes #2929

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
93287ef
assorted fixes
buck54321 Aug 23, 2024
0ed2456
upgrade ltcwallet to tame no-filter peer ban logs
buck54321 Aug 23, 2024
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 client/cmd/bisonw-desktop/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ require (
github.com/consensys/gnark-crypto v0.12.1 // indirect
github.com/crate-crypto/go-ipa v0.0.0-20240223125850-b1e8a79f509c // indirect
github.com/crate-crypto/go-kzg-4844 v1.0.0 // indirect
github.com/dcrlabs/ltcwallet v0.0.0-20240817190502-ee5cf83672a6 // indirect
github.com/dcrlabs/ltcwallet v0.0.0-20240823165752-3e026e8da010 // indirect
github.com/decred/dcrd/mixing v0.3.0 // indirect
github.com/decred/vspd/client/v3 v3.0.0 // indirect
github.com/ethereum/c-kzg-4844 v1.0.0 // indirect
Expand Down
4 changes: 2 additions & 2 deletions client/cmd/bisonw-desktop/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,8 +257,8 @@ github.com/dchest/siphash v1.2.3/go.mod h1:0NvQU092bT0ipiFN++/rXm69QG9tVxLAlQHIX
github.com/dcrlabs/bchwallet v0.0.0-20240114115928-2a995d024eed/go.mod h1:dX7SZgs+dmGL56e6KHn+MktfriF/aM2qI4yYK56ySEQ=
github.com/dcrlabs/bchwallet v0.0.0-20240114124852-0e95005810be h1:F61HTz77YatFuMgleG4Hp4QpXWJgjSG+S72YlXD4jPA=
github.com/dcrlabs/bchwallet v0.0.0-20240114124852-0e95005810be/go.mod h1:Km7vMslEkg88jIFE2TA/XX7kAvXvnsoGTXN9ktYSi98=
github.com/dcrlabs/ltcwallet v0.0.0-20240817190502-ee5cf83672a6 h1:8xo4LEr6/zI+0NuAQk67GBoDiAiaTN6dvr94DmvFXiI=
github.com/dcrlabs/ltcwallet v0.0.0-20240817190502-ee5cf83672a6/go.mod h1:UwMkslDKQGQx7UCGjolqPKulzX3YQxMhDvVZ0KukIQk=
github.com/dcrlabs/ltcwallet v0.0.0-20240823165752-3e026e8da010 h1:PtsVisotEbfWvFEvp2QbwT6rYrNP7b7v2ZXDkwYrCMY=
github.com/dcrlabs/ltcwallet v0.0.0-20240823165752-3e026e8da010/go.mod h1:UwMkslDKQGQx7UCGjolqPKulzX3YQxMhDvVZ0KukIQk=
github.com/dcrlabs/neutrino-bch v0.0.0-20240114121828-d656bce11095 h1:oGXgq+wZ2FvBzBTqXnOJ+ZP6f79zhfJNd46nDkJaUdU=
github.com/dcrlabs/neutrino-bch v0.0.0-20240114121828-d656bce11095/go.mod h1:aymH7e5PUsdsLagAIIMbpyJIff0Kv8/BJg7nolIVJbU=
github.com/deckarep/golang-set/v2 v2.6.0 h1:XfcQbWM1LlMB8BsJ8N9vW5ehnnPVIw0je80NsVHagjM=
Expand Down
2 changes: 2 additions & 0 deletions client/core/core.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9353,6 +9353,8 @@ func (c *Core) peerChange(w *xcWallet, numPeers uint32, err error) {
c.notify(newWalletConfigNote(TopicWalletPeersRestored, subject, details,
db.Success, w.state()))
c.startWalletSyncMonitor(w)
} else if !ss.Synced {
c.startWalletSyncMonitor(w)
}

// Send a WalletStateNote in case Synced or anything else has changed.
Expand Down
5 changes: 5 additions & 0 deletions client/webserver/site/src/css/main.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,11 @@ img.dex-logo {

img.logo-square {
content: url("/img/bison-square_50.png");

&.small {
height: 25px;
width: 25px;
}
}

img.logo-full {
Expand Down
27 changes: 12 additions & 15 deletions client/webserver/webserver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,6 @@ type cachedPassword struct {
type Config struct {
Core clientCore // *core.Core
MarketMaker MMCore // *mm.MarketMaker
MMCfgPath string
Addr string
CustomSiteDir string
Language string
Expand All @@ -251,19 +250,18 @@ type valStamp struct {
// WebServer is a single-client http and websocket server enabling a browser
// interface to Bison Wallet.
type WebServer struct {
ctx context.Context
wsServer *websocket.Server
mux *chi.Mux
siteDir string
lang atomic.Value // string
langs []string
core clientCore
mm MMCore
mmCfgPath string
addr string
csp string
srv *http.Server
html atomic.Value // *templates
ctx context.Context
wsServer *websocket.Server
mux *chi.Mux
siteDir string
lang atomic.Value // string
langs []string
core clientCore
mm MMCore
addr string
csp string
srv *http.Server
html atomic.Value // *templates

authMtx sync.RWMutex
authTokens map[string]bool
Expand Down Expand Up @@ -385,7 +383,6 @@ func New(cfg *Config) (*WebServer, error) {
langs: langs,
core: cfg.Core,
mm: cfg.MarketMaker,
mmCfgPath: cfg.MMCfgPath,
siteDir: siteDir,
mux: mux,
srv: httpServer,
Expand Down
2 changes: 1 addition & 1 deletion dex/testing/loadbot/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ require (
)

require (
github.com/dcrlabs/ltcwallet v0.0.0-20240817190502-ee5cf83672a6 // indirect
github.com/dcrlabs/ltcwallet v0.0.0-20240823165752-3e026e8da010 // indirect
github.com/ltcsuite/lnd/tlv v0.0.0-20240222214433-454d35886119 // indirect
github.com/ltcsuite/ltcd/chaincfg/chainhash v1.0.2 // indirect
)
Expand Down
4 changes: 2 additions & 2 deletions dex/testing/loadbot/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,8 +253,8 @@ github.com/dchest/siphash v1.2.3/go.mod h1:0NvQU092bT0ipiFN++/rXm69QG9tVxLAlQHIX
github.com/dcrlabs/bchwallet v0.0.0-20240114115928-2a995d024eed/go.mod h1:dX7SZgs+dmGL56e6KHn+MktfriF/aM2qI4yYK56ySEQ=
github.com/dcrlabs/bchwallet v0.0.0-20240114124852-0e95005810be h1:F61HTz77YatFuMgleG4Hp4QpXWJgjSG+S72YlXD4jPA=
github.com/dcrlabs/bchwallet v0.0.0-20240114124852-0e95005810be/go.mod h1:Km7vMslEkg88jIFE2TA/XX7kAvXvnsoGTXN9ktYSi98=
github.com/dcrlabs/ltcwallet v0.0.0-20240817190502-ee5cf83672a6 h1:8xo4LEr6/zI+0NuAQk67GBoDiAiaTN6dvr94DmvFXiI=
github.com/dcrlabs/ltcwallet v0.0.0-20240817190502-ee5cf83672a6/go.mod h1:UwMkslDKQGQx7UCGjolqPKulzX3YQxMhDvVZ0KukIQk=
github.com/dcrlabs/ltcwallet v0.0.0-20240823165752-3e026e8da010 h1:PtsVisotEbfWvFEvp2QbwT6rYrNP7b7v2ZXDkwYrCMY=
github.com/dcrlabs/ltcwallet v0.0.0-20240823165752-3e026e8da010/go.mod h1:UwMkslDKQGQx7UCGjolqPKulzX3YQxMhDvVZ0KukIQk=
github.com/dcrlabs/neutrino-bch v0.0.0-20240114121828-d656bce11095 h1:oGXgq+wZ2FvBzBTqXnOJ+ZP6f79zhfJNd46nDkJaUdU=
github.com/dcrlabs/neutrino-bch v0.0.0-20240114121828-d656bce11095/go.mod h1:aymH7e5PUsdsLagAIIMbpyJIff0Kv8/BJg7nolIVJbU=
github.com/deckarep/golang-set/v2 v2.6.0 h1:XfcQbWM1LlMB8BsJ8N9vW5ehnnPVIw0je80NsVHagjM=
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ require (
github.com/davecgh/go-spew v1.1.1
github.com/dchest/blake2b v1.0.0
github.com/dcrlabs/bchwallet v0.0.0-20240114124852-0e95005810be
github.com/dcrlabs/ltcwallet v0.0.0-20240817190502-ee5cf83672a6
github.com/dcrlabs/ltcwallet v0.0.0-20240823165752-3e026e8da010
github.com/dcrlabs/neutrino-bch v0.0.0-20240114121828-d656bce11095
github.com/decred/base58 v1.0.5
github.com/decred/dcrd/addrmgr/v2 v2.0.4
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,8 +253,8 @@ github.com/dchest/siphash v1.2.3/go.mod h1:0NvQU092bT0ipiFN++/rXm69QG9tVxLAlQHIX
github.com/dcrlabs/bchwallet v0.0.0-20240114115928-2a995d024eed/go.mod h1:dX7SZgs+dmGL56e6KHn+MktfriF/aM2qI4yYK56ySEQ=
github.com/dcrlabs/bchwallet v0.0.0-20240114124852-0e95005810be h1:F61HTz77YatFuMgleG4Hp4QpXWJgjSG+S72YlXD4jPA=
github.com/dcrlabs/bchwallet v0.0.0-20240114124852-0e95005810be/go.mod h1:Km7vMslEkg88jIFE2TA/XX7kAvXvnsoGTXN9ktYSi98=
github.com/dcrlabs/ltcwallet v0.0.0-20240817190502-ee5cf83672a6 h1:8xo4LEr6/zI+0NuAQk67GBoDiAiaTN6dvr94DmvFXiI=
github.com/dcrlabs/ltcwallet v0.0.0-20240817190502-ee5cf83672a6/go.mod h1:UwMkslDKQGQx7UCGjolqPKulzX3YQxMhDvVZ0KukIQk=
github.com/dcrlabs/ltcwallet v0.0.0-20240823165752-3e026e8da010 h1:PtsVisotEbfWvFEvp2QbwT6rYrNP7b7v2ZXDkwYrCMY=
github.com/dcrlabs/ltcwallet v0.0.0-20240823165752-3e026e8da010/go.mod h1:UwMkslDKQGQx7UCGjolqPKulzX3YQxMhDvVZ0KukIQk=
github.com/dcrlabs/neutrino-bch v0.0.0-20240114121828-d656bce11095 h1:oGXgq+wZ2FvBzBTqXnOJ+ZP6f79zhfJNd46nDkJaUdU=
github.com/dcrlabs/neutrino-bch v0.0.0-20240114121828-d656bce11095/go.mod h1:aymH7e5PUsdsLagAIIMbpyJIff0Kv8/BJg7nolIVJbU=
github.com/deckarep/golang-set/v2 v2.6.0 h1:XfcQbWM1LlMB8BsJ8N9vW5ehnnPVIw0je80NsVHagjM=
Expand Down
Loading