types: Use distinguishers for v2 IDs

SiaFoundation · Oct 13, 2023 · 9cbf7aa · 9cbf7aa
1 parent 6ca0ac7
commit 9cbf7aa
Showing 1 changed file with 7 additions and 9 deletions.
diff --git a/types/types.go b/types/types.go
@@ -42,10 +42,8 @@ var (
 	SpecifierEd25519       = NewSpecifier("ed25519")
 	SpecifierSiacoinOutput = NewSpecifier("siacoin output")
 	SpecifierSiafundOutput = NewSpecifier("siafund output")
-	SpecifierClaimOutput   = NewSpecifier("claim output")
 	SpecifierFileContract  = NewSpecifier("file contract")
 	SpecifierStorageProof  = NewSpecifier("storage proof")
-	SpecifierAttestation   = NewSpecifier("attestation")
 	SpecifierFoundation    = NewSpecifier("foundation")
 	SpecifierEntropy       = NewSpecifier("entropy")
 )
@@ -325,7 +323,7 @@ func (fcid FileContractID) V2RenterOutputID() SiacoinOutputID {
 	h := hasherPool.Get().(*Hasher)
 	defer hasherPool.Put(h)
 	h.Reset()
-	SpecifierSiacoinOutput.EncodeTo(h.E)
+	h.WriteDistinguisher("id/v2filecontractoutput")
 	fcid.EncodeTo(h.E)
 	h.E.WriteUint64(0)
 	return SiacoinOutputID(h.Sum())
@@ -336,7 +334,7 @@ func (fcid FileContractID) V2HostOutputID() SiacoinOutputID {
 	h := hasherPool.Get().(*Hasher)
 	defer hasherPool.Put(h)
 	h.Reset()
-	SpecifierSiacoinOutput.EncodeTo(h.E)
+	h.WriteDistinguisher("id/v2filecontractoutput")
 	fcid.EncodeTo(h.E)
 	h.E.WriteUint64(1)
 	return SiacoinOutputID(h.Sum())
@@ -347,7 +345,7 @@ func (fcid FileContractID) V2RenewalID() FileContractID {
 	h := hasherPool.Get().(*Hasher)
 	defer hasherPool.Put(h)
 	h.Reset()
-	SpecifierFileContract.EncodeTo(h.E)
+	h.WriteDistinguisher("id/v2filecontractrenewal")
 	fcid.EncodeTo(h.E)
 	return FileContractID(h.Sum())
 }
@@ -780,7 +778,7 @@ func (*V2Transaction) SiacoinOutputID(txid TransactionID, i int) SiacoinOutputID
 	h := hasherPool.Get().(*Hasher)
 	defer hasherPool.Put(h)
 	h.Reset()
-	SpecifierSiacoinOutput.EncodeTo(h.E)
+	h.WriteDistinguisher("id/siacoinoutput")
 	txid.EncodeTo(h.E)
 	h.E.WriteUint64(uint64(i))
 	return SiacoinOutputID(h.Sum())
@@ -791,7 +789,7 @@ func (*V2Transaction) SiafundOutputID(txid TransactionID, i int) SiafundOutputID
 	h := hasherPool.Get().(*Hasher)
 	defer hasherPool.Put(h)
 	h.Reset()
-	SpecifierSiafundOutput.EncodeTo(h.E)
+	h.WriteDistinguisher("id/siafundoutput")
 	txid.EncodeTo(h.E)
 	h.E.WriteUint64(uint64(i))
 	return SiafundOutputID(h.Sum())
@@ -802,7 +800,7 @@ func (*V2Transaction) V2FileContractID(txid TransactionID, i int) FileContractID
 	h := hasherPool.Get().(*Hasher)
 	defer hasherPool.Put(h)
 	h.Reset()
-	SpecifierFileContract.EncodeTo(h.E)
+	h.WriteDistinguisher("id/filecontract")
 	txid.EncodeTo(h.E)
 	h.E.WriteUint64(uint64(i))
 	return FileContractID(h.Sum())
@@ -813,7 +811,7 @@ func (*V2Transaction) AttestationID(txid TransactionID, i int) Hash256 {
 	h := hasherPool.Get().(*Hasher)
 	defer hasherPool.Put(h)
 	h.Reset()
-	SpecifierAttestation.EncodeTo(h.E)
+	h.WriteDistinguisher("id/attestation")
 	txid.EncodeTo(h.E)
 	h.E.WriteUint64(uint64(i))
 	return h.Sum()