From 5425f4afc41cc383741f6231360a2c5f3c88de40 Mon Sep 17 00:00:00 2001
From: MujkicA <ahmedmujkic2@gmail.com>
Date: Wed, 21 Aug 2024 23:17:41 +0200
Subject: [PATCH 1/4] fix charts

---
 .github/workflows/ci.yml                      |   2 +-
 Cargo.lock                                    | 335 ++++++++++--------
 Cargo.toml                                    |   2 +-
 deployment/Dockerfile                         |  35 --
 deployment/charts/Chart.yaml                  |   6 -
 deployment/charts/templates/_helpers.tpl      |  21 --
 deployment/charts/templates/deploy.yaml       | 116 ------
 deployment/charts/values.yaml                 |  17 -
 deployment/scripts/.env                       |  16 -
 deployment/scripts/service-delete.sh          |  19 -
 deployment/scripts/service-deploy.sh          |  26 --
 helm/fuel-block-committer/Chart.yaml          |   4 +-
 .../templates/deployment.yaml                 |   3 -
 helm/fuel-block-committer/templates/pvc.yaml  |  13 -
 14 files changed, 195 insertions(+), 420 deletions(-)
 delete mode 100644 deployment/Dockerfile
 delete mode 100644 deployment/charts/Chart.yaml
 delete mode 100644 deployment/charts/templates/_helpers.tpl
 delete mode 100644 deployment/charts/templates/deploy.yaml
 delete mode 100644 deployment/charts/values.yaml
 delete mode 100644 deployment/scripts/.env
 delete mode 100755 deployment/scripts/service-delete.sh
 delete mode 100755 deployment/scripts/service-deploy.sh
 delete mode 100644 helm/fuel-block-committer/templates/pvc.yaml

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 82c40dd8..5dcdc19a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -139,7 +139,7 @@ jobs:
           image_name: ${{ env.IMAGE_NAME }}
           docker_username: ${{ github.repository_owner }}
           docker_password: ${{ secrets.GITHUB_TOKEN }}
-          docker_platforms: linux/amd64,linux/arm64
+          docker_platforms: linux/amd64
 
       - uses: FuelLabs/.github/.github/actions/slack-notify-template@master
         if: always() && (github.ref == 'refs/heads/master' || github.ref_type == 'tag')
diff --git a/Cargo.lock b/Cargo.lock
index 71c2b1d7..26917a94 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -71,7 +71,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e01ed3140b2f8d422c68afa1ed2e85d996ea619c988ac834d255db32138655cb"
 dependencies = [
  "quote",
- "syn 2.0.74",
+ "syn 2.0.75",
 ]
 
 [[package]]
@@ -185,7 +185,7 @@ dependencies = [
  "actix-router",
  "proc-macro2",
  "quote",
- "syn 2.0.74",
+ "syn 2.0.75",
 ]
 
 [[package]]
@@ -203,6 +203,12 @@ version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
 
+[[package]]
+name = "adler2"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627"
+
 [[package]]
 name = "aes"
 version = "0.8.4"
@@ -323,9 +329,9 @@ dependencies = [
 
 [[package]]
 name = "arrayvec"
-version = "0.7.4"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
+checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
 [[package]]
 name = "ascii"
@@ -350,7 +356,7 @@ checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.74",
+ "syn 2.0.75",
 ]
 
 [[package]]
@@ -396,7 +402,7 @@ checksum = "3c87f3f15e7794432337fc718554eaa4dc8f04c9677a950ffe366f20a162ae42"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.74",
+ "syn 2.0.75",
 ]
 
 [[package]]
@@ -415,7 +421,7 @@ dependencies = [
  "cc",
  "cfg-if",
  "libc",
- "miniz_oxide",
+ "miniz_oxide 0.7.4",
  "object",
  "rustc-demangle",
  "serde",
@@ -552,7 +558,7 @@ dependencies = [
  "log",
  "pin-project-lite",
  "rustls 0.22.4",
- "rustls-native-certs 0.7.1",
+ "rustls-native-certs 0.7.2",
  "rustls-pemfile 2.1.3",
  "rustls-pki-types",
  "serde",
@@ -661,9 +667,9 @@ dependencies = [
 
 [[package]]
 name = "camino"
-version = "1.1.7"
+version = "1.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0ec6b951b160caa93cc0c7b209e5a3bff7aae9062213451ac99493cd844c239"
+checksum = "8b96ec4966b5813e2c0507c1f86115c8c5abaadc3980879c3424042a02fd1ad3"
 dependencies = [
  "serde",
 ]
@@ -693,12 +699,13 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.1.10"
+version = "1.1.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9e8aabfac534be767c909e0690571677d49f41bd8465ae876fe043d52ba5292"
+checksum = "72db2f7947ecee9b03b510377e8bb9077afa27176fdbff55c51027e976fdcc48"
 dependencies = [
  "jobserver",
  "libc",
+ "shlex",
 ]
 
 [[package]]
@@ -732,9 +739,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.5.15"
+version = "4.5.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "11d8838454fda655dafd3accb2b6e2bea645b9e4078abe84a22ceb947235c5cc"
+checksum = "ed6719fffa43d0d87e5fd8caeab59be1554fb028cd30edc88fc4369b17971019"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -761,7 +768,7 @@ dependencies = [
  "heck 0.5.0",
  "proc-macro2",
  "quote",
- "syn 2.0.74",
+ "syn 2.0.75",
 ]
 
 [[package]]
@@ -962,9 +969,9 @@ dependencies = [
 
 [[package]]
 name = "cpufeatures"
-version = "0.2.12"
+version = "0.2.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504"
+checksum = "51e852e6dc9a5bed1fae92dd2375037bf2b768725bf3be87811edee3249d09ad"
 dependencies = [
  "libc",
 ]
@@ -1103,7 +1110,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.74",
+ "syn 2.0.75",
 ]
 
 [[package]]
@@ -1191,7 +1198,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "strsim 0.11.1",
- "syn 2.0.74",
+ "syn 2.0.75",
 ]
 
 [[package]]
@@ -1213,7 +1220,7 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806"
 dependencies = [
  "darling_core 0.20.10",
  "quote",
- "syn 2.0.74",
+ "syn 2.0.75",
 ]
 
 [[package]]
@@ -1262,7 +1269,7 @@ checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.74",
+ "syn 2.0.75",
 ]
 
 [[package]]
@@ -1275,7 +1282,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "rustc_version",
- "syn 2.0.74",
+ "syn 2.0.75",
 ]
 
 [[package]]
