diff --git a/app/dcrdex.png b/app/dcrdex.png new file mode 100644 index 0000000000..b7547bcb2e Binary files /dev/null and b/app/dcrdex.png differ diff --git a/app/main.development.js b/app/main.development.js index 59a70dc3c8..bb8853d098 100644 --- a/app/main.development.js +++ b/app/main.development.js @@ -447,7 +447,8 @@ function createDexWindow(serverAddress) { contextIsolation: true }, width: 1280, - height: 940 + height: 940, + icon: __dirname + "/dcrdex.png" }); }); } @@ -881,7 +882,8 @@ app.on("ready", async () => { contextIsolation: true }, width: 1280, - height: 940 + height: 940, + icon: __dirname + "/dcrdex.png" }); }); diff --git a/go.mod b/go.mod index 3dbcb3c6f5..47d255aff6 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/decred/decrediton go 1.18 require ( - decred.org/dcrdex v0.5.4 + decred.org/dcrdex v0.5.6 github.com/decred/slog v1.2.0 github.com/jrick/logrotate v1.0.0 ) @@ -15,7 +15,7 @@ require ( github.com/VictoriaMetrics/fastcache v1.6.0 // indirect github.com/aead/siphash v1.0.1 // indirect github.com/agl/ed25519 v0.0.0-20170116200512-5312a6153412 // indirect - github.com/btcsuite/btcd v0.23.2 // indirect + github.com/btcsuite/btcd v0.23.3 // indirect github.com/btcsuite/btcd/btcec/v2 v2.2.1 // indirect github.com/btcsuite/btcd/btcutil v1.1.2 // indirect github.com/btcsuite/btcd/btcutil/psbt v1.1.5 // indirect @@ -62,7 +62,7 @@ require ( github.com/decred/dcrd/wire v1.5.0 // indirect github.com/decred/go-socks v1.1.0 // indirect github.com/edsrzf/mmap-go v1.0.0 // indirect - github.com/ethereum/go-ethereum v1.10.20 // indirect + github.com/ethereum/go-ethereum v1.10.25 // indirect github.com/fjl/memsize v0.0.0-20190710130421-bcb5799ab5e5 // indirect github.com/gballet/go-libpcsclite v0.0.0-20190607065134-2772fd86a8ff // indirect github.com/gcash/bchd v0.19.0 // indirect diff --git a/go.sum b/go.sum index 888bb9fa51..fbbbb75d64 100644 --- a/go.sum +++ b/go.sum @@ -40,8 +40,8 @@ cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9 contrib.go.opencensus.io/exporter/stackdriver v0.13.4/go.mod h1:aXENhDJ1Y4lIg4EUaVTwzvYETVNZk10Pu26tevFKLUc= decred.org/cspp/v2 v2.0.0 h1:b4fZrElRufz30rYnBZ2shhC8AjNVTN4i6TMzDi+hk44= decred.org/cspp/v2 v2.0.0/go.mod h1:0shJWKTWY3LxZEWGxtbER1Y45+HVjC0WZtj4bctSzCI= -decred.org/dcrdex v0.5.4 h1:PzyJqUD/7j5XdNPMYCCtkh1rpb9B+w4qYmlnE6ZtPvE= -decred.org/dcrdex v0.5.4/go.mod h1:P3CgA8YMjbeqN/HDEZ58/jUTNqRDyFtIzYPZdoXExb4= +decred.org/dcrdex v0.5.6 h1:3tnf2vG+CJ5j4L/3t1Yo3oqh75/CiJCv60w7QRw9erA= +decred.org/dcrdex v0.5.6/go.mod h1:PJz/P3v/3f1rO0gceRjVBXvEs+NWqrNC91OOuLqY6is= decred.org/dcrwallet/v2 v2.0.8 h1:ps0hU8SO2qnCjl4FxQxri8mO8MBWH4NRNW42hSN3E6o= decred.org/dcrwallet/v2 v2.0.8/go.mod h1:DEt4isEGSqMiMvo4scTX58oepPIwhTnaMCyTVPxCbzY= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= @@ -115,8 +115,8 @@ github.com/btcsuite/btcd v0.22.0-beta.0.20220207191057-4dc4ff7963b4/go.mod h1:7a github.com/btcsuite/btcd v0.22.0-beta.0.20220316175102-8d5c75c28923/go.mod h1:taIcYprAW2g6Z9S0gGUxyR+zDwimyDMK5ePOX+iJ2ds= github.com/btcsuite/btcd v0.23.0/go.mod h1:0QJIIN1wwIXF/3G/m87gIwGniDMDQqjVn4SZgnFpsYY= github.com/btcsuite/btcd v0.23.1/go.mod h1:0QJIIN1wwIXF/3G/m87gIwGniDMDQqjVn4SZgnFpsYY= -github.com/btcsuite/btcd v0.23.2 h1:/YOgUp25sdCnP5ho6Hl3s0E438zlX+Kak7E6TgBgoT0= -github.com/btcsuite/btcd v0.23.2/go.mod h1:0QJIIN1wwIXF/3G/m87gIwGniDMDQqjVn4SZgnFpsYY= +github.com/btcsuite/btcd v0.23.3 h1:4KH/JKy9WiCd+iUS9Mu0Zp7Dnj17TGdKrg9xc/FGj24= +github.com/btcsuite/btcd v0.23.3/go.mod h1:0QJIIN1wwIXF/3G/m87gIwGniDMDQqjVn4SZgnFpsYY= github.com/btcsuite/btcd/btcec/v2 v2.1.0/go.mod h1:2VzYrv4Gm4apmbVVsSq5bqf1Ec8v56E48Vt0Y/umPgA= github.com/btcsuite/btcd/btcec/v2 v2.1.1/go.mod h1:ctjw4H1kknNJmRN4iP1R7bTQ+v3GJkZBd6mui8ZsAZE= github.com/btcsuite/btcd/btcec/v2 v2.1.3/go.mod h1:ctjw4H1kknNJmRN4iP1R7bTQ+v3GJkZBd6mui8ZsAZE= @@ -300,8 +300,8 @@ github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.m github.com/envoyproxy/protoc-gen-validate v0.0.14/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/esimonov/ifshort v1.0.2/go.mod h1:yZqNJUrNn20K8Q9n2CrjTKYyVEmX209Hgu+M1LBpeZE= -github.com/ethereum/go-ethereum v1.10.20 h1:75IW830ClSS40yrQC1ZCMZCt5I+zU16oqId2SiQwdQ4= -github.com/ethereum/go-ethereum v1.10.20/go.mod h1:LWUN82TCHGpxB3En5HVmLLzPD7YSrEUFmFfN1nKkVN0= +github.com/ethereum/go-ethereum v1.10.25 h1:5dFrKJDnYf8L6/5o42abCE6a9yJm9cs4EJVRyYMr55s= +github.com/ethereum/go-ethereum v1.10.25/go.mod h1:EYFyF19u3ezGLD4RqOkLq+ZCXzYbLoNDdZlMt7kyKFg= github.com/ettle/strcase v0.1.1/go.mod h1:hzDLsPC7/lwKyBOywSHEP89nt2pDgdy+No1NBA9o9VY= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU= diff --git a/modules/dex/libdexc/adapter.go b/modules/dex/libdexc/adapter.go index 61d1ecf4f8..1e224f189e 100644 --- a/modules/dex/libdexc/adapter.go +++ b/modules/dex/libdexc/adapter.go @@ -184,7 +184,7 @@ func (c *CoreAdapter) shutdown(json.RawMessage) (string, error) { c.kill() c.wg.Wait() c.webServer.Wait() - closeFileLogger() + // closeFileLogger() // commented until we resolve (*Core).tipChange potentially logging after core shutdown atomic.SwapUint32(&c.inited, 0) return "", nil }