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

build(deps): bump the all-dependencies group with 3 updates #469

Closed
wants to merge 2 commits into from
Closed

build(deps): bump the all-dependencies group with 3 updates #469

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
f2c65ba
build(deps): bump the all-dependencies group with 3 updates
dependabot[bot] Sep 30, 2024
9c8c819
deps: bump coreutils
peterjan Oct 3, 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
10 changes: 5 additions & 5 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ go 1.23.0

require (
github.com/aws/aws-sdk-go v1.55.5
github.com/cloudflare/cloudflare-go v0.104.0
github.com/cloudflare/cloudflare-go v0.106.0
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.20240928202806-0e77790bd8bf
go.sia.tech/coreutils v0.4.0
go.sia.tech/jape v0.12.1
go.sia.tech/web/hostd v0.47.0
go.sia.tech/web/hostd v0.48.0
go.uber.org/goleak v1.3.0
go.uber.org/zap v1.27.0
golang.org/x/sys v0.25.0
Expand All @@ -33,7 +33,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
Expand Down
21 changes: 12 additions & 9 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da h1:KjTM2ks9d14ZYCvmH
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=
github.com/cloudflare/cloudflare-go v0.104.0/go.mod h1:pfUQ4PIG4ISI0/Mmc21Bp86UnFU0ktmPf3iTgbSL+cM=
github.com/cloudflare/cloudflare-go v0.106.0 h1:q41gC5Wc1nfi0D1ZhSHokWcd9mGMbqC7RE7qiP+qE00=
github.com/cloudflare/cloudflare-go v0.106.0/go.mod h1:pfUQ4PIG4ISI0/Mmc21Bp86UnFU0ktmPf3iTgbSL+cM=
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
Expand Down Expand Up @@ -42,18 +42,21 @@ 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/core v0.4.7 h1:UAyErZ3nk5/7N0gIG0OEEJJrxh7ru8lgGLlaNtT/Jq0=
go.sia.tech/core v0.4.7/go.mod h1:j2Ke8ihV8or7d2VDrFZWcCkwSVHO0DNMQJAGs9Qop2M=
go.sia.tech/core v0.4.8-0.20240928202806-0e77790bd8bf h1:x/lM7Y8Rlo12rcpPXapLvSVNyrHZEKO6j4eLNccPMKw=
go.sia.tech/core v0.4.8-0.20240928202806-0e77790bd8bf/go.mod h1:j2Ke8ihV8or7d2VDrFZWcCkwSVHO0DNMQJAGs9Qop2M=
go.sia.tech/coreutils v0.3.2/go.mod h1:woPVmN6GUpIKHdi71Hkb9goIbl7b45TquCsAyEzyxnI=
go.sia.tech/coreutils v0.4.0 h1:GkxJ2B7upm3/yhIOIku5oafbL/snd7tdmkj0NjrugnI=
go.sia.tech/coreutils v0.4.0/go.mod h1:dmpPtY/XVl7o0Pcyx2XpV6ujduJvNIr3ydvi3xdnXuI=
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.47.0 h1:jR9enyQaeesyj0kzg8JPcCPoJZ0k1epiaAmYpedGIUU=
go.sia.tech/web/hostd v0.47.0/go.mod h1:qU1Q738uhMjYd78XoySYp5iui7qxhsncBZnJ+KfM8fw=
go.sia.tech/web/hostd v0.48.0 h1:wRyRhS9ZJlujgxk9pyw2RCDr2lLTzgi1Ra7W1YYCsCI=
go.sia.tech/web/hostd v0.48.0/go.mod h1:qU1Q738uhMjYd78XoySYp5iui7qxhsncBZnJ+KfM8fw=
go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
Expand Down
21 changes: 13 additions & 8 deletions host/settings/announce.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,14 @@ func (m *ConfigManager) Announce() error {

minerFee := m.chain.RecommendedFee().Mul64(announcementTxnSize)

ha := chain.HostAnnouncement{
NetAddress: settings.NetAddress,
}

cs := m.chain.TipState()
if cs.Index.Height < cs.Network.HardforkV2.AllowHeight {
// create host announcement
ha := chain.HostAnnouncement{
PublicKey: m.hostKey.PublicKey(),
NetAddress: settings.NetAddress,
}

// create a transaction with an announcement
txn := types.Transaction{
ArbitraryData: [][]byte{
Expand All @@ -60,12 +62,15 @@ func (m *ConfigManager) Announce() error {
m.syncer.BroadcastTransactionSet(txnset)
m.log.Debug("broadcast announcement", zap.String("transactionID", txn.ID().String()), zap.String("netaddress", settings.NetAddress), zap.String("cost", minerFee.ExactString()))
} else {
// create host announcement
ha := chain.V2HostAnnouncement([]chain.NetAddress{
{Protocol: "tcp", Address: settings.NetAddress},
})

// create a v2 transaction with an announcement
txn := types.V2Transaction{
Attestations: []types.Attestation{
ha.ToAttestation(cs, m.hostKey),
},
MinerFee: minerFee,
Attestations: []types.Attestation{ha.ToAttestation(cs, m.hostKey)},
MinerFee: minerFee,
}
basis, toSign, err := m.wallet.FundV2Transaction(&txn, minerFee, true)
if err != nil {
Expand Down
6 changes: 3 additions & 3 deletions host/settings/update.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,13 @@ 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(ha chain.HostAnnouncement) {
if ha.PublicKey != pk {
return
}

nextAnnouncement = &Announcement{
Address: announcement.NetAddress,
Address: ha.NetAddress,
Index: index,
}
})
Expand Down
Loading