From 1d4832a4aa091365c70edfc2ec85d9df03d4e87e Mon Sep 17 00:00:00 2001
From: Hoon <48665813+sh-cha@users.noreply.github.com>
Date: Fri, 16 Aug 2024 14:34:15 +0900
Subject: [PATCH] bug fix da_node config & initializing tree (#10)

---
 executor/celestia/celestia.go | 1 -
 executor/child/child.go       | 2 +-
 executor/child/status.go      | 2 +-
 executor/host/host.go         | 1 -
 executor/types/config.go      | 2 +-
 5 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/executor/celestia/celestia.go b/executor/celestia/celestia.go
index 8e64639..8f30fa4 100644
--- 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
index e885593..2dd8a15 100644
--- 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
index 5480d8e..b071e6e 100644
--- 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
index 30e1b79..9809e23 100644
--- 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
index 7b27541..f6254e5 100644
--- 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,