fix: migrate wasm to the latest version

crates/runtime/src/factory.rs

@@ -26,7 +26,7 @@ pub struct CachedModule {
 
 impl CachedModule {
     /// Constructs a cache entry for the given strategy and import linker, optionally pre-populating stores.
-    pub fn new(strategy: Strategy, import_linker: Rc<ImportLinker>) -> Self {
+    pub fn new(strategy: Strategy, import_linker: Arc<ImportLinker>) -> Self {
         let mut stores = LinkedList::new();
         for _ in 0..N_DEFAULT_CACHED_STORE {
             let store = strategy.create_store(
@@ -64,7 +64,7 @@ pub struct RuntimeFactory {
     /// Suspended runtimes keyed by per-transaction call identifier.
     pub recoverable_runtimes: HashMap<u32, Runtime>,
     /// Import linker used to instantiate new stores.
-    pub import_linker: Rc<ImportLinker>,
+    pub import_linker: Arc<ImportLinker>,
     /// Monotonically increasing counter for assigning call identifiers.
     pub transaction_call_id_counter: u32,
 }
@@ -111,7 +111,7 @@ impl RuntimeFactory {
         println!("missing strategy: code_hash={code_hash} address={address}");
 
         let _span = tracing::info_span!("parse_rwasm_module").entered();
-        let rwasm_module = Rc::new(RwasmModule::new_or_empty(rwasm_module.as_ref()).0);
+        let (rwasm_module, _) = RwasmModule::new_or_empty(rwasm_module.as_ref());
         drop(_span);
 
         #[cfg(feature = "wasmtime")]
@@ -128,9 +128,9 @@ impl RuntimeFactory {
     #[tracing::instrument(level = "info", skip_all, fields(code_hash = %code_hash))]
     /// Initializes a Wasmtime-based strategy for the given module and inserts it into the cache.
     fn init_wasmtime(
-        import_linker: Rc<ImportLinker>,
+        import_linker: Arc<ImportLinker>,
         entry: VacantEntry<B256, CachedModule>,
-        rwasm_module: Rc<RwasmModule>,
+        rwasm_module: RwasmModule,
         #[allow(unused)] code_hash: B256,
     ) -> &mut CachedModule {
         // The lock helps to avoid recompiling same wasmtime modules,
@@ -150,17 +150,17 @@ impl RuntimeFactory {
             .expect("failed to compile wasmtime module, this should never happen");
 
         let strategy = Strategy::Wasmtime {
-            module: Rc::new(wasmtime_module),
+            module: wasmtime_module,
         };
         let cached_module = CachedModule::new(strategy, import_linker);
         entry.insert(cached_module)
     }
 
     #[tracing::instrument(level = "info", skip_all, fields(code_hash = %code_hash))]
     fn init_rwasm(
-        import_linker: Rc<ImportLinker>,
+        import_linker: Arc<ImportLinker>,
         entry: VacantEntry<B256, CachedModule>,
-        rwasm_module: Rc<RwasmModule>,
+        rwasm_module: RwasmModule,
         #[allow(unused)] code_hash: B256,
     ) -> &mut CachedModule {
         let strategy = Strategy::Rwasm {

crates/types/src/import_linker.rs

@@ -1,8 +1,8 @@
 use crate::{emit_fuel_procedure, SysFuncIdx};
-use alloc::rc::Rc;
+use alloc::sync::Arc;
 use rwasm::{ImportLinker, ImportName, ValType};
 
-pub fn import_linker_v1_preview() -> Rc<ImportLinker> {
+pub fn import_linker_v1_preview() -> Arc<ImportLinker> {
     let mut import_linker = ImportLinker::default();
     macro_rules! import_function {
         ($func_name:literal, $sys_func_idx:ident, $params:expr, $results:expr $(,)?) => {
@@ -202,5 +202,5 @@ pub fn import_linker_v1_preview() -> Rc<ImportLinker> {
         &[]
     );
 
-    Rc::new(import_linker)
+    Arc::new(import_linker)
 }

e2e/src/gas.rs

@@ -8,7 +8,7 @@ use fluentbase_sdk::{
 use fluentbase_testing::{EvmTestingContext, TxBuilder};
 use hex_literal::hex;
 use revm::context::result::{ExecutionResult, Output};
-use rwasm::{instruction_set, RwasmModule};
+use rwasm::{instruction_set, RwasmModule, RwasmModuleInner};
 
 #[test]
 fn test_simple_nested_call() {
@@ -124,7 +124,7 @@ fn test_simple_nested_call() {
     };
     ctx.add_wasm_contract(
         ACCOUNT3_ADDRESS,
-        RwasmModule {
+        RwasmModuleInner {
             code_section,
             data_section,
             ..Default::default()
@@ -300,7 +300,7 @@ fn test_blended_gas_spend_evm_from_wasm() {
     };
     ctx.add_wasm_contract(
         ACCOUNT3_ADDRESS,
-        RwasmModule {
+        RwasmModuleInner {
             code_section,
             data_section,
             ..Default::default()

evm-e2e/Cargo.toml

@@ -36,8 +36,8 @@ ctor = "0.5.0"
 fluentbase-genesis = { path = "../crates/genesis", default-features = false }
 fluentbase-contracts = { path = "../crates/contracts", default-features = false }
 fluentbase-types = { path = "../crates/types", default-features = false }
-rwasm = { git = "https://github.com/fluentlabs-xyz/rwasm", branch = "devel" }
-#rwasm = { path = "../rwasm", default-features = false }
+rwasm = { git = "https://github.com/fluentlabs-xyz/rwasm", branch = "devel", features = ["wasmtime"] }
+#rwasm = { path = "../../rwasm", default-features = false, features = ["wasmtime"] }
 
 [features]
 default = [