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.

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

dep and toolchain updates #1931

Merged
merged 3 commits into from
Aug 16, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
go: [1.17, 1.18]
go: [1.18, 1.19]
steps:
- uses: actions/checkout@v3

Expand All @@ -24,7 +24,7 @@ jobs:
working-directory: ./cmd/dcrdata

- name: Install Linters
run: "curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.46.2"
run: "curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.48.0"

- name: Go Tests
env:
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -129,8 +129,8 @@ Always run the Current release or on the Current stable branch. Do not use `mast

## Requirements

- [Go](https://golang.org) 1.17 or 1.18
- [Node.js](https://nodejs.org/en/download/) 16.x or 17.x. Node.js is only used
- [Go](https://golang.org) 1.18 or 1.19
- [Node.js](https://nodejs.org/en/download/) 16.x or 18.x. Node.js is only used
as a build tool, and is **not used at runtime**.
- Running `dcrd` running with `--txindex --addrindex`, and synchronized to the
current best block on the network. On startup, dcrdata will verify that the
Expand Down
7 changes: 4 additions & 3 deletions api/types/apicache.go
Original file line number Diff line number Diff line change
Expand Up @@ -636,10 +636,11 @@ func (pq *BlockPriorityQueue) Reheap() {

// Insert will add an element, while respecting the queue's capacity
// if at capacity
// - compare with top and replace or return
// - if replaced top, heapdown (Fix(pq,0))
// - compare with top and replace or return
// - if replaced top, heapdown (Fix(pq,0))
//
// else (not at capacity)
// - heap.Push, which is pq.Push (append at bottom) then heapup
// - heap.Push, which is pq.Push (append at bottom) then heapup
func (pq *BlockPriorityQueue) Insert(summary *BlockDataBasic, stakeInfo *StakeInfoExtended) (bool, *chainhash.Hash, int64) {
pq.mtx.Lock()
defer pq.mtx.Unlock()
Expand Down
55 changes: 30 additions & 25 deletions cmd/dcrdata/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/decred/dcrdata/cmd/dcrdata

go 1.17
go 1.18

replace (
github.com/decred/dcrdata/db/dcrpg/v8 => ../../db/dcrpg/
Expand All @@ -10,7 +10,7 @@ replace (
)

require (
github.com/caarlos0/env/v6 v6.6.2
github.com/caarlos0/env/v6 v6.9.3
github.com/decred/dcrd/blockchain/stake/v4 v4.0.0
github.com/decred/dcrd/chaincfg/chainhash v1.0.3
github.com/decred/dcrd/chaincfg/v3 v3.1.1
Expand All @@ -25,24 +25,24 @@ require (
github.com/decred/dcrdata/v8 v8.0.0
github.com/decred/politeia v1.3.0
github.com/decred/slog v1.2.0
github.com/didip/tollbooth/v6 v6.1.0
github.com/didip/tollbooth/v6 v6.1.3-0.20220606152938-a7634c70944a
github.com/dustin/go-humanize v1.0.1-0.20210705192016-249ff6c91207
github.com/go-chi/chi/v5 v5.0.4
github.com/go-chi/docgen v1.2.0
github.com/google/gops v0.3.22
github.com/google/gops v0.3.25
github.com/googollee/go-socket.io v1.4.4
github.com/jessevdk/go-flags v1.4.1-0.20200711081900-c17162fe8fd7
github.com/jrick/logrotate v1.0.0
github.com/rs/cors v1.8.0
golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4
github.com/rs/cors v1.8.2
golang.org/x/net v0.0.0-20220607020251-c690dde0001d
golang.org/x/text v0.3.7
)

require (
decred.org/cspp/v2 v2.0.0 // indirect
decred.org/dcrdex v0.0.0-20220620230547-1283356d184b // indirect
decred.org/dcrdex v0.5.0-rc1.0.20220812205206-99377fa0a218 // indirect
decred.org/dcrwallet v1.7.0 // indirect
decred.org/dcrwallet/v2 v2.0.1 // indirect
decred.org/dcrwallet/v2 v2.0.8 // indirect
github.com/AndreasBriese/bbloom v0.0.0-20190825152654-46b345b51c96 // indirect
github.com/StackExchange/wmi v1.2.1 // indirect
github.com/VictoriaMetrics/fastcache v1.6.0 // indirect
Expand All @@ -66,17 +66,20 @@ require (
github.com/carterjones/go-cloudflare-scraper v0.1.2 // indirect
github.com/carterjones/signalr v0.3.5 // indirect
github.com/cespare/xxhash v1.1.0 // indirect
github.com/cespare/xxhash/v2 v2.1.1 // indirect
github.com/cespare/xxhash/v2 v2.1.2 // indirect
github.com/companyzero/sntrup4591761 v0.0.0-20200131011700-2b0d299dbd22 // indirect
github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/dchest/blake2b v1.0.0 // indirect
github.com/dchest/siphash v1.2.2 // indirect
github.com/deckarep/golang-set v1.8.0 // indirect
github.com/decred/base58 v1.0.4 // indirect
github.com/decred/dcrd/addrmgr/v2 v2.0.0 // indirect
github.com/decred/dcrd/blockchain/stake/v3 v3.0.0 // indirect
github.com/decred/dcrd/blockchain/standalone/v2 v2.1.0 // indirect
github.com/decred/dcrd/blockchain/v4 v4.0.0 // indirect
github.com/decred/dcrd/blockchain/v4 v4.0.2 // indirect
github.com/decred/dcrd/certgen v1.1.1 // indirect
github.com/decred/dcrd/connmgr/v3 v3.1.0 // indirect
github.com/decred/dcrd/crypto/blake256 v1.0.1-0.20200921185235-6d75c7ec1199 // indirect
github.com/decred/dcrd/crypto/ripemd160 v1.0.1 // indirect
github.com/decred/dcrd/database/v2 v2.0.2 // indirect
Expand All @@ -97,71 +100,73 @@ require (
github.com/dgraph-io/badger v1.6.2 // indirect
github.com/dgraph-io/ristretto v0.0.2 // indirect
github.com/edsrzf/mmap-go v1.0.0 // indirect
github.com/ethereum/go-ethereum v1.10.17 // indirect
github.com/ethereum/go-ethereum v1.10.20 // 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
github.com/gcash/bchlog v0.0.0-20180913005452-b4f036f92fa6 // indirect
github.com/gcash/bchutil v0.0.0-20210113190856-6ea28dff4000 // indirect
github.com/go-ole/go-ole v1.2.6-0.20210915003542-8b1f7f90f6b1 // indirect
github.com/go-pkgz/expirable-cache v0.0.3 // indirect
github.com/go-ole/go-ole v1.2.6 // indirect
github.com/go-pkgz/expirable-cache v0.1.0 // indirect
github.com/go-stack/stack v1.8.0 // indirect
github.com/golang-jwt/jwt/v4 v4.3.0 // indirect
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/golang/snappy v0.0.4 // indirect
github.com/google/trillian v1.3.13 // indirect
github.com/google/uuid v1.2.0 // indirect
github.com/google/uuid v1.3.0 // indirect
github.com/gorilla/schema v1.1.0 // indirect
github.com/gorilla/websocket v1.5.0 // indirect
github.com/h2non/go-is-svg v0.0.0-20160927212452-35e8c4b0612c // indirect
github.com/hashicorp/go-bexpr v0.1.10 // indirect
github.com/hashicorp/golang-lru v0.5.5-0.20210104140557-80c98217689d // indirect
github.com/holiman/bloomfilter/v2 v2.0.3 // indirect
github.com/holiman/uint256 v1.2.0 // indirect
github.com/huin/goupnp v1.0.3-0.20220313090229-ca81a64b4204 // indirect
github.com/huin/goupnp v1.0.3 // indirect
github.com/jackpal/go-nat-pmp v1.0.2 // indirect
github.com/jrick/bitset v1.0.0 // indirect
github.com/jrick/wsrpc/v2 v2.3.4 // indirect
github.com/kkdai/bstream v1.0.0 // indirect
github.com/klauspost/cpuid/v2 v2.0.9 // indirect
github.com/lib/pq v1.10.3 // indirect
github.com/lib/pq v1.10.4 // indirect
github.com/lightninglabs/gozmq v0.0.0-20191113021534-d20a764486bf // indirect
github.com/lightninglabs/neutrino v0.14.1 // indirect
github.com/lightningnetwork/lnd/clock v1.0.1 // indirect
github.com/lightningnetwork/lnd/queue v1.0.1 // indirect
github.com/lightningnetwork/lnd/ticker v1.0.0 // indirect
github.com/lightningnetwork/lnd/tlv v1.0.2 // indirect
github.com/marcopeereboom/sbox v1.1.0 // indirect
github.com/mattn/go-colorable v0.1.8 // indirect
github.com/mattn/go-isatty v0.0.12 // indirect
github.com/mattn/go-colorable v0.1.12 // indirect
github.com/mattn/go-isatty v0.0.14 // indirect
github.com/mattn/go-runewidth v0.0.12 // indirect
github.com/mitchellh/mapstructure v1.4.1 // indirect
github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/mitchellh/pointerstructure v1.2.0 // indirect
github.com/olekukonko/tablewriter v0.0.5 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/prometheus/tsdb v0.7.1 // indirect
github.com/rivo/uniseg v0.2.0 // indirect
github.com/rjeczalik/notify v0.9.1 // indirect
github.com/robertkrimen/otto v0.0.0-20180617131154-15f95af6e78d // indirect
github.com/russross/blackfriday/v2 v2.1.0 // indirect
github.com/shirou/gopsutil v3.21.4-0.20210419000835-c7a38de76ee5+incompatible // indirect
github.com/status-im/keycard-go v0.0.0-20190316090335-8537d3370df4 // indirect
github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 // indirect
github.com/tklauser/go-sysconf v0.3.9 // indirect
github.com/tklauser/numcpus v0.3.0 // indirect
github.com/syndtr/goleveldb v1.0.1-0.20220614013038-64ee5596c38a // indirect
github.com/tklauser/go-sysconf v0.3.10 // indirect
github.com/tklauser/numcpus v0.4.0 // indirect
github.com/tyler-smith/go-bip39 v1.0.1-0.20181017060643-dbb3b84ba2ef // indirect
github.com/urfave/cli/v2 v2.10.2 // indirect
github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect
go.etcd.io/bbolt v1.3.7-0.20220130032806-d5db64bdbfde // indirect
golang.org/x/crypto v0.0.0-20220507011949-2cf3adece122 // indirect
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e // indirect
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a // indirect
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
golang.org/x/time v0.0.0-20220411224347-583f2d630306 // indirect
google.golang.org/genproto v0.0.0-20210521181308-5ccab8a35a9a // indirect
google.golang.org/grpc v1.38.0 // indirect
google.golang.org/protobuf v1.26.0 // indirect
gopkg.in/ini.v1 v1.62.0 // indirect
gopkg.in/ini.v1 v1.66.4 // indirect
gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce // indirect
gopkg.in/sourcemap.v1 v1.0.5 // indirect
gopkg.in/urfave/cli.v1 v1.20.0 // indirect
lukechampine.com/blake3 v1.1.7 // indirect
)
Loading