diff --git a/Cargo.toml b/Cargo.toml
index 0078ff7d7e..dd69b7f5e8 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -75,7 +75,11 @@ members = [
 
   "drip",
   "near/near-ibc-tests",
-  "light-clients/near/ics08-near", "lib/near-verifier", "light-clients/cometbls/near", "poc-relayer", "near/test-circuit",
+  "light-clients/near/ics08-near",
+  "lib/near-verifier",
+  "light-clients/cometbls/near",
+  "poc-relayer",
+  "near/test-circuit",
 ]
 
 [workspace.package]
@@ -103,7 +107,6 @@ cometbls-groth16-verifier = { path = "lib/cometbls-groth16-verifier", default-fe
 contracts                 = { path = "generated/rust/contracts", default-features = false }
 ethereum-light-client     = { path = "light-clients/ethereum-light-client", default-features = false }
 ethereum-verifier         = { path = "lib/ethereum-verifier", default-features = false }
-near-verifier         = { path = "lib/near-verifier", default-features = false }
 gnark-key-parser          = { path = "lib/gnark-key-parser", default-features = false }
 gnark-mimc                = { path = "lib/gnark-mimc", default-features = false }
 ibc-vm-rs                 = { path = "lib/ibc-vm-rs", default-features = false }
@@ -112,6 +115,7 @@ ics23                     = { path = "lib/ics23", default-features = false }
 linea-verifier            = { path = "lib/linea-verifier", default-features = false }
 linea-zktrie              = { path = "lib/linea-zktrie", default-features = false }
 macros                    = { path = "lib/macros", default-features = false }
+near-verifier             = { path = "lib/near-verifier", default-features = false }
 pg-queue                  = { path = "lib/pg-queue", default-features = false }
 poseidon-rs               = { path = "lib/poseidon-rs", default-features = false }
 protos                    = { path = "generated/rust/protos", default-features = false }
@@ -174,9 +178,9 @@ go-parse-duration        = { version = "0.1.1", default-features = false }
 hex                      = { version = "0.4.3", default-features = false }
 hex-literal              = { version = "0.4.1", default-features = false }
 lazy_static              = { version = "1.4.0", default-features = false }
+near-account-id          = { version = "1.0.0", default-features = false }
 near-contract-standards  = { version = "5.1.0", default-features = false }
 near-sdk                 = { version = "5.1.0", default-features = false }
-near-account-id          = { version = "1.0.0", default-features = false }
 near-sdk-contract-tools  = { version = "3.0.2", default-features = false }
 num-bigint               = { version = "0.4", default-features = false }
 primitive-types          = { version = "0.12.1", default-features = false }
diff --git a/flake.nix b/flake.nix
index 264cb19cdf..b40592f0ce 100644
--- a/flake.nix
+++ b/flake.nix
@@ -535,15 +535,17 @@
               nodePackages_latest.typescript-language-server
               nodePackages_latest.vscode-langservers-extracted
             ]) ++
