update core and renterd

SiaFoundation · Nov 1, 2024 · d96b303 · d96b303
1 parent d505df0
commit d96b303
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 17 deletions.
diff --git a/go.mod b/go.mod
@@ -5,12 +5,12 @@ go 1.23.1
 toolchain go1.23.2
 
 require (
-	go.sia.tech/core v0.5.0
-	go.sia.tech/coreutils v0.5.0
-	go.sia.tech/hostd v1.1.3-0.20241022083902-7d61fc09be7c
+	go.sia.tech/core v0.6.1
+	go.sia.tech/coreutils v0.6.0
+	go.sia.tech/hostd v1.1.3-0.20241101150257-8319b75af8b2
 	go.sia.tech/jape v0.12.1
-	go.sia.tech/renterd v1.1.0-beta.4.0.20241030143417-e4fe42de199d
-	go.sia.tech/walletd v0.8.1-0.20241021164545-5b34e523f8df
+	go.sia.tech/renterd v1.1.0-beta.4.0.20241101220719-9f67518242e8
+	go.sia.tech/walletd v0.8.1-0.20241101091153-465e9da22d82
 	go.uber.org/zap v1.27.0
 	lukechampine.com/frand v1.5.1
 )

diff --git a/go.sum b/go.sum
@@ -49,22 +49,22 @@ 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.5.0 h1:feLC7DSCF+PhU157s/94106hFKyiGrGQ9HC3/dF/l7E=
-go.sia.tech/core v0.5.0/go.mod h1:P3C1BWa/7J4XgdzWuaYHBvLo2RzZ0UBaJM4TG1GWB2g=
-go.sia.tech/coreutils v0.5.0 h1:/xKxdw83iZy0jjLzI2NGHyG4azyjK5DJscxpkr6nIGQ=
-go.sia.tech/coreutils v0.5.0/go.mod h1:VYM4FcmlhVrpDGvglLHjRW+gitoaxPNLvp5mL2quilo=
+go.sia.tech/core v0.6.1 h1:eaExM2E2eNr43su2XDkY5J24E3F54YGS7hcC3WtVjVk=
+go.sia.tech/core v0.6.1/go.mod h1:P3C1BWa/7J4XgdzWuaYHBvLo2RzZ0UBaJM4TG1GWB2g=
+go.sia.tech/coreutils v0.6.0 h1:r0IZt+aVdGG2uIHl7OtaWRYdVx4NQ7ezRoSGa0Ej8GY=
+go.sia.tech/coreutils v0.6.0/go.mod h1:XlsnogeYU/Tdjzp/HUNAj5T7tZCdmeBHIBjymbPC+uQ=
 go.sia.tech/gofakes3 v0.0.5 h1:vFhVBUFbKE9ZplvLE2w4TQxFMQyF8qvgxV4TaTph+Vw=
 go.sia.tech/gofakes3 v0.0.5/go.mod h1:LXEzwGw+OHysWLmagleCttX93cJZlT9rBu/icOZjQ54=
-go.sia.tech/hostd v1.1.3-0.20241022083902-7d61fc09be7c h1:oGRzqksT2MFoS4SvkrGbUG1LXNbnmv2KBzzv8uf0R4E=
-go.sia.tech/hostd v1.1.3-0.20241022083902-7d61fc09be7c/go.mod h1:EIuirLN/+714h+XaIpnJkU2BFdX/JF6Q1VXhX4N5sbc=
+go.sia.tech/hostd v1.1.3-0.20241101150257-8319b75af8b2 h1:6fogOsOr7efjeDHCO0mqIibEa5cOagSSo3JXe1fuifM=
+go.sia.tech/hostd v1.1.3-0.20241101150257-8319b75af8b2/go.mod h1:096sIYupHRUGkVyAe6i511la7wQo5LfRHGNUSMIKcT4=
 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.3.0 h1:hgR34IEkqvfBKUJkAzGi31OADeW2y7D6Bmy/Jcbop9c=
 go.sia.tech/mux v1.3.0/go.mod h1:I46++RD4beqA3cW9Xm9SwXbezwPqLvHhVs9HLpDtt58=
-go.sia.tech/renterd v1.1.0-beta.4.0.20241030143417-e4fe42de199d h1:tgH8ry6C/i+F6wl41V3Fi4UEu+eiYGTFv2iaomQJGsQ=
-go.sia.tech/renterd v1.1.0-beta.4.0.20241030143417-e4fe42de199d/go.mod h1:qKnu7fTrcu85pTKKfzGhXxj3DtQBdO6sXrJ+YmzO7EQ=
-go.sia.tech/walletd v0.8.1-0.20241021164545-5b34e523f8df h1:RW6sd5VqujpeITDWw1X2ef/UEnP2/3hiZWv4SpplJmI=
-go.sia.tech/walletd v0.8.1-0.20241021164545-5b34e523f8df/go.mod h1:4fufYJS0dofERcTSRAJ3awmgwujZeRFc9/sG6eea9OQ=
+go.sia.tech/renterd v1.1.0-beta.4.0.20241101220719-9f67518242e8 h1:BEVxPwqdHAodcrvEAY8vPK6yq/Y27d2vm6Y7ogsDYbc=
+go.sia.tech/renterd v1.1.0-beta.4.0.20241101220719-9f67518242e8/go.mod h1:OvmbR/4sInzJpYba6XF93CA4MNewL6CZiLQ2Fd+Ec6E=
+go.sia.tech/walletd v0.8.1-0.20241101091153-465e9da22d82 h1:b48uOxKkBhexR8/1bYLNscYyD8weMYWltj46wsNVhkY=
+go.sia.tech/walletd v0.8.1-0.20241101091153-465e9da22d82/go.mod h1:eowElIUuv8MVsyFBbOtLytJgm0ztzQBJ9QF7ZAiIK6g=
 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=

diff --git a/nodes/renterd.go b/nodes/renterd.go
@@ -204,7 +204,14 @@ func (m *Manager) StartRenterd(ctx context.Context, sk types.PrivateKey, ready c
 	defer wm.Close()
 
 	explorerURL := "https://api.siascan.com/exchange-rate/siacoin"
-	b, err := bus.New(ctx, ([32]byte)(sk[:32]), am, wh, cm, s, wm, store, 24*time.Hour, explorerURL, log.Named("bus"))
+	b, err := bus.New(ctx, config.Bus{
+		AllowPrivateIPs:               true,
+		AnnouncementMaxAgeHours:       90 * 24,
+		Bootstrap:                     true,
+		GatewayAddr:                   s.Addr(),
+		UsedUTXOExpiry:                time.Hour,
+		SlabBufferCompletionThreshold: 1 << 12,
+	}, ([32]byte)(sk[:32]), am, wh, cm, s, wm, store, explorerURL, log.Named("bus"))
 	if err != nil {
 		return fmt.Errorf("failed to create bus: %w", err)
 	}
@@ -225,7 +232,6 @@ func (m *Manager) StartRenterd(ctx context.Context, sk types.PrivateKey, ready c
 
 	w, err := worker.New(config.Worker{
 		AccountsRefillInterval:   time.Second,
-		AllowPrivateIPs:          true,
 		ContractLockTimeout:      5 * time.Second,
 		ID:                       "worker",
 		BusFlushInterval:         100 * time.Millisecond,