update force deploy extra transaction stdlib.blob

starcoinorg · Dec 25, 2024 · 41dc947 · 41dc947
1 parent 1da01d3
commit 41dc947
Show file tree

Hide file tree

Showing 11 changed files with 5 additions and 3 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -444,7 +444,7 @@ starcoin-crypto = { git = "https://github.com/starcoinorg/starcoin-crypto", rev
 starcoin-decrypt = { path = "commons/decrypt" }
 starcoin-dev = { path = "vm/dev" }
 starcoin-executor = { path = "executor" }
-starcoin-framework = { git = "https://github.com/starcoinorg/starcoin-framework", rev = "3e879a168036dceaa60c57c8e2b9228283476f81" }
+starcoin-framework = { git = "https://github.com/starcoinorg/starcoin-framework", rev = "b71d41082fe0499a547960c6eccd14c08c987b68" }
 starcoin-genesis = { path = "genesis" }
 starcoin-logger = { path = "commons/logger" }
 starcoin-metrics = { path = "commons/metrics" }

diff --git a/vm/stdlib/compiled/12/11-12/stdlib.blob b/vm/stdlib/compiled/12/11-12/stdlib.blob
diff --git a/vm/stdlib/compiled/12/11-12/stdlib/036_Account.mv b/vm/stdlib/compiled/12/11-12/stdlib/036_Account.mv
diff --git a/vm/stdlib/compiled/12/11-12/stdlib/064_StdlibUpgradeScripts.mv b/vm/stdlib/compiled/12/11-12/stdlib/064_StdlibUpgradeScripts.mv
diff --git a/vm/stdlib/compiled/12/stdlib/036_Account.mv b/vm/stdlib/compiled/12/stdlib/036_Account.mv
diff --git a/vm/stdlib/compiled/12/stdlib/064_StdlibUpgradeScripts.mv b/vm/stdlib/compiled/12/stdlib/064_StdlibUpgradeScripts.mv
diff --git a/vm/stdlib/compiled/latest/error_descriptions/error_descriptions.errmap b/vm/stdlib/compiled/latest/error_descriptions/error_descriptions.errmap
diff --git a/vm/stdlib/compiled/latest/stdlib/036_Account.mv b/vm/stdlib/compiled/latest/stdlib/036_Account.mv
diff --git a/vm/stdlib/compiled/latest/stdlib/064_StdlibUpgradeScripts.mv b/vm/stdlib/compiled/latest/stdlib/064_StdlibUpgradeScripts.mv
diff --git a/vm/vm-runtime/src/force_upgrade_management.rs b/vm/vm-runtime/src/force_upgrade_management.rs
@@ -3,6 +3,7 @@
 
 use starcoin_crypto::ed25519::{Ed25519PrivateKey, Ed25519PublicKey};
 use starcoin_types::account::Account;
+use starcoin_types::block::BlockNumber;
 use starcoin_vm_types::genesis_config::ChainId;
 
 pub const FORCE_UPGRADE_BLOCK_NUMBER: u64 = 17500000;
@@ -15,7 +16,8 @@ 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() {
-        16075000
+        // add 8000 + BARNARD_HARD_FORK_HEIGHT
+        16088000
     } else {
         FORCE_UPGRADE_BLOCK_NUMBER
     }