Integrate unstable-next-api into curr (dropped arg)

Author: Shaptic

cmd/stellar-rpc/lib/preflight/src/lib.rs

@@ -41,6 +41,14 @@ mod curr {
     pub(crate) mod shared;
 
     pub(crate) const PROTOCOL: u32 = soroban_env_host::meta::INTERFACE_VERSION.protocol;
+
+    // soroban-simulation-curr with unstable-next-api no longer takes bucket_list_size.
+    pub(crate) fn load_network_config(
+        snapshot: &impl soroban_env_host::storage::SnapshotSource,
+        _bucket_list_size: u64,
+    ) -> crate::Result<soroban_simulation::NetworkConfig> {
+        soroban_simulation::NetworkConfig::load_from_snapshot(snapshot)
+    }
 }
 
 #[path = "."]
@@ -52,6 +60,13 @@ mod prev {
     pub(crate) mod shared;
 
     pub(crate) const PROTOCOL: u32 = soroban_env_host::meta::INTERFACE_VERSION.protocol;
+
+    pub(crate) fn load_network_config(
+        snapshot: &impl soroban_env_host::storage::SnapshotSource,
+        bucket_list_size: u64,
+    ) -> crate::Result<soroban_simulation::NetworkConfig> {
+        soroban_simulation::NetworkConfig::load_from_snapshot(snapshot, bucket_list_size)
+    }
 }
 
 use std::cell::RefCell;

cmd/stellar-rpc/lib/preflight/src/shared.rs

@@ -129,7 +129,7 @@ pub(crate) fn preflight_invoke_hf_op_or_maybe_panic(
 
     let go_storage = Rc::new(GoLedgerStorage::new(handle));
     let network_config =
-        NetworkConfig::load_from_snapshot(go_storage.as_ref(), c_ledger_info.bucket_list_size)?;
+        super::load_network_config(go_storage.as_ref(), c_ledger_info.bucket_list_size)?;
     let ledger_info = fill_ledger_info(c_ledger_info, &network_config);
 
     let mut adjustment_config = SimulationAdjustmentConfig::default_adjustment();
@@ -212,7 +212,7 @@ pub(crate) fn preflight_footprint_ttl_op_or_maybe_panic(
         LedgerFootprint::from_xdr(unsafe { from_c_xdr(footprint) }, DEFAULT_XDR_RW_LIMITS)?;
     let go_storage = Rc::new(GoLedgerStorage::new(handle));
     let network_config =
-        NetworkConfig::load_from_snapshot(go_storage.as_ref(), c_ledger_info.bucket_list_size)?;
+        super::load_network_config(go_storage.as_ref(), c_ledger_info.bucket_list_size)?;
     let ledger_info = fill_ledger_info(c_ledger_info, &network_config);
     // TODO: It would make for a better UX if the user passed only the necessary fields for every operation.
     // That would remove a possibility of providing bad operation body, or a possibility of filling wrong footprint