Fix upload simulation (#1671)

### What

Fixes simulation due to
#1663

Author: sisuresh

soroban-env-host/src/host/frame.rs

@@ -859,26 +859,22 @@ impl Host {
         if self.in_storage_recording_mode()? {
             if let Some((parsed_module, wasmi_linker)) =
                 self.budget_ref().with_observable_shadow_mode(|| {
-                    use crate::vm::ParsedModule;
+                    use crate::vm::{ParsedModule, VersionedContractCodeCostInputs};
                     let wasm_key = self.contract_code_ledger_key(wasm_hash)?;
                     let is_key_live_in_snapshot = self
                         .try_borrow_storage_mut()?
                         .is_key_live_in_snapshot(self, &wasm_key)?;
                     if is_key_live_in_snapshot {
                         let (code, _costs) = self.retrieve_wasm_from_storage(&wasm_hash)?;
-                        // Currently only v0 costs are used by the inter-ledger
-                        // module cache. Note, that when key is not in the live
-                        // snapshot, the inter-ledger cache won't be used
-                        // either, so we'll end up in the "cache miss" case
-                        // below and then correctly charge the instantiation
-                        // costs in `Vm::new_with_cost_inputs`.
-                        let costs_v0 = crate::vm::VersionedContractCodeCostInputs::V0 {
-                            wasm_bytes: code.len(),
-                        };
+                        // Always extract and use v1 cost inputs, matching what
+                        // the real module cache does in enforcement mode via
+                        // `parse_and_cache_module_simple`.
+                        let cost_inputs =
+                            ParsedModule::extract_refined_contract_cost_inputs(self, &code)?;
                         let parsed_module = ParsedModule::new_with_isolated_engine(
                             self,
                             code.as_slice(),
-                            costs_v0,
+                            VersionedContractCodeCostInputs::V1(cost_inputs),
                         )?;
                         let wasmi_linker = parsed_module.make_wasmi_linker(self)?;
                         Ok(Some((parsed_module, wasmi_linker)))

soroban-env-host/src/test/e2e_tests.rs

@@ -5,7 +5,6 @@ use crate::e2e_testutils::{
     upload_wasm_host_fn,
 };
 use crate::testutils::simple_account_sign_fn;
-use crate::vm::VersionedContractCodeCostInputs;
 use crate::{
     budget::{AsBudget, Budget},
     builtin_contracts::testutils::TestSigner,
@@ -394,18 +393,7 @@ fn build_module_cache_for_entries(
             if restored_contracts.contains(&contract_id) {
                 continue;
             }
-            // Currently module cache always uses V0 cost inputs, so the parsed
-            // module will also use them during instantiation.
-            let code_cost_inputs = VersionedContractCodeCostInputs::V0 {
-                wasm_bytes: cd.code.len(),
-            };
-            cache.parse_and_cache_module(
-                &ctx,
-                ledger_info.protocol_version,
-                &contract_id,
-                &cd.code,
-                code_cost_inputs,
-            )?;
+            cache.parse_and_cache_module_simple(&ctx, ledger_info.protocol_version, &cd.code)?;
         }
     }
     Ok(cache)
@@ -1397,7 +1385,7 @@ fn test_create_contract_success_in_recording_mode() {
         ]
     );
     assert_eq!(res.auth, vec![cd.auth_entry]);
-    expect!["639648"].assert_eq(&res.resources.instructions.to_string());
+    expect!["663629"].assert_eq(&res.resources.instructions.to_string());
     expect!["104"].assert_eq(&res.resources.write_bytes.to_string());
     assert_eq!(
         res.resources,
@@ -1535,7 +1523,7 @@ fn test_create_contract_success_in_recording_mode_with_custom_account() {
         ]
     );
     assert_eq!(res.auth, vec![cd.auth_entry]);
-    expect!["1046806"].assert_eq(&res.resources.instructions.to_string());
+    expect!["1070787"].assert_eq(&res.resources.instructions.to_string());
     expect!["176"].assert_eq(&res.resources.write_bytes.to_string());
     assert_eq!(
         res.resources,
@@ -1606,7 +1594,7 @@ fn test_create_contract_success_in_recording_mode_with_enforced_auth() {
         ]
     );
     assert_eq!(res.auth, vec![cd.auth_entry]);
-    expect!["641135"].assert_eq(&res.resources.instructions.to_string());
+    expect!["665116"].assert_eq(&res.resources.instructions.to_string());
     expect!["104"].assert_eq(&res.resources.write_bytes.to_string());
     assert_eq!(
         res.resources,
@@ -2045,7 +2033,7 @@ fn test_invoke_contract_with_storage_ops_success_in_recording_mode() {
         ]
     );
     assert!(res.restored_rw_entry_ids.is_empty());
-    expect!["791047"].assert_eq(&res.resources.instructions.to_string());
+    expect!["898006"].assert_eq(&res.resources.instructions.to_string());
     expect!["80"].assert_eq(&res.resources.write_bytes.to_string());
     assert_eq!(
         res.resources,
@@ -2112,7 +2100,7 @@ fn test_invoke_contract_with_storage_ops_success_in_recording_mode() {
             wasm_entry_change.clone()
         ]
     );
-    expect!["902901"].assert_eq(&extend_res.resources.instructions.to_string());
+    expect!["1009860"].assert_eq(&extend_res.resources.instructions.to_string());
     assert_eq!(
         extend_res.resources,
         SorobanResources {
@@ -2555,7 +2543,7 @@ fn test_auto_restore_with_overwrite_in_recording_mode() {
         ]
     );
 
-    expect!["921385"].assert_eq(&res.resources.instructions.to_string());
+    expect!["1028344"].assert_eq(&res.resources.instructions.to_string());
     assert_eq!(
         res.resources,
         SorobanResources {

soroban-simulation/src/test/simulation.rs

@@ -340,7 +340,7 @@ fn test_simulate_create_contract() {
     );
     assert!(res.contract_events.is_empty());
     assert!(res.diagnostic_events.is_empty());
-    expect!["2377272"].assert_eq(&res.simulated_instructions.to_string());
+    expect!["2742756"].assert_eq(&res.simulated_instructions.to_string());
     expect!["104"].assert_eq(
         &res.transaction_data
             .as_ref()
@@ -349,7 +349,7 @@ fn test_simulate_create_contract() {
             .write_bytes
             .to_string(),
     );
-    expect!["12931"].assert_eq(
+    expect!["13296"].assert_eq(
         &res.transaction_data
             .as_ref()
             .unwrap()
@@ -372,7 +372,7 @@ fn test_simulate_create_contract() {
             resource_fee: res.transaction_data.as_ref().unwrap().resource_fee,
         })
     );
-    expect!["1188635"].assert_eq(&res.simulated_memory.to_string());
+    expect!["1371376"].assert_eq(&res.simulated_memory.to_string());
     assert_eq!(
         res.modified_entries,
         vec![LedgerEntryDiff {
@@ -497,7 +497,7 @@ fn test_simulate_invoke_contract_with_auth() {
     assert!(res.contract_events.is_empty());
     assert!(!res.diagnostic_events.is_empty());
 
-    expect!["39120150"].assert_eq(&res.simulated_instructions.to_string());
+    expect!["41453957"].assert_eq(&res.simulated_instructions.to_string());
     expect!["144"].assert_eq(
         &res.transaction_data
             .as_ref()
@@ -514,7 +514,7 @@ fn test_simulate_invoke_contract_with_auth() {
             .write_bytes
             .to_string(),
     );
-    expect!["114064"].assert_eq(
+    expect!["116397"].assert_eq(
         &res.transaction_data
             .as_ref()
             .unwrap()
@@ -557,7 +557,7 @@ fn test_simulate_invoke_contract_with_auth() {
             resource_fee: res.transaction_data.as_ref().unwrap().resource_fee,
         })
     );
-    expect!["19560059"].assert_eq(&res.simulated_memory.to_string());
+    expect!["20726952"].assert_eq(&res.simulated_memory.to_string());
     assert_eq!(
         res.modified_entries,
         vec![LedgerEntryDiff {
@@ -1435,15 +1435,15 @@ fn test_simulate_unsuccessful_sac_call_with_try_call() {
             issuer: AccountId(PublicKey::PublicKeyTypeEd25519(Uint256([0; 32]))),
         }),
     });
-    expect!["5227433"].assert_eq(
+    expect!["5592955"].assert_eq(
         &res.transaction_data
             .as_ref()
             .unwrap()
             .resources
             .instructions
             .to_string(),
     );
-    expect!["5576"].assert_eq(
+    expect!["5941"].assert_eq(
         &res.transaction_data
             .as_ref()
             .unwrap()