Merge branch 'feat/l2-hard-fork-full-node-transition' into srene/hard…

…fork-fix
dymensionxyz · Nov 10, 2024 · 635d160 · 635d160
2 parents 2ded44f + 8b3eff5
commit 635d160
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 44 deletions.
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
diff --git a/block/fork.go b/block/fork.go
@@ -64,8 +64,8 @@ func (m *Manager) checkForkUpdate(ctx context.Context) error {
 		if err != nil {
 			return err
 		}
-		err := fmt.Errorf("fork update")
-		m.freezeNode(ctx, err)
+
+		m.freezeNode(ctx, fmt.Errorf("fork update detected"))
 	}
 
 	return nil

diff --git a/mocks/github.com/dymensionxyz/dymint/store/mock_Store.go b/mocks/github.com/dymensionxyz/dymint/store/mock_Store.go
diff --git a/types/serialization.go b/types/serialization.go
@@ -295,6 +295,7 @@ func (s *State) FromProto(other *pb.State) error {
 
 	s.ConsensusParams = other.ConsensusParams
 	copy(s.LastResultsHash[:], other.LastResultsHash)
+	copy(s.LastHeaderHash[:], other.LastHeaderHash)
 	copy(s.AppHash[:], other.AppHash)
 	s.RollappParams = other.RollappParams
 	return nil