update barnard rollback height

network/src/service.rs

@@ -40,7 +40,7 @@ use std::ops::RangeInclusive;
 use std::sync::Arc;
 
 const BARNARD_HARD_FORK_PEER_VERSION_STRING_PREFIX: &str = "barnard_rollback_block_fix";
-const BARNARD_HARD_FORK_VERSION: [i32; 3] = [1, 13, 11];
+const BARNARD_HARD_FORK_VERSION: [i32; 3] = [1, 13, 12];
 
 pub struct NetworkActorService {
     /// Worker and inner have ChainInfo instances separately. There might be some way to solve the problem.
@@ -930,7 +930,7 @@ mod test {
         assert!(!greater_barnard_fork_version(&v3));
         let v4 = String::from("starcoin/1.12.9 (build:v1.12.9) (kele01)");
         assert!(!greater_barnard_fork_version(&v4));
-        let v5 = String::from("starcoin/1.13.12 (build:v1.13.12-alpha) (kele01)");
+        let v5 = String::from("starcoin/1.13.13 (build:v1.13.12-alpha) (kele01)");
         assert!(greater_barnard_fork_version(&v5));
     }
 }

storage/src/upgrade.rs

@@ -22,18 +22,18 @@ use std::cmp::Ordering;
 
 pub struct DBUpgrade;
 
-pub static BARNARD_HARD_FORK_HEIGHT: BlockNumber = 16057000;
+pub static BARNARD_HARD_FORK_HEIGHT: BlockNumber = 16080000;
 pub static BARNARD_HARD_FORK_HASH: Lazy<HashValue> = Lazy::new(|| {
     HashValue::from_hex_literal(
-        "0x1dd5987fa3b8bffad60f7a7756e73acd7b6808fed5a174200bf49e9f5de2d073",
+        "0x2dd593a9ac3e44d4a70423d39ffbd94930dba00b4682fcde9ebb2be8950bae7c",
     )
     .expect("")
 });
 
 pub static DRAGON_HARD_FORK_HEIGHT: BlockNumber = 16801958;
 pub static DRAGON_HARD_FORK_HASH: Lazy<HashValue> = Lazy::new(|| {
     HashValue::from_hex_literal(
-        "0xbef8d0af3b358af9fe25f7383fd2580679c54fe2ce7ff7a7434785ba6d11b943",
+        "0x1067291d5f74c1332de6e9109b1b4c382be1c482a052ad4bb0e2b66f220bb22e",
     )
     .expect("")
 });

vm/vm-runtime/src/force_upgrade_management.rs

@@ -15,7 +15,7 @@ pub fn get_force_upgrade_block_number(chain_id: &ChainId) -> u64 {
     } else if chain_id.is_halley() || chain_id.is_proxima() {
         300
     } else if chain_id.is_barnard() {
-        16085000
+        16075000
     } else {
         FORCE_UPGRADE_BLOCK_NUMBER
     }