bsc: Fix bohr block parser

icon-project · Sep 29, 2024 · e42e7e2 · e42e7e2
1 parent 998ca74
commit e42e7e2
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/bmv/bsc2/build.gradle b/bmv/bsc2/build.gradle
@@ -1,4 +1,4 @@
-version = '0.7.2'
+version = '0.7.3'
 
 dependencies {
     compileOnly("foundation.icon:javaee-api:$javaeeVersion")

diff --git a/bmv/bsc2/src/main/java/foundation/icon/btp/bmv/bsc2/BTPMessageVerifier.java b/bmv/bsc2/src/main/java/foundation/icon/btp/bmv/bsc2/BTPMessageVerifier.java
@@ -85,7 +85,7 @@ public BTPMessageVerifier(Address _bmc, BigInteger _chainId, @Optional byte[] _h
 
     @External(readonly = true)
     public String getVersion() {
-        return "0.7.2";
+        return "0.7.3";
     }
 
     @External(readonly = true)

diff --git a/bmv/bsc2/src/main/java/foundation/icon/btp/bmv/bsc2/Header.java b/bmv/bsc2/src/main/java/foundation/icon/btp/bmv/bsc2/Header.java
@@ -237,9 +237,15 @@ public VoteAttestation getVoteAttestation(ChainConfig config) {
                 blob = Arrays.copyOfRange(extra, EXTRA_VANITY, extra.length - EXTRA_SEAL);
             } else {
                 int num = extra[EXTRA_VANITY];
-                if (extra.length <= EXTRA_VANITY + EXTRA_SEAL + VALIDATOR_NUMBER_SIZE + num * VALIDATOR_BYTES_LENGTH) {
+                int turnLengthSize = 0;
+                if (config.isBohr(time)) {
+                    turnLengthSize = TURN_LENGTH_SIZE;
+                }
+
+                if (extra.length <= EXTRA_VANITY + EXTRA_SEAL + VALIDATOR_NUMBER_SIZE + num * VALIDATOR_BYTES_LENGTH + turnLengthSize) {
                     return null;
                 }
+
                 int start = EXTRA_VANITY + VALIDATOR_NUMBER_SIZE + num * VALIDATOR_BYTES_LENGTH;
                 if (config.isBohr(time)) {
                     start += TURN_LENGTH_SIZE;