Add in the actual heartbeat crypto, simple test of the service

Author: jannotti

config/consensus.go

@@ -540,6 +540,9 @@ type ConsensusParams struct {
 	// occur, extra funds need to be put into the FeeSink.  The bonus amount
 	// decays exponentially.
 	Bonus BonusPlan
+
+	// Heartbeat support
+	Heartbeat bool
 }
 
 // ProposerPayoutRules puts several related consensus parameters in one place. The same
@@ -1513,7 +1516,7 @@ func initConsensusProtocols() {
 	vFuture.LogicSigVersion = 11 // When moving this to a release, put a new higher LogicSigVersion here
 
 	vFuture.Payouts.Enabled = true
-	vFuture.Payouts.Percent = 75
+	vFuture.Payouts.Percent = 50
 	vFuture.Payouts.GoOnlineFee = 2_000_000         // 2 algos
 	vFuture.Payouts.MinBalance = 30_000_000_000     // 30,000 algos
 	vFuture.Payouts.MaxBalance = 70_000_000_000_000 // 70M algos
@@ -1524,7 +1527,9 @@ func initConsensusProtocols() {
 
 	vFuture.Bonus.BaseAmount = 10_000_000 // 10 Algos
 	// 2.9 sec rounds gives about 10.8M rounds per year.
-	vFuture.Bonus.DecayInterval = 250_000 // .99^(10.8/0.25) ~ .648. So 35% decay per year
+	vFuture.Bonus.DecayInterval = 1_000_000 // .99^(10.8M/1M) ~ .897. So ~10% decay per year
+
+	vFuture.Heartbeat = true
 
 	Consensus[protocol.ConsensusFuture] = vFuture
 

data/bookkeeping/block_test.go

@@ -1013,11 +1013,11 @@ func TestFirstYearsBonus(t *testing.T) {
 	fmt.Printf("paid %d algos\n", suma)
 	fmt.Printf("bonus start: %d end: %d\n", plan.BaseAmount, bonus)
 
-	// pays about 88M algos
-	a.InDelta(88_500_000, suma, 100_000)
+	// pays about 103.5M algos
+	a.InDelta(103_500_000, suma, 100_000)
 
-	// decline about 35%
-	a.InDelta(0.65, float64(bonus)/float64(plan.BaseAmount), 0.01)
+	// decline about 10%
+	a.InDelta(0.90, float64(bonus)/float64(plan.BaseAmount), 0.01)
 
 	// year 2
 	for i := 0; i < yearRounds; i++ {
@@ -1033,11 +1033,11 @@ func TestFirstYearsBonus(t *testing.T) {
 	fmt.Printf("paid %d algos after 2 years\n", sum2)
 	fmt.Printf("bonus end: %d\n", bonus)
 
-	// pays about 146M algos (total for 2 years)
-	a.InDelta(145_700_000, sum2, 100_000)
+	// pays about 196M algos (total for 2 years)
+	a.InDelta(196_300_000, sum2, 100_000)
 
-	// decline about 58%
-	a.InDelta(0.42, float64(bonus)/float64(plan.BaseAmount), 0.01)
+	// decline to about 81%
+	a.InDelta(0.81, float64(bonus)/float64(plan.BaseAmount), 0.01)
 
 	// year 3
 	for i := 0; i < yearRounds; i++ {
@@ -1053,9 +1053,9 @@ func TestFirstYearsBonus(t *testing.T) {
 	fmt.Printf("paid %d algos after 3 years\n", sum3)
 	fmt.Printf("bonus end: %d\n", bonus)
 
-	// pays about 182M algos (total for 3 years)
-	a.InDelta(182_600_000, sum3, 100_000)
+	// pays about 279M algos (total for 3 years)
+	a.InDelta(279_500_000, sum3, 100_000)
 
-	// declined to about 27% (but foundation funding probably gone anyway)
-	a.InDelta(0.27, float64(bonus)/float64(plan.BaseAmount), 0.01)
+	// declined to about 72% (but foundation funding probably gone anyway)
+	a.InDelta(0.72, float64(bonus)/float64(plan.BaseAmount), 0.01)
 }

data/committee/common_test.go

@@ -32,7 +32,7 @@ type selectionParameterListFn func(addr []basics.Address) (bool, []BalanceRecord
 
 var proto = config.Consensus[protocol.ConsensusCurrentVersion]
 
-func newAccount(t testing.TB, gen io.Reader, latest basics.Round, keyBatchesForward uint) (basics.Address, *crypto.SignatureSecrets, *crypto.VrfPrivkey) {
+func newAccount(t testing.TB, gen io.Reader) (basics.Address, *crypto.SignatureSecrets, *crypto.VrfPrivkey) {
 	var seed crypto.Seed
 	gen.Read(seed[:])
 	s := crypto.GenerateSignatureSecrets(seed)
@@ -49,10 +49,10 @@ func newAccount(t testing.TB, gen io.Reader, latest basics.Round, keyBatchesForw
 // formerly, testingenv, generated transactions and one-time secrets as well,
 // but they were not used by the tests.
 func testingenv(t testing.TB, numAccounts, numTxs int, seedGen io.Reader) (selectionParameterFn, selectionParameterListFn, basics.Round, []basics.Address, []*crypto.SignatureSecrets, []*crypto.VrfPrivkey) {
-	return testingenvMoreKeys(t, numAccounts, numTxs, uint(5), seedGen)
+	return testingenvMoreKeys(t, numAccounts, numTxs, seedGen)
 }
 
-func testingenvMoreKeys(t testing.TB, numAccounts, numTxs int, keyBatchesForward uint, seedGen io.Reader) (selectionParameterFn, selectionParameterListFn, basics.Round, []basics.Address, []*crypto.SignatureSecrets, []*crypto.VrfPrivkey) {
+func testingenvMoreKeys(t testing.TB, numAccounts, numTxs int, seedGen io.Reader) (selectionParameterFn, selectionParameterListFn, basics.Round, []basics.Address, []*crypto.SignatureSecrets, []*crypto.VrfPrivkey) {
 	if seedGen == nil {
 		seedGen = rand.New(rand.NewSource(1)) // same source as setting GODEBUG=randautoseed=0, same as pre-Go 1.20 default seed
 	}
@@ -70,7 +70,7 @@ func testingenvMoreKeys(t testing.TB, numAccounts, numTxs int, keyBatchesForward
 	lookback := basics.Round(2*proto.SeedRefreshInterval + proto.SeedLookback + 1)
 	var total basics.MicroAlgos
 	for i := 0; i < P; i++ {
-		addr, sigSec, vrfSec := newAccount(t, gen, lookback, keyBatchesForward)
+		addr, sigSec, vrfSec := newAccount(t, gen)
 		addrs[i] = addr
 		secrets[i] = sigSec
 		vrfSecrets[i] = vrfSec

data/committee/credential_test.go

@@ -251,9 +251,8 @@ func TestNoMoneyAccountNotSelected(t *testing.T) {
 	N := 1
 	for i := 0; i < N; i++ {
 		selParams, _, round, addresses, _, _ := testingenv(t, 10, 2000, seedGen)
-		lookback := basics.Round(2*proto.SeedRefreshInterval + proto.SeedLookback + 1)
 		gen := rand.New(rand.NewSource(2))
-		_, _, zeroVRFSecret := newAccount(t, gen, lookback, 5)
+		_, _, zeroVRFSecret := newAccount(t, gen)
 		period := Period(0)
 		ok, record, selectionSeed, _ := selParams(addresses[i])
 		if !ok {

data/transactions/heartbeat.go

@@ -29,14 +29,14 @@ type HeartbeatTxnFields struct {
 	_struct struct{} `codec:",omitempty,omitemptyarray"`
 
 	// HeartbeatAddress is the account this txn is proving onlineness for.
-	HeartbeatAddress basics.Address `codec:"hbad"`
+	HbAddress basics.Address `codec:"hbad"`
 
-	// Proof is a signature using HeartbeatAddress's partkey, thereby showing it is online.
-	Proof crypto.OneTimeSignature `codec:"hbprf"`
+	// HbProof is a signature using HeartbeatAddress's partkey, thereby showing it is online.
+	HbProof crypto.OneTimeSignature `codec:"hbprf"`
 
-	// Seed must be the block seed for the block before this transaction's
+	// HbSeed must be the block seed for the block before this transaction's
 	// firstValid. It is supplied in the transaction so that Proof can be
 	// checked at submit time without a ledger lookup, and must be checked at
 	// evaluation time for equality with the actual blockseed.
-	Seed committee.Seed `codec:"hbsd"`
+	HbSeed committee.Seed `codec:"hbsd"`
 }