From 9556aff0cc3999dfb47b8498ee0d4147841d7e67 Mon Sep 17 00:00:00 2001
From: "Masih H. Derkani" <m@derkani.org>
Date: Tue, 1 Oct 2024 21:34:46 +0100
Subject: [PATCH] Expose access to progress on f3 runner (#673)

The root F3 instance holds reference to the `gpbftRunner`, not
`gpbftHost`. To allow access to current progress from Lotus, move the
`Progress` implementation to runner and expose at root `F3` type.

Part of #599
---
 f3.go   |  7 +++++++
 host.go | 18 +++++++++---------
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/f3.go b/f3.go
index 78a767a3..8a221878 100644
--- a/f3.go
+++ b/f3.go
@@ -414,3 +414,10 @@ func (m *F3) GetPowerTable(ctx context.Context, ts gpbft.TipSetKey) (gpbft.Power
 	}
 	return nil, fmt.Errorf("no known network manifest")
 }
+
+func (m *F3) Progress() (instance, round uint64, phase gpbft.Phase) {
+	if st := m.state.Load(); st != nil && st.runner != nil {
+		instance, round, phase = st.runner.Progress()
+	}
+	return
+}
diff --git a/host.go b/host.go
index 92c8b71d..539016c8 100644
--- a/host.go
+++ b/host.go
@@ -452,7 +452,7 @@ func (h *gpbftRunner) startPubsub() (<-chan gpbft.ValidatedMessage, error) {
 
 var (
 	_ gpbft.Host     = (*gpbftHost)(nil)
-	_ gpbft.Progress = (*gpbftHost)(nil).Progress
+	_ gpbft.Progress = (*gpbftRunner)(nil).Progress
 )
 
 // gpbftHost is a newtype of gpbftRunner exposing APIs required by the gpbft.Participant
@@ -491,6 +491,14 @@ func (h *gpbftRunner) Stop(context.Context) error {
 	)
 }
 
+// Progress returns the latest progress of GPBFT consensus in terms of instance
+// ID, round and phase.
+//
+// This API is safe for concurrent use.
+func (h *gpbftRunner) Progress() (instance, round uint64, phase gpbft.Phase) {
+	return h.participant.Progress()
+}
+
 // Returns inputs to the next GPBFT instance.
 // These are:
 // - the supplemental data.
@@ -775,11 +783,3 @@ func (h *gpbftHost) Verify(pubKey gpbft.PubKey, msg []byte, sig []byte) error {
 func (h *gpbftHost) Aggregate(pubKeys []gpbft.PubKey) (gpbft.Aggregate, error) {
 	return h.verifier.Aggregate(pubKeys)
 }
-
-// Progress returns the latest progress of GPBFT concensus in terms of instance
-// ID, round and phase.
-//
-// This API is safe for concurrent use.
-func (h *gpbftHost) Progress() (instance, round uint64, phase gpbft.Phase) {
-	return h.participant.Progress()
-}