Move initial instance to manifest (#363)

* Move initial instance to manifest

Resolves #360

Signed-off-by: Jakub Sztandera <[email protected]>

* Switch urfave/cli to one used by lotus

Signed-off-by: Jakub Sztandera <[email protected]>

---------

Signed-off-by: Jakub Sztandera <[email protected]>

Author: Kubuxu

cmd/f3/run.go

@@ -89,8 +89,7 @@ var runCmd = cli.Command{
 
 		go runMessageSubscription(ctx, module, actorID, signingBackend)
 
-		initialInstance := c.Uint64("instance")
-		return module.Run(initialInstance, ctx)
+		return module.Run(ctx)
 	},
 }
 

f3.go

@@ -191,7 +191,7 @@ func (m *F3) teardownPubsub() error {
 	)
 }
 
-func (m *F3) boostrap(ctx context.Context, initialInstance uint64) error {
+func (m *F3) boostrap(ctx context.Context) error {
 	head, err := m.ec.GetHead(ctx)
 	if err != nil {
 		return xerrors.Errorf("failed to get the head: %w", err)
@@ -233,7 +233,7 @@ func (m *F3) boostrap(ctx context.Context, initialInstance uint64) error {
 		return xerrors.Errorf("getting initial power table: %w", err)
 	}
 
-	cs, err := certstore.CreateStore(ctx, m.ds, initialInstance, initialPowerTable)
+	cs, err := certstore.CreateStore(ctx, m.ds, m.Manifest.InitialInstance, initialPowerTable)
 	if err != nil {
 		return xerrors.Errorf("creating certstore: %w", err)
 	}
@@ -242,15 +242,15 @@ func (m *F3) boostrap(ctx context.Context, initialInstance uint64) error {
 }
 
 // Run start the module. It will exit when context is cancelled.
-func (m *F3) Run(initialInstance uint64, ctx context.Context) error {
+func (m *F3) Run(ctx context.Context) error {
 	ctx, cancel := context.WithCancel(ctx)
 	defer cancel()
 
 	cs, err := certstore.OpenStore(ctx, m.ds)
 	if err == nil {
 		m.setCertStore(cs)
 	} else if errors.Is(err, certstore.ErrNotInitialized) {
-		err := m.boostrap(ctx, initialInstance)
+		err := m.boostrap(ctx)
 		if err != nil {
 			return xerrors.Errorf("failed to boostrap: %w", err)
 		}
@@ -278,7 +278,12 @@ func (m *F3) Run(initialInstance uint64, ctx context.Context) error {
 	runnerErrCh := make(chan error, 1)
 
 	go func() {
-		err := runner.Run(initialInstance, ctx)
+		latest := m.certStore.Latest()
+		startInstance := uint64(m.Manifest.InitialInstance)
+		if latest != nil {
+			startInstance = latest.GPBFTInstance + 1
+		}
+		err := runner.Run(startInstance, ctx)
 		m.log.Errorf("running host: %+v", err)
 		runnerErrCh <- err
 	}()

go.mod

@@ -14,7 +14,7 @@ require (
 	github.com/libp2p/go-libp2p v0.35.0
 	github.com/libp2p/go-libp2p-pubsub v0.11.0
 	github.com/stretchr/testify v1.9.0
-	github.com/urfave/cli/v2 v2.27.2
+	github.com/urfave/cli/v2 v2.25.5
 	github.com/whyrusleeping/cbor-gen v0.1.1
 	go.uber.org/multierr v1.11.0
 	golang.org/x/crypto v0.23.0

go.sum

@@ -396,8 +396,8 @@ github.com/syndtr/goleveldb v1.0.0 h1:fBdIW9lB4Iz0n9khmH8w27SJ3QEJ7+IgjPEwGSZiFd
 github.com/syndtr/goleveldb v1.0.0/go.mod h1:ZVVdQEZoIme9iO1Ch2Jdy24qqXrMMOU6lpPAyBWyWuQ=
 github.com/tarm/serial v0.0.0-20180830185346-98f6abe2eb07/go.mod h1:kDXzergiv9cbyO7IOYJZWg1U88JhDg3PB6klq9Hg2pA=
 github.com/urfave/cli v1.22.2/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=
-github.com/urfave/cli/v2 v2.27.2 h1:6e0H+AkS+zDckwPCUrZkKX38mRaau4nL2uipkJpbkcI=
-github.com/urfave/cli/v2 v2.27.2/go.mod h1:g0+79LmHHATl7DAcHO99smiR/T7uGLw84w8Y42x+4eM=
+github.com/urfave/cli/v2 v2.25.5 h1:d0NIAyhh5shGscroL7ek/Ya9QYQE0KNabJgiUinIQkc=
+github.com/urfave/cli/v2 v2.25.5/go.mod h1:GHupkWPMM0M/sj1a2b4wUrWBPzazNrIjouW6fmdJLxc=
 github.com/viant/assertly v0.4.8/go.mod h1:aGifi++jvCrUaklKEKT0BU95igDNaqkvz+49uaYMPRU=
 github.com/viant/toolbox v0.24.0/go.mod h1:OxMCG57V0PXuIP2HNQrtJf2CjqdmbrOx5EkMILuUhzM=
 github.com/whyrusleeping/cbor-gen v0.0.0-20200414195334-429a0b5e922e/go.mod h1:Xj/M2wWU+QdTdRbu/L/1dIZY8/Wb2K9pAhtroQuxJJI=

host.go

@@ -102,7 +102,15 @@ func (h *gpbftHost) collectChain(base TipSet, head TipSet) ([]TipSet, error) {
 	// TODO: optimize when head is way beyond base
 	res := make([]TipSet, 0, 2*gpbft.CHAIN_MAX_LEN)
 	res = append(res, head)
+
 	for !bytes.Equal(head.Key(), base.Key()) {
+		if head.Epoch() < base.Epoch() {
+			// we reorged away from base
+			// scream and panic??
+			// TODO make sure this is correct, re-boostrap/manifest swap code has to be able to
+			// catch it
+			panic("reorg-ed away from base, dunno what to do, reboostrap is the answer")
+		}
 		var err error
 		head, err = h.client.ec.GetParent(h.runningCtx, head)
 		if err != nil {
@@ -123,7 +131,7 @@ func (h *gpbftHost) collectChain(base TipSet, head TipSet) ([]TipSet, error) {
 // ReceiveDecision (or known to be final via some other channel).
 func (h *gpbftHost) GetProposalForInstance(instance uint64) (*gpbft.SupplementalData, gpbft.ECChain, error) {
 	var baseTsk gpbft.TipSetKey
-	if instance == 0 {
+	if instance == h.manifest.InitialInstance {
 		ts, err := h.client.ec.GetTipsetByEpoch(h.runningCtx,
 			h.manifest.BootstrapEpoch-h.manifest.ECFinality)
 		if err != nil {
@@ -203,7 +211,7 @@ func (h *gpbftHost) GetCommitteeForInstance(instance uint64) (*gpbft.PowerTable,
 	var powerEntries gpbft.PowerEntries
 	var err error
 
-	if instance < h.manifest.CommiteeLookback {
+	if instance < h.manifest.InitialInstance+h.manifest.CommiteeLookback {
 		//boostrap phase
 		ts, err := h.client.ec.GetTipsetByEpoch(h.runningCtx, h.manifest.BootstrapEpoch-h.manifest.ECFinality)
 		if err != nil {
@@ -223,8 +231,7 @@ func (h *gpbftHost) GetCommitteeForInstance(instance uint64) (*gpbft.PowerTable,
 
 		powerEntries, err = h.client.certStore.GetPowerTable(h.runningCtx, instance)
 		if err != nil {
-			// this fires every round, is this correct?
-			h.log.Infof("failed getting power table from certstore: %v, falling back to EC", err)
+			h.log.Debugf("failed getting power table from certstore: %v, falling back to EC", err)
 
 			powerEntries, err = h.client.ec.GetPowerTable(h.runningCtx, powerTsk)
 			if err != nil {
@@ -318,7 +325,7 @@ func (h *gpbftHost) saveDecision(decision *gpbft.Justification) error {
 	if err != nil {
 		return xerrors.Errorf("forming certificate out of decision: %w", err)
 	}
-	_, _, _, err = certs.ValidateFinalityCertificates(h, h.NetworkName(), current.Entries, decision.Vote.Instance, cert.ECChain.Base())
+	_, _, _, err = certs.ValidateFinalityCertificates(h, h.NetworkName(), current.Entries, decision.Vote.Instance, nil, *cert)
 	if err != nil {
 		return xerrors.Errorf("certificate is invalid: %w", err)
 	}
@@ -327,6 +334,7 @@ func (h *gpbftHost) saveDecision(decision *gpbft.Justification) error {
 	if err != nil {
 		return xerrors.Errorf("saving ceritifcate in a store: %w", err)
 	}
+
 	return nil
 }
 

manifest.go

@@ -10,6 +10,7 @@ import (
 
 type Manifest struct {
 	NetworkName       gpbft.NetworkName
+	InitialInstance   uint64
 	InitialPowerTable gpbft.PowerEntries
 	BootstrapEpoch    int64