bug fix da_node config & initializing tree (#10)

sh-cha · web-flow · commit 1d4832a4aa09 · 2024-08-16T14:34:15.000+09:00
diff --git a/executor/celestia/celestia.go b/executor/celestia/celestia.go
@@ -69,7 +69,6 @@ func NewDACelestia(
 		panic(err)
 	}
 
-	cfg.ProcessType = nodetypes.PROCESS_TYPE_ONLY_BROADCAST
 	cfg.BroadcasterConfig.KeyringConfig.Address = batchSubmitter
 	cfg.BroadcasterConfig.BuildTxWithMessages = c.BuildTxWithMessages
 	cfg.BroadcasterConfig.PendingTxToProcessedMsgs = c.PendingTxToProcessedMsgs
diff --git a/executor/child/child.go b/executor/child/child.go
@@ -127,7 +127,7 @@ func (ch *Child) Initialize(startHeight uint64, startOutputIndex uint64, host ho
 		return err
 	}
 
-	if startOutputIndex != 0 {
+	if ch.node.HeightInitialized() && startOutputIndex != 0 {
 		ch.initializeTreeFn = func() error {
 			ch.logger.Info("initialize tree", zap.Uint64("index", startOutputIndex))
 			err := ch.mk.InitializeWorkingTree(startOutputIndex, 1)
diff --git a/executor/child/status.go b/executor/child/status.go
@@ -23,7 +23,7 @@ func (ch Child) GetStatus() Status {
 		LastUpdatedOracleL1Height:         ch.lastUpdatedOracleL1Height,
 		LastFinalizedDepositL1BlockHeight: ch.lastFinalizedDepositL1BlockHeight,
 		LastFinalizedDepositL1Sequence:    ch.lastFinalizedDepositL1Sequence,
-		LastWithdrawalL2Sequence:          ch.mk.GetWorkingTreeLeafCount() + ch.mk.GetStartLeafIndex(),
+		LastWithdrawalL2Sequence:          ch.mk.GetWorkingTreeLeafCount() + ch.mk.GetStartLeafIndex() - 1,
 		WorkingTreeIndex:                  ch.mk.GetWorkingTreeIndex(),
 		LastOutputSubmissionTime:          ch.lastOutputTime,
 		NextOutputSubmissionTime:          ch.nextOutputTime,
diff --git a/executor/host/host.go b/executor/host/host.go
@@ -76,7 +76,6 @@ func NewHost(
 	}
 
 	if batchSubmitter != "" {
-		cfg.ProcessType = nodetypes.PROCESS_TYPE_ONLY_BROADCAST
 		cfg.BroadcasterConfig.Bech32Prefix = bech32Prefix
 		cfg.BroadcasterConfig.KeyringConfig.Address = batchSubmitter
 	}
diff --git a/executor/types/config.go b/executor/types/config.go
@@ -194,7 +194,7 @@ func (cfg Config) L2NodeConfig(homePath string) nodetypes.NodeConfig {
 func (cfg Config) DANodeConfig(homePath string) nodetypes.NodeConfig {
 	nc := nodetypes.NodeConfig{
 		RPC:         cfg.DANode.RPCAddress,
-		ProcessType: nodetypes.PROCESS_TYPE_DEFAULT,
+		ProcessType: nodetypes.PROCESS_TYPE_ONLY_BROADCAST,
 		BroadcasterConfig: &btypes.BroadcasterConfig{
 			ChainID:       cfg.DANode.ChainID,
 			GasPrice:      cfg.DANode.GasPrice,

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,6 @@ func NewDACelestia(`
`69`	`69`	`panic(err)`
`70`	`70`	`}`
`71`	`71`
`72`		`- cfg.ProcessType = nodetypes.PROCESS_TYPE_ONLY_BROADCAST`
`73`	`72`	`cfg.BroadcasterConfig.KeyringConfig.Address = batchSubmitter`
`74`	`73`	`cfg.BroadcasterConfig.BuildTxWithMessages = c.BuildTxWithMessages`
`75`	`74`	`cfg.BroadcasterConfig.PendingTxToProcessedMsgs = c.PendingTxToProcessedMsgs`
Original file line number	Diff line number	Diff line change
`@@ -127,7 +127,7 @@ func (ch *Child) Initialize(startHeight uint64, startOutputIndex uint64, host ho`
`127`	`127`	`return err`
`128`	`128`	`}`
`129`	`129`
`130`		`- if startOutputIndex != 0 {`
	`130`	`+ if ch.node.HeightInitialized() && startOutputIndex != 0 {`
`131`	`131`	`ch.initializeTreeFn = func() error {`
`132`	`132`	`ch.logger.Info("initialize tree", zap.Uint64("index", startOutputIndex))`
`133`	`133`	`err := ch.mk.InitializeWorkingTree(startOutputIndex, 1)`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,6 @@ func NewHost(`
`76`	`76`	`}`
`77`	`77`
`78`	`78`	`if batchSubmitter != "" {`
`79`		`- cfg.ProcessType = nodetypes.PROCESS_TYPE_ONLY_BROADCAST`
`80`	`79`	`cfg.BroadcasterConfig.Bech32Prefix = bech32Prefix`
`81`	`80`	`cfg.BroadcasterConfig.KeyringConfig.Address = batchSubmitter`
`82`	`81`	`}`