fixes a bug for which events weren't being stored (#195)

consensus-shipyard · Jun 28, 2023 · f6d2599 · f6d2599
1 parent ef514a1
commit f6d2599
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 16 deletions.
diff --git a/cmd/eudico/daemon.go b/cmd/eudico/daemon.go
@@ -317,7 +317,7 @@ func eudicoDaemonAction(consensusAlgorithm global.ConsensusAlgorithm) func(*cli.
 		app := fx.New(
 			fxProviders,
 			fx.Populate(&rpcStopper),
-			fxmodules.Invokes(&cfg.Common, cctx.Bool("bootstrap"), isMirValidator),
+			fxmodules.Invokes(cfg, cctx.Bool("bootstrap"), isMirValidator),
 			// Debugging of the dependency graph
 			fx.Invoke(
 				func(dotGraph fx.DotGraph) {

diff --git a/cmd/lotus/eudico.go b/cmd/lotus/eudico.go
@@ -230,7 +230,7 @@ func eudicoDaemonAction(cctx *cli.Context) error {
 	app := fx.New(
 		fxProviders,
 		fx.Populate(&rpcStopper),
-		fxmodules.Invokes(&cfg.Common, cctx.Bool("bootstrap"), isMirValidator),
+		fxmodules.Invokes(cfg, cctx.Bool("bootstrap"), isMirValidator),
 		// Debugging of the dependency graph
 		fx.Invoke(
 			func(dotGraph fx.DotGraph) {

diff --git a/eudico-core/fxmodules/invokes.go b/eudico-core/fxmodules/invokes.go
@@ -10,23 +10,24 @@ import (
 	"github.com/filecoin-project/lotus/paychmgr/settler"
 )
 
-func Invokes(cfg *config.Common, isBootstrap bool, isMirValidator bool) fx.Option {
+func Invokes(cfg *config.FullNode, isBootstrap bool, isMirValidator bool) fx.Option {
 	return fx.Module("invokes",
 		fx.Invoke(
-			modules.MemoryWatchdog,                          // 1 defaults
-			modules.CheckFdLimit(build.DefaultFDLimit),      // 2 defaults
-			lp2p.PstoreAddSelfKeys,                          // 3 libp2p
-			lp2p.StartListening(cfg.Libp2p.ListenAddresses), // 4 common config
-			modules.DoSetGenesis,                            // 6
-			modules.RunHello,                                // 7
-			modules.RunChainExchange,                        // 8
-			modules.HandleIncomingMessages,                  // 12
-			modules.HandleMigrateClientFunds,                // 13
-			modules.HandlePaychManager,                      // 14
-			modules.RelayIndexerMessages,                    // 15
-			settler.SettlePaymentChannels,                   // 24
+			modules.MemoryWatchdog,                                 // 1 defaults
+			modules.CheckFdLimit(build.DefaultFDLimit),             // 2 defaults
+			lp2p.PstoreAddSelfKeys,                                 // 3 libp2p
+			lp2p.StartListening(cfg.Common.Libp2p.ListenAddresses), // 4 common config
+			modules.DoSetGenesis,                                   // 6
+			modules.RunHello,                                       // 7
+			modules.RunChainExchange,                               // 8
+			modules.HandleIncomingMessages,                         // 12
+			modules.HandleMigrateClientFunds,                       // 13
+			modules.HandlePaychManager,                             // 14
+			modules.RelayIndexerMessages,                           // 15
+			settler.SettlePaymentChannels,                          // 24
 		),
 		fxOptional(isBootstrap, fx.Invoke(modules.RunPeerMgr)),               // 10
 		fxOptional(!isMirValidator, fx.Invoke(modules.HandleIncomingBlocks)), // 11
+		fxOptional(cfg.Fevm.EnableEthRPC, fx.Invoke(modules.EnableStoringEvents)),
 	)
 }
diff --git a/itests/kit/ensemble.go b/itests/kit/ensemble.go
@@ -460,7 +460,7 @@ func (n *Ensemble) Start() *Ensemble {
 
 		app := fx.New(
 			fxProviders,
-			fxmodules.Invokes(&cfg.Common, false, !full.options.learner),
+			fxmodules.Invokes(cfg, false, !full.options.learner),
 			fx.Invoke(func(fullNode impl.FullNodeAPI) {
 				full.FullNode = &fullNode
 			}),