From 58d2cc50a7cd50c7432f1f057f5479070046d02c Mon Sep 17 00:00:00 2001 From: Nate Maninger Date: Mon, 7 Oct 2024 13:04:28 -0700 Subject: [PATCH] Update core and coreutils (#480) * deps: update core and coreutils * dependabot: revert * deps: update lukechampine/frand * settings: set public key field in announcement --- .github/dependabot.yml | 14 +------------- go.mod | 13 +++++++------ go.sum | 19 ++++++++----------- host/settings/announce.go | 1 + host/settings/update.go | 4 ++-- 5 files changed, 19 insertions(+), 32 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 30c1f536..76a6f8aa 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -7,21 +7,9 @@ version: 2 updates: - package-ecosystem: "gomod" directory: "/" - target-branch: master # see https://github.com/dependabot/dependabot-core/issues/1778#issuecomment-1988140219 - schedule: - interval: "daily" - allow: - - dependency-name: "go.sia.tech*" - dependency-type: "all" - groups: - all-dependencies: - patterns: - - "*" - - package-ecosystem: "gomod" # See documentation for possible values - directory: "/" # Location of package manifests schedule: interval: "weekly" groups: - all-dependencies: + dependencies: patterns: - "*" diff --git a/go.mod b/go.mod index ce5f8bbe..1665aa7b 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,8 @@ module go.sia.tech/hostd -go 1.23.0 +go 1.23.1 + +toolchain go1.23.2 require ( github.com/aws/aws-sdk-go v1.55.5 @@ -8,8 +10,8 @@ require ( github.com/hashicorp/golang-lru/v2 v2.0.7 github.com/mattn/go-sqlite3 v1.14.23 github.com/shopspring/decimal v1.4.0 - go.sia.tech/core v0.4.6 - go.sia.tech/coreutils v0.3.2 + go.sia.tech/core v0.4.8-0.20240926222149-2c8b541119dc + go.sia.tech/coreutils v0.4.1 go.sia.tech/jape v0.12.1 go.sia.tech/web/hostd v0.48.0 go.uber.org/goleak v1.3.0 @@ -19,13 +21,12 @@ require ( golang.org/x/time v0.6.0 gopkg.in/yaml.v3 v3.0.1 lukechampine.com/flagg v1.1.1 - lukechampine.com/frand v1.4.2 + lukechampine.com/frand v1.5.1 lukechampine.com/upnp v0.3.0 nhooyr.io/websocket v1.8.17 ) require ( - github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da // indirect github.com/goccy/go-json v0.10.3 // indirect github.com/google/go-querystring v1.1.0 // indirect github.com/jmespath/go-jmespath v0.4.0 // indirect @@ -33,7 +34,7 @@ require ( github.com/kr/pretty v0.3.1 // indirect github.com/rogpeppe/go-internal v1.12.0 // indirect go.etcd.io/bbolt v1.3.11 // indirect - go.sia.tech/mux v1.2.0 // indirect + go.sia.tech/mux v1.3.0 // indirect go.sia.tech/web v0.0.0-20240610131903-5611d44a533e // indirect go.uber.org/multierr v1.11.0 // indirect golang.org/x/crypto v0.27.0 // indirect diff --git a/go.sum b/go.sum index bfbc70de..343eb866 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,3 @@ -github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da h1:KjTM2ks9d14ZYCvmHS9iAKVt9AyzRSqNU1qabPih5BY= -github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da/go.mod h1:eHEWzANqSiWQsof+nXEI9bUVUyV6F53Fp89EuCh2EAA= github.com/aws/aws-sdk-go v1.55.5 h1:KKUZBfBoyqy5d3swXyiC7Q76ic40rYcbqH7qjh59kzU= github.com/aws/aws-sdk-go v1.55.5/go.mod h1:eRwEWoyTWFMVYVQzKMNHWP5/RV4xIUGMQfXQHfHkpNU= github.com/cloudflare/cloudflare-go v0.104.0 h1:R/lB0dZupaZbOgibAH/BRrkFbZ6Acn/WsKg2iX2xXuY= @@ -42,14 +40,14 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= go.etcd.io/bbolt v1.3.11 h1:yGEzV1wPz2yVCLsD8ZAiGHhHVlczyC9d1rP43/VCRJ0= go.etcd.io/bbolt v1.3.11/go.mod h1:dksAq7YMXoljX0xu6VF5DMZGbhYYoLUalEiSySYAS4I= -go.sia.tech/core v0.4.6 h1:QLm97a7GWBonfnMEOokqWRAqsWCUPL7kzo6k3Adwx8E= -go.sia.tech/core v0.4.6/go.mod h1:Zuq0Tn2aIXJyO0bjGu8cMeVWe+vwQnUfZhG1LCmjD5c= -go.sia.tech/coreutils v0.3.2 h1:3gJqvs18n1FVZmcrnfIYyzS+rBu06OtIscDDAfUAYQI= -go.sia.tech/coreutils v0.3.2/go.mod h1:woPVmN6GUpIKHdi71Hkb9goIbl7b45TquCsAyEzyxnI= +go.sia.tech/core v0.4.8-0.20240926222149-2c8b541119dc h1:+hCcYky+23HtiAnirXsq0U/NaCt1WuIu308lmfTtJNM= +go.sia.tech/core v0.4.8-0.20240926222149-2c8b541119dc/go.mod h1:j2Ke8ihV8or7d2VDrFZWcCkwSVHO0DNMQJAGs9Qop2M= +go.sia.tech/coreutils v0.4.1 h1:ExQ9g6EtnFe70ptNBG+OtZyFU3aBoEzE/06rtbN6f4c= +go.sia.tech/coreutils v0.4.1/go.mod h1:v60kPqZERsb1ZS0PVe4S8hr2ArNEwTdp7XTzErXnV2U= go.sia.tech/jape v0.12.1 h1:xr+o9V8FO8ScRqbSaqYf9bjj1UJ2eipZuNcI1nYousU= go.sia.tech/jape v0.12.1/go.mod h1:wU+h6Wh5olDjkPXjF0tbZ1GDgoZ6VTi4naFw91yyWC4= -go.sia.tech/mux v1.2.0 h1:ofa1Us9mdymBbGMY2XH/lSpY8itFsKIo/Aq8zwe+GHU= -go.sia.tech/mux v1.2.0/go.mod h1:Yyo6wZelOYTyvrHmJZ6aQfRoer3o4xyKQ4NmQLJrBSo= +go.sia.tech/mux v1.3.0 h1:hgR34IEkqvfBKUJkAzGi31OADeW2y7D6Bmy/Jcbop9c= +go.sia.tech/mux v1.3.0/go.mod h1:I46++RD4beqA3cW9Xm9SwXbezwPqLvHhVs9HLpDtt58= go.sia.tech/web v0.0.0-20240610131903-5611d44a533e h1:oKDz6rUExM4a4o6n/EXDppsEka2y/+/PgFOZmHWQRSI= go.sia.tech/web v0.0.0-20240610131903-5611d44a533e/go.mod h1:4nyDlycPKxTlCqvOeRO0wUfXxyzWCEE7+2BRrdNqvWk= go.sia.tech/web/hostd v0.48.0 h1:wRyRhS9ZJlujgxk9pyw2RCDr2lLTzgi1Ra7W1YYCsCI= @@ -68,7 +66,6 @@ golang.org/x/net v0.29.0 h1:5ORfpBpCs4HzDYoodCDBbwHzdR5UrLBZ3sOnUJmFoHo= golang.org/x/net v0.29.0/go.mod h1:gLkgy8jTGERgjzMic6DS9+SP0ajcu6Xu3Orq/SpETg0= golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ= golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= -golang.org/x/sys v0.0.0-20190626221950-04f50cda93cb/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34= golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.24.0 h1:Mh5cbb+Zk2hqqXNO7S1iTjEphVL+jb8ZWaqh/g+JWkM= @@ -90,8 +87,8 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= lukechampine.com/flagg v1.1.1 h1:jB5oL4D5zSUrzm5og6dDEi5pnrTF1poKfC7KE1lLsqc= lukechampine.com/flagg v1.1.1/go.mod h1:a9ZuZu5LSPXELWSJrabRD00ort+lDXSOQu34xWgEoDI= -lukechampine.com/frand v1.4.2 h1:RzFIpOvkMXuPMBb9maa4ND4wjBn71E1Jpf8BzJHMaVw= -lukechampine.com/frand v1.4.2/go.mod h1:4S/TM2ZgrKejMcKMbeLjISpJMO+/eZ1zu3vYX9dtj3s= +lukechampine.com/frand v1.5.1 h1:fg0eRtdmGFIxhP5zQJzM1lFDbD6CUfu/f+7WgAZd5/w= +lukechampine.com/frand v1.5.1/go.mod h1:4VstaWc2plN4Mjr10chUD46RAVGWhpkZ5Nja8+Azp0Q= lukechampine.com/upnp v0.3.0 h1:UVCD6eD6fmJmwak6DVE3vGN+L46Fk8edTcC6XYCb6C4= lukechampine.com/upnp v0.3.0/go.mod h1:sOuF+fGSDKjpUm6QI0mfb82ScRrhj8bsqsD78O5nK1k= nhooyr.io/websocket v1.8.17 h1:KEVeLJkUywCKVsnLIDlD/5gtayKp8VoCkksHCGGfT9Y= diff --git a/host/settings/announce.go b/host/settings/announce.go index 9d7f5041..f3196e8a 100644 --- a/host/settings/announce.go +++ b/host/settings/announce.go @@ -33,6 +33,7 @@ func (m *ConfigManager) Announce() error { minerFee := m.chain.RecommendedFee().Mul64(announcementTxnSize) ha := chain.HostAnnouncement{ + PublicKey: m.hostKey.PublicKey(), NetAddress: settings.NetAddress, } diff --git a/host/settings/update.go b/host/settings/update.go index 00e8319d..cf6f720c 100644 --- a/host/settings/update.go +++ b/host/settings/update.go @@ -37,8 +37,8 @@ func (cm *ConfigManager) UpdateChainState(tx UpdateStateTx, reverted []chain.Rev for _, cau := range applied { index := cau.State.Index - chain.ForEachHostAnnouncement(cau.Block, func(hostKey types.PublicKey, announcement chain.HostAnnouncement) { - if hostKey != pk { + chain.ForEachHostAnnouncement(cau.Block, func(announcement chain.HostAnnouncement) { + if announcement.PublicKey != pk { return }