[cherry-pick] Fix issue in bytecode verifier. (#23858)

## Description 

Fix for a bytecode verifier issue.

## Test plan 

Local tests.

---

## Release notes

Check each box that your changes affect. If none of the boxes relate to
your changes, release notes aren't required.

For each box you select, include information after the relevant heading
that describes the impact of your changes that a user might notice and
any actions they must take to implement updates.

- [X] Protocol: Adds a new protocol version that fixes an issue in the
bytecode verifier.
- [ ] Nodes (Validators and Full nodes): 
- [ ] gRPC:
- [ ] JSON-RPC: 
- [ ] GraphQL: 
- [ ] CLI: 
- [ ] Rust SDK:

Author: tzakian

crates/sui-core/src/authority/snapshots/sui_core__authority__execution_time_estimator__tests__execution_time_observer_v97.snap

@@ -0,0 +1,155 @@
+---
+source: crates/sui-core/src/authority/execution_time_estimator.rs
+expression: snapshot_data
+---
+protocol_version: 97
+consensus_observations:
+  - - MakeMoveVec
+    - observations:
+        - - 4
+          - secs: 0
+            nanos: 29000000
+        - - 7
+          - secs: 0
+            nanos: 28000000
+        - - 5
+          - secs: 0
+            nanos: 19000000
+        - - 1
+          - secs: 0
+            nanos: 25000000
+      stake_weighted_median:
+        secs: 0
+        nanos: 28000000
+  - - MergeCoins
+    - observations:
+        - - 6
+          - secs: 0
+            nanos: 63000000
+        - - 1
+          - secs: 0
+            nanos: 21000000
+        - - 2
+          - secs: 0
+            nanos: 32000000
+        - - 8
+          - secs: 0
+            nanos: 43000000
+      stake_weighted_median:
+        secs: 0
+        nanos: 43000000
+  - - SplitCoins
+    - observations:
+        - - 0
+          - ~
+        - - 9
+          - secs: 0
+            nanos: 76000000
+        - - 5
+          - secs: 0
+            nanos: 54000000
+        - - 5
+          - secs: 0
+            nanos: 35000000
+      stake_weighted_median:
+        secs: 0
+        nanos: 54000000
+  - - TransferObjects
+    - observations:
+        - - 0
+          - ~
+        - - 0
+          - ~
+        - - 0
+          - ~
+        - - 9
+          - secs: 0
+            nanos: 45000000
+      stake_weighted_median:
+        secs: 0
+        nanos: 45000000
+  - - Upgrade
+    - observations:
+        - - 9
+          - secs: 0
+            nanos: 425000000
+        - - 6
+          - secs: 0
+            nanos: 485000000
+        - - 10
+          - secs: 0
+            nanos: 827000000
+        - - 4
+          - secs: 0
+            nanos: 587000000
+      stake_weighted_median:
+        secs: 0
+        nanos: 587000000
+  - - MoveEntryPoint:
+        package: "0x0000000000000000000000000000000000000000000000000000000000000001"
+        module: coin
+        function: transfer
+        type_arguments: []
+    - observations:
+        - - 7
+          - secs: 0
+            nanos: 404000000
+        - - 6
+          - secs: 0
+            nanos: 162000000
+        - - 9
+          - secs: 0
+            nanos: 268000000
+        - - 8
+          - secs: 0
+            nanos: 0
+      stake_weighted_median:
+        secs: 0
+        nanos: 268000000
+  - - MoveEntryPoint:
+        package: "0x0000000000000000000000000000000000000000000000000000000000000002"
+        module: nft
+        function: mint
+        type_arguments: []
+    - observations:
+        - - 0
+          - ~
+        - - 0
+          - ~
+        - - 6
+          - secs: 0
+            nanos: 248000000
+        - - 8
+          - secs: 0
+            nanos: 499000000
+      stake_weighted_median:
+        secs: 0
+        nanos: 499000000
+transaction_estimates:
+  - - coin_transfer_call
+    - secs: 0
+      nanos: 268000000
+  - - mixed_move_calls
+    - secs: 0
+      nanos: 767000000
+  - - native_commands_with_observations
+    - secs: 0
+      nanos: 340000000
+  - - transfer_objects_3_items
+    - secs: 0
+      nanos: 180000000
+  - - split_coins_4_amounts
+    - secs: 0
+      nanos: 270000000
+  - - merge_coins_1_sources
+    - secs: 0
+      nanos: 86000000
+  - - make_move_vec_4_elements
+    - secs: 0
+      nanos: 140000000
+  - - mixed_commands
+    - secs: 0
+      nanos: 244000000
+  - - upgrade_package
+    - secs: 0
+      nanos: 587000000

crates/sui-open-rpc/spec/openrpc.json

@@ -1294,12 +1294,13 @@
             "name": "Result",
             "value": {
               "minSupportedProtocolVersion": "1",
-              "maxSupportedProtocolVersion": "96",
+              "maxSupportedProtocolVersion": "97",
               "protocolVersion": "6",
               "featureFlags": {
                 "abstract_size_in_object_runtime": false,
                 "accept_passkey_in_multisig": false,
                 "accept_zklogin_in_multisig": false,
+                "additional_borrow_checks": false,
                 "additional_consensus_digest_indirect_state": false,
                 "additional_multisig_checks": false,
                 "advance_epoch_start_time_in_safe_mode": true,

crates/sui-protocol-config/src/lib.rs

@@ -19,7 +19,7 @@ use tracing::{info, warn};
 
 /// The minimum and maximum protocol versions supported by this build.
 const MIN_PROTOCOL_VERSION: u64 = 1;
-const MAX_PROTOCOL_VERSION: u64 = 96;
+const MAX_PROTOCOL_VERSION: u64 = 97;
 
 // Record history of protocol version allocations here:
 //
@@ -264,6 +264,7 @@ const MAX_PROTOCOL_VERSION: u64 = 96;
 //             Fix bug where MFP transaction shared inputs' debts were not loaded
 //             Create Coin Registry object
 //             Enable checkpoint artifacts digest in devnet.
+// Version 97: Enable additional borrow checks
 
 #[derive(Copy, Clone, Debug, Hash, Serialize, Deserialize, PartialEq, Eq, PartialOrd, Ord)]
 pub struct ProtocolVersion(u64);
@@ -814,6 +815,10 @@ struct FeatureFlags {
     // If true charge for loads into the cache (i.e., fetches from storage) in the object runtime.
     #[serde(skip_serializing_if = "is_false")]
     object_runtime_charge_cache_load_gas: bool,
+
+    // If true, perform additional borrow checks
+    #[serde(skip_serializing_if = "is_false")]
+    additional_borrow_checks: bool,
 }
 
 fn is_false(b: &bool) -> bool {
@@ -2247,6 +2252,10 @@ impl ProtocolConfig {
     pub fn object_runtime_charge_cache_load_gas(&self) -> bool {
         self.feature_flags.object_runtime_charge_cache_load_gas
     }
+
+    pub fn additional_borrow_checks(&self) -> bool {
+        self.feature_flags.additional_borrow_checks
+    }
 }
 
 #[cfg(not(msim))]
@@ -4041,6 +4050,9 @@ impl ProtocolConfig {
                     // Enable Mysticeti fastpath handlers on mainnet.
                     cfg.feature_flags.mysticeti_fastpath = true;
                 }
+                97 => {
+                    cfg.feature_flags.additional_borrow_checks = true;
+                }
                 // Use this template when making changes:
                 //
                 //     // modify an existing constant.
@@ -4085,6 +4097,13 @@ impl ProtocolConfig {
             (None, None)
         };
 
+        let additional_borrow_checks = if signing_limits.is_some() {
+            // always turn on additional borrow checks during signing
+            true
+        } else {
+            self.additional_borrow_checks()
+        };
+
         VerifierConfig {
             max_loop_depth: Some(self.max_loop_depth() as usize),
             max_generic_instantiation_length: Some(self.max_generic_instantiation_length() as usize),
@@ -4108,6 +4127,7 @@ impl ProtocolConfig {
                 .reject_mutable_random_on_entry_functions(),
             bytecode_version: self.move_binary_format_version(),
             max_variants_in_enum: self.max_move_enum_variants_as_option(),
+            additional_borrow_checks,
         }
     }