Use IsF3Enabled() and remove the runtime stopping

Signed-off-by: Jakub Sztandera <[email protected]>
filecoin-project · Jul 4, 2024 · f87582d · f87582d
1 parent 43c9afa
commit f87582d
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 35 deletions.
diff --git a/build/params_2k.go b/build/params_2k.go
@@ -191,5 +191,5 @@ const Eip155ChainId = 31415926
 
 var WhitelistedBlock = cid.Undef
 
-const F3Enabled = true
+const f3Enabled = true
 const F3BootstrapEpoch abi.ChainEpoch = 100
diff --git a/build/params_butterfly.go b/build/params_butterfly.go
@@ -107,5 +107,5 @@ const Eip155ChainId = 3141592
 
 var WhitelistedBlock = cid.Undef
 
-const F3Enabled = true
+const f3Enabled = true
 const F3BootstrapEpoch abi.ChainEpoch = 200
diff --git a/build/params_calibnet.go b/build/params_calibnet.go
@@ -152,5 +152,5 @@ const Eip155ChainId = 314159
 
 var WhitelistedBlock = cid.Undef
 
-const F3Enabled = false
+const f3Enabled = false
 const F3BootstrapEpoch abi.ChainEpoch = -1
diff --git a/build/params_interop.go b/build/params_interop.go
@@ -146,5 +146,5 @@ const Eip155ChainId = 3141592
 
 var WhitelistedBlock = cid.Undef
 
-const F3Enabled = true
+const f3Enabled = true
 const F3BootstrapEpoch abi.ChainEpoch = 1000
diff --git a/build/params_mainnet.go b/build/params_mainnet.go
@@ -169,5 +169,5 @@ const Eip155ChainId = 314
 // WhitelistedBlock skips checks on message validity in this block to sidestep the zero-bls signature
 var WhitelistedBlock = MustParseCid("bafy2bzaceapyg2uyzk7vueh3xccxkuwbz3nxewjyguoxvhx77malc2lzn2ybi")
 
-const F3Enabled = false
+const f3Enabled = false
 const F3BootstrapEpoch abi.ChainEpoch = -1
diff --git a/build/params_shared_funcs.go b/build/params_shared_funcs.go
@@ -1,6 +1,8 @@
 package build
 
 import (
+	"os"
+
 	"github.com/ipfs/go-cid"
 	"github.com/libp2p/go-libp2p/core/protocol"
 
@@ -49,3 +51,8 @@ func MustParseCid(c string) cid.Cid {
 
 	return ret
 }
+
+func IsF3Enabled() bool {
+	const F3DisableEnvKey = "LOTUS_DISABLE_F3"
+	return f3Enabled && len(os.Getenv(F3DisableEnvKey)) == 0
+}
diff --git a/chain/lf3/f3.go b/chain/lf3/f3.go
@@ -3,7 +3,6 @@ package lf3
 import (
 	"context"
 	"errors"
-	"os"
 	"time"
 
 	"github.com/ipfs/go-datastore"
@@ -47,12 +46,6 @@ type F3Params struct {
 
 var log = logging.Logger("f3")
 
-const (
-	F3DisableEnvKey      = "DISABLE_F3"
-	F3DisableEnvValue    = "1"
-	F3DisableCheckPeriod = 2 * time.Duration(build.BlockDelaySecs)
-)
-
 func New(mctx helpers.MetricsCtx, lc fx.Lifecycle, params F3Params) (*F3, error) {
 	manifest := f3.LocalnetManifest()
 	manifest.NetworkName = gpbft.NetworkName(params.NetworkName)
@@ -90,23 +83,6 @@ func New(mctx helpers.MetricsCtx, lc fx.Lifecycle, params F3Params) (*F3, error)
 					log.Errorf("running f3: %+v", err)
 				}
 			}()
-			go func() {
-				ticker := time.NewTicker(F3DisableCheckPeriod)
-				for {
-					select {
-					case <-ticker.C:
-						if os.Getenv(F3DisableEnvKey) == F3DisableEnvValue {
-							// TODO: Once https://github.com/filecoin-project/lotus/pull/12173 is merged
-							// we can use fff.inner.Stop() instead of calling cancel()
-							cancel()
-							log.Errorf("F3 has been disabled in runtime")
-							return
-						}
-					case <-lCtx.Done():
-						return
-					}
-				}
-			}()
 		}, cancel))
 
 	return fff, nil

diff --git a/node/builder_miner.go b/node/builder_miner.go
@@ -2,7 +2,6 @@ package node
 
 import (
 	"errors"
-	"os"
 
 	"go.uber.org/fx"
 	"golang.org/x/xerrors"
@@ -14,7 +13,6 @@ import (
 	"github.com/filecoin-project/lotus/build"
 	"github.com/filecoin-project/lotus/chain/gen"
 	"github.com/filecoin-project/lotus/chain/gen/slashfilter"
-	"github.com/filecoin-project/lotus/chain/lf3"
 	"github.com/filecoin-project/lotus/lib/harmony/harmonydb"
 	"github.com/filecoin-project/lotus/miner"
 	"github.com/filecoin-project/lotus/node/config"
@@ -143,7 +141,7 @@ func ConfigStorageMiner(c interface{}) Option {
 		Override(new(config.HarmonyDB), cfg.HarmonyDB),
 		Override(new(harmonydb.ITestID), harmonydb.ITestID("")),
 		Override(new(*ctladdr.AddressSelector), modules.AddressSelector(&cfg.Addresses)),
-		If(build.F3Enabled && os.Getenv(lf3.F3DisableEnvKey) != lf3.F3DisableEnvValue, Override(F3Participation, modules.F3Participation)),
+		If(build.IsF3Enabled(), Override(F3Participation, modules.F3Participation)),
 	)
 }
 

diff --git a/node/modules/lp2p/pubsub.go b/node/modules/lp2p/pubsub.go
@@ -4,7 +4,6 @@ import (
 	"context"
 	"encoding/json"
 	"net"
-	"os"
 	"time"
 
 	pubsub "github.com/libp2p/go-libp2p-pubsub"
@@ -20,7 +19,6 @@ import (
 	"github.com/filecoin-project/go-f3/gpbft"
 
 	"github.com/filecoin-project/lotus/build"
-	"github.com/filecoin-project/lotus/chain/lf3"
 	"github.com/filecoin-project/lotus/metrics"
 	"github.com/filecoin-project/lotus/node/config"
 	"github.com/filecoin-project/lotus/node/modules/dtypes"
@@ -383,7 +381,7 @@ func GossipSub(in GossipIn) (service *pubsub.PubSub, err error) {
 		build.IndexerIngestTopic(in.Nn),
 	}
 
-	if build.F3Enabled && os.Getenv(lf3.F3DisableEnvKey) != lf3.F3DisableEnvValue {
+	if build.IsF3Enabled() {
 		allowTopics = append(allowTopics, gpbft.NetworkName(in.Nn).PubSubTopic())
 	}