cleanup

block/initchain.go

@@ -25,7 +25,6 @@ func (m *Manager) RunInitChain(ctx context.Context) error {
 	// update the state with only the consensus pubkey
 	m.Executor.UpdateStateAfterInitChain(&m.State, res, gensisValSet)
 	m.Executor.UpdateMempoolAfterInitChain(&m.State)
-
 	if _, err := m.Store.UpdateState(m.State, nil); err != nil {
 		return err
 	}

block/manager.go

@@ -18,8 +18,6 @@ import (
 
 	"github.com/dymensionxyz/dymint/p2p"
 	"github.com/libp2p/go-libp2p/core/crypto"
-
-	tmcrypto "github.com/tendermint/tendermint/crypto"
 	"github.com/tendermint/tendermint/libs/pubsub"
 	tmtypes "github.com/tendermint/tendermint/types"
 
@@ -209,14 +207,6 @@ func (m *Manager) UpdateSyncParams(endHeight uint64) {
 	m.lastSubmissionTime.Store(time.Now().UnixNano())
 }
 
-func getAddress(key crypto.PrivKey) ([]byte, error) {
-	rawKey, err := key.GetPublic().Raw()
-	if err != nil {
-		return nil, err
-	}
-	return tmcrypto.AddressHash(rawKey), nil
-}
-
 // TODO: move to gossip.go
 // onNewGossippedBlock will take a block and apply it
 func (m *Manager) onNewGossipedBlock(event pubsub.Message) {

block/produce.go

@@ -118,7 +118,6 @@ func (m *Manager) produceBlock(allowEmpty bool) (*types.Block, *types.Commit, er
 		newHeight = uint64(m.State.InitialHeight)
 		lastCommit = &types.Commit{}
 		m.State.BaseHeight = newHeight
-		m.State.SetBase(newHeight)
 	} else {
 		height := m.State.Height()
 		newHeight = height + 1

block/types.go

@@ -2,6 +2,9 @@ package block
 
 import (
 	"github.com/dymensionxyz/dymint/types"
+
+	"github.com/libp2p/go-libp2p/core/crypto"
+	tmcrypto "github.com/tendermint/tendermint/crypto"
 )
 
 // TODO: move to types package
@@ -22,3 +25,11 @@ type CachedBlock struct {
 	Block  *types.Block
 	Commit *types.Commit
 }
+
+func getAddress(key crypto.PrivKey) ([]byte, error) {
+	rawKey, err := key.GetPublic().Raw()
+	if err != nil {
+		return nil, err
+	}
+	return tmcrypto.AddressHash(rawKey), nil
+}