Merge branch 'master' of https://github.com/SiaFoundation/coreutils into pj/locked-outputs

peterjan · peterjan · commit 641887d29570 · 2025-06-03T09:51:10.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,16 @@
+## 0.15.2 (2025-05-29)
+
+### Fixes
+
+- Update core to v0.13.1
+
+## 0.15.1 (2025-05-29)
+
+### Fixes
+
+- Fix race in FundV2Transaction
+- Fixed an issue sending partial blocks to peers.
+
 ## 0.15.0 (2025-05-26)
 
 ### Breaking Changes
diff --git a/chain/manager.go b/chain/manager.go
@@ -881,15 +881,15 @@ func (m *Manager) TransactionsForPartialBlock(missing []types.Hash256) (txns []t
 	}
 	// TODO: might want to cache these
 	for _, txn := range m.txpool.txns {
-		if h := txn.FullHash(); want[h] {
+		if h := txn.MerkleLeafHash(); want[h] {
 			txns = append(txns, txn)
 			if delete(want, h); len(want) == 0 {
 				return
 			}
 		}
 	}
 	for _, txn := range m.txpool.v2txns {
-		if h := txn.FullHash(); want[h] {
+		if h := txn.MerkleLeafHash(); want[h] {
 			v2txns = append(v2txns, txn)
 			if delete(want, h); len(want) == 0 {
 				return
diff --git a/go.mod b/go.mod
@@ -1,4 +1,4 @@
-module go.sia.tech/coreutils // v0.15.0
+module go.sia.tech/coreutils // v0.15.2
 
 go 1.23.1
 
@@ -8,7 +8,7 @@ require (
 	github.com/quic-go/quic-go v0.52.0
 	github.com/quic-go/webtransport-go v0.8.1-0.20241018022711-4ac2c9250e66
 	go.etcd.io/bbolt v1.4.0
-	go.sia.tech/core v0.13.0
+	go.sia.tech/core v0.13.1
 	go.sia.tech/mux v1.4.0
 	go.uber.org/zap v1.27.0
 	golang.org/x/crypto v0.38.0
diff --git a/go.sum b/go.sum
@@ -31,8 +31,8 @@ github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOf
 github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 go.etcd.io/bbolt v1.4.0 h1:TU77id3TnN/zKr7CO/uk+fBCwF2jGcMuw2B/FMAzYIk=
 go.etcd.io/bbolt v1.4.0/go.mod h1:AsD+OCi/qPN1giOX1aiLAha3o1U8rAz65bvN4j0sRuk=
-go.sia.tech/core v0.13.0 h1:LulIZQe1A3DZ9/CyX1mcJvHy3zmw/0jEkZfuNp92D2w=
-go.sia.tech/core v0.13.0/go.mod h1:hAsdf7uqD8+oBgg5pwxFFgW7Rv41kBKM1v6r3a7UZqc=
+go.sia.tech/core v0.13.1 h1:dBKzZBhWZsgdV7qZa6qiaZtTDj5evvSqYWpeGNenlRI=
+go.sia.tech/core v0.13.1/go.mod h1:oMOgHT4bf9VSXUCOgtt9w4MFns/pY0LRUgwyMXdxW5w=
 go.sia.tech/mux v1.4.0 h1:LgsLHtn7l+25MwrgaPaUCaS8f2W2/tfvHIdXps04sVo=
 go.sia.tech/mux v1.4.0/go.mod h1:iNFi9ifFb2XhuD+LF4t2HBb4Mvgq/zIPKqwXU/NlqHA=
 go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
diff --git a/syncer/peer.go b/syncer/peer.go
@@ -344,12 +344,12 @@ func (s *Syncer) handleRPC(id types.Specifier, stream *gateway.Stream, origin *P
 				want[h] = true
 			}
 			for _, txn := range b.Transactions {
-				if want[txn.FullHash()] {
+				if want[txn.MerkleLeafHash()] {
 					r.Transactions = append(r.Transactions, txn)
 				}
 			}
 			for _, txn := range b.V2Transactions() {
-				if want[txn.FullHash()] {
+				if want[txn.MerkleLeafHash()] {
 					r.V2Transactions = append(r.V2Transactions, txn)
 				}
 			}

Original file line number	Diff line number	Diff line change
`@@ -881,15 +881,15 @@ func (m *Manager) TransactionsForPartialBlock(missing []types.Hash256) (txns []t`
`881`	`881`	`}`
`882`	`882`	`// TODO: might want to cache these`
`883`	`883`	`for _, txn := range m.txpool.txns {`
`884`		`- if h := txn.FullHash(); want[h] {`
	`884`	`+ if h := txn.MerkleLeafHash(); want[h] {`
`885`	`885`	`txns = append(txns, txn)`
`886`	`886`	`if delete(want, h); len(want) == 0 {`
`887`	`887`	`return`
`888`	`888`	`}`
`889`	`889`	`}`
`890`	`890`	`}`
`891`	`891`	`for _, txn := range m.txpool.v2txns {`
`892`		`- if h := txn.FullHash(); want[h] {`
	`892`	`+ if h := txn.MerkleLeafHash(); want[h] {`
`893`	`893`	`v2txns = append(v2txns, txn)`
`894`	`894`	`if delete(want, h); len(want) == 0 {`
`895`	`895`	`return`
Original file line number	Diff line number	Diff line change
`@@ -344,12 +344,12 @@ func (s Syncer) handleRPC(id types.Specifier, stream gateway.Stream, origin *P`
`344`	`344`	`want[h] = true`
`345`	`345`	`}`
`346`	`346`	`for _, txn := range b.Transactions {`
`347`		`- if want[txn.FullHash()] {`
	`347`	`+ if want[txn.MerkleLeafHash()] {`
`348`	`348`	`r.Transactions = append(r.Transactions, txn)`
`349`	`349`	`}`
`350`	`350`	`}`
`351`	`351`	`for _, txn := range b.V2Transactions() {`
`352`		`- if want[txn.FullHash()] {`
	`352`	`+ if want[txn.MerkleLeafHash()] {`
`353`	`353`	`r.V2Transactions = append(r.V2Transactions, txn)`
`354`	`354`	`}`
`355`	`355`	`}`