@@ -1349,7 +1356,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.74",
+ "syn 2.0.75",
 ]
 
 [[package]]
@@ -1383,7 +1390,7 @@ checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813"
 
 [[package]]
 name = "e2e"
-version = "0.4.0"
+version = "0.6.0"
 dependencies = [
  "anyhow",
  "eth",
@@ -1396,7 +1403,7 @@ dependencies = [
  "portpicker",
  "ports",
  "rand",
- "reqwest 0.12.5",
+ "reqwest 0.12.7",
  "rusoto_core",
  "rusoto_kms",
  "secp256k1",
@@ -1409,7 +1416,7 @@ dependencies = [
  "url",
  "validator",
  "walkdir",
- "zip 2.1.6",
+ "zip 2.2.0",
 ]
 
 [[package]]
@@ -1481,6 +1488,12 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ef1a6892d9eef45c8fa6b9e0086428a2cca8491aca8f787c534a3d6d0bcb3ced"
 
+[[package]]
+name = "embedded-io"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "edd0f118536f44f5ccd48bcb8b111bdc3de888b58c74639dfb034a357d0f206d"
+
 [[package]]
 name = "ena"
 version = "0.14.3"
@@ -1526,7 +1539,7 @@ dependencies = [
  "heck 0.4.1",
  "proc-macro2",
  "quote",
- "syn 2.0.74",
+ "syn 2.0.75",
 ]
 
 [[package]]
@@ -1558,7 +1571,7 @@ dependencies = [
 
 [[package]]
 name = "eth"
-version = "0.4.0"
+version = "0.6.0"
 dependencies = [
  "async-trait",
  "c-kzg",
@@ -1719,7 +1732,7 @@ dependencies = [
  "reqwest 0.11.27",
  "serde",
  "serde_json",
- "syn 2.0.74",
+ "syn 2.0.75",
  "toml",
  "walkdir",
 ]
@@ -1737,7 +1750,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "serde_json",
- "syn 2.0.74",
+ "syn 2.0.75",
 ]
 
 [[package]]
@@ -1763,7 +1776,7 @@ dependencies = [
  "serde",
  "serde_json",
  "strum 0.26.3",
- "syn 2.0.74",
+ "syn 2.0.75",
  "tempfile",
  "thiserror",
  "tiny-keccak",
@@ -1968,12 +1981,12 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
 
 [[package]]
 name = "flate2"
-version = "1.0.31"
+version = "1.0.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f211bbe8e69bbd0cfdea405084f128ae8b4aaa6b0b522fc8f2b009084797920"
+checksum = "9c0596c1eac1f9e04ed902702e9878208b336edc9d6fddc8a48387349bab3666"
 dependencies = [
  "crc32fast",
- "miniz_oxide",
+ "miniz_oxide 0.8.0",
 ]
 
 [[package]]
@@ -2035,7 +2048,7 @@ dependencies = [
 
 [[package]]
 name = "fuel"
-version = "0.4.0"
+version = "0.6.0"
 dependencies = [
  "async-trait",
  "fuel-core-client",
@@ -2059,7 +2072,7 @@ dependencies = [
 
 [[package]]
 name = "fuel-block-committer"
-version = "0.4.0"
+version = "0.6.0"
 dependencies = [
  "actix-web",
  "anyhow",
@@ -2147,7 +2160,7 @@ checksum = "89ad30ad1a11e5a811ae67b6b0cb6785ce21bcd5ef0afd442fd963d5be95d09d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.74",
+ "syn 2.0.75",
  "synstructure",
 ]
 
@@ -2320,7 +2333,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.74",
+ "syn 2.0.75",
 ]
 
 [[package]]
@@ -2451,7 +2464,7 @@ dependencies = [
  "futures-sink",
  "futures-util",
  "http 0.2.12",
- "indexmap 2.3.0",
+ "indexmap 2.4.0",
  "slab",
  "tokio",
  "tokio-util",
@@ -2460,9 +2473,9 @@ dependencies = [
 
 [[package]]
 name = "h2"
-version = "0.4.5"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa82e28a107a8cc405f0839610bdc9b15f1e25ec7d696aa5cf173edbcb1486ab"
+checksum = "524e8ac6999421f49a846c2d4411f337e53497d8ec55d67753beffa43c5d9205"
 dependencies = [
  "atomic-waker",
  "bytes",
@@ -2470,7 +2483,7 @@ dependencies = [
  "futures-core",
  "futures-sink",
  "http 1.1.0",
- "indexmap 2.3.0",
+ "indexmap 2.4.0",
  "slab",
  "tokio",
  "tokio-util",
@@ -2771,7 +2784,7 @@ dependencies = [
  "bytes",
  "futures-channel",
  "futures-util",
- "h2 0.4.5",
+ "h2 0.4.6",
  "http 1.1.0",
  "http-body 1.0.1",
  "httparse",
@@ -2838,7 +2851,7 @@ dependencies = [
  "hyper-util",
  "log",
  "rustls 0.22.4",
- "rustls-native-certs 0.7.1",
+ "rustls-native-certs 0.7.2",
  "rustls-pki-types",
  "tokio",
  "tokio-rustls 0.25.0",
@@ -2856,7 +2869,7 @@ dependencies = [
  "hyper 1.4.1",
  "hyper-util",
  "rustls 0.23.12",
- "rustls-native-certs 0.7.1",
+ "rustls-native-certs 0.7.2",
  "rustls-pki-types",
  "tokio",
  "tokio-rustls 0.26.0",
@@ -3016,7 +3029,7 @@ dependencies = [
  "autocfg",
  "impl-tools-lib",
  "proc-macro-error",
- "syn 2.0.74",
+ "syn 2.0.75",
 ]
 
 [[package]]
@@ -3028,7 +3041,7 @@ dependencies = [
  "proc-macro-error",
  "proc-macro2",
  "quote",
- "syn 2.0.74",
+ "syn 2.0.75",
 ]
 
 [[package]]
@@ -3061,9 +3074,9 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.3.0"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de3fc2e30ba82dd1b3911c8de1ffc143c74a914a14e99514d7637e3099df5ea0"
+checksum = "93ead53efc7ea8ed3cfb0c79fc8023fbb782a5432b52830b6518941cebe6505c"
 dependencies = [
  "equivalent",
  "hashbrown 0.14.5",
@@ -3097,7 +3110,7 @@ dependencies = [
  "socket2",
  "widestring",
  "windows-sys 0.48.0",
- "winreg 0.50.0",
+ "winreg",
 ]
 
 [[package]]
@@ -3165,9 +3178,9 @@ dependencies = [
 
 [[package]]
 name = "js-sys"
-version = "0.3.69"
+version = "0.3.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d"
+checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a"
 dependencies = [
  "wasm-bindgen",
 ]
@@ -3256,9 +3269,9 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.155"
+version = "0.2.158"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
+checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439"
 
 [[package]]
 name = "libm"
@@ -3382,7 +3395,7 @@ checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
 
 [[package]]
 name = "metrics"
-version = "0.4.0"
+version = "0.6.0"
 dependencies = [
  "prometheus",
 ]
@@ -3408,6 +3421,15 @@ dependencies = [
  "adler",
 ]
 
+[[package]]
+name = "miniz_oxide"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1"
+dependencies = [
+ "adler2",
+]
+
 [[package]]
 name = "mio"
 version = "1.0.2"
@@ -3445,7 +3467,7 @@ dependencies = [
  "cfg-if",
  "proc-macro2",
  "quote",
- "syn 2.0.74",
+ "syn 2.0.75",
 ]
 
 [[package]]
@@ -3572,7 +3594,7 @@ dependencies = [
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn 2.0.74",
+ "syn 2.0.75",
 ]
 
 [[package]]
@@ -3644,7 +3666,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.74",
+ "syn 2.0.75",
 ]
 
 [[package]]
@@ -3754,7 +3776,7 @@ dependencies = [
  "regex",
  "regex-syntax",
  "structmeta",
- "syn 2.0.74",
+ "syn 2.0.75",
 ]
 
 [[package]]
@@ -3839,7 +3861,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db"
 dependencies = [
  "fixedbitset",
- "indexmap 2.3.0",
+ "indexmap 2.4.0",
 ]
 
 [[package]]
@@ -3882,7 +3904,7 @@ dependencies = [
  "phf_shared 0.11.2",
  "proc-macro2",
  "quote",
- "syn 2.0.74",
+ "syn 2.0.75",
 ]
 
 [[package]]
@@ -3920,7 +3942,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.74",
+ "syn 2.0.75",
 ]
 
 [[package]]
@@ -3973,7 +3995,7 @@ dependencies = [
 
 [[package]]
 name = "ports"
-version = "0.4.0"
+version = "0.6.0"
 dependencies = [
  "async-trait",
  "ethers-core",
@@ -3990,12 +4012,13 @@ dependencies = [
 
 [[package]]
 name = "postcard"
-version = "1.0.8"
+version = "1.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a55c51ee6c0db07e68448e336cf8ea4131a620edefebf9893e759b2d793420f8"
+checksum = "5f7f0a8d620d71c457dd1d47df76bb18960378da56af4527aaa10f515eee732e"
 dependencies = [
  "cobs",
- "embedded-io",
+ "embedded-io 0.4.0",
+ "embedded-io 0.6.1",
  "heapless",
  "serde",
 ]
@@ -4054,7 +4077,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5f12335488a2f3b0a83b14edad48dca9879ce89b2edd10e80237e4e852dd645e"
 dependencies = [
  "proc-macro2",
- "syn 2.0.74",
+ "syn 2.0.75",
 ]
 
 [[package]]
@@ -4315,9 +4338,9 @@ dependencies = [
 
 [[package]]
 name = "redox_users"
-version = "0.4.5"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891"
+checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43"
 dependencies = [
  "getrandom",
  "libredox",
@@ -4399,21 +4422,21 @@ dependencies = [
  "wasm-bindgen-futures",
  "web-sys",
  "webpki-roots 0.25.4",
- "winreg 0.50.0",
+ "winreg",
 ]
 
 [[package]]
 name = "reqwest"
-version = "0.12.5"
+version = "0.12.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7d6d2a27d57148378eb5e111173f4276ad26340ecc5c49a4a2152167a2d6a37"
+checksum = "f8f4955649ef5c38cc7f9e8aa41761d48fb9677197daea9984dc54f56aad5e63"
 dependencies = [
  "base64 0.22.1",
  "bytes",
  "encoding_rs",
  "futures-core",
  "futures-util",
- "h2 0.4.5",
+ "h2 0.4.6",
  "hickory-resolver",
  "http 1.1.0",
  "http-body 1.0.1",
@@ -4432,7 +4455,7 @@ dependencies = [
  "pin-project-lite",
  "quinn",
  "rustls 0.23.12",
- "rustls-native-certs 0.7.1",
+ "rustls-native-certs 0.7.2",
  "rustls-pemfile 2.1.3",
  "rustls-pki-types",
  "serde",
@@ -4448,7 +4471,7 @@ dependencies = [
  "wasm-bindgen-futures",
  "web-sys",
  "webpki-roots 0.26.3",
- "winreg 0.52.0",
+ "windows-registry",
 ]
 
 [[package]]
@@ -4756,9 +4779,9 @@ dependencies = [
 
 [[package]]
 name = "rustls-native-certs"
-version = "0.7.1"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a88d6d420651b496bdd98684116959239430022a115c1240e6c3993be0b15fba"
+checksum = "04182dffc9091a404e0fc069ea5cd60e5b866c3adf881eff99a32d048242dffa"
 dependencies = [
  "openssl-probe",
  "rustls-pemfile 2.1.3",
@@ -5018,29 +5041,29 @@ checksum = "cd0b0ec5f1c1ca621c432a25813d8d60c88abe6d3e08a3eb9cf37d97a0fe3d73"
 
 [[package]]
 name = "serde"
-version = "1.0.206"
+version = "1.0.208"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b3e4cd94123dd520a128bcd11e34d9e9e423e7e3e50425cb1b4b1e3549d0284"
+checksum = "cff085d2cb684faa248efb494c39b68e522822ac0de72ccf08109abde717cfb2"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.206"
+version = "1.0.208"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fabfb6138d2383ea8208cf98ccf69cdfb1aff4088460681d84189aa259762f97"
+checksum = "24008e81ff7613ed8e5ba0cfaf24e2c2f1e5b8a0495711e44fcd4882fca62bcf"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.74",
+ "syn 2.0.75",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.124"
+version = "1.0.125"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "66ad62847a56b3dba58cc891acd13884b9c61138d330c0d7b6181713d4fce38d"
+checksum = "83c8e735a073ccf5be70aa8066aa984eaf2fa000db6c8d0100ae605b366d31ed"
 dependencies = [
  "itoa",
  "memchr",
@@ -5056,7 +5079,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.74",
+ "syn 2.0.75",
 ]
 
 [[package]]
@@ -5090,7 +5113,7 @@ dependencies = [
  "chrono",
  "hex",
  "indexmap 1.9.3",
- "indexmap 2.3.0",
+ "indexmap 2.4.0",
  "serde",
  "serde_derive",
  "serde_json",
@@ -5107,12 +5130,12 @@ dependencies = [
  "darling 0.20.10",
  "proc-macro2",
  "quote",
- "syn 2.0.74",
+ "syn 2.0.75",
 ]
 
 [[package]]
 name = "services"
-version = "0.4.0"
+version = "0.6.0"
 dependencies = [
  "async-trait",
  "fuel-crypto",
@@ -5354,7 +5377,7 @@ dependencies = [
  "futures-util",
  "hashlink",
  "hex",
- "indexmap 2.3.0",
+ "indexmap 2.4.0",
  "log",
  "memchr",
  "once_cell",
@@ -5538,7 +5561,7 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
 
 [[package]]
 name = "storage"
-version = "0.4.0"
+version = "0.6.0"
 dependencies = [
  "async-trait",
  "hex",
@@ -5597,7 +5620,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "structmeta-derive",
- "syn 2.0.74",
+ "syn 2.0.75",
 ]
 
 [[package]]
@@ -5608,7 +5631,7 @@ checksum = "152a0b65a590ff6c3da95cabe2353ee04e6167c896b28e3b14478c2636c922fc"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.74",
+ "syn 2.0.75",
 ]
 
 [[package]]
@@ -5652,7 +5675,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "rustversion",
- "syn 2.0.74",
+ "syn 2.0.75",
 ]
 
 [[package]]
@@ -5694,9 +5717,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.74"
+version = "2.0.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fceb41e3d546d0bd83421d3409b1460cc7444cd389341a4c880fe7a042cb3d7"
+checksum = "f6af063034fc1935ede7be0122941bafa9bacb949334d090b77ca98b5817c7d9"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -5714,6 +5737,9 @@ name = "sync_wrapper"
 version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394"
+dependencies = [
+ "futures-core",
+]
 
 [[package]]
 name = "synstructure"
@@ -5723,7 +5749,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.74",
+ "syn 2.0.75",
 ]
 
 [[package]]
@@ -5811,7 +5837,7 @@ dependencies = [
  "memchr",
  "parse-display",
  "pin-project-lite",
- "reqwest 0.12.5",
+ "reqwest 0.12.7",
  "serde",
  "serde_json",
  "serde_with",
@@ -5840,7 +5866,7 @@ checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.74",
+ "syn 2.0.75",
 ]
 
 [[package]]
@@ -5919,9 +5945,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.39.2"
+version = "1.39.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "daa4fb1bc778bd6f04cbfc4bb2d06a7396a8f299dc33ea1900cedaa316f467b1"
+checksum = "9babc99b9923bfa4804bd74722ff02c0381021eafa4db9949217e3be8e84fff5"
 dependencies = [
  "backtrace",
  "bytes",
@@ -5943,7 +5969,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.74",
+ "syn 2.0.75",
 ]
 
 [[package]]
@@ -6065,7 +6091,7 @@ version = "0.21.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1"
 dependencies = [
- "indexmap 2.3.0",
+ "indexmap 2.4.0",
  "toml_datetime",
  "winnow 0.5.40",
 ]
@@ -6076,7 +6102,7 @@ version = "0.22.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d"
 dependencies = [
- "indexmap 2.3.0",
+ "indexmap 2.4.0",
  "serde",
  "serde_spanned",
  "toml_datetime",
@@ -6100,15 +6126,15 @@ dependencies = [
 
 [[package]]
 name = "tower-layer"
-version = "0.3.2"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0"
+checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e"
 
 [[package]]
 name = "tower-service"
-version = "0.3.2"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52"
+checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3"
 
 [[package]]
 name = "tracing"
@@ -6130,7 +6156,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.74",
+ "syn 2.0.75",
 ]
 
 [[package]]
@@ -6250,9 +6276,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-properties"
-version = "0.1.1"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e4259d9d4425d9f0661581b804cb85fe66a4c631cadd8f490d1c13a35d5d9291"
+checksum = "52ea75f83c0137a9b98608359a5f1af8144876eb67bcb1ce837368e906a9f524"
 
 [[package]]
 name = "unicode-segmentation"
@@ -6262,9 +6288,9 @@ checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202"
 
 [[package]]
 name = "unicode-xid"
-version = "0.2.4"
+version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c"
+checksum = "229730647fbc343e3a80e463c1db7f78f3855d3f3739bee0dda773c9a037c90a"
 
 [[package]]
 name = "unicode_categories"
@@ -6335,7 +6361,7 @@ dependencies = [
 
 [[package]]
 name = "validator"
-version = "0.4.0"
+version = "0.6.0"
 dependencies = [
  "fuel-core-client",
  "fuel-crypto",
@@ -6404,34 +6430,35 @@ checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.92"
+version = "0.2.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8"
+checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5"
 dependencies = [
  "cfg-if",
+ "once_cell",
  "wasm-bindgen-macro",
 ]
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.92"
+version = "0.2.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da"
+checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b"
 dependencies = [
  "bumpalo",
  "log",
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.74",
+ "syn 2.0.75",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.42"
+version = "0.4.43"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0"
+checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed"
 dependencies = [
  "cfg-if",
  "js-sys",
@@ -6441,9 +6468,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.92"
+version = "0.2.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726"
+checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -6451,28 +6478,28 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.92"
+version = "0.2.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
+checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.74",
+ "syn 2.0.75",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.92"
+version = "0.2.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96"
+checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484"
 
 [[package]]
 name = "web-sys"
-version = "0.3.69"
+version = "0.3.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef"
+checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -6559,6 +6586,36 @@ dependencies = [
  "windows-targets 0.52.6",
 ]
 
+[[package]]
+name = "windows-registry"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e400001bb720a623c1c69032f8e3e4cf09984deec740f007dd2b03ec864804b0"
+dependencies = [
+ "windows-result",
+ "windows-strings",
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-result"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e"
+dependencies = [
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-strings"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10"
+dependencies = [
+ "windows-result",
+ "windows-targets 0.52.6",
+]
+
 [[package]]
 name = "windows-sys"
 version = "0.48.0"
@@ -6735,16 +6792,6 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
-[[package]]
-name = "winreg"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5"
-dependencies = [
- "cfg-if",
- "windows-sys 0.48.0",
-]
-
 [[package]]
 name = "ws_stream_wasm"
 version = "0.7.4"
@@ -6803,7 +6850,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.74",
+ "syn 2.0.75",
 ]
 
 [[package]]
@@ -6823,7 +6870,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.74",
+ "syn 2.0.75",
 ]
 
 [[package]]
@@ -6848,16 +6895,16 @@ dependencies = [
 
 [[package]]
 name = "zip"
-version = "2.1.6"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40dd8c92efc296286ce1fbd16657c5dbefff44f1b4ca01cc5f517d8b7b3d3e2e"
+checksum = "dc5e4288ea4057ae23afc69a4472434a87a2495cafce6632fd1c4ec9f5cf3494"
 dependencies = [
  "arbitrary",
  "crc32fast",
  "crossbeam-utils",
  "displaydoc",
  "flate2",
- "indexmap 2.3.0",
+ "indexmap 2.4.0",
  "memchr",
  "thiserror",
  "zopfli",
diff --git a/Cargo.toml b/Cargo.toml
index de85c2f5..09cc7851 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -13,7 +13,7 @@ members = [
 ]
 
 [workspace.package]
-version = "0.4.0"
+version = "0.6.0"
 authors = ["Fuel Labs <contact@fuel.sh>"]
 edition = "2021"
 homepage = "https://fuel.network/"
diff --git a/deployment/Dockerfile b/deployment/Dockerfile
deleted file mode 100644
index 029ab13c..00000000
--- a/deployment/Dockerfile
+++ /dev/null
@@ -1,35 +0,0 @@
-# Stage 1: Build
-FROM lukemathwalker/cargo-chef:latest-rust-1.79 as chef
-WORKDIR /build/
-# hadolint ignore=DL3008
-
-FROM chef as planner
-ENV CARGO_NET_GIT_FETCH_WITH_CLI=true
-COPY . .
-RUN cargo chef prepare --recipe-path recipe.json --bin fuel-block-committer
-
-FROM chef as builder
-COPY --from=planner /build/recipe.json recipe.json
-# Build our project dependencies, not our application!
-RUN cargo chef cook --release --recipe-path recipe.json --bin fuel-block-committer
-# Up to this point, if our dependency tree stays the same,
-# all layers should be cached.
-COPY . .
-RUN cargo build --release --bin fuel-block-committer
-
-# Stage 2: Run
-FROM ubuntu:22.04 as run
-
-RUN apt-get update -y \
-  && apt-get install -y --no-install-recommends ca-certificates \
-  # Clean up
-  && apt-get autoremove -y \
-  && apt-get clean -y \
-  && rm -rf /var/lib/apt/lists/*
-
-WORKDIR /root/
-
-COPY --from=builder /build/target/release/fuel-block-committer .
-COPY --from=builder /build/target/release/fuel-block-committer.d .
-
-ENTRYPOINT ["./fuel-block-committer"]
diff --git a/deployment/charts/Chart.yaml b/deployment/charts/Chart.yaml
deleted file mode 100644
index 44fe6442..00000000
--- a/deployment/charts/Chart.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-apiVersion: v2
-name: fuel-block-committer
-description: Fuel Block Committer Helm Chart
-type: application
-appVersion: "0.4.0"
-version: 0.1.1
diff --git a/deployment/charts/templates/_helpers.tpl b/deployment/charts/templates/_helpers.tpl
deleted file mode 100644
index 83bccda6..00000000
--- a/deployment/charts/templates/_helpers.tpl
+++ /dev/null
@@ -1,21 +0,0 @@
-{{- define "fuel-block-committer.name" -}}
-{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{- define "fuel-block-committer.fullname" -}}
-{{- if .Values.fullnameOverride -}}
-{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
-{{- $name := default .Chart.Name .Values.nameOverride -}}
-{{- if contains $name .Release.Name -}}
-{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
-{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-{{- end -}}
-{{- end -}}
-
-{{- define "fuel-block-committer.chart" -}}
-{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
diff --git a/deployment/charts/templates/deploy.yaml b/deployment/charts/templates/deploy.yaml
deleted file mode 100644
index 4d423a81..00000000
--- a/deployment/charts/templates/deploy.yaml
+++ /dev/null
@@ -1,116 +0,0 @@
-{{- if .Values.app.prometheus.enabled }}
-apiVersion: monitoring.coreos.com/v1
-kind: ServiceMonitor
-metadata:
-  name: {{ .Release.Name }}-service-monitor
-  labels:
-    release: {{ .Values.app.prometheus.helm_release_name }}
-spec:
-  selector:
-    app: {{ template "fuel-block-committer.name" . }}
-    release: {{ .Release.Name }}
-  endpoints:
-    - path: /metrics
-      port: http
-{{- end }}
----
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  name: "{{ .Release.Name }}-claim"
-  labels:
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-spec:
-  accessModes:
-    - "ReadWriteOnce"
-  resources:
-    requests:
-      storage: "1Gi"
-  storageClassName: "gp3"
----
-kind: Service
-apiVersion: v1
-metadata:
-  labels:
-    app: {{ template "fuel-block-committer.name" . }}
-    chart: {{ template "fuel-block-committer.chart" . }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-  name: {{ .Release.Name }}-service
-spec:
-  type: NodePort
-  selector:
-    app: {{ template "fuel-block-committer.name" . }}
-    release: {{ .Release.Name }}
-  ports:
-    - name: http
-      port: 80
-      protocol: TCP
-      targetPort: 8080
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: {{ .Release.Name }}-deployment
-  labels:
-    app: {{ template "fuel-block-committer.name" . }}
-    chart: {{ template "fuel-block-committer.chart" . }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-spec:
-  selector:
-    matchLabels:
-      app: {{ template "fuel-block-committer.name" . }}
-      release: {{ .Release.Name }}
-  replicas: 1
-  template:
-    metadata:
-      labels:
-        app: {{ template "fuel-block-committer.name" . }}
-        release: {{ .Release.Name }}
-    spec:
-      containers:
-        - name: {{ .Values.app.name }}
-          image: "{{ .Values.app.image.repository }}:{{ .Values.app.image.tag }}"
-          command: ["./fuel-block-committer"]
-          args:
-            - "--host"
-            - "0.0.0.0"
-            - "--port"
-            - "8080"
-            - "--db-path"
-            - "/mnt/db/db.db3"
-          resources: {}
-          imagePullPolicy: {{ .Values.app.image.pullPolicy }}
-          ports:
-            - name: http
-              containerPort: 8080
-              protocol: TCP
-          livenessProbe:
-            httpGet:
-              path: /health
-              port: 8080
-            initialDelaySeconds: 10
-            periodSeconds: 5
-            timeoutSeconds: 10
-          volumeMounts:
-            - name: "{{ .Release.Name }}-volume"
-              mountPath: "/mnt/db"
-          env:
-            - name: ETHEREUM_WALLET_KEY
-              value: "{{ .Values.app.ethereum_wallet_key | default false }}"
-            - name: ETHEREUM_RPC
-              value: "{{ .Values.app.ethereum_rpc }}"
-            - name: ETHEREUM_CHAIN
-              value: "{{ .Values.app.ethereum_chain_id }}"
-            - name: FUEL_GRAPHQL_ENDPOINT
-              value: "{{ .Values.app.fuel_graphql_endpoint }}"
-            - name: STATE_CONTRACT_ADDRESS
-              value: "{{ .Values.app.state_contract_address }}"
-            - name: COMMIT_INTERVAL
-              value: "{{ .Values.app.commit_interval }}"
-      volumes:
-        - name: "{{ .Release.Name }}-volume"
-          persistentVolumeClaim:
-            claimName: "{{ .Release.Name }}-claim"
diff --git a/deployment/charts/values.yaml b/deployment/charts/values.yaml
deleted file mode 100644
index 045be746..00000000
--- a/deployment/charts/values.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
-# Default values for fuel block committer
-
-app:
-  name: fuel-block-committer
-  ethereum_wallet_key: "${fuel_committer_eth_wallet_key}"
-  ethereum_rpc: "${fuel_committer_eth_rpc}"
-  ethereum_chain_id: "${fuel_committer_eth_chain_id}"
-  fuel_graphql_endpoint: "${fuel_committer_node_graphql_endpoint}"
-  state_contract_address: "${fuel_committer_state_contract_address}"
-  commit_interval: "${fuel_committer_commit_interval}"
-  image:
-    repository: "${fuel_committer_image_repository}"
-    tag: "${fuel_committer_image_tag}"
-    pullPolicy: Always
-  prometheus:
-    enabled: ${fuel_committer_prometheus_enabled}
-    helm_release_name: ${fuel_committer_prometheus_helm_release_name}
diff --git a/deployment/scripts/.env b/deployment/scripts/.env
deleted file mode 100644
index ce7ff413..00000000
--- a/deployment/scripts/.env
+++ /dev/null
@@ -1,16 +0,0 @@
-# k8s envs
-k8s_provider="eks"
-k8s_namespace="fuel-core"
-
-# Faucet envs
-fuel_committer_image_repository="ghcr.io/fuellabs/fuel-block-committer"
-fuel_committer_image_tag="latest"
-fuel_committer_eth_wallet_key="random"
-fuel_committer_eth_rpc="https://api.infura.io"
-fuel_committer_eth_chain_id="sepolia"
-fuel_committer_node_graphql_endpoint="node.example.com"
-fuel_committer_state_contract_address="CONTRACT_ADDRESS"
-fuel_committer_commit_interval="10800"
-
-# EKS
-TF_VAR_eks_cluster_name="test-cluster"
diff --git a/deployment/scripts/service-delete.sh b/deployment/scripts/service-delete.sh
deleted file mode 100755
index 4bed48c4..00000000
--- a/deployment/scripts/service-delete.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/bash
-
-set -o errexit # abort on nonzero exitstatus
-set -o nounset # abort on unbound variable
-
-set -o allexport && source .env && set +o allexport 
-
-if [ "${k8s_provider}" == "eks" ]; then
-    echo "Updating your kube context locally ...."
-    aws eks update-kubeconfig --name ${TF_VAR_eks_cluster_name}
-    echo "Deleting fuel-block-committer helm chart on ${TF_VAR_eks_cluster_name} ...."
-    helm delete fuel-block-committer \
-             --namespace ${k8s_namespace} \
-             --wait \
-             --timeout 8000s \
-             --debug
-else
-   echo "You have inputted a non-supported kubernetes provider in your .env"
-fi
diff --git a/deployment/scripts/service-deploy.sh b/deployment/scripts/service-deploy.sh
deleted file mode 100755
index a9ab629f..00000000
--- a/deployment/scripts/service-deploy.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/bash
-
-set -o errexit # abort on nonzero exitstatus
-set -o nounset # abort on unbound variable
-
-set -o allexport && source .env && set +o allexport 
-
-if [ "${k8s_provider}" == "eks" ]; then
-    echo "Updating your kube context locally ...."
-    aws eks update-kubeconfig --name ${TF_VAR_eks_cluster_name}
-    cd ../charts
-    mv values.yaml values.template 
-    envsubst < values.template > values.yaml
-    rm values.template
-    echo "Deploying fuel-block-committer helm chart to ${TF_VAR_eks_cluster_name} ...."
-    helm upgrade fuel-block-committer . \
-              --values values.yaml \
-              --install \
-              --create-namespace \
-              --namespace=${k8s_namespace} \
-              --wait \
-              --timeout 8000s \
-              --debug
-else
-   echo "You have inputted a non-supported kubernetes provider in your .env"
-fi
diff --git a/helm/fuel-block-committer/Chart.yaml b/helm/fuel-block-committer/Chart.yaml
index 1ed49f1f..3e25e7da 100644
--- a/helm/fuel-block-committer/Chart.yaml
+++ b/helm/fuel-block-committer/Chart.yaml
@@ -15,10 +15,10 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.5.4
+version: 0.6.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "0.1.0"
+appVersion: "0.6.0"
diff --git a/helm/fuel-block-committer/templates/deployment.yaml b/helm/fuel-block-committer/templates/deployment.yaml
index 0fb91693..1299e602 100644
--- a/helm/fuel-block-committer/templates/deployment.yaml
+++ b/helm/fuel-block-committer/templates/deployment.yaml
@@ -61,9 +61,6 @@ spec:
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
       volumes:
-        - name: fuel-block-committer-vol
-          persistentVolumeClaim:
-            claimName: {{ include "fuel-block-committer.fullname" . }}
         - name: config-volume
           configMap:
             name: {{ include "fuel-block-committer.fullname" . }}-config
diff --git a/helm/fuel-block-committer/templates/pvc.yaml b/helm/fuel-block-committer/templates/pvc.yaml
deleted file mode 100644
index ac4ee0f0..00000000
--- a/helm/fuel-block-committer/templates/pvc.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  name: {{ include "fuel-block-committer.fullname" . }}
-  labels:
-    {{- include "fuel-block-committer.labels" . | nindent 4 }}
-spec:
-  accessModes:
-    - {{ .Values.app.volume.accessmodes }}
-  resources:
-    requests:
-      storage: {{ .Values.app.volume.storagerequests }}
-  storageClassName: {{ .Values.app.volume.storageclass }}
\ No newline at end of file

From 100e484872343ec194d682e40c2f0f7c722bcf19 Mon Sep 17 00:00:00 2001
From: MujkicA <ahmedmujkic2@gmail.com>
Date: Wed, 21 Aug 2024 23:21:47 +0200
Subject: [PATCH 2/4] update ci

---
 .github/scripts/verify_chart_version.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/scripts/verify_chart_version.sh b/.github/scripts/verify_chart_version.sh
index c229527c..58c18b17 100755
--- a/.github/scripts/verify_chart_version.sh
+++ b/.github/scripts/verify_chart_version.sh
@@ -14,7 +14,7 @@ curl -sSLf "https://github.com/TomWright/dasel/releases/download/v1.24.3/dasel_l
 chmod +x dasel
 mv ./dasel /usr/local/bin/dasel
 # check appVersion with crate package metadata
-HELM_APP_VERSION=$(cat deployment/charts/Chart.yaml | dasel -r yaml 'appVersion')
+HELM_APP_VERSION=$(cat helm/fuel-block-committer/Chart.yaml | dasel -r yaml 'appVersion')
 CRATE_VERSION=$(cat Cargo.toml | dasel -r toml 'workspace.package.version')
 if [ "$HELM_APP_VERSION" != "$CRATE_VERSION" ]; then
 	err "crate version $CRATE_VERSION, doesn't match helm app version $HELM_APP_VERSION"

From 8e3416e776bc1323af4e29e972ec73485ff9e499 Mon Sep 17 00:00:00 2001
From: MujkicA <ahmedmujkic2@gmail.com>
Date: Wed, 21 Aug 2024 23:23:32 +0200
Subject: [PATCH 3/4] update ci again

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 5dcdc19a..a12d8d0f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -41,7 +41,7 @@ jobs:
         with:
           helm: latest
       - name: Lint helm chart
-        run: helm lint deployment/charts
+        run: helm lint helm/fuel-block-committer
       - name: Verify helm chart version matches crate
         run: |
           ./.github/scripts/verify_chart_version.sh

From d78fb775bdcf5d516863325cc933b5e1208309be Mon Sep 17 00:00:00 2001
From: segfault-magnet <ahmed.sagdati.ets@gmail.com>
Date: Wed, 21 Aug 2024 23:36:46 +0200
Subject: [PATCH 4/4] add back dockerfile

---
 .github/actions/docker-publish/action.yml |  2 +-
 Dockerfile                                | 35 +++++++++++++++++++++++
 2 files changed, 36 insertions(+), 1 deletion(-)
 create mode 100644 Dockerfile

diff --git a/.github/actions/docker-publish/action.yml b/.github/actions/docker-publish/action.yml
index e46a5a1a..8327c45c 100644
--- a/.github/actions/docker-publish/action.yml
+++ b/.github/actions/docker-publish/action.yml
@@ -15,7 +15,7 @@ inputs:
   docker_platforms:
     require: true
   docker_file:
-    default: deployment/Dockerfile
+    default: Dockerfile
     require: true
   docker_username:
     require: true
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 00000000..029ab13c
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,35 @@
+# Stage 1: Build
+FROM lukemathwalker/cargo-chef:latest-rust-1.79 as chef
+WORKDIR /build/
+# hadolint ignore=DL3008
+
+FROM chef as planner
+ENV CARGO_NET_GIT_FETCH_WITH_CLI=true
+COPY . .
+RUN cargo chef prepare --recipe-path recipe.json --bin fuel-block-committer
+
+FROM chef as builder
+COPY --from=planner /build/recipe.json recipe.json
+# Build our project dependencies, not our application!
+RUN cargo chef cook --release --recipe-path recipe.json --bin fuel-block-committer
+# Up to this point, if our dependency tree stays the same,
+# all layers should be cached.
+COPY . .
+RUN cargo build --release --bin fuel-block-committer
+
+# Stage 2: Run
+FROM ubuntu:22.04 as run
+
+RUN apt-get update -y \
+  && apt-get install -y --no-install-recommends ca-certificates \
+  # Clean up
+  && apt-get autoremove -y \
+  && apt-get clean -y \
+  && rm -rf /var/lib/apt/lists/*
+
+WORKDIR /root/
+
+COPY --from=builder /build/target/release/fuel-block-committer .
+COPY --from=builder /build/target/release/fuel-block-committer.d .
+
+ENTRYPOINT ["./fuel-block-committer"]