diff --git a/src/riscv/Cargo.lock b/src/riscv/Cargo.lock
index db351a3180d1da75f4edd7284dc26b8760055cb9..d1467d80437db43c0cd844b3801be203bfd74205 100644
--- a/src/riscv/Cargo.lock
+++ b/src/riscv/Cargo.lock
@@ -137,9 +137,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.5.0"
+version = "2.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
+checksum = "1b8e56985ec62d17e9c1001dc89c88ecd7dc08e47eba5ec7c29c7b5eeecde967"
 
 [[package]]
 name = "bitvec"
@@ -421,9 +421,9 @@ dependencies = [
 
 [[package]]
 name = "cranelift-module"
-version = "0.120.0"
+version = "0.120.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68a03c057d8a992e06596c871341e446af43ff9224f941e5b8adea39137a5391"
+checksum = "a25e2823b0274e2cf0f0db65cde302a5e8457ea3af9d334bcfd8557ac9dc8e0a"
 dependencies = [
  "anyhow",
  "cranelift-codegen",
@@ -621,9 +621,9 @@ dependencies = [
 
 [[package]]
 name = "ed25519-dalek"
-version = "2.1.1"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a3daa8e81a3963a60642bcc1f90a670680bd4a77535faa384e9d1c79d620871"
+checksum = "70e796c081cee67dc755e1a36a0a172b897fab85fc3f6bc48307991f64e4eca9"
 dependencies = [
  "curve25519-dalek",
  "ed25519",
@@ -972,6 +972,15 @@ version = "2.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d"
 
+[[package]]
+name = "memmap2"
+version = "0.9.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "483758ad303d734cec05e5c12b41d7e93e6a6390c5e9dae6bdeb7c1259012d28"
+dependencies = [
+ "libc",
+]
+
 [[package]]
 name = "minimal-lexical"
 version = "0.2.1"
@@ -1099,7 +1108,7 @@ dependencies = [
 [[package]]
 name = "octez-riscv"
 version = "0.0.0"
-source = "git+https://github.com/tezos/riscv-pvm.git#ffdd7b976f9a98f3140d8080b1119354afb04356"
+source = "git+https://github.com/tezos/riscv-pvm.git#afb02b632401f873fba323177f4619be723fd87e"
 dependencies = [
  "arbitrary-int",
  "bincode",
@@ -1115,6 +1124,7 @@ dependencies = [
  "ieee-apsqrt",
  "itertools",
  "libsecp256k1",
+ "memmap2",
  "num_enum",
  "paste",
  "range-collections",
@@ -1128,6 +1138,7 @@ dependencies = [
  "tezos-smart-rollup-utils",
  "tezos_crypto_rs",
  "thiserror",
+ "trait-set",
  "try-blocks",
  "tuples",
  "vm-fdt",
@@ -1340,9 +1351,9 @@ dependencies = [
 
 [[package]]
 name = "range-collections"
-version = "0.4.5"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca9edd21e2db51000ac63eccddabba622f826e631a60be7bade9bd6a76b69537"
+checksum = "861706ea9c4aded7584c5cd1d241cec2ea7f5f50999f236c22b65409a1f1a0d0"
 dependencies = [
  "binary-merge",
  "inplace-vec-builder",
@@ -1356,7 +1367,7 @@ version = "11.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e29830cbb1290e404f24c73af91c5d8d631ce7e128691e9477556b540cd01ecd"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.9.1",
 ]
 
 [[package]]
@@ -1448,11 +1459,11 @@ checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d"
 
 [[package]]
 name = "rustc_apfloat"
-version = "0.2.0+llvm-462a31f5a5ab"
+version = "0.2.3+llvm-462a31f5a5ab"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "465187772033a5ee566f69fe008df03628fce549a0899aae76f0a0c2e34696be"
+checksum = "486c2179b4796f65bfe2ee33679acf0927ac83ecf583ad6c91c3b4570911b9ad"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.9.1",
  "smallvec",
 ]
 
@@ -1684,7 +1695,7 @@ checksum = "e502f78cdbb8ba4718f566c418c52bc729126ffd16baee5baa718cf25dd5a69a"
 [[package]]
 name = "tezos-smart-rollup-build-utils"
 version = "0.2.2"
-source = "git+https://gitlab.com/tezos/tezos.git#646ce59cd891e652d69777314c44b3a48a293edd"
+source = "git+https://gitlab.com/tezos/tezos.git#70187e57c4f994f44f4461f3cb4498d47c426c7d"
 dependencies = [
  "rustc_version",
 ]
@@ -1692,12 +1703,12 @@ dependencies = [
 [[package]]
 name = "tezos-smart-rollup-constants"
 version = "0.2.2"
-source = "git+https://gitlab.com/tezos/tezos.git#646ce59cd891e652d69777314c44b3a48a293edd"
+source = "git+https://gitlab.com/tezos/tezos.git#70187e57c4f994f44f4461f3cb4498d47c426c7d"
 
 [[package]]
 name = "tezos-smart-rollup-core"
 version = "0.2.2"
-source = "git+https://gitlab.com/tezos/tezos.git#646ce59cd891e652d69777314c44b3a48a293edd"
+source = "git+https://gitlab.com/tezos/tezos.git#70187e57c4f994f44f4461f3cb4498d47c426c7d"
 dependencies = [
  "tezos-smart-rollup-build-utils",
  "tezos-smart-rollup-constants",
@@ -1706,7 +1717,7 @@ dependencies = [
 [[package]]
 name = "tezos-smart-rollup-encoding"
 version = "0.2.2"
-source = "git+https://gitlab.com/tezos/tezos.git#646ce59cd891e652d69777314c44b3a48a293edd"
+source = "git+https://gitlab.com/tezos/tezos.git#70187e57c4f994f44f4461f3cb4498d47c426c7d"
 dependencies = [
  "hex",
  "nom",
@@ -1725,7 +1736,7 @@ dependencies = [
 [[package]]
 name = "tezos-smart-rollup-host"
 version = "0.2.2"
-source = "git+https://gitlab.com/tezos/tezos.git#646ce59cd891e652d69777314c44b3a48a293edd"
+source = "git+https://gitlab.com/tezos/tezos.git#70187e57c4f994f44f4461f3cb4498d47c426c7d"
 dependencies = [
  "tezos-smart-rollup-build-utils",
  "tezos-smart-rollup-core",
@@ -1737,7 +1748,7 @@ dependencies = [
 [[package]]
 name = "tezos-smart-rollup-mock"
 version = "0.2.2"
-source = "git+https://gitlab.com/tezos/tezos.git#646ce59cd891e652d69777314c44b3a48a293edd"
+source = "git+https://gitlab.com/tezos/tezos.git#70187e57c4f994f44f4461f3cb4498d47c426c7d"
 dependencies = [
  "hex",
  "tezos-smart-rollup-core",
@@ -1750,7 +1761,7 @@ dependencies = [
 [[package]]
 name = "tezos-smart-rollup-utils"
 version = "0.2.2"
-source = "git+https://gitlab.com/tezos/tezos.git#646ce59cd891e652d69777314c44b3a48a293edd"
+source = "git+https://gitlab.com/tezos/tezos.git#70187e57c4f994f44f4461f3cb4498d47c426c7d"
 dependencies = [
  "clap",
  "hex",
@@ -1767,7 +1778,7 @@ dependencies = [
 [[package]]
 name = "tezos_crypto_rs"
 version = "0.6.0"
-source = "git+https://gitlab.com/tezos/tezos.git#646ce59cd891e652d69777314c44b3a48a293edd"
+source = "git+https://gitlab.com/tezos/tezos.git#70187e57c4f994f44f4461f3cb4498d47c426c7d"
 dependencies = [
  "anyhow",
  "bs58",
@@ -1792,7 +1803,7 @@ dependencies = [
 [[package]]
 name = "tezos_data_encoding"
 version = "0.6.0"
-source = "git+https://gitlab.com/tezos/tezos.git#646ce59cd891e652d69777314c44b3a48a293edd"
+source = "git+https://gitlab.com/tezos/tezos.git#70187e57c4f994f44f4461f3cb4498d47c426c7d"
 dependencies = [
  "bit-vec",
  "bitvec",
@@ -1809,7 +1820,7 @@ dependencies = [
 [[package]]
 name = "tezos_data_encoding_derive"
 version = "0.6.0"
-source = "git+https://gitlab.com/tezos/tezos.git#646ce59cd891e652d69777314c44b3a48a293edd"
+source = "git+https://gitlab.com/tezos/tezos.git#70187e57c4f994f44f4461f3cb4498d47c426c7d"
 dependencies = [
  "lazy_static",
  "once_cell",
@@ -1902,6 +1913,17 @@ dependencies = [
  "winnow",
 ]
 
+[[package]]
+name = "trait-set"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b79e2e9c9ab44c6d7c20d5976961b47e8f49ac199154daa514b77cd1ab536625"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
 [[package]]
 name = "try-blocks"
 version = "0.1.4"