Merge pull request #272 from SiaFoundation/siafund-claim-fix

consensus: Fix Siafund ClaimStart not being recorded
SiaFoundation · Feb 10, 2025 · bfa61b4 · bfa61b4
2 parents 3c6ca85 + 289fa55
commit bfa61b4
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 2 deletions.
diff --git a/.changeset/fix_siafund_claimstart.md b/.changeset/fix_siafund_claimstart.md
@@ -0,0 +1,5 @@
+---
+default: patch
+---
+
+# Fix Siafund ClaimStart not being recorded
diff --git a/consensus/application.go b/consensus/application.go
@@ -390,6 +390,7 @@ func (ms *MidState) createSiafundElement(id types.SiafundOutputID, sfo types.Sia
 		StateElement:  types.StateElement{LeafIndex: types.UnassignedLeafIndex},
 		ID:            id,
 		SiafundOutput: sfo,
+		ClaimStart:    ms.siafundTaxRevenue,
 	}
 	sfed.Created = true
 	return sfed

diff --git a/consensus/application_test.go b/consensus/application_test.go
@@ -1153,6 +1153,15 @@ func TestSiafunds(t *testing.T) {
 		},
 	}
 	genesisBlock.Transactions = []types.Transaction{giftTxn}
+	genesisBlock.V2 = &types.V2BlockData{
+		Transactions: []types.V2Transaction{{
+			FileContracts: []types.V2FileContract{{
+				RenterOutput: types.SiacoinOutput{
+					Value: types.Siacoins(1000), // ensure initial SiafundTaxRevenue is not 0
+				},
+			}},
+		}},
+	}
 	db, cs := newConsensusDB(n, genesisBlock)
 
 	signTxn := func(cs State, txn *types.V2Transaction) {
@@ -1196,6 +1205,24 @@ func TestSiafunds(t *testing.T) {
 		return
 	}
 
+	// roundtrip SF output, to reset its ClaimStart
+	sfe := db.sfes[giftTxn.SiafundOutputID(0)]
+	txn := types.V2Transaction{
+		SiafundInputs: []types.V2SiafundInput{{
+			Parent:       sfe,
+			ClaimAddress: giftAddress,
+		}},
+		SiafundOutputs: []types.SiafundOutput{{
+			Address: giftAddress,
+			Value:   giftAmountSF,
+		}},
+	}
+	signTxn(cs, &txn)
+	if _, err := mineTxns(nil, []types.V2Transaction{txn}); err != nil {
+		t.Fatal(err)
+	}
+	sfe = db.sfes[txn.SiafundOutputID(txn.ID(), 0)]
+
 	fc := types.V2FileContract{
 		ProofHeight:      20,
 		ExpirationHeight: 30,
@@ -1206,7 +1233,7 @@ func TestSiafunds(t *testing.T) {
 	}
 	fcValue := fc.RenterOutput.Value.Add(fc.HostOutput.Value).Add(cs.V2FileContractTax(fc))
 
-	txn := types.V2Transaction{
+	txn = types.V2Transaction{
 		SiacoinInputs: []types.V2SiacoinInput{{
 			Parent: db.sces[giftTxn.SiacoinOutputID(0)],
 		}},
@@ -1229,7 +1256,7 @@ func TestSiafunds(t *testing.T) {
 	// make a siafund claim
 	txn = types.V2Transaction{
 		SiafundInputs: []types.V2SiafundInput{{
-			Parent:       db.sfes[giftTxn.SiafundOutputID(0)],
+			Parent:       sfe,
 			ClaimAddress: giftAddress,
 		}},
 		SiafundOutputs: []types.SiafundOutput{{