diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a417ef83738..b94f95430d4 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -109,6 +109,22 @@ jobs:
           - macOS-latest
           # - windows-latest
     steps:
+      - name: Free Disk Space (Ubuntu)
+        if: runner.os == 'Linux'
+        uses: jlumbroso/free-disk-space@main
+        with:
+          # this might remove tools that are actually needed,
+          # if set to "true" but frees about 6 GB
+          tool-cache: false
+
+          # all of these default to true, but feel free to set to
+          # "false" if necessary for your workflow
+          android: true
+          dotnet: true
+          haskell: true
+          large-packages: false
+          docker-images: true
+          swap-storage: true
       - uses: ilammy/setup-nasm@v1
       - uses: actions/checkout@v3
         with:
diff --git a/Cargo.lock b/Cargo.lock
index 208497e2c4c..a6900b0e321 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -75,15 +75,6 @@ dependencies = [
  "version_check",
 ]
 
-[[package]]
-name = "aho-corasick"
-version = "0.7.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac"
-dependencies = [
- "memchr",
-]
-
 [[package]]
 name = "aho-corasick"
 version = "1.0.2"
@@ -125,9 +116,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.71"
+version = "1.0.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8"
+checksum = "3b13c32d80ecc7ab747b80c3784bce54ee8a7a0cc4fbda9bf4cda2cf6fe90854"
 
 [[package]]
 name = "arrayref"
@@ -144,7 +135,7 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 [[package]]
 name = "as-ffi-bindings"
 version = "0.2.5"
-source = "git+https://github.com/massalabs/as-ffi-bindings.git?tag=v0.4.0#7767634dfc22407bd2b0fa0e4fd7432231b10dd7"
+source = "git+https://github.com/massalabs/as-ffi-bindings.git?tag=0.5.0#512792515055573e600c0054a4b44bbcbfeb779a"
 dependencies = [
  "anyhow",
  "wasmer",
@@ -176,20 +167,20 @@ version = "0.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193"
 dependencies = [
- "proc-macro2 1.0.63",
- "quote 1.0.29",
- "syn 2.0.23",
+ "proc-macro2 1.0.66",
+ "quote 1.0.32",
+ "syn 2.0.27",
 ]
 
 [[package]]
 name = "async-trait"
-version = "0.1.70"
+version = "0.1.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79fa67157abdfd688a259b6648808757db9347af834624f27ec646da976aee5d"
+checksum = "cc6dde6e4ed435a4c1ee4e73592f5ba9da2151af10076cc04858746af9352d09"
 dependencies = [
- "proc-macro2 1.0.63",
- "quote 1.0.29",
- "syn 2.0.23",
+ "proc-macro2 1.0.66",
+ "quote 1.0.32",
+ "syn 2.0.27",
 ]
 
 [[package]]
@@ -211,9 +202,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
 [[package]]
 name = "axum"
-version = "0.6.18"
+version = "0.6.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8175979259124331c1d7bf6586ee7e0da434155e4b2d48ec2c8386281d8df39"
+checksum = "a6a1de45611fdb535bfde7b7de4fd54f4fd2b17b1737c0a59b69bf9b92074b8c"
 dependencies = [
  "async-trait",
  "axum-core",
@@ -308,8 +299,8 @@ dependencies = [
  "lazy_static",
  "lazycell",
  "peeking_take_while",
- "proc-macro2 1.0.63",
- "quote 1.0.29",
+ "proc-macro2 1.0.66",
+ "quote 1.0.32",
  "regex",
  "rustc-hash",
  "shlex",
@@ -392,7 +383,7 @@ dependencies = [
  "borsh-derive-internal",
  "borsh-schema-derive-internal",
  "proc-macro-crate 0.1.5",
- "proc-macro2 1.0.63",
+ "proc-macro2 1.0.66",
  "syn 1.0.109",
 ]
 
@@ -402,8 +393,8 @@ version = "0.10.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "afb438156919598d2c7bad7e1c0adf3d26ed3840dbc010db1a882a65583ca2fb"
 dependencies = [
- "proc-macro2 1.0.63",
- "quote 1.0.29",
+ "proc-macro2 1.0.66",
+ "quote 1.0.32",
  "syn 1.0.109",
 ]
 
@@ -413,8 +404,8 @@ version = "0.10.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "634205cc43f74a1b9046ef87c4540ebda95696ec0f315024860cad7c5b0f5ccd"
 dependencies = [
- "proc-macro2 1.0.63",
- "quote 1.0.29",
+ "proc-macro2 1.0.66",
+ "quote 1.0.32",
  "syn 1.0.109",
 ]
 
@@ -429,9 +420,9 @@ dependencies = [
 
 [[package]]
 name = "bstr"
-version = "1.5.0"
+version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a246e68bb43f6cd9db24bea052a53e40405417c5fb372e3d1a8a7f770a564ef5"
+checksum = "6798148dccfbff0fae41c7574d2fa8f1ef3492fba0face179de5d8d447d67b05"
 dependencies = [
  "memchr",
  "serde",
@@ -460,8 +451,8 @@ version = "0.6.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a7ec4c6f261935ad534c0c22dbef2201b45918860eb1c574b972bd213a76af61"
 dependencies = [
- "proc-macro2 1.0.63",
- "quote 1.0.29",
+ "proc-macro2 1.0.66",
+ "quote 1.0.32",
  "syn 1.0.109",
 ]
 
@@ -983,12 +974,12 @@ dependencies = [
 
 [[package]]
 name = "darling"
-version = "0.20.1"
+version = "0.20.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0558d22a7b463ed0241e993f76f09f30b126687447751a8638587b864e4b3944"
+checksum = "0209d94da627ab5605dcccf08bb18afa5009cfbef48d8a8b7d7bdbc79be25c5e"
 dependencies = [
- "darling_core 0.20.1",
- "darling_macro 0.20.1",
+ "darling_core 0.20.3",
+ "darling_macro 0.20.3",
 ]
 
 [[package]]
@@ -999,24 +990,24 @@ checksum = "109c1ca6e6b7f82cc233a97004ea8ed7ca123a9af07a8230878fcfda9b158bf0"
 dependencies = [
  "fnv",
  "ident_case",
- "proc-macro2 1.0.63",
- "quote 1.0.29",
+ "proc-macro2 1.0.66",
+ "quote 1.0.32",
  "strsim 0.10.0",
  "syn 1.0.109",
 ]
 
 [[package]]
 name = "darling_core"
-version = "0.20.1"
+version = "0.20.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab8bfa2e259f8ee1ce5e97824a3c55ec4404a0d772ca7fa96bf19f0752a046eb"
+checksum = "177e3443818124b357d8e76f53be906d60937f0d3a90773a664fa63fa253e621"
 dependencies = [
  "fnv",
  "ident_case",
- "proc-macro2 1.0.63",
- "quote 1.0.29",
+ "proc-macro2 1.0.66",
+ "quote 1.0.32",
  "strsim 0.10.0",
- "syn 2.0.23",
+ "syn 2.0.27",
 ]
 
 [[package]]
@@ -1026,29 +1017,29 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e"
 dependencies = [
  "darling_core 0.14.4",
- "quote 1.0.29",
+ "quote 1.0.32",
  "syn 1.0.109",
 ]
 
 [[package]]
 name = "darling_macro"
-version = "0.20.1"
+version = "0.20.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29a358ff9f12ec09c3e61fef9b5a9902623a695a46a917b07f269bff1445611a"
+checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5"
 dependencies = [
- "darling_core 0.20.1",
- "quote 1.0.29",
- "syn 2.0.23",
+ "darling_core 0.20.3",
+ "quote 1.0.32",
+ "syn 2.0.27",
 ]
 
 [[package]]
 name = "dashmap"
-version = "5.4.0"
+version = "5.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "907076dfda823b0b36d2a1bb5f90c96660a5bbcd7729e10727f07858f22c4edc"
+checksum = "6943ae99c34386c84a470c499d3414f66502a41340aa895406e0d2e4a207b91d"
 dependencies = [
  "cfg-if",
- "hashbrown 0.12.3",
+ "hashbrown 0.14.0",
  "lock_api",
  "once_cell",
  "parking_lot_core",
@@ -1060,8 +1051,8 @@ version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b"
 dependencies = [
- "proc-macro2 1.0.63",
- "quote 1.0.29",
+ "proc-macro2 1.0.66",
+ "quote 1.0.32",
  "syn 1.0.109",
 ]
 
@@ -1150,9 +1141,9 @@ version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d"
 dependencies = [
- "proc-macro2 1.0.63",
- "quote 1.0.29",
- "syn 2.0.23",
+ "proc-macro2 1.0.66",
+ "quote 1.0.32",
+ "syn 2.0.27",
 ]
 
 [[package]]
@@ -1177,8 +1168,8 @@ dependencies = [
  "byteorder",
  "lazy_static",
  "proc-macro-error",
- "proc-macro2 1.0.63",
- "quote 1.0.29",
+ "proc-macro2 1.0.66",
+ "quote 1.0.32",
  "syn 1.0.109",
 ]
 
@@ -1219,9 +1210,9 @@ dependencies = [
 
 [[package]]
 name = "either"
-version = "1.8.1"
+version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91"
+checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07"
 
 [[package]]
 name = "encode_unicode"
@@ -1250,8 +1241,8 @@ version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c134c37760b27a871ba422106eedbb8247da973a09e82558bf26d619c882b159"
 dependencies = [
- "proc-macro2 1.0.63",
- "quote 1.0.29",
+ "proc-macro2 1.0.66",
+ "quote 1.0.32",
  "syn 1.0.109",
 ]
 
@@ -1262,8 +1253,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a8ea75f31022cba043afe037940d73684327e915f88f62478e778c3de914cd0a"
 dependencies = [
  "enum_delegate_lib",
- "proc-macro2 1.0.63",
- "quote 1.0.29",
+ "proc-macro2 1.0.66",
+ "quote 1.0.32",
  "syn 1.0.109",
 ]
 
@@ -1273,8 +1264,8 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2e1f6c3800b304a6be0012039e2a45a322a093539c45ab818d9e6895a39c90fe"
 dependencies = [
- "proc-macro2 1.0.63",
- "quote 1.0.29",
+ "proc-macro2 1.0.66",
+ "quote 1.0.32",
  "rand 0.8.5",
  "syn 1.0.109",
 ]
@@ -1294,23 +1285,23 @@ version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e08b6c6ab82d70f08844964ba10c7babb716de2ecaeab9be5717918a5177d3af"
 dependencies = [
- "darling 0.20.1",
- "proc-macro2 1.0.63",
- "quote 1.0.29",
- "syn 2.0.23",
+ "darling 0.20.3",
+ "proc-macro2 1.0.66",
+ "quote 1.0.32",
+ "syn 2.0.27",
 ]
 
 [[package]]
 name = "equivalent"
-version = "1.0.0"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88bffebc5d80432c9b140ee17875ff173a8ab62faad5b257da912bd2f6c1c0a1"
+checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
 
 [[package]]
 name = "erased-serde"
-version = "0.3.27"
+version = "0.3.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f94c0e13118e7d7533271f754a168ae8400e6a1cc043f2bfd53cc7290f1a1de3"
+checksum = "da96524cc884f6558f1769b6c46686af2fe8e8b4cd253bd5a3cdba8181b8e070"
 dependencies = [
  "serde",
 ]
@@ -1360,12 +1351,9 @@ checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7"
 
 [[package]]
 name = "fastrand"
-version = "1.9.0"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be"
-dependencies = [
- "instant",
-]
+checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764"
 
 [[package]]
 name = "fd-lock"
@@ -1374,7 +1362,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ef033ed5e9bad94e55838ca0ca906db0e043f517adda0c8b79c7a8c66c93c1b5"
 dependencies = [
  "cfg-if",
- "rustix 0.38.3",
+ "rustix 0.38.4",
  "windows-sys 0.48.0",
 ]
 
@@ -1499,9 +1487,9 @@ version = "0.3.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72"
 dependencies = [
- "proc-macro2 1.0.63",
- "quote 1.0.29",
- "syn 2.0.23",
+ "proc-macro2 1.0.66",
+ "quote 1.0.32",
+ "syn 2.0.27",
 ]
 
 [[package]]
@@ -1620,11 +1608,11 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
 
 [[package]]
 name = "globset"
-version = "0.4.10"
+version = "0.4.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "029d74589adefde59de1a0c4f4732695c32805624aec7b68d91503d4dba79afc"
+checksum = "1391ab1f92ffcc08911957149833e682aa3fe252b9f45f966d2ef972274c97df"
 dependencies = [
- "aho-corasick 0.7.20",
+ "aho-corasick",
  "bstr",
  "fnv",
  "log",
@@ -1633,14 +1621,15 @@ dependencies = [
 
 [[package]]
 name = "gloo-net"
-version = "0.2.6"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9902a044653b26b99f7e3693a42f171312d9be8b26b5697bd1e43ad1f8a35e10"
+checksum = "a66b4e3c7d9ed8d315fd6b97c8b1f74a7c6ecbbc2320e65ae7ed38b7068cc620"
 dependencies = [
  "futures-channel",
  "futures-core",
  "futures-sink",
  "gloo-utils",
+ "http",
  "js-sys",
  "pin-project",
  "serde",
@@ -1840,9 +1829,9 @@ dependencies = [
 
 [[package]]
 name = "http-range-header"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0bfe8eed0a9285ef776bb792479ea3834e8b94e13d615c2f66d03dd50a435a29"
+checksum = "add0ab9360ddbd88cfeb3bd9574a1d85cfdfa14db10b3e21d3700dbc4328758f"
 
 [[package]]
 name = "httparse"
@@ -1900,7 +1889,7 @@ dependencies = [
  "rustls-native-certs",
  "tokio",
  "tokio-rustls",
- "webpki-roots",
+ "webpki-roots 0.23.1",
 ]
 
 [[package]]
@@ -1984,15 +1973,6 @@ dependencies = [
  "generic-array",
 ]
 
-[[package]]
-name = "instant"
-version = "0.1.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
-dependencies = [
- "cfg-if",
-]
-
 [[package]]
 name = "io-lifetimes"
 version = "1.0.11"
@@ -2015,9 +1995,9 @@ dependencies = [
 
 [[package]]
 name = "itoa"
-version = "1.0.8"
+version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62b02a5381cc465bd3041d84623d0fa3b66738b52b8e2fc3bab8ad63ab032f4a"
+checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38"
 
 [[package]]
 name = "jobserver"
@@ -2050,9 +2030,9 @@ dependencies = [
 
 [[package]]
 name = "jsonrpsee"
-version = "0.18.2"
+version = "0.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1822d18e4384a5e79d94dc9e4d1239cfa9fad24e55b44d2efeff5b394c9fece4"
+checksum = "e5f3783308bddc49d0218307f66a09330c106fbd792c58bac5c8dc294fdd0f98"
 dependencies = [
  "jsonrpsee-client-transport",
  "jsonrpsee-core",
@@ -2067,9 +2047,9 @@ dependencies = [
 
 [[package]]
 name = "jsonrpsee-client-transport"
-version = "0.18.2"
+version = "0.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "11aa5766d5c430b89cb26a99b88f3245eb91534be8126102cea9e45ee3891b22"
+checksum = "abc5630e4fa0096f00ec7b44d520701fda4504170cb85e22dca603ae5d7ad0d7"
 dependencies = [
  "futures-channel",
  "futures-util",
@@ -2084,14 +2064,14 @@ dependencies = [
  "tokio-rustls",
  "tokio-util",
  "tracing",
- "webpki-roots",
+ "webpki-roots 0.24.0",
 ]
 
 [[package]]
 name = "jsonrpsee-core"
-version = "0.18.2"
+version = "0.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64c6832a55f662b5a6ecc844db24b8b9c387453f923de863062c60ce33d62b81"
+checksum = "5aaa4c4d5fb801dcc316d81f76422db259809037a86b3194ae538dd026b05ed7"
 dependencies = [
  "anyhow",
  "async-lock",
@@ -2117,9 +2097,9 @@ dependencies = [
 
 [[package]]
 name = "jsonrpsee-http-client"
-version = "0.18.2"
+version = "0.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1705c65069729e3dccff6fd91ee431d5d31cabcf00ce68a62a2c6435ac713af9"
+checksum = "aa7165efcbfbc951d180162ff28fe91b657ed81925e37a35e4a396ce12109f96"
 dependencies = [
  "async-trait",
  "hyper",
@@ -2136,22 +2116,22 @@ dependencies = [
 
 [[package]]
 name = "jsonrpsee-proc-macros"
-version = "0.18.2"
+version = "0.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6027ac0b197ce9543097d02a290f550ce1d9432bf301524b013053c0b75cc94"
+checksum = "21dc12b1d4f16a86e8c522823c4fab219c88c03eb7c924ec0501a64bf12e058b"
 dependencies = [
  "heck 0.4.1",
  "proc-macro-crate 1.3.1",
- "proc-macro2 1.0.63",
- "quote 1.0.29",
+ "proc-macro2 1.0.66",
+ "quote 1.0.32",
  "syn 1.0.109",
 ]
 
 [[package]]
 name = "jsonrpsee-server"
-version = "0.18.2"
+version = "0.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f06661d1a6b6e5b85469dc9c29acfbb9b3bb613797a6fd10a3ebb8a70754057"
+checksum = "6e79d78cfd5abd8394da10753723093c3ff64391602941c9c4b1d80a3414fd53"
 dependencies = [
  "futures-util",
  "hyper",
@@ -2169,9 +2149,9 @@ dependencies = [
 
 [[package]]
 name = "jsonrpsee-types"
-version = "0.18.2"
+version = "0.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e5bf6c75ce2a4217421154adfc65a24d2b46e77286e59bba5d9fa6544ccc8f4"
+checksum = "00aa7cc87bc42e04e26c8ac3e7186142f7fd2949c763d9b6a7e64a69672d8fb2"
 dependencies = [
  "anyhow",
  "beef",
@@ -2183,9 +2163,9 @@ dependencies = [
 
 [[package]]
 name = "jsonrpsee-wasm-client"
-version = "0.18.2"
+version = "0.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34e6ea7c6d862e60f8baebd946c037b70c6808a4e4e31e792a4029184e3ce13a"
+checksum = "0fe953c2801356f214d3f4051f786b3d11134512a46763ee8c39a9e3fa2cc1c0"
 dependencies = [
  "jsonrpsee-client-transport",
  "jsonrpsee-core",
@@ -2194,9 +2174,9 @@ dependencies = [
 
 [[package]]
 name = "jsonrpsee-ws-client"
-version = "0.18.2"
+version = "0.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a64b2589680ba1ad7863f279cd2d5083c1dc0a7c0ea959d22924553050f8ab9f"
+checksum = "5c71b2597ec1c958c6d5bc94bb61b44d74eb28e69dc421731ab0035706f13882"
 dependencies = [
  "http",
  "jsonrpsee-client-transport",
@@ -2319,9 +2299,9 @@ dependencies = [
 
 [[package]]
 name = "libz-sys"
-version = "1.1.9"
+version = "1.1.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56ee889ecc9568871456d42f603d6a0ce59ff328d291063a45cbdf0036baf6db"
+checksum = "d97137b25e321a73eef1418d1d5d2eda4d77e12813f8e6dead84bc52c5870a7b"
 dependencies = [
  "cc",
  "pkg-config",
@@ -2340,12 +2320,6 @@ version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4"
 
-[[package]]
-name = "linux-raw-sys"
-version = "0.3.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519"
-
 [[package]]
 name = "linux-raw-sys"
 version = "0.4.3"
@@ -2384,7 +2358,7 @@ version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c0fbfc88337168279f2e9ae06e157cfed4efd3316e14dc96ed074d4f2e6c5952"
 dependencies = [
- "quote 1.0.29",
+ "quote 1.0.32",
  "syn 1.0.109",
 ]
 
@@ -2511,7 +2485,7 @@ dependencies = [
 [[package]]
 name = "massa-proto-rs"
 version = "0.1.0"
-source = "git+https://github.com/massalabs/massa-proto-rs?rev=18ec02f#18ec02ff5bccedc64b3788964e9d78ccb9559567"
+source = "git+https://github.com/massalabs/massa-proto-rs?rev=32179e2#32179e291bb1ad521d362390318d7dad80c04026"
 dependencies = [
  "glob",
  "prost",
@@ -2524,7 +2498,7 @@ dependencies = [
 [[package]]
 name = "massa-sc-runtime"
 version = "0.10.0"
-source = "git+https://github.com/massalabs/massa-sc-runtime?branch=main#ca2c7f1b4e5fb24764f9f34bd38c70bfd6aa526a"
+source = "git+https://github.com/massalabs/massa-sc-runtime?branch=main#a2ad6ea81ee6ad7b217319667529fa17410a07b4"
 dependencies = [
  "anyhow",
  "as-ffi-bindings",
@@ -2535,7 +2509,7 @@ dependencies = [
  "glob",
  "loupe",
  "more-asserts 0.3.1",
- "num_enum",
+ "num_enum 0.6.1",
  "parking_lot",
  "prost",
  "prost-build",
@@ -2544,7 +2518,7 @@ dependencies = [
  "regex",
  "serde",
  "serde_json",
- "serial_test 1.0.0",
+ "serial_test 2.0.0",
  "sha2 0.10.6",
  "thiserror",
  "tracing",
@@ -2663,7 +2637,7 @@ dependencies = [
  "mockall",
  "nom",
  "num",
- "num_enum",
+ "num_enum 0.5.11",
  "parking_lot",
  "rand 0.8.5",
  "serde",
@@ -2934,8 +2908,8 @@ dependencies = [
  "futures-util",
  "h2",
  "hyper",
- "itertools",
  "massa-proto-rs",
+ "massa_bootstrap",
  "massa_channel",
  "massa_consensus_exports",
  "massa_execution_exports",
@@ -2945,11 +2919,13 @@ dependencies = [
  "massa_pos_exports",
  "massa_protocol_exports",
  "massa_serialization",
+ "massa_signature",
  "massa_storage",
  "massa_time",
  "massa_versioning",
  "massa_wallet",
  "num",
+ "parking_lot",
  "serde",
  "thiserror",
  "tokio",
@@ -2990,7 +2966,7 @@ dependencies = [
  "massa_models",
  "massa_serialization",
  "nom",
- "num_enum",
+ "num_enum 0.5.11",
  "serde",
  "serde_json",
  "tempfile",
@@ -3050,7 +3026,7 @@ dependencies = [
  "massa_time",
  "nom",
  "num",
- "num_enum",
+ "num_enum 0.5.11",
  "rust_decimal",
  "serde",
  "serde_with",
@@ -3070,7 +3046,7 @@ dependencies = [
  "massa_models",
  "massa_serialization",
  "nom",
- "num_enum",
+ "num_enum 0.5.11",
  "rand 0.8.5",
  "rocksdb",
  "schnellru",
@@ -3195,7 +3171,7 @@ dependencies = [
  "massa_versioning",
  "nom",
  "num",
- "num_enum",
+ "num_enum 0.5.11",
  "parking_lot",
  "peernet",
  "rand 0.8.5",
@@ -3269,6 +3245,7 @@ name = "massa_time"
 version = "0.24.0"
 dependencies = [
  "displaydoc",
+ "massa-proto-rs",
  "massa_serialization",
  "nom",
  "serde",
@@ -3292,7 +3269,7 @@ dependencies = [
  "more-asserts 0.3.1",
  "nom",
  "num",
- "num_enum",
+ "num_enum 0.5.11",
  "parking_lot",
  "tempfile",
  "thiserror",
@@ -3430,8 +3407,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "22ce75669015c4f47b289fd4d4f56e894e4c96003ffdf3ac51313126f94c6cbb"
 dependencies = [
  "cfg-if",
- "proc-macro2 1.0.63",
- "quote 1.0.29",
+ "proc-macro2 1.0.66",
+ "quote 1.0.32",
  "syn 1.0.109",
 ]
 
@@ -3514,9 +3491,9 @@ dependencies = [
 
 [[package]]
 name = "num"
-version = "0.4.0"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43db66d1170d347f9a065114077f7dccb00c1b9478c89384490a3425279a4606"
+checksum = "b05180d69e3da0e530ba2a1dae5110317e49e3b7f3d41be227dc5f92e49ee7af"
 dependencies = [
  "num-bigint",
  "num-complex",
@@ -3584,9 +3561,9 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.15"
+version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd"
+checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2"
 dependencies = [
  "autocfg",
  "libm",
@@ -3608,7 +3585,16 @@ version = "0.5.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9"
 dependencies = [
- "num_enum_derive",
+ "num_enum_derive 0.5.11",
+]
+
+[[package]]
+name = "num_enum"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a015b430d3c108a207fd776d2e2196aaf8b1cf8cf93253e3a097ff3085076a1"
+dependencies = [
+ "num_enum_derive 0.6.1",
 ]
 
 [[package]]
@@ -3618,11 +3604,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799"
 dependencies = [
  "proc-macro-crate 1.3.1",
- "proc-macro2 1.0.63",
- "quote 1.0.29",
+ "proc-macro2 1.0.66",
+ "quote 1.0.32",
  "syn 1.0.109",
 ]
 
+[[package]]
+name = "num_enum_derive"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96667db765a921f7b295ffee8b60472b686a51d4f21c2ee4ffdb94c7013b65a6"
+dependencies = [
+ "proc-macro-crate 1.3.1",
+ "proc-macro2 1.0.66",
+ "quote 1.0.32",
+ "syn 2.0.27",
+]
+
 [[package]]
 name = "object"
 version = "0.28.4"
@@ -3761,8 +3759,8 @@ version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0f35583365be5d148e959284f42526841917b7bfa09e2d1a7ad5dde2cf0eaa39"
 dependencies = [
- "proc-macro2 1.0.63",
- "quote 1.0.29",
+ "proc-macro2 1.0.66",
+ "quote 1.0.32",
  "syn 1.0.109",
 ]
 
@@ -3814,9 +3812,9 @@ checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94"
 
 [[package]]
 name = "pest"
-version = "2.7.0"
+version = "2.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f73935e4d55e2abf7f130186537b19e7a4abc886a0252380b59248af473a3fc9"
+checksum = "0d2d1d55045829d65aad9d389139882ad623b33b904e7c9f1b10c5b8927298e5"
 dependencies = [
  "thiserror",
  "ucd-trie",
@@ -3824,9 +3822,9 @@ dependencies = [
 
 [[package]]
 name = "pest_derive"
-version = "2.7.0"
+version = "2.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aef623c9bbfa0eedf5a0efba11a5ee83209c326653ca31ff019bec3a95bfff2b"
+checksum = "5f94bca7e7a599d89dea5dfa309e217e7906c3c007fb9c3299c40b10d6a315d3"
 dependencies = [
  "pest",
  "pest_generator",
@@ -3834,22 +3832,22 @@ dependencies = [
 
 [[package]]
 name = "pest_generator"
-version = "2.7.0"
+version = "2.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3e8cba4ec22bada7fc55ffe51e2deb6a0e0db2d0b7ab0b103acc80d2510c190"
+checksum = "99d490fe7e8556575ff6911e45567ab95e71617f43781e5c05490dc8d75c965c"
 dependencies = [
  "pest",
  "pest_meta",
- "proc-macro2 1.0.63",
- "quote 1.0.29",
- "syn 2.0.23",
+ "proc-macro2 1.0.66",
+ "quote 1.0.32",
+ "syn 2.0.27",
 ]
 
 [[package]]
 name = "pest_meta"
-version = "2.7.0"
+version = "2.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a01f71cb40bd8bb94232df14b946909e14660e33fc05db3e50ae2a82d7ea0ca0"
+checksum = "2674c66ebb4b4d9036012091b537aae5878970d6999f81a265034d85b136b341"
 dependencies = [
  "once_cell",
  "pest",
@@ -3881,9 +3879,9 @@ version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ec2e072ecce94ec471b13398d5402c188e76ac03cf74dd1a975161b23a3f6d9c"
 dependencies = [
- "proc-macro2 1.0.63",
- "quote 1.0.29",
- "syn 2.0.23",
+ "proc-macro2 1.0.66",
+ "quote 1.0.32",
+ "syn 2.0.27",
 ]
 
 [[package]]
@@ -3986,7 +3984,7 @@ version = "0.1.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6c8646e95016a7a6c4adea95bafa8a16baab64b583356217f2c85db4a39d9a86"
 dependencies = [
- "proc-macro2 1.0.63",
+ "proc-macro2 1.0.66",
  "syn 1.0.109",
 ]
 
@@ -4016,8 +4014,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
 dependencies = [
  "proc-macro-error-attr",
- "proc-macro2 1.0.63",
- "quote 1.0.29",
+ "proc-macro2 1.0.66",
+ "quote 1.0.32",
  "syn 1.0.109",
  "version_check",
 ]
@@ -4028,8 +4026,8 @@ version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
 dependencies = [
- "proc-macro2 1.0.63",
- "quote 1.0.29",
+ "proc-macro2 1.0.66",
+ "quote 1.0.32",
  "version_check",
 ]
 
@@ -4044,9 +4042,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.63"
+version = "1.0.66"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b368fba921b0dce7e60f5e04ec15e565b3303972b42bcfde1d0713b881959eb"
+checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9"
 dependencies = [
  "unicode-ident",
 ]
@@ -4121,8 +4119,8 @@ checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4"
 dependencies = [
  "anyhow",
  "itertools",
- "proc-macro2 1.0.63",
- "quote 1.0.29",
+ "proc-macro2 1.0.66",
+ "quote 1.0.32",
  "syn 1.0.109",
 ]
 
@@ -4156,8 +4154,8 @@ version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "16b845dbfca988fa33db069c0e230574d15a3088f147a87b64c7589eb662c9ac"
 dependencies = [
- "proc-macro2 1.0.63",
- "quote 1.0.29",
+ "proc-macro2 1.0.66",
+ "quote 1.0.32",
  "syn 1.0.109",
 ]
 
@@ -4189,11 +4187,11 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.29"
+version = "1.0.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "573015e8ab27661678357f27dc26460738fd2b6c86e46f386fde94cb5d913105"
+checksum = "50f3b39ccfb720540debaa0164757101c08ecb8d326b15358ce76a62c7e85965"
 dependencies = [
- "proc-macro2 1.0.63",
+ "proc-macro2 1.0.66",
 ]
 
 [[package]]
@@ -4367,11 +4365,11 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.9.0"
+version = "1.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89089e897c013b3deb627116ae56a6955a72b8bed395c9526af31c9fe528b484"
+checksum = "b2eae68fc220f7cf2532e4494aded17545fce192d59cd996e0fe7887f4ceb575"
 dependencies = [
- "aho-corasick 1.0.2",
+ "aho-corasick",
  "memchr",
  "regex-automata",
  "regex-syntax",
@@ -4379,20 +4377,20 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.3.0"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa250384981ea14565685dea16a9ccc4d1c541a13f82b9c168572264d1df8c56"
+checksum = "39354c10dd07468c2e73926b23bb9c2caca74c5501e38a35da70406f1d923310"
 dependencies = [
- "aho-corasick 1.0.2",
+ "aho-corasick",
  "memchr",
  "regex-syntax",
 ]
 
 [[package]]
 name = "regex-syntax"
-version = "0.7.3"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ab07dc67230e4a4718e70fd5c20055a4334b121f1f9db8fe63ef39ce9b8c846"
+checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2"
 
 [[package]]
 name = "region"
@@ -4454,8 +4452,8 @@ version = "0.7.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b2e06b915b5c230a17d7a736d1e2e63ee753c256a8614ef3f5147b13a4f5541d"
 dependencies = [
- "proc-macro2 1.0.63",
- "quote 1.0.29",
+ "proc-macro2 1.0.66",
+ "quote 1.0.32",
  "syn 1.0.109",
 ]
 
@@ -4536,23 +4534,9 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "0.37.23"
+version = "0.38.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d69718bf81c6127a49dc64e44a742e8bb9213c0ff8869a22c308f84c1d4ab06"
-dependencies = [
- "bitflags 1.3.2",
- "errno",
- "io-lifetimes",
- "libc",
- "linux-raw-sys 0.3.8",
- "windows-sys 0.48.0",
-]
-
-[[package]]
-name = "rustix"
-version = "0.38.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac5ffa1efe7548069688cd7028f32591853cd7b5b756d41bcffd2353e4fc75b4"
+checksum = "0a962918ea88d644592894bc6dc55acc6c0956488adcebbfb6e273506b7fd6e5"
 dependencies = [
  "bitflags 2.3.3",
  "errno",
@@ -4563,13 +4547,13 @@ dependencies = [
 
 [[package]]
 name = "rustls"
-version = "0.21.2"
+version = "0.21.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e32ca28af694bc1bbf399c33a516dbdf1c90090b8ab23c2bc24f834aa2247f5f"
+checksum = "79ea77c539259495ce8ca47f53e66ae0330a8819f67e23ac96ca02f50e7b7d36"
 dependencies = [
  "log",
  "ring",
- "rustls-webpki",
+ "rustls-webpki 0.101.2",
  "sct",
 ]
 
@@ -4604,11 +4588,21 @@ dependencies = [
  "untrusted",
 ]
 
+[[package]]
+name = "rustls-webpki"
+version = "0.101.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "513722fd73ad80a71f72b61009ea1b584bcfa1483ca93949c8f290298837fa59"
+dependencies = [
+ "ring",
+ "untrusted",
+]
+
 [[package]]
 name = "rustversion"
-version = "1.0.13"
+version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc31bd9b61a32c31f9650d18add92aa83a49ba979c143eefd27fe7177b05bd5f"
+checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4"
 
 [[package]]
 name = "rustyline"
@@ -4639,16 +4633,16 @@ version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "107c3d5d7f370ac09efa62a78375f94d94b8a33c61d8c278b96683fb4dbf2d8d"
 dependencies = [
- "proc-macro2 1.0.63",
- "quote 1.0.29",
+ "proc-macro2 1.0.66",
+ "quote 1.0.32",
  "syn 1.0.109",
 ]
 
 [[package]]
 name = "ryu"
-version = "1.0.14"
+version = "1.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe232bdf6be8c8de797b22184ee71118d63780ea42ac85b61d1baa6d3b782ae9"
+checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741"
 
 [[package]]
 name = "same-file"
@@ -4681,9 +4675,9 @@ dependencies = [
 
 [[package]]
 name = "scopeguard"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
+checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 
 [[package]]
 name = "sct"
@@ -4703,9 +4697,9 @@ checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b"
 
 [[package]]
 name = "security-framework"
-version = "2.9.1"
+version = "2.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fc758eb7bffce5b308734e9b0c1468893cae9ff70ebf13e7090be8dcbcc83a8"
+checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de"
 dependencies = [
  "bitflags 1.3.2",
  "core-foundation",
@@ -4716,9 +4710,9 @@ dependencies = [
 
 [[package]]
 name = "security-framework-sys"
-version = "2.9.0"
+version = "2.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f51d0c0d83bec45f16480d0ce0058397a69e48fcdc52d1dc8855fb68acbd31a7"
+checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -4732,9 +4726,9 @@ checksum = "f638d531eccd6e23b980caf34876660d38e265409d8e99b397ab71eb3612fad0"
 
 [[package]]
 name = "serde"
-version = "1.0.166"
+version = "1.0.175"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d01b7404f9d441d3ad40e6a636a7782c377d2abdbe4fa2440e2edcc2f4f10db8"
+checksum = "5d25439cd7397d044e2748a6fe2432b5e85db703d6d097bd014b3c0ad1ebff0b"
 dependencies = [
  "serde_derive",
 ]
@@ -4752,20 +4746,20 @@ dependencies = [
 
 [[package]]
 name = "serde_derive"
-version = "1.0.166"
+version = "1.0.175"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5dd83d6dde2b6b2d466e14d9d1acce8816dedee94f735eac6395808b3483c6d6"
+checksum = "b23f7ade6f110613c0d63858ddb8b94c1041f550eab58a16b371bdf2c9c80ab4"
 dependencies = [
- "proc-macro2 1.0.63",
- "quote 1.0.29",
- "syn 2.0.23",
+ "proc-macro2 1.0.66",
+ "quote 1.0.32",
+ "syn 2.0.27",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.100"
+version = "1.0.103"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f1e14e89be7aa4c4b78bdbdc9eb5bf8517829a600ae8eaa39a6e1d960b5185c"
+checksum = "d03b412469450d4404fe8499a268edd7f8b79fecb074b0d812ad64ca21f4031b"
 dependencies = [
  "itoa",
  "ryu",
@@ -4805,10 +4799,10 @@ version = "2.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "881b6f881b17d13214e5d494c939ebab463d01264ce1811e9d4ac3a882e7695f"
 dependencies = [
- "darling 0.20.1",
- "proc-macro2 1.0.63",
- "quote 1.0.29",
- "syn 2.0.23",
+ "darling 0.20.3",
+ "proc-macro2 1.0.66",
+ "quote 1.0.32",
+ "syn 2.0.27",
 ]
 
 [[package]]
@@ -4845,8 +4839,8 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "079a83df15f85d89a68d64ae1238f142f172b1fa915d0d76b26a7cba1b659a69"
 dependencies = [
- "proc-macro2 1.0.63",
- "quote 1.0.29",
+ "proc-macro2 1.0.66",
+ "quote 1.0.32",
  "syn 1.0.109",
 ]
 
@@ -4856,9 +4850,9 @@ version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "91d129178576168c589c9ec973feedf7d3126c01ac2bf08795109aa35b69fb8f"
 dependencies = [
- "proc-macro2 1.0.63",
- "quote 1.0.29",
- "syn 2.0.23",
+ "proc-macro2 1.0.66",
+ "quote 1.0.32",
+ "syn 2.0.27",
 ]
 
 [[package]]
@@ -4967,9 +4961,9 @@ checksum = "826167069c09b99d56f31e9ae5c99049e932a98c9dc2dac47645b08dbbf76ba7"
 
 [[package]]
 name = "smallvec"
-version = "1.10.0"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0"
+checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9"
 
 [[package]]
 name = "socket2"
@@ -5053,8 +5047,8 @@ checksum = "dcb5ae327f9cc13b68763b5749770cb9e048a99bd9dfdfa58d0cf05d5f64afe0"
 dependencies = [
  "heck 0.3.3",
  "proc-macro-error",
- "proc-macro2 1.0.63",
- "quote 1.0.29",
+ "proc-macro2 1.0.66",
+ "quote 1.0.32",
  "syn 1.0.109",
 ]
 
@@ -5074,8 +5068,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59"
 dependencies = [
  "heck 0.4.1",
- "proc-macro2 1.0.63",
- "quote 1.0.29",
+ "proc-macro2 1.0.66",
+ "quote 1.0.32",
  "rustversion",
  "syn 1.0.109",
 ]
@@ -5085,7 +5079,7 @@ name = "substruct"
 version = "0.1.0"
 source = "git+https://github.com/sydhds/substruct#2fb3ae0dc9d913a0566ce6415eaa7a7ca1690fe1"
 dependencies = [
- "quote 1.0.29",
+ "quote 1.0.32",
  "syn 1.0.109",
 ]
 
@@ -5112,19 +5106,19 @@ version = "1.0.109"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
 dependencies = [
- "proc-macro2 1.0.63",
- "quote 1.0.29",
+ "proc-macro2 1.0.66",
+ "quote 1.0.32",
  "unicode-ident",
 ]
 
 [[package]]
 name = "syn"
-version = "2.0.23"
+version = "2.0.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59fb7d6d8281a51045d62b8eb3a7d1ce347b76f312af50cd3dc0af39c87c1737"
+checksum = "b60f673f44a8255b9c8c657daf66a596d435f2da81a555b06dc644d080ba45e0"
 dependencies = [
- "proc-macro2 1.0.63",
- "quote 1.0.29",
+ "proc-macro2 1.0.66",
+ "quote 1.0.32",
  "unicode-ident",
 ]
 
@@ -5142,21 +5136,20 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
 
 [[package]]
 name = "target-lexicon"
-version = "0.12.8"
+version = "0.12.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b1c7f239eb94671427157bd93b3694320f3668d4e1eff08c7285366fd777fac"
+checksum = "1d2faeef5759ab89935255b1a4cd98e0baf99d1085e37d36599c625dac49ae8e"
 
 [[package]]
 name = "tempfile"
-version = "3.6.0"
+version = "3.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31c0432476357e58790aaa47a8efb0c5138f137343f3b5f23bd36a27e3b0a6d6"
+checksum = "5486094ee78b2e5038a6382ed7645bc084dc2ec433426ca4c3cb61e2007b8998"
 dependencies = [
- "autocfg",
  "cfg-if",
  "fastrand",
  "redox_syscall 0.3.5",
- "rustix 0.37.23",
+ "rustix 0.38.4",
  "windows-sys 0.48.0",
 ]
 
@@ -5183,22 +5176,22 @@ checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d"
 
 [[package]]
 name = "thiserror"
-version = "1.0.41"
+version = "1.0.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c16a64ba9387ef3fdae4f9c1a7f07a0997fce91985c0336f1ddc1822b3b37802"
+checksum = "611040a08a0439f8248d1990b111c95baa9c704c805fa1f62104b39655fd7f90"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.41"
+version = "1.0.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d14928354b01c4d6a4f0e549069adef399a284e7995c7ccca94e8a07a5346c59"
+checksum = "090198534930841fab3a5d1bb637cde49e339654e606195f8d9c76eeb081dc96"
 dependencies = [
- "proc-macro2 1.0.63",
- "quote 1.0.29",
- "syn 2.0.23",
+ "proc-macro2 1.0.66",
+ "quote 1.0.32",
+ "syn 2.0.27",
 ]
 
 [[package]]
@@ -5224,9 +5217,9 @@ dependencies = [
 
 [[package]]
 name = "time"
-version = "0.3.22"
+version = "0.3.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea9e1b3cf1243ae005d9e74085d4d542f3125458f3a81af210d901dcd7411efd"
+checksum = "59e399c068f43a5d116fedaf73b203fa4f9c519f17e2b34f63221d3792f81446"
 dependencies = [
  "itoa",
  "serde",
@@ -5242,9 +5235,9 @@ checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb"
 
 [[package]]
 name = "time-macros"
-version = "0.2.9"
+version = "0.2.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "372950940a5f07bf38dbe211d7283c9e6d7327df53794992d293e534c733d09b"
+checksum = "96ba15a897f3c86766b757e5ac7221554c6750054d74d5b28844fce5fb36a6c4"
 dependencies = [
  "time-core",
 ]
@@ -5310,9 +5303,9 @@ version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e"
 dependencies = [
- "proc-macro2 1.0.63",
- "quote 1.0.29",
- "syn 2.0.23",
+ "proc-macro2 1.0.66",
+ "quote 1.0.32",
+ "syn 2.0.27",
 ]
 
 [[package]]
@@ -5369,9 +5362,9 @@ checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b"
 
 [[package]]
 name = "toml_edit"
-version = "0.19.11"
+version = "0.19.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "266f016b7f039eec8a1a80dfe6156b633d208b9fccca5e4db1d6775b0c4e34a7"
+checksum = "f8123f27e969974a3dfba720fdb560be359f57b44302d280ba72e76a74480e8a"
 dependencies = [
  "indexmap 2.0.0",
  "toml_datetime",
@@ -5417,9 +5410,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a6fdaae4c2c638bb70fe42803a26fbd6fc6ac8c72f5c59f67ecc2a2dcabf4b07"
 dependencies = [
  "prettyplease",
- "proc-macro2 1.0.63",
+ "proc-macro2 1.0.66",
  "prost-build",
- "quote 1.0.29",
+ "quote 1.0.32",
  "syn 1.0.109",
 ]
 
@@ -5492,9 +5485,9 @@ dependencies = [
 
 [[package]]
 name = "tower-http"
-version = "0.4.1"
+version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8bd22a874a2d0b70452d5597b12c537331d49060824a95f49f108994f94aa4c"
+checksum = "55ae70283aba8d2a8b411c695c437fe25b8b5e44e23e780662002fc72fb47a82"
 dependencies = [
  "bitflags 2.3.3",
  "bytes",
@@ -5539,9 +5532,9 @@ version = "0.1.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab"
 dependencies = [
- "proc-macro2 1.0.63",
- "quote 1.0.29",
- "syn 2.0.23",
+ "proc-macro2 1.0.66",
+ "quote 1.0.32",
+ "syn 2.0.27",
 ]
 
 [[package]]
@@ -5593,8 +5586,8 @@ version = "0.1.0"
 source = "git+https://github.com/massalabs/transition.git?rev=93fa3bf82f9f5ff421c78536879b7fd1b948ca75#93fa3bf82f9f5ff421c78536879b7fd1b948ca75"
 dependencies = [
  "darling 0.14.4",
- "proc-macro2 1.0.63",
- "quote 1.0.29",
+ "proc-macro2 1.0.66",
+ "quote 1.0.32",
  "syn 1.0.109",
  "unsigned-varint",
 ]
@@ -5613,9 +5606,9 @@ checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba"
 
 [[package]]
 name = "ucd-trie"
-version = "0.1.5"
+version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e79c4d996edb816c91e4308506774452e55e95c3c9de07b6729e17e15a5ef81"
+checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9"
 
 [[package]]
 name = "unicode-bidi"
@@ -5625,9 +5618,9 @@ checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460"
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.10"
+version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22049a19f4a68748a168c0fc439f9516686aa045927ff767eca0a85101fb6e73"
+checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c"
 
 [[package]]
 name = "unicode-normalization"
@@ -5699,9 +5692,9 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
 
 [[package]]
 name = "uuid"
-version = "1.4.0"
+version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d023da39d1fde5a8a3fe1f3e01ca9632ada0a63e9797de55a879d6e2236277be"
+checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d"
 
 [[package]]
 name = "valuable"
@@ -5777,9 +5770,9 @@ dependencies = [
  "bumpalo",
  "log",
  "once_cell",
- "proc-macro2 1.0.63",
- "quote 1.0.29",
- "syn 2.0.23",
+ "proc-macro2 1.0.66",
+ "quote 1.0.32",
+ "syn 2.0.27",
  "wasm-bindgen-shared",
 ]
 
@@ -5801,8 +5794,8 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c5020cfa87c7cecefef118055d44e3c1fc122c7ec25701d528ee458a0b45f38f"
 dependencies = [
- "proc-macro2 1.0.63",
- "quote 1.0.29",
+ "proc-macro2 1.0.66",
+ "quote 1.0.32",
  "syn 1.0.109",
 ]
 
@@ -5824,7 +5817,7 @@ version = "0.2.87"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d"
 dependencies = [
- "quote 1.0.29",
+ "quote 1.0.32",
  "wasm-bindgen-macro-support",
 ]
 
@@ -5834,9 +5827,9 @@ version = "0.2.87"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b"
 dependencies = [
- "proc-macro2 1.0.63",
- "quote 1.0.29",
- "syn 2.0.23",
+ "proc-macro2 1.0.66",
+ "quote 1.0.32",
+ "syn 2.0.27",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
@@ -5849,18 +5842,18 @@ checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1"
 
 [[package]]
 name = "wasm-encoder"
-version = "0.29.0"
+version = "0.31.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18c41dbd92eaebf3612a39be316540b8377c871cb9bde6b064af962984912881"
+checksum = "41763f20eafed1399fff1afb466496d3a959f58241436cfdc17e3f5ca954de16"
 dependencies = [
  "leb128",
 ]
 
 [[package]]
 name = "wasmer"
-version = "3.3.0"
+version = "4.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78caedecd8cb71ed47ccca03b68d69414a3d278bb031e6f93f15759344efdd52"
+checksum = "ea790bcdfb4e6e9d1e5ddf75b4699aac62b078fcc9f27f44e1748165ceea67bf"
 dependencies = [
  "bytes",
  "cfg-if",
@@ -5886,9 +5879,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-compiler"
-version = "3.3.0"
+version = "4.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "726a8450541af4a57c34af7b6973fdbfc79f896cc7e733429577dfd1d1687180"
+checksum = "f093937725e242e5529fed27e08ff836c011a9ecc22e6819fb818c2ac6ff5f88"
 dependencies = [
  "backtrace",
  "cfg-if",
@@ -5910,9 +5903,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-compiler-cranelift"
-version = "3.3.0"
+version = "4.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1e5633f90f372563ebbdf3f9799c7b29ba11c90e56cf9b54017112d2e656c95"
+checksum = "3b27b1670d27158789ebe14e4da3902c72132174884a1c6a3533ce4fd9dd83db"
 dependencies = [
  "cranelift-codegen",
  "cranelift-entity",
@@ -5929,9 +5922,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-compiler-singlepass"
-version = "3.3.0"
+version = "4.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4d38957de6f452115c0af3ff08cec268ee248d665b54d4bbf7da60b7453cb97"
+checksum = "02509aaab7e302fc551ff03512807514b379ba32136892e96fcaa5b62a3228de"
 dependencies = [
  "byteorder",
  "dynasm",
@@ -5948,21 +5941,21 @@ dependencies = [
 
 [[package]]
 name = "wasmer-derive"
-version = "3.3.0"
+version = "4.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97901fdbaae383dbb90ea162cc3a76a9fa58ac39aec7948b4c0b9bbef9307738"
+checksum = "13ae8286cba2acb10065a4dac129c7c7f7bcd24acd6538555d96616eea16bc27"
 dependencies = [
  "proc-macro-error",
- "proc-macro2 1.0.63",
- "quote 1.0.29",
+ "proc-macro2 1.0.66",
+ "quote 1.0.32",
  "syn 1.0.109",
 ]
 
 [[package]]
 name = "wasmer-middlewares"
-version = "3.3.0"
+version = "4.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e028013811035111beb768074b6ccc09eabd77811b1e01fd099b5471924ca16"
+checksum = "3bc8cafe02112ecf21a7fc1d090ac0f0220a86a8d4f561c24e382a4c2ee4addc"
 dependencies = [
  "wasmer",
  "wasmer-types",
@@ -5971,9 +5964,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-object"
-version = "3.3.0"
+version = "4.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b6a25e04fdd0f2173bebfce2804ac1fba5e45827afed76876bf414e74244aae"
+checksum = "bda85dbe7e313fa98a22d11045885db631871e1d17382297da401f2be7e4c957"
 dependencies = [
  "object 0.28.4",
  "thiserror",
@@ -5982,9 +5975,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-types"
-version = "3.3.0"
+version = "4.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67f1f2839f4f61509550e4ddcd0e658e19f3af862b51c79fda15549d735d659b"
+checksum = "918d2f0bb5eaa95a80c06be33f21dee92f40f12cd0982da34490d121a99d244b"
 dependencies = [
  "bytecheck",
  "enum-iterator",
@@ -5998,9 +5991,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-vm"
-version = "3.3.0"
+version = "4.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "043118ec4f16d1714fed3aab758b502b864bd865e1d5188626c9ad290100563f"
+checksum = "a1e000c2cbd4f9805427af5f3b3446574caf89ab3a1e66c2f3579fbde22b072b"
 dependencies = [
  "backtrace",
  "cc",
@@ -6035,9 +6028,9 @@ dependencies = [
 
 [[package]]
 name = "wast"
-version = "60.0.0"
+version = "62.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd06cc744b536e30387e72a48fdd492105b9c938bb4f415c39c616a7a0a697ad"
+checksum = "b8ae06f09dbe377b889fbd620ff8fa21e1d49d1d9d364983c0cdbf9870cb9f1f"
 dependencies = [
  "leb128",
  "memchr",
@@ -6047,9 +6040,9 @@ dependencies = [
 
 [[package]]
 name = "wat"
-version = "1.0.66"
+version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5abe520f0ab205366e9ac7d3e6b2fc71de44e32a2b58f2ec871b6b575bdcea3b"
+checksum = "842e15861d203fb4a96d314b0751cdeaf0f6f8b35e8d81d2953af2af5e44e637"
 dependencies = [
  "wast",
 ]
@@ -6070,7 +6063,16 @@ version = "0.23.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b03058f88386e5ff5310d9111d53f48b17d732b401aeb83a8d5190f2ac459338"
 dependencies = [
- "rustls-webpki",
+ "rustls-webpki 0.100.1",
+]
+
+[[package]]
+name = "webpki-roots"
+version = "0.24.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b291546d5d9d1eab74f069c77749f2cb8504a12caa20f0f2de93ddbf6f411888"
+dependencies = [
+ "rustls-webpki 0.101.2",
 ]
 
 [[package]]
@@ -6301,9 +6303,9 @@ checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a"
 
 [[package]]
 name = "winnow"
-version = "0.4.7"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca0ace3845f0d96209f0375e6d367e3eb87eb65d27d445bdc9f1843a26f39448"
+checksum = "25b5872fa2e10bd067ae946f927e726d7d603eaeb6e02fa6a350e0722d2b8c11"
 dependencies = [
  "memchr",
 ]
@@ -6341,9 +6343,9 @@ version = "1.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
 dependencies = [
- "proc-macro2 1.0.63",
- "quote 1.0.29",
- "syn 2.0.23",
+ "proc-macro2 1.0.66",
+ "quote 1.0.32",
+ "syn 2.0.27",
 ]
 
 [[package]]
diff --git a/README.md b/README.md
index c76e9565fa6..7f9f1bcfe47 100644
--- a/README.md
+++ b/README.md
@@ -30,9 +30,9 @@ Here is a list of tools to easily build applications on the Massa blockchain:
 - [JS Client library](https://github.com/massalabs/massa-web3) to connect to the Massa blockchain from your applications.
 - [AssemblyScript](https://github.com/massalabs/massa-as-sdk) SDKs to write smart contracts.
 - [Examples of applications](https://github.com/massalabs/massa-sc-examples) built on Massa.
-- [Explorer](test.massa.net).
+- [Explorer](https://test.massa.net).
 - [Interactive API specification](https://playground.open-rpc.org/?schemaUrl=https://test.massa.net/api/v2&uiSchema\[appBar\]\[ui:input\]=false&uiSchema\[appBar\]\[ui:inputPlaceholder\]=Enter+Massa+JSON-RPC+server+URL&uiSchema\[appBar\]\[ui:logoUrl\]=https://massa.net/favicons/favicon.ico&uiSchema\[appBar\]\[ui:splitView\]=false&uiSchema\[appBar\]\[ui:darkMode\]=false&uiSchema\[appBar\]\[ui:title\]=Massa&uiSchema\[appBar\]\[ui:examplesDropdown\]=false&uiSchema\[methods\]\[ui:defaultExpanded\]=false&uiSchema\[methods\]\[ui:methodPlugins\]=true&uiSchema\[params\]\[ui:defaultExpanded\]=false).
-- [Lots of documentation](docs.massa.net), from [web3 development](https://docs.massa.net/en/latest/web3-dev/smart-contracts.html)
+- [Lots of documentation](https://docs.massa.net), from [web3 development](https://docs.massa.net/en/latest/web3-dev/smart-contracts.html)
   to [Massa's architecture](https://docs.massa.net/en/latest/general-doc/architecture.html).
 
 ## Join the Testnet
diff --git a/massa-api-exports/Cargo.toml b/massa-api-exports/Cargo.toml
index 1aea6b0f2d7..b03510d4a5d 100644
--- a/massa-api-exports/Cargo.toml
+++ b/massa-api-exports/Cargo.toml
@@ -8,7 +8,7 @@ edition = "2021"
 paginate = "1.1.11"
 displaydoc = "0.2"
 thiserror = "1.0"
-jsonrpsee = { version = "0.18.2", features = ["jsonrpsee-core", "jsonrpsee-types"] }
+jsonrpsee = { version = "0.19.0", features = ["jsonrpsee-core", "jsonrpsee-types"] }
 serde = { version = "1.0", features = ["derive"] }
 strum = { version = "0.24", features = ["derive"] }
 
diff --git a/massa-api/Cargo.toml b/massa-api/Cargo.toml
index 3216e174d71..c67e6cffa59 100644
--- a/massa-api/Cargo.toml
+++ b/massa-api/Cargo.toml
@@ -6,7 +6,7 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-jsonrpsee = { version = "0.18.2", features = ["server", "macros"] }
+jsonrpsee = { version = "0.19.0", features = ["server", "macros"] }
 futures = "0.3.18"
 async-trait = "0.1.58"
 serde = { version = "1.0", features = ["derive"] }
diff --git a/massa-api/src/lib.rs b/massa-api/src/lib.rs
index 3a8e1c02208..926cedf522d 100644
--- a/massa-api/src/lib.rs
+++ b/massa-api/src/lib.rs
@@ -160,8 +160,7 @@ async fn serve<T>(
         } else {
             BatchRequestConfig::Disabled
         })
-        .ping_interval(api_config.ping_interval.to_duration())
-        .custom_tokio_runtime(tokio::runtime::Handle::current());
+        .ping_interval(api_config.ping_interval.to_duration());
 
     if api_config.enable_http && !api_config.enable_ws {
         server_builder = server_builder.http_only();
@@ -186,7 +185,7 @@ async fn serve<T>(
         .await
         .expect("failed to build server");
 
-    let server_handler = server.start(api).expect("server start failed");
+    let server_handler = server.start(api);
     let stop_handler = StopHandle { server_handler };
 
     Ok(stop_handler)
diff --git a/massa-api/src/public.rs b/massa-api/src/public.rs
index 179f4e9ba4b..a4c08b69f85 100644
--- a/massa-api/src/public.rs
+++ b/massa-api/src/public.rs
@@ -43,7 +43,7 @@ use massa_models::{
     output_event::SCOutputEvent,
     prehash::{PreHashMap, PreHashSet},
     secure_share::SecureShareDeserializer,
-    slot::Slot,
+    slot::{IndexedSlot, Slot},
     timeslots,
     timeslots::{get_latest_block_slot_at_timestamp, time_range_to_slot_range},
     version::Version,
@@ -839,13 +839,34 @@ impl MassaRpcServer for API<Public> {
                     .saturating_add(self.0.api_settings.draw_lookahead_period_count),
                 cur_slot.thread,
             );
+            let selections = self
+                .0
+                .selector_controller
+                .get_available_selections_in_range(
+                    cur_slot..=slot_end,
+                    Some(&addresses.iter().copied().collect()),
+                )
+                .unwrap_or_default();
+
             addresses
                 .iter()
                 .map(|addr| {
-                    self.0
-                        .selector_controller
-                        .get_address_selections(addr, cur_slot, slot_end)
-                        .unwrap_or_default()
+                    let mut producer_slots = Vec::new();
+                    let mut endorser_slots = Vec::new();
+                    for (selection_slot, selection) in &selections {
+                        if selection.producer == *addr {
+                            producer_slots.push(*selection_slot);
+                        }
+                        for (index, endorser) in selection.endorsements.iter().enumerate() {
+                            if endorser == addr {
+                                endorser_slots.push(IndexedSlot {
+                                    slot: *selection_slot,
+                                    index,
+                                });
+                            }
+                        }
+                    }
+                    (producer_slots, endorser_slots)
                 })
                 .collect::<Vec<_>>()
         };
diff --git a/massa-async-pool/Cargo.toml b/massa-async-pool/Cargo.toml
index f63dfc3867b..1c35712ec9a 100644
--- a/massa-async-pool/Cargo.toml
+++ b/massa-async-pool/Cargo.toml
@@ -19,7 +19,7 @@ massa_serialization = { path = "../massa-serialization" }
 massa_signature = { path = "../massa-signature" }
 massa_db_exports = { path = "../massa-db-exports" }
 massa_time = { path = "../massa-time" }
-massa-proto-rs = { git = "https://github.com/massalabs/massa-proto-rs", rev = "18ec02f", features = ["tonic"] }
+massa-proto-rs = { git = "https://github.com/massalabs/massa-proto-rs", rev = "32179e2", features = ["tonic"] }
 
 [dev-dependencies]
 tempfile = "3.3"
diff --git a/massa-async-pool/src/mapping_grpc.rs b/massa-async-pool/src/mapping_grpc.rs
index d0adda0e0e8..109ea77c54a 100644
--- a/massa-async-pool/src/mapping_grpc.rs
+++ b/massa-async-pool/src/mapping_grpc.rs
@@ -13,159 +13,158 @@ impl From<AsyncMessage> for grpc_model::AsyncMessage {
             destination: value.destination.to_string(),
             handler: value.handler.to_string(),
             max_gas: value.max_gas,
-            fee: value.fee.to_raw(),
-            coins: value.coins.to_raw(),
+            fee: Some(value.fee.into()),
+            coins: Some(value.coins.into()),
             validity_start: Some(value.validity_start.into()),
             validity_end: Some(value.validity_start.into()),
             data: value.data,
             trigger: value.trigger.map(|trigger| trigger.into()),
             can_be_executed: value.can_be_executed,
-            hash: value.hash.to_string(),
         }
     }
 }
 
+//TODO to be checked, use functions
 impl From<AsyncMessageUpdate> for grpc_model::AsyncMessageUpdate {
     fn from(value: AsyncMessageUpdate) -> Self {
         grpc_model::AsyncMessageUpdate {
             emission_slot: match value.emission_slot {
                 SetOrKeep::Set(value) => Some(grpc_model::SetOrKeepSlot {
-                    r#type: grpc_model::AsyncPoolChangeType::Set as i32,
-                    value: Some(value.into()),
+                    change: Some(grpc_model::set_or_keep_slot::Change::Set(value.into())),
                 }),
                 SetOrKeep::Keep => Some(grpc_model::SetOrKeepSlot {
-                    r#type: grpc_model::AsyncPoolChangeType::Delete as i32,
-                    value: None,
+                    change: Some(grpc_model::set_or_keep_slot::Change::Keep(
+                        grpc_model::Empty {},
+                    )),
                 }),
             },
             emission_index: match value.emission_index {
-                SetOrKeep::Set(value) => Some(grpc_model::SetOrKeepFixed64 {
-                    r#type: grpc_model::AsyncPoolChangeType::Set as i32,
-                    value: Some(value),
+                SetOrKeep::Set(value) => Some(grpc_model::SetOrKeepUint64 {
+                    change: Some(grpc_model::set_or_keep_uint64::Change::Set(value)),
                 }),
-                SetOrKeep::Keep => Some(grpc_model::SetOrKeepFixed64 {
-                    r#type: grpc_model::AsyncPoolChangeType::Delete as i32,
-                    value: None,
+                SetOrKeep::Keep => Some(grpc_model::SetOrKeepUint64 {
+                    change: Some(grpc_model::set_or_keep_uint64::Change::Keep(
+                        grpc_model::Empty {},
+                    )),
                 }),
             },
             sender: match value.sender {
                 SetOrKeep::Set(value) => Some(grpc_model::SetOrKeepString {
-                    r#type: grpc_model::AsyncPoolChangeType::Set as i32,
-                    value: Some(value.to_string()),
+                    change: Some(grpc_model::set_or_keep_string::Change::Set(
+                        value.to_string(),
+                    )),
                 }),
                 SetOrKeep::Keep => Some(grpc_model::SetOrKeepString {
-                    r#type: grpc_model::AsyncPoolChangeType::Delete as i32,
-                    value: None,
+                    change: Some(grpc_model::set_or_keep_string::Change::Keep(
+                        grpc_model::Empty {},
+                    )),
                 }),
             },
             destination: match value.destination {
                 SetOrKeep::Set(value) => Some(grpc_model::SetOrKeepString {
-                    r#type: grpc_model::AsyncPoolChangeType::Set as i32,
-                    value: Some(value.to_string()),
+                    change: Some(grpc_model::set_or_keep_string::Change::Set(
+                        value.to_string(),
+                    )),
                 }),
                 SetOrKeep::Keep => Some(grpc_model::SetOrKeepString {
-                    r#type: grpc_model::AsyncPoolChangeType::Delete as i32,
-                    value: None,
+                    change: Some(grpc_model::set_or_keep_string::Change::Keep(
+                        grpc_model::Empty {},
+                    )),
                 }),
             },
             handler: match value.handler {
                 SetOrKeep::Set(value) => Some(grpc_model::SetOrKeepString {
-                    r#type: grpc_model::AsyncPoolChangeType::Set as i32,
-                    value: Some(value),
+                    change: Some(grpc_model::set_or_keep_string::Change::Set(value)),
                 }),
                 SetOrKeep::Keep => Some(grpc_model::SetOrKeepString {
-                    r#type: grpc_model::AsyncPoolChangeType::Delete as i32,
-                    value: None,
+                    change: Some(grpc_model::set_or_keep_string::Change::Keep(
+                        grpc_model::Empty {},
+                    )),
                 }),
             },
             max_gas: match value.max_gas {
-                SetOrKeep::Set(value) => Some(grpc_model::SetOrKeepFixed64 {
-                    r#type: grpc_model::AsyncPoolChangeType::Set as i32,
-                    value: Some(value),
+                SetOrKeep::Set(value) => Some(grpc_model::SetOrKeepUint64 {
+                    change: Some(grpc_model::set_or_keep_uint64::Change::Set(value)),
                 }),
-                SetOrKeep::Keep => Some(grpc_model::SetOrKeepFixed64 {
-                    r#type: grpc_model::AsyncPoolChangeType::Delete as i32,
-                    value: None,
+                SetOrKeep::Keep => Some(grpc_model::SetOrKeepUint64 {
+                    change: Some(grpc_model::set_or_keep_uint64::Change::Keep(
+                        grpc_model::Empty {},
+                    )),
                 }),
             },
+            //TODO check Amount usage
             fee: match value.fee {
-                SetOrKeep::Set(value) => Some(grpc_model::SetOrKeepFixed64 {
-                    r#type: grpc_model::AsyncPoolChangeType::Set as i32,
-                    value: Some(value.to_raw()),
+                SetOrKeep::Set(value) => Some(grpc_model::SetOrKeepUint64 {
+                    change: Some(grpc_model::set_or_keep_uint64::Change::Set(value.to_raw())),
                 }),
-                SetOrKeep::Keep => Some(grpc_model::SetOrKeepFixed64 {
-                    r#type: grpc_model::AsyncPoolChangeType::Delete as i32,
-                    value: None,
+                SetOrKeep::Keep => Some(grpc_model::SetOrKeepUint64 {
+                    change: Some(grpc_model::set_or_keep_uint64::Change::Keep(
+                        grpc_model::Empty {},
+                    )),
                 }),
             },
+            //TODO check Amount usage
             coins: match value.coins {
-                SetOrKeep::Set(value) => Some(grpc_model::SetOrKeepFixed64 {
-                    r#type: grpc_model::AsyncPoolChangeType::Set as i32,
-                    value: Some(value.to_raw()),
+                SetOrKeep::Set(value) => Some(grpc_model::SetOrKeepUint64 {
+                    change: Some(grpc_model::set_or_keep_uint64::Change::Set(value.to_raw())),
                 }),
-                SetOrKeep::Keep => Some(grpc_model::SetOrKeepFixed64 {
-                    r#type: grpc_model::AsyncPoolChangeType::Delete as i32,
-                    value: None,
+                SetOrKeep::Keep => Some(grpc_model::SetOrKeepUint64 {
+                    change: Some(grpc_model::set_or_keep_uint64::Change::Keep(
+                        grpc_model::Empty {},
+                    )),
                 }),
             },
             validity_start: match value.validity_start {
                 SetOrKeep::Set(value) => Some(grpc_model::SetOrKeepSlot {
-                    r#type: grpc_model::AsyncPoolChangeType::Set as i32,
-                    value: Some(value.into()),
+                    change: Some(grpc_model::set_or_keep_slot::Change::Set(value.into())),
                 }),
                 SetOrKeep::Keep => Some(grpc_model::SetOrKeepSlot {
-                    r#type: grpc_model::AsyncPoolChangeType::Delete as i32,
-                    value: None,
+                    change: Some(grpc_model::set_or_keep_slot::Change::Keep(
+                        grpc_model::Empty {},
+                    )),
                 }),
             },
             validity_end: match value.validity_end {
                 SetOrKeep::Set(value) => Some(grpc_model::SetOrKeepSlot {
-                    r#type: grpc_model::AsyncPoolChangeType::Set as i32,
-                    value: Some(value.into()),
+                    change: Some(grpc_model::set_or_keep_slot::Change::Set(value.into())),
                 }),
                 SetOrKeep::Keep => Some(grpc_model::SetOrKeepSlot {
-                    r#type: grpc_model::AsyncPoolChangeType::Delete as i32,
-                    value: None,
+                    change: Some(grpc_model::set_or_keep_slot::Change::Keep(
+                        grpc_model::Empty {},
+                    )),
                 }),
             },
             data: match value.data {
                 SetOrKeep::Set(value) => Some(grpc_model::SetOrKeepBytes {
-                    r#type: grpc_model::AsyncPoolChangeType::Set as i32,
-                    value: Some(value),
+                    change: Some(grpc_model::set_or_keep_bytes::Change::Set(value)),
                 }),
                 SetOrKeep::Keep => Some(grpc_model::SetOrKeepBytes {
-                    r#type: grpc_model::AsyncPoolChangeType::Delete as i32,
-                    value: None,
+                    change: Some(grpc_model::set_or_keep_bytes::Change::Keep(
+                        grpc_model::Empty {},
+                    )),
                 }),
             },
+            //TODO remove unwrap
             trigger: match value.trigger {
                 SetOrKeep::Set(value) => Some(grpc_model::SetOrKeepAsyncMessageTrigger {
-                    r#type: grpc_model::AsyncPoolChangeType::Set as i32,
-                    value: value.map(|trigger| trigger.into()),
+                    change: Some(grpc_model::set_or_keep_async_message_trigger::Change::Set(
+                        value.map(|trigger| trigger.into()).unwrap(),
+                    )),
                 }),
                 SetOrKeep::Keep => Some(grpc_model::SetOrKeepAsyncMessageTrigger {
-                    r#type: grpc_model::AsyncPoolChangeType::Delete as i32,
-                    value: None,
+                    change: Some(grpc_model::set_or_keep_async_message_trigger::Change::Keep(
+                        grpc_model::Empty {},
+                    )),
                 }),
             },
             can_be_executed: match value.can_be_executed {
                 SetOrKeep::Set(value) => Some(grpc_model::SetOrKeepBool {
-                    r#type: grpc_model::AsyncPoolChangeType::Set as i32,
-                    value: Some(value),
+                    change: Some(grpc_model::set_or_keep_bool::Change::Set(value)),
                 }),
                 SetOrKeep::Keep => Some(grpc_model::SetOrKeepBool {
-                    r#type: grpc_model::AsyncPoolChangeType::Delete as i32,
-                    value: None,
-                }),
-            },
-            hash: match value.hash {
-                SetOrKeep::Set(value) => Some(grpc_model::SetOrKeepString {
-                    r#type: grpc_model::AsyncPoolChangeType::Set as i32,
-                    value: Some(value.to_string()),
-                }),
-                SetOrKeep::Keep => Some(grpc_model::SetOrKeepString {
-                    r#type: grpc_model::AsyncPoolChangeType::Delete as i32,
-                    value: None,
+                    change: Some(grpc_model::set_or_keep_bool::Change::Keep(
+                        grpc_model::Empty {},
+                    )),
                 }),
             },
         }
diff --git a/massa-bootstrap/src/error.rs b/massa-bootstrap/src/error.rs
index f0a26f7c836..439196373db 100644
--- a/massa-bootstrap/src/error.rs
+++ b/massa-bootstrap/src/error.rs
@@ -25,6 +25,8 @@ pub enum BootstrapError {
     GeneralError(String),
     /// deserialization error: {0}
     DeserializeError(String),
+    /// serialization error: {0}
+    SerializationError(String),
     /// models error: {0}
     ModelsError(#[from] massa_models::error::ModelsError),
     /// serialize error: {0}
diff --git a/massa-bootstrap/src/lib.rs b/massa-bootstrap/src/lib.rs
index 43b986052e9..ff0b7958f20 100644
--- a/massa-bootstrap/src/lib.rs
+++ b/massa-bootstrap/src/lib.rs
@@ -30,6 +30,8 @@ mod messages;
 mod server;
 mod settings;
 mod tools;
+/// white/black list
+pub mod white_black_list;
 
 pub use client::{get_state, DefaultConnector};
 pub use listener::BootstrapTcpListener;
diff --git a/massa-bootstrap/src/server.rs b/massa-bootstrap/src/server.rs
index 4c22ee6928c..91fb6a6808f 100644
--- a/massa-bootstrap/src/server.rs
+++ b/massa-bootstrap/src/server.rs
@@ -24,7 +24,6 @@
 //! 4. Checks if the client has attempted too recently
 //! 5. All checks have passed: spawn a thread on which to run the bootstrap session
 //!    This thread creates a new tokio runtime, and runs it with `block_on`
-mod white_black_list;
 
 use crossbeam::channel::tick;
 use humantime::format_duration;
@@ -50,7 +49,6 @@ use std::{
     time::{Duration, Instant},
 };
 use tracing::{debug, error, info, warn};
-use white_black_list::*;
 
 #[cfg(not(test))]
 use crate::listener::BootstrapTcpListener;
@@ -61,6 +59,7 @@ use crate::{
     error::BootstrapError,
     listener::{BootstrapListenerStopHandle, PollEvent},
     messages::{BootstrapClientMessage, BootstrapServerMessage},
+    white_black_list::SharedWhiteBlackList,
     BootstrapConfig,
 };
 /// Specifies a common interface that can be used by standard, or mockers
@@ -79,6 +78,8 @@ pub struct BootstrapManager {
     main_handle: thread::JoinHandle<Result<(), BootstrapError>>,
     listener_stopper: BootstrapListenerStopHandle,
     update_stopper_tx: crossbeam::channel::Sender<()>,
+    /// shared white/black list
+    pub white_black_list: SharedWhiteBlackList<'static>,
 }
 
 impl BootstrapManager {
@@ -89,12 +90,14 @@ impl BootstrapManager {
         main_handle: thread::JoinHandle<Result<(), BootstrapError>>,
         update_stopper_tx: crossbeam::channel::Sender<()>,
         listener_stopper: BootstrapListenerStopHandle,
+        white_black_list: SharedWhiteBlackList<'static>,
     ) -> Self {
         Self {
             update_handle,
             main_handle,
             update_stopper_tx,
             listener_stopper,
+            white_black_list,
         }
     }
 
@@ -168,6 +171,7 @@ pub fn start_bootstrap_server(
         })
         .expect("in `start_bootstrap_server`, OS failed to spawn list-updater thread");
 
+    let w_b_list = white_black_list.clone();
     let main_handle = thread::Builder::new()
         .name("bs-main-loop".to_string())
         .spawn(move || {
@@ -176,7 +180,7 @@ pub fn start_bootstrap_server(
                 protocol_controller,
                 final_state,
                 ev_poller,
-                white_black_list,
+                white_black_list: w_b_list,
                 keypair,
                 version,
                 ip_hist_map: HashMap::with_capacity(config.ip_list_max_size),
@@ -192,6 +196,7 @@ pub fn start_bootstrap_server(
         main_handle,
         update_stopper_tx,
         listener_stopper,
+        white_black_list,
     ))
 }
 
diff --git a/massa-bootstrap/src/server/white_black_list.rs b/massa-bootstrap/src/white_black_list.rs
similarity index 61%
rename from massa-bootstrap/src/server/white_black_list.rs
rename to massa-bootstrap/src/white_black_list.rs
index 3afb1cef57f..48fa9f56c63 100644
--- a/massa-bootstrap/src/server/white_black_list.rs
+++ b/massa-bootstrap/src/white_black_list.rs
@@ -16,7 +16,7 @@ use crate::tools::normalize_ip;
 /// A wrapper around the white/black lists that allows efficient sharing between threads
 // TODO: don't clone the path-bufs...
 #[derive(Clone)]
-pub(crate) struct SharedWhiteBlackList<'a> {
+pub struct SharedWhiteBlackList<'a> {
     inner: Arc<RwLock<WhiteBlackListInner>>,
     white_path: Cow<'a, Path>,
     black_path: Cow<'a, Path>,
@@ -35,14 +35,89 @@ impl SharedWhiteBlackList<'_> {
         })
     }
 
+    /// get the white list
+    pub fn get_white_list(&self) -> Option<HashSet<IpAddr>> {
+        self.inner.read().white_list.clone()
+    }
+
+    /// get the black list
+    pub fn get_black_list(&self) -> Option<HashSet<IpAddr>> {
+        self.inner.read().black_list.clone()
+    }
+
+    /// Add IP address to the black list
+    pub fn add_ips_to_blacklist(&self, ips: Vec<IpAddr>) -> Result<(), BootstrapError> {
+        let mut write_lock = self.inner.write();
+        if let Some(black_list) = &mut write_lock.black_list {
+            black_list.extend(ips);
+        } else {
+            write_lock.black_list = Some(HashSet::from_iter(ips));
+        };
+        self.write_to_file(&self.black_path, write_lock.black_list.as_ref().unwrap())?;
+        Ok(())
+    }
+
+    /// Remove IPs address from the black list
+    pub fn remove_ips_from_blacklist(&self, ips: Vec<IpAddr>) -> Result<(), BootstrapError> {
+        let mut write_lock = self.inner.write();
+        if let Some(black_list) = &mut write_lock.black_list {
+            for ip in ips {
+                black_list.remove(&ip);
+            }
+            self.write_to_file(&self.black_path, black_list)?;
+        }
+        Ok(())
+    }
+
+    /// Add IP address to the white list
+    pub fn add_ips_to_whitelist(&self, ips: Vec<IpAddr>) -> Result<(), BootstrapError> {
+        let mut write_lock = self.inner.write();
+        if let Some(white_list) = &mut write_lock.white_list {
+            white_list.extend(ips);
+        } else {
+            write_lock.white_list = Some(HashSet::from_iter(ips));
+        };
+        self.write_to_file(&self.white_path, write_lock.white_list.as_ref().unwrap())?;
+        Ok(())
+    }
+
+    /// Remove IPs address from the white list
+    pub fn remove_ips_from_whitelist(&self, ips: Vec<IpAddr>) -> Result<(), BootstrapError> {
+        let mut write_lock = self.inner.write();
+        if let Some(white_list) = &mut write_lock.white_list {
+            for ip in ips {
+                white_list.remove(&ip);
+            }
+            self.write_to_file(&self.white_path, white_list)?;
+        }
+        Ok(())
+    }
+
+    /// write list to file
+    fn write_to_file(
+        &self,
+        file_path: &Path,
+        data: &HashSet<IpAddr>,
+    ) -> Result<(), BootstrapError> {
+        let list = serde_json::to_string(data).map_err(|e| {
+            warn!(error = ?e, "failed to serialize list");
+            BootstrapError::SerializationError(e.to_string())
+        })?;
+        std::fs::write(file_path, list).map_err(|e| {
+            warn!(error = ?e, "failed to write list to file");
+            BootstrapError::IoError(e)
+        })?;
+        Ok(())
+    }
+
     /// Checks if the white/black list is up to date with a read-lock
     /// Creates a new list, and replaces the old one in a write-lock
     pub(crate) fn update(&mut self) -> Result<(), BootstrapError> {
         let read_lock = self.inner.read();
-        let (new_white, new_black) =
+        let (new_white_file, new_black_file) =
             WhiteBlackListInner::update_list(&self.white_path, &self.black_path)?;
-        let white_delta = new_white != read_lock.white_list;
-        let black_delta = new_black != read_lock.black_list;
+        let white_delta = new_white_file != read_lock.white_list;
+        let black_delta = new_black_file != read_lock.black_list;
         if white_delta || black_delta {
             // Ideally this scope would be atomic
             let mut mut_inner = {
@@ -52,11 +127,11 @@ impl SharedWhiteBlackList<'_> {
 
             if white_delta {
                 info!("whitelist has updated !");
-                mut_inner.white_list = new_white;
+                mut_inner.white_list = new_white_file;
             }
             if black_delta {
                 info!("blacklist has updated !");
-                mut_inner.black_list = new_black;
+                mut_inner.black_list = new_black_file;
             }
         }
         Ok(())
diff --git a/massa-client/Cargo.toml b/massa-client/Cargo.toml
index c421644765f..b641c801328 100644
--- a/massa-client/Cargo.toml
+++ b/massa-client/Cargo.toml
@@ -28,7 +28,6 @@ massa_signature = { path = "../massa-signature" }
 massa_time = { path = "../massa-time" }
 massa_sdk = { path = "../massa-sdk" }
 massa_wallet = { path = "../massa-wallet" }
-# massa-proto-rs = { git = "https://github.com/massalabs/massa-proto-rs", rev = "18ec02f", features = ["tonic"] }
 
 [dev-dependencies]
 toml_edit = "0.19"
diff --git a/massa-client/base_config/config.toml b/massa-client/base_config/config.toml
index 7de719c6990..03942e8fe4e 100644
--- a/massa-client/base_config/config.toml
+++ b/massa-client/base_config/config.toml
@@ -7,7 +7,8 @@ timeout = 1000
 ip = "127.0.0.1"
 private_port = 33034
 public_port = 33035
-grpc_port = 33037
+grpc_public_port = 33037
+grpc_private_port = 33038
 
 [client]
     # maximum size in bytes of a request
diff --git a/massa-client/src/main.rs b/massa-client/src/main.rs
index 4bd72599f33..829d8f71dd9 100644
--- a/massa-client/src/main.rs
+++ b/massa-client/src/main.rs
@@ -33,9 +33,12 @@ struct Args {
     /// Port to listen on (Massa private API).
     #[structopt(long)]
     private_port: Option<u16>,
-    /// Port to listen on (Massa GRPC API).
+    /// Port to listen on (Massa GRPC Public API).
     #[structopt(long)]
-    grpc_port: Option<u16>,
+    grpc_public_port: Option<u16>,
+    /// Port to listen on (Massa GRPC Private API).
+    #[structopt(long)]
+    grpc_private_port: Option<u16>,
     /// Address to listen on
     #[structopt(long)]
     ip: Option<IpAddr>,
@@ -129,9 +132,13 @@ async fn run(args: Args) -> Result<()> {
         Some(private_port) => private_port,
         None => settings.default_node.private_port,
     };
-    let grpc_port = match args.grpc_port {
+    let grpc_port = match args.grpc_public_port {
+        Some(grpc_port) => grpc_port,
+        None => settings.default_node.grpc_public_port,
+    };
+    let grpc_priv_port = match args.grpc_private_port {
         Some(grpc_port) => grpc_port,
-        None => settings.default_node.grpc_port,
+        None => settings.default_node.grpc_private_port,
     };
 
     // Setup panic handlers,
@@ -145,8 +152,15 @@ async fn run(args: Args) -> Result<()> {
     }));
 
     // Note: grpc handler requires a mut handler
-    let mut client =
-        Client::new(address, public_port, private_port, grpc_port, &http_config).await?;
+    let mut client = Client::new(
+        address,
+        public_port,
+        private_port,
+        grpc_port,
+        grpc_priv_port,
+        &http_config,
+    )
+    .await?;
     if atty::is(Stream::Stdout) && args.command == Command::help && !args.json {
         // Interactive mode
         repl::run(&mut client, &args.wallet, args.password).await?;
diff --git a/massa-client/src/settings.rs b/massa-client/src/settings.rs
index 53c8fbe9ee9..b621629302d 100644
--- a/massa-client/src/settings.rs
+++ b/massa-client/src/settings.rs
@@ -24,7 +24,8 @@ pub struct DefaultNode {
     pub ip: IpAddr,
     pub private_port: u16,
     pub public_port: u16,
-    pub grpc_port: u16,
+    pub grpc_public_port: u16,
+    pub grpc_private_port: u16,
 }
 
 /// Client settings
diff --git a/massa-consensus-exports/Cargo.toml b/massa-consensus-exports/Cargo.toml
index 904d3268717..9f4af7014e2 100644
--- a/massa-consensus-exports/Cargo.toml
+++ b/massa-consensus-exports/Cargo.toml
@@ -13,7 +13,7 @@ nom = "=7.1"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 thiserror = "1.0"
-jsonrpsee = { version = "0.18.2", features = ["server"] }
+jsonrpsee = { version = "0.19.0", features = ["server"] }
 tokio = { version = "1.23", features = ["sync"] }
 mockall = {version =  "0.11.4", features = ["nightly"], optional = true}
 #custom modules
diff --git a/massa-execution-exports/Cargo.toml b/massa-execution-exports/Cargo.toml
index 3c3305bf9ae..4fa63989c8b 100644
--- a/massa-execution-exports/Cargo.toml
+++ b/massa-execution-exports/Cargo.toml
@@ -18,7 +18,7 @@ tokio = { version = "1.23", features = ["sync"] }
 mockall = { version = "0.11.4",  optional = true}
 
 # custom modules
-massa-proto-rs = { git = "https://github.com/massalabs/massa-proto-rs", rev = "18ec02f", features = ["tonic"] }
+massa-proto-rs = { git = "https://github.com/massalabs/massa-proto-rs", rev = "32179e2", features = ["tonic"] }
 massa_hash = { path = "../massa-hash" }
 massa_models = { path = "../massa-models" }
 massa_time = { path = "../massa-time" }
diff --git a/massa-execution-exports/src/lib.rs b/massa-execution-exports/src/lib.rs
index 367a2097a26..589eb3caa47 100644
--- a/massa-execution-exports/src/lib.rs
+++ b/massa-execution-exports/src/lib.rs
@@ -48,7 +48,8 @@ mod channels;
 mod controller_traits;
 mod error;
 mod event_store;
-mod mapping_grpc;
+/// mapping grpc
+pub mod mapping_grpc;
 mod settings;
 mod types;
 
diff --git a/massa-execution-exports/src/mapping_grpc.rs b/massa-execution-exports/src/mapping_grpc.rs
index 382501d625e..966bee9b88b 100644
--- a/massa-execution-exports/src/mapping_grpc.rs
+++ b/massa-execution-exports/src/mapping_grpc.rs
@@ -1,20 +1,323 @@
 // Copyright (c) 2023 MASSA LABS <info@massa.net>
 
-use crate::{ExecutionOutput, SlotExecutionOutput};
+use std::str::FromStr;
+
+use crate::{
+    ExecutionOutput, ExecutionQueryCycleInfos, ExecutionQueryError, ExecutionQueryExecutionStatus,
+    ExecutionQueryRequestItem, ExecutionQueryResponseItem, ExecutionQueryStakerInfo,
+    SlotExecutionOutput,
+};
+use grpc_api::execution_query_request_item as exec;
+use massa_models::address::Address;
+use massa_models::error::ModelsError;
+use massa_models::execution::EventFilter;
+use massa_models::mapping_grpc::to_denunciation_index;
+use massa_models::operation::OperationId;
+use massa_models::prehash::{CapacityAllocator, PreHashSet};
+use massa_proto_rs::massa::api::v1 as grpc_api;
 use massa_proto_rs::massa::model::v1 as grpc_model;
 
+/// Convert a `grpc_api::ScExecutionEventsRequest` to a `ScExecutionEventsRequest`
+pub fn to_querystate_filter(
+    query: grpc_api::ExecutionQueryRequestItem,
+) -> Result<ExecutionQueryRequestItem, ModelsError> {
+    if let Some(item) = query.request_item {
+        match item {
+            exec::RequestItem::AddressExistsCandidate(value) => {
+                Ok(ExecutionQueryRequestItem::AddressExistsCandidate(
+                    Address::from_str(&value.address)?,
+                ))
+            }
+            exec::RequestItem::AddressExistsFinal(value) => Ok(
+                ExecutionQueryRequestItem::AddressExistsFinal(Address::from_str(&value.address)?),
+            ),
+            exec::RequestItem::AddressBalanceCandidate(value) => {
+                Ok(ExecutionQueryRequestItem::AddressBalanceCandidate(
+                    Address::from_str(&value.address)?,
+                ))
+            }
+            exec::RequestItem::AddressBalanceFinal(value) => Ok(
+                ExecutionQueryRequestItem::AddressBalanceFinal(Address::from_str(&value.address)?),
+            ),
+            exec::RequestItem::AddressBytecodeCandidate(value) => {
+                Ok(ExecutionQueryRequestItem::AddressBytecodeCandidate(
+                    Address::from_str(&value.address)?,
+                ))
+            }
+            exec::RequestItem::AddressBytecodeFinal(value) => {
+                Ok(ExecutionQueryRequestItem::AddressBytecodeCandidate(
+                    Address::from_str(&value.address)?,
+                ))
+            }
+            exec::RequestItem::AddressDatastoreKeysCandidate(value) => {
+                Ok(ExecutionQueryRequestItem::AddressBytecodeCandidate(
+                    Address::from_str(&value.address)?,
+                ))
+            }
+            exec::RequestItem::AddressDatastoreKeysFinal(value) => {
+                Ok(ExecutionQueryRequestItem::AddressDatastoreKeysFinal {
+                    addr: Address::from_str(&value.address)?,
+                    prefix: value.prefix,
+                })
+            }
+            exec::RequestItem::AddressDatastoreValueCandidate(value) => {
+                Ok(ExecutionQueryRequestItem::AddressDatastoreValueCandidate {
+                    addr: Address::from_str(&value.address)?,
+                    key: value.key,
+                })
+            }
+            exec::RequestItem::AddressDatastoreValueFinal(value) => {
+                Ok(ExecutionQueryRequestItem::AddressDatastoreValueFinal {
+                    addr: Address::from_str(&value.address)?,
+                    key: value.key,
+                })
+            }
+            exec::RequestItem::OpExecutionStatusCandidate(value) => {
+                Ok(ExecutionQueryRequestItem::OpExecutionStatusCandidate(
+                    OperationId::from_str(&value.operation_id)?,
+                ))
+            }
+            exec::RequestItem::OpExecutionStatusFinal(value) => {
+                Ok(ExecutionQueryRequestItem::OpExecutionStatusFinal(
+                    OperationId::from_str(&value.operation_id)?,
+                ))
+            }
+            //TODO to be improved
+            exec::RequestItem::DenunciationExecutionStatusCandidate(value) => Ok(
+                ExecutionQueryRequestItem::DenunciationExecutionStatusCandidate(
+                    to_denunciation_index(value.denunciation_index.ok_or_else(|| {
+                        ModelsError::ErrorRaised("no denounciation index found".to_string())
+                    })?)?,
+                ),
+            ),
+            //TODO to be improved
+            exec::RequestItem::DenunciationExecutionStatusFinal(value) => {
+                Ok(ExecutionQueryRequestItem::DenunciationExecutionStatusFinal(
+                    to_denunciation_index(value.denunciation_index.ok_or_else(|| {
+                        ModelsError::ErrorRaised("no denounciation index found".to_string())
+                    })?)?,
+                ))
+            }
+            exec::RequestItem::AddressRollsCandidate(value) => {
+                Ok(ExecutionQueryRequestItem::AddressRollsCandidate(
+                    Address::from_str(&value.address)?,
+                ))
+            }
+            exec::RequestItem::AddressRollsFinal(value) => Ok(
+                ExecutionQueryRequestItem::AddressRollsFinal(Address::from_str(&value.address)?),
+            ),
+            exec::RequestItem::AddressDeferredCreditsCandidate(value) => {
+                Ok(ExecutionQueryRequestItem::AddressDeferredCreditsCandidate(
+                    Address::from_str(&value.address)?,
+                ))
+            }
+            exec::RequestItem::AddressDeferredCreditsFinal(value) => {
+                Ok(ExecutionQueryRequestItem::AddressDeferredCreditsFinal(
+                    Address::from_str(&value.address)?,
+                ))
+            }
+            //TODO to be checked
+            exec::RequestItem::CycleInfos(value) => {
+                let addreses = value
+                    .restrict_to_addresses
+                    .into_iter()
+                    .map(|address| Address::from_str(&address))
+                    .collect::<Result<Vec<_>, _>>()?;
+                let mut addresses_set = PreHashSet::with_capacity(addreses.len());
+                addresses_set.extend(addreses);
+                Ok(ExecutionQueryRequestItem::CycleInfos {
+                    cycle: value.cycle,
+                    restrict_to_addresses: Some(addresses_set),
+                })
+            }
+            exec::RequestItem::Events(value) => {
+                let event_filter = to_event_filter(value.filters)?;
+                Ok(ExecutionQueryRequestItem::Events(event_filter))
+            }
+        }
+    } else {
+        Err(ModelsError::ErrorRaised("no filter provided".to_string()))
+    }
+}
+
+/// Convert a vector of `grpc_model::ScExecutionEventsFilter` to a `EventFilter`
+pub fn to_event_filter(
+    sce_filters: Vec<grpc_api::ScExecutionEventsFilter>,
+) -> Result<EventFilter, ModelsError> {
+    let mut event_filter = EventFilter::default();
+    for query in sce_filters {
+        if let Some(filter) = query.filter {
+            match filter {
+                grpc_api::sc_execution_events_filter::Filter::SlotRange(slot_range) => {
+                    event_filter.start = slot_range.start_slot.map(|slot| slot.into());
+                    event_filter.end = slot_range.end_slot.map(|slot| slot.into());
+                }
+                grpc_api::sc_execution_events_filter::Filter::CallerAddress(caller_address) => {
+                    event_filter.original_caller_address =
+                        Some(Address::from_str(&caller_address)?);
+                }
+                grpc_api::sc_execution_events_filter::Filter::EmitterAddress(emitter_address) => {
+                    event_filter.emitter_address = Some(Address::from_str(&emitter_address)?);
+                }
+                grpc_api::sc_execution_events_filter::Filter::OriginalOperationId(operation_id) => {
+                    event_filter.original_operation_id =
+                        Some(OperationId::from_str(&operation_id)?);
+                }
+                grpc_api::sc_execution_events_filter::Filter::IsFailure(is_failure) => {
+                    event_filter.is_error = Some(is_failure);
+                }
+                grpc_api::sc_execution_events_filter::Filter::Status(status) => {
+                    // See grpc_model::ScExecutionEventStatus
+                    match status {
+                        1 => event_filter.is_final = Some(true),
+                        2 => event_filter.is_final = Some(false),
+                        _ => event_filter.is_final = None,
+                    }
+                }
+            }
+        }
+    }
+
+    Ok(event_filter)
+}
+
+/// Converts a `ExecutionQueryResponse` to a `grpc_api::ExecutionQueryResponse`
+pub fn to_execution_query_response(
+    value: Result<ExecutionQueryResponseItem, ExecutionQueryError>,
+) -> grpc_api::ExecutionQueryResponse {
+    match value {
+        Ok(item) => grpc_api::ExecutionQueryResponse {
+            response: Some(grpc_api::execution_query_response::Response::Result(
+                to_execution_query_result(item),
+            )),
+        },
+        Err(err) => grpc_api::ExecutionQueryResponse {
+            response: Some(grpc_api::execution_query_response::Response::Error(
+                err.into(),
+            )),
+        },
+    }
+}
+
+// Convertss a `ExecutionQueryResponseItem` to a `grpc_api::ExecutionQueryResponseItem`
+fn to_execution_query_result(
+    value: ExecutionQueryResponseItem,
+) -> grpc_api::ExecutionQueryResponseItem {
+    let response_item = match value {
+        ExecutionQueryResponseItem::Boolean(result) => {
+            grpc_api::execution_query_response_item::ResponseItem::Boolean(result)
+        }
+        ExecutionQueryResponseItem::RollCount(result) => {
+            grpc_api::execution_query_response_item::ResponseItem::RollCount(result)
+        }
+        ExecutionQueryResponseItem::Amount(result) => {
+            grpc_api::execution_query_response_item::ResponseItem::Amount(result.into())
+        }
+        ExecutionQueryResponseItem::Bytecode(result) => {
+            grpc_api::execution_query_response_item::ResponseItem::Bytes(result.0)
+        }
+        ExecutionQueryResponseItem::DatastoreValue(result) => {
+            grpc_api::execution_query_response_item::ResponseItem::Bytes(result)
+        }
+        ExecutionQueryResponseItem::KeyList(result) => {
+            grpc_api::execution_query_response_item::ResponseItem::VecBytes(
+                grpc_model::ArrayOfBytesWrapper {
+                    items: result.into_iter().collect(),
+                },
+            )
+        }
+        ExecutionQueryResponseItem::DeferredCredits(result) => {
+            grpc_api::execution_query_response_item::ResponseItem::DeferredCredits(
+                grpc_api::DeferredCreditsEntryWrapper {
+                    entries: result
+                        .into_iter()
+                        .map(|(slot, amount)| grpc_api::DeferredCreditsEntry {
+                            slot: Some(slot.into()),
+                            amount: Some(amount.into()),
+                        })
+                        .collect(),
+                },
+            )
+        }
+        ExecutionQueryResponseItem::ExecutionStatus(result) => match result {
+            ExecutionQueryExecutionStatus::AlreadyExecutedWithSuccess => {
+                grpc_api::execution_query_response_item::ResponseItem::ExecutionStatus(
+                    grpc_api::ExecutionQueryExecutionStatus::AlreadyExecutedWithSuccess as i32,
+                )
+            }
+            ExecutionQueryExecutionStatus::AlreadyExecutedWithFailure => {
+                grpc_api::execution_query_response_item::ResponseItem::ExecutionStatus(
+                    grpc_api::ExecutionQueryExecutionStatus::AlreadyExecutedWithFailure as i32,
+                )
+            }
+            ExecutionQueryExecutionStatus::ExecutableOrExpired => {
+                grpc_api::execution_query_response_item::ResponseItem::ExecutionStatus(
+                    grpc_api::ExecutionQueryExecutionStatus::ExecutableOrExpired as i32,
+                )
+            }
+        },
+        ExecutionQueryResponseItem::CycleInfos(result) => {
+            grpc_api::execution_query_response_item::ResponseItem::CycleInfos(to_cycle_info(result))
+        }
+        ExecutionQueryResponseItem::Events(result) => {
+            grpc_api::execution_query_response_item::ResponseItem::Events(
+                grpc_api::ScOutputEventsWrapper {
+                    events: result.into_iter().map(|event| event.into()).collect(),
+                },
+            )
+        }
+    };
+
+    grpc_api::ExecutionQueryResponseItem {
+        response_item: Some(response_item),
+    }
+}
+
+// Convertss a `ExecutionQueryCycleInfos` to a `grpc_api::CycleInfos`
+fn to_cycle_info(value: ExecutionQueryCycleInfos) -> grpc_api::ExecutionQueryCycleInfos {
+    grpc_api::ExecutionQueryCycleInfos {
+        cycle: value.cycle,
+        is_final: value.is_final,
+        staker_infos: value
+            .staker_infos
+            .into_iter()
+            .map(|(address, info)| to_execution_query_staker_info(address, info))
+            .collect(),
+    }
+}
+
+// Convertss a `ExecutionQueryStakerInfo` to a `grpc_api::ExecutionQueryStakerInfo`
+fn to_execution_query_staker_info(
+    address: Address,
+    info: ExecutionQueryStakerInfo,
+) -> grpc_api::ExecutionQueryStakerInfoEntry {
+    grpc_api::ExecutionQueryStakerInfoEntry {
+        address: address.to_string(),
+        info: Some(grpc_api::ExecutionQueryStakerInfo {
+            active_rolls: info.active_rolls,
+            production_stats: Some(grpc_api::ExecutionQueryStakerInfoProductionStatsEntry {
+                address: address.to_string(),
+                stats: Some(grpc_api::ExecutionQueryStakerInfoProductionStats {
+                    block_success_count: info.production_stats.block_success_count,
+                    block_failure_count: info.production_stats.block_failure_count,
+                }),
+            }),
+        }),
+    }
+}
+
 impl From<SlotExecutionOutput> for grpc_model::SlotExecutionOutput {
     fn from(value: SlotExecutionOutput) -> Self {
         match value {
             SlotExecutionOutput::ExecutedSlot(execution_output) => {
                 grpc_model::SlotExecutionOutput {
-                    status: vec![grpc_model::ExecutionOutputStatus::Candidate as i32],
+                    status: grpc_model::ExecutionOutputStatus::Candidate as i32,
                     execution_output: Some(execution_output.into()),
                 }
             }
             SlotExecutionOutput::FinalizedSlot(execution_output) => {
                 grpc_model::SlotExecutionOutput {
-                    status: vec![grpc_model::ExecutionOutputStatus::Final as i32],
+                    status: grpc_model::ExecutionOutputStatus::Final as i32,
                     execution_output: Some(execution_output.into()),
                 }
             }
@@ -37,3 +340,15 @@ impl From<ExecutionOutput> for grpc_model::ExecutionOutput {
         }
     }
 }
+
+impl From<ExecutionQueryError> for grpc_model::Error {
+    fn from(value: ExecutionQueryError) -> Self {
+        match value {
+            ExecutionQueryError::NotFound(error) => grpc_model::Error {
+                //TODO to be defined
+                code: 404,
+                message: error,
+            },
+        }
+    }
+}
diff --git a/massa-final-state/Cargo.toml b/massa-final-state/Cargo.toml
index f0d76c6a27c..381c0158730 100644
--- a/massa-final-state/Cargo.toml
+++ b/massa-final-state/Cargo.toml
@@ -22,7 +22,7 @@ massa_async_pool = { path = "../massa-async-pool" }
 massa_serialization = { path = "../massa-serialization" }
 massa_pos_exports = { path = "../massa-pos-exports" }
 massa_db_exports = { path = "../massa-db-exports" }
-massa-proto-rs = { git = "https://github.com/massalabs/massa-proto-rs", rev = "18ec02f", features = ["tonic"] }
+massa-proto-rs = { git = "https://github.com/massalabs/massa-proto-rs", rev = "32179e2", features = ["tonic"] }
 massa_versioning = { path = "../massa-versioning" }
 massa_time = { path = "../massa-time" }
 massa_hash = { path = "../massa-hash" }
diff --git a/massa-final-state/src/mapping_grpc.rs b/massa-final-state/src/mapping_grpc.rs
index 908138fe227..98c6c0986d0 100644
--- a/massa-final-state/src/mapping_grpc.rs
+++ b/massa-final-state/src/mapping_grpc.rs
@@ -16,9 +16,10 @@ impl From<StateChanges> for grpc_model::StateChanges {
                         operation_id: op_id.to_string(),
                         value: Some(grpc_model::ExecutedOpsChangeValue {
                             status: if op_exec_status {
-                                vec![grpc_model::OperationExecutionStatus::Success as i32]
+                                //TODO to be enhanced
+                                grpc_model::OperationExecutionStatus::Success as i32
                             } else {
-                                vec![grpc_model::OperationExecutionStatus::Failed as i32]
+                                grpc_model::OperationExecutionStatus::Failed as i32
                             },
                             slot: Some(op_valid_until_slot.into()),
                         }),
diff --git a/massa-grpc/Cargo.toml b/massa-grpc/Cargo.toml
index b3735bb5a62..0deba81cabc 100644
--- a/massa-grpc/Cargo.toml
+++ b/massa-grpc/Cargo.toml
@@ -10,7 +10,7 @@ homepage = "https://massa.net"
 documentation = "https://docs.massa.net/"
 
 [dependencies]
-massa-proto-rs = { git = "https://github.com/massalabs/massa-proto-rs", rev = "18ec02f", features = ["tonic"] }
+massa-proto-rs = { git = "https://github.com/massalabs/massa-proto-rs", rev = "32179e2", features = ["tonic"] }
 displaydoc = "0.2"
 thiserror = "1.0"
 tonic = { version = "0.9.2", features = ["gzip", "tls"] }
@@ -23,9 +23,9 @@ futures-util = "0.3.25"
 serde = { version = "1.0", features = ["derive"] }
 tokio = { version = "1.23", features = ["rt-multi-thread", "macros"] }
 tokio-stream = "0.1.12"
-itertools = "0.10"
 h2 = "0.3.17"
 tracing = "0.1"
+parking_lot = { version = "0.12", features = ["deadlock_detection"] }
 # custom modules
 massa_consensus_exports = { path = "../massa-consensus-exports" }
 massa_hash = { path = "../massa-hash" }
@@ -39,6 +39,8 @@ massa_time = { path = "../massa-time" }
 massa_wallet = { path = "../massa-wallet" }
 massa_serialization = { path = "../massa-serialization" }
 massa_versioning = { path = "../massa-versioning" }
+massa_signature = { path = "../massa-signature" }
+massa_bootstrap = { path = "../massa-bootstrap" }
 
 [dev-dependencies]
 num = "0.4"
diff --git a/massa-grpc/src/api.rs b/massa-grpc/src/api.rs
deleted file mode 100644
index 105014adae9..00000000000
--- a/massa-grpc/src/api.rs
+++ /dev/null
@@ -1,650 +0,0 @@
-// Copyright (c) 2023 MASSA LABS <info@massa.net>
-
-use crate::error::GrpcError;
-use crate::server::MassaGrpc;
-use itertools::izip;
-use massa_models::address::Address;
-use massa_models::block::BlockGraphStatus;
-use massa_models::block_id::BlockId;
-use massa_models::execution::EventFilter;
-use massa_models::operation::{OperationId, SecureShareOperation};
-use massa_models::prehash::PreHashSet;
-use massa_models::slot::Slot;
-use massa_models::timeslots::{self, get_latest_block_slot_at_timestamp};
-use massa_proto_rs::massa::api::v1 as grpc_api;
-use massa_proto_rs::massa::model::v1 as grpc_model;
-use massa_time::MassaTime;
-use std::str::FromStr;
-use tracing::log::warn;
-
-/// Default offset
-const DEFAULT_OFFSET: u64 = 1;
-/// Default limit
-const DEFAULT_LIMIT: u64 = 50;
-
-/// Get blocks
-pub(crate) fn get_blocks(
-    grpc: &MassaGrpc,
-    request: tonic::Request<grpc_api::GetBlocksRequest>,
-) -> Result<grpc_api::GetBlocksResponse, GrpcError> {
-    let inner_req = request.into_inner();
-
-    // Get the block IDs from the request.
-    let blocks_ids: Vec<BlockId> = inner_req
-        .queries
-        .into_iter()
-        .take(grpc.grpc_config.max_block_ids_per_request as usize + 1)
-        .map(|query| {
-            // Get the block ID from the query.
-            query
-                .filter
-                .ok_or_else(|| GrpcError::InvalidArgument("filter is missing".to_string()))
-                .and_then(|filter| {
-                    BlockId::from_str(filter.id.as_str()).map_err(|_| {
-                        GrpcError::InvalidArgument(format!("invalid block id: {}", filter.id))
-                    })
-                })
-        })
-        .collect::<Result<_, _>>()?;
-
-    if blocks_ids.len() as u32 > grpc.grpc_config.max_block_ids_per_request {
-        return Err(GrpcError::InvalidArgument(format!(
-            "too many block ids received. Only a maximum of {} block ids are accepted per request",
-            grpc.grpc_config.max_block_ids_per_request
-        )));
-    }
-
-    // Get the current slot.
-    let now: MassaTime = MassaTime::now()?;
-    let current_slot = get_latest_block_slot_at_timestamp(
-        grpc.grpc_config.thread_count,
-        grpc.grpc_config.t0,
-        grpc.grpc_config.genesis_timestamp,
-        now,
-    )?
-    .unwrap_or_else(|| Slot::new(0, 0));
-
-    // Create the context for the response.
-    let context = Some(grpc_api::BlocksContext {
-        slot: Some(current_slot.into()),
-    });
-
-    let storage = grpc.storage.clone_without_refs();
-    let blocks = blocks_ids
-        .into_iter()
-        .filter_map(|id| {
-            let content = if let Some(wrapped_block) = storage.read_blocks().get(&id) {
-                wrapped_block.content.clone()
-            } else {
-                return None;
-            };
-
-            if let Some(graph_status) = grpc
-                .consensus_controller
-                .get_block_statuses(&[id])
-                .into_iter()
-                .next()
-            {
-                let mut status = Vec::new();
-
-                if graph_status == BlockGraphStatus::Final {
-                    status.push(grpc_model::BlockStatus::Final.into());
-                };
-                if graph_status == BlockGraphStatus::ActiveInBlockclique {
-                    status.push(grpc_model::BlockStatus::InBlockclique.into());
-                };
-                if graph_status == BlockGraphStatus::ActiveInBlockclique
-                    || graph_status == BlockGraphStatus::ActiveInAlternativeCliques
-                {
-                    status.push(grpc_model::BlockStatus::Candidate.into());
-                };
-                if graph_status == BlockGraphStatus::Discarded {
-                    status.push(grpc_model::BlockStatus::Discarded.into());
-                };
-
-                return Some(grpc_model::BlockWrapper {
-                    id: id.to_string(),
-                    block: Some(content.into()),
-                    status,
-                });
-            }
-
-            None
-        })
-        .collect::<Vec<grpc_model::BlockWrapper>>();
-
-    Ok(grpc_api::GetBlocksResponse {
-        id: inner_req.id,
-        context,
-        blocks,
-    })
-}
-
-/// get blocks by slots
-pub(crate) fn get_blocks_by_slots(
-    grpc: &MassaGrpc,
-    request: tonic::Request<grpc_api::GetBlocksBySlotsRequest>,
-) -> Result<grpc_api::GetBlocksBySlotsResponse, GrpcError> {
-    let inner_req = request.into_inner();
-    let storage = grpc.storage.clone_without_refs();
-
-    let mut blocks = Vec::new();
-
-    for slot in inner_req.slots.into_iter() {
-        let Some(block_id) = grpc.consensus_controller.get_blockclique_block_at_slot(Slot {
-            period: slot.period,
-            thread: slot.thread as u8,
-        }) else {
-            continue;
-        };
-
-        let res = storage.read_blocks().get(&block_id).map(|b| {
-            let massa_header = b.clone().content.header;
-            let operations: Vec<String> = b
-                .content
-                .operations
-                .iter()
-                .map(|ope| ope.to_string())
-                .collect();
-
-            (massa_header.into(), operations)
-        });
-
-        if let Some(block) = res {
-            blocks.push(grpc_model::Block {
-                header: Some(block.0),
-                operations: block.1,
-            });
-        }
-    }
-
-    Ok(grpc_api::GetBlocksBySlotsResponse {
-        id: inner_req.id,
-        blocks,
-    })
-}
-
-/// Get multiple datastore entries
-pub(crate) fn get_datastore_entries(
-    grpc: &MassaGrpc,
-    request: tonic::Request<grpc_api::GetDatastoreEntriesRequest>,
-) -> Result<grpc_api::GetDatastoreEntriesResponse, GrpcError> {
-    let inner_req = request.into_inner();
-    let id = inner_req.id;
-
-    let filters = inner_req
-        .queries
-        .into_iter()
-        .map(|query| match query.filter {
-            Some(filter) => Address::from_str(filter.address.as_str())
-                .map(|address| (address, filter.key))
-                .map_err(|e| e.into()),
-            None => Err(GrpcError::InvalidArgument("filter is missing".to_string())),
-        })
-        .collect::<Result<Vec<_>, _>>()?;
-
-    let entries = grpc
-        .execution_controller
-        .get_final_and_active_data_entry(filters)
-        .into_iter()
-        .map(|output| grpc_api::DatastoreEntry {
-            final_value: output.0.unwrap_or_default(),
-            candidate_value: output.1.unwrap_or_default(),
-        })
-        .collect();
-
-    Ok(grpc_api::GetDatastoreEntriesResponse { id, entries })
-}
-
-/// Get the largest stakers
-pub(crate) fn get_largest_stakers(
-    grpc: &MassaGrpc,
-    request: tonic::Request<grpc_api::GetLargestStakersRequest>,
-) -> Result<grpc_api::GetLargestStakersResponse, GrpcError> {
-    let inner_req = request.into_inner();
-    let id = inner_req.id;
-
-    // Parse the query parameters, if provided.
-    let query_res: Result<(u64, u64, Option<grpc_api::LargestStakersFilter>), GrpcError> =
-        inner_req
-            .query
-            .map_or(Ok((DEFAULT_OFFSET, DEFAULT_LIMIT, None)), |query| {
-                let limit = if query.limit == 0 {
-                    DEFAULT_LIMIT
-                } else {
-                    query.limit
-                };
-                let filter = query.filter;
-                // If the filter is provided, validate the minimum and maximum roll counts.
-                let filter_opt = filter
-                    .map(|filter| {
-                        if let Some(min_rolls) = filter.min_rolls {
-                            if min_rolls == 0 {
-                                return Err(GrpcError::InvalidArgument(
-                                    "min_rolls should be a positive number".into(),
-                                ));
-                            }
-                            if let Some(max_rolls) = filter.max_rolls {
-                                if max_rolls == 0 {
-                                    return Err(GrpcError::InvalidArgument(
-                                        "max_rolls should be a positive number".into(),
-                                    ));
-                                }
-                                if min_rolls > max_rolls {
-                                    return Err(GrpcError::InvalidArgument(format!(
-                                        "min_rolls {} cannot be greater than max_rolls {}",
-                                        min_rolls, max_rolls
-                                    )));
-                                }
-                            }
-                        }
-
-                        Ok(filter)
-                    })
-                    .transpose()?; // Convert `Option<Result>` to `Result<Option>`.
-
-                Ok((query.offset, limit, filter_opt))
-            });
-
-    let (offset, limit, filter_opt) = query_res?;
-
-    // Get the current cycle and slot.
-    let now: MassaTime = MassaTime::now()?;
-
-    let latest_block_slot_at_timestamp_result = get_latest_block_slot_at_timestamp(
-        grpc.grpc_config.thread_count,
-        grpc.grpc_config.t0,
-        grpc.grpc_config.genesis_timestamp,
-        now,
-    );
-
-    let (cur_cycle, cur_slot) = match latest_block_slot_at_timestamp_result {
-        Ok(Some(cur_slot)) if cur_slot.period <= grpc.grpc_config.last_start_period => (
-            Slot::new(grpc.grpc_config.last_start_period, 0)
-                .get_cycle(grpc.grpc_config.periods_per_cycle),
-            cur_slot,
-        ),
-        Ok(Some(cur_slot)) => (
-            cur_slot.get_cycle(grpc.grpc_config.periods_per_cycle),
-            cur_slot,
-        ),
-        Ok(None) => (0, Slot::new(0, 0)),
-        Err(e) => return Err(GrpcError::ModelsError(e)),
-    };
-
-    // Create the context for the response.
-    let context = Some(grpc_api::LargestStakersContext {
-        slot: Some(cur_slot.into()),
-    });
-
-    // Get the list of stakers, filtered by the specified minimum and maximum roll counts.
-    let mut staker_vec = grpc
-        .execution_controller
-        .get_cycle_active_rolls(cur_cycle)
-        .into_iter()
-        .filter(|(_, rolls)| {
-            filter_opt.as_ref().map_or(true, |filter| {
-                if let Some(min_rolls) = filter.min_rolls {
-                    if *rolls < min_rolls {
-                        return false;
-                    }
-                }
-                if let Some(max_rolls) = filter.max_rolls {
-                    if *rolls > max_rolls {
-                        return false;
-                    }
-                }
-                true
-            })
-        })
-        .map(|(address, roll_counts)| (address.to_string(), roll_counts))
-        .collect::<Vec<(String, u64)>>();
-
-    // Sort the stakers by their roll counts in descending order.
-    staker_vec.sort_by_key(|&(_, roll_counts)| std::cmp::Reverse(roll_counts));
-
-    // Paginate the stakers based on the specified offset and limit.
-    let stakers = staker_vec
-        .into_iter()
-        .map(|(address, rolls)| grpc_api::LargestStakerEntry { address, rolls })
-        .skip(offset as usize)
-        .take(limit as usize)
-        .collect();
-
-    // Return a response with the given id, context, and the collected stakers.
-    Ok(grpc_api::GetLargestStakersResponse {
-        id,
-        context,
-        stakers,
-    })
-}
-
-// Get node version
-pub(crate) fn get_mip_status(
-    grpc: &MassaGrpc,
-    request: tonic::Request<grpc_api::GetMipStatusRequest>,
-) -> Result<grpc_api::GetMipStatusResponse, GrpcError> {
-    let mip_store_status_ = grpc.mip_store.get_mip_status();
-    let mip_store_status: Result<Vec<grpc_model::MipStatusEntry>, GrpcError> = mip_store_status_
-        .iter()
-        .map(|(mip_info, state_id_)| {
-            let state_id = grpc_model::ComponentStateId::from(state_id_);
-            Ok(grpc_model::MipStatusEntry {
-                mip_info: Some(grpc_model::MipInfo::from(mip_info)),
-                state_id: i32::from(state_id),
-            })
-        })
-        .collect();
-
-    Ok(grpc_api::GetMipStatusResponse {
-        id: request.into_inner().id,
-        entries: mip_store_status?,
-    })
-}
-
-/// Get next block best parents
-pub(crate) fn get_next_block_best_parents(
-    grpc: &MassaGrpc,
-    request: tonic::Request<grpc_api::GetNextBlockBestParentsRequest>,
-) -> Result<grpc_api::GetNextBlockBestParentsResponse, GrpcError> {
-    let inner_req = request.into_inner();
-    let parents = grpc
-        .consensus_controller
-        .get_best_parents()
-        .into_iter()
-        .map(|p| grpc_api::BlockParent {
-            block_id: p.0.to_string(),
-            period: p.1,
-        })
-        .collect();
-    Ok(grpc_api::GetNextBlockBestParentsResponse {
-        id: inner_req.id,
-        parents,
-    })
-}
-
-/// Get operations
-pub(crate) fn get_operations(
-    grpc: &MassaGrpc,
-    request: tonic::Request<grpc_api::GetOperationsRequest>,
-) -> Result<grpc_api::GetOperationsResponse, GrpcError> {
-    let storage = grpc.storage.clone_without_refs();
-    let inner_req: grpc_api::GetOperationsRequest = request.into_inner();
-    let id = inner_req.id;
-
-    let operations_ids: Vec<OperationId> = inner_req
-        .queries
-        .into_iter()
-        .take(grpc.grpc_config.max_operation_ids_per_request as usize + 1)
-        .map(|query| {
-            query
-                .filter
-                .ok_or_else(|| GrpcError::InvalidArgument("filter is missing".to_string()))
-                .and_then(|filter| {
-                    OperationId::from_str(filter.id.as_str()).map_err(|_| {
-                        GrpcError::InvalidArgument(format!("invalid operation id: {}", filter.id))
-                    })
-                })
-        })
-        .collect::<Result<_, _>>()?;
-
-    if operations_ids.len() as u32 > grpc.grpc_config.max_operation_ids_per_request {
-        return Err(GrpcError::InvalidArgument(format!("too many operations received. Only a maximum of {} operations are accepted per request", grpc.grpc_config.max_operation_ids_per_request)));
-    }
-
-    // Get the current slot.
-    let now: MassaTime = MassaTime::now()?;
-    let current_slot = get_latest_block_slot_at_timestamp(
-        grpc.grpc_config.thread_count,
-        grpc.grpc_config.t0,
-        grpc.grpc_config.genesis_timestamp,
-        now,
-    )?
-    .unwrap_or_else(|| Slot::new(0, 0));
-
-    // Create the context for the response.
-    let context = Some(grpc_api::OperationsContext {
-        slot: Some(current_slot.into()),
-    });
-
-    // Get the operations and the list of blocks that contain them from storage
-    let storage_info: Vec<(SecureShareOperation, PreHashSet<BlockId>)> = {
-        let read_blocks = storage.read_blocks();
-        let read_ops = storage.read_operations();
-        operations_ids
-            .iter()
-            .filter_map(|id| {
-                read_ops.get(id).cloned().map(|op| {
-                    (
-                        op,
-                        read_blocks
-                            .get_blocks_by_operation(id)
-                            .cloned()
-                            .unwrap_or_default(),
-                    )
-                })
-            })
-            .collect()
-    };
-
-    // Keep only the ops id (found in storage)
-    let ops: Vec<OperationId> = storage_info.iter().map(|(op, _)| op.id).collect();
-
-    // Get the speculative and final execution status of the operations
-    let exec_statuses: Vec<_> = grpc
-        .execution_controller
-        .get_ops_exec_status(&ops)
-        .into_iter()
-        .map(|(spec_exec, final_exec)| match (spec_exec, final_exec) {
-            (Some(true), Some(true)) => {
-                vec![
-                    grpc_model::OperationStatus::Success.into(),
-                    grpc_model::OperationStatus::Final.into(),
-                ]
-            }
-            (Some(false), Some(false)) => {
-                vec![
-                    grpc_model::OperationStatus::Failure.into(),
-                    grpc_model::OperationStatus::Final.into(),
-                ]
-            }
-            (Some(true), None) => {
-                vec![
-                    grpc_model::OperationStatus::Success.into(),
-                    grpc_model::OperationStatus::Pending.into(),
-                ]
-            }
-            (Some(false), None) => {
-                vec![
-                    grpc_model::OperationStatus::Failure.into(),
-                    grpc_model::OperationStatus::Pending.into(),
-                ]
-            }
-            _ => {
-                vec![grpc_model::OperationStatus::Unknown.into()]
-            }
-        })
-        .collect();
-
-    // Gather all values into a vector of OperationWrapper instances
-    let mut operations: Vec<grpc_model::OperationWrapper> = Vec::with_capacity(ops.len());
-    let zipped_iterator = izip!(
-        ops.into_iter(),
-        storage_info.into_iter(),
-        exec_statuses.into_iter(),
-    );
-    for (id, (operation, in_blocks), exec_status) in zipped_iterator {
-        operations.push(grpc_model::OperationWrapper {
-            id: id.to_string(),
-            thread: operation
-                .content_creator_address
-                .get_thread(grpc.grpc_config.thread_count) as u32,
-            operation: Some(operation.into()),
-            block_ids: in_blocks.into_iter().map(|id| id.to_string()).collect(),
-            status: exec_status,
-        });
-    }
-
-    Ok(grpc_api::GetOperationsResponse {
-        id,
-        context,
-        operations,
-    })
-}
-
-/// Get smart contract execution events
-pub(crate) fn get_sc_execution_events(
-    grpc: &MassaGrpc,
-    request: tonic::Request<grpc_api::GetScExecutionEventsRequest>,
-) -> Result<grpc_api::GetScExecutionEventsResponse, GrpcError> {
-    let inner_req: grpc_api::GetScExecutionEventsRequest = request.into_inner();
-    let id = inner_req.id;
-
-    let event_filter = inner_req
-        .query
-        .map_or(Ok(EventFilter::default()), |query| {
-            query.filter.map_or(Ok(EventFilter::default()), |filter| {
-                filter.try_into().map_err(|e| {
-                    GrpcError::InvalidArgument(format!("failed to parse filter due to: {}", e))
-                })
-            })
-        })?;
-
-    // Get the current slot.
-    let now: MassaTime = MassaTime::now()?;
-    let current_slot = get_latest_block_slot_at_timestamp(
-        grpc.grpc_config.thread_count,
-        grpc.grpc_config.t0,
-        grpc.grpc_config.genesis_timestamp,
-        now,
-    )?
-    .unwrap_or_else(|| Slot::new(0, 0));
-
-    // Create the context for the response.
-    let context = Some(grpc_api::GetScExecutionEventsContext {
-        slot: Some(current_slot.into()),
-    });
-
-    let events: Vec<grpc_model::ScExecutionEvent> = grpc
-        .execution_controller
-        .get_filtered_sc_output_event(event_filter)
-        .into_iter()
-        .map(|event| event.into())
-        .collect();
-
-    Ok(grpc_api::GetScExecutionEventsResponse {
-        id,
-        context,
-        events,
-    })
-}
-
-//  Get selector draws
-pub(crate) fn get_selector_draws(
-    grpc: &MassaGrpc,
-    request: tonic::Request<grpc_api::GetSelectorDrawsRequest>,
-) -> Result<grpc_api::GetSelectorDrawsResponse, GrpcError> {
-    let inner_req = request.into_inner();
-    let id = inner_req.id;
-
-    let addresses = inner_req
-        .queries
-        .into_iter()
-        .map(|query| match query.filter {
-            Some(filter) => Address::from_str(filter.address.as_str()).map_err(|e| e.into()),
-            None => Err(GrpcError::InvalidArgument("filter is missing".to_string())),
-        })
-        .collect::<Result<Vec<_>, _>>()?;
-
-    // get future draws from selector
-    let selection_draws = {
-        let cur_slot = match timeslots::get_current_latest_block_slot(
-            grpc.grpc_config.thread_count,
-            grpc.grpc_config.t0,
-            grpc.grpc_config.genesis_timestamp,
-        ) {
-            Ok(slot) => slot.unwrap_or_else(Slot::min),
-            Err(e) => {
-                warn!("failed to get current slot with error: {}", e);
-                Slot::min()
-            }
-        };
-
-        let slot_end = Slot::new(
-            cur_slot
-                .period
-                .saturating_add(grpc.grpc_config.draw_lookahead_period_count),
-            cur_slot.thread,
-        );
-        addresses
-            .iter()
-            .map(|addr| {
-                let (nt_block_draws, nt_endorsement_draws) = grpc
-                    .selector_controller
-                    .get_address_selections(addr, cur_slot, slot_end)
-                    .unwrap_or_default();
-
-                let mut proto_nt_block_draws = Vec::with_capacity(addresses.len());
-                let mut proto_nt_endorsement_draws = Vec::with_capacity(addresses.len());
-                let iterator = izip!(nt_block_draws.into_iter(), nt_endorsement_draws.into_iter());
-                for (next_block_draw, next_endorsement_draw) in iterator {
-                    proto_nt_block_draws.push(next_block_draw.into());
-                    proto_nt_endorsement_draws.push(next_endorsement_draw.into());
-                }
-
-                (proto_nt_block_draws, proto_nt_endorsement_draws)
-            })
-            .collect::<Vec<_>>()
-    };
-
-    // Compile results
-    let mut res = Vec::with_capacity(addresses.len());
-    let iterator = izip!(addresses.into_iter(), selection_draws.into_iter());
-    for (address, (next_block_draws, next_endorsement_draws)) in iterator {
-        res.push(grpc_model::SelectorDraws {
-            address: address.to_string(),
-            next_block_draws,
-            next_endorsement_draws,
-        });
-    }
-
-    Ok(grpc_api::GetSelectorDrawsResponse {
-        id,
-        selector_draws: res,
-    })
-}
-
-/// Get transactions throughput
-pub(crate) fn get_transactions_throughput(
-    grpc: &MassaGrpc,
-    request: tonic::Request<grpc_api::GetTransactionsThroughputRequest>,
-) -> Result<grpc_api::GetTransactionsThroughputResponse, GrpcError> {
-    let stats = grpc.execution_controller.get_stats();
-    let nb_sec_range = stats
-        .time_window_end
-        .saturating_sub(stats.time_window_start)
-        .to_duration()
-        .as_secs();
-
-    // checked_div
-    let throughput = stats
-        .final_executed_operations_count
-        .checked_div(nb_sec_range as usize)
-        .unwrap_or_default() as u32;
-
-    Ok(grpc_api::GetTransactionsThroughputResponse {
-        id: request.into_inner().id,
-        throughput,
-    })
-}
-
-// Get node version
-pub(crate) fn get_version(
-    grpc: &MassaGrpc,
-    request: tonic::Request<grpc_api::GetVersionRequest>,
-) -> Result<grpc_api::GetVersionResponse, GrpcError> {
-    Ok(grpc_api::GetVersionResponse {
-        id: request.into_inner().id,
-        version: grpc.version.to_string(),
-    })
-}
diff --git a/massa-grpc/src/config.rs b/massa-grpc/src/config.rs
index 65bdb92c6e9..88f41894577 100644
--- a/massa-grpc/src/config.rs
+++ b/massa-grpc/src/config.rs
@@ -1,5 +1,6 @@
 // Copyright (c) 2023 MASSA LABS <info@massa.net>
 
+use massa_signature::KeyPair;
 use massa_time::MassaTime;
 use serde::Deserialize;
 use std::{net::SocketAddr, path::PathBuf, time::Duration};
@@ -18,7 +19,9 @@ pub struct GrpcConfig {
     pub enable_health: bool,
     /// whether to enable gRPC reflection
     pub enable_reflection: bool,
-    /// whether to enable mTLS
+    /// whether to enable TLS
+    pub enable_tls: bool,
+    /// whether to enable mTLS (requires `enable_tls` to be true)
     pub enable_mtls: bool,
     /// bind for the Massa gRPC API
     pub bind: SocketAddr,
@@ -40,6 +43,8 @@ pub struct GrpcConfig {
     pub initial_connection_window_size: Option<u32>,
     /// sets the SETTINGS_MAX_CONCURRENT_STREAMS spec option for HTTP2 connections. Default is no limit (`None`)
     pub max_concurrent_streams: Option<u32>,
+    /// max number of arguments per gRPC request
+    pub max_arguments: u64,
     /// set whether TCP keepalive messages are enabled on accepted connections
     pub tcp_keepalive: Option<Duration>,
     /// set the value of `TCP_NODELAY` option for accepted connections. Enabled by default
@@ -80,6 +85,8 @@ pub struct GrpcConfig {
     pub t0: MassaTime,
     /// periods per cycle
     pub periods_per_cycle: u64,
+    /// keypair file
+    pub keypair: KeyPair,
     /// limits the maximum size of streaming channel
     pub max_channel_size: usize,
     /// when looking for next draw we want to look at max `draw_lookahead_period_count`
@@ -99,3 +106,12 @@ pub struct GrpcConfig {
     /// client certificate authority root path
     pub client_certificate_authority_root_path: PathBuf,
 }
+
+/// gRPC API configuration.
+#[derive(Debug, Deserialize, Clone)]
+pub struct GrpcApiConfig {
+    /// Public server gRPC configuration.
+    pub public: GrpcConfig,
+    /// Private server gRPC configuration.
+    pub private: GrpcConfig,
+}
diff --git a/massa-grpc/src/error.rs b/massa-grpc/src/error.rs
index 335dfada0ae..a978b626152 100644
--- a/massa-grpc/src/error.rs
+++ b/massa-grpc/src/error.rs
@@ -9,7 +9,9 @@ use massa_execution_exports::ExecutionError;
 use massa_hash::MassaHashError;
 use massa_models::error::ModelsError;
 use massa_protocol_exports::ProtocolError;
+use massa_signature::MassaSignatureError;
 use massa_time::TimeError;
+use massa_versioning::versioning_factory::FactoryError;
 use massa_wallet::WalletError;
 use tracing::log::error;
 
@@ -19,6 +21,8 @@ use tracing::log::error;
 pub enum GrpcError {
     /// `massa_hash` error: {0}
     MassaHashError(#[from] MassaHashError),
+    /// `massa_hash` error: {0}
+    MassaSignatureError(#[from] MassaSignatureError),
     /// consensus error: {0}
     ConsensusError(#[from] ConsensusError),
     /// execution error: {0}
@@ -31,12 +35,16 @@ pub enum GrpcError {
     ModelsError(#[from] ModelsError),
     /// Time error: {0}
     TimeError(#[from] TimeError),
+    /// Versioning factory error: {0}
+    FactoryError(#[from] FactoryError),
     /// Wallet error: {0}
     WalletError(#[from] WalletError),
     /// Internal server error: {0}
     InternalServerError(String),
     /// Invalid argument error: {0}
     InvalidArgument(String),
+    /// Not implemented error: {0}
+    Unimplemented(String),
 }
 
 impl From<GrpcError> for tonic::Status {
@@ -44,15 +52,18 @@ impl From<GrpcError> for tonic::Status {
         error!("{}", error);
         match error {
             GrpcError::MassaHashError(e) => tonic::Status::internal(e.to_string()),
+            GrpcError::MassaSignatureError(e) => tonic::Status::internal(e.to_string()),
             GrpcError::ConsensusError(e) => tonic::Status::internal(e.to_string()),
             GrpcError::ExecutionError(e) => tonic::Status::internal(e.to_string()),
             GrpcError::ProtocolError(e) => tonic::Status::internal(e.to_string()),
             GrpcError::ModelsError(e) => tonic::Status::internal(e.to_string()),
             GrpcError::TimeError(e) => tonic::Status::internal(e.to_string()),
+            GrpcError::FactoryError(e) => tonic::Status::internal(e.to_string()),
             GrpcError::WalletError(e) => tonic::Status::internal(e.to_string()),
             GrpcError::InternalServerError(e) => tonic::Status::internal(e),
             GrpcError::ReflectionError(e) => tonic::Status::internal(e.to_string()),
             GrpcError::InvalidArgument(e) => tonic::Status::invalid_argument(e),
+            GrpcError::Unimplemented(e) => tonic::Status::unimplemented(e),
         }
     }
 }
diff --git a/massa-grpc/src/handler.rs b/massa-grpc/src/handler.rs
index 825b4925837..352749ec9a4 100644
--- a/massa-grpc/src/handler.rs
+++ b/massa-grpc/src/handler.rs
@@ -2,15 +2,22 @@
 
 use massa_proto_rs::massa::api::v1 as grpc_api;
 
-use crate::api::{
-    get_blocks, get_blocks_by_slots, get_datastore_entries, get_largest_stakers, get_mip_status,
-    get_next_block_best_parents, get_operations, get_sc_execution_events, get_selector_draws,
-    get_transactions_throughput, get_version,
+use crate::private::{
+    add_staking_secret_keys, add_to_bootstrap_blacklist, add_to_bootstrap_whitelist,
+    add_to_peers_whitelist, allow_everyone_to_bootstrap, ban_nodes_by_ids, ban_nodes_by_ips,
+    get_bootstrap_blacklist, get_bootstrap_whitelist, get_mip_status, get_node_status,
+    get_peers_whitelist, remove_from_bootstrap_blacklist, remove_from_bootstrap_whitelist,
+    remove_from_peers_whitelist, remove_staking_addresses, shutdown_gracefully, sign_messages,
+    unban_nodes_by_ids, unban_nodes_by_ips,
 };
-use crate::server::MassaGrpc;
+use crate::public::{
+    execute_read_only_call, get_blocks, get_datastore_entries, get_next_block_best_parents,
+    get_operations, get_sc_execution_events, get_selector_draws, get_stakers, get_status,
+    get_transactions_throughput, query_state,
+};
+use crate::server::{MassaPrivateGrpc, MassaPublicGrpc};
 use crate::stream::{
     new_blocks::{new_blocks, NewBlocksStreamType},
-    new_blocks_headers::{new_blocks_headers, NewBlocksHeadersStreamType},
     new_endorsements::{new_endorsements, NewEndorsementsStreamType},
     new_filled_blocks::{new_filled_blocks, NewFilledBlocksStreamType},
     new_operations::{new_operations, NewOperationsStreamType},
@@ -22,7 +29,16 @@ use crate::stream::{
 };
 
 #[tonic::async_trait]
-impl grpc_api::massa_service_server::MassaService for MassaGrpc {
+impl grpc_api::public_service_server::PublicService for MassaPublicGrpc {
+    /// Execute read only call
+    async fn execute_read_only_call(
+        &self,
+        request: tonic::Request<grpc_api::ExecuteReadOnlyCallRequest>,
+    ) -> std::result::Result<tonic::Response<grpc_api::ExecuteReadOnlyCallResponse>, tonic::Status>
+    {
+        Ok(tonic::Response::new(execute_read_only_call(self, request)?))
+    }
+
     /// handler for get blocks
     async fn get_blocks(
         &self,
@@ -31,14 +47,6 @@ impl grpc_api::massa_service_server::MassaService for MassaGrpc {
         Ok(tonic::Response::new(get_blocks(self, request)?))
     }
 
-    /// handler for get blocks by slots
-    async fn get_blocks_by_slots(
-        &self,
-        request: tonic::Request<grpc_api::GetBlocksBySlotsRequest>,
-    ) -> Result<tonic::Response<grpc_api::GetBlocksBySlotsResponse>, tonic::Status> {
-        Ok(tonic::Response::new(get_blocks_by_slots(self, request)?))
-    }
-
     /// handler for get multiple datastore entries
     async fn get_datastore_entries(
         &self,
@@ -48,19 +56,19 @@ impl grpc_api::massa_service_server::MassaService for MassaGrpc {
     }
 
     /// handler for get largest stakers
-    async fn get_largest_stakers(
+    async fn get_stakers(
         &self,
-        request: tonic::Request<grpc_api::GetLargestStakersRequest>,
-    ) -> Result<tonic::Response<grpc_api::GetLargestStakersResponse>, tonic::Status> {
-        Ok(tonic::Response::new(get_largest_stakers(self, request)?))
+        request: tonic::Request<grpc_api::GetStakersRequest>,
+    ) -> Result<tonic::Response<grpc_api::GetStakersResponse>, tonic::Status> {
+        Ok(tonic::Response::new(get_stakers(self, request)?))
     }
 
-    /// handler for get mip status (versioning)
-    async fn get_mip_status(
+    /// handler for get satatus
+    async fn get_status(
         &self,
-        request: tonic::Request<grpc_api::GetMipStatusRequest>,
-    ) -> Result<tonic::Response<grpc_api::GetMipStatusResponse>, tonic::Status> {
-        Ok(tonic::Response::new(get_mip_status(self, request)?))
+        request: tonic::Request<grpc_api::GetStatusRequest>,
+    ) -> Result<tonic::Response<grpc_api::GetStatusResponse>, tonic::Status> {
+        Ok(tonic::Response::new(get_status(self, request)?))
     }
 
     /// handler for get next block best parents
@@ -110,11 +118,11 @@ impl grpc_api::massa_service_server::MassaService for MassaGrpc {
     }
 
     /// handler for get version
-    async fn get_version(
+    async fn query_state(
         &self,
-        request: tonic::Request<grpc_api::GetVersionRequest>,
-    ) -> Result<tonic::Response<grpc_api::GetVersionResponse>, tonic::Status> {
-        Ok(tonic::Response::new(get_version(self, request)?))
+        request: tonic::Request<grpc_api::QueryStateRequest>,
+    ) -> Result<tonic::Response<grpc_api::QueryStateResponse>, tonic::Status> {
+        Ok(tonic::Response::new(query_state(self, request)?))
     }
 
     // ███████╗████████╗██████╗ ███████╗ █████╗ ███╗   ███╗
@@ -133,18 +141,6 @@ impl grpc_api::massa_service_server::MassaService for MassaGrpc {
         Ok(tonic::Response::new(new_blocks(self, request).await?))
     }
 
-    type NewBlocksHeadersStream = NewBlocksHeadersStreamType;
-
-    /// handler for subscribe new blocks headers
-    async fn new_blocks_headers(
-        &self,
-        request: tonic::Request<tonic::Streaming<grpc_api::NewBlocksHeadersRequest>>,
-    ) -> Result<tonic::Response<Self::NewBlocksHeadersStream>, tonic::Status> {
-        Ok(tonic::Response::new(
-            new_blocks_headers(self, request).await?,
-        ))
-    }
-
     type NewEndorsementsStream = NewEndorsementsStreamType;
 
     /// handler for subscribe new operations stream
@@ -233,3 +229,174 @@ impl grpc_api::massa_service_server::MassaService for MassaGrpc {
         ))
     }
 }
+
+#[tonic::async_trait]
+impl grpc_api::private_service_server::PrivateService for MassaPrivateGrpc {
+    /// Add IP addresses to node bootstrap blacklist
+    async fn add_to_bootstrap_blacklist(
+        &self,
+        request: tonic::Request<grpc_api::AddToBootstrapBlacklistRequest>,
+    ) -> Result<tonic::Response<grpc_api::AddToBootstrapBlacklistResponse>, tonic::Status> {
+        Ok(tonic::Response::new(add_to_bootstrap_blacklist(
+            self, request,
+        )?))
+    }
+    /// Add IP addresses to node bootstrap whitelist
+    async fn add_to_bootstrap_whitelist(
+        &self,
+        request: tonic::Request<grpc_api::AddToBootstrapWhitelistRequest>,
+    ) -> Result<tonic::Response<grpc_api::AddToBootstrapWhitelistResponse>, tonic::Status> {
+        Ok(tonic::Response::new(add_to_bootstrap_whitelist(
+            self, request,
+        )?))
+    }
+    /// Add IP addresses to node peers whitelist. No confirmation to expect.
+    /// Note: If the ip was unknown it adds it to the known peers, otherwise it updates the peer type
+    async fn add_to_peers_whitelist(
+        &self,
+        request: tonic::Request<grpc_api::AddToPeersWhitelistRequest>,
+    ) -> Result<tonic::Response<grpc_api::AddToPeersWhitelistResponse>, tonic::Status> {
+        Ok(tonic::Response::new(add_to_peers_whitelist(self, request)?))
+    }
+    /// Add staking secret keys to wallet
+    async fn add_staking_secret_keys(
+        &self,
+        request: tonic::Request<grpc_api::AddStakingSecretKeysRequest>,
+    ) -> Result<tonic::Response<grpc_api::AddStakingSecretKeysResponse>, tonic::Status> {
+        Ok(tonic::Response::new(add_staking_secret_keys(
+            self, request,
+        )?))
+    }
+    /// Ban multiple nodes by their individual ids
+    async fn ban_nodes_by_ids(
+        &self,
+        request: tonic::Request<grpc_api::BanNodesByIdsRequest>,
+    ) -> Result<tonic::Response<grpc_api::BanNodesByIdsResponse>, tonic::Status> {
+        Ok(tonic::Response::new(ban_nodes_by_ids(self, request)?))
+    }
+
+    /// Ban multiple nodes by their individual IP addresses
+    async fn ban_nodes_by_ips(
+        &self,
+        request: tonic::Request<grpc_api::BanNodesByIpsRequest>,
+    ) -> Result<tonic::Response<grpc_api::BanNodesByIpsResponse>, tonic::Status> {
+        Ok(tonic::Response::new(ban_nodes_by_ips(self, request)?))
+    }
+
+    /// Get node bootstrap blacklist IP addresses
+    async fn get_bootstrap_blacklist(
+        &self,
+        request: tonic::Request<grpc_api::GetBootstrapBlacklistRequest>,
+    ) -> Result<tonic::Response<grpc_api::GetBootstrapBlacklistResponse>, tonic::Status> {
+        Ok(tonic::Response::new(get_bootstrap_blacklist(
+            self, request,
+        )?))
+    }
+    /// Get node bootstrap whitelist IP addresses
+    async fn get_bootstrap_whitelist(
+        &self,
+        request: tonic::Request<grpc_api::GetBootstrapWhitelistRequest>,
+    ) -> Result<tonic::Response<grpc_api::GetBootstrapWhitelistResponse>, tonic::Status> {
+        Ok(tonic::Response::new(get_bootstrap_whitelist(
+            self, request,
+        )?))
+    }
+    /// handler for get mip status (versioning)
+    async fn get_mip_status(
+        &self,
+        request: tonic::Request<grpc_api::GetMipStatusRequest>,
+    ) -> Result<tonic::Response<grpc_api::GetMipStatusResponse>, tonic::Status> {
+        Ok(tonic::Response::new(get_mip_status(self, request)?))
+    }
+    /// Allow everyone to bootstrap from the node by removing bootstrap whitelist configuration file
+    async fn allow_everyone_to_bootstrap(
+        &self,
+        request: tonic::Request<grpc_api::AllowEveryoneToBootstrapRequest>,
+    ) -> Result<tonic::Response<grpc_api::AllowEveryoneToBootstrapResponse>, tonic::Status> {
+        Ok(tonic::Response::new(allow_everyone_to_bootstrap(
+            self, request,
+        )?))
+    }
+    /// Get node status
+    async fn get_node_status(
+        &self,
+        request: tonic::Request<grpc_api::GetNodeStatusRequest>,
+    ) -> Result<tonic::Response<grpc_api::GetNodeStatusResponse>, tonic::Status> {
+        Ok(tonic::Response::new(get_node_status(self, request)?))
+    }
+    /// Get node peers whitelist IP addresses
+    async fn get_peers_whitelist(
+        &self,
+        request: tonic::Request<grpc_api::GetPeersWhitelistRequest>,
+    ) -> Result<tonic::Response<grpc_api::GetPeersWhitelistResponse>, tonic::Status> {
+        Ok(tonic::Response::new(get_peers_whitelist(self, request)?))
+    }
+    /// Remove from bootstrap blacklist given IP addresses
+    async fn remove_from_bootstrap_blacklist(
+        &self,
+        request: tonic::Request<grpc_api::RemoveFromBootstrapBlacklistRequest>,
+    ) -> Result<tonic::Response<grpc_api::RemoveFromBootstrapBlacklistResponse>, tonic::Status>
+    {
+        Ok(tonic::Response::new(remove_from_bootstrap_blacklist(
+            self, request,
+        )?))
+    }
+    /// Remove from bootstrap whitelist given IP addresses
+    async fn remove_from_bootstrap_whitelist(
+        &self,
+        request: tonic::Request<grpc_api::RemoveFromBootstrapWhitelistRequest>,
+    ) -> Result<tonic::Response<grpc_api::RemoveFromBootstrapWhitelistResponse>, tonic::Status>
+    {
+        Ok(tonic::Response::new(remove_from_bootstrap_whitelist(
+            self, request,
+        )?))
+    }
+    /// Remove from peers whitelist given IP addresses
+    async fn remove_from_peers_whitelist(
+        &self,
+        request: tonic::Request<grpc_api::RemoveFromPeersWhitelistRequest>,
+    ) -> Result<tonic::Response<grpc_api::RemoveFromPeersWhitelistResponse>, tonic::Status> {
+        Ok(tonic::Response::new(remove_from_peers_whitelist(
+            self, request,
+        )?))
+    }
+    /// Remove addresses from staking
+    async fn remove_staking_addresses(
+        &self,
+        request: tonic::Request<grpc_api::RemoveStakingAddressesRequest>,
+    ) -> Result<tonic::Response<grpc_api::RemoveStakingAddressesResponse>, tonic::Status> {
+        Ok(tonic::Response::new(remove_staking_addresses(
+            self, request,
+        )?))
+    }
+    /// Sign messages with node's key
+    async fn sign_messages(
+        &self,
+        request: tonic::Request<grpc_api::SignMessagesRequest>,
+    ) -> Result<tonic::Response<grpc_api::SignMessagesResponse>, tonic::Status> {
+        Ok(tonic::Response::new(sign_messages(self, request)?))
+    }
+    /// Shutdown the node gracefully
+    async fn shutdown_gracefully(
+        &self,
+        request: tonic::Request<grpc_api::ShutdownGracefullyRequest>,
+    ) -> Result<tonic::Response<grpc_api::ShutdownGracefullyResponse>, tonic::Status> {
+        Ok(tonic::Response::new(shutdown_gracefully(self, request)?))
+    }
+
+    /// Unban multiple nodes by their individual ids
+    async fn unban_nodes_by_ids(
+        &self,
+        request: tonic::Request<grpc_api::UnbanNodesByIdsRequest>,
+    ) -> Result<tonic::Response<grpc_api::UnbanNodesByIdsResponse>, tonic::Status> {
+        Ok(tonic::Response::new(unban_nodes_by_ids(self, request)?))
+    }
+
+    /// Unban multiple nodes by their individual IP addresses
+    async fn unban_nodes_by_ips(
+        &self,
+        request: tonic::Request<grpc_api::UnbanNodesByIpsRequest>,
+    ) -> Result<tonic::Response<grpc_api::UnbanNodesByIpsResponse>, tonic::Status> {
+        Ok(tonic::Response::new(unban_nodes_by_ips(self, request)?))
+    }
+}
diff --git a/massa-grpc/src/lib.rs b/massa-grpc/src/lib.rs
index 29840d0fc6b..f82852a7d55 100644
--- a/massa-grpc/src/lib.rs
+++ b/massa-grpc/src/lib.rs
@@ -20,14 +20,16 @@ use tonic_health as _;
 use tonic_reflection as _;
 use tonic_web as _;
 
-/// business code for non stream methods
-pub mod api;
 /// gRPC configuration
 pub mod config;
 /// models error
 pub mod error;
 /// gRPC API implementation
 pub mod handler;
+/// business code for node management methods
+pub mod private;
+/// business code for non stream methods
+pub mod public;
 /// gRPC service initialization and serve
 pub mod server;
 /// business code for stream methods
diff --git a/massa-grpc/src/private.rs b/massa-grpc/src/private.rs
new file mode 100644
index 00000000000..24968380122
--- /dev/null
+++ b/massa-grpc/src/private.rs
@@ -0,0 +1,472 @@
+// Copyright (c) 2023 MASSA LABS <info@massa.net>
+
+use std::net::IpAddr;
+use std::str::FromStr;
+
+use crate::error::GrpcError;
+use crate::server::MassaPrivateGrpc;
+use massa_execution_exports::ExecutionQueryRequest;
+use massa_hash::Hash;
+use massa_models::config::CompactConfig;
+use massa_models::node::NodeId;
+use massa_models::slot::Slot;
+use massa_models::timeslots::get_latest_block_slot_at_timestamp;
+use massa_proto_rs::massa::api::v1 as grpc_api;
+use massa_proto_rs::massa::model::v1 as grpc_model;
+use massa_protocol_exports::{PeerConnectionType, PeerId};
+use massa_signature::KeyPair;
+use massa_time::MassaTime;
+use tracing::warn;
+// use massa_proto_rs::massa::model::v1 "add_to_bootstrap_blacklist"as grpc_model;
+
+/// Add IP addresses to node bootstrap blacklist
+pub(crate) fn add_to_bootstrap_blacklist(
+    grpc: &MassaPrivateGrpc,
+    request: tonic::Request<grpc_api::AddToBootstrapBlacklistRequest>,
+) -> Result<grpc_api::AddToBootstrapBlacklistResponse, GrpcError> {
+    let inner_req = request.into_inner();
+
+    let ips = inner_req
+        .ips
+        .into_iter()
+        .filter_map(|ip| match IpAddr::from_str(&ip) {
+            Ok(ip_addr) => Some(ip_addr),
+            Err(e) => {
+                warn!("error when parsing address : {}", e);
+                None
+            }
+        })
+        .collect();
+
+    if let Some(bs_list) = &grpc.bs_white_black_list {
+        if let Err(e) = bs_list.add_ips_to_blacklist(ips) {
+            warn!("error when adding ips to bootstrap blacklist : {}", e)
+        }
+    }
+
+    Ok(grpc_api::AddToBootstrapBlacklistResponse {})
+}
+/// Add IP addresses to node bootstrap whitelist
+pub(crate) fn add_to_bootstrap_whitelist(
+    grpc: &MassaPrivateGrpc,
+    request: tonic::Request<grpc_api::AddToBootstrapWhitelistRequest>,
+) -> Result<grpc_api::AddToBootstrapWhitelistResponse, GrpcError> {
+    let inner_req = request.into_inner();
+
+    let ips = inner_req
+        .ips
+        .into_iter()
+        .filter_map(|ip| match IpAddr::from_str(&ip) {
+            Ok(ip_addr) => Some(ip_addr),
+            Err(e) => {
+                warn!("error when parsing address : {}", e);
+                None
+            }
+        })
+        .collect();
+
+    if let Some(bs_list) = &grpc.bs_white_black_list {
+        if let Err(e) = bs_list.add_ips_to_whitelist(ips) {
+            warn!("error when adding ips to bootstrap whitelist : {}", e)
+        }
+    }
+
+    Ok(grpc_api::AddToBootstrapWhitelistResponse {})
+}
+/// Add IP addresses to node peers whitelist. No confirmation to expect.
+/// Note: If the ip was unknown it adds it to the known peers, otherwise it updates the peer type
+pub(crate) fn add_to_peers_whitelist(
+    _grpc: &MassaPrivateGrpc,
+    _request: tonic::Request<grpc_api::AddToPeersWhitelistRequest>,
+) -> Result<grpc_api::AddToPeersWhitelistResponse, GrpcError> {
+    Err(GrpcError::Unimplemented(
+        "add_to_peers_whitelist".to_string(),
+    ))
+}
+/// Add staking secret keys to wallet
+pub(crate) fn add_staking_secret_keys(
+    grpc: &MassaPrivateGrpc,
+    request: tonic::Request<grpc_api::AddStakingSecretKeysRequest>,
+) -> Result<grpc_api::AddStakingSecretKeysResponse, GrpcError> {
+    let secret_keys = request.into_inner().secret_keys;
+
+    if secret_keys.is_empty() {
+        return Err(GrpcError::InvalidArgument(
+            "no secret key received".to_string(),
+        ));
+    }
+
+    if secret_keys.len() as u64 > grpc.grpc_config.max_arguments {
+        return Err(GrpcError::InvalidArgument(format!(
+            "too many secret keys received. Only a maximum of {} secret keys are accepted per request",
+            grpc.grpc_config.max_arguments
+        )));
+    }
+
+    let keypairs = match secret_keys.iter().map(|x| KeyPair::from_str(x)).collect() {
+        Ok(keypairs) => keypairs,
+        Err(e) => return Err(GrpcError::InvalidArgument(e.to_string())),
+    };
+
+    grpc.node_wallet.write().add_keypairs(keypairs)?;
+
+    Ok(grpc_api::AddStakingSecretKeysResponse {})
+}
+
+/// Ban multiple nodes by their individual ids
+pub(crate) fn ban_nodes_by_ids(
+    grpc: &MassaPrivateGrpc,
+    request: tonic::Request<grpc_api::BanNodesByIdsRequest>,
+) -> Result<grpc_api::BanNodesByIdsResponse, GrpcError> {
+    let node_ids = request.into_inner().node_ids;
+
+    if node_ids.is_empty() {
+        return Err(GrpcError::InvalidArgument(
+            "no node id received".to_string(),
+        ));
+    }
+
+    if node_ids.len() as u64 > grpc.grpc_config.max_arguments {
+        return Err(GrpcError::InvalidArgument(format!(
+            "too many node ids received. Only a maximum of {} node ids are accepted per request",
+            grpc.grpc_config.max_arguments
+        )));
+    }
+
+    //TODO: Change when unify node id and peer id
+    let peer_ids = node_ids
+        .into_iter()
+        .map(|id| {
+            NodeId::from_str(&id).map(|node_id| PeerId::from_public_key(node_id.get_public_key()))
+        })
+        .collect::<Result<Vec<_>, _>>()?;
+
+    grpc.protocol_controller.ban_peers(peer_ids)?;
+
+    Ok(grpc_api::BanNodesByIdsResponse {})
+}
+
+/// Ban multiple nodes by their individual IP addresses
+pub(crate) fn ban_nodes_by_ips(
+    _grpc: &MassaPrivateGrpc,
+    _request: tonic::Request<grpc_api::BanNodesByIpsRequest>,
+) -> Result<grpc_api::BanNodesByIpsResponse, GrpcError> {
+    Err(GrpcError::Unimplemented("ban_nodes_by_ips".to_string()))
+}
+
+/// Get node bootstrap blacklist IP addresses
+pub(crate) fn get_bootstrap_blacklist(
+    grpc: &MassaPrivateGrpc,
+    _request: tonic::Request<grpc_api::GetBootstrapBlacklistRequest>,
+) -> Result<grpc_api::GetBootstrapBlacklistResponse, GrpcError> {
+    let list = {
+        match grpc.bs_white_black_list {
+            Some(ref bs_list) => bs_list
+                .get_black_list()
+                .unwrap_or_default()
+                .into_iter()
+                .map(|ip| ip.to_string())
+                .collect(),
+            None => Vec::new(),
+        }
+    };
+    Ok(grpc_api::GetBootstrapBlacklistResponse { ips: list })
+}
+/// Get node bootstrap whitelist IP addresses
+pub(crate) fn get_bootstrap_whitelist(
+    grpc: &MassaPrivateGrpc,
+    _request: tonic::Request<grpc_api::GetBootstrapWhitelistRequest>,
+) -> Result<grpc_api::GetBootstrapWhitelistResponse, GrpcError> {
+    let list = {
+        match grpc.bs_white_black_list {
+            Some(ref bs_list) => bs_list
+                .get_white_list()
+                .unwrap_or_default()
+                .into_iter()
+                .map(|ip| ip.to_string())
+                .collect(),
+            None => Vec::new(),
+        }
+    };
+
+    Ok(grpc_api::GetBootstrapWhitelistResponse { ips: list })
+}
+// Get MIP store dump
+pub(crate) fn get_mip_status(
+    grpc: &MassaPrivateGrpc,
+    _request: tonic::Request<grpc_api::GetMipStatusRequest>,
+) -> Result<grpc_api::GetMipStatusResponse, GrpcError> {
+    let mip_store_status_ = grpc.mip_store.get_mip_status();
+    let mip_store_status: Result<Vec<grpc_model::MipStatusEntry>, GrpcError> = mip_store_status_
+        .iter()
+        .map(|(mip_info, state_id_)| {
+            let state_id = grpc_model::ComponentStateId::from(state_id_);
+            Ok(grpc_model::MipStatusEntry {
+                mip_info: Some(grpc_model::MipInfo::from(mip_info)),
+                state_id: i32::from(state_id),
+            })
+        })
+        .collect();
+
+    Ok(grpc_api::GetMipStatusResponse {
+        mipstatus_entries: mip_store_status?,
+    })
+}
+
+/// Allow everyone to bootstrap from the node by removing bootstrap whitelist configuration file
+pub(crate) fn allow_everyone_to_bootstrap(
+    _grpc: &MassaPrivateGrpc,
+    _request: tonic::Request<grpc_api::AllowEveryoneToBootstrapRequest>,
+) -> Result<grpc_api::AllowEveryoneToBootstrapResponse, GrpcError> {
+    Err(GrpcError::Unimplemented(
+        "allow_everyone_to_bootstrap".to_string(),
+    ))
+}
+/// Get node status
+pub(crate) fn get_node_status(
+    grpc: &MassaPrivateGrpc,
+    _request: tonic::Request<grpc_api::GetNodeStatusRequest>,
+) -> Result<grpc_api::GetNodeStatusResponse, GrpcError> {
+    let config = CompactConfig::default();
+    let now = MassaTime::now()?;
+    let last_slot = get_latest_block_slot_at_timestamp(
+        grpc.grpc_config.thread_count,
+        grpc.grpc_config.t0,
+        grpc.grpc_config.genesis_timestamp,
+        now,
+    )?;
+    let execution_stats = grpc.execution_controller.get_stats();
+    let consensus_stats = grpc.consensus_controller.get_stats()?;
+    let (network_stats, peers) = grpc.protocol_controller.get_stats()?;
+    let pool_stats = grpc_model::PoolStats {
+        operations_count: grpc.pool_controller.get_denunciation_count() as u64,
+        endorsements_count: grpc.pool_controller.get_endorsement_count() as u64,
+    };
+
+    let mut connected_nodes = peers
+        .iter()
+        .map(|(id, peer)| {
+            let connection_type = match peer.1 {
+                PeerConnectionType::IN => grpc_model::ConnectionType::Incoming,
+                PeerConnectionType::OUT => grpc_model::ConnectionType::Outgoing,
+            };
+
+            grpc_model::ConnectedNode {
+                node_id: NodeId::new(id.get_public_key()).to_string(),
+                node_ip: peer.0.ip().to_string(),
+                connection_type: connection_type as i32,
+            }
+        })
+        .collect::<Vec<_>>();
+    connected_nodes.sort_by(|a, b| a.node_ip.cmp(&b.node_ip));
+
+    let current_cycle = last_slot
+        .unwrap_or_else(|| Slot::new(0, 0))
+        .get_cycle(grpc.grpc_config.periods_per_cycle);
+    let cycle_duration = grpc
+        .grpc_config
+        .t0
+        .checked_mul(grpc.grpc_config.periods_per_cycle)?;
+    let current_cycle_time = if current_cycle == 0 {
+        grpc.grpc_config.genesis_timestamp
+    } else {
+        cycle_duration
+            .checked_mul(current_cycle)
+            .and_then(|elapsed_time_before_current_cycle| {
+                grpc.grpc_config
+                    .genesis_timestamp
+                    .checked_add(elapsed_time_before_current_cycle)
+            })?
+    };
+    let next_cycle_time = current_cycle_time.checked_add(cycle_duration)?;
+    let empty_request = ExecutionQueryRequest { requests: vec![] };
+    let state = grpc.execution_controller.query_state(empty_request);
+    let node_ip = grpc
+        .protocol_config
+        .routable_ip
+        .map(|ip| ip.to_string())
+        .unwrap_or_default();
+
+    let status = grpc_model::NodeStatus {
+        node_id: grpc.node_id.to_string(),
+        node_ip,
+        version: grpc.version.to_string(),
+        current_time: Some(now.into()),
+        current_cycle,
+        current_cycle_time: Some(current_cycle_time.into()),
+        next_cycle_time: Some(next_cycle_time.into()),
+        connected_nodes,
+        last_executed_final_slot: Some(state.final_cursor.into()),
+        last_executed_speculative_slot: Some(state.candidate_cursor.into()),
+        final_state_fingerprint: state.final_state_fingerprint.to_string(),
+        consensus_stats: Some(consensus_stats.into()),
+        pool_stats: Some(pool_stats),
+        network_stats: Some(network_stats.into()),
+        execution_stats: Some(execution_stats.into()),
+        config: Some(config.into()),
+    };
+
+    Ok(grpc_api::GetNodeStatusResponse {
+        status: Some(status),
+    })
+}
+/// Get node peers whitelist IP addresses
+pub(crate) fn get_peers_whitelist(
+    _grpc: &MassaPrivateGrpc,
+    _request: tonic::Request<grpc_api::GetPeersWhitelistRequest>,
+) -> Result<grpc_api::GetPeersWhitelistResponse, GrpcError> {
+    Err(GrpcError::Unimplemented("get_peers_whitelist".to_string()))
+}
+/// Remove from bootstrap blacklist given IP addresses
+pub(crate) fn remove_from_bootstrap_blacklist(
+    grpc: &MassaPrivateGrpc,
+    request: tonic::Request<grpc_api::RemoveFromBootstrapBlacklistRequest>,
+) -> Result<grpc_api::RemoveFromBootstrapBlacklistResponse, GrpcError> {
+    let inner_req = request.into_inner();
+    let ips = inner_req
+        .ips
+        .into_iter()
+        .filter_map(|ip| match IpAddr::from_str(&ip) {
+            Ok(ip_addr) => Some(ip_addr),
+            Err(e) => {
+                warn!("error when parsing address : {}", e);
+                None
+            }
+        })
+        .collect();
+
+    if let Some(bs_list) = &grpc.bs_white_black_list {
+        if let Err(e) = bs_list.remove_ips_from_blacklist(ips) {
+            warn!("error when removing ips to bootstrap blacklist : {}", e)
+        }
+    }
+
+    Ok(grpc_api::RemoveFromBootstrapBlacklistResponse {})
+}
+/// Remove from bootstrap whitelist given IP addresses
+pub(crate) fn remove_from_bootstrap_whitelist(
+    grpc: &MassaPrivateGrpc,
+    request: tonic::Request<grpc_api::RemoveFromBootstrapWhitelistRequest>,
+) -> Result<grpc_api::RemoveFromBootstrapWhitelistResponse, GrpcError> {
+    let inner_req = request.into_inner();
+    let ips = inner_req
+        .ips
+        .into_iter()
+        .filter_map(|ip| match IpAddr::from_str(&ip) {
+            Ok(ip_addr) => Some(ip_addr),
+            Err(e) => {
+                warn!("error when parsing address : {}", e);
+                None
+            }
+        })
+        .collect();
+
+    if let Some(bs_list) = &grpc.bs_white_black_list {
+        if let Err(e) = bs_list.remove_ips_from_whitelist(ips) {
+            warn!("error when removing ips to bootstrap whitelist : {}", e)
+        }
+    }
+
+    Ok(grpc_api::RemoveFromBootstrapWhitelistResponse {})
+}
+/// Remove from peers whitelist given IP addresses
+pub(crate) fn remove_from_peers_whitelist(
+    _grpc: &MassaPrivateGrpc,
+    _request: tonic::Request<grpc_api::RemoveFromPeersWhitelistRequest>,
+) -> Result<grpc_api::RemoveFromPeersWhitelistResponse, GrpcError> {
+    Err(GrpcError::Unimplemented(
+        "remove_from_peers_whitelist".to_string(),
+    ))
+}
+/// Remove addresses from staking
+pub(crate) fn remove_staking_addresses(
+    _grpc: &MassaPrivateGrpc,
+    _request: tonic::Request<grpc_api::RemoveStakingAddressesRequest>,
+) -> Result<grpc_api::RemoveStakingAddressesResponse, GrpcError> {
+    Err(GrpcError::Unimplemented(
+        "remove_staking_addresses".to_string(),
+    ))
+}
+/// Sign messages with node's key
+pub(crate) fn sign_messages(
+    grpc: &MassaPrivateGrpc,
+    request: tonic::Request<grpc_api::SignMessagesRequest>,
+) -> Result<grpc_api::SignMessagesResponse, GrpcError> {
+    let messages = request.into_inner().messages;
+
+    if messages.is_empty() {
+        return Err(GrpcError::InvalidArgument(
+            "no message received".to_string(),
+        ));
+    }
+
+    if messages.len() as u64 > grpc.grpc_config.max_arguments {
+        return Err(GrpcError::InvalidArgument(format!(
+            "too many messages received. Only a maximum of {} messages are accepted per request",
+            grpc.grpc_config.max_arguments
+        )));
+    }
+
+    let keypair = grpc.grpc_config.keypair.clone();
+    let signatures = messages
+        .into_iter()
+        .map(|message| {
+            keypair
+                .sign(&Hash::compute_from(&message))
+                .map(|signature| signature.to_string())
+        })
+        .collect::<Result<Vec<_>, _>>()?;
+
+    Ok(grpc_api::SignMessagesResponse {
+        public_key: keypair.get_public_key().to_string(),
+        signatures,
+    })
+}
+/// Shutdown the node gracefully
+pub(crate) fn shutdown_gracefully(
+    _grpc: &MassaPrivateGrpc,
+    _request: tonic::Request<grpc_api::ShutdownGracefullyRequest>,
+) -> Result<grpc_api::ShutdownGracefullyResponse, GrpcError> {
+    Err(GrpcError::Unimplemented("shutdown_gracefully".to_string()))
+}
+
+/// Unban multiple nodes by their individual ids
+pub(crate) fn unban_nodes_by_ids(
+    grpc: &MassaPrivateGrpc,
+    request: tonic::Request<grpc_api::UnbanNodesByIdsRequest>,
+) -> Result<grpc_api::UnbanNodesByIdsResponse, GrpcError> {
+    let node_ids = request.into_inner().node_ids;
+
+    if node_ids.is_empty() {
+        return Err(GrpcError::InvalidArgument(
+            "no node id received".to_string(),
+        ));
+    }
+
+    if node_ids.len() as u64 > grpc.grpc_config.max_arguments {
+        return Err(GrpcError::InvalidArgument(format!(
+            "too many node ids received. Only a maximum of {} node ids are accepted per request",
+            grpc.grpc_config.max_arguments
+        )));
+    }
+
+    //TODO: Change when unify node id and peer id
+    let peer_ids = node_ids
+        .into_iter()
+        .map(|id| {
+            NodeId::from_str(&id).map(|node_id| PeerId::from_public_key(node_id.get_public_key()))
+        })
+        .collect::<Result<Vec<_>, _>>()?;
+
+    grpc.protocol_controller.unban_peers(peer_ids)?;
+
+    Ok(grpc_api::UnbanNodesByIdsResponse {})
+}
+
+/// Unban multiple nodes by their individual IP addresses
+pub(crate) fn unban_nodes_by_ips(
+    _grpc: &MassaPrivateGrpc,
+    _request: tonic::Request<grpc_api::UnbanNodesByIpsRequest>,
+) -> Result<grpc_api::UnbanNodesByIpsResponse, GrpcError> {
+    Err(GrpcError::Unimplemented("unban_nodes_by_ips".to_string()))
+}
diff --git a/massa-grpc/src/public.rs b/massa-grpc/src/public.rs
new file mode 100644
index 00000000000..36dfc0ab4ba
--- /dev/null
+++ b/massa-grpc/src/public.rs
@@ -0,0 +1,742 @@
+// Copyright (c) 2023 MASSA LABS <info@massa.net>
+
+use crate::error::GrpcError;
+use crate::server::MassaPublicGrpc;
+
+use massa_execution_exports::mapping_grpc::{
+    to_event_filter, to_execution_query_response, to_querystate_filter,
+};
+use massa_execution_exports::{
+    ExecutionQueryRequest, ExecutionStackElement, ReadOnlyExecutionRequest, ReadOnlyExecutionTarget,
+};
+use massa_models::address::Address;
+use massa_models::block::Block;
+use massa_models::block_id::BlockId;
+use massa_models::config::CompactConfig;
+use massa_models::datastore::DatastoreDeserializer;
+use massa_models::operation::{OperationId, SecureShareOperation};
+use massa_models::prehash::PreHashSet;
+use massa_models::slot::Slot;
+use massa_models::timeslots::get_latest_block_slot_at_timestamp;
+use massa_proto_rs::massa::api::v1 as grpc_api;
+use massa_proto_rs::massa::model::v1::{self as grpc_model, read_only_execution_call};
+use massa_serialization::{DeserializeError, Deserializer};
+use massa_time::MassaTime;
+use massa_versioning::versioning_factory::{FactoryStrategy, VersioningFactory};
+use std::collections::HashSet;
+use std::str::FromStr;
+use tracing::log::warn;
+
+/// Execute read only call (function or bytecode)
+pub(crate) fn execute_read_only_call(
+    grpc: &MassaPublicGrpc,
+    request: tonic::Request<grpc_api::ExecuteReadOnlyCallRequest>,
+) -> Result<grpc_api::ExecuteReadOnlyCallResponse, GrpcError> {
+    let inner_req = request.into_inner();
+    let call: grpc_model::ReadOnlyExecutionCall = inner_req
+        .call
+        .ok_or_else(|| GrpcError::InvalidArgument("no call provided".to_string()))?;
+
+    let mut call_stack = Vec::new();
+
+    let caller_address = match call.caller_address {
+        Some(addr) => Address::from_str(&addr)?,
+        None => {
+            let now = MassaTime::now()?;
+            let keypair = grpc.keypair_factory.create(&(), FactoryStrategy::At(now))?;
+            Address::from_public_key(&keypair.get_public_key())
+        }
+    };
+
+    let target = if let Some(call_target) = call.target {
+        match call_target {
+            read_only_execution_call::Target::BytecodeCall(value) => {
+                let op_datastore = if value.operation_datastore.is_empty() {
+                    None
+                } else {
+                    let deserializer = DatastoreDeserializer::new(
+                        grpc.grpc_config.max_op_datastore_entry_count,
+                        grpc.grpc_config.max_op_datastore_key_length,
+                        grpc.grpc_config.max_op_datastore_value_length,
+                    );
+                    match deserializer.deserialize::<DeserializeError>(&value.operation_datastore) {
+                        Ok((_, deserialized)) => Some(deserialized),
+                        Err(e) => {
+                            return Err(GrpcError::InvalidArgument(format!(
+                                "Datastore deserializing error: {}",
+                                e
+                            )))
+                        }
+                    }
+                };
+
+                call_stack.push(ExecutionStackElement {
+                    address: caller_address,
+                    coins: Default::default(),
+                    owned_addresses: vec![caller_address],
+                    operation_datastore: op_datastore,
+                });
+
+                ReadOnlyExecutionTarget::BytecodeExecution(value.bytecode)
+            }
+            read_only_execution_call::Target::FunctionCall(value) => {
+                let target_address = Address::from_str(&value.target_addr)?;
+                call_stack.push(ExecutionStackElement {
+                    address: caller_address,
+                    coins: Default::default(),
+                    owned_addresses: vec![caller_address],
+                    operation_datastore: None, // should always be None
+                });
+                call_stack.push(ExecutionStackElement {
+                    address: target_address,
+                    coins: Default::default(),
+                    owned_addresses: vec![target_address],
+                    operation_datastore: None, // should always be None
+                });
+
+                ReadOnlyExecutionTarget::FunctionCall {
+                    target_addr: Address::from_str(&value.target_addr)?,
+                    target_func: value.target_func,
+                    parameter: value.parameter,
+                }
+            }
+        }
+    } else {
+        return Err(GrpcError::InvalidArgument(
+            "no call target provided".to_string(),
+        ));
+    };
+
+    let read_only_call = ReadOnlyExecutionRequest {
+        max_gas: call.max_gas,
+        call_stack,
+        target,
+        is_final: call.is_final,
+    };
+
+    let output = grpc
+        .execution_controller
+        .execute_readonly_request(read_only_call)?;
+
+    let result = grpc_model::ReadOnlyExecutionOutput {
+        out: Some(output.out.into()),
+        max_gas: output.gas_cost,
+        call_result: output.call_result,
+    };
+
+    Ok(grpc_api::ExecuteReadOnlyCallResponse {
+        output: Some(result),
+    })
+}
+
+/// Get blocks
+pub(crate) fn get_blocks(
+    grpc: &MassaPublicGrpc,
+    request: tonic::Request<grpc_api::GetBlocksRequest>,
+) -> Result<grpc_api::GetBlocksResponse, GrpcError> {
+    let inner_req = request.into_inner();
+
+    let mut block_ids: Vec<BlockId> = Vec::new();
+    let mut addresses: Option<Vec<String>> = None;
+    let (mut slot_min, mut slot_max) = (None, None);
+
+    // Get params filter from the request.
+    for query in inner_req.filters.into_iter() {
+        if let Some(filter) = query.filter {
+            match filter {
+                grpc_api::get_blocks_filter::Filter::Addresses(addrs) => {
+                    for addr in addrs.addresses {
+                        if let Some(ref mut vec) = addresses {
+                            vec.push(addr);
+                        } else {
+                            addresses = Some(vec![addr]);
+                        }
+                    }
+                }
+                grpc_api::get_blocks_filter::Filter::BlockIds(ids) => {
+                    for id in ids.block_ids {
+                        if block_ids.len() < grpc.grpc_config.max_block_ids_per_request as usize + 1
+                        {
+                            block_ids.push(BlockId::from_str(&id).map_err(|_| {
+                                GrpcError::InvalidArgument(format!("invalid block id: {}", id))
+                            })?);
+                        }
+                    }
+                }
+                grpc_api::get_blocks_filter::Filter::SlotRange(slot_range) => {
+                    slot_max = slot_range.start_slot;
+                    slot_min = slot_range.end_slot;
+                }
+            }
+        }
+    }
+
+    // if no filter provided return an error
+    if block_ids.is_empty() && addresses.is_none() && slot_min.is_none() && slot_max.is_none() {
+        return Err(GrpcError::InvalidArgument("no filter provided".to_string()));
+    }
+
+    let storage = grpc.storage.clone_without_refs();
+    let read_blocks = storage.read_blocks();
+
+    let blocks = if !block_ids.is_empty() {
+        if block_ids.len() as u32 > grpc.grpc_config.max_block_ids_per_request {
+            return Err(GrpcError::InvalidArgument(format!(
+                "too many block ids received. Only a maximum of {} block ids are accepted per request",
+                grpc.grpc_config.max_block_ids_per_request
+            )));
+        }
+
+        block_ids
+            .into_iter()
+            .filter_map(|id| {
+                let content = if let Some(wrapped_block) = read_blocks.get(&id) {
+                    wrapped_block.content.clone()
+                } else {
+                    return None;
+                };
+
+                // check addresses filter
+                if let Some(filter_addresses) = &addresses {
+                    if !filter_addresses
+                        .iter()
+                        .any(|addr| content.header.content_creator_address.to_string().eq(addr))
+                    {
+                        return None;
+                    }
+                }
+                // check slot filter
+                if let Some(slot_min) = &slot_min {
+                    if content.header.content.slot < slot_min.clone().into() {
+                        return None;
+                    }
+                }
+                if let Some(slot_max) = &slot_max {
+                    if content.header.content.slot > slot_max.clone().into() {
+                        return None;
+                    }
+                }
+
+                Some(content)
+            })
+            .collect::<Vec<Block>>()
+    } else if let Some(addresses) = addresses {
+        let mut blocks = Vec::new();
+        for addr in addresses.into_iter() {
+            let address = Address::from_str(&addr)
+                .map_err(|_| GrpcError::InvalidArgument(format!("invalid address: {}", addr)))?;
+            if let Some(hash_set) = read_blocks.get_blocks_created_by(&address) {
+                let result = hash_set
+                    .iter()
+                    .filter_map(|block_id| {
+                        if let Some(block) = read_blocks
+                            .get(block_id)
+                            .map(|wrapped_block| wrapped_block.content.clone())
+                        {
+                            // check slot filter
+                            if let Some(slot_min) = &slot_min {
+                                if block.header.content.slot < slot_min.clone().into() {
+                                    return None;
+                                }
+                            }
+                            if let Some(slot_max) = &slot_max {
+                                if block.header.content.slot > slot_max.clone().into() {
+                                    return None;
+                                }
+                            }
+
+                            return Some(block);
+                        }
+
+                        None
+                    })
+                    .collect::<Vec<Block>>();
+
+                blocks.extend_from_slice(&result);
+            }
+        }
+        blocks
+    } else {
+        // only slot range is provided
+        let graph = grpc
+            .consensus_controller
+            .get_block_graph_status(slot_min.map(|s| s.into()), slot_max.map(|s| s.into()))?;
+
+        graph
+            .active_blocks
+            .iter()
+            .filter_map(|b| {
+                read_blocks
+                    .get(b.0)
+                    .map(|wrapped_block| wrapped_block.content.clone())
+            })
+            .collect::<Vec<Block>>()
+    };
+
+    let block_ids = blocks
+        .iter()
+        .map(|block| block.header.id)
+        .collect::<Vec<BlockId>>();
+
+    let blocks_status = grpc.consensus_controller.get_block_statuses(&block_ids);
+
+    let result = blocks
+        .iter()
+        .zip(blocks_status)
+        .map(|(block, block_graph_status)| grpc_model::BlockWrapper {
+            block_id: block.header.id.to_string(),
+            block: Some(block.clone().into()),
+            status: block_graph_status.into(),
+        })
+        .collect();
+
+    Ok(grpc_api::GetBlocksResponse {
+        wrapped_blocks: result,
+    })
+}
+
+/// Get multiple datastore entries
+pub(crate) fn get_datastore_entries(
+    grpc: &MassaPublicGrpc,
+    request: tonic::Request<grpc_api::GetDatastoreEntriesRequest>,
+) -> Result<grpc_api::GetDatastoreEntriesResponse, GrpcError> {
+    let inner_req = request.into_inner();
+
+    let filters: Vec<(Address, Vec<u8>)> = inner_req
+        .filters
+        .into_iter()
+        .filter_map(|filter| {
+            filter.filter.and_then(|filter| match filter {
+                grpc_api::get_datastore_entry_filter::Filter::AddressKey(addrs) => {
+                    if let Ok(add) = &Address::from_str(&addrs.address) {
+                        Some((*add, addrs.key))
+                    } else {
+                        None
+                    }
+                }
+            })
+        })
+        .collect();
+
+    // return error if entry are empty
+    if filters.is_empty() {
+        return Err(GrpcError::InvalidArgument("no filter provided".to_string()));
+    }
+
+    let entries = grpc
+        .execution_controller
+        .get_final_and_active_data_entry(filters)
+        .into_iter()
+        .map(|output| grpc_model::DatastoreEntry {
+            final_value: output.0.unwrap_or_default(),
+            candidate_value: output.1.unwrap_or_default(),
+        })
+        .collect();
+
+    Ok(grpc_api::GetDatastoreEntriesResponse {
+        datastore_entries: entries,
+    })
+}
+
+/// Get the stakers
+pub(crate) fn get_stakers(
+    grpc: &MassaPublicGrpc,
+    request: tonic::Request<grpc_api::GetStakersRequest>,
+) -> Result<grpc_api::GetStakersResponse, GrpcError> {
+    let inner_req = request.into_inner();
+
+    // min_roll, max_roll, limit
+    let mut filter_opt = (None, None, None);
+
+    // Parse the query parameters, if provided.
+    inner_req
+        .filters
+        .iter()
+        .for_each(|filter| match filter.filter {
+            Some(grpc_api::stakers_filter::Filter::MinRolls(min_rolls)) => {
+                filter_opt.0 = Some(min_rolls);
+            }
+            Some(grpc_api::stakers_filter::Filter::MaxRolls(max_rolls)) => {
+                filter_opt.1 = Some(max_rolls);
+            }
+            Some(grpc_api::stakers_filter::Filter::Limit(limit)) => {
+                filter_opt.2 = Some(limit);
+            }
+            None => {}
+        });
+
+    // Get the current cycle and slot.
+    let now: MassaTime = MassaTime::now()?;
+
+    let latest_block_slot_at_timestamp_result = get_latest_block_slot_at_timestamp(
+        grpc.grpc_config.thread_count,
+        grpc.grpc_config.t0,
+        grpc.grpc_config.genesis_timestamp,
+        now,
+    );
+
+    let (cur_cycle, _cur_slot) = match latest_block_slot_at_timestamp_result {
+        Ok(Some(cur_slot)) if cur_slot.period <= grpc.grpc_config.last_start_period => (
+            Slot::new(grpc.grpc_config.last_start_period, 0)
+                .get_cycle(grpc.grpc_config.periods_per_cycle),
+            cur_slot,
+        ),
+        Ok(Some(cur_slot)) => (
+            cur_slot.get_cycle(grpc.grpc_config.periods_per_cycle),
+            cur_slot,
+        ),
+        Ok(None) => (0, Slot::new(0, 0)),
+        Err(e) => return Err(GrpcError::ModelsError(e)),
+    };
+
+    // Get the list of stakers, filtered by the specified minimum and maximum roll counts.
+    let mut staker_vec = grpc
+        .execution_controller
+        .get_cycle_active_rolls(cur_cycle)
+        .into_iter()
+        .filter_map(|(addr, rolls)| {
+            if let Some(min_rolls) = filter_opt.0 {
+                if rolls < min_rolls {
+                    return None;
+                }
+            }
+            if let Some(max_rolls) = filter_opt.1 {
+                if rolls > max_rolls {
+                    return None;
+                }
+            }
+            Some((addr.to_string(), rolls))
+        })
+        .collect::<Vec<(String, u64)>>();
+
+    // Sort the stakers by their roll counts in descending order.
+    staker_vec.sort_by_key(|&(_, roll_counts)| std::cmp::Reverse(roll_counts));
+
+    if let Some(limit) = filter_opt.2 {
+        staker_vec = staker_vec
+            .into_iter()
+            .take(limit as usize)
+            .collect::<Vec<(String, u64)>>();
+    }
+
+    let stakers = staker_vec
+        .into_iter()
+        .map(|(address, rolls)| grpc_model::StakerEntry { address, rolls })
+        .collect();
+
+    Ok(grpc_api::GetStakersResponse { stakers })
+}
+
+/// Get next block best parents
+pub(crate) fn get_next_block_best_parents(
+    grpc: &MassaPublicGrpc,
+    _request: tonic::Request<grpc_api::GetNextBlockBestParentsRequest>,
+) -> Result<grpc_api::GetNextBlockBestParentsResponse, GrpcError> {
+    let block_parents = grpc
+        .consensus_controller
+        .get_best_parents()
+        .into_iter()
+        .map(|p| grpc_model::BlockParent {
+            block_id: p.0.to_string(),
+            period: p.1,
+        })
+        .collect();
+    Ok(grpc_api::GetNextBlockBestParentsResponse { block_parents })
+}
+
+/// Get operations
+pub(crate) fn get_operations(
+    grpc: &MassaPublicGrpc,
+    request: tonic::Request<grpc_api::GetOperationsRequest>,
+) -> Result<grpc_api::GetOperationsResponse, GrpcError> {
+    let storage = grpc.storage.clone_without_refs();
+    let inner_req: grpc_api::GetOperationsRequest = request.into_inner();
+
+    let mut operation_ids = Vec::new();
+    let mut filter_ope_types = Vec::new();
+
+    // Get params filter from the request.
+    for query in inner_req.filters.into_iter() {
+        if let Some(filter) = query.filter {
+            match filter {
+                grpc_api::get_operations_filter::Filter::OperationIds(ids) => {
+                    for id in ids.operation_ids {
+                        if operation_ids.len()
+                            < grpc.grpc_config.max_operation_ids_per_request as usize + 1
+                        {
+                            operation_ids.push(OperationId::from_str(&id).map_err(|_| {
+                                GrpcError::InvalidArgument(format!("invalid operation id: {}", id))
+                            })?);
+                        }
+                    }
+                }
+                grpc_api::get_operations_filter::Filter::OperationTypes(ope_types) => {
+                    filter_ope_types.extend_from_slice(&ope_types.op_types);
+                }
+            }
+        }
+    }
+
+    if operation_ids.is_empty() {
+        return Err(GrpcError::InvalidArgument(
+            "no operations ids specified".to_string(),
+        ));
+    }
+
+    if operation_ids.len() as u32 > grpc.grpc_config.max_operation_ids_per_request {
+        return Err(GrpcError::InvalidArgument(format!("too many operations received. Only a maximum of {} operations are accepted per request", grpc.grpc_config.max_operation_ids_per_request)));
+    }
+
+    let read_blocks = storage.read_blocks();
+    let read_ops = storage.read_operations();
+
+    // Get the operations and the list of blocks that contain them from storage
+    let storage_info: Vec<(&SecureShareOperation, HashSet<BlockId>)> = operation_ids
+        .iter()
+        .filter_map(|ope_id| {
+            read_ops.get(ope_id).map(|secure_share| {
+                let block_ids = read_blocks
+                    .get_blocks_by_operation(ope_id)
+                    .map(|hashset| hashset.iter().cloned().collect::<HashSet<BlockId>>())
+                    .unwrap_or_default();
+
+                (secure_share, block_ids)
+            })
+        })
+        .collect();
+
+    let operations: Vec<grpc_model::OperationWrapper> = storage_info
+        .into_iter()
+        .filter_map(|secure_share| {
+            let (secure_share, block_ids) = secure_share;
+            let ope_type: grpc_model::OpType = secure_share.content.op.clone().into();
+            if !filter_ope_types.is_empty() && !filter_ope_types.contains(&(ope_type as i32)) {
+                return None;
+            }
+
+            Some(grpc_model::OperationWrapper {
+                id: secure_share.id.to_string(),
+                thread: secure_share
+                    .content_creator_address
+                    .get_thread(grpc.grpc_config.thread_count) as u32,
+                operation: Some((*secure_share).clone().into()),
+                block_ids: block_ids.into_iter().map(|id| id.to_string()).collect(),
+            })
+        })
+        .collect();
+
+    Ok(grpc_api::GetOperationsResponse {
+        wrapped_operations: operations,
+    })
+}
+
+/// Get smart contract execution events
+pub(crate) fn get_sc_execution_events(
+    grpc: &MassaPublicGrpc,
+    request: tonic::Request<grpc_api::GetScExecutionEventsRequest>,
+) -> Result<grpc_api::GetScExecutionEventsResponse, GrpcError> {
+    let event_filter = to_event_filter(request.into_inner().filters)?;
+    let events: Vec<grpc_model::ScExecutionEvent> = grpc
+        .execution_controller
+        .get_filtered_sc_output_event(event_filter)
+        .into_iter()
+        .map(|event| event.into())
+        .collect();
+
+    Ok(grpc_api::GetScExecutionEventsResponse { events })
+}
+
+//  Get selector draws
+pub(crate) fn get_selector_draws(
+    grpc: &MassaPublicGrpc,
+    request: tonic::Request<grpc_api::GetSelectorDrawsRequest>,
+) -> Result<grpc_api::GetSelectorDrawsResponse, GrpcError> {
+    let inner_req = request.into_inner();
+    let mut addresses: PreHashSet<Address> = PreHashSet::default();
+    let mut slot_range: (Option<Slot>, Option<Slot>) = (None, None);
+
+    // parse filters from request
+    inner_req.filters.into_iter().for_each(|query| {
+        if let Some(filter) = query.filter {
+            match filter {
+                grpc_api::selector_draws_filter::Filter::Addresses(addrs) => {
+                    addrs
+                        .addresses
+                        .into_iter()
+                        .for_each(|addr| match Address::from_str(&addr) {
+                            Ok(ad) => {
+                                addresses.insert(ad);
+                            }
+                            Err(e) => warn!("failed to parse address: {}", e),
+                        });
+                }
+                grpc_api::selector_draws_filter::Filter::SlotRange(range) => {
+                    if let Some(start_slot) = range.start_slot {
+                        slot_range.0 = Some(start_slot.into());
+                    }
+                    if let Some(end_slot) = range.end_slot {
+                        slot_range.1 = Some(end_slot.into());
+                    }
+                }
+            }
+        }
+    });
+
+    if slot_range.0.is_none() || slot_range.1.is_none() {
+        return Err(GrpcError::InvalidArgument(
+            "slot range is required".to_string(),
+        ));
+    }
+
+    // get future draws from selector
+    let selection_draws = {
+        let slot_start = slot_range.0.unwrap();
+        let slot_end = slot_range.1.unwrap();
+        let restrict_to_addresses = if addresses.is_empty() {
+            None
+        } else {
+            Some(&addresses)
+        };
+
+        grpc.selector_controller
+            .get_available_selections_in_range(slot_start..=slot_end, restrict_to_addresses)
+            .unwrap_or_default()
+            .into_iter()
+            .map(|(v_slot, v_sel)| {
+                let block_producer: Option<String> = if addresses.contains(&v_sel.producer) {
+                    Some(v_sel.producer.to_string())
+                } else {
+                    None
+                };
+                let endorsement_producers: Vec<grpc_model::EndorsementDraw> = v_sel
+                    .endorsements
+                    .into_iter()
+                    .enumerate()
+                    .filter_map(|(index, endo_sel)| {
+                        if addresses.contains(&endo_sel) {
+                            Some(grpc_model::EndorsementDraw {
+                                index: index as u64,
+                                producer: endo_sel.to_string(),
+                            })
+                        } else {
+                            None
+                        }
+                    })
+                    .collect();
+
+                grpc_model::SlotDraw {
+                    slot: Some(v_slot.into()),
+                    block_producer,
+                    endorsement_draws: endorsement_producers,
+                }
+            })
+            .collect()
+    };
+
+    Ok(grpc_api::GetSelectorDrawsResponse {
+        draws: selection_draws,
+    })
+}
+
+//  Get status
+pub(crate) fn get_status(
+    grpc: &MassaPublicGrpc,
+    _request: tonic::Request<grpc_api::GetStatusRequest>,
+) -> Result<grpc_api::GetStatusResponse, GrpcError> {
+    let config = CompactConfig::default();
+    let now = MassaTime::now()?;
+    let last_slot = get_latest_block_slot_at_timestamp(
+        grpc.grpc_config.thread_count,
+        grpc.grpc_config.t0,
+        grpc.grpc_config.genesis_timestamp,
+        now,
+    )?;
+
+    let current_cycle = last_slot
+        .unwrap_or_else(|| Slot::new(0, 0))
+        .get_cycle(grpc.grpc_config.periods_per_cycle);
+    let cycle_duration = grpc
+        .grpc_config
+        .t0
+        .checked_mul(grpc.grpc_config.periods_per_cycle)?;
+    let current_cycle_time = if current_cycle == 0 {
+        grpc.grpc_config.genesis_timestamp
+    } else {
+        cycle_duration
+            .checked_mul(current_cycle)
+            .and_then(|elapsed_time_before_current_cycle| {
+                grpc.grpc_config
+                    .genesis_timestamp
+                    .checked_add(elapsed_time_before_current_cycle)
+            })?
+    };
+    let next_cycle_time = current_cycle_time.checked_add(cycle_duration)?;
+    //TODO to be enhanced
+    let empty_request = ExecutionQueryRequest { requests: vec![] };
+    let state = grpc.execution_controller.query_state(empty_request);
+
+    let status = grpc_model::PublicStatus {
+        node_id: grpc.node_id.to_string(),
+        version: grpc.version.to_string(),
+        current_time: Some(now.into()),
+        current_cycle,
+        current_cycle_time: Some(current_cycle_time.into()),
+        next_cycle_time: Some(next_cycle_time.into()),
+        last_executed_final_slot: Some(state.final_cursor.into()),
+        last_executed_speculative_slot: Some(state.candidate_cursor.into()),
+        final_state_fingerprint: state.final_state_fingerprint.to_string(),
+        config: Some(config.into()),
+    };
+
+    Ok(grpc_api::GetStatusResponse {
+        status: Some(status),
+    })
+}
+
+/// Get transactions throughput
+pub(crate) fn get_transactions_throughput(
+    grpc: &MassaPublicGrpc,
+    _request: tonic::Request<grpc_api::GetTransactionsThroughputRequest>,
+) -> Result<grpc_api::GetTransactionsThroughputResponse, GrpcError> {
+    let stats = grpc.execution_controller.get_stats();
+    let nb_sec_range = stats
+        .time_window_end
+        .saturating_sub(stats.time_window_start)
+        .to_duration()
+        .as_secs();
+
+    let throughput = stats
+        .final_executed_operations_count
+        .checked_div(nb_sec_range as usize)
+        .unwrap_or_default() as u32;
+
+    Ok(grpc_api::GetTransactionsThroughputResponse { throughput })
+}
+
+/// Get query state
+pub(crate) fn query_state(
+    grpc: &MassaPublicGrpc,
+    request: tonic::Request<grpc_api::QueryStateRequest>,
+) -> Result<grpc_api::QueryStateResponse, GrpcError> {
+    let queries = request
+        .into_inner()
+        .queries
+        .into_iter()
+        .map(to_querystate_filter)
+        .collect::<Result<Vec<_>, _>>()?;
+
+    let response = grpc
+        .execution_controller
+        .query_state(ExecutionQueryRequest { requests: queries });
+
+    Ok(grpc_api::QueryStateResponse {
+        final_cursor: Some(response.final_cursor.into()),
+        candidate_cursor: Some(response.candidate_cursor.into()),
+        final_state_fingerprint: response.final_state_fingerprint.to_string(),
+        responses: response
+            .responses
+            .into_iter()
+            .map(to_execution_query_response)
+            .collect(),
+    })
+}
diff --git a/massa-grpc/src/server.rs b/massa-grpc/src/server.rs
index 9b6a9f48eb6..7888b74994e 100644
--- a/massa-grpc/src/server.rs
+++ b/massa-grpc/src/server.rs
@@ -1,31 +1,94 @@
 // Copyright (c) 2023 MASSA LABS <info@massa.net>
 
+use massa_bootstrap::white_black_list::SharedWhiteBlackList;
+use massa_models::node::NodeId;
+use massa_versioning::keypair_factory::KeyPairFactory;
+use massa_versioning::versioning::MipStore;
+use parking_lot::RwLock;
+use std::convert::Infallible;
+use std::sync::{Arc, Condvar, Mutex};
+
 use crate::config::GrpcConfig;
 use crate::error::GrpcError;
 use futures_util::FutureExt;
-use hyper::Method;
+use hyper::service::Service;
+use hyper::{Body, Method, Request, Response};
 use massa_consensus_exports::{ConsensusChannels, ConsensusController};
 use massa_execution_exports::{ExecutionChannels, ExecutionController};
 use massa_pool_exports::{PoolChannels, PoolController};
 use massa_pos_exports::SelectorController;
-use massa_proto_rs::massa::api::v1::massa_service_server::MassaServiceServer;
 use massa_proto_rs::massa::api::v1::FILE_DESCRIPTOR_SET;
-use massa_protocol_exports::ProtocolController;
+use massa_proto_rs::massa::api::v1::{
+    private_service_server::PrivateServiceServer, public_service_server::PublicServiceServer,
+};
+use massa_protocol_exports::{ProtocolConfig, ProtocolController};
 use massa_storage::Storage;
-use massa_versioning::versioning::MipStore;
 
+use massa_wallet::Wallet;
 use tokio::sync::oneshot;
-use tonic::{
-    codec::CompressionEncoding,
-    transport::{Certificate, Identity, ServerTlsConfig},
-};
+use tonic::body::BoxBody;
+use tonic::codegen::CompressionEncoding;
+use tonic::transport::NamedService;
+use tonic::transport::{Certificate, Identity, ServerTlsConfig};
 use tonic_health::server::HealthReporter;
 use tonic_web::GrpcWebLayer;
 use tower_http::cors::{Any, CorsLayer};
 use tracing::log::{info, warn};
 
-/// gRPC API content
-pub struct MassaGrpc {
+/// gRPC PRIVATE API content
+pub struct MassaPrivateGrpc {
+    /// link to the consensus component
+    pub consensus_controller: Box<dyn ConsensusController>,
+    /// link to the execution component
+    pub execution_controller: Box<dyn ExecutionController>,
+    /// link to the pool component
+    pub pool_controller: Box<dyn PoolController>,
+    /// link to the protocol component
+    pub protocol_controller: Box<dyn ProtocolController>,
+    /// Mechanism by which to gracefully shut down.
+    /// To be a clone of the same pair provided to the ctrlc handler.
+    pub stop_cv: Arc<(Mutex<bool>, Condvar)>,
+    /// User wallet
+    pub node_wallet: Arc<RwLock<Wallet>>,
+    /// gRPC configuration
+    pub grpc_config: GrpcConfig,
+    /// Massa protocol configuration
+    pub protocol_config: ProtocolConfig,
+    /// our node id
+    pub node_id: NodeId,
+    /// database for all MIP info
+    pub mip_store: MipStore,
+    /// node version
+    pub version: massa_models::version::Version,
+    /// white/black list of bootstrap
+    pub bs_white_black_list: Option<SharedWhiteBlackList<'static>>,
+}
+
+impl MassaPrivateGrpc {
+    /// Start the gRPC PRIVATE API
+    pub async fn serve(self, config: &GrpcConfig) -> Result<StopHandle, GrpcError> {
+        let mut service = PrivateServiceServer::new(self)
+            .max_decoding_message_size(config.max_decoding_message_size)
+            .max_encoding_message_size(config.max_encoding_message_size);
+
+        if let Some(encoding) = &config.accept_compressed {
+            if encoding.eq_ignore_ascii_case("Gzip") {
+                service = service.accept_compressed(CompressionEncoding::Gzip);
+            };
+        }
+
+        if let Some(encoding) = &config.send_compressed {
+            if encoding.eq_ignore_ascii_case("Gzip") {
+                service = service.send_compressed(CompressionEncoding::Gzip);
+            };
+        }
+
+        serve(service, config).await
+    }
+}
+
+/// gRPC PUBLIC API content
+pub struct MassaPublicGrpc {
     /// link to the consensus component
     pub consensus_controller: Box<dyn ConsensusController>,
     /// link(channels) to the consensus component
@@ -37,144 +100,45 @@ pub struct MassaGrpc {
     /// link(channels) to the pool component
     pub pool_channels: PoolChannels,
     /// link to the pool component
-    pub pool_command_sender: Box<dyn PoolController>,
+    pub pool_controller: Box<dyn PoolController>,
     /// link to the protocol component
-    pub protocol_command_sender: Box<dyn ProtocolController>,
+    pub protocol_controller: Box<dyn ProtocolController>,
     /// link to the selector component
     pub selector_controller: Box<dyn SelectorController>,
     /// link to the storage component
     pub storage: Storage,
     /// gRPC configuration
     pub grpc_config: GrpcConfig,
+    /// Massa protocol configuration
+    pub protocol_config: ProtocolConfig,
+    /// our node id
+    pub node_id: NodeId,
     /// node version
     pub version: massa_models::version::Version,
-    /// mip store
-    pub mip_store: MipStore,
+    /// keypair factory
+    pub keypair_factory: KeyPairFactory,
 }
 
-impl MassaGrpc {
-    /// Start the gRPC API
+impl MassaPublicGrpc {
+    /// Start the gRPC PUBLIC API
     pub async fn serve(self, config: &GrpcConfig) -> Result<StopHandle, GrpcError> {
-        let mut svc = MassaServiceServer::new(self)
+        let mut service = PublicServiceServer::new(self)
             .max_decoding_message_size(config.max_decoding_message_size)
             .max_encoding_message_size(config.max_encoding_message_size);
 
         if let Some(encoding) = &config.accept_compressed {
             if encoding.eq_ignore_ascii_case("Gzip") {
-                svc = svc.accept_compressed(CompressionEncoding::Gzip);
+                service = service.accept_compressed(CompressionEncoding::Gzip);
             };
         }
 
         if let Some(encoding) = &config.send_compressed {
             if encoding.eq_ignore_ascii_case("Gzip") {
-                svc = svc.send_compressed(CompressionEncoding::Gzip);
+                service = service.send_compressed(CompressionEncoding::Gzip);
             };
         }
 
-        let (shutdown_send, shutdown_recv) = oneshot::channel::<()>();
-
-        let mut server_builder = tonic::transport::Server::builder()
-            .concurrency_limit_per_connection(config.concurrency_limit_per_connection)
-            .timeout(config.timeout)
-            .initial_stream_window_size(config.initial_stream_window_size)
-            .initial_connection_window_size(config.initial_connection_window_size)
-            .max_concurrent_streams(config.max_concurrent_streams)
-            .tcp_keepalive(config.tcp_keepalive)
-            .tcp_nodelay(config.tcp_nodelay)
-            .http2_keepalive_interval(config.http2_keepalive_interval)
-            .http2_keepalive_timeout(config.http2_keepalive_timeout)
-            .http2_adaptive_window(config.http2_adaptive_window)
-            .max_frame_size(config.max_frame_size);
-
-        if config.enable_mtls {
-            let cert = std::fs::read_to_string(config.server_certificate_path.clone())
-                .expect("error, failed to read server certificat");
-            let key = std::fs::read_to_string(config.server_private_key_path.clone())
-                .expect("error, failed to read server private key");
-            let server_identity = Identity::from_pem(cert, key);
-
-            let client_ca_cert =
-                std::fs::read_to_string(config.client_certificate_authority_root_path.clone())
-                    .expect("error, failed to read client certificate authority root");
-            let client_ca_cert = Certificate::from_pem(client_ca_cert);
-
-            let tls = ServerTlsConfig::new()
-                .identity(server_identity)
-                .client_ca_root(client_ca_cert);
-
-            server_builder = server_builder
-                .tls_config(tls)
-                .expect("error, failed to setup mTLS");
-
-            info!("gRPC mTLS enabled");
-        }
-
-        let reflection_service_opt = if config.enable_reflection {
-            let reflection_service = tonic_reflection::server::Builder::configure()
-                .register_encoded_file_descriptor_set(FILE_DESCRIPTOR_SET)
-                .build()?;
-
-            Some(reflection_service)
-        } else {
-            None
-        };
-
-        let health_service_opt = if config.enable_health {
-            let (mut health_reporter, health_service) = tonic_health::server::health_reporter();
-            health_reporter
-                .set_serving::<MassaServiceServer<MassaGrpc>>()
-                .await;
-            tokio::spawn(massa_service_status(health_reporter.clone()));
-            info!("gRPC health service enabled");
-            Some(health_service)
-        } else {
-            None
-        };
-
-        if config.accept_http1 {
-            if config.enable_cors {
-                let cors = CorsLayer::new()
-                    // Allow `GET`, `POST` and `OPTIONS` when accessing the resource
-                    .allow_methods([Method::GET, Method::POST, Method::OPTIONS])
-                    // Allow requests from any origin
-                    .allow_origin(Any)
-                    .allow_headers([hyper::header::CONTENT_TYPE]);
-
-                let router_with_http1 = server_builder
-                    .accept_http1(true)
-                    .layer(cors)
-                    .layer(GrpcWebLayer::new())
-                    .add_optional_service(reflection_service_opt)
-                    .add_optional_service(health_service_opt)
-                    .add_service(svc);
-
-                tokio::spawn(
-                    router_with_http1.serve_with_shutdown(config.bind, shutdown_recv.map(drop)),
-                );
-            } else {
-                let router_with_http1 = server_builder
-                    .accept_http1(true)
-                    .layer(GrpcWebLayer::new())
-                    .add_optional_service(reflection_service_opt)
-                    .add_optional_service(health_service_opt)
-                    .add_service(svc);
-
-                tokio::spawn(
-                    router_with_http1.serve_with_shutdown(config.bind, shutdown_recv.map(drop)),
-                );
-            }
-        } else {
-            let router = server_builder
-                .add_optional_service(reflection_service_opt)
-                .add_optional_service(health_service_opt)
-                .add_service(svc);
-
-            tokio::spawn(router.serve_with_shutdown(config.bind, shutdown_recv.map(drop)));
-        }
-
-        Ok(StopHandle {
-            stop_cmd_sender: shutdown_send,
-        })
+        serve(service, config).await
     }
 }
 
@@ -198,6 +162,129 @@ impl StopHandle {
 async fn massa_service_status(mut reporter: HealthReporter) {
     //TODO add a complete health check based on Massa modules health
     reporter
-        .set_serving::<MassaServiceServer<MassaGrpc>>()
+        .set_serving::<PublicServiceServer<MassaPublicGrpc>>()
         .await;
 }
+
+// Configure and start the gRPC API with the given service
+async fn serve<S>(service: S, config: &GrpcConfig) -> Result<StopHandle, GrpcError>
+where
+    S: Service<Request<Body>, Response = Response<BoxBody>, Error = Infallible>
+        + NamedService
+        + Clone
+        + Send
+        + 'static,
+    S::Future: Send + 'static,
+{
+    let (shutdown_send, shutdown_recv) = oneshot::channel::<()>();
+
+    let mut server_builder = tonic::transport::Server::builder()
+        .concurrency_limit_per_connection(config.concurrency_limit_per_connection)
+        .timeout(config.timeout)
+        .initial_stream_window_size(config.initial_stream_window_size)
+        .initial_connection_window_size(config.initial_connection_window_size)
+        .max_concurrent_streams(config.max_concurrent_streams)
+        .tcp_keepalive(config.tcp_keepalive)
+        .tcp_nodelay(config.tcp_nodelay)
+        .http2_keepalive_interval(config.http2_keepalive_interval)
+        .http2_keepalive_timeout(config.http2_keepalive_timeout)
+        .http2_adaptive_window(config.http2_adaptive_window)
+        .max_frame_size(config.max_frame_size);
+
+    if config.enable_tls {
+        let cert = std::fs::read_to_string(config.server_certificate_path.clone())
+            .expect("error, failed to read server certificat");
+        let key = std::fs::read_to_string(config.server_private_key_path.clone())
+            .expect("error, failed to read server private key");
+        let server_identity = Identity::from_pem(cert, key);
+
+        let tls = ServerTlsConfig::new().identity(server_identity);
+
+        if config.enable_mtls {
+            let client_ca_cert =
+                std::fs::read_to_string(config.client_certificate_authority_root_path.clone())
+                    .expect("error, failed to read client certificate authority root");
+            let client_ca_cert = Certificate::from_pem(client_ca_cert);
+
+            let tls = tls.client_ca_root(client_ca_cert);
+
+            server_builder = server_builder
+                .tls_config(tls)
+                .expect("error, failed to setup mTLS");
+
+            info!("gRPC mTLS enabled");
+        } else {
+            server_builder = server_builder
+                .tls_config(tls)
+                .expect("error, failed to setup TLS");
+            info!("gRPC TLS enabled");
+        }
+    }
+
+    let reflection_service_opt = if config.enable_reflection {
+        let reflection_service = tonic_reflection::server::Builder::configure()
+            .register_encoded_file_descriptor_set(FILE_DESCRIPTOR_SET)
+            .build()?;
+
+        Some(reflection_service)
+    } else {
+        None
+    };
+
+    let health_service_opt = if config.enable_health {
+        let (mut health_reporter, health_service) = tonic_health::server::health_reporter();
+        health_reporter
+            .set_serving::<PublicServiceServer<MassaPublicGrpc>>()
+            .await;
+        tokio::spawn(massa_service_status(health_reporter.clone()));
+        info!("gRPC health service enabled");
+        Some(health_service)
+    } else {
+        None
+    };
+
+    if config.accept_http1 {
+        if config.enable_cors {
+            let cors = CorsLayer::new()
+                // Allow `GET`, `POST` and `OPTIONS` when accessing the resource
+                .allow_methods([Method::GET, Method::POST, Method::OPTIONS])
+                // Allow requests from any origin
+                .allow_origin(Any)
+                .allow_headers([hyper::header::CONTENT_TYPE]);
+
+            let router_with_http1 = server_builder
+                .accept_http1(true)
+                .layer(cors)
+                .layer(GrpcWebLayer::new())
+                .add_optional_service(reflection_service_opt)
+                .add_optional_service(health_service_opt)
+                .add_service(service);
+
+            tokio::spawn(
+                router_with_http1.serve_with_shutdown(config.bind, shutdown_recv.map(drop)),
+            );
+        } else {
+            let router_with_http1 = server_builder
+                .accept_http1(true)
+                .layer(GrpcWebLayer::new())
+                .add_optional_service(reflection_service_opt)
+                .add_optional_service(health_service_opt)
+                .add_service(service);
+
+            tokio::spawn(
+                router_with_http1.serve_with_shutdown(config.bind, shutdown_recv.map(drop)),
+            );
+        }
+    } else {
+        let router = server_builder
+            .add_optional_service(reflection_service_opt)
+            .add_optional_service(health_service_opt)
+            .add_service(service);
+
+        tokio::spawn(router.serve_with_shutdown(config.bind, shutdown_recv.map(drop)));
+    }
+
+    Ok(StopHandle {
+        stop_cmd_sender: shutdown_send,
+    })
+}
diff --git a/massa-grpc/src/stream/mod.rs b/massa-grpc/src/stream/mod.rs
index 7406f75b9e2..f6e91c4fb0d 100644
--- a/massa-grpc/src/stream/mod.rs
+++ b/massa-grpc/src/stream/mod.rs
@@ -2,8 +2,6 @@
 
 /// stream new blocks
 pub mod new_blocks;
-/// stream new blocks with operations content
-pub mod new_blocks_headers;
 /// stream new endorsements
 pub mod new_endorsements;
 /// stream new blocks headers
diff --git a/massa-grpc/src/stream/new_blocks.rs b/massa-grpc/src/stream/new_blocks.rs
index ad563b9dbe0..14bcef1038a 100644
--- a/massa-grpc/src/stream/new_blocks.rs
+++ b/massa-grpc/src/stream/new_blocks.rs
@@ -1,7 +1,7 @@
 // Copyright (c) 2023 MASSA LABS <info@massa.net>
 
 use crate::error::{match_for_io_error, GrpcError};
-use crate::server::MassaGrpc;
+use crate::server::MassaPublicGrpc;
 use futures_util::StreamExt;
 use massa_proto_rs::massa::api::v1 as grpc_api;
 use std::io::ErrorKind;
@@ -22,7 +22,7 @@ pub type NewBlocksStreamType = Pin<
 
 /// Creates a new stream of new produced and received blocks
 pub(crate) async fn new_blocks(
-    grpc: &MassaGrpc,
+    grpc: &MassaPublicGrpc,
     request: Request<Streaming<grpc_api::NewBlocksRequest>>,
 ) -> Result<NewBlocksStreamType, GrpcError> {
     // Create a channel to handle communication with the client
@@ -33,8 +33,6 @@ pub(crate) async fn new_blocks(
     let mut subscriber = grpc.consensus_channels.block_sender.subscribe();
 
     tokio::spawn(async move {
-        // Initialize the request_id string
-        let mut request_id = String::new();
         loop {
             select! {
                 // Receive a new block from the subscriber
@@ -43,8 +41,7 @@ pub(crate) async fn new_blocks(
                         Ok(massa_block) => {
                             // Send the new block through the channel
                             if let Err(e) = tx.send(Ok(grpc_api::NewBlocksResponse {
-                                    id: request_id.clone(),
-                                    block: Some(massa_block.into())
+                                signed_block: Some(massa_block.into())
                             })).await {
                                 error!("failed to send new block : {}", e);
                                 break;
@@ -57,13 +54,7 @@ pub(crate) async fn new_blocks(
                 res = in_stream.next() => {
                     match res {
                         Some(res) => {
-                            match res {
-                                // Get the request_id from the received data
-                                Ok(data) => {
-                                    request_id = data.id
-                                },
-                                // Handle any errors that may occur during receiving the data
-                                Err(err) => {
+                            if let Err(err) = res {
                                     // Check if the error matches any IO errors
                                     if let Some(io_err) = match_for_io_error(&err) {
                                         if io_err.kind() == ErrorKind::BrokenPipe {
@@ -77,7 +68,6 @@ pub(crate) async fn new_blocks(
                                         error!("failed to send back new_blocks error response: {}", e);
                                         break;
                                     }
-                                }
                             }
                         },
                         None => {
diff --git a/massa-grpc/src/stream/new_blocks_headers.rs b/massa-grpc/src/stream/new_blocks_headers.rs
deleted file mode 100644
index 4c6c66ae2f3..00000000000
--- a/massa-grpc/src/stream/new_blocks_headers.rs
+++ /dev/null
@@ -1,95 +0,0 @@
-// Copyright (c) 2023 MASSA LABS <info@massa.net>
-
-use crate::error::{match_for_io_error, GrpcError};
-use crate::server::MassaGrpc;
-use futures_util::StreamExt;
-use massa_proto_rs::massa::api::v1 as grpc_api;
-use std::io::ErrorKind;
-use std::pin::Pin;
-use tokio::select;
-use tonic::codegen::futures_core;
-use tonic::{Request, Streaming};
-use tracing::log::{error, warn};
-
-/// Type declaration for NewBlocksHeaders
-pub type NewBlocksHeadersStreamType = Pin<
-    Box<
-        dyn futures_core::Stream<Item = Result<grpc_api::NewBlocksHeadersResponse, tonic::Status>>
-            + Send
-            + 'static,
-    >,
->;
-
-/// Creates a new stream of new produced and received blocks headers
-pub(crate) async fn new_blocks_headers(
-    grpc: &MassaGrpc,
-    request: Request<Streaming<grpc_api::NewBlocksHeadersRequest>>,
-) -> Result<NewBlocksHeadersStreamType, GrpcError> {
-    // Create a channel to handle communication with the client
-    let (tx, rx) = tokio::sync::mpsc::channel(grpc.grpc_config.max_channel_size);
-    // Get the inner stream from the request
-    let mut in_stream = request.into_inner();
-    // Subscribe to the new blocks headers channel
-    let mut subscriber = grpc.consensus_channels.block_header_sender.subscribe();
-
-    tokio::spawn(async move {
-        // Initialize the request_id string
-        let mut request_id = String::new();
-        loop {
-            select! {
-                // Receive a new block header from the subscriber
-                 event = subscriber.recv() => {
-                    match event {
-                        Ok(massa_block_header) => {
-                            // Send the new block header through the channel
-                            if let Err(e) = tx.send(Ok(grpc_api::NewBlocksHeadersResponse {
-                                    id: request_id.clone(),
-                                    block_header: Some(massa_block_header.into())
-                            })).await {
-                                error!("failed to send new block header : {}", e);
-                                break;
-                            }
-                        },
-                        Err(e) => error!("error on receive new block header : {}", e)
-                    }
-                },
-            // Receive a new message from the in_stream
-            res = in_stream.next() => {
-                match res {
-                    Some(res) => {
-                        match res {
-                            // Get the request_id from the received data
-                            Ok(data) => {
-                                request_id = data.id
-                            },
-                            // Handle any errors that may occur during receiving the data
-                            Err(err) => {
-                                // Check if the error matches any IO errors
-                                if let Some(io_err) = match_for_io_error(&err) {
-                                    if io_err.kind() == ErrorKind::BrokenPipe {
-                                        warn!("client disconnected, broken pipe: {}", io_err);
-                                        break;
-                                    }
-                                }
-                                error!("{}", err);
-                                // Send the error response back to the client
-                                if let Err(e) = tx.send(Err(err)).await {
-                                    error!("failed to send back new_blocks_headers error response: {}", e);
-                                    break;
-                                }
-                            }
-                        }
-                    },
-                    None => {
-                        // The client has disconnected
-                        break;
-                    },
-                }
-            }
-            }
-        }
-    });
-
-    let out_stream = tokio_stream::wrappers::ReceiverStream::new(rx);
-    Ok(Box::pin(out_stream) as NewBlocksHeadersStreamType)
-}
diff --git a/massa-grpc/src/stream/new_endorsements.rs b/massa-grpc/src/stream/new_endorsements.rs
index 6c739c46a10..c077c1c6261 100644
--- a/massa-grpc/src/stream/new_endorsements.rs
+++ b/massa-grpc/src/stream/new_endorsements.rs
@@ -1,7 +1,7 @@
 // Copyright (c) 2023 MASSA LABS <info@massa.net>
 
 use crate::error::{match_for_io_error, GrpcError};
-use crate::server::MassaGrpc;
+use crate::server::MassaPublicGrpc;
 use futures_util::StreamExt;
 use massa_proto_rs::massa::api::v1 as grpc_api;
 use std::io::ErrorKind;
@@ -22,7 +22,7 @@ pub type NewEndorsementsStreamType = Pin<
 
 /// Creates a new stream of new produced and received endorsements
 pub(crate) async fn new_endorsements(
-    grpc: &MassaGrpc,
+    grpc: &MassaPublicGrpc,
     request: Request<Streaming<grpc_api::NewEndorsementsRequest>>,
 ) -> Result<NewEndorsementsStreamType, GrpcError> {
     // Create a channel to handle communication with the client
@@ -33,8 +33,6 @@ pub(crate) async fn new_endorsements(
     let mut subscriber = grpc.pool_channels.endorsement_sender.subscribe();
 
     tokio::spawn(async move {
-        // Initialize the request_id string
-        let mut request_id = String::new();
         loop {
             select! {
                 // Receive a new endorsement from the subscriber
@@ -43,8 +41,7 @@ pub(crate) async fn new_endorsements(
                         Ok(massa_endorsement) => {
                             // Send the new endorsement through the channel
                             if let Err(e) = tx.send(Ok(grpc_api::NewEndorsementsResponse {
-                                    id: request_id.clone(),
-                                    endorsement: Some(massa_endorsement.into())
+                                    signed_endorsement: Some(massa_endorsement.into())
                             })).await {
                                 error!("failed to send new endorsement : {}", e);
                                 break;
@@ -57,13 +54,7 @@ pub(crate) async fn new_endorsements(
                 res = in_stream.next() => {
                     match res {
                         Some(res) => {
-                            match res {
-                                // Get the request_id from the received data
-                                Ok(data) => {
-                                    request_id = data.id
-                                },
-                                // Handle any errors that may occur during receiving the data
-                                Err(err) => {
+                            if let Err(err) = res {
                                     // Check if the error matches any IO errors
                                     if let Some(io_err) = match_for_io_error(&err) {
                                         if io_err.kind() == ErrorKind::BrokenPipe {
@@ -77,7 +68,6 @@ pub(crate) async fn new_endorsements(
                                         error!("failed to send back new_endorsements error response: {}", e);
                                         break;
                                     }
-                                }
                             }
                         },
                         None => {
diff --git a/massa-grpc/src/stream/new_filled_blocks.rs b/massa-grpc/src/stream/new_filled_blocks.rs
index ba39824cd09..3abcd765672 100644
--- a/massa-grpc/src/stream/new_filled_blocks.rs
+++ b/massa-grpc/src/stream/new_filled_blocks.rs
@@ -1,7 +1,7 @@
 // Copyright (c) 2023 MASSA LABS <info@massa.net>
 
 use crate::error::{match_for_io_error, GrpcError};
-use crate::server::MassaGrpc;
+use crate::server::MassaPublicGrpc;
 use futures_util::StreamExt;
 use massa_proto_rs::massa::api::v1 as grpc_api;
 use std::io::ErrorKind;
@@ -22,7 +22,7 @@ pub type NewFilledBlocksStreamType = Pin<
 
 /// Creates a new stream of new produced and received filled blocks
 pub(crate) async fn new_filled_blocks(
-    grpc: &MassaGrpc,
+    grpc: &MassaPublicGrpc,
     request: Request<Streaming<grpc_api::NewFilledBlocksRequest>>,
 ) -> Result<NewFilledBlocksStreamType, GrpcError> {
     // Create a channel to handle communication with the client
@@ -33,8 +33,6 @@ pub(crate) async fn new_filled_blocks(
     let mut subscriber = grpc.consensus_channels.filled_block_sender.subscribe();
 
     tokio::spawn(async move {
-        // Initialize the request_id string
-        let mut request_id = String::new();
         loop {
             select! {
                 // Receive a new filled block from the subscriber
@@ -43,7 +41,6 @@ pub(crate) async fn new_filled_blocks(
                         Ok(massa_filled_block) => {
                             // Send the new filled block through the channel
                             if let Err(e) = tx.send(Ok(grpc_api::NewFilledBlocksResponse {
-                                    id: request_id.clone(),
                                     filled_block: Some(massa_filled_block.into())
                             })).await {
                                 error!("failed to send new block : {}", e);
@@ -57,13 +54,7 @@ pub(crate) async fn new_filled_blocks(
             res = in_stream.next() => {
                 match res {
                     Some(res) => {
-                        match res {
-                            // Get the request_id from the received data
-                            Ok(data) => {
-                                request_id = data.id
-                            },
-                            // Handle any errors that may occur during receiving the data
-                            Err(err) => {
+                        if let Err(err) = res {
                                 // Check if the error matches any IO errors
                                 if let Some(io_err) = match_for_io_error(&err) {
                                     if io_err.kind() == ErrorKind::BrokenPipe {
@@ -77,7 +68,6 @@ pub(crate) async fn new_filled_blocks(
                                     error!("failed to send back new_filled_blocks error response: {}", e);
                                     break;
                                 }
-                            }
                         }
                     },
                     None => {
diff --git a/massa-grpc/src/stream/new_operations.rs b/massa-grpc/src/stream/new_operations.rs
index 76ea99b7648..02ba5d144d6 100644
--- a/massa-grpc/src/stream/new_operations.rs
+++ b/massa-grpc/src/stream/new_operations.rs
@@ -1,9 +1,10 @@
 // Copyright (c) 2023 MASSA LABS <info@massa.net>
 
 use crate::error::GrpcError;
-use crate::server::MassaGrpc;
+use crate::server::MassaPublicGrpc;
 use futures_util::StreamExt;
-use massa_proto_rs::massa::api::v1 as grpc_api;
+use massa_proto_rs::massa::api::v1::{self as grpc_api, NewOperationsRequest};
+use massa_proto_rs::massa::model::v1 as grpc_model;
 use std::pin::Pin;
 use tokio::select;
 use tonic::codegen::futures_core;
@@ -19,9 +20,20 @@ pub type NewOperationsStreamType = Pin<
     >,
 >;
 
+fn get_request_parameters(request: NewOperationsRequest) -> Vec<i32> {
+    let mut filter_ope_types = Vec::new();
+
+    request.filters.into_iter().for_each(|query| {
+        if let Some(filter) = query.operation_types {
+            filter_ope_types.extend_from_slice(&filter.op_types);
+        }
+    });
+    filter_ope_types
+}
+
 /// Creates a new stream of new produced and received operations
 pub(crate) async fn new_operations(
-    grpc: &MassaGrpc,
+    grpc: &MassaPublicGrpc,
     request: Request<Streaming<grpc_api::NewOperationsRequest>>,
 ) -> Result<NewOperationsStreamType, GrpcError> {
     // Create a channel to handle communication with the client
@@ -33,10 +45,9 @@ pub(crate) async fn new_operations(
 
     tokio::spawn(async move {
         if let Some(Ok(request)) = in_stream.next().await {
-            let mut request_id = request.id;
-            let mut filter = request.query.and_then(|q| q.filter);
-
             // Spawn a new task for sending new operations
+            let mut filters = get_request_parameters(request);
+
             loop {
                 select! {
                     // Receive a new operation from the subscriber
@@ -44,15 +55,12 @@ pub(crate) async fn new_operations(
                         match event {
                             Ok(massa_operation) => {
                                 // Check if the operation should be sent
-                                if !should_send(&filter, massa_operation.clone().content.op.into()) {
+                                if !should_send(&filters, grpc_model::OpType::from(massa_operation.clone().content.op) as i32) {
                                     continue;
                                 }
 
                                 // Send the new operation through the channel
-                                if let Err(e) = tx.send(Ok(grpc_api::NewOperationsResponse {
-                                    id: request_id.clone(),
-                                    operation: Some(massa_operation.into())
-                                })).await {
+                                if let Err(e) = tx.send(Ok(grpc_api::NewOperationsResponse {signed_operation: Some(massa_operation.into())})).await {
                                     error!("failed to send operation : {}", e);
                                     break;
                                 }
@@ -66,10 +74,8 @@ pub(crate) async fn new_operations(
                             Some(res) => {
                                 match res {
                                     Ok(data) => {
-                                        // Update current filter && request id
-                                        filter = data.query
-                                        .and_then(|q| q.filter);
-                                        request_id = data.id;
+                                        // Update current filter
+                                        filters = get_request_parameters(data);
                                     },
                                     Err(e) => {
                                         error!("{}", e);
@@ -94,20 +100,6 @@ pub(crate) async fn new_operations(
     Ok(Box::pin(out_stream) as NewOperationsStreamType)
 }
 
-fn should_send(
-    filter_opt: &Option<grpc_api::NewOperationsFilter>,
-    ope_type: grpc_api::OpType,
-) -> bool {
-    match filter_opt {
-        Some(filter) => {
-            let filtered_ope_ids = &filter.types;
-            if filtered_ope_ids.is_empty() {
-                true
-            } else {
-                let id: i32 = ope_type as i32;
-                filtered_ope_ids.contains(&id)
-            }
-        }
-        None => true, // if user has no filter = All operations type is send
-    }
+fn should_send(filters: &Vec<i32>, ope_type: i32) -> bool {
+    filters.is_empty() || filters.contains(&ope_type)
 }
diff --git a/massa-grpc/src/stream/new_slot_execution_outputs.rs b/massa-grpc/src/stream/new_slot_execution_outputs.rs
index fbb285a3c36..75da9e9a971 100644
--- a/massa-grpc/src/stream/new_slot_execution_outputs.rs
+++ b/massa-grpc/src/stream/new_slot_execution_outputs.rs
@@ -1,7 +1,7 @@
 // Copyright (c) 2023 MASSA LABS <info@massa.net>
 
 use crate::error::{match_for_io_error, GrpcError};
-use crate::server::MassaGrpc;
+use crate::server::MassaPublicGrpc;
 use futures_util::StreamExt;
 use massa_execution_exports::SlotExecutionOutput;
 use massa_proto_rs::massa::api::v1 as grpc_api;
@@ -25,7 +25,7 @@ pub type NewSlotExecutionOutputsStreamType = Pin<
 
 /// Creates a new stream of new produced and received slot execution outputs
 pub(crate) async fn new_slot_execution_outputs(
-    grpc: &MassaGrpc,
+    grpc: &MassaPublicGrpc,
     request: Request<Streaming<grpc_api::NewSlotExecutionOutputsRequest>>,
 ) -> Result<NewSlotExecutionOutputsStreamType, GrpcError> {
     // Create a channel to handle communication with the client
@@ -41,8 +41,8 @@ pub(crate) async fn new_slot_execution_outputs(
     tokio::spawn(async move {
         // Initialize the request_id string
         if let Some(Ok(request)) = in_stream.next().await {
-            let mut request_id = request.id;
-            let mut filter = request.query.and_then(|q| q.filter);
+            let mut filters: Vec<grpc_api::NewSlotExecutionOutputsFilter> = request.filters;
+
             loop {
                 select! {
                     // Receive a new slot execution output from the subscriber
@@ -50,12 +50,11 @@ pub(crate) async fn new_slot_execution_outputs(
                         match event {
                             Ok(massa_slot_execution_output) => {
                                 // Check if the slot execution output should be sent
-                                if !should_send(&filter, &massa_slot_execution_output) {
+                                if !should_send(filters.clone(), &massa_slot_execution_output) {
                                   continue;
                                 }
                                 // Send the new slot execution output through the channel
                                 if let Err(e) = tx.send(Ok(grpc_api::NewSlotExecutionOutputsResponse {
-                                        id: request_id.clone(),
                                         output: Some(massa_slot_execution_output.into())
                                 })).await {
                                     error!("failed to send new slot execution output : {}", e);
@@ -74,9 +73,7 @@ pub(crate) async fn new_slot_execution_outputs(
                                     // Get the request_id from the received data
                                     Ok(data) => {
                                         // Update current filter && request id
-                                        filter = data.query
-                                            .and_then(|q| q.filter);
-                                        request_id = data.id
+                                        filters = data.filters;
                                     },
                                     // Handle any errors that may occur during receiving the data
                                     Err(err) => {
@@ -118,20 +115,24 @@ pub(crate) async fn new_slot_execution_outputs(
 
 /// Return if the execution outputs should be send to client
 fn should_send(
-    filter_opt: &Option<grpc_api::NewSlotExecutionOutputsFilter>,
+    filters: Vec<grpc_api::NewSlotExecutionOutputsFilter>,
     exec_out_status: &SlotExecutionOutput,
 ) -> bool {
-    match filter_opt {
-        Some(filter) => match exec_out_status {
-            SlotExecutionOutput::ExecutedSlot(_) => {
-                let id = grpc_model::ExecutionOutputStatus::Candidate as i32;
-                filter.status.contains(&id)
-            }
-            SlotExecutionOutput::FinalizedSlot(_) => {
-                let id = grpc_model::ExecutionOutputStatus::Final as i32;
-                filter.status.contains(&id)
-            }
-        },
-        None => true, // if user has no filter = All execution outputs status are sent
+    if filters.is_empty() {
+        return true;
+    }
+    match exec_out_status {
+        SlotExecutionOutput::ExecutedSlot(_) => {
+            let id = grpc_model::ExecutionOutputStatus::Candidate as i32;
+            filters.iter().any(|f| {
+                matches!(f.filter.as_ref(), Some(grpc_api::new_slot_execution_outputs_filter::Filter::Status(status)) if *status == id)
+            })
+        }
+        SlotExecutionOutput::FinalizedSlot(_) => {
+            let id = grpc_model::ExecutionOutputStatus::Final as i32;
+            filters.iter().any(|f| {
+                matches!(f.filter.as_ref(), Some(grpc_api::new_slot_execution_outputs_filter::Filter::Status(status)) if *status == id)
+            })
+        }
     }
 }
diff --git a/massa-grpc/src/stream/send_blocks.rs b/massa-grpc/src/stream/send_blocks.rs
index 0f45e18ae2d..9a9d8c75d21 100644
--- a/massa-grpc/src/stream/send_blocks.rs
+++ b/massa-grpc/src/stream/send_blocks.rs
@@ -1,13 +1,12 @@
 // Copyright (c) 2023 MASSA LABS <info@massa.net>
 
 use crate::error::{match_for_io_error, GrpcError};
-use crate::server::MassaGrpc;
+use crate::server::MassaPublicGrpc;
 use futures_util::StreamExt;
 use massa_models::block::{BlockDeserializer, BlockDeserializerArgs, SecureShareBlock};
 use massa_models::error::ModelsError;
 use massa_models::mapping_grpc::secure_share_to_vec;
 use massa_models::secure_share::SecureShareDeserializer;
-use massa_proto_rs::google::rpc::Status;
 use massa_proto_rs::massa::api::v1 as grpc_api;
 use massa_serialization::{DeserializeError, Deserializer};
 use std::io::ErrorKind;
@@ -30,11 +29,11 @@ pub type SendBlocksStreamType = Pin<
 /// verifies, saves and propagates the block received in each message, and sends back a stream of
 /// block id messages
 pub(crate) async fn send_blocks(
-    grpc: &MassaGrpc,
+    grpc: &MassaPublicGrpc,
     request: Request<tonic::Streaming<grpc_api::SendBlocksRequest>>,
 ) -> Result<SendBlocksStreamType, GrpcError> {
     let consensus_controller = grpc.consensus_controller.clone();
-    let protocol_command_sender = grpc.protocol_command_sender.clone();
+    let protocol_command_sender = grpc.protocol_controller.clone();
     let storage = grpc.storage.clone_without_refs();
     let config = grpc.grpc_config.clone();
 
@@ -49,24 +48,22 @@ pub(crate) async fn send_blocks(
             match result {
                 Ok(req_content) => {
                     let Some(proto_block) = req_content.block else {
-                        report_error(
-                            req_content.id.clone(),
-                            tx.clone(),
-                            tonic::Code::InvalidArgument,
-                            "the request payload is empty".to_owned(),
-                        ).await;
-                        continue;
-                    };
+                            report_error(
+                                tx.clone(),
+                                tonic::Code::InvalidArgument,
+                                "the request payload is empty".to_owned(),
+                            ).await;
+                            continue;
+                        };
 
                     let Ok(blk_serialized) = secure_share_to_vec(proto_block) else {
-                        report_error(
-                            req_content.id.clone(),
-                            tx.clone(),
-                            tonic::Code::InvalidArgument,
-                            "failed to convert block secure share".to_owned(),
-                        ).await;
-                        continue;
-                    };
+                            report_error(
+                                tx.clone(),
+                                tonic::Code::InvalidArgument,
+                                "failed to convert block secure share".to_owned(),
+                            ).await;
+                            continue;
+                        };
 
                     // Create a block deserializer arguments
                     let args = BlockDeserializerArgs {
@@ -85,7 +82,6 @@ pub(crate) async fn send_blocks(
                             let (rest, res_block): (&[u8], SecureShareBlock) = tuple;
                             if !rest.is_empty() {
                                 report_error(
-                                    req_content.id.clone(),
                                     tx.clone(),
                                     tonic::Code::InvalidArgument,
                                     "the request payload is too large".to_owned(),
@@ -108,7 +104,6 @@ pub(crate) async fn send_blocks(
                                 })
                             {
                                 report_error(
-                                    req_content.id.clone(),
                                     tx.clone(),
                                     tonic::Code::InvalidArgument,
                                     format!("wrong signature: {}", e),
@@ -136,7 +131,6 @@ pub(crate) async fn send_blocks(
                             {
                                 // If propagation failed, send an error message back to the client
                                 report_error(
-                                    req_content.id.clone(),
                                     tx.clone(),
                                     tonic::Code::Internal,
                                     format!("failed to propagate block: {}", e),
@@ -145,16 +139,11 @@ pub(crate) async fn send_blocks(
                                 continue;
                             };
 
-                            // Build the response message
-                            let result = grpc_api::BlockResult {
-                                block_id: res_block.id.to_string(),
-                            };
                             // Send the response message back to the client
                             if let Err(e) = tx
                                 .send(Ok(grpc_api::SendBlocksResponse {
-                                    id: req_content.id.clone(),
-                                    message: Some(grpc_api::send_blocks_response::Message::Result(
-                                        result,
+                                    result: Some(grpc_api::send_blocks_response::Result::BlockId(
+                                        res_block.id.to_string(),
                                     )),
                                 }))
                                 .await
@@ -165,7 +154,6 @@ pub(crate) async fn send_blocks(
                         // If the verification failed, send an error message back to the client
                         Err(e) => {
                             report_error(
-                                req_content.id.clone(),
                                 tx.clone(),
                                 tonic::Code::InvalidArgument,
                                 format!("failed to deserialize block: {}", e),
@@ -201,7 +189,6 @@ pub(crate) async fn send_blocks(
 
 /// This function reports an error to the sender by sending a gRPC response message to the client
 async fn report_error(
-    id: String,
     sender: Sender<Result<grpc_api::SendBlocksResponse, tonic::Status>>,
     code: tonic::Code,
     error: String,
@@ -210,12 +197,12 @@ async fn report_error(
     // Attempt to send the error response message to the sender
     if let Err(e) = sender
         .send(Ok(grpc_api::SendBlocksResponse {
-            id,
-            message: Some(grpc_api::send_blocks_response::Message::Error(Status {
-                code: code.into(),
-                message: error,
-                details: Vec::new(),
-            })),
+            result: Some(grpc_api::send_blocks_response::Result::Error(
+                massa_proto_rs::massa::model::v1::Error {
+                    code: code.into(),
+                    message: error,
+                },
+            )),
         }))
         .await
     {
diff --git a/massa-grpc/src/stream/send_endorsements.rs b/massa-grpc/src/stream/send_endorsements.rs
index 200de92f00b..8658ac0f2ce 100644
--- a/massa-grpc/src/stream/send_endorsements.rs
+++ b/massa-grpc/src/stream/send_endorsements.rs
@@ -1,12 +1,13 @@
 // Copyright (c) 2023 MASSA LABS <info@massa.net>
 
 use crate::error::{match_for_io_error, GrpcError};
-use crate::server::MassaGrpc;
+use crate::server::MassaPublicGrpc;
 use futures_util::StreamExt;
 use massa_models::endorsement::{EndorsementDeserializer, SecureShareEndorsement};
 use massa_models::mapping_grpc::secure_share_to_vec;
 use massa_models::secure_share::SecureShareDeserializer;
 use massa_proto_rs::massa::api::v1 as grpc_api;
+use massa_proto_rs::massa::model::v1 as grpc_model;
 use massa_serialization::{DeserializeError, Deserializer};
 use std::collections::HashMap;
 use std::io::ErrorKind;
@@ -27,11 +28,11 @@ pub type SendEndorsementsStreamType = Pin<
 /// verifies, saves and propagates the endorsements received in each message, and sends back a stream of
 /// endorsements ids messages
 pub(crate) async fn send_endorsements(
-    grpc: &MassaGrpc,
+    grpc: &MassaPublicGrpc,
     request: tonic::Request<tonic::Streaming<grpc_api::SendEndorsementsRequest>>,
 ) -> Result<SendEndorsementsStreamType, GrpcError> {
-    let mut pool_command_sender = grpc.pool_command_sender.clone();
-    let protocol_command_sender = grpc.protocol_command_sender.clone();
+    let mut pool_command_sender = grpc.pool_controller.clone();
+    let protocol_command_sender = grpc.protocol_controller.clone();
     let config = grpc.grpc_config.clone();
     let storage = grpc.storage.clone_without_refs();
 
@@ -48,7 +49,6 @@ pub(crate) async fn send_endorsements(
                     // If the incoming message has no endorsements, send an error message back to the client
                     if req_content.endorsements.is_empty() {
                         report_error(
-                            req_content.id.clone(),
                             tx.clone(),
                             tonic::Code::InvalidArgument,
                             "the request payload is empty".to_owned(),
@@ -59,7 +59,6 @@ pub(crate) async fn send_endorsements(
                         let proto_endorsement = req_content.endorsements;
                         if proto_endorsement.len() as u32 > config.max_endorsements_per_message {
                             report_error(
-                                req_content.id.clone(),
                                 tx.clone(),
                                 tonic::Code::InvalidArgument,
                                 "too many endorsements per message".to_owned(),
@@ -118,7 +117,6 @@ pub(crate) async fn send_endorsements(
                                         let error =
                                             format!("failed to propagate endorsement: {}", e);
                                         report_error(
-                                            req_content.id.clone(),
                                             tx.clone(),
                                             tonic::Code::Internal,
                                             error.to_owned(),
@@ -127,15 +125,14 @@ pub(crate) async fn send_endorsements(
                                     };
 
                                     // Build the response message
-                                    let result = grpc_api::EndorsementResult {
+                                    let result = grpc_model::EndorsementsIds {
                                         endorsements_ids: verified_eds.keys().cloned().collect(),
                                     };
                                     // Send the response message back to the client
                                     if let Err(e) = tx
                                         .send(Ok(grpc_api::SendEndorsementsResponse {
-                                            id: req_content.id.clone(),
-                                            message: Some(
-                                                grpc_api::send_endorsements_response::Message::Result(
+                                            result: Some(
+                                                grpc_api::send_endorsements_response::Result::EndorsementsIds(
                                                     result,
                                                 ),
                                             ),
@@ -149,7 +146,6 @@ pub(crate) async fn send_endorsements(
                                 Err(e) => {
                                     let error = format!("invalid endorsement(s): {}", e);
                                     report_error(
-                                        req_content.id.clone(),
                                         tx.clone(),
                                         tonic::Code::InvalidArgument,
                                         error.to_owned(),
@@ -187,9 +183,8 @@ pub(crate) async fn send_endorsements(
     Ok(Box::pin(out_stream) as SendEndorsementsStreamType)
 }
 
-/// This function reports an error to the sender by sending a gRPC response message to the client
+// This function reports an error to the sender by sending a gRPC response message to the client
 async fn report_error(
-    id: String,
     sender: tokio::sync::mpsc::Sender<Result<grpc_api::SendEndorsementsResponse, tonic::Status>>,
     code: tonic::Code,
     error: String,
@@ -198,12 +193,10 @@ async fn report_error(
     // Attempt to send the error response message to the sender
     if let Err(e) = sender
         .send(Ok(grpc_api::SendEndorsementsResponse {
-            id,
-            message: Some(grpc_api::send_endorsements_response::Message::Error(
-                massa_proto_rs::google::rpc::Status {
+            result: Some(grpc_api::send_endorsements_response::Result::Error(
+                massa_proto_rs::massa::model::v1::Error {
                     code: code.into(),
                     message: error,
-                    details: Vec::new(),
                 },
             )),
         }))
diff --git a/massa-grpc/src/stream/send_operations.rs b/massa-grpc/src/stream/send_operations.rs
index 0b83f8fefe0..4e59c9896ef 100644
--- a/massa-grpc/src/stream/send_operations.rs
+++ b/massa-grpc/src/stream/send_operations.rs
@@ -1,12 +1,13 @@
 // Copyright (c) 2023 MASSA LABS <info@massa.net>
 
 use crate::error::{match_for_io_error, GrpcError};
-use crate::server::MassaGrpc;
+use crate::server::MassaPublicGrpc;
 use futures_util::StreamExt;
 use massa_models::mapping_grpc::secure_share_to_vec;
 use massa_models::operation::{OperationDeserializer, SecureShareOperation};
 use massa_models::secure_share::SecureShareDeserializer;
 use massa_proto_rs::massa::api::v1 as grpc_api;
+use massa_proto_rs::massa::model::v1 as grpc_model;
 use massa_serialization::{DeserializeError, Deserializer};
 use std::collections::HashMap;
 use std::io::ErrorKind;
@@ -27,11 +28,11 @@ pub type SendOperationsStreamType = Pin<
 /// verifies, saves and propagates the operations received in each message, and sends back a stream of
 /// operations ids messages
 pub(crate) async fn send_operations(
-    grpc: &MassaGrpc,
+    grpc: &MassaPublicGrpc,
     request: tonic::Request<tonic::Streaming<grpc_api::SendOperationsRequest>>,
 ) -> Result<SendOperationsStreamType, GrpcError> {
-    let mut pool_command_sender = grpc.pool_command_sender.clone();
-    let protocol_command_sender = grpc.protocol_command_sender.clone();
+    let mut pool_controller = grpc.pool_controller.clone();
+    let protocol_controller = grpc.protocol_controller.clone();
     let config = grpc.grpc_config.clone();
     let storage = grpc.storage.clone_without_refs();
 
@@ -48,7 +49,6 @@ pub(crate) async fn send_operations(
                     // If the incoming message has no operations, send an error message back to the client
                     if req_content.operations.is_empty() {
                         report_error(
-                            req_content.id.clone(),
                             tx.clone(),
                             tonic::Code::InvalidArgument,
                             "the request payload is empty".to_owned(),
@@ -58,7 +58,6 @@ pub(crate) async fn send_operations(
                         // If there are too many operations in the incoming message, send an error message back to the client
                         if req_content.operations.len() as u32 > config.max_operations_per_message {
                             report_error(
-                                req_content.id.clone(),
                                 tx.clone(),
                                 tonic::Code::InvalidArgument,
                                 "too many operations per message".to_owned(),
@@ -108,17 +107,16 @@ pub(crate) async fn send_operations(
                                     operation_storage
                                         .store_operations(verified_ops.values().cloned().collect());
                                     // Add the received operations to the operations pool
-                                    pool_command_sender.add_operations(operation_storage.clone());
+                                    pool_controller.add_operations(operation_storage.clone());
 
                                     // Propagate the operations to the network
-                                    if let Err(e) = protocol_command_sender
-                                        .propagate_operations(operation_storage)
+                                    if let Err(e) =
+                                        protocol_controller.propagate_operations(operation_storage)
                                     {
                                         // If propagation failed, send an error message back to the client
                                         let error =
                                             format!("failed to propagate operations: {}", e);
                                         report_error(
-                                            req_content.id.clone(),
                                             tx.clone(),
                                             tonic::Code::Internal,
                                             error.to_owned(),
@@ -127,15 +125,14 @@ pub(crate) async fn send_operations(
                                     };
 
                                     // Build the response message
-                                    let result = grpc_api::OperationResult {
-                                        operations_ids: verified_ops.keys().cloned().collect(),
+                                    let result = grpc_model::OperationIds {
+                                        operation_ids: verified_ops.keys().cloned().collect(),
                                     };
                                     // Send the response message back to the client
                                     if let Err(e) = tx
                                         .send(Ok(grpc_api::SendOperationsResponse {
-                                            id: req_content.id.clone(),
-                                            message: Some(
-                                                grpc_api::send_operations_response::Message::Result(
+                                            result: Some(
+                                                grpc_api::send_operations_response::Result::OperationsIds(
                                                     result,
                                                 ),
                                             ),
@@ -149,7 +146,6 @@ pub(crate) async fn send_operations(
                                 Err(e) => {
                                     let error = format!("invalid operation(s): {}", e);
                                     report_error(
-                                        req_content.id.clone(),
                                         tx.clone(),
                                         tonic::Code::InvalidArgument,
                                         error.to_owned(),
@@ -184,9 +180,8 @@ pub(crate) async fn send_operations(
     Ok(Box::pin(out_stream) as SendOperationsStreamType)
 }
 
-/// This function reports an error to the sender by sending a gRPC response message to the client
+// This function reports an error to the sender by sending a gRPC response message to the client
 async fn report_error(
-    id: String,
     sender: tokio::sync::mpsc::Sender<Result<grpc_api::SendOperationsResponse, tonic::Status>>,
     code: tonic::Code,
     error: String,
@@ -195,12 +190,10 @@ async fn report_error(
     // Attempt to send the error response message to the sender
     if let Err(e) = sender
         .send(Ok(grpc_api::SendOperationsResponse {
-            id,
-            message: Some(grpc_api::send_operations_response::Message::Error(
-                massa_proto_rs::google::rpc::Status {
+            result: Some(grpc_api::send_operations_response::Result::Error(
+                grpc_model::Error {
                     code: code.into(),
                     message: error,
-                    details: Vec::new(),
                 },
             )),
         }))
diff --git a/massa-grpc/src/stream/tx_throughput.rs b/massa-grpc/src/stream/tx_throughput.rs
index 3e512adef5c..fb76704bd43 100644
--- a/massa-grpc/src/stream/tx_throughput.rs
+++ b/massa-grpc/src/stream/tx_throughput.rs
@@ -1,6 +1,6 @@
 // Copyright (c) 2023 MASSA LABS <info@massa.net>
 
-use crate::{error::GrpcError, server::MassaGrpc};
+use crate::{error::GrpcError, server::MassaPublicGrpc};
 use futures_util::StreamExt;
 use massa_proto_rs::massa::api::v1 as grpc_api;
 use std::pin::Pin;
@@ -28,7 +28,7 @@ pub type TransactionsThroughputStreamType = Pin<
 
 /// The function returns a stream of transaction throughput statistics
 pub(crate) async fn transactions_throughput(
-    grpc: &MassaGrpc,
+    grpc: &MassaPublicGrpc,
     request: tonic::Request<tonic::Streaming<grpc_api::TransactionsThroughputRequest>>,
 ) -> Result<TransactionsThroughputStreamType, GrpcError> {
     let execution_controller = grpc.execution_controller.clone();
@@ -40,7 +40,6 @@ pub(crate) async fn transactions_throughput(
 
     // Spawn a new Tokio task to handle the stream processing
     tokio::spawn(async move {
-        let mut request_id = "".to_string();
         let mut interval = time::interval(Duration::from_secs(DEFAULT_THROUGHPUT_INTERVAL));
 
         // Continuously loop until the stream ends or an error occurs
@@ -50,8 +49,6 @@ pub(crate) async fn transactions_throughput(
                 res = in_stream.next() => {
                     match res {
                         Some(Ok(req)) => {
-                            // Update the request ID
-                            request_id = req.id;
                             // Update the interval timer based on the request (or use the default)
                             let new_timer = req.interval.unwrap_or(DEFAULT_THROUGHPUT_INTERVAL);
                             interval = time::interval(Duration::from_secs(new_timer));
@@ -79,7 +76,6 @@ pub(crate) async fn transactions_throughput(
                     // Send the throughput response back to the client
                     if let Err(e) = tx
                         .send(Ok(grpc_api::TransactionsThroughputResponse {
-                            id: request_id.clone(),
                             throughput,
                         }))
                         .await
diff --git a/massa-grpc/src/tests/test.rs b/massa-grpc/src/tests/test.rs
index 7081eb79c39..c88a7e42536 100644
--- a/massa-grpc/src/tests/test.rs
+++ b/massa-grpc/src/tests/test.rs
@@ -1,24 +1,32 @@
 // Copyright (c) 2023 MASSA LABS <info@massa.net>
 
 use crate::config::GrpcConfig;
-use crate::server::MassaGrpc;
+use crate::server::MassaPublicGrpc;
 use massa_channel::MassaChannel;
 use massa_consensus_exports::test_exports::MockConsensusControllerImpl;
 use massa_consensus_exports::ConsensusChannels;
 use massa_execution_exports::{test_exports::MockExecutionController, ExecutionChannels};
-use massa_models::config::{
-    ENDORSEMENT_COUNT, GENESIS_TIMESTAMP, MAX_DATASTORE_VALUE_LENGTH,
-    MAX_DENUNCIATIONS_PER_BLOCK_HEADER, MAX_ENDORSEMENTS_PER_MESSAGE, MAX_FUNCTION_NAME_LENGTH,
-    MAX_OPERATIONS_PER_BLOCK, MAX_OPERATIONS_PER_MESSAGE, MAX_OPERATION_DATASTORE_ENTRY_COUNT,
-    MAX_OPERATION_DATASTORE_KEY_LENGTH, MAX_OPERATION_DATASTORE_VALUE_LENGTH, MAX_PARAMETERS_SIZE,
-    MIP_STORE_STATS_BLOCK_CONSIDERED, PERIODS_PER_CYCLE, T0, THREAD_COUNT, VERSION,
+use massa_models::{
+    config::{
+        ENDORSEMENT_COUNT, GENESIS_TIMESTAMP, MAX_DATASTORE_VALUE_LENGTH,
+        MAX_DENUNCIATIONS_PER_BLOCK_HEADER, MAX_ENDORSEMENTS_PER_MESSAGE, MAX_FUNCTION_NAME_LENGTH,
+        MAX_OPERATIONS_PER_BLOCK, MAX_OPERATIONS_PER_MESSAGE, MAX_OPERATION_DATASTORE_ENTRY_COUNT,
+        MAX_OPERATION_DATASTORE_KEY_LENGTH, MAX_OPERATION_DATASTORE_VALUE_LENGTH,
+        MAX_PARAMETERS_SIZE, MIP_STORE_STATS_BLOCK_CONSIDERED, PERIODS_PER_CYCLE, T0, THREAD_COUNT,
+        VERSION,
+    },
+    node::NodeId,
 };
 use massa_pool_exports::test_exports::MockPoolController;
 use massa_pool_exports::PoolChannels;
 use massa_pos_exports::test_exports::MockSelectorController;
-use massa_proto_rs::massa::api::v1::massa_service_client::MassaServiceClient;
-use massa_protocol_exports::MockProtocolController;
-use massa_versioning::versioning::{MipStatsConfig, MipStore};
+use massa_proto_rs::massa::api::v1::public_service_client::PublicServiceClient;
+use massa_protocol_exports::{MockProtocolController, ProtocolConfig};
+use massa_signature::KeyPair;
+use massa_versioning::{
+    keypair_factory::KeyPairFactory,
+    versioning::{MipStatsConfig, MipStore},
+};
 use num::rational::Ratio;
 use std::{
     net::{IpAddr, Ipv4Addr, SocketAddr},
@@ -49,13 +57,14 @@ async fn test_start_grpc_server() {
     let endorsement_sender = tokio::sync::broadcast::channel(2000).0;
     let operation_sender = tokio::sync::broadcast::channel(5000).0;
     let slot_execution_output_sender = tokio::sync::broadcast::channel(5000).0;
-
+    let keypair = KeyPair::generate(0).unwrap();
     let grpc_config = GrpcConfig {
         enabled: true,
         accept_http1: true,
         enable_cors: true,
         enable_health: true,
         enable_reflection: true,
+        enable_tls: false,
         enable_mtls: false,
         bind: SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)), 8888),
         accept_compressed: None,
@@ -67,6 +76,7 @@ async fn test_start_grpc_server() {
         initial_stream_window_size: None,
         initial_connection_window_size: None,
         max_concurrent_streams: None,
+        max_arguments: 128,
         tcp_keepalive: None,
         tcp_nodelay: false,
         http2_keepalive_interval: None,
@@ -87,6 +97,7 @@ async fn test_start_grpc_server() {
         genesis_timestamp: *GENESIS_TIMESTAMP,
         t0: T0,
         periods_per_cycle: PERIODS_PER_CYCLE,
+        keypair: keypair.clone(),
         max_channel_size: 128,
         draw_lookahead_period_count: 10,
         last_start_period: 0,
@@ -105,7 +116,7 @@ async fn test_start_grpc_server() {
 
     let mip_store = MipStore::try_from(([], mip_stats_config)).unwrap();
 
-    let service = MassaGrpc {
+    let service = MassaPublicGrpc {
         consensus_controller: Box::new(consensus_controller),
         consensus_channels,
         execution_controller: execution_ctrl.0.clone(),
@@ -118,13 +129,17 @@ async fn test_start_grpc_server() {
             selector: selector_ctrl.0.clone(),
             execution_controller: execution_ctrl.0.clone(),
         },
-        pool_command_sender: pool_ctrl.0,
-        protocol_command_sender: Box::new(MockProtocolController::new()),
+        pool_controller: pool_ctrl.0,
+        protocol_controller: Box::new(MockProtocolController::new()),
+        protocol_config: ProtocolConfig::default(),
         selector_controller: selector_ctrl.0,
         storage: shared_storage,
         grpc_config: grpc_config.clone(),
         version: *VERSION,
-        mip_store,
+        node_id: NodeId::new(keypair.get_public_key()),
+        keypair_factory: KeyPairFactory {
+            mip_store: mip_store.clone(),
+        },
     };
 
     let stop_handle = service.serve(&grpc_config).await.unwrap();
@@ -136,6 +151,6 @@ async fn test_start_grpc_server() {
         .await
         .unwrap();
 
-    let _res = MassaServiceClient::new(channel);
+    let _res = PublicServiceClient::new(channel);
     stop_handle.stop();
 }
diff --git a/massa-ledger-exports/Cargo.toml b/massa-ledger-exports/Cargo.toml
index 56b612c25ec..c756ca6b955 100644
--- a/massa-ledger-exports/Cargo.toml
+++ b/massa-ledger-exports/Cargo.toml
@@ -14,7 +14,7 @@ nom = "=7.1"
 num_enum = "0.5.10"
 
 # custom modules
-massa-proto-rs = { git = "https://github.com/massalabs/massa-proto-rs", rev = "18ec02f", features = ["tonic"] }
+massa-proto-rs = { git = "https://github.com/massalabs/massa-proto-rs", rev = "32179e2", features = ["tonic"] }
 massa_hash = { path = "../massa-hash" }
 massa_models = { path = "../massa-models" }
 massa_serialization = { path = "../massa-serialization" }
diff --git a/massa-ledger-exports/src/mapping_grpc.rs b/massa-ledger-exports/src/mapping_grpc.rs
index c6bdbde842f..04aa055dd51 100644
--- a/massa-ledger-exports/src/mapping_grpc.rs
+++ b/massa-ledger-exports/src/mapping_grpc.rs
@@ -6,9 +6,9 @@ use massa_proto_rs::massa::model::v1 as grpc_model;
 impl From<LedgerEntry> for grpc_model::LedgerEntry {
     fn from(value: LedgerEntry) -> Self {
         grpc_model::LedgerEntry {
-            balance: value.balance.to_raw(),
+            balance: Some(value.balance.into()),
             bytecode: value.bytecode.0,
-            entries: value
+            datastore: value
                 .datastore
                 .into_iter()
                 .map(|(key, value)| grpc_model::BytesMapFieldEntry { key, value })
@@ -22,22 +22,22 @@ impl From<LedgerEntryUpdate> for grpc_model::LedgerEntryUpdate {
         grpc_model::LedgerEntryUpdate {
             balance: match value.balance {
                 SetOrKeep::Set(value) => Some(grpc_model::SetOrKeepBalance {
-                    r#type: grpc_model::LedgerChangeType::Set as i32,
-                    balance: Some(value.to_raw()),
+                    change: Some(grpc_model::set_or_keep_balance::Change::Set(value.into())),
                 }),
                 SetOrKeep::Keep => Some(grpc_model::SetOrKeepBalance {
-                    r#type: grpc_model::LedgerChangeType::Delete as i32,
-                    balance: None,
+                    change: Some(grpc_model::set_or_keep_balance::Change::Keep(
+                        grpc_model::Empty {},
+                    )),
                 }),
             },
             bytecode: match value.bytecode {
-                SetOrKeep::Set(value) => Some(grpc_model::SetOrKeepBytecode {
-                    r#type: grpc_model::LedgerChangeType::Set as i32,
-                    bytecode: Some(value.0),
+                SetOrKeep::Set(value) => Some(grpc_model::SetOrKeepBytes {
+                    change: Some(grpc_model::set_or_keep_bytes::Change::Set(value.0)),
                 }),
-                SetOrKeep::Keep => Some(grpc_model::SetOrKeepBytecode {
-                    r#type: grpc_model::LedgerChangeType::Delete as i32,
-                    bytecode: None,
+                SetOrKeep::Keep => Some(grpc_model::SetOrKeepBytes {
+                    change: Some(grpc_model::set_or_keep_bytes::Change::Keep(
+                        grpc_model::Empty {},
+                    )),
                 }),
             },
             datastore: value
@@ -45,15 +45,17 @@ impl From<LedgerEntryUpdate> for grpc_model::LedgerEntryUpdate {
                 .into_iter()
                 .map(|entry| match entry.1 {
                     SetOrDelete::Set(value) => grpc_model::SetOrDeleteDatastoreEntry {
-                        r#type: grpc_model::LedgerChangeType::Set as i32,
-                        datastore_entry: Some(grpc_model::BytesMapFieldEntry {
-                            key: entry.0,
-                            value,
-                        }),
+                        change: Some(grpc_model::set_or_delete_datastore_entry::Change::Set(
+                            grpc_model::BytesMapFieldEntry {
+                                key: entry.0,
+                                value,
+                            },
+                        )),
                     },
                     SetOrDelete::Delete => grpc_model::SetOrDeleteDatastoreEntry {
-                        r#type: grpc_model::LedgerChangeType::Delete as i32,
-                        datastore_entry: None,
+                        change: Some(grpc_model::set_or_delete_datastore_entry::Change::Delete(
+                            grpc_model::Empty {},
+                        )),
                     },
                 })
                 .collect(),
diff --git a/massa-models/Cargo.toml b/massa-models/Cargo.toml
index b4f6c2fbe9f..11b2fba650c 100644
--- a/massa-models/Cargo.toml
+++ b/massa-models/Cargo.toml
@@ -18,7 +18,7 @@ config = "0.13"
 bs58 = { version = "=0.4", features = ["check"] }
 bitvec = { version = "=1.0", features = ["serde"] }
 nom = "=7.1"
-massa-proto-rs = { git = "https://github.com/massalabs/massa-proto-rs", rev = "18ec02f", features = ["tonic"] }
+massa-proto-rs = { git = "https://github.com/massalabs/massa-proto-rs", rev = "32179e2", features = ["tonic"] }
 
 # custom modules
 massa_hash = { path = "../massa-hash" }
diff --git a/massa-models/src/mapping_grpc.rs b/massa-models/src/mapping_grpc.rs
index 1b2eaae695d..fcc742db0f9 100644
--- a/massa-models/src/mapping_grpc.rs
+++ b/massa-models/src/mapping_grpc.rs
@@ -2,20 +2,71 @@
 
 use std::str::FromStr;
 
-use crate::address::Address;
-use crate::block::{Block, FilledBlock, SecureShareBlock};
+use crate::amount::Amount;
+use crate::block::{Block, BlockGraphStatus, FilledBlock, SecureShareBlock};
 use crate::block_header::{BlockHeader, SecuredHeader};
+use crate::config::CompactConfig;
 use crate::denunciation::DenunciationIndex;
 use crate::endorsement::{Endorsement, SecureShareEndorsement};
 use crate::error::ModelsError;
-use crate::execution::EventFilter;
-use crate::operation::{Operation, OperationId, OperationType, SecureShareOperation};
+use crate::operation::{Operation, OperationType, SecureShareOperation};
 use crate::output_event::{EventExecutionContext, SCOutputEvent};
 use crate::slot::{IndexedSlot, Slot};
-use massa_proto_rs::massa::api::v1 as grpc_api;
+use crate::stats::{ConsensusStats, ExecutionStats, NetworkStats};
 use massa_proto_rs::massa::model::v1 as grpc_model;
 use massa_signature::{PublicKey, Signature};
 
+//TODO check error type
+/// Converts a gRPC `grpc_model::DenunciationIndex` into a DenunciationIndex
+pub fn to_denunciation_index(
+    value: grpc_model::DenunciationIndex,
+) -> Result<DenunciationIndex, ModelsError> {
+    match value
+        .entry
+        .ok_or_else(|| ModelsError::ErrorRaised("no denunciation_index found".to_string()))?
+    {
+        grpc_model::denunciation_index::Entry::BlockHeader(block_header) => {
+            Ok(DenunciationIndex::BlockHeader {
+                slot: block_header
+                    .slot
+                    .ok_or_else(|| ModelsError::ErrorRaised("no slot found".to_string()))?
+                    .into(),
+            })
+        }
+        grpc_model::denunciation_index::Entry::Endorsement(endorsement) => {
+            Ok(DenunciationIndex::Endorsement {
+                slot: endorsement
+                    .slot
+                    .ok_or_else(|| ModelsError::ErrorRaised("no slot found".to_string()))?
+                    .into(),
+                index: endorsement.index,
+            })
+        }
+    }
+}
+
+/// Converts a gRPC `SecureShare` into a byte vector
+pub fn secure_share_to_vec(value: grpc_model::SecureShare) -> Result<Vec<u8>, ModelsError> {
+    let pub_key = PublicKey::from_str(&value.content_creator_pub_key)?;
+    let pub_key_b = pub_key.to_bytes();
+    // Concatenate signature, public key, and data into a single byte vector
+    let mut serialized_content =
+        Vec::with_capacity(value.signature.len() + pub_key_b.len() + value.serialized_data.len());
+    serialized_content
+        .extend_from_slice(&Signature::from_str(&value.signature).map(|value| value.to_bytes())?);
+    serialized_content.extend_from_slice(&pub_key_b);
+    serialized_content.extend_from_slice(&value.serialized_data);
+
+    Ok(serialized_content)
+}
+
+impl From<Amount> for grpc_model::NativeAmount {
+    fn from(value: Amount) -> Self {
+        let (mantissa, scale) = value.to_mantissa_scale();
+        grpc_model::NativeAmount { mantissa, scale }
+    }
+}
+
 impl From<Block> for grpc_model::Block {
     fn from(value: Block) -> Self {
         grpc_model::Block {
@@ -29,6 +80,22 @@ impl From<Block> for grpc_model::Block {
     }
 }
 
+impl From<BlockGraphStatus> for i32 {
+    fn from(value: BlockGraphStatus) -> Self {
+        match value {
+            BlockGraphStatus::ActiveInBlockclique => {
+                grpc_model::BlockStatus::NonFinalBlockclique.into()
+            }
+            BlockGraphStatus::ActiveInAlternativeCliques => {
+                grpc_model::BlockStatus::NonFinalAlternateClique.into()
+            }
+            BlockGraphStatus::Final => grpc_model::BlockStatus::Final.into(),
+            BlockGraphStatus::Discarded => grpc_model::BlockStatus::Discarded.into(),
+            _ => grpc_model::BlockStatus::Unspecified.into(),
+        }
+    }
+}
+
 impl From<BlockHeader> for grpc_model::BlockHeader {
     fn from(value: BlockHeader) -> Self {
         let res = value.endorsements.into_iter().map(|e| e.into()).collect();
@@ -40,8 +107,11 @@ impl From<BlockHeader> for grpc_model::BlockHeader {
                 .into_iter()
                 .map(|parent| parent.to_string())
                 .collect(),
-            operation_merkle_root: value.operation_merkle_root.to_string(),
             endorsements: res,
+            current_version: value.current_version,
+            announced_version: value.announced_version,
+            //TODO to be updated in Massa models
+            operations_hash: value.operation_merkle_root.to_string(),
         }
     }
 }
@@ -53,7 +123,7 @@ impl From<FilledBlock> for grpc_model::FilledBlock {
             operations: value
                 .operations
                 .into_iter()
-                .map(|tuple| grpc_model::FilledOperationTuple {
+                .map(|tuple| grpc_model::FilledOperationEntry {
                     operation_id: tuple.0.to_string(),
                     operation: tuple.1.map(|op| op.into()),
                 })
@@ -70,7 +140,7 @@ impl From<SecureShareBlock> for grpc_model::SignedBlock {
             signature: value.signature.to_string(),
             content_creator_pub_key: value.content_creator_pub_key.to_string(),
             content_creator_address: value.content_creator_address.to_string(),
-            id: value.id.to_string(),
+            secure_hash: value.id.to_string(),
             serialized_size,
         }
     }
@@ -84,7 +154,7 @@ impl From<SecuredHeader> for grpc_model::SignedBlockHeader {
             signature: value.signature.to_string(),
             content_creator_pub_key: value.content_creator_pub_key.to_string(),
             content_creator_address: value.content_creator_address.to_string(),
-            id: value.id.to_string(),
+            secure_hash: value.id.to_string(),
             serialized_size,
         }
     }
@@ -108,7 +178,7 @@ impl From<SecureShareEndorsement> for grpc_model::SignedEndorsement {
             signature: value.signature.to_string(),
             content_creator_pub_key: value.content_creator_pub_key.to_string(),
             content_creator_address: value.content_creator_address.to_string(),
-            id: value.id.to_string(),
+            secure_hash: value.id.to_string(),
             serialized_size,
         }
     }
@@ -124,7 +194,7 @@ impl From<OperationType> for grpc_model::OperationType {
             } => {
                 let transaction = grpc_model::Transaction {
                     recipient_address: recipient_address.to_string(),
-                    amount: amount.to_raw(),
+                    amount: Some(amount.into()),
                 };
                 grpc_operation_type.r#type =
                     Some(grpc_model::operation_type::Type::Transaction(transaction));
@@ -169,7 +239,7 @@ impl From<OperationType> for grpc_model::OperationType {
                     target_func,
                     param,
                     max_gas,
-                    coins: coins.to_raw(),
+                    coins: Some(coins.into()),
                 };
                 grpc_operation_type.r#type =
                     Some(grpc_model::operation_type::Type::CallSc(call_sc));
@@ -183,35 +253,34 @@ impl From<OperationType> for grpc_model::OperationType {
 impl From<Operation> for grpc_model::Operation {
     fn from(op: Operation) -> Self {
         grpc_model::Operation {
-            fee: op.fee.to_raw(),
+            fee: Some(op.fee.into()),
             expire_period: op.expire_period,
             op: Some(op.op.into()),
         }
     }
 }
 
-impl From<OperationType> for grpc_api::OpType {
+impl From<OperationType> for grpc_model::OpType {
     fn from(value: OperationType) -> Self {
         match value {
-            OperationType::Transaction { .. } => grpc_api::OpType::Transaction,
-            OperationType::RollBuy { .. } => grpc_api::OpType::RollBuy,
-            OperationType::RollSell { .. } => grpc_api::OpType::RollSell,
-            OperationType::ExecuteSC { .. } => grpc_api::OpType::ExecuteSc,
-            OperationType::CallSC { .. } => grpc_api::OpType::CallSc,
+            OperationType::Transaction { .. } => grpc_model::OpType::Transaction,
+            OperationType::RollBuy { .. } => grpc_model::OpType::RollBuy,
+            OperationType::RollSell { .. } => grpc_model::OpType::RollSell,
+            OperationType::ExecuteSC { .. } => grpc_model::OpType::ExecuteSc,
+            OperationType::CallSC { .. } => grpc_model::OpType::CallSc,
         }
     }
 }
 
 impl From<SecureShareOperation> for grpc_model::SignedOperation {
     fn from(value: SecureShareOperation) -> Self {
-        let serialized_size = value.serialized_size() as u64;
         grpc_model::SignedOperation {
+            serialized_size: value.serialized_size() as u64,
             content: Some(value.content.into()),
             signature: value.signature.to_string(),
             content_creator_pub_key: value.content_creator_pub_key.to_string(),
             content_creator_address: value.content_creator_address.to_string(),
-            id: value.id.to_string(),
-            serialized_size,
+            secure_hash: value.id.to_string(),
         }
     }
 }
@@ -243,51 +312,18 @@ impl From<grpc_model::Slot> for Slot {
     }
 }
 
-impl TryFrom<grpc_api::GetScExecutionEventsFilter> for EventFilter {
-    type Error = crate::error::ModelsError;
-
-    fn try_from(filter: grpc_api::GetScExecutionEventsFilter) -> Result<Self, Self::Error> {
-        let status_final = grpc_model::ScExecutionEventStatus::Final as i32;
-        let status_error = grpc_model::ScExecutionEventStatus::Failure as i32;
-        Ok(Self {
-            start: filter.start_slot.map(|slot| slot.into()),
-            end: filter.end_slot.map(|slot| slot.into()),
-            emitter_address: filter
-                .emitter_address
-                .map(|address| Address::from_str(&address))
-                .transpose()?,
-            original_caller_address: filter
-                .caller_address
-                .map(|address| Address::from_str(&address))
-                .transpose()?,
-            original_operation_id: filter
-                .original_operation_id
-                .map(|operation_id| OperationId::from_str(&operation_id))
-                .transpose()?,
-            is_final: Some(filter.status.contains(&status_final)),
-            is_error: Some(filter.status.contains(&status_error)),
-        })
-    }
-}
-
 impl From<SCOutputEvent> for grpc_model::ScExecutionEvent {
     fn from(value: SCOutputEvent) -> Self {
         grpc_model::ScExecutionEvent {
             context: Some(value.context.into()),
-            data: value.data,
+            data: value.data.as_bytes().to_vec(),
         }
     }
 }
 
 impl From<EventExecutionContext> for grpc_model::ScExecutionEventContext {
     fn from(value: EventExecutionContext) -> Self {
-        let id_str = format!(
-            "{}{}{}",
-            &value.slot.period, &value.slot.thread, &value.index_in_slot
-        );
-        let id = bs58::encode(id_str.as_bytes()).with_check().into_string();
         Self {
-            id,
             origin_slot: Some(value.slot.into()),
             block_id: value.block.map(|id| id.to_string()),
             index_in_slot: value.index_in_slot,
@@ -297,19 +333,13 @@ impl From<EventExecutionContext> for grpc_model::ScExecutionEventContext {
                 .map(|a| a.to_string())
                 .collect(),
             origin_operation_id: value.origin_operation_id.map(|id| id.to_string()),
-            status: {
-                let mut status = Vec::new();
-                if value.read_only {
-                    status.push(grpc_model::ScExecutionEventStatus::ReadOnly as i32);
-                }
-                if value.is_error {
-                    status.push(grpc_model::ScExecutionEventStatus::Failure as i32);
-                }
-                if value.is_final {
-                    status.push(grpc_model::ScExecutionEventStatus::Final as i32);
-                }
-
-                status
+            is_failure: value.is_error,
+            status: if value.read_only {
+                grpc_model::ScExecutionEventStatus::ReadOnly as i32
+            } else if value.is_final {
+                grpc_model::ScExecutionEventStatus::Final as i32
+            } else {
+                grpc_model::ScExecutionEventStatus::Unspecified as i32
             },
         }
     }
@@ -339,17 +369,54 @@ impl From<DenunciationIndex> for grpc_model::DenunciationIndex {
     }
 }
 
-/// Converts a gRPC `SecureShare` into a byte vector
-pub fn secure_share_to_vec(value: grpc_model::SecureShare) -> Result<Vec<u8>, ModelsError> {
-    let pub_key = PublicKey::from_str(&value.content_creator_pub_key)?;
-    let pub_key_b = pub_key.to_bytes();
-    // Concatenate signature, public key, and data into a single byte vector
-    let mut serialized_content =
-        Vec::with_capacity(value.signature.len() + pub_key_b.len() + value.serialized_data.len());
-    serialized_content
-        .extend_from_slice(&Signature::from_str(&value.signature).map(|value| value.to_bytes())?);
-    serialized_content.extend_from_slice(&pub_key_b);
-    serialized_content.extend_from_slice(&value.serialized_data);
+impl From<CompactConfig> for grpc_model::CompactConfig {
+    fn from(value: CompactConfig) -> Self {
+        grpc_model::CompactConfig {
+            genesis_timestamp: Some(value.genesis_timestamp.into()),
+            end_timestamp: value.end_timestamp.map(|time| time.into()),
+            thread_count: value.thread_count as u32,
+            t0: Some(value.t0.into()),
+            delta_f0: value.delta_f0,
+            operation_validity_periods: value.operation_validity_periods,
+            periods_per_cycle: value.periods_per_cycle,
+            block_reward: Some(value.block_reward.into()),
+            roll_price: Some(value.roll_price.into()),
+            max_block_size: value.max_block_size,
+        }
+    }
+}
 
-    Ok(serialized_content)
+impl From<ConsensusStats> for grpc_model::ConsensusStats {
+    fn from(value: ConsensusStats) -> Self {
+        grpc_model::ConsensusStats {
+            start_timespan: Some(value.start_timespan.into()),
+            end_timespan: Some(value.end_timespan.into()),
+            final_block_count: value.final_block_count,
+            stale_block_count: value.stale_block_count,
+            clique_count: value.clique_count,
+        }
+    }
+}
+
+impl From<ExecutionStats> for grpc_model::ExecutionStats {
+    fn from(value: ExecutionStats) -> Self {
+        grpc_model::ExecutionStats {
+            time_window_start: Some(value.time_window_start.into()),
+            time_window_end: Some(value.time_window_end.into()),
+            final_block_count: value.final_block_count as u64,
+            final_executed_operations_count: value.final_executed_operations_count as u64,
+        }
+    }
+}
+
+impl From<NetworkStats> for grpc_model::NetworkStats {
+    fn from(value: NetworkStats) -> Self {
+        grpc_model::NetworkStats {
+            in_connection_count: value.in_connection_count,
+            out_connection_count: value.out_connection_count,
+            known_peer_count: value.known_peer_count,
+            banned_peer_count: value.banned_peer_count,
+            active_node_count: value.active_node_count,
+        }
+    }
 }
diff --git a/massa-node/Cargo.toml b/massa-node/Cargo.toml
index b28c6ff6a48..c50597e547f 100644
--- a/massa-node/Cargo.toml
+++ b/massa-node/Cargo.toml
@@ -54,7 +54,7 @@ massa_factory_exports = { path = "../massa-factory-exports" }
 massa_factory_worker = { path = "../massa-factory-worker" }
 massa_grpc = { path = "../massa-grpc" }
 massa_versioning = { path = "../massa-versioning" }
-massa_signature = { path = "../massa-signature", optional = true }
+massa_signature = { path = "../massa-signature" }
 massa_db_exports = { path = "../massa-db-exports" }
 massa_db_worker = { path = "../massa-db-worker" }
 #massa_signature = { path = "../massa-signature", optional = true }
@@ -63,9 +63,9 @@ massa_db_worker = { path = "../massa-db-worker" }
 [features]
 beta = []
 # 10s after initiating the first launch, will re-launch as if the node was signalled with `NeedsResync`
-resync_check = []
+resync_check = []   
 deadlock_detection = []
-op_spammer = ["rand", "massa_signature"]
+op_spammer = ["rand"]
 bootstrap_server = ["massa_consensus_worker/bootstrap_server", "massa_final_state/bootstrap_server"]
 sandbox = ["massa_bootstrap/sandbox", "massa_consensus_worker/sandbox", "massa_execution_worker/sandbox", "massa_factory_worker/sandbox", "massa_final_state/sandbox", "massa_models/sandbox", "massa_metrics/sandbox"]
 testing = ["massa_metrics/testing"]
diff --git a/massa-node/base_config/config.toml b/massa-node/base_config/config.toml
index af80e3d41ff..fa4835008b6 100644
--- a/massa-node/base_config/config.toml
+++ b/massa-node/base_config/config.toml
@@ -39,52 +39,108 @@
     enable_broadcast = false
 
 [grpc]
-    # whether to enable gRPC
-    enabled = true
-    # whether to add HTTP 1 layer
-    accept_http1 = false
-    # whether to enable CORS. works only if `accept_http1` is true
-    enable_cors = false
-    # whether to enable gRPC health service
-    enable_health = true
-    # whether to enable gRPC reflection(introspection)
-    enable_reflection = true
-    # whether to enable mTLS
-    enable_mtls = false
-    # bind for the Massa gRPC API
-    bind = "127.0.0.1:33037"
-    # which compression encodings does the server accept for requests
-    accept_compressed = "Gzip"
-    # which compression encodings might the server use for responses
-    send_compressed = "Gzip"
-    # limits the maximum size of a decoded message. Defaults to 50MB
-    max_decoding_message_size = 52428800
-    # limits the maximum size of an encoded message. Defaults to 50MB
-    max_encoding_message_size = 52428800
-    # limits the maximum size of streaming channel
-    max_channel_size = 128
-    # set a timeout on for all request handlers in seconds. Defaults to 60s
-    timeout = 60
-    # sets the maximum frame size to use for HTTP2(must be within 16,384 and 16,777,215). Defaults to 16MB
-    max_frame_size = 16777215
-    # set the concurrency limit applied to on requests inbound per connection. Defaults to 32
-    concurrency_limit_per_connection = 32
-    # sets the SETTINGS_MAX_CONCURRENT_STREAMS spec option for HTTP2 connections
-    max_concurrent_streams = 1024
-    # set the value of `TCP_NODELAY` option for accepted connections. Enabled by default
-    tcp_nodelay = true
-    # max number of future periods considered during requests
-    draw_lookahead_period_count = 10
-    # The maximum number of block IDs that can be included in a single request
-    max_block_ids_per_request = 50
-    # max number of operation ids that can be included in a single request
-    max_operation_ids_per_request = 250
-    # server certificate path
-    server_certificate_path = "config/tls/server.pem"
-    # server private key path
-    server_private_key_path = "config/tls/server.key"
-    # client certificate authority root path
-    client_certificate_authority_root_path = "config/tls/client_ca.pem"
+    [grpc.public]
+        # whether to enable gRPC
+        enabled = true
+        # whether to add HTTP 1 layer
+        accept_http1 = false
+        # whether to enable CORS. works only if `accept_http1` is true
+        enable_cors = false
+        # whether to enable gRPC health service
+        enable_health = true
+        # whether to enable gRPC reflection(introspection)
+        enable_reflection = true
+        # whether to enable TLS
+        enable_tls = false
+        # whether to enable mTLS (requires `enable_tls` to be true)
+        enable_mtls = false
+        # bind for the Massa gRPC API
+        bind = "0.0.0.0:33037"
+        # which compression encodings does the server accept for requests
+        accept_compressed = "Gzip"
+        # which compression encodings might the server use for responses
+        send_compressed = "Gzip"
+        # limits the maximum size of a decoded message. Defaults to 50MB
+        max_decoding_message_size = 52428800
+        # limits the maximum size of an encoded message. Defaults to 50MB
+        max_encoding_message_size = 52428800
+        # limits the maximum size of streaming channel
+        max_channel_size = 128
+        # set a timeout on for all request handlers in seconds. Defaults to 60s
+        timeout = 60
+        # sets the maximum frame size to use for HTTP2(must be within 16,384 and 16,777,215). Defaults to 16MB
+        max_frame_size = 16777215
+        # set the concurrency limit applied to on requests inbound per connection. Defaults to 32
+        concurrency_limit_per_connection = 32
+        # sets the SETTINGS_MAX_CONCURRENT_STREAMS spec option for HTTP2 connections
+        max_concurrent_streams = 1024
+        # max number of arguments per gRPC request
+        max_arguments = 128
+        # set the value of `TCP_NODELAY` option for accepted connections. Enabled by default
+        tcp_nodelay = true
+        # max number of future periods considered during requests
+        draw_lookahead_period_count = 10
+        # The maximum number of block IDs that can be included in a single request
+        max_block_ids_per_request = 50
+        # max number of operation ids that can be included in a single request
+        max_operation_ids_per_request = 250
+        # server certificate path
+        server_certificate_path = "config/tls/public/server.pem"
+        # server private key path
+        server_private_key_path = "config/tls/public/server.key"
+        # client certificate authority root path
+        client_certificate_authority_root_path = "config/tls/public/client_ca.pem"
+    [grpc.private]
+        # whether to enable gRPC
+        enabled = true
+        # whether to add HTTP 1 layer
+        accept_http1 = false
+        # whether to enable CORS. works only if `accept_http1` is true
+        enable_cors = false
+        # whether to enable gRPC health service
+        enable_health = true
+        # whether to enable gRPC reflection(introspection)
+        enable_reflection = true
+        # whether to enable TLS
+        enable_tls = false
+        # whether to enable mTLS (requires `enable_tls` to be true)
+        enable_mtls = false
+        # bind for the Massa gRPC API
+        bind = "127.0.0.1:33038"
+        # which compression encodings does the server accept for requests
+        accept_compressed = "Gzip"
+        # which compression encodings might the server use for responses
+        send_compressed = "Gzip"
+        # limits the maximum size of a decoded message. Defaults to 50MB
+        max_decoding_message_size = 52428800
+        # limits the maximum size of an encoded message. Defaults to 50MB
+        max_encoding_message_size = 52428800
+        # limits the maximum size of streaming channel
+        max_channel_size = 128
+        # set a timeout on for all request handlers in seconds. Defaults to 60s
+        timeout = 60
+        # sets the maximum frame size to use for HTTP2(must be within 16,384 and 16,777,215). Defaults to 16MB
+        max_frame_size = 16777215
+        # set the concurrency limit applied to on requests inbound per connection. Defaults to 32
+        concurrency_limit_per_connection = 32
+        # sets the SETTINGS_MAX_CONCURRENT_STREAMS spec option for HTTP2 connections
+        max_concurrent_streams = 1024
+        # max number of arguments per gRPC request
+        max_arguments = 128
+        # set the value of `TCP_NODELAY` option for accepted connections. Enabled by default
+        tcp_nodelay = true
+        # max number of future periods considered during requests
+        draw_lookahead_period_count = 10
+        # The maximum number of block IDs that can be included in a single request
+        max_block_ids_per_request = 50
+        # max number of operation ids that can be included in a single request
+        max_operation_ids_per_request = 250
+        # server certificate path
+        server_certificate_path = "config/tls/private/server.pem"
+        # server private key path
+        server_private_key_path = "config/tls/private/server.key"
+        # client certificate authority root path
+        client_certificate_authority_root_path = "config/tls/private/client_ca.pem"
 [execution]
     # max number of generated events kept in RAM
     max_final_events = 10000
diff --git a/massa-node/src/main.rs b/massa-node/src/main.rs
index 6c4ebf8e099..7a066015fcf 100644
--- a/massa-node/src/main.rs
+++ b/massa-node/src/main.rs
@@ -36,7 +36,7 @@ use massa_factory_exports::{FactoryChannels, FactoryConfig, FactoryManager};
 use massa_factory_worker::start_factory;
 use massa_final_state::{FinalState, FinalStateConfig};
 use massa_grpc::config::GrpcConfig;
-use massa_grpc::server::MassaGrpc;
+use massa_grpc::server::{MassaPrivateGrpc, MassaPublicGrpc};
 use massa_ledger_exports::LedgerConfig;
 use massa_ledger_worker::FinalLedger;
 use massa_logging::massa_trace;
@@ -82,13 +82,16 @@ use massa_pos_exports::{PoSConfig, SelectorConfig, SelectorManager};
 use massa_pos_worker::start_selector_worker;
 use massa_protocol_exports::{ProtocolConfig, ProtocolManager, TransportType};
 use massa_protocol_worker::{create_protocol_controller, start_protocol_controller};
+use massa_signature::KeyPair;
 use massa_storage::Storage;
 use massa_time::MassaTime;
+use massa_versioning::keypair_factory::KeyPairFactory;
 use massa_versioning::mips::get_mip_list;
 use massa_versioning::versioning::{MipStatsConfig, MipStore};
 use massa_wallet::Wallet;
 use num::rational::Ratio;
 use parking_lot::RwLock;
+use settings::GrpcSettings;
 use std::collections::HashMap;
 use std::path::PathBuf;
 use std::sync::atomic::{AtomicUsize, Ordering};
@@ -121,6 +124,7 @@ async fn launch(
     StopHandle,
     StopHandle,
     Option<massa_grpc::server::StopHandle>,
+    Option<massa_grpc::server::StopHandle>,
     MetricsStopper,
 ) {
     info!("Node version : {}", *VERSION);
@@ -745,6 +749,7 @@ async fn launch(
                     format!("Could not bind to address: {}", addr).as_str()
                 )
             });
+
         start_bootstrap_server(
             listener,
             listener_stopper,
@@ -784,7 +789,7 @@ async fn launch(
         max_function_name_length: MAX_FUNCTION_NAME_LENGTH,
         max_parameter_size: MAX_PARAMETERS_SIZE,
         thread_count: THREAD_COUNT,
-        keypair,
+        keypair: keypair.clone(),
         genesis_timestamp: *GENESIS_TIMESTAMP,
         t0: T0,
         periods_per_cycle: PERIODS_PER_CYCLE,
@@ -814,98 +819,77 @@ async fn launch(
     let mut api_config = api_config.clone();
     api_config.enable_ws = false;
 
-    // Whether to spawn gRPC API
-    let grpc_handle = if SETTINGS.grpc.enabled {
-        let grpc_config = GrpcConfig {
-            enabled: SETTINGS.grpc.enabled,
-            accept_http1: SETTINGS.grpc.accept_http1,
-            enable_cors: SETTINGS.grpc.enable_cors,
-            enable_health: SETTINGS.grpc.enable_health,
-            enable_reflection: SETTINGS.grpc.enable_reflection,
-            enable_mtls: SETTINGS.grpc.enable_mtls,
-            bind: SETTINGS.grpc.bind,
-            accept_compressed: SETTINGS.grpc.accept_compressed.clone(),
-            send_compressed: SETTINGS.grpc.send_compressed.clone(),
-            max_decoding_message_size: SETTINGS.grpc.max_decoding_message_size,
-            max_encoding_message_size: SETTINGS.grpc.max_encoding_message_size,
-            concurrency_limit_per_connection: SETTINGS.grpc.concurrency_limit_per_connection,
-            timeout: SETTINGS.grpc.timeout.to_duration(),
-            initial_stream_window_size: SETTINGS.grpc.initial_stream_window_size,
-            initial_connection_window_size: SETTINGS.grpc.initial_connection_window_size,
-            max_concurrent_streams: SETTINGS.grpc.max_concurrent_streams,
-            tcp_keepalive: SETTINGS.grpc.tcp_keepalive.map(|t| t.to_duration()),
-            tcp_nodelay: SETTINGS.grpc.tcp_nodelay,
-            http2_keepalive_interval: SETTINGS
-                .grpc
-                .http2_keepalive_interval
-                .map(|t| t.to_duration()),
-            http2_keepalive_timeout: SETTINGS
-                .grpc
-                .http2_keepalive_timeout
-                .map(|t| t.to_duration()),
-            http2_adaptive_window: SETTINGS.grpc.http2_adaptive_window,
-            max_frame_size: SETTINGS.grpc.max_frame_size,
-            thread_count: THREAD_COUNT,
-            max_operations_per_block: MAX_OPERATIONS_PER_BLOCK,
-            endorsement_count: ENDORSEMENT_COUNT,
-            max_endorsements_per_message: MAX_ENDORSEMENTS_PER_MESSAGE,
-            max_datastore_value_length: MAX_DATASTORE_VALUE_LENGTH,
-            max_op_datastore_entry_count: MAX_OPERATION_DATASTORE_ENTRY_COUNT,
-            max_op_datastore_key_length: MAX_OPERATION_DATASTORE_KEY_LENGTH,
-            max_op_datastore_value_length: MAX_OPERATION_DATASTORE_VALUE_LENGTH,
-            max_function_name_length: MAX_FUNCTION_NAME_LENGTH,
-            max_parameter_size: MAX_PARAMETERS_SIZE,
-            max_operations_per_message: MAX_OPERATIONS_PER_MESSAGE,
-            genesis_timestamp: *GENESIS_TIMESTAMP,
-            t0: T0,
-            periods_per_cycle: PERIODS_PER_CYCLE,
-            max_channel_size: SETTINGS.grpc.max_channel_size,
-            draw_lookahead_period_count: SETTINGS.grpc.draw_lookahead_period_count,
-            last_start_period: final_state.read().last_start_period,
-            max_denunciations_per_block_header: MAX_DENUNCIATIONS_PER_BLOCK_HEADER,
-            max_block_ids_per_request: SETTINGS.grpc.max_block_ids_per_request,
-            max_operation_ids_per_request: SETTINGS.grpc.max_operation_ids_per_request,
-            server_certificate_path: SETTINGS.grpc.server_certificate_path.clone(),
-            server_private_key_path: SETTINGS.grpc.server_private_key_path.clone(),
-            client_certificate_authority_root_path: SETTINGS
-                .grpc
-                .client_certificate_authority_root_path
-                .clone(),
-        };
+    // Whether to spawn gRPC PUBLIC API
+    let grpc_public_handle = if SETTINGS.grpc.public.enabled {
+        let grpc_public_config =
+            configure_grpc(&SETTINGS.grpc.public, keypair.clone(), &final_state);
 
-        let grpc_api = MassaGrpc {
+        let grpc_public_api = MassaPublicGrpc {
             consensus_controller: consensus_controller.clone(),
             consensus_channels: consensus_channels.clone(),
             execution_controller: execution_controller.clone(),
             execution_channels,
             pool_channels,
-            pool_command_sender: pool_controller.clone(),
-            protocol_command_sender: protocol_controller.clone(),
+            pool_controller: pool_controller.clone(),
+            protocol_controller: protocol_controller.clone(),
             selector_controller: selector_controller.clone(),
             storage: shared_storage.clone(),
-            grpc_config: grpc_config.clone(),
+            grpc_config: grpc_public_config.clone(),
+            protocol_config: protocol_config.clone(),
+            node_id,
             version: *VERSION,
+            keypair_factory: KeyPairFactory {
+                mip_store: mip_store.clone(),
+            },
+        };
+
+        // Spawn gRPC PUBLIC API
+        let grpc_public_stop_handle = grpc_public_api
+            .serve(&grpc_public_config)
+            .await
+            .expect("failed to start gRPC PUBLIC API");
+        info!("gRPC | PUBLIC | listening on: {}", grpc_public_config.bind);
+
+        Some(grpc_public_stop_handle)
+    } else {
+        None
+    };
+
+    // Whether to spawn gRPC PRIVATE API
+    let grpc_private_handle = if SETTINGS.grpc.private.enabled {
+        let grpc_private_config =
+            configure_grpc(&SETTINGS.grpc.private, keypair.clone(), &final_state);
+
+        let bs_white_black_list = bootstrap_manager
+            .as_ref()
+            .map(|manager| manager.white_black_list.clone());
+
+        let grpc_private_api = MassaPrivateGrpc {
+            consensus_controller: consensus_controller.clone(),
+            execution_controller: execution_controller.clone(),
+            pool_controller: pool_controller.clone(),
+            protocol_controller: protocol_controller.clone(),
+            grpc_config: grpc_private_config.clone(),
+            protocol_config: protocol_config.clone(),
+            node_id,
             mip_store: mip_store.clone(),
+            version: *VERSION,
+            stop_cv: sig_int_toggled.clone(),
+            node_wallet: node_wallet.clone(),
+            bs_white_black_list,
         };
 
-        // HACK maybe should remove timeout later
-        if let Ok(result) =
-            tokio::time::timeout(Duration::from_secs(3), grpc_api.serve(&grpc_config)).await
-        {
-            match result {
-                Ok(stop) => {
-                    info!("API | gRPC | listening on: {}", grpc_config.bind);
-                    Some(stop)
-                }
-                Err(e) => {
-                    error!("{}", e);
-                    None
-                }
-            }
-        } else {
-            error!("Timeout on start grpc API");
-            None
-        }
+        // Spawn gRPC PRIVATE API
+        let grpc_private_stop_handle = grpc_private_api
+            .serve(&grpc_private_config)
+            .await
+            .expect("failed to start gRPC PRIVATE API");
+        info!(
+            "gRPC | PRIVATE | listening on: {}",
+            grpc_private_config.bind
+        );
+
+        Some(grpc_private_stop_handle)
     } else {
         None
     };
@@ -1001,11 +985,72 @@ async fn launch(
         api_private_handle,
         api_public_handle,
         api_handle,
-        grpc_handle,
+        grpc_private_handle,
+        grpc_public_handle,
         metrics_stopper,
     )
 }
 
+// Get the configuration of the gRPC server
+fn configure_grpc(
+    settings: &GrpcSettings,
+    keypair: KeyPair,
+    final_state: &Arc<RwLock<FinalState>>,
+) -> GrpcConfig {
+    GrpcConfig {
+        enabled: settings.enabled,
+        accept_http1: settings.accept_http1,
+        enable_cors: settings.enable_cors,
+        enable_health: settings.enable_health,
+        enable_reflection: settings.enable_reflection,
+        enable_tls: settings.enable_tls,
+        enable_mtls: settings.enable_mtls,
+        bind: settings.bind,
+        accept_compressed: settings.accept_compressed.clone(),
+        send_compressed: settings.send_compressed.clone(),
+        max_decoding_message_size: settings.max_decoding_message_size,
+        max_encoding_message_size: settings.max_encoding_message_size,
+        concurrency_limit_per_connection: settings.concurrency_limit_per_connection,
+        timeout: settings.timeout.to_duration(),
+        initial_stream_window_size: settings.initial_stream_window_size,
+        initial_connection_window_size: settings.initial_connection_window_size,
+        max_concurrent_streams: settings.max_concurrent_streams,
+        max_arguments: settings.max_arguments,
+        tcp_keepalive: settings.tcp_keepalive.map(|t| t.to_duration()),
+        tcp_nodelay: settings.tcp_nodelay,
+        http2_keepalive_interval: settings.http2_keepalive_interval.map(|t| t.to_duration()),
+        http2_keepalive_timeout: settings.http2_keepalive_timeout.map(|t| t.to_duration()),
+        http2_adaptive_window: settings.http2_adaptive_window,
+        max_frame_size: settings.max_frame_size,
+        thread_count: THREAD_COUNT,
+        max_operations_per_block: MAX_OPERATIONS_PER_BLOCK,
+        endorsement_count: ENDORSEMENT_COUNT,
+        max_endorsements_per_message: MAX_ENDORSEMENTS_PER_MESSAGE,
+        max_datastore_value_length: MAX_DATASTORE_VALUE_LENGTH,
+        max_op_datastore_entry_count: MAX_OPERATION_DATASTORE_ENTRY_COUNT,
+        max_op_datastore_key_length: MAX_OPERATION_DATASTORE_KEY_LENGTH,
+        max_op_datastore_value_length: MAX_OPERATION_DATASTORE_VALUE_LENGTH,
+        max_function_name_length: MAX_FUNCTION_NAME_LENGTH,
+        max_parameter_size: MAX_PARAMETERS_SIZE,
+        max_operations_per_message: MAX_OPERATIONS_PER_MESSAGE,
+        genesis_timestamp: *GENESIS_TIMESTAMP,
+        t0: T0,
+        periods_per_cycle: PERIODS_PER_CYCLE,
+        keypair,
+        max_channel_size: settings.max_channel_size,
+        draw_lookahead_period_count: settings.draw_lookahead_period_count,
+        last_start_period: final_state.read().last_start_period,
+        max_denunciations_per_block_header: MAX_DENUNCIATIONS_PER_BLOCK_HEADER,
+        max_block_ids_per_request: settings.max_block_ids_per_request,
+        max_operation_ids_per_request: settings.max_operation_ids_per_request,
+        server_certificate_path: settings.server_certificate_path.clone(),
+        server_private_key_path: settings.server_private_key_path.clone(),
+        client_certificate_authority_root_path: settings
+            .client_certificate_authority_root_path
+            .clone(),
+    }
+}
+
 struct Managers {
     bootstrap_manager: Option<BootstrapManager>,
     consensus_manager: Box<dyn ConsensusManager>,
@@ -1016,6 +1061,7 @@ struct Managers {
     factory_manager: Box<dyn FactoryManager>,
 }
 
+#[allow(clippy::too_many_arguments)]
 async fn stop(
     _consensus_event_receiver: MassaReceiver<ConsensusEvent>,
     Managers {
@@ -1030,7 +1076,8 @@ async fn stop(
     api_private_handle: StopHandle,
     api_public_handle: StopHandle,
     api_handle: StopHandle,
-    grpc_handle: Option<massa_grpc::server::StopHandle>,
+    grpc_private_handle: Option<massa_grpc::server::StopHandle>,
+    grpc_public_handle: Option<massa_grpc::server::StopHandle>,
     mut metrics_stopper: MetricsStopper,
 ) {
     // stop bootstrap
@@ -1040,12 +1087,19 @@ async fn stop(
             .expect("bootstrap server shutdown failed")
     }
 
-    info!("Start stopping API's: gRPC, EXPERIMENTAL, PUBLIC, PRIVATE");
+    info!("Start stopping API's: gRPC(PUBLIC, PRIVATE), EXPERIMENTAL, PUBLIC, PRIVATE");
+
+    // stop Massa gRPC PUBLIC API
+    if let Some(handle) = grpc_public_handle {
+        handle.stop();
+    }
+    info!("API | PUBLIC gRPC | stopped");
 
-    // stop Massa gRPC API
-    if let Some(handle) = grpc_handle {
+    // stop Massa gRPC PRIVATE API
+    if let Some(handle) = grpc_private_handle {
         handle.stop();
     }
+    info!("API | PRIVATE gRPC | stopped");
 
     // stop Massa API
     api_handle.stop().await;
@@ -1226,7 +1280,8 @@ async fn run(args: Args) -> anyhow::Result<()> {
             api_private_handle,
             api_public_handle,
             api_handle,
-            grpc_handle,
+            grpc_private_handle,
+            grpc_public_handle,
             metrics_stopper,
         ) = launch(&cur_args, node_wallet.clone(), Arc::clone(&sig_int_toggled)).await;
 
@@ -1291,7 +1346,8 @@ async fn run(args: Args) -> anyhow::Result<()> {
             api_private_handle,
             api_public_handle,
             api_handle,
-            grpc_handle,
+            grpc_private_handle,
+            grpc_public_handle,
             metrics_stopper,
         )
         .await;
diff --git a/massa-node/src/settings.rs b/massa-node/src/settings.rs
index 7b0364613da..20d57c96acd 100644
--- a/massa-node/src/settings.rs
+++ b/massa-node/src/settings.rs
@@ -136,7 +136,7 @@ pub struct Settings {
     pub ledger: LedgerSettings,
     pub selector: SelectionSettings,
     pub factory: FactorySettings,
-    pub grpc: GrpcSettings,
+    pub grpc: GrpcApiSettings,
     pub metrics: MetricsSettings,
     pub versioning: VersioningSettings,
 }
@@ -269,7 +269,9 @@ pub struct GrpcSettings {
     pub enable_health: bool,
     /// whether to enable gRPC reflection
     pub enable_reflection: bool,
-    /// whether to enable mTLS
+    /// whether to enable TLS
+    pub enable_tls: bool,
+    /// whether to enable mTLS (requires `enable_tls` to be true)
     pub enable_mtls: bool,
     /// bind for the Massa gRPC API
     pub bind: SocketAddr,
@@ -293,6 +295,8 @@ pub struct GrpcSettings {
     pub initial_connection_window_size: Option<u32>,
     /// sets the SETTINGS_MAX_CONCURRENT_STREAMS spec option for HTTP2 connections. Default is no limit (`None`)
     pub max_concurrent_streams: Option<u32>,
+    /// max number of arguments per gRPC request
+    pub max_arguments: u64,
     /// set whether TCP keepalive messages are enabled on accepted connections
     pub tcp_keepalive: Option<MassaTime>,
     /// set the value of `TCP_NODELAY` option for accepted connections. Enabled by default
@@ -319,6 +323,15 @@ pub struct GrpcSettings {
     pub client_certificate_authority_root_path: PathBuf,
 }
 
+/// gRPC API settings.
+#[derive(Debug, Deserialize, Clone)]
+pub struct GrpcApiSettings {
+    /// Public server gRPC configuration.
+    pub public: GrpcSettings,
+    /// Private server gRPC configuration.
+    pub private: GrpcSettings,
+}
+
 #[derive(Debug, Deserialize, Clone)]
 pub struct VersioningSettings {
     // Warn user to update its node if we reach this percentage for announced network versions
diff --git a/massa-pool-worker/src/operation_pool.rs b/massa-pool-worker/src/operation_pool.rs
index 145781871ca..924dea321d3 100644
--- a/massa-pool-worker/src/operation_pool.rs
+++ b/massa-pool-worker/src/operation_pool.rs
@@ -14,7 +14,7 @@ use massa_time::MassaTime;
 use massa_wallet::Wallet;
 use parking_lot::RwLock;
 use std::{cmp::max, cmp::Ordering, cmp::PartialOrd, collections::BTreeSet, sync::Arc};
-use tracing::{debug, warn};
+use tracing::{debug, trace, warn};
 
 use crate::types::OperationInfo;
 
@@ -84,18 +84,25 @@ impl OperationPool {
         let max_slot = max(max_slot, min_slot);
 
         // search for all our PoS draws in the interval of interest
-        let mut pos_draws = BTreeSet::new();
-        let addrs = self.wallet.read().keys.keys().copied().collect::<Vec<_>>();
-        for addr in addrs {
-            let (d, _) = self
-                .channels
-                .selector
-                .get_address_selections(&addr, min_slot, max_slot)
-                .expect("could not get PoS draws");
-            pos_draws.extend(d.into_iter());
-        }
+        let addrs: PreHashSet<Address> = self.wallet.read().keys.keys().copied().collect();
+        let mut pos_draws: BTreeSet<Slot> = self
+            .channels
+            .selector
+            .get_available_selections_in_range(min_slot..=max_slot, Some(&addrs))
+            .expect("could not get PoS draws")
+            .into_iter()
+            .filter_map(|(v_slot, v_sel)| {
+                if addrs.contains(&v_sel.producer) {
+                    Some(v_slot)
+                } else {
+                    None
+                }
+            })
+            .collect();
+
         // retain only the ones that are strictly after the last final slot of their thread
         pos_draws.retain(|s| s.period > self.last_cs_final_periods[s.thread as usize]);
+
         pos_draws
     }
 
@@ -411,6 +418,14 @@ impl OperationPool {
                 let op = ops
                     .get(new_op_id)
                     .expect("operation not found in storage but listed as owned");
+
+                // Broadcast operations to active channel subscribers.
+                if self.config.broadcast_enabled {
+                    if let Err(err) = self.channels.operation_sender.send(op.clone()) {
+                        trace!("error, failed to broadcast operations {}: {}", op.id, err);
+                    }
+                }
+
                 self.sorted_ops.push(OperationInfo::from_op(
                     op,
                     self.config.operation_validity_periods,
diff --git a/massa-pool-worker/src/tests/operation_pool_tests.rs b/massa-pool-worker/src/tests/operation_pool_tests.rs
index fbeb20b0a46..443b4457c1a 100644
--- a/massa-pool-worker/src/tests/operation_pool_tests.rs
+++ b/massa-pool-worker/src/tests/operation_pool_tests.rs
@@ -21,10 +21,10 @@ use crate::tests::tools::OpGenerator;
 
 use super::tools::{create_some_operations, operation_pool_test, PoolTestBoilerPlate};
 use massa_execution_exports::MockExecutionController;
-use massa_models::{amount::Amount, operation::OperationId, slot::Slot};
+use massa_models::{amount::Amount, config::ENDORSEMENT_COUNT, operation::OperationId, slot::Slot};
 use massa_pool_exports::PoolConfig;
-use massa_pos_exports::MockSelectorController;
-use std::time::Duration;
+use massa_pos_exports::{MockSelectorController, Selection};
+use std::{collections::BTreeMap, time::Duration};
 
 #[test]
 fn test_add_operation() {
@@ -57,15 +57,31 @@ fn test_add_operation() {
         res.expect_clone_box().times(2).returning(|| {
             //TODO: Add sequence
             let mut story = MockSelectorController::new();
-            story.expect_get_address_selections().returning(|_, _, _| {
-                let mut all_slots = Vec::new();
-                for i in 0..15 {
-                    for j in 0..32 {
-                        all_slots.push(Slot::new(i, j));
+            story
+                .expect_get_available_selections_in_range()
+                .returning(|slot_range, opt_addrs| {
+                    let mut all_slots = BTreeMap::new();
+                    let addr = *opt_addrs
+                        .expect("No addresses filter given")
+                        .into_iter()
+                        .next()
+                        .expect("No addresses given");
+                    for i in 0..15 {
+                        for j in 0..32 {
+                            let s = Slot::new(i, j);
+                            if slot_range.contains(&s) {
+                                all_slots.insert(
+                                    s,
+                                    Selection {
+                                        producer: addr,
+                                        endorsements: vec![addr; ENDORSEMENT_COUNT as usize],
+                                    },
+                                );
+                            }
+                        }
                     }
-                }
-                Ok((all_slots.clone(), vec![]))
-            });
+                    Ok(all_slots)
+                });
             Box::new(story)
         });
         res
@@ -120,15 +136,31 @@ fn test_add_irrelevant_operation() {
         res.expect_clone_box().times(2).returning(|| {
             //TODO: Add sequence
             let mut story = MockSelectorController::new();
-            story.expect_get_address_selections().returning(|_, _, _| {
-                let mut all_slots = Vec::new();
-                for i in 0..15 {
-                    for j in 0..32 {
-                        all_slots.push(Slot::new(i, j));
+            story
+                .expect_get_available_selections_in_range()
+                .returning(|slot_range, opt_addrs| {
+                    let mut all_slots = BTreeMap::new();
+                    let addr = *opt_addrs
+                        .expect("No addresses filter given")
+                        .into_iter()
+                        .next()
+                        .expect("No addresses given");
+                    for i in 0..15 {
+                        for j in 0..32 {
+                            let s = Slot::new(i, j);
+                            if slot_range.contains(&s) {
+                                all_slots.insert(
+                                    s,
+                                    Selection {
+                                        producer: addr,
+                                        endorsements: vec![addr; ENDORSEMENT_COUNT as usize],
+                                    },
+                                );
+                            }
+                        }
                     }
-                }
-                Ok((all_slots.clone(), vec![]))
-            });
+                    Ok(all_slots)
+                });
             Box::new(story)
         });
         res
@@ -184,20 +216,35 @@ fn test_pool() {
         res.expect_clone_box().times(2).returning(|| {
             //TODO: Add sequence
             let mut story = MockSelectorController::new();
-            story.expect_get_address_selections().returning(|_, _, _| {
-                let mut all_slots = Vec::new();
-                for i in 0..15 {
-                    for j in 0..32 {
-                        all_slots.push(Slot::new(i, j));
+            story
+                .expect_get_available_selections_in_range()
+                .returning(|slot_range, opt_addrs| {
+                    let mut all_slots = BTreeMap::new();
+                    let addr = *opt_addrs
+                        .expect("No addresses filter given")
+                        .into_iter()
+                        .next()
+                        .expect("No addresses given");
+                    for i in 0..15 {
+                        for j in 0..32 {
+                            let s = Slot::new(i, j);
+                            if slot_range.contains(&s) {
+                                all_slots.insert(
+                                    s,
+                                    Selection {
+                                        producer: addr,
+                                        endorsements: vec![addr; ENDORSEMENT_COUNT as usize],
+                                    },
+                                );
+                            }
+                        }
                     }
-                }
-                Ok((all_slots.clone(), vec![]))
-            });
+                    Ok(all_slots)
+                });
             Box::new(story)
         });
         res
     };
-
     let PoolTestBoilerPlate {
         mut pool_manager,
         mut pool_controller,
diff --git a/massa-pool-worker/src/tests/scenario.rs b/massa-pool-worker/src/tests/scenario.rs
index 5982043348c..713053df48c 100644
--- a/massa-pool-worker/src/tests/scenario.rs
+++ b/massa-pool-worker/src/tests/scenario.rs
@@ -12,6 +12,7 @@
 //! Same as the previous test with a low limit of size to check if
 //! configurations are taken into account.
 
+use std::collections::BTreeMap;
 use std::time::Duration;
 
 use crate::tests::tools::create_some_operations;
@@ -19,11 +20,13 @@ use crate::tests::tools::OpGenerator;
 use massa_execution_exports::MockExecutionController;
 use massa_models::address::Address;
 use massa_models::amount::Amount;
+use massa_models::config::ENDORSEMENT_COUNT;
 use massa_models::operation::OperationId;
 use massa_models::prehash::PreHashSet;
 use massa_models::slot::Slot;
 use massa_pool_exports::PoolConfig;
 use massa_pos_exports::MockSelectorController;
+use massa_pos_exports::Selection;
 use massa_signature::KeyPair;
 
 use super::tools::PoolTestBoilerPlate;
@@ -63,27 +66,40 @@ fn test_simple_get_operations() {
     });
 
     // Provide the selector boilderplate
-    let mut selector_controller = {
+    let selector_controller = {
         let mut res = Box::new(MockSelectorController::new());
         res.expect_clone_box().times(2).returning(|| {
             //TODO: Add sequence
             let mut story = MockSelectorController::new();
-            story.expect_get_address_selections().returning(|_, _, _| {
-                let mut all_slots = Vec::new();
-                for i in 0..15 {
-                    for j in 0..32 {
-                        all_slots.push(Slot::new(i, j));
+            story
+                .expect_get_available_selections_in_range()
+                .returning(|slot_range, opt_addrs| {
+                    let mut all_slots = BTreeMap::new();
+                    let addr = *opt_addrs
+                        .expect("No addresses filter given")
+                        .into_iter()
+                        .next()
+                        .expect("No addresses given");
+                    for i in 0..15 {
+                        for j in 0..32 {
+                            let s = Slot::new(i, j);
+                            if slot_range.contains(&s) {
+                                all_slots.insert(
+                                    s,
+                                    Selection {
+                                        producer: addr,
+                                        endorsements: vec![addr; ENDORSEMENT_COUNT as usize],
+                                    },
+                                );
+                            }
+                        }
                     }
-                }
-                Ok((all_slots.clone(), vec![]))
-            });
+                    Ok(all_slots)
+                });
             Box::new(story)
         });
         res
     };
-    selector_controller
-        .expect_clone_box()
-        .returning(|| Box::new(MockSelectorController::new()));
 
     // Setup the pool controller
     let config = PoolConfig::default();
@@ -188,15 +204,31 @@ fn test_get_operations_overflow() {
         res.expect_clone_box().times(2).returning(|| {
             //TODO: Add sequence
             let mut story = MockSelectorController::new();
-            story.expect_get_address_selections().returning(|_, _, _| {
-                let mut all_slots = Vec::new();
-                for i in 0..15 {
-                    for j in 0..32 {
-                        all_slots.push(Slot::new(i, j));
+            story
+                .expect_get_available_selections_in_range()
+                .returning(|slot_range, opt_addrs| {
+                    let mut all_slots = BTreeMap::new();
+                    let addr = *opt_addrs
+                        .expect("No addresses filter given")
+                        .into_iter()
+                        .next()
+                        .expect("No addresses given");
+                    for i in 0..15 {
+                        for j in 0..32 {
+                            let s = Slot::new(i, j);
+                            if slot_range.contains(&s) {
+                                all_slots.insert(
+                                    s,
+                                    Selection {
+                                        producer: addr,
+                                        endorsements: vec![addr; ENDORSEMENT_COUNT as usize],
+                                    },
+                                );
+                            }
+                        }
                     }
-                }
-                Ok((all_slots.clone(), vec![]))
-            });
+                    Ok(all_slots)
+                });
             Box::new(story)
         });
         res
diff --git a/massa-pos-exports/src/controller_traits.rs b/massa-pos-exports/src/controller_traits.rs
index d002fc66e44..a6dfd129a72 100644
--- a/massa-pos-exports/src/controller_traits.rs
+++ b/massa-pos-exports/src/controller_traits.rs
@@ -7,10 +7,7 @@ use std::collections::BTreeMap;
 
 use crate::PosResult;
 use massa_hash::Hash;
-use massa_models::{
-    address::Address,
-    slot::{IndexedSlot, Slot},
-};
+use massa_models::{address::Address, prehash::PreHashSet, slot::Slot};
 
 #[cfg(feature = "testing")]
 use std::collections::{HashMap, VecDeque};
@@ -45,26 +42,23 @@ pub trait SelectorController: Send + Sync {
         lookback_seed: Hash,
     ) -> PosResult<()>;
 
-    /// Get [Selection] computed for a slot:
-    /// # Arguments
-    /// * `slot`: target slot of the selection
+    /// Get [Selection] computed for a slot
     fn get_selection(&self, slot: Slot) -> PosResult<Selection>;
 
-    /// Return a list of slots where `address` has been chosen to produce a
-    /// block and a list where he is chosen for the endorsements.
-    /// Look from the `start` slot to the `end` slot.
-    fn get_address_selections(
-        &self,
-        address: &Address,
-        start: Slot,
-        end: Slot,
-    ) -> PosResult<(Vec<Slot>, Vec<IndexedSlot>)>;
-
     /// Get [Address] of the selected block producer for a given slot
-    /// # Arguments
-    /// * `slot`: target slot of the selection
     fn get_producer(&self, slot: Slot) -> PosResult<Address>;
 
+    /// Get selections computed for a slot range (only returns available selections):
+    /// # Arguments
+    /// * `slot_range`: range of slots to get the selection for
+    /// * `restrict_to_addresses`: optionally restrict only to slots involving a given address
+    #[allow(clippy::needless_lifetimes)] // lifetime elision conflicts with Mockall
+    fn get_available_selections_in_range<'a>(
+        &self,
+        slot_range: std::ops::RangeInclusive<Slot>,
+        restrict_to_addresses: Option<&'a PreHashSet<Address>>,
+    ) -> PosResult<BTreeMap<Slot, Selection>>;
+
     /// Returns a boxed clone of self.
     /// Useful to allow cloning `Box<dyn SelectorController>`.
     fn clone_box(&self) -> Box<dyn SelectorController>;
diff --git a/massa-pos-exports/src/test_exports/mock.rs b/massa-pos-exports/src/test_exports/mock.rs
index 88b88cde2c5..c7b0a342ad4 100644
--- a/massa-pos-exports/src/test_exports/mock.rs
+++ b/massa-pos-exports/src/test_exports/mock.rs
@@ -8,10 +8,7 @@ use std::{
 };
 
 use massa_hash::Hash;
-use massa_models::{
-    address::Address,
-    slot::{IndexedSlot, Slot},
-};
+use massa_models::{address::Address, prehash::PreHashSet, slot::Slot};
 
 use crate::{PosResult, Selection, SelectorController};
 
@@ -30,14 +27,12 @@ pub enum MockSelectorControllerMessage {
     /// Get a list of slots where address has been chosen to produce a block and a list where he is chosen for the endorsements.
     /// Look from the start slot to the end slot.
     GetAddressSelections {
-        /// Address to search
-        address: Address,
-        /// Start of the search range
-        start: Slot,
-        /// End of the search range
-        end: Slot,
+        /// Slot range to consider
+        slot_range: std::ops::RangeInclusive<Slot>,
+        /// Optionally restrict to a list of addresses
+        restrict_to_addresses: Option<PreHashSet<Address>>,
         /// Receiver to send the result to
-        response_tx: Sender<PosResult<(Vec<Slot>, Vec<IndexedSlot>)>>,
+        response_tx: Sender<PosResult<BTreeMap<Slot, Selection>>>,
     },
     /// Get the entire selection of PoS. used for testing only
     GetEntireSelection {
@@ -130,19 +125,18 @@ impl SelectorController for MockSelectorController {
         response_rx.recv().unwrap()
     }
 
-    fn get_address_selections(
+    #[allow(clippy::needless_lifetimes)] // lifetime elision conflicts with Mockall
+    fn get_available_selections_in_range<'a>(
         &self,
-        address: &Address,
-        start: Slot,
-        end: Slot,
-    ) -> PosResult<(Vec<Slot>, Vec<IndexedSlot>)> {
+        slot_range: std::ops::RangeInclusive<Slot>,
+        restrict_to_addresses: Option<&'a PreHashSet<Address>>,
+    ) -> PosResult<BTreeMap<Slot, Selection>> {
         let (response_tx, response_rx) = crossbeam_channel::unbounded();
         self.0
             .lock()
             .send(MockSelectorControllerMessage::GetAddressSelections {
-                address: *address,
-                start,
-                end,
+                slot_range,
+                restrict_to_addresses: restrict_to_addresses.cloned(),
                 response_tx,
             })
             .unwrap();
diff --git a/massa-pos-worker/src/controller.rs b/massa-pos-worker/src/controller.rs
index 865ba03d13f..658c8eefe4a 100644
--- a/massa-pos-worker/src/controller.rs
+++ b/massa-pos-worker/src/controller.rs
@@ -7,10 +7,7 @@ use std::collections::BTreeMap;
 
 use crate::{Command, DrawCachePtr};
 use massa_hash::Hash;
-use massa_models::{
-    address::Address,
-    slot::{IndexedSlot, Slot},
-};
+use massa_models::{address::Address, prehash::PreHashSet, slot::Slot};
 use massa_pos_exports::{PosError, PosResult, Selection, SelectorController, SelectorManager};
 #[cfg(feature = "testing")]
 use std::collections::{HashMap, VecDeque};
@@ -108,52 +105,83 @@ impl SelectorController for SelectorControllerImpl {
     }
 
     /// Get [Address] of the selected block producer for a given slot
-    /// # Arguments
-    /// * `slot`: target slot of the selection
     fn get_producer(&self, slot: Slot) -> PosResult<Address> {
-        let cycle = slot.get_cycle(self.periods_per_cycle);
-        let (_cache_cv, cache_lock) = &*self.cache;
-        let cache_guard = cache_lock.read();
-        let cache = cache_guard.as_ref().map_err(|err| err.clone())?;
-
-        cache
-            .get(cycle)
-            .and_then(|selections| selections.draws.get(&slot).map(|s| s.producer))
-            .ok_or(PosError::CycleUnavailable(cycle))
+        self.get_selection(slot).map(|selection| selection.producer)
     }
 
-    /// Return a list of slots where `address` has been chosen to produce a
-    /// block and a list where he is chosen for the endorsements.
-    /// Look from the `start` slot to the `end` slot.
-    fn get_address_selections(
+    /// Get selections computed for a slot range (only lists available selections):
+    /// # Arguments
+    /// * `slot_range`: target slot of the selection (from included, to included)
+    /// * `restrict_to_addresses`: optionally restrict only to slots involving a given address
+    #[allow(clippy::needless_lifetimes)] // lifetime elision conflicts with Mockall
+    fn get_available_selections_in_range<'a>(
         &self,
-        address: &Address,
-        mut slot: Slot, /* starting slot */
-        end: Slot,
-    ) -> PosResult<(Vec<Slot>, Vec<IndexedSlot>)> {
+        slot_range: std::ops::RangeInclusive<Slot>,
+        restrict_to_addresses: Option<&'a PreHashSet<Address>>,
+    ) -> PosResult<BTreeMap<Slot, Selection>> {
+        // get range bounds, reject empty case
+        if slot_range.is_empty() {
+            return Ok(BTreeMap::new());
+        }
+        if let Some(r) = &restrict_to_addresses && r.is_empty() {
+            return Ok(BTreeMap::new());
+        }
+        // take lock
         let (_cache_cv, cache_lock) = &*self.cache;
         let cache_guard = cache_lock.read();
         let cache = cache_guard.as_ref().map_err(|err| err.clone())?;
-        let mut slot_producers = vec![];
-        let mut slot_endorsers = vec![];
-        while slot < end {
-            if let Some(selection) = cache
-                .get(slot.get_cycle(self.periods_per_cycle))
+
+        // check if the requested cycles are available
+        let slot_begin;
+        let slot_end_included;
+        {
+            let available_cycles = match cache.get_available_cycles_range() {
+                Some(c) => c,
+                None => return Ok(BTreeMap::new()),
+            };
+            slot_begin = std::cmp::max(
+                *slot_range.start(),
+                Slot::new_first_of_cycle(*available_cycles.start(), self.periods_per_cycle)
+                    .expect("could not get first slot of available cycle"),
+            );
+            slot_end_included = std::cmp::min(
+                *slot_range.end(),
+                Slot::new_last_of_cycle(
+                    *available_cycles.end(),
+                    self.periods_per_cycle,
+                    self.thread_count,
+                )
+                .expect("could not get last slot of available cycle"),
+            );
+        }
+
+        // get the selections
+        let mut res = BTreeMap::new();
+        let mut slot = slot_begin;
+        while slot <= slot_end_included {
+            let cycle = slot.get_cycle(self.periods_per_cycle);
+            let slot_selection = cache
+                .get(cycle)
                 .and_then(|selections| selections.draws.get(&slot))
-            {
-                if selection.producer == *address {
-                    slot_producers.push(slot);
-                } else if let Some(index) = selection.endorsements.iter().position(|e| e == address)
+                .ok_or(PosError::CycleUnavailable(cycle))?;
+            if let Some(restrict_to_addrs) = restrict_to_addresses {
+                if restrict_to_addrs.contains(&slot_selection.producer)
+                    || slot_selection
+                        .endorsements
+                        .iter()
+                        .any(|a| restrict_to_addrs.contains(a))
                 {
-                    slot_endorsers.push(IndexedSlot { slot, index });
+                    res.insert(slot, slot_selection.clone());
                 }
+            } else {
+                res.insert(slot, slot_selection.clone());
             }
             slot = match slot.get_next_slot(self.thread_count) {
-                Ok(next_slot) => next_slot,
-                _ => break,
-            };
+                Ok(s) => s,
+                Err(_) => break,
+            }
         }
-        Ok((slot_producers, slot_endorsers))
+        Ok(res)
     }
 
     /// Returns a boxed clone of self.
diff --git a/massa-pos-worker/src/lib.rs b/massa-pos-worker/src/lib.rs
index 85c4b186c51..e1dd525f6f5 100644
--- a/massa-pos-worker/src/lib.rs
+++ b/massa-pos-worker/src/lib.rs
@@ -1,6 +1,6 @@
 // Copyright (c) 2022 MASSA LABS <info@massa.net>
 
-// Features used for draining cache in selector thread
+#![feature(let_chains)]
 
 mod controller;
 mod draw;
@@ -35,6 +35,21 @@ pub(crate) enum Command {
 pub(crate) struct DrawCache(pub VecDeque<CycleDraws>);
 
 impl DrawCache {
+    /// Get the range of available cycles in the cache.
+    /// Returns None if the cache is empty
+    pub fn get_available_cycles_range(&self) -> Option<std::ops::RangeInclusive<u64>> {
+        match self.0.front() {
+            None => None,
+            Some(cd) => {
+                let upper_bound = cd
+                    .cycle
+                    .checked_add(self.0.len().try_into().expect("overflow on cycles length"))
+                    .expect("overflow on cycle delta");
+                Some(cd.cycle..=upper_bound)
+            }
+        }
+    }
+
     /// get the index of a cycle in the cache
     pub fn get_cycle_index(&self, cycle: u64) -> Option<usize> {
         let first_cycle = match self.0.front() {
diff --git a/massa-sdk/Cargo.toml b/massa-sdk/Cargo.toml
index 6597a23e917..362cc6610f8 100644
--- a/massa-sdk/Cargo.toml
+++ b/massa-sdk/Cargo.toml
@@ -4,9 +4,9 @@ version = "0.24.0"
 edition = "2021"
 
 [dependencies]
-jsonrpsee = { version = "0.18.2", features = ["client"] }
-jsonrpsee-http-client = { version = "0.18.2", features = ["webpki-tls"] }
-jsonrpsee-ws-client = { version = "0.18.2", features = ["webpki-tls"] }
+jsonrpsee = { version = "0.19.0", features = ["client"] }
+jsonrpsee-http-client = { version = "0.19.0", features = ["webpki-tls"] }
+jsonrpsee-ws-client = { version = "0.19.0", features = ["webpki-tls"] }
 http = "0.2.8"
 tonic = { version = "0.9.1", features = ["gzip"] }
 thiserror = "1.0"
@@ -14,4 +14,4 @@ tracing = {version =  "0.1", features = ["log"]}
 massa_api_exports = { path = "../massa-api-exports" }
 massa_models = { path = "../massa-models" }
 massa_time = { path = "../massa-time" }
-massa-proto-rs = { git = "https://github.com/massalabs/massa-proto-rs", rev = "18ec02f", features = ["tonic"] }
+massa-proto-rs = { git = "https://github.com/massalabs/massa-proto-rs", rev = "32179e2", features = ["tonic"] }
diff --git a/massa-sdk/src/lib.rs b/massa-sdk/src/lib.rs
index 15b3f84646c..7180f660934 100644
--- a/massa-sdk/src/lib.rs
+++ b/massa-sdk/src/lib.rs
@@ -42,7 +42,8 @@ use massa_models::{
     prehash::{PreHashMap, PreHashSet},
     version::Version,
 };
-use massa_proto_rs::massa::api::v1::massa_service_client::MassaServiceClient;
+use massa_proto_rs::massa::api::v1::private_service_client::PrivateServiceClient;
+use massa_proto_rs::massa::api::v1::public_service_client::PublicServiceClient;
 use std::net::{IpAddr, SocketAddr};
 use std::str::FromStr;
 use thiserror::Error;
@@ -69,8 +70,10 @@ pub struct Client {
     pub public: RpcClient,
     /// private component
     pub private: RpcClient,
-    /// grpc client
-    pub grpc: Option<MassaServiceClient<tonic::transport::Channel>>,
+    /// grpc public client
+    pub grpc_public: Option<PublicServiceClient<tonic::transport::Channel>>,
+    /// grpc private client
+    pub grpc_private: Option<PrivateServiceClient<tonic::transport::Channel>>,
 }
 
 impl Client {
@@ -79,22 +82,37 @@ impl Client {
         ip: IpAddr,
         public_port: u16,
         private_port: u16,
-        grpc_port: u16,
+        grpc_public_port: u16,
+        grpc_private_port: u16,
         http_config: &HttpConfig,
     ) -> Result<Client, ClientError> {
         let public_socket_addr = SocketAddr::new(ip, public_port);
         let private_socket_addr = SocketAddr::new(ip, private_port);
-        let grpc_socket_addr = SocketAddr::new(ip, grpc_port);
+        let grpc_public_socket_addr = SocketAddr::new(ip, grpc_public_port);
+        let grpc_private_socket_addr = SocketAddr::new(ip, grpc_private_port);
         let public_url = format!("http://{}", public_socket_addr);
         let private_url = format!("http://{}", private_socket_addr);
-        let grpc_url = format!("grpc://{}", grpc_socket_addr);
+        let grpc_public_url = format!("grpc://{}", grpc_public_socket_addr);
+        let grpc_private_url = format!("grpc://{}", grpc_private_socket_addr);
 
-        // try to start grpc client and connect to the server
-        let grpc_opts = match tonic::transport::Channel::from_shared(grpc_url)?
+        // try to start grpc client (public api) and connect to the server
+        let grpc_pub_client = match tonic::transport::Channel::from_shared(grpc_public_url)?
             .connect()
             .await
         {
-            Ok(channel) => Some(MassaServiceClient::new(channel)),
+            Ok(channel) => Some(PublicServiceClient::new(channel)),
+            Err(e) => {
+                tracing::warn!("unable to connect to grpc server {}", e);
+                None
+            }
+        };
+
+        // try to start grpc client (private api) and connect to the server
+        let grpc_priv_client = match tonic::transport::Channel::from_shared(grpc_private_url)?
+            .connect()
+            .await
+        {
+            Ok(channel) => Some(PrivateServiceClient::new(channel)),
             Err(e) => {
                 tracing::warn!("unable to connect to grpc server {}", e);
                 None
@@ -104,7 +122,8 @@ impl Client {
         Ok(Client {
             public: RpcClient::from_url(&public_url, http_config).await,
             private: RpcClient::from_url(&private_url, http_config).await,
-            grpc: grpc_opts,
+            grpc_public: grpc_pub_client,
+            grpc_private: grpc_priv_client,
         })
     }
 }
diff --git a/massa-time/Cargo.toml b/massa-time/Cargo.toml
index 66fbf573f46..0cdb20b50b8 100644
--- a/massa-time/Cargo.toml
+++ b/massa-time/Cargo.toml
@@ -12,6 +12,7 @@ displaydoc = "0.2"
 serde = { version = "1.0", features = ["derive"] }
 thiserror = "1.0"
 nom = "=7.1"
+massa-proto-rs = { git = "https://github.com/massalabs/massa-proto-rs", rev = "32179e2", features = ["tonic"] }
 
 # Custom dependencies
 massa_serialization = { path = "../massa-serialization" }
diff --git a/massa-time/src/lib.rs b/massa-time/src/lib.rs
index 3691bfe2956..cd0ae8837fc 100644
--- a/massa-time/src/lib.rs
+++ b/massa-time/src/lib.rs
@@ -5,6 +5,7 @@
 #![feature(bound_map)]
 
 mod error;
+mod mapping_grpc;
 pub use error::TimeError;
 use massa_serialization::{Deserializer, Serializer, U64VarIntDeserializer, U64VarIntSerializer};
 use nom::error::{context, ContextError, ParseError};
diff --git a/massa-time/src/mapping_grpc.rs b/massa-time/src/mapping_grpc.rs
new file mode 100644
index 00000000000..10ab686e3ec
--- /dev/null
+++ b/massa-time/src/mapping_grpc.rs
@@ -0,0 +1,12 @@
+// Copyright (c) 2023 MASSA LABS <info@massa.net>
+
+use crate::MassaTime;
+use massa_proto_rs::massa::model::v1 as grpc_model;
+
+impl From<MassaTime> for grpc_model::NativeTime {
+    fn from(value: MassaTime) -> Self {
+        grpc_model::NativeTime {
+            milliseconds: value.to_millis(),
+        }
+    }
+}
diff --git a/massa-versioning/Cargo.toml b/massa-versioning/Cargo.toml
index 2045cc49bc4..4574797275a 100644
--- a/massa-versioning/Cargo.toml
+++ b/massa-versioning/Cargo.toml
@@ -20,7 +20,7 @@ massa_models = { path = "../massa-models" }
 massa_serialization = { path = "../massa-serialization" }
 massa_hash = { path = "../massa-hash" }
 massa_signature = { path = "../massa-signature" }
-massa-proto-rs = { git = "https://github.com/massalabs/massa-proto-rs", rev = "18ec02f", features = ["tonic"] }
+massa-proto-rs = { git = "https://github.com/massalabs/massa-proto-rs", rev = "32179e2", features = ["tonic"] }
 massa_db_exports = { path = "../massa-db-exports" }
 
 [dev-dependencies]
diff --git a/massa-versioning/src/grpc_mapping.rs b/massa-versioning/src/grpc_mapping.rs
index a6b4c62e73e..ca3b5fe8d6b 100644
--- a/massa-versioning/src/grpc_mapping.rs
+++ b/massa-versioning/src/grpc_mapping.rs
@@ -38,9 +38,9 @@ impl From<&MipInfo> for grpc_model::MipInfo {
         Self {
             name: value.name.clone(),
             version: value.version,
-            start: value.start.to_millis(),
-            timeout: value.start.to_millis(),
-            activation_delay: value.activation_delay.to_millis(),
+            start: Some(value.start.into()),
+            timeout: Some(value.timeout.into()),
+            activation_delay: Some(value.activation_delay.into()),
             components,
         }
     }
diff --git a/massa-versioning/src/versioning.rs b/massa-versioning/src/versioning.rs
index 854e46467b7..acd5b7ce430 100644
--- a/massa-versioning/src/versioning.rs
+++ b/massa-versioning/src/versioning.rs
@@ -669,7 +669,6 @@ impl MipStore {
     }
 
     // Network restart
-
     pub fn is_consistent_with_shutdown_period(
         &self,
         shutdown_start: Slot,