-                (with pkgs; [
-                  go
-                  gopls
-                  go-tools
-                  gotools
-                ])
-                ++ [(python.withPackages (py-pkgs: [
-                  py-pkgs.nearup
-                ]))]
+              (with pkgs; [
+                go
+                gopls
+                go-tools
+                gotools
+              ])
+              ++ [
+              (python.withPackages (py-pkgs: [
+                py-pkgs.nearup
+              ]))
+            ]
 
               ++ (with goPkgs; [
               go
diff --git a/lib/chain-utils/Cargo.toml b/lib/chain-utils/Cargo.toml
index 4a8ef22160..773f96272c 100644
--- a/lib/chain-utils/Cargo.toml
+++ b/lib/chain-utils/Cargo.toml
@@ -26,6 +26,9 @@ frame-support-procedural = { workspace = true }
 futures                  = { workspace = true }
 hex                      = { workspace = true }
 ics23                    = { workspace = true }
+near-jsonrpc-client      = "0.10.1"
+near-primitives          = "0.23.0"
+near-primitives-core     = "0.23.0"
 num-rational             = "0.4.2"
 num_enum                 = "0.7.0"
 prost                    = { workspace = true }
@@ -41,9 +44,6 @@ thiserror                = { workspace = true }
 tokio                    = { workspace = true }
 tracing                  = { workspace = true }
 typenum                  = { workspace = true, features = ["const-generics", "no_std"] }
-near-jsonrpc-client = "0.10.1"
-near-primitives = "0.23.0"
-near-primitives-core = "0.23.0"
 
 [features]
 arbitrary = ["dep:arbitrary"]
diff --git a/lib/near-verifier/Cargo.toml b/lib/near-verifier/Cargo.toml
index fb0577dd01..9ea7ecb1b8 100644
--- a/lib/near-verifier/Cargo.toml
+++ b/lib/near-verifier/Cargo.toml
@@ -1,20 +1,20 @@
 [package]
-name = "near-verifier"
-version = "0.1.0"
-edition.workspace = true
-license-file.workspace = true
-repository.workspace = true
 authors                = ["Union Labs"]
+edition.workspace      = true
+license-file.workspace = true
+name                   = "near-verifier"
+repository.workspace   = true
+version                = "0.1.0"
 
 [dependencies]
-unionlabs          = { workspace = true, features = [ "near" ] }
+borsh                = { workspace = true }
+near-account-id      = { workspace = true }
 near-primitives-core = { version = "0.23" }
-thiserror       = { workspace = true }
-sha2            = { workspace = true }
-serde = { workspace = true }
-near-account-id = { workspace = true }
-borsh = { workspace = true }
+serde                = { workspace = true }
 serde_json.workspace = true
+sha2                 = { workspace = true }
+thiserror            = { workspace = true }
+unionlabs            = { workspace = true, features = ["near"] }
 
 [lints]
 workspace = true
diff --git a/lib/unionlabs/Cargo.toml b/lib/unionlabs/Cargo.toml
index 6c2c616b5e..a294c3b52c 100644
--- a/lib/unionlabs/Cargo.toml
+++ b/lib/unionlabs/Cargo.toml
@@ -55,8 +55,8 @@ wasmparser               = { version = "0.113" }
 
 borsh                = { workspace = true, features = ["derive"] }
 bs58                 = "0.4"
+near-account-id      = { workspace = true }
 near-primitives-core = { version = "0.23" }
-near-account-id = { workspace = true }
 schemars             = { workspace = true, features = ["derive"], optional = true }
 
 [dev-dependencies]
diff --git a/light-clients/cometbls/near/Cargo.toml b/light-clients/cometbls/near/Cargo.toml
index ed718d3999..6558926139 100644
--- a/light-clients/cometbls/near/Cargo.toml
+++ b/light-clients/cometbls/near/Cargo.toml
@@ -1,26 +1,26 @@
 [package]
-name = "cometbls-near"
-version = "0.1.0"
-edition.workspace = true
+edition.workspace      = true
 license-file.workspace = true
-repository.workspace = true
+name                   = "cometbls-near"
+repository.workspace   = true
+version                = "0.1.0"
 
 [lib]
 crate-type = ["cdylib"]
 
 [dependencies]
-near-sdk                = { workspace = true, features = ["wee_alloc"] }
-near-sdk-contract-tools = { workspace = true }
-ibc-vm-rs               = { workspace = true }
-unionlabs               = { workspace = true, features = [ "near" ] }
-near-contract-standards = { workspace = true }
-near-primitives-core    = { version = "0.21" }
-borsh = { workspace = true, features = [ "derive"] }
-thiserror = { workspace = true }
-ics23              = { workspace = true }
+borsh                     = { workspace = true, features = ["derive"] }
 cometbls-groth16-verifier = { workspace = true }
-hex-literal = {workspace = true }
-hex.workspace       = true
+hex-literal               = { workspace = true }
+hex.workspace             = true
+ibc-vm-rs                 = { workspace = true }
+ics23                     = { workspace = true }
+near-contract-standards   = { workspace = true }
+near-primitives-core      = { version = "0.21" }
+near-sdk                  = { workspace = true, features = ["wee_alloc"] }
+near-sdk-contract-tools   = { workspace = true }
+thiserror                 = { workspace = true }
+unionlabs                 = { workspace = true, features = ["near"] }
 
 [lints]
 workspace = true
diff --git a/light-clients/near/ics08-near/Cargo.toml b/light-clients/near/ics08-near/Cargo.toml
index 97575bae88..1c707c9891 100644
--- a/light-clients/near/ics08-near/Cargo.toml
+++ b/light-clients/near/ics08-near/Cargo.toml
@@ -15,6 +15,7 @@ crate-type = ["cdylib", "rlib"]
 [dependencies]
 bytes           = { workspace = true }
 cosmwasm-std    = { workspace = true, features = ["abort", "iterator"] }
+cw-storage-plus = { workspace = true }
 dlmalloc        = { workspace = true, features = ["global"] }
 hex             = { workspace = true }
 prost           = { workspace = true }
@@ -27,19 +28,18 @@ serde-utils     = { workspace = true }
 sha2            = { workspace = true }
 sha3            = { workspace = true }
 thiserror       = { workspace = true }
-cw-storage-plus = { workspace = true }
 
-ics008-wasm-client = { workspace = true }
-unionlabs          = { workspace = true, features = [ "near" ] }
+borsh                = { workspace = true }
+ics008-wasm-client   = { workspace = true }
 near-primitives-core = { version = "0.23" }
-near-verifier = { workspace = true }
-borsh = { workspace = true }
+near-verifier        = { workspace = true }
+unionlabs            = { workspace = true, features = ["near"] }
 
-base64      = { workspace = true }
+base64 = { workspace = true }
 [dev-dependencies]
-lazy_static = "1.4.0"
-serde_json  = { workspace = true }
+lazy_static         = "1.4.0"
+near-crypto         = "0.23"
 near-jsonrpc-client = "0.10.1"
-tokio = { workspace = true, features = [ "full" ] }
-near-primitives = "0.23.0"
-near-crypto             = "0.23"
+near-primitives     = "0.23.0"
+serde_json          = { workspace = true }
+tokio               = { workspace = true, features = ["full"] }
diff --git a/light-clients/near/near/Cargo.toml b/light-clients/near/near/Cargo.toml
index d4d4b44c68..c547c12128 100644
--- a/light-clients/near/near/Cargo.toml
+++ b/light-clients/near/near/Cargo.toml
@@ -10,10 +10,10 @@ near-contract-standards = { workspace = true }
 near-primitives-core    = { version = "0.21" }
 near-sdk                = { workspace = true, features = ["wee_alloc"] }
 near-sdk-contract-tools = { workspace = true }
+near-verifier           = { workspace = true }
 serde                   = { workspace = true }
 serde_json              = { workspace = true }
 unionlabs               = { workspace = true, features = ["near"] }
-near-verifier = { workspace = true }
 
 [dev-dependencies]
 anyhow     = "1.0"
diff --git a/near/near.nix b/near/near.nix
index 9626671bef..60b1953d99 100644
--- a/near/near.nix
+++ b/near/near.nix
@@ -175,9 +175,11 @@
       near-localnet = pkgs.writeShellApplication {
         name = "near-localnet";
         # runtimeInputs = [ nearup ];
-        runtimeInputs = [(python.withPackages (py-pkgs: [
-          py-pkgs.nearup
-        ]))] ++ [ pkgs.strace pkgs.iproute pkgs.busybox unstablePkgs.nodePackages_latest.near-cli ];
+        runtimeInputs = [
+          (python.withPackages (py-pkgs: [
+            py-pkgs.nearup
+          ]))
+        ] ++ [ pkgs.strace pkgs.iproute pkgs.busybox unstablePkgs.nodePackages_latest.near-cli ];
         text = ''
           mkdir /tmp
           export TMPDIR=/tmp
diff --git a/near/test-circuit/Cargo.toml b/near/test-circuit/Cargo.toml
index 197608fa06..325bb246e0 100644
--- a/near/test-circuit/Cargo.toml
+++ b/near/test-circuit/Cargo.toml
@@ -1,9 +1,9 @@
 [package]
-name = "test-circuit"
-version = "0.1.0"
-edition.workspace = true
+edition.workspace      = true
 license-file.workspace = true
-repository.workspace = true
+name                   = "test-circuit"
+repository.workspace   = true
+version                = "0.1.0"
 
 [lints]
 workspace = true
@@ -23,8 +23,8 @@ unionlabs                         = { workspace = true, features = ["near"] }
 # near-primitives = { git = "https://github.com/near/nearcore" }
 base64                  = { workspace = true }
 env_logger              = "0.9"
+hex-literal.workspace   = true
 hex.workspace           = true
-hex-literal.workspace           = true
 near-crypto             = "0.20"
 near-jsonrpc-client     = "0.8"
 near-jsonrpc-primitives = "0.20"
diff --git a/networks/services/near.nix b/networks/services/near.nix
index 76200ebc1a..f3db3862e3 100644
--- a/networks/services/near.nix
+++ b/networks/services/near.nix
@@ -2,10 +2,10 @@
 {
   image = {
     enableRecommendedContents = true;
-      contents = [
-        pkgs.coreutils
-        near-localnet
-      ];
+    contents = [
+      pkgs.coreutils
+      near-localnet
+    ];
   };
   service = {
     tty = true;
diff --git a/poc-relayer/Cargo.toml b/poc-relayer/Cargo.toml
index 9d02b58cf8..cd090b9dc8 100644
--- a/poc-relayer/Cargo.toml
+++ b/poc-relayer/Cargo.toml
@@ -1,33 +1,33 @@
 [package]
-name = "poc-relayer"
-version = "0.1.0"
-edition.workspace = true
+edition.workspace      = true
 license-file.workspace = true
-repository.workspace = true
+name                   = "poc-relayer"
+repository.workspace   = true
+version                = "0.1.0"
 
 [dependencies]
-tokio = { workspace = true, features = [ "full" ] }
-near-primitives = "0.23.0"
+base64                  = { workspace = true }
+borsh                   = { workspace = true, features = ["borsh-derive"] }
+chain-utils             = { workspace = true }
+cometbft-rpc            = { workspace = true }
+hex.workspace           = true
+ibc-vm-rs.workspace     = true
 near-crypto             = "0.23"
-base64      = { workspace = true }
-serde_json  = { workspace = true }
-near-jsonrpc-client = "0.10.1"
+near-jsonrpc-client     = "0.10.1"
 near-jsonrpc-primitives = "0.23"
-unionlabs          = { workspace = true, features = [ "near" ] }
-near-primitives-core = { version = "0.23" }
-serde.workspace = true
-borsh                             = { workspace = true, features = ["borsh-derive"] }
-cometbft-rpc             = { workspace = true }
-tendermint-rpc           = { workspace = true, features = ["http-client", "websocket-client", "default"] }
-chain-utils = { workspace = true }
-prost                    = { workspace = true }
-protos.workspace = true
-hex.workspace = true
-ibc-vm-rs.workspace = true
-near-verifier = { workspace = true }
-tendermint               = { workspace = true }
-num-bigint               = { workspace = true }
-tendermint-proto         = { workspace = true }
+near-primitives         = "0.23.0"
+near-primitives-core    = { version = "0.23" }
+near-verifier           = { workspace = true }
+num-bigint              = { workspace = true }
+prost                   = { workspace = true }
+protos.workspace        = true
+serde.workspace         = true
+serde_json              = { workspace = true }
+tendermint              = { workspace = true }
+tendermint-proto        = { workspace = true }
+tendermint-rpc          = { workspace = true, features = ["http-client", "websocket-client", "default"] }
+tokio                   = { workspace = true, features = ["full"] }
+unionlabs               = { workspace = true, features = ["near"] }
 
 [lints]
 workspace = true
diff --git a/python-packages.nix b/python-packages.nix
index 3b255650f8..1d0ea4cd8c 100644
--- a/python-packages.nix
+++ b/python-packages.nix
@@ -13,9 +13,9 @@ self: super: {
     };
     format = "wheel";
     doCheck = false;
-    buildInputs = [];
-    checkInputs = [];
-    nativeBuildInputs = [];
+    buildInputs = [ ];
+    checkInputs = [ ];
+    nativeBuildInputs = [ ];
     propagatedBuildInputs = [
       self."botocore"
       self."jmespath"
@@ -31,9 +31,9 @@ self: super: {
     };
     format = "wheel";
     doCheck = false;
-    buildInputs = [];
-    checkInputs = [];
-    nativeBuildInputs = [];
+    buildInputs = [ ];
+    checkInputs = [ ];
+    nativeBuildInputs = [ ];
     propagatedBuildInputs = [
       self."jmespath"
       self."python-dateutil"
@@ -49,10 +49,10 @@ self: super: {
     };
     format = "wheel";
     doCheck = false;
-    buildInputs = [];
-    checkInputs = [];
-    nativeBuildInputs = [];
-    propagatedBuildInputs = [];
+    buildInputs = [ ];
+    checkInputs = [ ];
+    nativeBuildInputs = [ ];
+    propagatedBuildInputs = [ ];
   };
   "jmespath" = super.buildPythonPackage rec {
     pname = "jmespath";
@@ -63,10 +63,10 @@ self: super: {
     };
     format = "wheel";
     doCheck = false;
-    buildInputs = [];
-    checkInputs = [];
-    nativeBuildInputs = [];
-    propagatedBuildInputs = [];
+    buildInputs = [ ];
+    checkInputs = [ ];
+    nativeBuildInputs = [ ];
+    propagatedBuildInputs = [ ];
   };
   "nearup" = super.buildPythonPackage rec {
     pname = "nearup";
@@ -77,9 +77,9 @@ self: super: {
     };
     format = "wheel";
     doCheck = false;
-    buildInputs = [];
-    checkInputs = [];
-    nativeBuildInputs = [];
+    buildInputs = [ ];
+    checkInputs = [ ];
+    nativeBuildInputs = [ ];
     propagatedBuildInputs = [
       self."boto3"
       self."click"
@@ -95,10 +95,10 @@ self: super: {
     };
     format = "setuptools";
     doCheck = false;
-    buildInputs = [];
-    checkInputs = [];
-    nativeBuildInputs = [];
-    propagatedBuildInputs = [];
+    buildInputs = [ ];
+    checkInputs = [ ];
+    nativeBuildInputs = [ ];
+    propagatedBuildInputs = [ ];
   };
   "python-dateutil" = super.buildPythonPackage rec {
     pname = "python-dateutil";
@@ -109,9 +109,9 @@ self: super: {
     };
     format = "wheel";
     doCheck = false;
-    buildInputs = [];
-    checkInputs = [];
-    nativeBuildInputs = [];
+    buildInputs = [ ];
+    checkInputs = [ ];
+    nativeBuildInputs = [ ];
     propagatedBuildInputs = [
       self."six"
     ];
@@ -125,9 +125,9 @@ self: super: {
     };
     format = "wheel";
     doCheck = false;
-    buildInputs = [];
-    checkInputs = [];
-    nativeBuildInputs = [];
+    buildInputs = [ ];
+    checkInputs = [ ];
+    nativeBuildInputs = [ ];
     propagatedBuildInputs = [
       self."botocore"
     ];
@@ -141,10 +141,10 @@ self: super: {
     };
     format = "wheel";
     doCheck = false;
-    buildInputs = [];
-    checkInputs = [];
-    nativeBuildInputs = [];
-    propagatedBuildInputs = [];
+    buildInputs = [ ];
+    checkInputs = [ ];
+    nativeBuildInputs = [ ];
+    propagatedBuildInputs = [ ];
   };
   "urllib3" = super.buildPythonPackage rec {
     pname = "urllib3";
@@ -155,9 +155,9 @@ self: super: {
     };
     format = "wheel";
     doCheck = false;
-    buildInputs = [];
-    checkInputs = [];
-    nativeBuildInputs = [];
-    propagatedBuildInputs = [];
+    buildInputs = [ ];
+    checkInputs = [ ];
+    nativeBuildInputs = [ ];
+    propagatedBuildInputs = [ ];
   };
 }