Skip to content

Commit

Permalink
bump deps (#11148)
Browse files Browse the repository at this point in the history 
* bump deps

- github.com/go-webauthn/webauthn v0.8.6

- github.com/prometheus/common v0.45.0

- github.com/prometheus/prometheus v0.47.2

- github.com/tidwall/gjson v1.17.0

- gonum.org/v1/gonum v0.14.0

* Use UnmarshalFirst to maintain compatibility

---------

Co-authored-by: Ryan Tinianov <tinianov@live.com>
  • Loading branch information
@jmank88 @nolag
jmank88 and nolag authored Nov 8, 2023
1 parent c80fb93 commit 027068e
Show file tree
Hide file tree
Showing 7 changed files with 102 additions and 121 deletions.
7 changes: 4 additions & 3 deletions core/cbor/cbor.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ func ParseDietCBOR(b []byte) (map[string]interface{}, error) {
b = autoAddMapDelimiters(b)

var m map[interface{}]interface{}
if err := cbor.Unmarshal(b, &m); err != nil {
if _, err := cbor.UnmarshalFirst(b, &m); err != nil {
return nil, err
}

Expand All @@ -38,7 +38,8 @@ func ParseDietCBOR(b []byte) (map[string]interface{}, error) {
// "top-level map" requirement of "diet" CBOR.
func ParseDietCBORToStruct(b []byte, v interface{}) error {
b = autoAddMapDelimiters(b)
return cbor.Unmarshal(b, v)
_, err := cbor.UnmarshalFirst(b, v)
return err
}

// ParseStandardCBOR parses CBOR in "standards compliant" mode.
Expand All @@ -49,7 +50,7 @@ func ParseStandardCBOR(b []byte) (a interface{}, err error) {
if len(b) == 0 {
return nil, nil
}
if err = cbor.Unmarshal(b, &a); err != nil {
if _, err = cbor.UnmarshalFirst(b, &a); err != nil {
return nil, err
}
return
Expand Down
20 changes: 10 additions & 10 deletions core/scripts/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ require (
github.com/fatih/color v1.15.0 // indirect
github.com/flynn/noise v0.0.0-20180327030543-2492fe189ae6 // indirect
github.com/fsnotify/fsnotify v1.6.0 // indirect
github.com/fxamacker/cbor/v2 v2.4.0 // indirect
github.com/fxamacker/cbor/v2 v2.5.0 // indirect
github.com/gabriel-vasile/mimetype v1.4.2 // indirect
github.com/gagliardetto/binary v0.7.1 // indirect
github.com/gagliardetto/solana-go v1.4.1-0.20220428092759-5250b4abbb27 // indirect
Expand All @@ -132,21 +132,21 @@ require (
github.com/go-playground/universal-translator v0.18.1 // indirect
github.com/go-playground/validator/v10 v10.14.0 // indirect
github.com/go-stack/stack v1.8.1 // indirect
github.com/go-webauthn/revoke v0.1.9 // indirect
github.com/go-webauthn/webauthn v0.8.2 // indirect
github.com/go-webauthn/webauthn v0.8.6 // indirect
github.com/go-webauthn/x v0.1.4 // indirect
github.com/goccy/go-json v0.10.2 // indirect
github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 // indirect
github.com/gofrs/flock v0.8.1 // indirect
github.com/gogo/protobuf v1.3.3 // indirect
github.com/golang-jwt/jwt/v4 v4.5.0 // indirect
github.com/golang-jwt/jwt/v5 v5.0.0 // indirect
github.com/golang/glog v1.1.0 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/mock v1.6.0 // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb // indirect
github.com/google/btree v1.1.2 // indirect
github.com/google/go-querystring v1.1.0 // indirect
github.com/google/go-tpm v0.3.3 // indirect
github.com/google/go-tpm v0.9.0 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/gopacket v1.1.19 // indirect
github.com/google/pprof v0.0.0-20230705174524-200ffdc848b8 // indirect
Expand Down Expand Up @@ -254,7 +254,7 @@ require (
github.com/mattn/go-colorable v0.1.13 // indirect
github.com/mattn/go-isatty v0.0.19 // indirect
github.com/mattn/go-runewidth v0.0.14 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
github.com/mimoo/StrobeGo v0.0.0-20210601165009-122bf33a46e0 // indirect
github.com/minio/blake2b-simd v0.0.0-20160723061019-3f5f724cb5b1 // indirect
github.com/minio/sha256-simd v0.1.1 // indirect
Expand Down Expand Up @@ -289,9 +289,9 @@ require (
github.com/pressly/goose/v3 v3.15.1 // indirect
github.com/prometheus/client_golang v1.17.0 // indirect
github.com/prometheus/client_model v0.5.0 // indirect
github.com/prometheus/common v0.44.0 // indirect
github.com/prometheus/common v0.45.0 // indirect
github.com/prometheus/procfs v0.12.0 // indirect
github.com/prometheus/prometheus v0.46.0 // indirect
github.com/prometheus/prometheus v0.47.2 // indirect
github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
github.com/rivo/uniseg v0.4.4 // indirect
github.com/rjeczalik/notify v0.9.3 // indirect
Expand Down Expand Up @@ -325,7 +325,7 @@ require (
github.com/teris-io/shortid v0.0.0-20201117134242-e59966efd125 // indirect
github.com/theodesp/go-heaps v0.0.0-20190520121037-88e35354fe0a // indirect
github.com/tidwall/btree v1.6.0 // indirect
github.com/tidwall/gjson v1.16.0 // indirect
github.com/tidwall/gjson v1.17.0 // indirect
github.com/tidwall/match v1.1.1 // indirect
github.com/tidwall/pretty v1.2.0 // indirect
github.com/tklauser/go-sysconf v0.3.12 // indirect
Expand Down Expand Up @@ -367,7 +367,7 @@ require (
golang.org/x/text v0.13.0 // indirect
golang.org/x/time v0.3.0 // indirect
golang.org/x/tools v0.14.0 // indirect
gonum.org/v1/gonum v0.13.0 // indirect
gonum.org/v1/gonum v0.14.0 // indirect
google.golang.org/genproto v0.0.0-20230717213848-3f92550aa753 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20230717213848-3f92550aa753 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20230717213848-3f92550aa753 // indirect
Expand Down
Loading

0 comments on commit 027068e

Please sign in to comment.