Functionality for building custom mainnet tags

app/test_helpers.go

@@ -458,7 +458,7 @@ func (ao EmptyAppOptions) Get(o string) interface{} {
 	}
 
 	if o == "btc-config.checkpoint-tag" {
-		return txformat.MainTagStr
+		return txformat.DefaultMainTagStr
 	}
 
 	return nil

btctxformatter/bbnformatter.go

@@ -5,15 +5,17 @@ package btctxformatter
 // in some separate document/config
 
 const (
-	MainTagStr string = "bbnm"
-
+	mainTagPrefix string = "bbn"
 	testTagPrefix string = "bbt"
 
-	DefautTestTagStr string = testTagPrefix + "0"
+	DefaultTestTagStr string = testTagPrefix + "0"
+	DefaultMainTagStr string = testTagPrefix + "m"
 )
 
-func MainTag() BabylonTag {
-	return BabylonTag([]byte(MainTagStr))
+func MainTag(idx uint8) BabylonTag {
+	bytes := []byte(mainTagPrefix)
+	bytes = append(bytes, idx)
+	return BabylonTag(bytes)
 }
 
 func TestTag(idx uint8) BabylonTag {

btctxformatter/formatter_test.go

@@ -2,7 +2,7 @@ package btctxformatter
 
 import (
 	"bytes"
-	"crypto/rand"
+	"math/rand"
 	"testing"
 )
 
@@ -93,11 +93,11 @@ func FuzzEncodingDecoding(f *testing.F) {
 
 // This fuzzer checks if decoder won't panic with whatever bytes we point it at
 func FuzzDecodingWontPanic(f *testing.F) {
-	f.Add(randNBytes(firstPartLength))
-	f.Add(randNBytes(secondPartLength))
+	f.Add(randNBytes(firstPartLength), uint8(rand.Intn(99)))
+	f.Add(randNBytes(secondPartLength), uint8(rand.Intn(99)))
 
-	f.Fuzz(func(t *testing.T, bytes []byte) {
-		decoded, err := IsBabylonCheckpointData(MainTag(), CurrentVersion, bytes)
+	f.Fuzz(func(t *testing.T, bytes []byte, tagIdx uint8) {
+		decoded, err := IsBabylonCheckpointData(MainTag(tagIdx), CurrentVersion, bytes)
 
 		if err == nil {
 			if decoded.Index != 0 && decoded.Index != 1 {

cmd/babylond/cmd/custom_babylon_config.go

@@ -15,7 +15,7 @@ type BtcConfig struct {
 func defaultBabylonBtcConfig() BtcConfig {
 	return BtcConfig{
 		Network:       string(bbn.BtcMainnet),
-		CheckpointTag: string(txformat.MainTagStr),
+		CheckpointTag: string(txformat.DefaultMainTagStr),
 	}
 }
 

cmd/babylond/cmd/testnet.go

@@ -132,7 +132,7 @@ Example:
 	cmd.Flags().String(flags.FlagKeyAlgorithm, string(hd.Secp256k1Type), "Key signing algorithm to generate keys for")
 	// btccheckpoint args
 	cmd.Flags().String(flagBtcNetwork, string(bbn.BtcSimnet), "Bitcoin network to use. Available networks: simnet, testnet, mainnet")
-	cmd.Flags().String(flagBtcCheckpointTag, string(txformat.DefautTestTagStr), "Tag to use for Bitcoin checkpoints.")
+	cmd.Flags().String(flagBtcCheckpointTag, string(txformat.DefaultTestTagStr), "Tag to use for Bitcoin checkpoints.")
 	cmd.Flags().Uint64(flagBtcConfirmationDepth, 6, "Confirmation depth for Bitcoin headers.")
 	cmd.Flags().Uint64(flagBtcFinalizationTimeout, 20, "Finalization timeout for Bitcoin headers.")
 	// epoch args

test/integration_test.go

@@ -295,7 +295,7 @@ func TestSubmitCheckpoint(t *testing.T) {
 	}
 
 	p1, p2 := txformat.MustEncodeCheckpointData(
-		txformat.BabylonTag(txformat.DefautTestTagStr),
+		txformat.BabylonTag(txformat.DefaultTestTagStr),
 		txformat.CurrentVersion,
 		rawBtcCheckpoint,
 	)

testutil/keeper/btccheckpoint.go

@@ -53,7 +53,7 @@ func NewBTCCheckpointKeeper(
 		ek,
 		powLimit,
 		// use MainTag tests
-		txformat.MainTag(),
+		txformat.MainTag(0),
 	)
 
 	ctx := sdk.NewContext(stateStore, tmproto.Header{}, false, log.NewNopLogger())

x/btccheckpoint/keeper/msg_server_test.go

@@ -65,9 +65,9 @@ func getRandomCheckpointDataForEpoch(e uint64) testCheckpointData {
 }
 
 // both f and s must be parts retrived from txformat.Encode
-func getExpectedOpReturn(f []byte, s []byte) []byte {
+func getExpectedOpReturn(tag txformat.BabylonTag, f []byte, s []byte) []byte {
 	firstPartNoHeader, err := txformat.GetCheckpointData(
-		txformat.MainTag(),
+		tag,
 		txformat.CurrentVersion,
 		0,
 		f,
@@ -78,7 +78,7 @@ func getExpectedOpReturn(f []byte, s []byte) []byte {
 	}
 
 	secondPartNoHeader, err := txformat.GetCheckpointData(
-		txformat.MainTag(),
+		tag,
 		txformat.CurrentVersion,
 		1,
 		s,
@@ -103,6 +103,7 @@ func TestSubmitValidNewCheckpoint(t *testing.T) {
 	defaultParams := btcctypes.DefaultParams()
 	kDeep := defaultParams.BtcConfirmationDepth
 	checkpointData := getRandomCheckpointDataForEpoch(epoch)
+	tag := txformat.MainTag(0)
 
 	rawBTCCkpt := &txformat.RawBtcCheckpoint{
 		Epoch:            checkpointData.epoch,
@@ -112,15 +113,15 @@ func TestSubmitValidNewCheckpoint(t *testing.T) {
 		BlsSig:           checkpointData.blsSig,
 	}
 	data1, data2 := txformat.MustEncodeCheckpointData(
-		txformat.MainTag(),
+		tag,
 		txformat.CurrentVersion,
 		rawBTCCkpt,
 	)
 
 	blck1 := dg.CreateBlock(1, 7, 7, data1)
 	blck2 := dg.CreateBlock(2, 14, 3, data2)
 
-	expectedOpReturn := getExpectedOpReturn(data1, data2)
+	expectedOpReturn := getExpectedOpReturn(tag, data1, data2)
 
 	// here we will only have valid unconfirmed submissions
 	lc := btcctypes.NewMockBTCLightClientKeeper(int64(kDeep) - 1)
@@ -193,6 +194,7 @@ func TestStateTransitionOfValidSubmission(t *testing.T) {
 	kDeep := defaultParams.BtcConfirmationDepth
 	wDeep := defaultParams.CheckpointFinalizationTimeout
 	checkpointData := getRandomCheckpointDataForEpoch(epoch)
+	tag := txformat.MainTag(0)
 
 	rawBTCCkpt := &txformat.RawBtcCheckpoint{
 		Epoch:            checkpointData.epoch,
@@ -202,7 +204,7 @@ func TestStateTransitionOfValidSubmission(t *testing.T) {
 		BlsSig:           checkpointData.blsSig,
 	}
 	data1, data2 := txformat.MustEncodeCheckpointData(
-		txformat.MainTag(),
+		tag,
 		txformat.CurrentVersion,
 		rawBTCCkpt,
 	)