Skip to content

Commit edaf5d2

Browse files
committed
add CodecV7 to general util functions
1 parent 392b6ff commit edaf5d2

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

encoding/da.go

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -691,8 +691,10 @@ func GetHardforkName(config *params.ChainConfig, blockHeight, blockTimestamp uin
691691
return "darwin"
692692
} else if !config.IsEuclid(blockTimestamp) {
693693
return "darwinV2"
694-
} else {
694+
} else if !config.IsEuclidV2(blockTimestamp) {
695695
return "euclid"
696+
} else {
697+
return "euclidV2"
696698
}
697699
}
698700

@@ -709,9 +711,11 @@ func GetCodecVersion(config *params.ChainConfig, blockHeight, blockTimestamp uin
709711
return CodecV3
710712
} else if !config.IsEuclid(blockTimestamp) {
711713
return CodecV4
712-
} else {
714+
} else if !config.IsEuclidV2(blockTimestamp) {
713715
// V5 is skipped, because it is only used for the special Euclid transition batch that we handle explicitly
714716
return CodecV6
717+
} else {
718+
return CodecV7
715719
}
716720
}
717721

@@ -740,7 +744,7 @@ func GetChunkEnableCompression(codecVersion CodecVersion, chunk *Chunk) (bool, e
740744
return false, nil
741745
case CodecV2, CodecV3:
742746
return true, nil
743-
case CodecV4, CodecV5, CodecV6:
747+
case CodecV4, CodecV5, CodecV6, CodecV7:
744748
return CheckChunkCompressedDataCompatibility(chunk, codecVersion)
745749
default:
746750
return false, fmt.Errorf("unsupported codec version: %v", codecVersion)
@@ -754,7 +758,7 @@ func GetBatchEnableCompression(codecVersion CodecVersion, batch *Batch) (bool, e
754758
return false, nil
755759
case CodecV2, CodecV3:
756760
return true, nil
757-
case CodecV4, CodecV5, CodecV6:
761+
case CodecV4, CodecV5, CodecV6, CodecV7:
758762
return CheckBatchCompressedDataCompatibility(batch, codecVersion)
759763
default:
760764
return false, fmt.Errorf("unsupported codec version: %v", codecVersion)

0 commit comments

Comments
 (0)