From c0b7240188b374224be1bffb125f42dd38852774 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Nov 2024 09:43:46 +0000 Subject: [PATCH 1/2] Bump go.sia.tech/core from 0.6.1 to 0.6.2 in the all-dependencies group Bumps the all-dependencies group with 1 update: [go.sia.tech/core](https://github.com/SiaFoundation/core). Updates `go.sia.tech/core` from 0.6.1 to 0.6.2 - [Commits](https://github.com/SiaFoundation/core/compare/v0.6.1...v0.6.2) --- updated-dependencies: - dependency-name: go.sia.tech/core dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all-dependencies ... Signed-off-by: dependabot[bot] --- go.mod | 6 +++--- go.sum | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/go.mod b/go.mod index e033d62e..04cc2a59 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,7 @@ toolchain go1.23.2 require ( github.com/ip2location/ip2location-go v8.3.0+incompatible github.com/mattn/go-sqlite3 v1.14.24 - go.sia.tech/core v0.6.1 + go.sia.tech/core v0.6.2 go.sia.tech/coreutils v0.6.0 go.sia.tech/jape v0.12.1 go.uber.org/zap v1.27.0 @@ -24,8 +24,8 @@ require ( go.etcd.io/bbolt v1.3.11 // indirect go.sia.tech/mux v1.3.0 // indirect go.uber.org/multierr v1.11.0 // indirect - golang.org/x/crypto v0.28.0 // indirect - golang.org/x/sys v0.26.0 // indirect + golang.org/x/crypto v0.29.0 // indirect + golang.org/x/sys v0.27.0 // indirect golang.org/x/tools v0.20.0 // indirect gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect ) diff --git a/go.sum b/go.sum index 8f141009..4da52644 100644 --- a/go.sum +++ b/go.sum @@ -21,8 +21,8 @@ github.com/stretchr/testify v1.8.3 h1:RP3t2pwF7cMEbC1dqtB6poj3niw/9gnV4Cjg5oW5gt github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= 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.6.1 h1:eaExM2E2eNr43su2XDkY5J24E3F54YGS7hcC3WtVjVk= -go.sia.tech/core v0.6.1/go.mod h1:P3C1BWa/7J4XgdzWuaYHBvLo2RzZ0UBaJM4TG1GWB2g= +go.sia.tech/core v0.6.2 h1:8NEjxyD93A+EhZopsBy/LvuHH+zUSjRNKnf9rXgtIwU= +go.sia.tech/core v0.6.2/go.mod h1:4v+aT/33857tMfqa5j5OYlAoLsoIrd4d7qMlgeP+VGk= 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/jape v0.12.1 h1:xr+o9V8FO8ScRqbSaqYf9bjj1UJ2eipZuNcI1nYousU= @@ -35,14 +35,14 @@ go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8= go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E= -golang.org/x/crypto v0.28.0 h1:GBDwsMXVQi34v5CCYUm2jkJvu4cbtru2U4TN2PSyQnw= -golang.org/x/crypto v0.28.0/go.mod h1:rmgy+3RHxRZMyY0jjAJShp2zgEdOqj2AO7U0pYmeQ7U= +golang.org/x/crypto v0.29.0 h1:L5SG1JTTXupVV3n6sUqMTeWbjAyfPwoda2DLX8J8FrQ= +golang.org/x/crypto v0.29.0/go.mod h1:+F4F4N5hv6v38hfeYwTdx20oUvLLc+QfrE9Ax9HtgRg= golang.org/x/mod v0.17.0 h1:zY54UmvipHiNd+pm+m0x9KhZ9hl1/7QNMyxXbc6ICqA= golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M= golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= -golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo= -golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.27.0 h1:wBqf8DvsY9Y/2P8gAfPDEYNuS30J4lPHJxXSb/nJZ+s= +golang.org/x/sys v0.27.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/tools v0.20.0 h1:hz/CVckiOxybQvFw6h7b/q80NTr9IUQb4s1IIzW7KNY= golang.org/x/tools v0.20.0/go.mod h1:WvitBU7JJf6A4jOdg4S1tviW9bhUxkgeCui/0JHctQg= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= From 43a0e557e7e5418ff28878264449c6ed6173752c Mon Sep 17 00:00:00 2001 From: Chris Schinnerl Date: Mon, 18 Nov 2024 11:02:53 +0100 Subject: [PATCH 2/2] fix build --- explorer/types.go | 2 +- internal/rhp/v3/rhp.go | 4 ++-- internal/testutil/chain.go | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/explorer/types.go b/explorer/types.go index cfea0770..5fb1f0a9 100644 --- a/explorer/types.go +++ b/explorer/types.go @@ -151,7 +151,7 @@ type ExtendedFileContract struct { Payout types.Currency `json:"payout"` ValidProofOutputs []ContractSiacoinOutput `json:"validProofOutputs"` MissedProofOutputs []ContractSiacoinOutput `json:"missedProofOutputs"` - UnlockHash types.Hash256 `json:"unlockHash"` + UnlockHash types.Address `json:"unlockHash"` RevisionNumber uint64 `json:"revisionNumber"` } diff --git a/internal/rhp/v3/rhp.go b/internal/rhp/v3/rhp.go index 55f7a845..cbffcf9a 100644 --- a/internal/rhp/v3/rhp.go +++ b/internal/rhp/v3/rhp.go @@ -761,13 +761,13 @@ func prepareContractRenewal(currentRevision types.FileContractRevision, renterAd WindowStart: uint64(endHeight), WindowEnd: uint64(endHeight + host.WindowSize), Payout: taxAdjustedPayout(renterPayout.Add(hostValidPayout)), - UnlockHash: types.Hash256(types.UnlockConditions{ + UnlockHash: types.UnlockConditions{ PublicKeys: []types.UnlockKey{ renterKey.PublicKey().UnlockKey(), hostKey.UnlockKey(), }, SignaturesRequired: 2, - }.UnlockHash()), + }.UnlockHash(), RevisionNumber: 0, ValidProofOutputs: []types.SiacoinOutput{ {Value: renterPayout, Address: renterAddress}, diff --git a/internal/testutil/chain.go b/internal/testutil/chain.go index c7e04fe9..2af080c6 100644 --- a/internal/testutil/chain.go +++ b/internal/testutil/chain.go @@ -53,7 +53,7 @@ func PrepareContractFormation(renterPubKey types.PublicKey, hostKey types.Public WindowStart: startHeight, WindowEnd: endHeight, Payout: payout, - UnlockHash: types.Hash256(uc.UnlockHash()), + UnlockHash: uc.UnlockHash(), RevisionNumber: 0, ValidProofOutputs: []types.SiacoinOutput{ {Value: renterPayout, Address: refundAddr},