Merge branch 'master' into element-id

Author: lukechampine

Diff for: .github/workflows/main.yml

@@ -0,0 +1,12 @@
+name: Lint & Test
+on:
+  pull_request:
+  push:
+    branches:
+      - master
+
+jobs:
+  test:
+    uses: SiaFoundation/workflows/.github/workflows/go-test.yml@master
+    with:
+      try-build: false

Diff for: .github/workflows/nightly.yml

@@ -50,6 +50,8 @@ type Network struct {
 	InitialCoinbase types.Currency `json:"initialCoinbase"`
 	MinimumCoinbase types.Currency `json:"minimumCoinbase"`
 	InitialTarget   types.BlockID  `json:"initialTarget"`
+	BlockInterval   time.Duration  `json:"blockInterval"`
+	MaturityDelay   uint64         `json:"maturityDelay"`
 
 	HardforkDevAddr struct {
 		Height     uint64        `json:"height"`
@@ -225,7 +227,7 @@ func (s State) SufficientlyHeavierThan(t State) bool {
 
 // BlockInterval is the expected wall clock time between consecutive blocks.
 func (s State) BlockInterval() time.Duration {
-	return 10 * time.Minute
+	return s.Network.BlockInterval
 }
 
 // BlockReward returns the reward for mining a child block.
@@ -240,7 +242,7 @@ func (s State) BlockReward() types.Currency {
 // MaturityHeight is the height at which various outputs created in the child
 // block will "mature" (become spendable).
 func (s State) MaturityHeight() uint64 {
-	return s.childHeight() + 144
+	return s.childHeight() + s.Network.MaturityDelay
 }
 
 // SiafundCount is the number of siafunds in existence.
@@ -256,12 +258,12 @@ func (s State) AncestorDepth() uint64 {
 
 // FoundationSubsidy returns the Foundation subsidy output for the child block.
 // If no subsidy is due, the returned output has a value of zero.
-func (s State) FoundationSubsidy() (sco types.SiacoinOutput) {
+func (s State) FoundationSubsidy() (sco types.SiacoinOutput, exists bool) {
 	sco.Address = s.FoundationPrimaryAddress
 
 	subsidyPerBlock := types.Siacoins(30000)
-	const blocksPerYear = 144 * 365
-	const blocksPerMonth = blocksPerYear / 12
+	blocksPerYear := uint64(365 * 24 * time.Hour / s.BlockInterval())
+	blocksPerMonth := blocksPerYear / 12
 	hardforkHeight := s.Network.HardforkFoundation.Height
 	if s.childHeight() < hardforkHeight || (s.childHeight()-hardforkHeight)%blocksPerMonth != 0 {
 		sco.Value = types.ZeroCurrency
@@ -270,7 +272,7 @@ func (s State) FoundationSubsidy() (sco types.SiacoinOutput) {
 	} else {
 		sco.Value = subsidyPerBlock.Mul64(blocksPerMonth)
 	}
-	return
+	return sco, !sco.Value.IsZero()
 }
 
 // NonceFactor is the factor by which all block nonces must be divisible.
@@ -626,31 +628,7 @@ func (ms *MidState) fileContractElement(ts V1TransactionSupplement, id types.Fil
 	if i, ok := ms.created[id]; ok {
 		return ms.fces[i], true
 	}
-	return ts.fileContractElement(id)
-}
-
-func (ms *MidState) mustSiacoinElement(ts V1TransactionSupplement, id types.SiacoinOutputID) types.SiacoinElement {
-	sce, ok := ms.siacoinElement(ts, id)
-	if !ok {
-		panic("missing SiacoinElement")
-	}
-	return sce
-}
-
-func (ms *MidState) mustSiafundElement(ts V1TransactionSupplement, id types.SiafundOutputID) types.SiafundElement {
-	sfe, ok := ms.siafundElement(ts, id)
-	if !ok {
-		panic("missing SiafundElement")
-	}
-	return sfe
-}
-
-func (ms *MidState) mustFileContractElement(ts V1TransactionSupplement, id types.FileContractID) types.FileContractElement {
-	fce, ok := ms.fileContractElement(ts, id)
-	if !ok {
-		panic("missing FileContractElement")
-	}
-	return fce
+	return ts.revision(id)
 }
 
 func (ms *MidState) spent(id types.ElementID) (types.TransactionID, bool) {
@@ -684,6 +662,25 @@ func NewMidState(s State) *MidState {
 	}
 }
 
+// A V1StorageProofSupplement pairs a file contract with the block ID used to
+// derive its storage proof leaf index.
+type V1StorageProofSupplement struct {
+	FileContract types.FileContractElement
+	WindowID     types.BlockID
+}
+
+// EncodeTo implements types.EncoderTo.
+func (sps V1StorageProofSupplement) EncodeTo(e *types.Encoder) {
+	sps.FileContract.EncodeTo(e)
+	sps.WindowID.EncodeTo(e)
+}
+
+// DecodeFrom implements types.DecoderFrom.
+func (sps *V1StorageProofSupplement) DecodeFrom(d *types.Decoder) {
+	sps.FileContract.DecodeFrom(d)
+	sps.WindowID.DecodeFrom(d)
+}
+
 // A V1TransactionSupplement contains elements that are associated with a v1
 // transaction, but not included in the transaction. For example, v1
 // transactions reference the ID of each SiacoinOutput they spend, but do not
@@ -695,24 +692,23 @@ type V1TransactionSupplement struct {
 	SiacoinInputs        []types.SiacoinElement
 	SiafundInputs        []types.SiafundElement
 	RevisedFileContracts []types.FileContractElement
-	ValidFileContracts   []types.FileContractElement
-	StorageProofBlockIDs []types.BlockID // must match ValidFileContracts
+	StorageProofs        []V1StorageProofSupplement
 }
 
 // EncodeTo implements types.EncoderTo.
 func (ts V1TransactionSupplement) EncodeTo(e *types.Encoder) {
 	types.EncodeSlice(e, ts.SiacoinInputs)
 	types.EncodeSlice(e, ts.SiafundInputs)
 	types.EncodeSlice(e, ts.RevisedFileContracts)
-	types.EncodeSlice(e, ts.ValidFileContracts)
+	types.EncodeSlice(e, ts.StorageProofs)
 }
 
 // DecodeFrom implements types.DecoderFrom.
 func (ts *V1TransactionSupplement) DecodeFrom(d *types.Decoder) {
 	types.DecodeSlice(d, &ts.SiacoinInputs)
 	types.DecodeSlice(d, &ts.SiafundInputs)
 	types.DecodeSlice(d, &ts.RevisedFileContracts)
-	types.DecodeSlice(d, &ts.ValidFileContracts)
+	types.DecodeSlice(d, &ts.StorageProofs)
 }
 
 func (ts V1TransactionSupplement) siacoinElement(id types.SiacoinOutputID) (sce types.SiacoinElement, ok bool) {
@@ -733,27 +729,22 @@ func (ts V1TransactionSupplement) siafundElement(id types.SiafundOutputID) (sfe
 	return
 }
 
-func (ts V1TransactionSupplement) fileContractElement(id types.FileContractID) (fce types.FileContractElement, ok bool) {
+func (ts V1TransactionSupplement) revision(id types.FileContractID) (fce types.FileContractElement, ok bool) {
 	for _, fce := range ts.RevisedFileContracts {
 		if types.FileContractID(fce.ID) == id {
 			return fce, true
 		}
 	}
-	for _, fce := range ts.ValidFileContracts {
-		if types.FileContractID(fce.ID) == id {
-			return fce, true
-		}
-	}
 	return
 }
 
-func (ts V1TransactionSupplement) storageProofWindowID(id types.FileContractID) types.BlockID {
-	for i, fce := range ts.ValidFileContracts {
-		if types.FileContractID(fce.ID) == id {
-			return ts.StorageProofBlockIDs[i]
+func (ts V1TransactionSupplement) storageProof(id types.FileContractID) (sps V1StorageProofSupplement, ok bool) {
+	for _, sps := range ts.StorageProofs {
+		if types.FileContractID(sps.FileContract.ID) == id {
+			return sps, true
 		}
 	}
-	panic("missing contract for storage proof window ID") // developer error
+	return
 }
 
 // A V1BlockSupplement contains elements that are associated with a v1 block,

Diff for: .github/workflows/test.yml

@@ -463,13 +463,20 @@ func (ms *MidState) addAttestationElement(ae types.AttestationElement) {
 func (ms *MidState) ApplyTransaction(txn types.Transaction, ts V1TransactionSupplement) {
 	txid := txn.ID()
 	for _, sci := range txn.SiacoinInputs {
-		ms.spendSiacoinElement(ms.mustSiacoinElement(ts, sci.ParentID), txid)
+		sce, ok := ms.siacoinElement(ts, sci.ParentID)
+		if !ok {
+			panic("missing SiacoinElement")
+		}
+		ms.spendSiacoinElement(sce, txid)
 	}
 	for i, sco := range txn.SiacoinOutputs {
 		ms.addSiacoinElement(txn.SiacoinOutputID(i), sco)
 	}
 	for _, sfi := range txn.SiafundInputs {
-		sfe := ms.mustSiafundElement(ts, sfi.ParentID)
+		sfe, ok := ms.siafundElement(ts, sfi.ParentID)
+		if !ok {
+			panic("missing SiafundElement")
+		}
 		claimPortion := ms.siafundPool.Sub(sfe.ClaimStart).Div64(ms.base.SiafundCount()).Mul64(sfe.SiafundOutput.Value)
 		ms.spendSiafundElement(sfe, txid)
 		ms.addImmatureSiacoinElement(sfi.ParentID.ClaimOutputID(), types.SiacoinOutput{Value: claimPortion, Address: sfi.ClaimAddress})
@@ -481,12 +488,19 @@ func (ms *MidState) ApplyTransaction(txn types.Transaction, ts V1TransactionSupp
 		ms.addFileContractElement(txn.FileContractID(i), fc)
 	}
 	for _, fcr := range txn.FileContractRevisions {
-		ms.reviseFileContractElement(ms.mustFileContractElement(ts, fcr.ParentID), fcr.FileContract)
+		fce, ok := ms.fileContractElement(ts, fcr.ParentID)
+		if !ok {
+			panic("missing FileContractElement")
+		}
+		ms.reviseFileContractElement(fce, fcr.FileContract)
 	}
 	for _, sp := range txn.StorageProofs {
-		fce := ms.mustFileContractElement(ts, sp.ParentID)
-		ms.resolveFileContractElement(fce, true, txid)
-		for i, sco := range fce.FileContract.ValidProofOutputs {
+		sps, ok := ts.storageProof(sp.ParentID)
+		if !ok {
+			panic("missing V1StorageProofSupplement")
+		}
+		ms.resolveFileContractElement(sps.FileContract, true, txid)
+		for i, sco := range sps.FileContract.FileContract.ValidProofOutputs {
 			ms.addImmatureSiacoinElement(sp.ParentID.ValidOutputID(i), sco)
 		}
 	}
@@ -541,7 +555,7 @@ func (ms *MidState) ApplyV2Transaction(txn types.V2Transaction) {
 		case *types.V2StorageProof:
 			renter, host = fc.RenterOutput, fc.HostOutput
 		case *types.V2FileContractFinalization:
-			renter, host = r.RenterOutput, r.HostOutput
+			renter, host = fc.RenterOutput, fc.HostOutput
 		case *types.V2FileContractExpiration:
 			renter, host = fc.RenterOutput, fc.MissedHostOutput()
 		}
@@ -573,7 +587,7 @@ func (ms *MidState) ApplyBlock(b types.Block, bs V1BlockSupplement) {
 	for i, sco := range b.MinerPayouts {
 		ms.addImmatureSiacoinElement(bid.MinerOutputID(i), sco)
 	}
-	if subsidy := ms.base.FoundationSubsidy(); !subsidy.Value.IsZero() {
+	if subsidy, ok := ms.base.FoundationSubsidy(); ok {
 		ms.addImmatureSiacoinElement(bid.FoundationOutputID(), subsidy)
 	}
 	for _, fce := range bs.ExpiringFileContracts {

Diff for: consensus/state.go

@@ -826,8 +826,8 @@ func TestApplyRevertBlockV1(t *testing.T) {
 		}
 	}
 	addedSCEs = []types.SiacoinElement{
-		{SiacoinOutput: txnB3.FileContracts[0].ValidProofOutputs[1], MaturityHeight: 148},
-		{SiacoinOutput: txnB3.FileContracts[0].ValidProofOutputs[0], MaturityHeight: 148},
+		{SiacoinOutput: txnB3.FileContracts[0].ValidProofOutputs[1], MaturityHeight: cs.MaturityHeight()},
+		{SiacoinOutput: txnB3.FileContracts[0].ValidProofOutputs[0], MaturityHeight: cs.MaturityHeight()},
 		{SiacoinOutput: b5.MinerPayouts[0], MaturityHeight: cs.MaturityHeight()},
 	}
 	spentSCEs = nil
@@ -836,8 +836,10 @@ func TestApplyRevertBlockV1(t *testing.T) {
 
 	// add block with storage proof
 	bs = db.supplementTipBlock(b5)
-	bs.Transactions[0].ValidFileContracts = append(bs.Transactions[0].ValidFileContracts, db.fces[txnB5.StorageProofs[0].ParentID])
-	bs.Transactions[0].StorageProofBlockIDs = append(bs.Transactions[0].StorageProofBlockIDs, b3.ID())
+	bs.Transactions[0].StorageProofs = append(bs.Transactions[0].StorageProofs, V1StorageProofSupplement{
+		FileContract: db.fces[txnB5.StorageProofs[0].ParentID],
+		WindowID:     b3.ID(),
+	})
 	prev = cs
 	if au, err := addBlock(&b5, bs); err != nil {
 		t.Fatal(err)
@@ -911,8 +913,7 @@ func TestApplyRevertBlockV2(t *testing.T) {
 				r.RenterSignature = renterPrivateKey.SignHash(cs.RenewalSigHash(*r))
 				r.HostSignature = hostPrivateKey.SignHash(cs.RenewalSigHash(*r))
 			case *types.V2FileContractFinalization:
-				r.RenterSignature = renterPrivateKey.SignHash(cs.ContractSigHash(types.V2FileContract(*r)))
-				r.HostSignature = hostPrivateKey.SignHash(cs.ContractSigHash(types.V2FileContract(*r)))
+				*r = types.V2FileContractFinalization(renterPrivateKey.SignHash(cs.ContractSigHash(txn.FileContractResolutions[i].Parent.V2FileContract)))
 			}
 		}
 	}
@@ -1095,6 +1096,7 @@ func TestApplyRevertBlockV2(t *testing.T) {
 	v1FC.Filesize = 65
 	v1FC.FileMerkleRoot = blake2b.SumPair((State{}).StorageProofLeafHash([]byte{1}), (State{}).StorageProofLeafHash([]byte{2}))
 	v2FC := types.V2FileContract{
+		Capacity:         v1FC.Filesize,
 		Filesize:         v1FC.Filesize,
 		FileMerkleRoot:   v1FC.FileMerkleRoot,
 		ProofHeight:      20,
@@ -1252,8 +1254,8 @@ func TestApplyRevertBlockV2(t *testing.T) {
 	}
 
 	addedSCEs = []types.SiacoinElement{
-		{SiacoinOutput: txnB3.FileContracts[0].RenterOutput, MaturityHeight: 148},
-		{SiacoinOutput: txnB3.FileContracts[0].HostOutput, MaturityHeight: 148},
+		{SiacoinOutput: txnB3.FileContracts[0].RenterOutput, MaturityHeight: cs.MaturityHeight()},
+		{SiacoinOutput: txnB3.FileContracts[0].HostOutput, MaturityHeight: cs.MaturityHeight()},
 		{SiacoinOutput: b5.MinerPayouts[0], MaturityHeight: cs.MaturityHeight()},
 	}
 	spentSCEs = nil