Merge remote-tracking branch 'origin/master' into nate/rhp4

SiaFoundation · Sep 27, 2024 · e331259 · e331259
2 parents 24d8518 + f45eedc
commit e331259
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/chain/db.go b/chain/db.go
@@ -566,8 +566,10 @@ func (db *DBStore) SupplementTipTransaction(txn types.Transaction) (ts consensus
 	for _, sp := range txn.StorageProofs {
 		if fce, ok := db.getFileContractElement(sp.ParentID, numLeaves); ok {
 			if windowIndex, ok := db.BestIndex(fce.FileContract.WindowStart - 1); ok {
-				ts.ValidFileContracts = append(ts.ValidFileContracts, fce)
-				ts.StorageProofBlockIDs = append(ts.StorageProofBlockIDs, windowIndex.ID)
+				ts.StorageProofs = append(ts.StorageProofs, consensus.V1StorageProofSupplement{
+					FileContract: fce,
+					WindowID:     windowIndex.ID,
+				})
 			}
 		}
 	}

diff --git a/go.mod b/go.mod
@@ -2,8 +2,6 @@ module go.sia.tech/coreutils
 
 go 1.23.0
 
-replace go.sia.tech/core => ../core
-
 require (
 	go.etcd.io/bbolt v1.3.11
 	go.sia.tech/core v0.4.8-0.20240927164319-a84f9361f4c0

diff --git a/go.sum b/go.sum
@@ -8,6 +8,8 @@ github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKs
 github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
 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.8-0.20240927164319-a84f9361f4c0 h1:C13mxkhuwcS5kIYvsumrZDvWtPY6FLfYsRDkyTKKLAY=
+go.sia.tech/core v0.4.8-0.20240927164319-a84f9361f4c0/go.mod h1:j2Ke8ihV8or7d2VDrFZWcCkwSVHO0DNMQJAGs9Qop2M=
 go.sia.tech/mux v1.3.0 h1:hgR34IEkqvfBKUJkAzGi31OADeW2y7D6Bmy/Jcbop9c=
 go.sia.tech/mux v1.3.0/go.mod h1:I46++RD4beqA3cW9Xm9SwXbezwPqLvHhVs9HLpDtt58=
 go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=