diff --git a/.changeset/config.json b/.changeset/config.json
index d88011f613..f05ab78d1d 100644
--- a/.changeset/config.json
+++ b/.changeset/config.json
@@ -7,5 +7,5 @@
   "access": "restricted",
   "baseBranch": "main",
   "updateInternalDependencies": "patch",
-  "ignore": []
+  "ignore": ["crisp", "enclave-example", "crisp-client", "enclave-docs", "enclave-client"]
 }
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 26f68cebc9..f02cfb45cf 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -282,7 +282,7 @@ jobs:
           ls -la target/debug/fake_encrypt || echo "fake_encrypt not found"
           ls -la target/debug/pack_e3_params || echo "pack_e3_params not found"
           ls -la ~/.cargo/bin/enclave || echo "enclave binary not found"
-          ls -la packages/evm/dist || echo "SDK dist not found"
+          ls -la packages/enclave-contracts/dist || echo "SDK dist not found"
           ls -la crates/wasm/dist || echo "WASM dist not found"
       - name: "Set executable permissions"
         run: |
@@ -545,10 +545,10 @@ jobs:
           name: sdk-artifacts
           path: |
             packages/enclave-sdk/dist
-            packages/evm/dist
-            packages/evm/artifacts
-            packages/evm/cache
-            packages/evm/typechain-types
+            packages/enclave-contracts/dist
+            packages/enclave-contracts/artifacts
+            packages/enclave-contracts/cache
+            packages/enclave-contracts/typechain-types
             crates/wasm/dist
           retention-days: 1
           if-no-files-found: warn
@@ -596,7 +596,7 @@ jobs:
           echo "Checking downloaded artifacts:"
           ls -la ~/.cargo/bin/enclave || echo "enclave binary not found"
           ls -la templates/default/target/debug/e3-support-scripts-dev || echo "support scripts not found"
-          ls -la packages/evm/dist || echo "SDK dist not found"
+          ls -la packages/enclave-contracts/dist || echo "SDK dist not found"
           ls -la crates/wasm/dist || echo "WASM dist not found"
           echo "Support scripts permissions:"
           ls -la templates/default/target/debug/e3-support-scripts-dev
diff --git a/.github/workflows/ec2-deployment.yml b/.github/workflows/ec2-deployment.yml
index aa389f5c6a..4b5a3da277 100644
--- a/.github/workflows/ec2-deployment.yml
+++ b/.github/workflows/ec2-deployment.yml
@@ -7,7 +7,7 @@ on:
     paths:
       - "Cargo.*"
       - "crates/**"
-      - "packages/evm/contracts/**"
+      - "packages/enclave-contracts/contracts/**"
   pull_request:
     branches:
       - release
@@ -15,7 +15,7 @@ on:
     paths:
       - "Cargo.*"
       - "crates/**"
-      - "packages/evm/contracts/**"
+      - "packages/enclave-contracts/contracts/**"
 
 env:
   DOCKERFILE_PATH: crates/Dockerfile
diff --git a/.github/workflows/releases.yml b/.github/workflows/releases.yml
index 617eb443f0..5d8629aecf 100644
--- a/.github/workflows/releases.yml
+++ b/.github/workflows/releases.yml
@@ -40,14 +40,14 @@ jobs:
           git status --porcelain || true
 
           echo "Checking for problematic files:"
-          ls -la packages/evm/artifacts/contracts/interfaces/ICiphernodeRegistry.sol/ 2>/dev/null || echo "ICiphernodeRegistry.sol directory not found"
-          ls -la packages/evm/artifacts/contracts/interfaces/IEnclave.sol/ 2>/dev/null || echo "IEnclave.sol directory not found"
-          ls -la packages/evm/artifacts/contracts/registry/NaiveRegistryFilter.sol/ 2>/dev/null || echo "NaiveRegistryFilter.sol directory not found"
+          ls -la packages/enclave-contracts/artifacts/contracts/interfaces/ICiphernodeRegistry.sol/ 2>/dev/null || echo "ICiphernodeRegistry.sol directory not found"
+          ls -la packages/enclave-contracts/artifacts/contracts/interfaces/IEnclave.sol/ 2>/dev/null || echo "IEnclave.sol directory not found"
+          ls -la packages/enclave-contracts/artifacts/contracts/registry/NaiveRegistryFilter.sol/ 2>/dev/null || echo "NaiveRegistryFilter.sol directory not found"
 
           # Remove the specific problematic files from git tracking if they exist
-          git rm --cached --ignore-unmatch "packages/evm/artifacts/contracts/interfaces/ICiphernodeRegistry.sol/ICiphernodeRegistry.json" || true
-          git rm --cached --ignore-unmatch "packages/evm/artifacts/contracts/interfaces/IEnclave.sol/IEnclave.json" || true
-          git rm --cached --ignore-unmatch "packages/evm/artifacts/contracts/registry/NaiveRegistryFilter.sol/NaiveRegistryFilter.json" || true
+          git rm --cached --ignore-unmatch "packages/enclave-contracts/artifacts/contracts/interfaces/ICiphernodeRegistry.sol/ICiphernodeRegistry.json" || true
+          git rm --cached --ignore-unmatch "packages/enclave-contracts/artifacts/contracts/interfaces/IEnclave.sol/IEnclave.json" || true
+          git rm --cached --ignore-unmatch "packages/enclave-contracts/artifacts/contracts/registry/NaiveRegistryFilter.sol/NaiveRegistryFilter.json" || true
 
           # Ensure we're on the main branch and up to date
           git checkout main
@@ -61,11 +61,11 @@ jobs:
           git reset --hard HEAD
 
           # Force remove the entire artifacts directory (it should be regenerated by .gitignore rules)
-          rm -rf packages/evm/artifacts/ || true
-          rm -rf packages/evm/cache/ || true
-          rm -rf packages/evm/types/ || true
-          rm -rf packages/evm/node_modules/ || true
-          rm -rf packages/evm/dist/ || true
+          rm -rf packages/enclave-contracts/artifacts/ || true
+          rm -rf packages/enclave-contracts/cache/ || true
+          rm -rf packages/enclave-contracts/types/ || true
+          rm -rf packages/enclave-contracts/node_modules/ || true
+          rm -rf packages/enclave-contracts/dist/ || true
 
           # Also clean up any Rust build artifacts
           rm -rf target/ || true
diff --git a/Cargo.lock b/Cargo.lock
index 38cfe33849..bcbacb941c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -11,7 +11,7 @@ dependencies = [
  "actix-macros",
  "actix-rt",
  "actix_derive",
- "bitflags 2.9.2",
+ "bitflags 2.9.4",
  "bytes",
  "crossbeam-channel",
  "futures-core",
@@ -33,7 +33,7 @@ version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5f7b0a21988c1bf877cf4759ef5ddaac04c1c9fe808c9142ecb78ba97d97a28a"
 dependencies = [
- "bitflags 2.9.2",
+ "bitflags 2.9.4",
  "bytes",
  "futures-core",
  "futures-sink",
@@ -46,16 +46,16 @@ dependencies = [
 
 [[package]]
 name = "actix-http"
-version = "3.11.0"
+version = "3.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44dfe5c9e0004c623edc65391dfd51daa201e7e30ebd9c9bedf873048ec32bc2"
+checksum = "44cceded2fb55f3c4b67068fa64962e2ca59614edc5b03167de9ff82ae803da0"
 dependencies = [
  "actix-codec",
  "actix-rt",
  "actix-service",
  "actix-utils",
  "base64",
- "bitflags 2.9.2",
+ "bitflags 2.9.4",
  "brotli",
  "bytes",
  "bytestring",
@@ -110,9 +110,9 @@ dependencies = [
 
 [[package]]
 name = "actix-rt"
-version = "2.10.0"
+version = "2.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24eda4e2a6e042aa4e55ac438a2ae052d3b5da0ecf83d7411e1a368946925208"
+checksum = "92589714878ca59a7626ea19734f0e07a6a875197eec751bb5d3f99e64998c63"
 dependencies = [
  "futures-core",
  "tokio",
@@ -341,9 +341,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-chains"
-version = "0.2.6"
+version = "0.2.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4195a29a4b87137b2bb02105e746102873bc03561805cf45c0e510c961f160e6"
+checksum = "ef8ff73a143281cb77c32006b04af9c047a6b8fe5860e85a88ad325328965355"
 dependencies = [
  "alloy-primitives",
  "num_enum",
@@ -352,9 +352,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-consensus"
-version = "1.0.24"
+version = "1.0.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eda689f7287f15bd3582daba6be8d1545bad3740fd1fb778f629a1fe866bb43b"
+checksum = "1816584b0c17e3ab5781d7044b07d5b884cf8fe005811b4ae2cded266e0e8c87"
 dependencies = [
  "alloy-eips",
  "alloy-primitives",
@@ -372,14 +372,14 @@ dependencies = [
  "secp256k1",
  "serde",
  "serde_with",
- "thiserror 2.0.15",
+ "thiserror 2.0.16",
 ]
 
 [[package]]
 name = "alloy-consensus-any"
-version = "1.0.24"
+version = "1.0.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b5659581e41e8fe350ecc3593cb5c9dcffddfd550896390f2b78a07af67b0fa"
+checksum = "dbb74c249b00a0e5005efc2aa3ef48c805b278cad848b544d5f53cb266f45976"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -391,9 +391,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-contract"
-version = "1.0.24"
+version = "1.0.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "944085cf3ac8f32d96299aa26c03db7c8ca6cdaafdbc467910b889f0328e6b70"
+checksum = "b5cabcc7fdf60c92df94889d6e1b73814ecf47e99a6554f6dd7f75b45aa9d7fa"
 dependencies = [
  "alloy-consensus",
  "alloy-dyn-abi",
@@ -409,7 +409,7 @@ dependencies = [
  "futures",
  "futures-util",
  "serde_json",
- "thiserror 2.0.15",
+ "thiserror 2.0.16",
 ]
 
 [[package]]
@@ -451,7 +451,7 @@ dependencies = [
  "alloy-rlp",
  "crc",
  "serde",
- "thiserror 2.0.15",
+ "thiserror 2.0.16",
 ]
 
 [[package]]
@@ -475,14 +475,14 @@ dependencies = [
  "alloy-rlp",
  "k256",
  "serde",
- "thiserror 2.0.15",
+ "thiserror 2.0.16",
 ]
 
 [[package]]
 name = "alloy-eips"
-version = "1.0.24"
+version = "1.0.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f35887da30b5fc50267109a3c61cd63e6ca1f45967983641053a40ee83468c1"
+checksum = "82cee87eceefee136d68bba6d7202745c218346f28f0b96ce83b8061c991ddad"
 dependencies = [
  "alloy-eip2124",
  "alloy-eip2930",
@@ -495,14 +495,16 @@ dependencies = [
  "derive_more",
  "either",
  "serde",
+ "serde_with",
  "sha2",
+ "thiserror 2.0.16",
 ]
 
 [[package]]
 name = "alloy-genesis"
-version = "1.0.24"
+version = "1.0.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "11d4009efea6f403b3a80531f9c6f70fc242399498ff71196a1688cc1c901f44"
+checksum = "d3da452bed368030bed0108ad208331f89ae4a7ec75b0c2935d61458a17844bc"
 dependencies = [
  "alloy-eips",
  "alloy-primitives",
@@ -539,24 +541,24 @@ dependencies = [
 
 [[package]]
 name = "alloy-json-rpc"
-version = "1.0.24"
+version = "1.0.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "883dee3b4020fcb5667ee627b4f401e899dad82bf37b246620339dd980720ed9"
+checksum = "eb4dc62df1be5c5f103f66ac8f25bf4d34e7b812e642159918466bb4c0f8e9a9"
 dependencies = [
  "alloy-primitives",
  "alloy-sol-types",
  "http 1.3.1",
  "serde",
  "serde_json",
- "thiserror 2.0.15",
+ "thiserror 2.0.16",
  "tracing",
 ]
 
 [[package]]
 name = "alloy-network"
-version = "1.0.24"
+version = "1.0.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd6e5b8ac1654a05c224390008e43634a2bdc74e181e02cf8ed591d8b3d4ad08"
+checksum = "54e07a4331293a40c1a2fff58739c6da826cd86e3e76cd339af5d99b5e085344"
 dependencies = [
  "alloy-consensus",
  "alloy-consensus-any",
@@ -575,14 +577,14 @@ dependencies = [
  "futures-utils-wasm",
  "serde",
  "serde_json",
- "thiserror 2.0.15",
+ "thiserror 2.0.16",
 ]
 
 [[package]]
 name = "alloy-network-primitives"
-version = "1.0.24"
+version = "1.0.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80d7980333dd9391719756ac28bc2afa9baa705fc70ffd11dc86ab078dd64477"
+checksum = "237f507e38aac68d95389fbfba451a8d18cbdb51c971bc78f643de54bb15e395"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -593,9 +595,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-node-bindings"
-version = "1.0.24"
+version = "1.0.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "984c20af8aee7d123bb4bf40cf758b362b38cb9ff7160d986b6face604a1e6a9"
+checksum = "efb6429689d9b36eb8726d270dcd16f0a564355202a581f535f027eb638a3d66"
 dependencies = [
  "alloy-genesis",
  "alloy-hardforks",
@@ -607,7 +609,7 @@ dependencies = [
  "rand 0.8.5",
  "serde_json",
  "tempfile",
- "thiserror 2.0.15",
+ "thiserror 2.0.16",
  "tracing",
  "url",
 ]
@@ -625,7 +627,7 @@ dependencies = [
  "derive_more",
  "foldhash",
  "hashbrown 0.15.5",
- "indexmap 2.10.0",
+ "indexmap 2.11.0",
  "itoa",
  "k256",
  "keccak-asm",
@@ -641,9 +643,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-provider"
-version = "1.0.24"
+version = "1.0.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "478a42fe167057b7b919cd8b0c2844f0247f667473340dad100eaf969de5754e"
+checksum = "040b10bb781540585e87a1e9f9a0c4f54f49674114f33aa05c9a50cf3c92e26c"
 dependencies = [
  "alloy-chains",
  "alloy-consensus",
@@ -679,7 +681,7 @@ dependencies = [
  "reqwest",
  "serde",
  "serde_json",
- "thiserror 2.0.15",
+ "thiserror 2.0.16",
  "tokio",
  "tracing",
  "url",
@@ -688,9 +690,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-pubsub"
-version = "1.0.24"
+version = "1.0.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0a99b17987f40a066b29b6b56d75e84cd193b866cac27cae17b59f40338de95"
+checksum = "079102403ebc88599cf20f1299f6a108ef9c915c2d0308197dad3afec5b4c56a"
 dependencies = [
  "alloy-json-rpc",
  "alloy-primitives",
@@ -732,9 +734,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-rpc-client"
-version = "1.0.24"
+version = "1.0.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a0c6d723fbdf4a87454e2e3a275e161be27edcfbf46e2e3255dd66c138634b6"
+checksum = "c353b166a2cfb39167ead4f8ec335acdb439ad2a436245bccc218022fe28ca65"
 dependencies = [
  "alloy-json-rpc",
  "alloy-primitives",
@@ -758,9 +760,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-rpc-types"
-version = "1.0.24"
+version = "1.0.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c41492dac39365b86a954de86c47ec23dcc7452cdb2fde591caadc194b3e34c6"
+checksum = "2791cc56e1e5e7a774b172e9a926e0a8f1b0bdc25cc4d486f9672f725be31123"
 dependencies = [
  "alloy-primitives",
  "alloy-rpc-types-anvil",
@@ -775,9 +777,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-rpc-types-anvil"
-version = "1.0.24"
+version = "1.0.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10493fa300a2757d8134f584800fef545c15905c95122bed1f6dde0b0d9dae27"
+checksum = "3936b18dc0ad4f6b1f3f319e518e53d94512b8fcec433b3078654c8c889c2425"
 dependencies = [
  "alloy-primitives",
  "alloy-rpc-types-eth",
@@ -787,9 +789,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-rpc-types-any"
-version = "1.0.24"
+version = "1.0.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f7eb22670a972ad6c222a6c6dac3eef905579acffe9d63ab42be24c7d158535"
+checksum = "9f81c39d47eac1904e378a8079e2903bc1ddb3d9e73d5461c0db6c215d9d7ec1"
 dependencies = [
  "alloy-consensus-any",
  "alloy-rpc-types-eth",
@@ -798,20 +800,21 @@ dependencies = [
 
 [[package]]
 name = "alloy-rpc-types-debug"
-version = "1.0.24"
+version = "1.0.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9b6f0482c82310366ec3dcf4e5212242f256a69fcf1a26e5017e6704091ee95"
+checksum = "9fd5f36cb2ac899c411d7bb69c3e79500bf42291957a974675f82d82249f1f67"
 dependencies = [
  "alloy-primitives",
  "derive_more",
  "serde",
+ "serde_with",
 ]
 
 [[package]]
 name = "alloy-rpc-types-engine"
-version = "1.0.24"
+version = "1.0.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e24c171377c0684e3860385f6d93fbfcc8ecc74f6cce8304c822bf1a50bacce0"
+checksum = "9718f018a4e3d15e136d63ca6a646e0271a3098c5a8bf6759a0cb71d8b2ba7ce"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -826,9 +829,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-rpc-types-eth"
-version = "1.0.24"
+version = "1.0.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b777b98526bbe5b7892ca22a7fd5f18ed624ff664a79f40d0f9f2bf94ba79a84"
+checksum = "b1a21e2b9b9da3f21351b9a34f820aa0580d5709aa821e8bfd26411649750f34"
 dependencies = [
  "alloy-consensus",
  "alloy-consensus-any",
@@ -842,28 +845,28 @@ dependencies = [
  "serde",
  "serde_json",
  "serde_with",
- "thiserror 2.0.15",
+ "thiserror 2.0.16",
 ]
 
 [[package]]
 name = "alloy-rpc-types-trace"
-version = "1.0.24"
+version = "1.0.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6a854af3fe8fce1cfe319fcf84ee8ba8cda352b14d3dd4221405b5fc6cce9e1"
+checksum = "30276c059d90a203403a6c32f685f90b1e0528b25c9b8dc4bf2715d5699d3ada"
 dependencies = [
  "alloy-primitives",
  "alloy-rpc-types-eth",
  "alloy-serde",
  "serde",
  "serde_json",
- "thiserror 2.0.15",
+ "thiserror 2.0.16",
 ]
 
 [[package]]
 name = "alloy-rpc-types-txpool"
-version = "1.0.24"
+version = "1.0.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3cc803e9b8d16154c856a738c376e002abe4b388e5fef91c8aebc8373e99fd45"
+checksum = "3b2f89d56470df030990d88a46403838cc31ca5c89daa0e752a54b81d9b99514"
 dependencies = [
  "alloy-primitives",
  "alloy-rpc-types-eth",
@@ -873,9 +876,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-serde"
-version = "1.0.24"
+version = "1.0.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee8d2c52adebf3e6494976c8542fbdf12f10123b26e11ad56f77274c16a2a039"
+checksum = "432bbb99cfa037b8a50deb4128da7bfc3d094a6b2ac6e9220bf89b1408c5e269"
 dependencies = [
  "alloy-primitives",
  "serde",
@@ -884,9 +887,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-signer"
-version = "1.0.24"
+version = "1.0.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c0494d1e0f802716480aabbe25549c7f6bc2a25ff33b08fd332bbb4b7d06894"
+checksum = "e4b97ec9efdf375ada378d03404e8515c4e04694481fbb8c9e636313130fd734"
 dependencies = [
  "alloy-primitives",
  "async-trait",
@@ -894,14 +897,14 @@ dependencies = [
  "either",
  "elliptic-curve",
  "k256",
- "thiserror 2.0.15",
+ "thiserror 2.0.16",
 ]
 
 [[package]]
 name = "alloy-signer-local"
-version = "1.0.24"
+version = "1.0.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59c2435eb8979a020763ced3fb478932071c56e5f75ea86db41f320915d325ba"
+checksum = "63e6e5b61817be1dfca20a7738eb09c9a85c333ef34ed0ae6946bdff077245fa"
 dependencies = [
  "alloy-consensus",
  "alloy-network",
@@ -910,7 +913,7 @@ dependencies = [
  "async-trait",
  "k256",
  "rand 0.8.5",
- "thiserror 2.0.15",
+ "thiserror 2.0.16",
 ]
 
 [[package]]
@@ -937,7 +940,7 @@ dependencies = [
  "alloy-sol-macro-input",
  "const-hex",
  "heck",
- "indexmap 2.10.0",
+ "indexmap 2.11.0",
  "proc-macro-error2",
  "proc-macro2",
  "quote",
@@ -988,9 +991,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-transport"
-version = "1.0.24"
+version = "1.0.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c0107675e10c7f248bf7273c1e7fdb02409a717269cc744012e6f3c39959bfb"
+checksum = "7c48ab8f6beec1d32754043ad3b4da077e80ba78fd762acfb16a8460336887a2"
 dependencies = [
  "alloy-json-rpc",
  "alloy-primitives",
@@ -1002,7 +1005,7 @@ dependencies = [
  "parking_lot 0.12.4",
  "serde",
  "serde_json",
- "thiserror 2.0.15",
+ "thiserror 2.0.16",
  "tokio",
  "tower 0.5.2",
  "tracing",
@@ -1012,9 +1015,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-transport-http"
-version = "1.0.24"
+version = "1.0.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78e3736701b5433afd06eecff08f0688a71a10e0e1352e0bbf0bed72f0dd4e35"
+checksum = "27e6b0b1188a87bbfbb5adf5ad7dcd0744e03fe3184e8ef683ec29846d884bee"
 dependencies = [
  "alloy-json-rpc",
  "alloy-transport",
@@ -1027,9 +1030,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-transport-ipc"
-version = "1.0.24"
+version = "1.0.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c79064b5a08259581cb5614580010007c2df6deab1e8f3e8c7af8d7e9227008f"
+checksum = "d139efe46da66c26eafbc32ef7e7f6c5a8ed57f5ac9853fd84d6d41b42f6f34b"
 dependencies = [
  "alloy-json-rpc",
  "alloy-pubsub",
@@ -1047,9 +1050,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-transport-ws"
-version = "1.0.24"
+version = "1.0.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77fd607158cb9bc54cbcfcaab4c5f36c5b26994c7dc58b6f095ce27a54f270f3"
+checksum = "b94fdb3e7cb76cb44ef70737f8b6ff08b8b1f14205abfecedbbe3ba0212278a9"
 dependencies = [
  "alloy-pubsub",
  "alloy-transport",
@@ -1065,9 +1068,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-trie"
-version = "0.9.0"
+version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bada1fc392a33665de0dc50d401a3701b62583c655e3522a323490a5da016962"
+checksum = "e3412d52bb97c6c6cc27ccc28d4e6e8cf605469101193b50b0bd5813b1f990b5"
 dependencies = [
  "alloy-primitives",
  "alloy-rlp",
@@ -1081,12 +1084,12 @@ dependencies = [
 
 [[package]]
 name = "alloy-tx-macros"
-version = "1.0.24"
+version = "1.0.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6acb36318dfa50817154064fea7932adf2eec3f51c86680e2b37d7e8906c66bb"
+checksum = "81901009f4ebb0fa0d2b37328ddec6ca420ca06289dddd714bc7ee9be3c86d4b"
 dependencies = [
  "alloy-primitives",
- "darling",
+ "darling 0.21.3",
  "proc-macro2",
  "quote",
  "syn 2.0.106",
@@ -1441,9 +1444,9 @@ dependencies = [
 
 [[package]]
 name = "async-executor"
-version = "1.13.2"
+version = "1.13.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb812ffb58524bdd10860d7d974e2f01cc0950c2438a74ee5ec2e2280c6c4ffa"
+checksum = "497c00e0fd83a72a79a39fcbd8e3e2f055d6f6c7e025f3b3d91f4f8e76527fb8"
 dependencies = [
  "async-task",
  "concurrent-queue",
@@ -1740,9 +1743,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.9.2"
+version = "2.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a65b545ab31d687cff52899d4890855fec459eb6afe0da6417b8a18da87aa29"
+checksum = "2261d10cca569e4643e526d8dc2e62e433cc8aba21ab764233731f8d369bf394"
 
 [[package]]
 name = "bitvec"
@@ -1910,10 +1913,11 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.2.33"
+version = "1.2.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ee0f8803222ba5a7e2777dd72ca451868909b1ac410621b676adf07280e9b5f"
+checksum = "590f9024a68a8c40351881787f1934dc11afd69090f5edb6831464694d836ea3"
 dependencies = [
+ "find-msvc-tools",
  "jobserver",
  "libc",
  "shlex",
@@ -1921,9 +1925,9 @@ dependencies = [
 
 [[package]]
 name = "cfg-if"
-version = "1.0.1"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9555578bc9e57714c812a1f84e4fc5b4d21fcb063490c624de019f7464c91268"
+checksum = "2fd1289c04a9ea8cb22300a459a72a385d7c73d3259e2ed7dcb2af674838cfa9"
 
 [[package]]
 name = "cfg_aliases"
@@ -2053,9 +2057,9 @@ dependencies = [
 
 [[package]]
 name = "const-hex"
-version = "1.14.1"
+version = "1.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83e22e0ed40b96a48d3db274f72fd365bd78f67af39b6bbd47e8a15e1c6207ff"
+checksum = "dccd746bf9b1038c0507b7cec21eb2b11222db96a2902c96e8c185d6d20fb9c4"
 dependencies = [
  "cfg-if",
  "cpufeatures",
@@ -2270,8 +2274,18 @@ version = "0.20.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fc7f46116c46ff9ab3eb1597a45688b6715c6e628b5c133e288e709a29bcb4ee"
 dependencies = [
- "darling_core",
- "darling_macro",
+ "darling_core 0.20.11",
+ "darling_macro 0.20.11",
+]
+
+[[package]]
+name = "darling"
+version = "0.21.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9cdf337090841a411e2a7f3deb9187445851f91b309c0c0a29e05f74a00a48c0"
+dependencies = [
+ "darling_core 0.21.3",
+ "darling_macro 0.21.3",
 ]
 
 [[package]]
@@ -2288,13 +2302,39 @@ dependencies = [
  "syn 2.0.106",
 ]
 
+[[package]]
+name = "darling_core"
+version = "0.21.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1247195ecd7e3c85f83c8d2a366e4210d588e802133e1e355180a9870b517ea4"
+dependencies = [
+ "fnv",
+ "ident_case",
+ "proc-macro2",
+ "quote",
+ "serde",
+ "strsim",
+ "syn 2.0.106",
+]
+
 [[package]]
 name = "darling_macro"
 version = "0.20.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fc34b93ccb385b40dc71c6fceac4b2ad23662c7eeb248cf10d529b7e055b6ead"
 dependencies = [
- "darling_core",
+ "darling_core 0.20.11",
+ "quote",
+ "syn 2.0.106",
+]
+
+[[package]]
+name = "darling_macro"
+version = "0.21.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d38308df82d1080de0afee5d069fa14b0326a88c14f15c5ccda35b4a6c414c81"
+dependencies = [
+ "darling_core 0.21.3",
  "quote",
  "syn 2.0.106",
 ]
@@ -2365,9 +2405,9 @@ dependencies = [
 
 [[package]]
 name = "deranged"
-version = "0.4.0"
+version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c9e6a11ca8224451684bc0d7d5a7adbf8f2fd6887261a1cfc3c0432f9d4068e"
+checksum = "d630bccd429a5bb5a64b5e94f693bfc48c9f8566418fda4c494cc94f911f87cc"
 dependencies = [
  "powerfmt",
  "serde",
@@ -2807,7 +2847,7 @@ dependencies = [
 [[package]]
 name = "e3-greco-generator"
 version = "0.1.0"
-source = "git+https://github.com/gnosisguild/greco#25471873f64fe22163b79a9e27441f52a725ff42"
+source = "git+https://github.com/gnosisguild/greco#77ef983e259c6ed5fd9f226ecc3778c21a6acf2b"
 dependencies = [
  "blake3",
  "clap",
@@ -2828,7 +2868,7 @@ dependencies = [
 [[package]]
 name = "e3-greco-polynomial"
 version = "0.1.0"
-source = "git+https://github.com/gnosisguild/greco#25471873f64fe22163b79a9e27441f52a725ff42"
+source = "git+https://github.com/gnosisguild/greco#77ef983e259c6ed5fd9f226ecc3778c21a6acf2b"
 dependencies = [
  "num-bigint",
  "num-traits",
@@ -3253,7 +3293,7 @@ dependencies = [
 [[package]]
 name = "fhe"
 version = "0.1.0-beta.7"
-source = "git+https://github.com/gnosisguild/fhe.rs#86663a95af6a502b75307281e228b3d60302fd23"
+source = "git+https://github.com/gnosisguild/fhe.rs#ee350f2b759ffa7026eca16af576b6dbdc2a2ebd"
 dependencies = [
  "doc-comment",
  "fhe-math",
@@ -3278,7 +3318,7 @@ dependencies = [
 [[package]]
 name = "fhe-math"
 version = "0.1.0-beta.7"
-source = "git+https://github.com/gnosisguild/fhe.rs#86663a95af6a502b75307281e228b3d60302fd23"
+source = "git+https://github.com/gnosisguild/fhe.rs#ee350f2b759ffa7026eca16af576b6dbdc2a2ebd"
 dependencies = [
  "ethnum",
  "fhe-traits",
@@ -3300,7 +3340,7 @@ dependencies = [
 [[package]]
 name = "fhe-traits"
 version = "0.1.0-beta.7"
-source = "git+https://github.com/gnosisguild/fhe.rs#86663a95af6a502b75307281e228b3d60302fd23"
+source = "git+https://github.com/gnosisguild/fhe.rs#ee350f2b759ffa7026eca16af576b6dbdc2a2ebd"
 dependencies = [
  "rand 0.8.5",
 ]
@@ -3308,7 +3348,7 @@ dependencies = [
 [[package]]
 name = "fhe-util"
 version = "0.1.0-beta.7"
-source = "git+https://github.com/gnosisguild/fhe.rs#86663a95af6a502b75307281e228b3d60302fd23"
+source = "git+https://github.com/gnosisguild/fhe.rs#ee350f2b759ffa7026eca16af576b6dbdc2a2ebd"
 dependencies = [
  "itertools 0.12.1",
  "num-bigint-dig",
@@ -3342,16 +3382,22 @@ dependencies = [
 
 [[package]]
 name = "filetime"
-version = "0.2.25"
+version = "0.2.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586"
+checksum = "bc0505cd1b6fa6580283f6bdf70a73fcf4aba1184038c90902b92b3dd0df63ed"
 dependencies = [
  "cfg-if",
  "libc",
  "libredox",
- "windows-sys 0.59.0",
+ "windows-sys 0.60.2",
 ]
 
+[[package]]
+name = "find-msvc-tools"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e178e4fba8a2726903f6ba98a6d221e76f9c12c650d5dc0e6afdc50677b49650"
+
 [[package]]
 name = "fixed-hash"
 version = "0.8.0"
@@ -3409,9 +3455,9 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
 
 [[package]]
 name = "form_urlencoded"
-version = "1.2.1"
+version = "1.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456"
+checksum = "cb4cb245038516f5f85277875cdaa4f7d2c9a0fa0468de06ed190163b1581fcf"
 dependencies = [
  "percent-encoding",
 ]
@@ -3622,7 +3668,7 @@ dependencies = [
  "js-sys",
  "libc",
  "r-efi",
- "wasi 0.14.2+wasi-0.2.4",
+ "wasi 0.14.3+wasi-0.2.4",
  "wasm-bindgen",
 ]
 
@@ -3648,7 +3694,7 @@ version = "0.20.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2deb07a133b1520dc1a5690e9bd08950108873d7ed5de38dcc74d3b5ebffa110"
 dependencies = [
- "bitflags 2.9.2",
+ "bitflags 2.9.4",
  "libc",
  "libgit2-sys",
  "log",
@@ -3698,7 +3744,7 @@ dependencies = [
  "futures-sink",
  "futures-util",
  "http 0.2.12",
- "indexmap 2.10.0",
+ "indexmap 2.11.0",
  "slab",
  "tokio",
  "tokio-util",
@@ -3717,7 +3763,7 @@ dependencies = [
  "futures-core",
  "futures-sink",
  "http 1.3.1",
- "indexmap 2.10.0",
+ "indexmap 2.11.0",
  "slab",
  "tokio",
  "tokio-util",
@@ -4160,9 +4206,9 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
 
 [[package]]
 name = "idna"
-version = "1.0.3"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e"
+checksum = "3b0875f23caa03898994f6ddc501886a45c7d3d62d04d2d90788d47be1b1e4de"
 dependencies = [
  "idna_adapter",
  "smallvec",
@@ -4276,9 +4322,9 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.10.0"
+version = "2.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe4cd85333e22411419a0bcae1297d25e58c9443848b11dc6a86fefe8c78a661"
+checksum = "f2481980430f9f78649238835720ddccc57e52df14ffce1c6f37391d61b563e9"
 dependencies = [
  "equivalent",
  "hashbrown 0.15.5",
@@ -4346,11 +4392,11 @@ dependencies = [
 
 [[package]]
 name = "io-uring"
-version = "0.7.9"
+version = "0.7.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d93587f37623a1a17d94ef2bc9ada592f5465fe7732084ab7beefabe5c77c0c4"
+checksum = "046fa2d4d00aea763528b4950358d0ead425372445dc8ff86312b3c69ff7727b"
 dependencies = [
- "bitflags 2.9.2",
+ "bitflags 2.9.4",
  "cfg-if",
  "libc",
 ]
@@ -4424,9 +4470,9 @@ checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
 
 [[package]]
 name = "jobserver"
-version = "0.1.33"
+version = "0.1.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38f262f097c174adebe41eb73d66ae9c06b2844fb0da69969647bbddd9b0538a"
+checksum = "9afb3de4395d6b3e67a780b6de64b51c978ecf11cb9a462c66be7d4ca9039d33"
 dependencies = [
  "getrandom 0.3.3",
  "libc",
@@ -4701,7 +4747,7 @@ dependencies = [
  "quick-protobuf",
  "rand 0.8.5",
  "sha2",
- "thiserror 2.0.15",
+ "thiserror 2.0.16",
  "tracing",
  "zeroize",
 ]
@@ -4911,7 +4957,7 @@ version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "391290121bad3d37fbddad76d8f5d1c1c314cfc646d143d7e07a3086ddff0ce3"
 dependencies = [
- "bitflags 2.9.2",
+ "bitflags 2.9.4",
  "libc",
  "redox_syscall 0.5.17",
 ]
@@ -5248,7 +5294,7 @@ dependencies = [
  "log",
  "netlink-packet-core",
  "netlink-sys",
- "thiserror 2.0.15",
+ "thiserror 2.0.16",
 ]
 
 [[package]]
@@ -5487,7 +5533,7 @@ version = "0.10.73"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8505734d46c8ab1e19a1dce3aef597ad87dcb4c37e7188231769bd6bd51cebf8"
 dependencies = [
- "bitflags 2.9.2",
+ "bitflags 2.9.4",
  "cfg-if",
  "foreign-types",
  "libc",
@@ -5535,7 +5581,7 @@ dependencies = [
  "futures-sink",
  "js-sys",
  "pin-project-lite",
- "thiserror 2.0.15",
+ "thiserror 2.0.16",
  "tracing",
 ]
 
@@ -5567,7 +5613,7 @@ dependencies = [
  "opentelemetry_sdk",
  "prost 0.13.5",
  "reqwest",
- "thiserror 2.0.15",
+ "thiserror 2.0.16",
  "tokio",
  "tonic",
  "tracing",
@@ -5611,7 +5657,7 @@ dependencies = [
  "percent-encoding",
  "rand 0.9.2",
  "serde_json",
- "thiserror 2.0.15",
+ "thiserror 2.0.16",
  "tracing",
 ]
 
@@ -5754,9 +5800,9 @@ dependencies = [
 
 [[package]]
 name = "percent-encoding"
-version = "2.3.1"
+version = "2.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
+checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220"
 
 [[package]]
 name = "pest"
@@ -5765,7 +5811,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1db05f56d34358a8b1066f67cbb203ee3e7ed2ba674a6263a1d5ec6db2204323"
 dependencies = [
  "memchr",
- "thiserror 2.0.15",
+ "thiserror 2.0.16",
  "ucd-trie",
 ]
 
@@ -5776,7 +5822,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db"
 dependencies = [
  "fixedbitset",
- "indexmap 2.10.0",
+ "indexmap 2.11.0",
 ]
 
 [[package]]
@@ -5938,9 +5984,9 @@ checksum = "f84267b20a16ea918e43c6a88433c2d54fa145c92a811b5b047ccbe153674483"
 
 [[package]]
 name = "potential_utf"
-version = "0.1.2"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5a7c30837279ca13e7c867e9e40053bc68740f988cb07f7ca6df43cc734b585"
+checksum = "84df19adbe5b5a0782edcab45899906947ab039ccf4573713735ee7de1e6b08a"
 dependencies = [
  "zerovec",
 ]
@@ -5962,9 +6008,9 @@ dependencies = [
 
 [[package]]
 name = "prettyplease"
-version = "0.2.36"
+version = "0.2.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff24dfcda44452b9816fff4cd4227e1bb73ff5a2f1bc1105aa92fb8565ce44d2"
+checksum = "479ca8adacdd7ce8f1fb39ce9ecccbfe93a3f1344b3d0d97f20bc0196208f62b"
 dependencies = [
  "proc-macro2",
  "syn 2.0.106",
@@ -6063,13 +6109,13 @@ checksum = "6fcdab19deb5195a31cf7726a210015ff1496ba1464fd42cb4f537b8b01b471f"
 dependencies = [
  "bit-set",
  "bit-vec 0.8.0",
- "bitflags 2.9.2",
+ "bitflags 2.9.4",
  "lazy_static",
  "num-traits",
  "rand 0.9.2",
  "rand_chacha 0.9.0",
  "rand_xorshift",
- "regex-syntax 0.8.5",
+ "regex-syntax 0.8.6",
  "rusty-fork",
  "tempfile",
  "unarray",
@@ -6181,9 +6227,9 @@ dependencies = [
 
 [[package]]
 name = "quinn"
-version = "0.11.8"
+version = "0.11.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "626214629cda6781b6dc1d316ba307189c85ba657213ce642d9c77670f8202c8"
+checksum = "b9e20a958963c291dc322d98411f541009df2ced7b5a4f2bd52337638cfccf20"
 dependencies = [
  "bytes",
  "cfg_aliases",
@@ -6193,8 +6239,8 @@ dependencies = [
  "quinn-udp",
  "rustc-hash",
  "rustls",
- "socket2 0.5.10",
- "thiserror 2.0.15",
+ "socket2 0.6.0",
+ "thiserror 2.0.16",
  "tokio",
  "tracing",
  "web-time",
@@ -6202,9 +6248,9 @@ dependencies = [
 
 [[package]]
 name = "quinn-proto"
-version = "0.11.12"
+version = "0.11.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49df843a9161c85bb8aae55f101bc0bac8bcafd637a620d9122fd7e0b2f7422e"
+checksum = "f1906b49b0c3bc04b5fe5d86a77925ae6524a19b816ae38ce1e426255f1d8a31"
 dependencies = [
  "bytes",
  "getrandom 0.3.3",
@@ -6215,7 +6261,7 @@ dependencies = [
  "rustls",
  "rustls-pki-types",
  "slab",
- "thiserror 2.0.15",
+ "thiserror 2.0.16",
  "tinyvec",
  "tracing",
  "web-time",
@@ -6223,16 +6269,16 @@ dependencies = [
 
 [[package]]
 name = "quinn-udp"
-version = "0.5.13"
+version = "0.5.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fcebb1209ee276352ef14ff8732e24cc2b02bbac986cd74a4c81bcb2f9881970"
+checksum = "addec6a0dcad8a8d96a771f815f0eaf55f9d1805756410b39f5fa81332574cbd"
 dependencies = [
  "cfg_aliases",
  "libc",
  "once_cell",
- "socket2 0.5.10",
+ "socket2 0.6.0",
  "tracing",
- "windows-sys 0.59.0",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
@@ -6396,7 +6442,7 @@ version = "0.5.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5407465600fb0548f1442edf71dd20683c6ed326200ace4b1ef0763521bb3b77"
 dependencies = [
- "bitflags 2.9.2",
+ "bitflags 2.9.4",
 ]
 
 [[package]]
@@ -6418,7 +6464,7 @@ checksum = "a4e608c6638b9c18977b00b475ac1f28d14e84b27d8d42f70e0bf1e3dec127ac"
 dependencies = [
  "getrandom 0.2.16",
  "libredox",
- "thiserror 2.0.15",
+ "thiserror 2.0.16",
 ]
 
 [[package]]
@@ -6449,8 +6495,8 @@ checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-automata 0.4.9",
- "regex-syntax 0.8.5",
+ "regex-automata 0.4.10",
+ "regex-syntax 0.8.6",
 ]
 
 [[package]]
@@ -6464,20 +6510,20 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.4.9"
+version = "0.4.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908"
+checksum = "6b9458fa0bfeeac22b5ca447c63aaf45f28439a709ccd244698632f9aa6394d6"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-syntax 0.8.5",
+ "regex-syntax 0.8.6",
 ]
 
 [[package]]
 name = "regex-lite"
-version = "0.1.6"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53a49587ad06b26609c52e423de037e7f57f20d53535d66e08c695f347df952a"
+checksum = "943f41321c63ef1c92fd763bfe054d2668f7f225a5c29f0105903dc2fc04ba30"
 
 [[package]]
 name = "regex-syntax"
@@ -6487,9 +6533,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
 
 [[package]]
 name = "regex-syntax"
-version = "0.8.5"
+version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
+checksum = "caf4aa5b0f434c91fe5c7f1ecb6a5ece2130b02ad2a590589dda5146df959001"
 
 [[package]]
 name = "reqwest"
@@ -6690,7 +6736,7 @@ version = "1.0.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "11181fbabf243db407ef8df94a6ce0b2f9a733bd8be4ad02b4eda9602296cac8"
 dependencies = [
- "bitflags 2.9.2",
+ "bitflags 2.9.4",
  "errno",
  "libc",
  "linux-raw-sys",
@@ -6858,7 +6904,7 @@ version = "2.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02"
 dependencies = [
- "bitflags 2.9.2",
+ "bitflags 2.9.4",
  "core-foundation",
  "core-foundation-sys",
  "libc",
@@ -6968,7 +7014,7 @@ dependencies = [
  "chrono",
  "hex",
  "indexmap 1.9.3",
- "indexmap 2.10.0",
+ "indexmap 2.11.0",
  "schemars 0.9.0",
  "schemars 1.0.4",
  "serde",
@@ -6984,7 +7030,7 @@ version = "3.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "de90945e6565ce0d9a25098082ed4ee4002e047cb59892c318d66821e14bb30f"
 dependencies = [
- "darling",
+ "darling 0.20.11",
  "proc-macro2",
  "quote",
  "syn 2.0.106",
@@ -6996,7 +7042,7 @@ version = "0.9.34+deprecated"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47"
 dependencies = [
- "indexmap 2.10.0",
+ "indexmap 2.11.0",
  "itoa",
  "ryu",
  "serde",
@@ -7326,7 +7372,7 @@ version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b"
 dependencies = [
- "bitflags 2.9.2",
+ "bitflags 2.9.4",
  "core-foundation",
  "system-configuration-sys",
 ]
@@ -7382,11 +7428,11 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "2.0.15"
+version = "2.0.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80d76d3f064b981389ecb4b6b7f45a0bf9fdac1d5b9204c7bd6714fecc302850"
+checksum = "3467d614147380f2e4e374161426ff399c91084acd2363eaf549172b3d5e60c0"
 dependencies = [
- "thiserror-impl 2.0.15",
+ "thiserror-impl 2.0.16",
 ]
 
 [[package]]
@@ -7402,9 +7448,9 @@ dependencies = [
 
 [[package]]
 name = "thiserror-impl"
-version = "2.0.15"
+version = "2.0.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44d29feb33e986b6ea906bd9c3559a856983f92371b3eaa5e83782a351623de0"
+checksum = "6c5e1be1c48b9172ee610da68fd9cd2770e7a4056cb3fc98710ee6906f0c7960"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -7431,12 +7477,11 @@ dependencies = [
 
 [[package]]
 name = "time"
-version = "0.3.41"
+version = "0.3.43"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a7619e19bc266e0f9c5e6686659d394bc57973859340060a69221e57dbc0c40"
+checksum = "83bde6f1ec10e72d583d91623c939f623002284ef622b87de38cfd546cbf2031"
 dependencies = [
  "deranged",
- "itoa",
  "num-conv",
  "powerfmt",
  "serde",
@@ -7446,15 +7491,15 @@ dependencies = [
 
 [[package]]
 name = "time-core"
-version = "0.1.4"
+version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c9e9a38711f559d9e3ce1cdb06dd7c5b8ea546bc90052da6d06bb76da74bb07c"
+checksum = "40868e7c1d2f0b8d73e4a8c7f0ff63af4f6d19be117e90bd73eb1d62cf831c6b"
 
 [[package]]
 name = "time-macros"
-version = "0.2.22"
+version = "0.2.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3526739392ec93fd8b359c8e98514cb3e8e021beb4e5f597b00a0221f8ed8a49"
+checksum = "30cfb0125f12d9c277f35663a0a33f8c30190f4e4574868a330595412d34ebf3"
 dependencies = [
  "num-conv",
  "time-core",
@@ -7481,9 +7526,9 @@ dependencies = [
 
 [[package]]
 name = "tinyvec"
-version = "1.9.0"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09b3661f17e86524eccd4371ab0429194e0d7c008abb45f7a7495b1719463c71"
+checksum = "bfa5fdc3bce6191a1dbc8c02d5c8bffcf557bafa17c124c5264a458f1b0613fa"
 dependencies = [
  "tinyvec_macros",
 ]
@@ -7613,7 +7658,7 @@ version = "0.22.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "41fe8c660ae4257887cf66394862d21dbca4a6ddd26f04a3560410406a2f819a"
 dependencies = [
- "indexmap 2.10.0",
+ "indexmap 2.11.0",
  "serde",
  "serde_spanned",
  "toml_datetime",
@@ -7694,7 +7739,7 @@ version = "0.6.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "adc82fd73de2a9722ac5da747f12383d2bfdb93591ee6c58486e0097890f05f2"
 dependencies = [
- "bitflags 2.9.2",
+ "bitflags 2.9.4",
  "bytes",
  "futures-util",
  "http 1.3.1",
@@ -7820,7 +7865,7 @@ dependencies = [
  "rustls",
  "rustls-pki-types",
  "sha1",
- "thiserror 2.0.15",
+ "thiserror 2.0.16",
  "utf-8",
 ]
 
@@ -8025,11 +8070,11 @@ checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
 
 [[package]]
 name = "wasi"
-version = "0.14.2+wasi-0.2.4"
+version = "0.14.3+wasi-0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9683f9a5a998d873c0d21fcbe3c083009670149a8fab228644b8bd36b2c48cb3"
+checksum = "6a51ae83037bdd272a9e28ce236db8c07016dd0d50c27038b3f407533c030c95"
 dependencies = [
- "wit-bindgen-rt",
+ "wit-bindgen",
 ]
 
 [[package]]
@@ -8105,9 +8150,9 @@ dependencies = [
 
 [[package]]
 name = "wasmtimer"
-version = "0.4.2"
+version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8d49b5d6c64e8558d9b1b065014426f35c18de636895d24893dbbd329743446"
+checksum = "1c598d6b99ea013e35844697fc4670d08339d5cda15588f193c6beedd12f644b"
 dependencies = [
  "futures",
  "js-sys",
@@ -8506,9 +8551,9 @@ checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486"
 
 [[package]]
 name = "winnow"
-version = "0.7.12"
+version = "0.7.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3edebf492c8125044983378ecb5766203ad3b4c2f7a922bd7dd207f6d443e95"
+checksum = "21a0236b59786fed61e2a80582dd500fe61f18b5dca67a4a067d0bc9039339cf"
 dependencies = [
  "memchr",
 ]
@@ -8524,13 +8569,10 @@ dependencies = [
 ]
 
 [[package]]
-name = "wit-bindgen-rt"
-version = "0.39.0"
+name = "wit-bindgen"
+version = "0.45.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1"
-dependencies = [
- "bitflags 2.9.2",
-]
+checksum = "052283831dbae3d879dc7f51f3d92703a316ca49f91540417d38591826127814"
 
 [[package]]
 name = "writeable"
@@ -8551,7 +8593,7 @@ dependencies = [
  "pharos",
  "rustc_version 0.4.1",
  "send_wrapper",
- "thiserror 2.0.15",
+ "thiserror 2.0.16",
  "wasm-bindgen",
  "wasm-bindgen-futures",
  "web-sys",
diff --git a/crates/Dockerfile b/crates/Dockerfile
index 6ea06cdd9e..5526f2da9c 100644
--- a/crates/Dockerfile
+++ b/crates/Dockerfile
@@ -5,7 +5,7 @@ COPY crates/wasm/package.json ./crates/wasm/package.json
 COPY packages/enclave-react ./packages/enclave-react
 COPY packages/enclave-sdk ./packages/enclave-sdk
 COPY packages/enclave-config ./packages/enclave-config
-COPY packages/evm ./packages/evm
+COPY packages/enclave-contracts ./packages/enclave-contracts
 COPY pnpm-workspace.yaml .
 COPY pnpm-lock.yaml .
 
@@ -13,7 +13,7 @@ RUN npm install -g corepack
 RUN corepack enable
 
 # We just need the contracts to be compiled here
-RUN cd packages/evm && pnpm install && pnpm compile:contracts
+RUN cd packages/enclave-contracts && pnpm install && pnpm compile:contracts
 
 # Build stage
 FROM rust:1.86 AS ciphernode-builder
@@ -31,8 +31,8 @@ COPY Cargo.toml ./Cargo.toml
 COPY ./rust-toolchain.toml .
 
 WORKDIR /build/crates
-COPY --from=evm-builder /build/packages/evm/artifacts ../packages/evm/artifacts
-COPY --from=evm-builder /build/packages/evm/deployments ../packages/evm/deployments
+COPY --from=evm-builder /build/packages/enclave-contracts/artifacts ../packages/enclave-contracts/artifacts
+COPY --from=evm-builder /build/packages/enclave-contracts/deployments ../packages/enclave-contracts/deployments
 
 
 # find crates/* -name "Cargo.toml" -not -path "*/support/*" -printf "COPY %p %p\n" | sed 's|COPY \(.*\) crates/|COPY \1 ./|'
diff --git a/crates/entrypoint/build.rs b/crates/entrypoint/build.rs
index f9d0783c0e..6f2a568fab 100644
--- a/crates/entrypoint/build.rs
+++ b/crates/entrypoint/build.rs
@@ -21,7 +21,7 @@ fn main() -> std::io::Result<()> {
         .join("..")
         .join("..")
         .join("packages")
-        .join("evm")
+        .join("enclave-contracts")
         .join("deployments")
         .join("sepolia");
 
@@ -63,7 +63,7 @@ fn main() -> std::io::Result<()> {
     let out_dir = env::var("OUT_DIR").unwrap();
     let dest_path = Path::new(&out_dir).join("contract_deployments.rs");
     fs::write(dest_path, contract_info)?;
-    println!("cargo:rerun-if-changed=../../packages/evm/deployments/sepolia");
+    println!("cargo:rerun-if-changed=../../packages/enclave-contracts/deployments/sepolia");
 
     Ok(())
 }
diff --git a/crates/evm/src/ciphernode_registry_sol.rs b/crates/evm/src/ciphernode_registry_sol.rs
index 3ad92b8a8e..b2f1353bb1 100644
--- a/crates/evm/src/ciphernode_registry_sol.rs
+++ b/crates/evm/src/ciphernode_registry_sol.rs
@@ -21,7 +21,7 @@ sol!(
     #[sol(rpc)]
     #[derive(Debug)]
     ICiphernodeRegistry,
-    "../../packages/evm/artifacts/contracts/interfaces/ICiphernodeRegistry.sol/ICiphernodeRegistry.json"
+    "../../packages/enclave-contracts/artifacts/contracts/interfaces/ICiphernodeRegistry.sol/ICiphernodeRegistry.json"
 );
 
 struct CiphernodeAddedWithChainId(pub ICiphernodeRegistry::CiphernodeAdded, pub u64);
diff --git a/crates/evm/src/enclave_sol_reader.rs b/crates/evm/src/enclave_sol_reader.rs
index 7b90be2418..9cb019423b 100644
--- a/crates/evm/src/enclave_sol_reader.rs
+++ b/crates/evm/src/enclave_sol_reader.rs
@@ -19,7 +19,7 @@ use tracing::{error, info, trace};
 sol!(
     #[sol(rpc)]
     IEnclave,
-    "../../packages/evm/artifacts/contracts/interfaces/IEnclave.sol/IEnclave.json"
+    "../../packages/enclave-contracts/artifacts/contracts/interfaces/IEnclave.sol/IEnclave.json"
 );
 
 struct E3RequestedWithChainId(pub IEnclave::E3Requested, pub u64);
diff --git a/crates/evm/src/enclave_sol_writer.rs b/crates/evm/src/enclave_sol_writer.rs
index 19b163eddb..cc2f2cc4ee 100644
--- a/crates/evm/src/enclave_sol_writer.rs
+++ b/crates/evm/src/enclave_sol_writer.rs
@@ -25,7 +25,7 @@ use tracing::info;
 sol!(
     #[sol(rpc)]
     IEnclave,
-    "../../packages/evm/artifacts/contracts/interfaces/IEnclave.sol/IEnclave.json"
+    "../../packages/enclave-contracts/artifacts/contracts/interfaces/IEnclave.sol/IEnclave.json"
 );
 
 /// Consumes events from the event bus and calls EVM methods on the Enclave.sol contract
diff --git a/crates/evm/src/registry_filter_sol.rs b/crates/evm/src/registry_filter_sol.rs
index 1ec4507444..bde572ea9c 100644
--- a/crates/evm/src/registry_filter_sol.rs
+++ b/crates/evm/src/registry_filter_sol.rs
@@ -22,7 +22,7 @@ use tracing::info;
 sol!(
     #[sol(rpc)]
     NaiveRegistryFilter,
-    "../../packages/evm/artifacts/contracts/registry/NaiveRegistryFilter.sol/NaiveRegistryFilter.json"
+    "../../packages/enclave-contracts/artifacts/contracts/registry/NaiveRegistryFilter.sol/NaiveRegistryFilter.json"
 );
 
 pub struct RegistryFilterSolWriter<P> {
diff --git a/crates/init/src/lib.rs b/crates/init/src/lib.rs
index 37e0f65eb6..a081f1a3cc 100644
--- a/crates/init/src/lib.rs
+++ b/crates/init/src/lib.rs
@@ -53,7 +53,7 @@ async fn install_enclave(cwd: &PathBuf, template: Option<String>, verbose: bool)
     let evm_version = spinner
         .run("Getting workspace version of enclave...", || async {
             package_json::get_version_from_package_json(
-                &PathBuf::from(TEMP_DIR).join("packages/evm/package.json"),
+                &PathBuf::from(TEMP_DIR).join("packages/enclave-contracts/package.json"),
             )
             .await
         })
@@ -87,18 +87,18 @@ async fn install_enclave(cwd: &PathBuf, template: Option<String>, verbose: bool)
                 &vec![
                     Filter::new(
                         "**/package.json",
-                        r#""@gnosis-guild/enclave":\s*"[^"]*""#,
-                        &format!(r#""@gnosis-guild/enclave": "{}""#, evm_version),
+                        r#""@enclave-e3/contracts":\s*"[^"]*""#,
+                        &format!(r#""@enclave-e3/contracts": "{}""#, evm_version),
                     ),
                     Filter::new(
                         "**/package.json",
-                        r#""@gnosis-guild/enclave-react":\s*"[^"]*""#,
-                        &format!(r#""@gnosis-guild/enclave-react": "{}""#, react_version),
+                        r#""@enclave-e3/react":\s*"[^"]*""#,
+                        &format!(r#""@enclave-e3/react": "{}""#, react_version),
                     ),
                     Filter::new(
                         "**/package.json",
-                        r#""@gnosis-guild/enclave-sdk":\s*"[^"]*""#,
-                        &format!(r#""@gnosis-guild/enclave-sdk": "{}""#, sdk_version),
+                        r#""@enclave-e3/sdk":\s*"[^"]*""#,
+                        &format!(r#""@enclave-e3/sdk": "{}""#, sdk_version),
                     ),
                 ],
             )
diff --git a/crates/wasm/CHANGELOG.md b/crates/wasm/CHANGELOG.md
new file mode 100644
index 0000000000..7537b9e458
--- /dev/null
+++ b/crates/wasm/CHANGELOG.md
@@ -0,0 +1,7 @@
+# @enclave-e3/wasm
+
+## 0.0.6-test.0
+
+### Patch Changes
+
+- Migrate npm org
diff --git a/crates/wasm/README.md b/crates/wasm/README.md
index 1abb021467..841c3f08ca 100644
--- a/crates/wasm/README.md
+++ b/crates/wasm/README.md
@@ -12,15 +12,15 @@ This is because in modern node there is no need for preloading however in the br
 
 ```ts
 // Bad! Because this uses the raw loader which doesn't exist in node contexts
-import init, { bfvEncryptNumber } from "@gnosis-guild/e3-wasm";
+import init, { bfvEncryptNumber } from "@enclave-e3/wasm";
 ```
 
 ##### ✅ DO USE THE EXPORTED SUBMODULE
 
 ```ts
 // Good! Use the universal loader
-import init from "@gnosis-guild/e3-wasm/init";
-import { bfvEncryptNumber } from "@gnosis-guild/e3-wasm";
+import init from "@enclave-e3/wasm/init";
+import { bfvEncryptNumber } from "@enclave-e3/wasm";
 
 export async function bfvEncryptNumber(
   data: bigint,
diff --git a/crates/wasm/package.json b/crates/wasm/package.json
index bd1dbd416e..9fbc799459 100644
--- a/crates/wasm/package.json
+++ b/crates/wasm/package.json
@@ -1,15 +1,22 @@
 {
-  "name": "@gnosis-guild/e3-wasm",
-  "private": false,
-  "version": "0.0.6-test",
+  "name": "@enclave-e3/wasm",
+  "version": "0.0.10-test",
   "description": "Wasm modules for enclave.",
   "main": "dist/nodejs/e3_wasm.js",
   "module": "dist/web/e3_wasm.js",
   "types": "dist/web/e3_wasm.d.ts",
   "files": [
     "dist/",
-    "dist/**/*"
+    "dist/nodejs/**",
+    "dist/web/**",
+    "init_node.js",
+    "init_node.cjs",
+    "init_web.js",
+    "init.d.ts"
   ],
+  "publishConfig": {
+    "access": "public"
+  },
   "scripts": {
     "build": "./scripts/build.sh",
     "prerelease": "pnpm build",
diff --git a/deploy/local/contracts.sh b/deploy/local/contracts.sh
index 7497c550f9..95337162e8 100755
--- a/deploy/local/contracts.sh
+++ b/deploy/local/contracts.sh
@@ -4,7 +4,7 @@
 cargo install --locked --path ./crates/cli --bin enclave -f
 
 # Deploy Contacts
-(cd packages/evm && rm -rf deployments/localhost && pnpm deploy:mocks --network localhost)
+(cd packages/enclave-contracts && rm -rf deployments/localhost && pnpm deploy:mocks --network localhost)
 
 # Deploy CRISP Contracts
 (cd examples/CRISP && ETH_WALLET_PRIVATE_KEY=0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80 FOUNDRY_PROFILE=local forge script --rpc-url http://localhost:8545 --broadcast deploy/Deploy.s.sol)
diff --git a/deploy/local/start.sh b/deploy/local/start.sh
index 7daece27e7..bb3eb52dcf 100755
--- a/deploy/local/start.sh
+++ b/deploy/local/start.sh
@@ -68,7 +68,7 @@ deploy_contracts() {
     
     # Deploy Enclave contracts
     echo "   Deploying Enclave contracts..."
-    (cd packages/evm && rm -rf deployments/localhost && pnpm deploy:mocks --network localhost)
+    (cd packages/enclave-contracts && rm -rf deployments/localhost && pnpm deploy:mocks --network localhost)
     
     # Deploy CRISP contracts
     echo "   Deploying CRISP contracts..."
diff --git a/docs/package.json b/docs/package.json
index 30d19cb424..d59cdf148b 100644
--- a/docs/package.json
+++ b/docs/package.json
@@ -1,6 +1,7 @@
 {
   "name": "enclave-docs",
   "version": "1.0.0",
+  "private": true,
   "description": "the official documentation for Enclave.",
   "main": "index.js",
   "scripts": {
diff --git a/docs/pages/CRISP/setup.mdx b/docs/pages/CRISP/setup.mdx
index 5d19767a36..00724d4a3d 100644
--- a/docs/pages/CRISP/setup.mdx
+++ b/docs/pages/CRISP/setup.mdx
@@ -176,10 +176,10 @@ Keep this terminal open and running. Open a new terminal for the next steps.
    pnpm install
    ```
 
-3. Navigate to the `packages/evm` directory:
+3. Navigate to the `packages/enclave-contracts` directory:
 
    ```sh
-   cd packages/evm
+   cd packages/enclave-contracts
    ```
 
 4. Deploy the Enclave contracts on the local testnet:
@@ -247,7 +247,7 @@ Start the ciphernodes using the Enclave CLI:
 
    ```sh
    # Navigate back to the Enclave repository
-   cd ../../packages/evm
+   cd ../../packages/enclave-contracts
    
    # Add the ciphernodes
    pnpm ciphernode:add --ciphernode-address "0xbDA5747bFD65F08deb54cb465eB87D40e51B197E" --network "localhost"
diff --git a/docs/pages/setting-up-server.mdx b/docs/pages/setting-up-server.mdx
index e8a891710a..8f6923419f 100644
--- a/docs/pages/setting-up-server.mdx
+++ b/docs/pages/setting-up-server.mdx
@@ -32,13 +32,13 @@ The Enclave SDK handles much of this complexity for you, providing:
 For TypeScript/JavaScript applications:
 
 ```bash
-pnpm add @gnosis-guild/enclave
+pnpm add @enclave-e3/contracts
 ```
 
 For React applications:
 
 ```bash
-pnpm add @gnosis-guild/enclave @gnosis-guild/enclave-react
+pnpm add @enclave-e3/contracts @enclave-e3/react
 ```
 
 ### Basic TypeScript Client
@@ -46,7 +46,7 @@ pnpm add @gnosis-guild/enclave @gnosis-guild/enclave-react
 Create a type-safe client that can interact with Enclave contracts:
 
 ```typescript
-import { EnclaveSDK, EnclaveEventType } from '@gnosis-guild/enclave-sdk'
+import { EnclaveSDK, EnclaveEventType } from '@enclave-e3/sdk'
 import { createPublicClient, createWalletClient, http, custom } from 'viem'
 
 // Initialize clients
@@ -92,7 +92,7 @@ For React applications, use the `useEnclaveSDK` hook for seamless integration:
 
 ```typescript
 import React, { useEffect, useState } from 'react';
-import { useEnclaveSDK } from '@gnosis-guild/enclave-react';
+import { useEnclaveSDK } from '@enclave-e3/react';
 
 function E3Dashboard() {
   const [e3Data, setE3Data] = useState(null);
@@ -208,7 +208,7 @@ sdk.onEnclaveEvent(EnclaveEventType.CIPHERTEXT_OUTPUT_PUBLISHED, (event) => {
 ### Registry Events
 
 ```typescript
-import { RegistryEventType } from '@gnosis-guild/enclave/sdk'
+import { RegistryEventType } from '@enclave-e3/sdk'
 
 // Monitor ciphernode network changes
 sdk.onEnclaveEvent(RegistryEventType.CIPHERNODE_ADDED, (event) => {
@@ -225,7 +225,7 @@ sdk.onEnclaveEvent(RegistryEventType.COMMITTEE_PUBLISHED, (event) => {
 For server-side applications, you can create automated coordination services:
 
 ```typescript
-import { EnclaveSDK } from '@gnosis-guild/enclave-sdk'
+import { EnclaveSDK } from '@enclave-e3/sdk'
 import { createPublicClient, createWalletClient, http } from 'viem'
 import { privateKeyToAccount } from 'viem/accounts'
 
@@ -299,7 +299,7 @@ server.start()
 The SDK includes comprehensive error handling:
 
 ```typescript
-import { SDKError } from '@gnosis-guild/enclave-sdk'
+import { SDKError } from '@enclave-e3/sdk'
 
 try {
   await sdk.requestE3(params)
diff --git a/docs/pages/write-e3-contract.mdx b/docs/pages/write-e3-contract.mdx
index ddd625e7eb..ca0dd05175 100644
--- a/docs/pages/write-e3-contract.mdx
+++ b/docs/pages/write-e3-contract.mdx
@@ -44,7 +44,7 @@ and initialize the new E3. Some useful validations include:
   Compute Provider chosen for your E3 Program.
 
 For an example, see this
-[mockup](https://github.com/gnosisguild/enclave/blob/cf50fd6c10f0df8f03eecfd19cedc17b051e72a6/packages/evm/contracts/test/MockE3Program.sol#L9)
+[mockup](https://github.com/gnosisguild/enclave/blob/cf50fd6c10f0df8f03eecfd19cedc17b051e72a6/packages/enclave-contracts/contracts/test/MockE3Program.sol#L9)
 or check out the
 [demo implementation for the CRISP protocol](https://github.com/gnosisguild/CRISP/blob/9ffc89aedf92e8f8eb8a21b03091b1f48b587fe4/packages/risc0/contracts/CRISPRisc0.sol#L28).
 
@@ -80,7 +80,7 @@ most likely be used in tandem with a proof generated by your Data Provider.
 ```solidity
 pragma solidity >=0.8.27;
 
-import {IInputValidator} from "@gnosis-guild/enclave/interfaces.sol";
+import {IInputValidator} from "@enclave-e3/contracts/interfaces.sol";
 
 contract MyInputValidator is IInputValidator {
     function validate(address sender, bytes memory data) external override returns (bytes memory, bool) {
diff --git a/examples/CRISP/CHANGELOG.md b/examples/CRISP/CHANGELOG.md
new file mode 100644
index 0000000000..f65a9e976c
--- /dev/null
+++ b/examples/CRISP/CHANGELOG.md
@@ -0,0 +1,8 @@
+# crisp
+
+## 0.0.1-test.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @enclave-e3/contracts@0.0.6-test.0
diff --git a/examples/CRISP/Readme.md b/examples/CRISP/Readme.md
index 604d485814..3301731c19 100644
--- a/examples/CRISP/Readme.md
+++ b/examples/CRISP/Readme.md
@@ -122,7 +122,7 @@ Keep Anvil running in the terminal, and open a new terminal for the next steps.
 2. Navigate to the `evm` directory:
 
    ```sh
-   cd enclave/packages/evm
+   cd enclave/packages/enclave-contracts
    ```
 
 3. Install dependencies:
diff --git a/examples/CRISP/client/libs/wasm/pkg/crisp_worker.js b/examples/CRISP/client/libs/wasm/pkg/crisp_worker.js
index 7bda3f3597..96c965c001 100755
--- a/examples/CRISP/client/libs/wasm/pkg/crisp_worker.js
+++ b/examples/CRISP/client/libs/wasm/pkg/crisp_worker.js
@@ -4,7 +4,7 @@
 // without even the implied warranty of MERCHANTABILITY
 // or FITNESS FOR A PARTICULAR PURPOSE.
 
-import { EnclaveSDK, FheProtocol } from '@gnosis-guild/enclave-sdk';
+import { EnclaveSDK, FheProtocol } from '@enclave-e3/sdk';
 import circuit from "../../noir/crisp_circuit.json";
 
 self.onmessage = async function (event) {
diff --git a/examples/CRISP/client/package.json b/examples/CRISP/client/package.json
index 536ea539d8..99de09fc34 100644
--- a/examples/CRISP/client/package.json
+++ b/examples/CRISP/client/package.json
@@ -18,7 +18,7 @@
     "deploy": "gh-pages -d dist"
   },
   "dependencies": {
-    "@gnosis-guild/enclave-sdk": "workspace:*",
+    "@enclave-e3/sdk": "^0.0.10-test",
     "@aztec/bb.js": "^0.82.2",
     "@emotion/babel-plugin": "^11.11.0",
     "@emotion/react": "^11.11.4",
diff --git a/examples/CRISP/client/vite.config.ts b/examples/CRISP/client/vite.config.ts
index fac9ef938f..62f5bcabbb 100644
--- a/examples/CRISP/client/vite.config.ts
+++ b/examples/CRISP/client/vite.config.ts
@@ -23,7 +23,7 @@ export default defineConfig({
   },
   optimizeDeps: {
     esbuildOptions: { target: "esnext" },
-    exclude: ['@rollup/browser', '@noir-lang/noirc_abi', '@noir-lang/acvm_js'],
+    exclude: ['@rollup/browser', '@noir-lang/noirc_abi', '@noir-lang/acvm_js', '@enclave-e3/wasm', '@enclave-e3/wasm/init'],
   },
   resolve: {
     alias: {
diff --git a/examples/CRISP/contracts/CRISPInputValidator.sol b/examples/CRISP/contracts/CRISPInputValidator.sol
index 60cfbd1244..4eccbdd0ed 100644
--- a/examples/CRISP/contracts/CRISPInputValidator.sol
+++ b/examples/CRISP/contracts/CRISPInputValidator.sol
@@ -5,7 +5,7 @@
 // or FITNESS FOR A PARTICULAR PURPOSE.
 pragma solidity >=0.8.27;
 
-import {IInputValidator} from "@gnosis-guild/enclave/contracts/interfaces/IInputValidator.sol";
+import {IInputValidator} from "@enclave-e3/contracts/contracts/interfaces/IInputValidator.sol";
 import {IBasePolicy} from "@excubiae/contracts/interfaces/IBasePolicy.sol";
 import {Clone} from "@excubiae/contracts/proxy/Clone.sol";
 import {IVerifier} from "./CRISPVerifier.sol";
diff --git a/examples/CRISP/contracts/CRISPProgram.sol b/examples/CRISP/contracts/CRISPProgram.sol
index e7d521c2b9..03f20dd37b 100644
--- a/examples/CRISP/contracts/CRISPProgram.sol
+++ b/examples/CRISP/contracts/CRISPProgram.sol
@@ -7,11 +7,11 @@ pragma solidity >=0.8.27;
 
 import {IRiscZeroVerifier} from "risc0/IRiscZeroVerifier.sol";
 import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";
-import {IE3Program} from "@gnosis-guild/enclave/contracts/interfaces/IE3Program.sol";
+import {IE3Program} from "@enclave-e3/contracts/contracts/interfaces/IE3Program.sol";
 import {IBasePolicy} from "@excubiae/contracts/interfaces/IBasePolicy.sol";
-import {IInputValidator} from "@gnosis-guild/enclave/contracts/interfaces/IInputValidator.sol";
-import {IEnclave} from "@gnosis-guild/enclave/contracts/interfaces/IEnclave.sol";
 import {ISemaphore} from "@hashcloak/semaphore-contracts-noir/interfaces/ISemaphoreNoir.sol";
+import {IInputValidator} from "@enclave-e3/contracts/contracts/interfaces/IInputValidator.sol";
+import {IEnclave} from "@enclave-e3/contracts/contracts/interfaces/IEnclave.sol";
 import {CRISPCheckerFactory} from "./CRISPCheckerFactory.sol";
 import {CRISPPolicyFactory} from "./CRISPPolicyFactory.sol";
 import {CRISPInputValidatorFactory} from "./CRISPInputValidatorFactory.sol";
diff --git a/examples/CRISP/deploy/Deploy.s.sol b/examples/CRISP/deploy/Deploy.s.sol
index ace69c7cc7..7dc1dff08f 100644
--- a/examples/CRISP/deploy/Deploy.s.sol
+++ b/examples/CRISP/deploy/Deploy.s.sol
@@ -25,11 +25,11 @@ import {ControlID} from "risc0/groth16/ControlID.sol";
 import {CRISPProgram} from "../contracts/CRISPProgram.sol";
 import {CRISPPolicy} from "../contracts/CRISPPolicy.sol";
 import {CRISPChecker} from "../contracts/CRISPChecker.sol";
-import {IE3Program} from "@gnosis-guild/enclave/contracts/interfaces/IE3Program.sol";
-import {IEnclave} from "@gnosis-guild/enclave/contracts/interfaces/IEnclave.sol";
 import {SemaphoreNoir} from "@hashcloak/semaphore-contracts-noir/SemaphoreNoir.sol";
 import {SemaphoreNoirVerifier} from "@hashcloak/semaphore-contracts-noir/base/SemaphoreNoirVerifier.sol";
 import {IVerifier} from "@hashcloak/semaphore-contracts-noir/interfaces/ISemaphoreNoirVerifier.sol";
+import {IE3Program} from "@enclave-e3/contracts/contracts/interfaces/IE3Program.sol";
+import {IEnclave} from "@enclave-e3/contracts/contracts/interfaces/IEnclave.sol";
 import {CRISPCheckerFactory} from "../contracts/CRISPCheckerFactory.sol";
 import {CRISPPolicyFactory} from "../contracts/CRISPPolicyFactory.sol";
 import {CRISPInputValidatorFactory} from "../contracts/CRISPInputValidatorFactory.sol";
diff --git a/examples/CRISP/docker-compose.yaml b/examples/CRISP/docker-compose.yaml
index 573cc6b33d..186ed91031 100644
--- a/examples/CRISP/docker-compose.yaml
+++ b/examples/CRISP/docker-compose.yaml
@@ -13,7 +13,7 @@ services:
       - cargo-bin:/home/ubuntu/.cargo/bin
       - cargo-registry:/home/ubuntu/.cargo/registry
       - server-target:/app/examples/CRISP/server/target
-      - evm-node-modules:/app/packages/evm/node_modules
+      - evm-node-modules:/app/packages/enclave-contracts/node_modules
       - root-node-modules:/app/node_modules
       - client-node-modules:/app/examples/CRISP/client/node_modules
       - crisp-node-modules:/app/examples/CRISP/node_modules
diff --git a/examples/CRISP/package.json b/examples/CRISP/package.json
index 01461d0633..0ce6dfa710 100644
--- a/examples/CRISP/package.json
+++ b/examples/CRISP/package.json
@@ -22,15 +22,15 @@
   },
   "dependencies": {
     "@excubiae/contracts": "^0.4.0",
-    "@gnosis-guild/enclave": "workspace:*",
     "@hashcloak/semaphore-contracts-noir": "1.0.1",
-    "@gnosis-guild/enclave-sdk": "workspace:*",
+    "@enclave-e3/sdk": "^0.0.10-test",
+    "@enclave-e3/contracts": "^0.0.10-test",
     "@zk-kit/lean-imt.sol": "2.0.0",
     "poseidon-solidity": "^0.0.5",
     "solady": "^0.1.13"
   },
   "devDependencies": {
-    "@gnosis-guild/enclave-config": "workspace:*",
+    "@enclave-e3/config": "^0.0.10-test",
     "@nomicfoundation/hardhat-chai-matchers": "^2.0.0",
     "@nomicfoundation/hardhat-ethers": "^3.0.0",
     "@nomicfoundation/hardhat-foundry": "^1.1.2",
@@ -40,8 +40,6 @@
     "@nomicfoundation/hardhat-toolbox": "^5.0.0",
     "@nomicfoundation/hardhat-verify": "^2.0.0",
     "@nomicfoundation/ignition-core": "^0.15.5",
-    "@semaphore-protocol/core": "github:hmzakhalid/semaphore-noir#dist-core",
-    "@semaphore-protocol/data": "^4.9.2",
     "@synthetixio/synpress": "^4.1.0",
     "@synthetixio/synpress-cache": "^0.0.12",
     "@typechain/ethers-v6": "^0.5.0",
diff --git a/examples/CRISP/remappings.txt b/examples/CRISP/remappings.txt
index 4685b7cb9c..2cfa5adb37 100644
--- a/examples/CRISP/remappings.txt
+++ b/examples/CRISP/remappings.txt
@@ -2,7 +2,7 @@ forge-std/=lib/risc0-ethereum/lib/forge-std/src/
 @openzeppelin/=lib/risc0-ethereum/lib/openzeppelin-contracts/
 openzeppelin/=lib/risc0-ethereum/lib/openzeppelin-contracts/
 risc0/=lib/risc0-ethereum/contracts/src/
-@gnosis-guild/enclave/=node_modules/@gnosis-guild/enclave/
+@enclave-e3/contracts/=node_modules/@enclave-e3/contracts/
 @excubiae/contracts/=node_modules/@excubiae/contracts/
 solady/=node_modules/solady/
 @hashcloak/semaphore-contracts-noir/=node_modules/@hashcloak/semaphore-contracts-noir/
diff --git a/examples/CRISP/scripts/build.sh b/examples/CRISP/scripts/build.sh
index 4065176090..db6d9dfc58 100755
--- a/examples/CRISP/scripts/build.sh
+++ b/examples/CRISP/scripts/build.sh
@@ -3,5 +3,5 @@
 set -e
 
 (cargo build --locked)
-(cd ../../packages/evm && pnpm compile)
+(cd ../../packages/enclave-contracts && pnpm compile)
 (cd ./client && pnpm build)
diff --git a/examples/CRISP/scripts/evm_deploy.sh b/examples/CRISP/scripts/evm_deploy.sh
index a526afd7fa..7c3a7307bf 100755
--- a/examples/CRISP/scripts/evm_deploy.sh
+++ b/examples/CRISP/scripts/evm_deploy.sh
@@ -3,6 +3,6 @@
 set -euo pipefail
 
 wait-on tcp:8545 && \
-  (cd ../../packages/evm && \
+  (cd ../../packages/enclave-contracts && \
     rm -rf deployments/localhost && \
     pnpm deploy:mocks --network localhost)
diff --git a/examples/CRISP/scripts/setup.sh b/examples/CRISP/scripts/setup.sh
index 1ceb4daebb..21410a62f5 100755
--- a/examples/CRISP/scripts/setup.sh
+++ b/examples/CRISP/scripts/setup.sh
@@ -7,7 +7,7 @@ export CARGO_INCREMENTAL=1
 echo "pnpm install"
 (cd ../../ && pnpm install --frozen-lockfile)
 echo "evm"
-(cd ../../packages/evm && pnpm compile)
+(cd ../../packages/enclave-contracts && pnpm compile)
 echo "server"
 (cd ./server && [[ ! -f .env ]] && cp .env.example .env; [[ ! -f ../.env ]] && cp .env.example ../.env; cargo build --locked --bin cli && cargo build --locked --bin server)
 echo "client"
diff --git a/examples/CRISP/tests/crisp.contracts.test.ts b/examples/CRISP/tests/crisp.contracts.test.ts
index d6e92af11f..815228159e 100644
--- a/examples/CRISP/tests/crisp.contracts.test.ts
+++ b/examples/CRISP/tests/crisp.contracts.test.ts
@@ -3,8 +3,8 @@
 // This file is provided WITHOUT ANY WARRANTY;
 // without even the implied warranty of MERCHANTABILITY
 // or FITNESS FOR A PARTICULAR PURPOSE.
-import { EnclaveSDK, FheProtocol } from "@gnosis-guild/enclave-sdk"
-import { Enclave, Enclave__factory as EnclaveFactory } from "@gnosis-guild/enclave/types"
+import { EnclaveSDK, FheProtocol } from "@enclave-e3/sdk"
+import { Enclave, Enclave__factory as EnclaveFactory } from "@enclave-e3/contracts/types"
 import { expect } from "chai"
 import fs from "fs"
 import path from "path"
diff --git a/package.json b/package.json
index 0c97f600a6..e194a77563 100644
--- a/package.json
+++ b/package.json
@@ -9,7 +9,7 @@
     "url": "https://github.com/gnosisguild"
   },
   "scripts": {
-    "clean": "cd packages/evm && pnpm clean",
+    "clean": "cd packages/enclave-contracts && pnpm clean",
     "compile": "pnpm evm:build && pnpm sdk:build && pnpm react:build && pnpm ciphernode:build && ./scripts/compile-circuits.sh",
     "lint": "pnpm evm:lint && pnpm ciphernode:lint && ./scripts/lint-circuits.sh",
     "check:license": "./scripts/check-license-headers.sh",
@@ -20,24 +20,24 @@
     "prepare": "husky",
     "enclave": "cd crates && ./scripts/launch.sh",
     "ciphernode:lint": "cargo fmt -- --check",
-    "ciphernode:add": "cd packages/evm && pnpm ciphernode:add",
-    "ciphernode:remove": "cd packages/evm && pnpm ciphernode:remove",
+    "ciphernode:add": "cd packages/enclave-contracts && pnpm ciphernode:add",
+    "ciphernode:remove": "cd packages/enclave-contracts && pnpm ciphernode:remove",
     "ciphernode:test": "cd crates && ./scripts/test.sh",
     "ciphernode:build": "cargo build --locked --release",
     "preciphernode:build": "pnpm evm:build",
-    "committee:new": "cd packages/evm && pnpm committee:new",
-    "committee:publish": "cd packages/evm && pnpm hardhat committee:publish",
-    "e3:activate": "cd packages/evm && pnpm -s hardhat e3:activate",
-    "e3:publishInput": "cd packages/evm && pnpm hardhat e3:publishInput",
-    "e3:publishCiphertext": "cd packages/evm && pnpm hardhat e3:publishCiphertext",
-    "evm:install": "cd packages/evm && pnpm install",
-    "evm:node": "cd packages/evm && pnpm hardhat node",
-    "evm:build": "cd packages/evm && pnpm compile",
-    "evm:lint": "cd packages/evm && pnpm lint",
-    "evm:typechain": "cd packages/evm && pnpm typechain",
-    "evm:test": "cd packages/evm && pnpm test",
-    "evm:coverage": "cd packages/evm && pnpm coverage",
-    "evm:release": "cd packages/evm && pnpm release",
+    "committee:new": "cd packages/enclave-contracts && pnpm committee:new",
+    "committee:publish": "cd packages/enclave-contracts && pnpm hardhat committee:publish",
+    "e3:activate": "cd packages/enclave-contracts && pnpm -s hardhat e3:activate",
+    "e3:publishInput": "cd packages/enclave-contracts && pnpm hardhat e3:publishInput",
+    "e3:publishCiphertext": "cd packages/enclave-contracts && pnpm hardhat e3:publishCiphertext",
+    "evm:install": "cd packages/enclave-contracts && pnpm install",
+    "evm:node": "cd packages/enclave-contracts && pnpm hardhat node",
+    "evm:build": "cd packages/enclave-contracts && pnpm compile",
+    "evm:lint": "cd packages/enclave-contracts && pnpm lint",
+    "evm:typechain": "cd packages/enclave-contracts && pnpm typechain",
+    "evm:test": "cd packages/enclave-contracts && pnpm test",
+    "evm:coverage": "cd packages/enclave-contracts && pnpm coverage",
+    "evm:release": "cd packages/enclave-contracts && pnpm release",
     "react:build": "cd packages/enclave-react && pnpm build",
     "sdk:build": "cd packages/enclave-sdk && pnpm build",
     "sdk:test": "cd packages/enclave-sdk && pnpm test",
diff --git a/packages/enclave-config/CHANGELOG.md b/packages/enclave-config/CHANGELOG.md
new file mode 100644
index 0000000000..510addb3b5
--- /dev/null
+++ b/packages/enclave-config/CHANGELOG.md
@@ -0,0 +1,7 @@
+# @enclave-e3/config
+
+## 0.0.6-test.0
+
+### Patch Changes
+
+- Migrate npm org
diff --git a/packages/enclave-config/package.json b/packages/enclave-config/package.json
index 1c8f5e0cea..e2a794140e 100644
--- a/packages/enclave-config/package.json
+++ b/packages/enclave-config/package.json
@@ -1,8 +1,10 @@
 {
-  "name": "@gnosis-guild/enclave-config",
-  "private": false,
-  "version": "0.0.6-test",
-  "description": "",
+  "name": "@enclave-e3/config",
+  "version": "0.0.10-test",
+  "publishConfig": {
+    "access": "public"
+  },
+  "description": "Common configuration for Enclave",
   "module": true,
   "main": "index.js",
   "type": "module",
diff --git a/packages/evm/.czrc b/packages/enclave-contracts/.czrc
similarity index 100%
rename from packages/evm/.czrc
rename to packages/enclave-contracts/.czrc
diff --git a/packages/evm/.editorconfig b/packages/enclave-contracts/.editorconfig
similarity index 100%
rename from packages/evm/.editorconfig
rename to packages/enclave-contracts/.editorconfig
diff --git a/packages/evm/.env.example b/packages/enclave-contracts/.env.example
similarity index 100%
rename from packages/evm/.env.example
rename to packages/enclave-contracts/.env.example
diff --git a/packages/evm/.eslintignore b/packages/enclave-contracts/.eslintignore
similarity index 100%
rename from packages/evm/.eslintignore
rename to packages/enclave-contracts/.eslintignore
diff --git a/packages/evm/.eslintrc.yml b/packages/enclave-contracts/.eslintrc.yml
similarity index 100%
rename from packages/evm/.eslintrc.yml
rename to packages/enclave-contracts/.eslintrc.yml
diff --git a/packages/evm/.gitignore b/packages/enclave-contracts/.gitignore
similarity index 100%
rename from packages/evm/.gitignore
rename to packages/enclave-contracts/.gitignore
diff --git a/packages/evm/.prettierignore b/packages/enclave-contracts/.prettierignore
similarity index 100%
rename from packages/evm/.prettierignore
rename to packages/enclave-contracts/.prettierignore
diff --git a/packages/evm/.prettierrc.yml b/packages/enclave-contracts/.prettierrc.yml
similarity index 100%
rename from packages/evm/.prettierrc.yml
rename to packages/enclave-contracts/.prettierrc.yml
diff --git a/packages/evm/.solcover.js b/packages/enclave-contracts/.solcover.js
similarity index 100%
rename from packages/evm/.solcover.js
rename to packages/enclave-contracts/.solcover.js
diff --git a/packages/evm/.solhint.json b/packages/enclave-contracts/.solhint.json
similarity index 100%
rename from packages/evm/.solhint.json
rename to packages/enclave-contracts/.solhint.json
diff --git a/packages/evm/.solhintignore b/packages/enclave-contracts/.solhintignore
similarity index 100%
rename from packages/evm/.solhintignore
rename to packages/enclave-contracts/.solhintignore
diff --git a/packages/evm/README.md b/packages/enclave-contracts/README.md
similarity index 97%
rename from packages/evm/README.md
rename to packages/enclave-contracts/README.md
index 7fcc887fdf..df50b4bff4 100644
--- a/packages/evm/README.md
+++ b/packages/enclave-contracts/README.md
@@ -5,7 +5,7 @@
 To install, run
 
 ```
-pnpm add @gnosis-guild/enclave
+pnpm add @enclave-e3/contracts
 ```
 
 If writing a new E3 program, you can import the necessary interfaces by writing
diff --git a/packages/evm/artifacts/contracts/interfaces/ICiphernodeRegistry.sol/ICiphernodeRegistry.json b/packages/enclave-contracts/artifacts/contracts/interfaces/ICiphernodeRegistry.sol/ICiphernodeRegistry.json
similarity index 100%
rename from packages/evm/artifacts/contracts/interfaces/ICiphernodeRegistry.sol/ICiphernodeRegistry.json
rename to packages/enclave-contracts/artifacts/contracts/interfaces/ICiphernodeRegistry.sol/ICiphernodeRegistry.json
diff --git a/packages/evm/artifacts/contracts/interfaces/IEnclave.sol/IEnclave.json b/packages/enclave-contracts/artifacts/contracts/interfaces/IEnclave.sol/IEnclave.json
similarity index 100%
rename from packages/evm/artifacts/contracts/interfaces/IEnclave.sol/IEnclave.json
rename to packages/enclave-contracts/artifacts/contracts/interfaces/IEnclave.sol/IEnclave.json
diff --git a/packages/evm/artifacts/contracts/registry/NaiveRegistryFilter.sol/NaiveRegistryFilter.json b/packages/enclave-contracts/artifacts/contracts/registry/NaiveRegistryFilter.sol/NaiveRegistryFilter.json
similarity index 100%
rename from packages/evm/artifacts/contracts/registry/NaiveRegistryFilter.sol/NaiveRegistryFilter.json
rename to packages/enclave-contracts/artifacts/contracts/registry/NaiveRegistryFilter.sol/NaiveRegistryFilter.json
diff --git a/packages/evm/contracts/Enclave.sol b/packages/enclave-contracts/contracts/Enclave.sol
similarity index 100%
rename from packages/evm/contracts/Enclave.sol
rename to packages/enclave-contracts/contracts/Enclave.sol
diff --git a/packages/evm/contracts/interfaces/ICiphernodeRegistry.sol b/packages/enclave-contracts/contracts/interfaces/ICiphernodeRegistry.sol
similarity index 100%
rename from packages/evm/contracts/interfaces/ICiphernodeRegistry.sol
rename to packages/enclave-contracts/contracts/interfaces/ICiphernodeRegistry.sol
diff --git a/packages/evm/contracts/interfaces/IComputeProvider.sol b/packages/enclave-contracts/contracts/interfaces/IComputeProvider.sol
similarity index 100%
rename from packages/evm/contracts/interfaces/IComputeProvider.sol
rename to packages/enclave-contracts/contracts/interfaces/IComputeProvider.sol
diff --git a/packages/evm/contracts/interfaces/IDecryptionVerifier.sol b/packages/enclave-contracts/contracts/interfaces/IDecryptionVerifier.sol
similarity index 100%
rename from packages/evm/contracts/interfaces/IDecryptionVerifier.sol
rename to packages/enclave-contracts/contracts/interfaces/IDecryptionVerifier.sol
diff --git a/packages/evm/contracts/interfaces/IE3.sol b/packages/enclave-contracts/contracts/interfaces/IE3.sol
similarity index 100%
rename from packages/evm/contracts/interfaces/IE3.sol
rename to packages/enclave-contracts/contracts/interfaces/IE3.sol
diff --git a/packages/evm/contracts/interfaces/IE3Program.sol b/packages/enclave-contracts/contracts/interfaces/IE3Program.sol
similarity index 100%
rename from packages/evm/contracts/interfaces/IE3Program.sol
rename to packages/enclave-contracts/contracts/interfaces/IE3Program.sol
diff --git a/packages/evm/contracts/interfaces/IEnclave.sol b/packages/enclave-contracts/contracts/interfaces/IEnclave.sol
similarity index 100%
rename from packages/evm/contracts/interfaces/IEnclave.sol
rename to packages/enclave-contracts/contracts/interfaces/IEnclave.sol
diff --git a/packages/evm/contracts/interfaces/IInputValidator.sol b/packages/enclave-contracts/contracts/interfaces/IInputValidator.sol
similarity index 100%
rename from packages/evm/contracts/interfaces/IInputValidator.sol
rename to packages/enclave-contracts/contracts/interfaces/IInputValidator.sol
diff --git a/packages/evm/contracts/interfaces/IRegistryFilter.sol b/packages/enclave-contracts/contracts/interfaces/IRegistryFilter.sol
similarity index 100%
rename from packages/evm/contracts/interfaces/IRegistryFilter.sol
rename to packages/enclave-contracts/contracts/interfaces/IRegistryFilter.sol
diff --git a/packages/evm/contracts/registry/CiphernodeRegistryOwnable.sol b/packages/enclave-contracts/contracts/registry/CiphernodeRegistryOwnable.sol
similarity index 100%
rename from packages/evm/contracts/registry/CiphernodeRegistryOwnable.sol
rename to packages/enclave-contracts/contracts/registry/CiphernodeRegistryOwnable.sol
diff --git a/packages/evm/contracts/registry/NaiveRegistryFilter.sol b/packages/enclave-contracts/contracts/registry/NaiveRegistryFilter.sol
similarity index 100%
rename from packages/evm/contracts/registry/NaiveRegistryFilter.sol
rename to packages/enclave-contracts/contracts/registry/NaiveRegistryFilter.sol
diff --git a/packages/evm/contracts/test/MockCiphernodeRegistry.sol b/packages/enclave-contracts/contracts/test/MockCiphernodeRegistry.sol
similarity index 100%
rename from packages/evm/contracts/test/MockCiphernodeRegistry.sol
rename to packages/enclave-contracts/contracts/test/MockCiphernodeRegistry.sol
diff --git a/packages/evm/contracts/test/MockComputeProvider.sol b/packages/enclave-contracts/contracts/test/MockComputeProvider.sol
similarity index 100%
rename from packages/evm/contracts/test/MockComputeProvider.sol
rename to packages/enclave-contracts/contracts/test/MockComputeProvider.sol
diff --git a/packages/evm/contracts/test/MockDecryptionVerifier.sol b/packages/enclave-contracts/contracts/test/MockDecryptionVerifier.sol
similarity index 100%
rename from packages/evm/contracts/test/MockDecryptionVerifier.sol
rename to packages/enclave-contracts/contracts/test/MockDecryptionVerifier.sol
diff --git a/packages/evm/contracts/test/MockE3Program.sol b/packages/enclave-contracts/contracts/test/MockE3Program.sol
similarity index 100%
rename from packages/evm/contracts/test/MockE3Program.sol
rename to packages/enclave-contracts/contracts/test/MockE3Program.sol
diff --git a/packages/evm/contracts/test/MockInputValidator.sol b/packages/enclave-contracts/contracts/test/MockInputValidator.sol
similarity index 100%
rename from packages/evm/contracts/test/MockInputValidator.sol
rename to packages/enclave-contracts/contracts/test/MockInputValidator.sol
diff --git a/packages/evm/contracts/test/MockRegistryFilter.sol b/packages/enclave-contracts/contracts/test/MockRegistryFilter.sol
similarity index 100%
rename from packages/evm/contracts/test/MockRegistryFilter.sol
rename to packages/enclave-contracts/contracts/test/MockRegistryFilter.sol
diff --git a/packages/evm/deploy/enclave.ts b/packages/enclave-contracts/deploy/enclave.ts
similarity index 100%
rename from packages/evm/deploy/enclave.ts
rename to packages/enclave-contracts/deploy/enclave.ts
diff --git a/packages/evm/deploy/mocks.ts b/packages/enclave-contracts/deploy/mocks.ts
similarity index 100%
rename from packages/evm/deploy/mocks.ts
rename to packages/enclave-contracts/deploy/mocks.ts
diff --git a/packages/evm/deployments/sepolia/.chainId b/packages/enclave-contracts/deployments/sepolia/.chainId
similarity index 100%
rename from packages/evm/deployments/sepolia/.chainId
rename to packages/enclave-contracts/deployments/sepolia/.chainId
diff --git a/packages/evm/deployments/sepolia/CiphernodeRegistryOwnable.json b/packages/enclave-contracts/deployments/sepolia/CiphernodeRegistryOwnable.json
similarity index 100%
rename from packages/evm/deployments/sepolia/CiphernodeRegistryOwnable.json
rename to packages/enclave-contracts/deployments/sepolia/CiphernodeRegistryOwnable.json
diff --git a/packages/evm/deployments/sepolia/Enclave.json b/packages/enclave-contracts/deployments/sepolia/Enclave.json
similarity index 100%
rename from packages/evm/deployments/sepolia/Enclave.json
rename to packages/enclave-contracts/deployments/sepolia/Enclave.json
diff --git a/packages/evm/deployments/sepolia/MockComputeProvider.json b/packages/enclave-contracts/deployments/sepolia/MockComputeProvider.json
similarity index 100%
rename from packages/evm/deployments/sepolia/MockComputeProvider.json
rename to packages/enclave-contracts/deployments/sepolia/MockComputeProvider.json
diff --git a/packages/evm/deployments/sepolia/MockDecryptionVerifier.json b/packages/enclave-contracts/deployments/sepolia/MockDecryptionVerifier.json
similarity index 100%
rename from packages/evm/deployments/sepolia/MockDecryptionVerifier.json
rename to packages/enclave-contracts/deployments/sepolia/MockDecryptionVerifier.json
diff --git a/packages/evm/deployments/sepolia/MockE3Program.json b/packages/enclave-contracts/deployments/sepolia/MockE3Program.json
similarity index 100%
rename from packages/evm/deployments/sepolia/MockE3Program.json
rename to packages/enclave-contracts/deployments/sepolia/MockE3Program.json
diff --git a/packages/evm/deployments/sepolia/MockInputValidator.json b/packages/enclave-contracts/deployments/sepolia/MockInputValidator.json
similarity index 100%
rename from packages/evm/deployments/sepolia/MockInputValidator.json
rename to packages/enclave-contracts/deployments/sepolia/MockInputValidator.json
diff --git a/packages/evm/deployments/sepolia/NaiveRegistryFilter.json b/packages/enclave-contracts/deployments/sepolia/NaiveRegistryFilter.json
similarity index 100%
rename from packages/evm/deployments/sepolia/NaiveRegistryFilter.json
rename to packages/enclave-contracts/deployments/sepolia/NaiveRegistryFilter.json
diff --git a/packages/evm/deployments/sepolia/solcInputs/1560ab6aa11f44088d4445eb3d74156d.json b/packages/enclave-contracts/deployments/sepolia/solcInputs/1560ab6aa11f44088d4445eb3d74156d.json
similarity index 100%
rename from packages/evm/deployments/sepolia/solcInputs/1560ab6aa11f44088d4445eb3d74156d.json
rename to packages/enclave-contracts/deployments/sepolia/solcInputs/1560ab6aa11f44088d4445eb3d74156d.json
diff --git a/packages/evm/deployments/sepolia/solcInputs/3d9e1a948fbfdecab1738e926b737452.json b/packages/enclave-contracts/deployments/sepolia/solcInputs/3d9e1a948fbfdecab1738e926b737452.json
similarity index 100%
rename from packages/evm/deployments/sepolia/solcInputs/3d9e1a948fbfdecab1738e926b737452.json
rename to packages/enclave-contracts/deployments/sepolia/solcInputs/3d9e1a948fbfdecab1738e926b737452.json
diff --git a/packages/evm/deployments/sepolia/solcInputs/4e50d78ca1d53cbd796603c29498c065.json b/packages/enclave-contracts/deployments/sepolia/solcInputs/4e50d78ca1d53cbd796603c29498c065.json
similarity index 100%
rename from packages/evm/deployments/sepolia/solcInputs/4e50d78ca1d53cbd796603c29498c065.json
rename to packages/enclave-contracts/deployments/sepolia/solcInputs/4e50d78ca1d53cbd796603c29498c065.json
diff --git a/packages/evm/deployments/sepolia/solcInputs/7505270e9ddb813a3809c10e5d95f372.json b/packages/enclave-contracts/deployments/sepolia/solcInputs/7505270e9ddb813a3809c10e5d95f372.json
similarity index 100%
rename from packages/evm/deployments/sepolia/solcInputs/7505270e9ddb813a3809c10e5d95f372.json
rename to packages/enclave-contracts/deployments/sepolia/solcInputs/7505270e9ddb813a3809c10e5d95f372.json
diff --git a/packages/evm/deployments/sepolia/solcInputs/af1a33d80136fdacbd4916512487a8ab.json b/packages/enclave-contracts/deployments/sepolia/solcInputs/af1a33d80136fdacbd4916512487a8ab.json
similarity index 100%
rename from packages/evm/deployments/sepolia/solcInputs/af1a33d80136fdacbd4916512487a8ab.json
rename to packages/enclave-contracts/deployments/sepolia/solcInputs/af1a33d80136fdacbd4916512487a8ab.json
diff --git a/packages/evm/deployments/sepolia/solcInputs/c0f9a30d0a9d62ed2e9527f5f26eeea3.json b/packages/enclave-contracts/deployments/sepolia/solcInputs/c0f9a30d0a9d62ed2e9527f5f26eeea3.json
similarity index 100%
rename from packages/evm/deployments/sepolia/solcInputs/c0f9a30d0a9d62ed2e9527f5f26eeea3.json
rename to packages/enclave-contracts/deployments/sepolia/solcInputs/c0f9a30d0a9d62ed2e9527f5f26eeea3.json
diff --git a/packages/evm/deployments/sepolia/solcInputs/c9b7037486bd8b1125ffad462d6531cb.json b/packages/enclave-contracts/deployments/sepolia/solcInputs/c9b7037486bd8b1125ffad462d6531cb.json
similarity index 100%
rename from packages/evm/deployments/sepolia/solcInputs/c9b7037486bd8b1125ffad462d6531cb.json
rename to packages/enclave-contracts/deployments/sepolia/solcInputs/c9b7037486bd8b1125ffad462d6531cb.json
diff --git a/packages/evm/deployments/sepolia/solcInputs/f32a0aa4ee06fa210859a817cc9dafc5.json b/packages/enclave-contracts/deployments/sepolia/solcInputs/f32a0aa4ee06fa210859a817cc9dafc5.json
similarity index 100%
rename from packages/evm/deployments/sepolia/solcInputs/f32a0aa4ee06fa210859a817cc9dafc5.json
rename to packages/enclave-contracts/deployments/sepolia/solcInputs/f32a0aa4ee06fa210859a817cc9dafc5.json
diff --git a/packages/evm/hardhat.config.cts b/packages/enclave-contracts/hardhat.config.cts
similarity index 100%
rename from packages/evm/hardhat.config.cts
rename to packages/enclave-contracts/hardhat.config.cts
diff --git a/packages/evm/package.json b/packages/enclave-contracts/package.json
similarity index 95%
rename from packages/evm/package.json
rename to packages/enclave-contracts/package.json
index b3277cabd8..c9cf4000f6 100644
--- a/packages/evm/package.json
+++ b/packages/enclave-contracts/package.json
@@ -1,7 +1,7 @@
 {
-  "name": "@gnosis-guild/enclave",
+  "name": "@enclave-e3/contracts",
   "description": "Enclave is an open-source protocol for Encrypted Execution Environments (E3).",
-  "version": "0.0.6-test",
+  "version": "0.0.10-test",
   "license": "LGPL-3.0-only",
   "author": {
     "name": "gnosisguild",
@@ -42,7 +42,7 @@
     }
   },
   "devDependencies": {
-    "@gnosis-guild/enclave-config": "workspace:*",
+    "@enclave-e3/config": "workspace:*",
     "@nomicfoundation/hardhat-chai-matchers": "^2.0.2",
     "@nomicfoundation/hardhat-ethers": "^3.0.5",
     "@nomicfoundation/hardhat-network-helpers": "^1.0.10",
@@ -103,8 +103,7 @@
     "typechain"
   ],
   "publishConfig": {
-    "access": "public",
-    "git-checks": false
+    "access": "public"
   },
   "scripts": {
     "clean": "rimraf ./artifacts ./cache ./coverage ./types ./dist ./coverage.json && pnpm typechain",
@@ -133,7 +132,6 @@
   },
   "dependencies": {
     "@excubiae/contracts": "^0.4.0",
-    "@gnosis-guild/enclave-sdk": "workspace:*",
     "solady": "^0.1.13"
   },
   "packageManager": "pnpm@10.7.1+sha512.2d92c86b7928dc8284f53494fb4201f983da65f0fb4f0d40baafa5cf628fa31dae3e5968f12466f17df7e97310e30f343a648baea1b9b350685dafafffdf5808"
diff --git a/packages/evm/tasks/accounts.ts b/packages/enclave-contracts/tasks/accounts.ts
similarity index 100%
rename from packages/evm/tasks/accounts.ts
rename to packages/enclave-contracts/tasks/accounts.ts
diff --git a/packages/evm/tasks/ciphernode.ts b/packages/enclave-contracts/tasks/ciphernode.ts
similarity index 100%
rename from packages/evm/tasks/ciphernode.ts
rename to packages/enclave-contracts/tasks/ciphernode.ts
diff --git a/packages/evm/tasks/enclave.ts b/packages/enclave-contracts/tasks/enclave.ts
similarity index 100%
rename from packages/evm/tasks/enclave.ts
rename to packages/enclave-contracts/tasks/enclave.ts
diff --git a/packages/evm/test/CiphernodeRegistry/CiphernodeRegistryOwnable.spec.ts b/packages/enclave-contracts/test/CiphernodeRegistry/CiphernodeRegistryOwnable.spec.ts
similarity index 100%
rename from packages/evm/test/CiphernodeRegistry/CiphernodeRegistryOwnable.spec.ts
rename to packages/enclave-contracts/test/CiphernodeRegistry/CiphernodeRegistryOwnable.spec.ts
diff --git a/packages/evm/test/CiphernodeRegistry/NaiveRegistryFilter.spec.ts b/packages/enclave-contracts/test/CiphernodeRegistry/NaiveRegistryFilter.spec.ts
similarity index 100%
rename from packages/evm/test/CiphernodeRegistry/NaiveRegistryFilter.spec.ts
rename to packages/enclave-contracts/test/CiphernodeRegistry/NaiveRegistryFilter.spec.ts
diff --git a/packages/evm/test/Enclave.spec.ts b/packages/enclave-contracts/test/Enclave.spec.ts
similarity index 100%
rename from packages/evm/test/Enclave.spec.ts
rename to packages/enclave-contracts/test/Enclave.spec.ts
diff --git a/packages/evm/test/fixtures/CiphernodeRegistryOwnable.fixture.ts b/packages/enclave-contracts/test/fixtures/CiphernodeRegistryOwnable.fixture.ts
similarity index 100%
rename from packages/evm/test/fixtures/CiphernodeRegistryOwnable.fixture.ts
rename to packages/enclave-contracts/test/fixtures/CiphernodeRegistryOwnable.fixture.ts
diff --git a/packages/evm/test/fixtures/Enclave.fixture.ts b/packages/enclave-contracts/test/fixtures/Enclave.fixture.ts
similarity index 100%
rename from packages/evm/test/fixtures/Enclave.fixture.ts
rename to packages/enclave-contracts/test/fixtures/Enclave.fixture.ts
diff --git a/packages/evm/test/fixtures/MockCiphernodeRegistry.fixture.ts b/packages/enclave-contracts/test/fixtures/MockCiphernodeRegistry.fixture.ts
similarity index 100%
rename from packages/evm/test/fixtures/MockCiphernodeRegistry.fixture.ts
rename to packages/enclave-contracts/test/fixtures/MockCiphernodeRegistry.fixture.ts
diff --git a/packages/evm/test/fixtures/MockComputeProvider.fixture.ts b/packages/enclave-contracts/test/fixtures/MockComputeProvider.fixture.ts
similarity index 100%
rename from packages/evm/test/fixtures/MockComputeProvider.fixture.ts
rename to packages/enclave-contracts/test/fixtures/MockComputeProvider.fixture.ts
diff --git a/packages/evm/test/fixtures/MockDecryptionVerifier.fixture.ts b/packages/enclave-contracts/test/fixtures/MockDecryptionVerifier.fixture.ts
similarity index 100%
rename from packages/evm/test/fixtures/MockDecryptionVerifier.fixture.ts
rename to packages/enclave-contracts/test/fixtures/MockDecryptionVerifier.fixture.ts
diff --git a/packages/evm/test/fixtures/MockE3Program.fixture.ts b/packages/enclave-contracts/test/fixtures/MockE3Program.fixture.ts
similarity index 100%
rename from packages/evm/test/fixtures/MockE3Program.fixture.ts
rename to packages/enclave-contracts/test/fixtures/MockE3Program.fixture.ts
diff --git a/packages/evm/test/fixtures/MockInputValidator.fixture.ts b/packages/enclave-contracts/test/fixtures/MockInputValidator.fixture.ts
similarity index 100%
rename from packages/evm/test/fixtures/MockInputValidator.fixture.ts
rename to packages/enclave-contracts/test/fixtures/MockInputValidator.fixture.ts
diff --git a/packages/evm/test/fixtures/NaiveRegistryFilter.fixture.ts b/packages/enclave-contracts/test/fixtures/NaiveRegistryFilter.fixture.ts
similarity index 100%
rename from packages/evm/test/fixtures/NaiveRegistryFilter.fixture.ts
rename to packages/enclave-contracts/test/fixtures/NaiveRegistryFilter.fixture.ts
diff --git a/packages/evm/test/fixtures/PoseidonT3.fixture.ts b/packages/enclave-contracts/test/fixtures/PoseidonT3.fixture.ts
similarity index 100%
rename from packages/evm/test/fixtures/PoseidonT3.fixture.ts
rename to packages/enclave-contracts/test/fixtures/PoseidonT3.fixture.ts
diff --git a/packages/evm/test/fixtures/pubkey.bin b/packages/enclave-contracts/test/fixtures/pubkey.bin
similarity index 100%
rename from packages/evm/test/fixtures/pubkey.bin
rename to packages/enclave-contracts/test/fixtures/pubkey.bin
diff --git a/packages/evm/tsconfig.json b/packages/enclave-contracts/tsconfig.json
similarity index 82%
rename from packages/evm/tsconfig.json
rename to packages/enclave-contracts/tsconfig.json
index a8d06e7401..7bfa765c31 100644
--- a/packages/evm/tsconfig.json
+++ b/packages/enclave-contracts/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "@gnosis-guild/enclave-config/tsconfig.json",
+  "extends": "@enclave-e3/config/tsconfig.json",
   "include": ["tasks/**/*", "test/**/*", "deploy/**/*", "types/**/*"],
   "exclude": ["node_modules", "dist"],
   "compilerOptions": {
diff --git a/packages/evm/tsup.config.mjs b/packages/enclave-contracts/tsup.config.mjs
similarity index 81%
rename from packages/evm/tsup.config.mjs
rename to packages/enclave-contracts/tsup.config.mjs
index 954a7c4939..f6d26e5b58 100644
--- a/packages/evm/tsup.config.mjs
+++ b/packages/enclave-contracts/tsup.config.mjs
@@ -1,4 +1,4 @@
-import { baseConfig } from "@gnosis-guild/enclave-config/tsup";
+import { baseConfig } from "@enclave-e3/config/tsup";
 import { defineConfig } from "tsup";
 
 export default defineConfig({
diff --git a/packages/enclave-react/CHANGELOG.md b/packages/enclave-react/CHANGELOG.md
new file mode 100644
index 0000000000..006f0e289e
--- /dev/null
+++ b/packages/enclave-react/CHANGELOG.md
@@ -0,0 +1,9 @@
+# @enclave-e3/react
+
+## 0.0.6-test.0
+
+### Patch Changes
+
+- Migrate npm org
+- Updated dependencies
+  - @enclave-e3/sdk@0.0.6-test.0
diff --git a/packages/enclave-react/README.md b/packages/enclave-react/README.md
index 8d39021a61..255ffe7562 100644
--- a/packages/enclave-react/README.md
+++ b/packages/enclave-react/README.md
@@ -1,15 +1,15 @@
-# @gnosis-guild/enclave-react
+# @enclave-e3/react
 
 React hooks and utilities for Enclave SDK.
 
 ## Installation
 
 ```bash
-npm install @gnosis-guild/enclave-react @gnosis-guild/enclave
+npm install @enclave-e3/react @enclave-e3/contracts
 # or
-yarn add @gnosis-guild/enclave-react @gnosis-guild/enclave
+yarn add @enclave-e3/react @enclave-e3/contracts
 # or
-pnpm add @gnosis-guild/enclave-react @gnosis-guild/enclave
+pnpm add @enclave-e3/react @enclave-e3/contracts
 ```
 
 ## Usage
@@ -19,7 +19,7 @@ pnpm add @gnosis-guild/enclave-react @gnosis-guild/enclave
 A React hook for interacting with the Enclave SDK. This hook provides a clean interface for managing SDK state, handling contract interactions, and listening to events.
 
 ```tsx
-import { useEnclaveSDK } from '@gnosis-guild/enclave-react';
+import { useEnclaveSDK } from '@enclave-e3/react';
 
 function MyComponent() {
   const {
diff --git a/packages/enclave-react/package.json b/packages/enclave-react/package.json
index 0dfbea7e1a..0fc9a7ac15 100644
--- a/packages/enclave-react/package.json
+++ b/packages/enclave-react/package.json
@@ -1,6 +1,6 @@
 {
-  "name": "@gnosis-guild/enclave-react",
-  "version": "0.0.6-test",
+  "name": "@enclave-e3/react",
+  "version": "0.0.10-test",
   "description": "React hooks and utilities for Enclave SDK",
   "type": "module",
   "private": false,
@@ -39,15 +39,14 @@
     "wagmi": "^2.14.16"
   },
   "publishConfig": {
-    "access": "public",
-    "git-checks": false
+    "access": "public"
   },
   "dependencies": {
-    "@gnosis-guild/enclave-sdk": "workspace:*",
+    "@enclave-e3/sdk": "workspace:*",
     "viem": "2.30.6"
   },
   "devDependencies": {
-    "@gnosis-guild/enclave-config": "workspace:*",
+    "@enclave-e3/config": "workspace:*",
     "@types/react": "^18.2.0",
     "tsup": "^8.5.0",
     "typescript": "5.8.3"
diff --git a/packages/enclave-react/src/index.ts b/packages/enclave-react/src/index.ts
index cc1ac39011..516ef8ea17 100644
--- a/packages/enclave-react/src/index.ts
+++ b/packages/enclave-react/src/index.ts
@@ -5,7 +5,7 @@
 // or FITNESS FOR A PARTICULAR PURPOSE.
 
 /**
- * @gnosis-guild/enclave-react
+ * @enclave-e3/react
  *
  * React hooks and utilities for Enclave SDK
  */
@@ -27,6 +27,6 @@ export type {
   CiphernodeRemovedData,
   CommitteeRequestedData,
   CommitteePublishedData,
-} from "@gnosis-guild/enclave-sdk";
+} from "@enclave-e3/sdk";
 
-export { EnclaveEventType, RegistryEventType } from "@gnosis-guild/enclave-sdk";
+export { EnclaveEventType, RegistryEventType } from "@enclave-e3/sdk";
diff --git a/packages/enclave-react/src/useEnclaveSDK.ts b/packages/enclave-react/src/useEnclaveSDK.ts
index 6baea2da54..172875cfce 100644
--- a/packages/enclave-react/src/useEnclaveSDK.ts
+++ b/packages/enclave-react/src/useEnclaveSDK.ts
@@ -16,7 +16,7 @@ import {
   EnclaveEventType,
   RegistryEventType,
   SDKError,
-} from "@gnosis-guild/enclave-sdk";
+} from "@enclave-e3/sdk";
 
 export interface UseEnclaveSDKConfig {
   contracts?: {
@@ -59,7 +59,7 @@ export interface UseEnclaveSDKReturn {
  *
  * @example
  * ```tsx
- * import { useEnclaveSDK } from '@gnosis-guild/enclave-react';
+ * import { useEnclaveSDK } from '@enclave-e3/react';
  *
  * function MyComponent() {
  *   const {
diff --git a/packages/enclave-react/tsconfig.json b/packages/enclave-react/tsconfig.json
index e55c5bb253..4fce575758 100644
--- a/packages/enclave-react/tsconfig.json
+++ b/packages/enclave-react/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "@gnosis-guild/enclave-config/dom.tsconfig.json",
+  "extends": "@enclave-e3/config/dom.tsconfig.json",
   "include": ["src/**/*", "tests/**/*"],
   "exclude": ["node_modules", "dist"],
   "compilerOptions": {
diff --git a/packages/enclave-react/tsup.config.js b/packages/enclave-react/tsup.config.js
index 159d7d1fc7..59377a14ea 100644
--- a/packages/enclave-react/tsup.config.js
+++ b/packages/enclave-react/tsup.config.js
@@ -5,7 +5,7 @@
 // or FITNESS FOR A PARTICULAR PURPOSE.
 
 import { defineConfig } from "tsup";
-import { baseConfig } from "@gnosis-guild/enclave-config/tsup";
+import { baseConfig } from "@enclave-e3/config/tsup";
 
 export default defineConfig({
   ...baseConfig,
diff --git a/packages/enclave-sdk/CHANGELOG.md b/packages/enclave-sdk/CHANGELOG.md
new file mode 100644
index 0000000000..890d3cd8ed
--- /dev/null
+++ b/packages/enclave-sdk/CHANGELOG.md
@@ -0,0 +1,10 @@
+# @enclave-e3/sdk
+
+## 0.0.6-test.0
+
+### Patch Changes
+
+- Migrate npm org
+- Updated dependencies
+  - @enclave-e3/contracts@0.0.6-test.0
+  - @enclave-e3/wasm@0.0.6-test.0
diff --git a/packages/enclave-sdk/README.md b/packages/enclave-sdk/README.md
index 5fb59c0329..5e193b7b3f 100644
--- a/packages/enclave-sdk/README.md
+++ b/packages/enclave-sdk/README.md
@@ -19,7 +19,7 @@ methods, and comprehensive error handling.
 ## Installation
 
 ```bash
-pnpm add @gnosis-guild/enclave-sdk
+pnpm add @enclave-e3/sdk
 ```
 
 ## Quick Start
@@ -29,7 +29,7 @@ import {
   EnclaveSDK,
   EnclaveEventType,
   RegistryEventType,
-} from "@gnosis-guild/enclave-sdk";
+} from "@enclave-e3/sdk";
 import { createPublicClient, createWalletClient, http, custom } from "viem";
 
 // Initialize clients
@@ -83,7 +83,7 @@ Usage within a typescript project should work out of the box, however in order t
 - Use `vite`
 - Use the `vite-plugin-top-level-await` plugin
 - Use the `vite-plugin-wasm` plugin
-- Exclude the `@gnosis-guild/e3-wasm` package from bundling optimization.
+- Exclude the `@enclave-e3/wasm` package from bundling optimization.
 
 This will enable `vite` to correctly bundle and serve the wasm bundle we use effectively.
 
@@ -95,7 +95,7 @@ import topLevelAwait from 'vite-plugin-top-level-await'
 export default defineConfig({
   // other config ...
   optimizeDeps: {
-    exclude: ['@gnosis-guild/e3-wasm'],
+    exclude: ['@enclave-e3/wasm'],
   },
   plugins: [wasm(), topLevelAwait()],
 })
@@ -160,7 +160,7 @@ interface EnclaveEvent<T extends AllEventTypes> {
 The SDK includes a React hook for easy integration:
 
 ```typescript
-import { useEnclaveSDK } from '@gnosis-guild/enclave/sdk';
+import { useEnclaveSDK } from '@enclave-e3/contracts/sdk';
 
 function MyComponent() {
   const {
@@ -285,7 +285,7 @@ interface SDKConfig {
 The SDK includes comprehensive error handling:
 
 ```typescript
-import { SDKError } from "@gnosis-guild/enclave-sdk";
+import { SDKError } from "@enclave-e3/sdk";
 
 try {
   await sdk.requestE3(params);
@@ -303,7 +303,7 @@ try {
 ### Building the SDK
 
 ```bash
-cd packages/evm
+cd packages/enclave-contracts
 pnpm compile
 ```
 
@@ -321,7 +321,7 @@ contract interactions.
 ### Testing
 
 ```bash
-cd packages/evm
+cd packages/enclave-contracts
 pnpm test
 ```
 
diff --git a/packages/enclave-sdk/package.json b/packages/enclave-sdk/package.json
index 21b3020382..e48a16dfa3 100644
--- a/packages/enclave-sdk/package.json
+++ b/packages/enclave-sdk/package.json
@@ -1,7 +1,6 @@
 {
-  "name": "@gnosis-guild/enclave-sdk",
-  "private": false,
-  "version": "0.0.6-test",
+  "name": "@enclave-e3/sdk",
+  "version": "0.0.10-test",
   "type": "module",
   "exports": {
     ".": {
@@ -17,8 +16,11 @@
   "files": [
     "dist"
   ],
+  "publishConfig": {
+    "access": "public"
+  },
   "scripts": {
-    "prebuild": "cd ../evm && pnpm compile:ts && cd ../../crates/wasm && pnpm build",
+    "prebuild": "cd ../enclave-contracts && pnpm compile:ts && cd ../../crates/wasm && pnpm build",
     "build": "tsup",
     "dev": "tsup --watch",
     "clean": "rm -rf dist",
@@ -27,7 +29,7 @@
     "release": "pnpm publish --access=public"
   },
   "devDependencies": {
-    "@gnosis-guild/enclave-config": "workspace:*",
+    "@enclave-e3/config": "workspace:*",
     "concurrently": "^9.1.2",
     "tsup": "^8.5.0",
     "typescript": "5.8.3",
@@ -37,8 +39,8 @@
   "dependencies": {
     "@aztec/bb.js": "^0.82.2",
     "@noir-lang/noir_js": "1.0.0-beta.3",
-    "@gnosis-guild/e3-wasm": "workspace:*",
-    "@gnosis-guild/enclave": "workspace:*",
+    "@enclave-e3/wasm": "^0.0.10-test",
+    "@enclave-e3/contracts": "workspace:*",
     "comlink": "^4.4.2",
     "viem": "2.30.6",
     "vite-plugin-top-level-await": "^1.5.0",
diff --git a/packages/enclave-sdk/src/contract-client.ts b/packages/enclave-sdk/src/contract-client.ts
index 853ef8d3cc..bebadd9fbd 100644
--- a/packages/enclave-sdk/src/contract-client.ts
+++ b/packages/enclave-sdk/src/contract-client.ts
@@ -15,7 +15,7 @@ import {
 import {
   CiphernodeRegistryOwnable__factory,
   Enclave__factory,
-} from "@gnosis-guild/enclave/types";
+} from "@enclave-e3/contracts/types";
 import { type E3 } from "./types";
 import { SDKError, isValidAddress } from "./utils";
 
diff --git a/packages/enclave-sdk/src/enclave-sdk.ts b/packages/enclave-sdk/src/enclave-sdk.ts
index 73bc419cdf..1c9148f8f4 100644
--- a/packages/enclave-sdk/src/enclave-sdk.ts
+++ b/packages/enclave-sdk/src/enclave-sdk.ts
@@ -16,12 +16,12 @@ import {
 } from "viem";
 import { privateKeyToAccount } from "viem/accounts";
 import { hardhat, mainnet, monadTestnet, sepolia } from "viem/chains";
-import initializeWasm from "@gnosis-guild/e3-wasm/init";
+import initializeWasm from "@enclave-e3/wasm/init";
 
 import {
   CiphernodeRegistryOwnable__factory,
   Enclave__factory,
-} from "@gnosis-guild/enclave/types";
+} from "@enclave-e3/contracts/types";
 import { ContractClient } from "./contract-client";
 import { EventListener } from "./event-listener";
 import { FheProtocol, EnclaveEventType, BfvProtocolParams } from "./types";
@@ -35,8 +35,8 @@ import type {
   ProtocolParams,
   VerifiableEncryptionResult,
 } from "./types";
-import { bfv_encrypt_number, bfv_verifiable_encrypt_number } from "@gnosis-guild/e3-wasm";
-import { CircuitInputs, defaultParams, generateProof } from "./greco";
+import { bfv_encrypt_number, bfv_verifiable_encrypt_number } from "@enclave-e3/wasm";
+import { CircuitInputs, generateProof } from "./greco";
 import { CompiledCircuit } from "@noir-lang/noir_js";
 
 export class EnclaveSDK {
diff --git a/packages/enclave-sdk/src/types.ts b/packages/enclave-sdk/src/types.ts
index 31c0f4a51b..c1e301873e 100644
--- a/packages/enclave-sdk/src/types.ts
+++ b/packages/enclave-sdk/src/types.ts
@@ -6,11 +6,12 @@
 
 import type { Log, PublicClient, WalletClient } from "viem";
 import type { ProofData } from "@aztec/bb.js";
-import type {
-  CiphernodeRegistryOwnable,
-  Enclave,
-  MockCiphernodeRegistry,
-} from "@gnosis-guild/enclave/types";
+
+import {
+  type CiphernodeRegistryOwnable,
+  type Enclave,
+  type MockCiphernodeRegistry,
+} from "@enclave-e3/contracts/types";
 
 /**
  * SDK configuration
diff --git a/packages/enclave-sdk/tsconfig.json b/packages/enclave-sdk/tsconfig.json
index 0ab9246f05..14d49d1f3d 100644
--- a/packages/enclave-sdk/tsconfig.json
+++ b/packages/enclave-sdk/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "@gnosis-guild/enclave-config/tsconfig.json",
+  "extends": "@enclave-e3/config/tsconfig.json",
   "include": ["src/**/*", "tests/**/*"],
   "exclude": ["node_modules", "dist"],
   "compilerOptions": {
diff --git a/packages/enclave-sdk/tsup.config.js b/packages/enclave-sdk/tsup.config.js
index 1db149f582..c3eba93d7b 100644
--- a/packages/enclave-sdk/tsup.config.js
+++ b/packages/enclave-sdk/tsup.config.js
@@ -5,7 +5,7 @@
 // or FITNESS FOR A PARTICULAR PURPOSE.
 
 import { defineConfig } from "tsup";
-import { baseConfig } from "@gnosis-guild/enclave-config/tsup";
+import { baseConfig } from "@enclave-e3/config/tsup";
 
 export default defineConfig([
   {
@@ -17,7 +17,7 @@ export default defineConfig([
     }),
     esbuildOptions: (options) => {
       options.alias = {
-        "@gnosis-guild/e3-wasm/init": "../../../crates/wasm/init_node.js",
+        "@enclave-e3/wasm/init": "../../../crates/wasm/init_node.js",
       };
     },
   },
@@ -30,7 +30,7 @@ export default defineConfig([
     }),
     esbuildOptions: (options) => {
       options.alias = {
-        "@gnosis-guild/e3-wasm/init": "../../../crates/wasm/init_node.cjs",
+        "@enclave-e3/wasm/init": "../../../crates/wasm/init_node.cjs",
       };
     },
   },
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index b3b1201412..cf4bfadcca 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -63,15 +63,15 @@ importers:
 
   examples/CRISP:
     dependencies:
+      '@enclave-e3/contracts':
+        specifier: ^0.0.10-test
+        version: 0.0.10-test
+      '@enclave-e3/sdk':
+        specifier: ^0.0.10-test
+        version: 0.0.10-test(@types/node@22.7.5)(bufferutil@4.0.9)(typescript@5.8.3)(utf-8-validate@5.0.10)(vite@6.3.5(@types/node@22.7.5)(jiti@1.21.7)(tsx@4.20.5)(yaml@2.8.1))(zod@3.25.76)
       '@excubiae/contracts':
         specifier: ^0.4.0
         version: 0.4.0
-      '@gnosis-guild/enclave':
-        specifier: workspace:*
-        version: link:../../packages/evm
-      '@gnosis-guild/enclave-sdk':
-        specifier: workspace:*
-        version: link:../../packages/enclave-sdk
       '@hashcloak/semaphore-contracts-noir':
         specifier: 1.0.1
         version: 1.0.1
@@ -85,9 +85,9 @@ importers:
         specifier: ^0.1.13
         version: 0.1.26
     devDependencies:
-      '@gnosis-guild/enclave-config':
-        specifier: workspace:*
-        version: link:../../packages/enclave-config
+      '@enclave-e3/config':
+        specifier: ^0.0.10-test
+        version: 0.0.10-test(tsup@8.5.0(@microsoft/api-extractor@7.52.11(@types/node@22.7.5))(@swc/core@1.13.5)(jiti@1.21.7)(postcss@8.5.6)(tsx@4.20.5)(typescript@5.8.3)(yaml@2.8.1))
       '@nomicfoundation/hardhat-chai-matchers':
         specifier: ^2.0.0
         version: 2.1.0(@nomicfoundation/hardhat-ethers@3.1.0(ethers@6.15.0(bufferutil@4.0.9)(utf-8-validate@5.0.10))(hardhat@2.26.3(bufferutil@4.0.9)(ts-node@10.9.2(@swc/core@1.13.5)(@swc/wasm@1.13.5)(@types/node@22.7.5)(typescript@5.8.3))(typescript@5.8.3)(utf-8-validate@5.0.10)))(chai@5.3.3)(ethers@6.15.0(bufferutil@4.0.9)(utf-8-validate@5.0.10))(hardhat@2.26.3(bufferutil@4.0.9)(ts-node@10.9.2(@swc/core@1.13.5)(@swc/wasm@1.13.5)(@types/node@22.7.5)(typescript@5.8.3))(typescript@5.8.3)(utf-8-validate@5.0.10))
@@ -118,18 +118,12 @@ importers:
       '@playwright/test':
         specifier: 1.52.0
         version: 1.52.0
-      '@semaphore-protocol/core':
-        specifier: github:hmzakhalid/semaphore-noir#dist-core
-        version: https://codeload.github.com/hmzakhalid/semaphore-noir/tar.gz/caad5529009ebdeb1613c552c4e188a54b681a43(@types/snarkjs@0.7.9)(bufferutil@4.0.9)(commander@13.1.0)(utf-8-validate@5.0.10)
-      '@semaphore-protocol/data':
-        specifier: ^4.9.2
-        version: 4.13.0(bufferutil@4.0.9)(typescript@5.8.3)(utf-8-validate@5.0.10)(zod@3.25.76)
       '@synthetixio/synpress':
         specifier: ^4.1.0
-        version: 4.1.1(@depay/solana-web3.js@1.98.3)(@depay/web3-blockchains@9.8.6)(@microsoft/api-extractor@7.52.11(@types/node@22.7.5))(@playwright/test@1.52.0)(@swc/core@1.13.5)(bufferutil@4.0.9)(ethers@6.15.0(bufferutil@4.0.9)(utf-8-validate@5.0.10))(playwright-core@1.52.0)(postcss@8.5.6)(typescript@5.8.3)(utf-8-validate@5.0.10)(zod@3.25.76)
+        version: 4.1.1(@depay/solana-web3.js@1.98.3)(@depay/web3-blockchains@9.8.6)(@microsoft/api-extractor@7.52.11(@types/node@22.7.5))(@playwright/test@1.52.0)(@swc/core@1.13.5)(bufferutil@4.0.9)(ethers@6.15.0(bufferutil@4.0.9)(utf-8-validate@5.0.10))(jiti@1.21.7)(playwright-core@1.52.0)(postcss@8.5.6)(tsx@4.20.5)(typescript@5.8.3)(utf-8-validate@5.0.10)(yaml@2.8.1)(zod@3.25.76)
       '@synthetixio/synpress-cache':
         specifier: ^0.0.12
-        version: 0.0.12(@microsoft/api-extractor@7.52.11(@types/node@22.7.5))(@swc/core@1.13.5)(playwright-core@1.52.0)(postcss@8.5.6)(typescript@5.8.3)
+        version: 0.0.12(@microsoft/api-extractor@7.52.11(@types/node@22.7.5))(@swc/core@1.13.5)(jiti@1.21.7)(playwright-core@1.52.0)(postcss@8.5.6)(tsx@4.20.5)(typescript@5.8.3)(yaml@2.8.1)
       '@typechain/ethers-v6':
         specifier: ^0.5.0
         version: 0.5.1(ethers@6.15.0(bufferutil@4.0.9)(utf-8-validate@5.0.10))(typechain@8.3.2(typescript@5.8.3))(typescript@5.8.3)
@@ -196,9 +190,9 @@ importers:
       '@emotion/react':
         specifier: ^11.11.4
         version: 11.14.0(@types/react@18.3.24)(react@18.3.1)
-      '@gnosis-guild/enclave-sdk':
-        specifier: workspace:*
-        version: link:../../../packages/enclave-sdk
+      '@enclave-e3/sdk':
+        specifier: ^0.0.10-test
+        version: 0.0.10-test(@types/node@22.7.5)(bufferutil@4.0.9)(rollup@4.49.0)(typescript@5.8.3)(utf-8-validate@5.0.10)(vite@5.4.19(@types/node@22.7.5))(zod@3.25.76)
       '@hashcloak/semaphore-noir-proof':
         specifier: 1.0.0
         version: 1.0.0(@semaphore-protocol/group@4.13.0(bufferutil@4.0.9)(utf-8-validate@5.0.10))(@semaphore-protocol/identity@4.13.0)(@types/snarkjs@0.7.9)(bufferutil@4.0.9)(commander@13.1.0)(utf-8-validate@5.0.10)
@@ -333,99 +327,16 @@ importers:
         specifier: 8.5.0
         version: 8.5.0(@microsoft/api-extractor@7.52.11(@types/node@22.7.5))(@swc/core@1.13.5)(jiti@1.21.7)(postcss@8.5.6)(tsx@4.20.5)(typescript@5.8.3)(yaml@2.8.1)
 
-  packages/enclave-react:
-    dependencies:
-      '@gnosis-guild/enclave-sdk':
-        specifier: workspace:*
-        version: link:../enclave-sdk
-      react:
-        specifier: ^18.2.0
-        version: 18.3.1
-      viem:
-        specifier: 2.30.6
-        version: 2.30.6(bufferutil@4.0.9)(typescript@5.8.3)(utf-8-validate@5.0.10)(zod@3.25.76)
-      wagmi:
-        specifier: ^2.14.16
-        version: 2.16.8(@tanstack/query-core@5.85.5)(@tanstack/react-query@5.85.5(react@18.3.1))(@types/react@18.3.24)(bufferutil@4.0.9)(immer@10.0.2)(react@18.3.1)(typescript@5.8.3)(utf-8-validate@5.0.10)(viem@2.30.6(bufferutil@4.0.9)(typescript@5.8.3)(utf-8-validate@5.0.10)(zod@3.25.76))(zod@3.25.76)
-    devDependencies:
-      '@gnosis-guild/enclave-config':
-        specifier: workspace:*
-        version: link:../enclave-config
-      '@types/react':
-        specifier: ^18.2.0
-        version: 18.3.24
-      tsup:
-        specifier: 8.5.0
-        version: 8.5.0(@microsoft/api-extractor@7.52.11(@types/node@22.7.5))(@swc/core@1.13.5)(jiti@1.21.7)(postcss@8.5.6)(tsx@4.20.5)(typescript@5.8.3)(yaml@2.8.1)
-      typescript:
-        specifier: 5.8.3
-        version: 5.8.3
-
-  packages/enclave-sdk:
-    dependencies:
-      '@aztec/bb.js':
-        specifier: ^0.82.2
-        version: 0.82.3
-      '@gnosis-guild/e3-wasm':
-        specifier: workspace:*
-        version: link:../../crates/wasm
-      '@gnosis-guild/enclave':
-        specifier: workspace:*
-        version: link:../evm
-      '@noir-lang/noir_js':
-        specifier: 1.0.0-beta.3
-        version: 1.0.0-beta.3
-      comlink:
-        specifier: ^4.4.2
-        version: 4.4.2
-      viem:
-        specifier: 2.30.6
-        version: 2.30.6(bufferutil@4.0.9)(typescript@5.8.3)(utf-8-validate@5.0.10)(zod@3.25.76)
-      vite-plugin-top-level-await:
-        specifier: ^1.5.0
-        version: 1.6.0(rollup@4.49.0)(vite@6.3.5(@types/node@22.7.5)(jiti@1.21.7)(tsx@4.20.5)(yaml@2.8.1))
-      vite-plugin-wasm:
-        specifier: ^3.4.1
-        version: 3.5.0(vite@6.3.5(@types/node@22.7.5)(jiti@1.21.7)(tsx@4.20.5)(yaml@2.8.1))
-      vitest:
-        specifier: ^1.6.1
-        version: 1.6.1(@types/node@22.7.5)
-      web-worker:
-        specifier: ^1.5.0
-        version: 1.5.0
-    devDependencies:
-      '@gnosis-guild/enclave-config':
-        specifier: workspace:*
-        version: link:../enclave-config
-      concurrently:
-        specifier: ^9.1.2
-        version: 9.2.1
-      tsup:
-        specifier: 8.5.0
-        version: 8.5.0(@microsoft/api-extractor@7.52.11(@types/node@22.7.5))(@swc/core@1.13.5)(jiti@1.21.7)(postcss@8.5.6)(tsx@4.20.5)(typescript@5.8.3)(yaml@2.8.1)
-      typescript:
-        specifier: 5.8.3
-        version: 5.8.3
-      vite:
-        specifier: ^6.2.0
-        version: 6.3.5(@types/node@22.7.5)(jiti@1.21.7)(tsx@4.20.5)(yaml@2.8.1)
-      vite-plugin-dts:
-        specifier: ^4.5.3
-        version: 4.5.4(@types/node@22.7.5)(rollup@4.49.0)(typescript@5.8.3)(vite@6.3.5(@types/node@22.7.5)(jiti@1.21.7)(tsx@4.20.5)(yaml@2.8.1))
-
-  packages/evm:
+  packages/enclave-contracts:
     dependencies:
       '@excubiae/contracts':
         specifier: ^0.4.0
         version: 0.4.0
-      '@gnosis-guild/enclave-sdk':
-        specifier: workspace:*
-        version: link:../enclave-sdk
       solady:
         specifier: ^0.1.13
         version: 0.1.26
     devDependencies:
-      '@gnosis-guild/enclave-config':
+      '@enclave-e3/config':
         specifier: workspace:*
         version: link:../enclave-config
       '@nomicfoundation/hardhat-chai-matchers':
@@ -555,12 +466,92 @@ importers:
         specifier: 5.8.3
         version: 5.8.3
 
+  packages/enclave-react:
+    dependencies:
+      '@enclave-e3/sdk':
+        specifier: workspace:*
+        version: link:../enclave-sdk
+      react:
+        specifier: ^18.2.0
+        version: 18.3.1
+      viem:
+        specifier: 2.30.6
+        version: 2.30.6(bufferutil@4.0.9)(typescript@5.8.3)(utf-8-validate@5.0.10)(zod@3.25.76)
+      wagmi:
+        specifier: ^2.14.16
+        version: 2.16.8(@tanstack/query-core@5.85.5)(@tanstack/react-query@5.85.5(react@18.3.1))(@types/react@18.3.24)(bufferutil@4.0.9)(immer@10.0.2)(react@18.3.1)(typescript@5.8.3)(utf-8-validate@5.0.10)(viem@2.30.6(bufferutil@4.0.9)(typescript@5.8.3)(utf-8-validate@5.0.10)(zod@3.25.76))(zod@3.25.76)
+    devDependencies:
+      '@enclave-e3/config':
+        specifier: workspace:*
+        version: link:../enclave-config
+      '@types/react':
+        specifier: ^18.2.0
+        version: 18.3.24
+      tsup:
+        specifier: 8.5.0
+        version: 8.5.0(@microsoft/api-extractor@7.52.11(@types/node@22.7.5))(@swc/core@1.13.5)(jiti@1.21.7)(postcss@8.5.6)(tsx@4.20.5)(typescript@5.8.3)(yaml@2.8.1)
+      typescript:
+        specifier: 5.8.3
+        version: 5.8.3
+
+  packages/enclave-sdk:
+    dependencies:
+      '@aztec/bb.js':
+        specifier: ^0.82.2
+        version: 0.82.3
+      '@enclave-e3/contracts':
+        specifier: workspace:*
+        version: link:../enclave-contracts
+      '@enclave-e3/wasm':
+        specifier: ^0.0.10-test
+        version: 0.0.10-test
+      '@noir-lang/noir_js':
+        specifier: 1.0.0-beta.3
+        version: 1.0.0-beta.3
+      comlink:
+        specifier: ^4.4.2
+        version: 4.4.2
+      viem:
+        specifier: 2.30.6
+        version: 2.30.6(bufferutil@4.0.9)(typescript@5.8.3)(utf-8-validate@5.0.10)(zod@3.25.76)
+      vite-plugin-top-level-await:
+        specifier: ^1.5.0
+        version: 1.6.0(rollup@4.49.0)(vite@6.3.5(@types/node@22.7.5)(jiti@1.21.7)(tsx@4.20.5)(yaml@2.8.1))
+      vite-plugin-wasm:
+        specifier: ^3.4.1
+        version: 3.5.0(vite@6.3.5(@types/node@22.7.5)(jiti@1.21.7)(tsx@4.20.5)(yaml@2.8.1))
+      vitest:
+        specifier: ^1.6.1
+        version: 1.6.1(@types/node@22.7.5)
+      web-worker:
+        specifier: ^1.5.0
+        version: 1.5.0
+    devDependencies:
+      '@enclave-e3/config':
+        specifier: workspace:*
+        version: link:../enclave-config
+      concurrently:
+        specifier: ^9.1.2
+        version: 9.2.1
+      tsup:
+        specifier: 8.5.0
+        version: 8.5.0(@microsoft/api-extractor@7.52.11(@types/node@22.7.5))(@swc/core@1.13.5)(jiti@1.21.7)(postcss@8.5.6)(tsx@4.20.5)(typescript@5.8.3)(yaml@2.8.1)
+      typescript:
+        specifier: 5.8.3
+        version: 5.8.3
+      vite:
+        specifier: ^6.2.0
+        version: 6.3.5(@types/node@22.7.5)(jiti@1.21.7)(tsx@4.20.5)(yaml@2.8.1)
+      vite-plugin-dts:
+        specifier: ^4.5.3
+        version: 4.5.4(@types/node@22.7.5)(rollup@4.49.0)(typescript@5.8.3)(vite@6.3.5(@types/node@22.7.5)(jiti@1.21.7)(tsx@4.20.5)(yaml@2.8.1))
+
   templates/default:
     dependencies:
-      '@gnosis-guild/enclave':
+      '@enclave-e3/contracts':
         specifier: workspace:*
-        version: link:../../packages/evm
-      '@gnosis-guild/enclave-sdk':
+        version: link:../../packages/enclave-contracts
+      '@enclave-e3/sdk':
         specifier: workspace:*
         version: link:../../packages/enclave-sdk
       '@types/yargs':
@@ -666,13 +657,10 @@ importers:
 
   templates/default/client:
     dependencies:
-      '@gnosis-guild/enclave':
-        specifier: workspace:*
-        version: link:../../../packages/evm
-      '@gnosis-guild/enclave-react':
+      '@enclave-e3/react':
         specifier: workspace:*
         version: link:../../../packages/enclave-react
-      '@gnosis-guild/enclave-sdk':
+      '@enclave-e3/sdk':
         specifier: workspace:*
         version: link:../../../packages/enclave-sdk
       '@phosphor-icons/react':
@@ -1545,6 +1533,20 @@ packages:
   '@emotion/weak-memoize@0.4.0':
     resolution: {integrity: sha512-snKqtPW01tN0ui7yu9rGv69aJXr/a/Ywvl11sUjNtEcRc+ng/mQriFL0wLXMef74iHa/EkftbDzU9F8iFbH+zg==}
 
+  '@enclave-e3/config@0.0.10-test':
+    resolution: {integrity: sha512-MMacOEfYvzV+mb1k9PUwXjuRBXXEygHgspdzcUZBkKq56YN/JI+VZIhnfk9IUCGw0NG84sIdBAFhgQz11tZebA==}
+    peerDependencies:
+      tsup: 8.5.0
+
+  '@enclave-e3/contracts@0.0.10-test':
+    resolution: {integrity: sha512-NAwFyd82Tz5l14RMyT1++uqbhjuJWiDIHVKJKiSPGUOZt5Ee07/4ZWrUZvrIaIsmfQWuCFeqUjeI3RsPW0xUTA==}
+
+  '@enclave-e3/sdk@0.0.10-test':
+    resolution: {integrity: sha512-/athXNiSgxRlBl1Egdl/4RwZETkmnBHvIbUmSmB/cAU/gzNJh1tO4yOzMB5Gbw0jyqPoUGye7i6MS9Hc+p1GYw==}
+
+  '@enclave-e3/wasm@0.0.10-test':
+    resolution: {integrity: sha512-mEfHn+exMB/seUaMGfw3zaVm9Z9/2XDU7M9k3O6UCUudwoKsfSoHsJdKXVYwFxu96bkqyDGPk9zSU7yNpwPcZg==}
+
   '@esbuild/aix-ppc64@0.20.0':
     resolution: {integrity: sha512-fGFDEctNh0CcSwsiRPxiaqX0P5rq+AqE0SRhYGZ4PX46Lg1FNR6oCxJghf8YgY0WQEgQuh3lErUFE4KxLeRmmw==}
     engines: {node: '>=12'}
@@ -3164,34 +3166,15 @@ packages:
   '@semaphore-protocol/contracts@4.13.0':
     resolution: {integrity: sha512-MZeD3CJIgHn8WnEcUvWkQjncIcfdqPwzeb6tPX3Zf0n5VhRiigxBLSuQYY5QzFNd/mzgScLO6duwOq3T1Oup+A==}
 
-  '@semaphore-protocol/core@https://codeload.github.com/hmzakhalid/semaphore-noir/tar.gz/caad5529009ebdeb1613c552c4e188a54b681a43':
-    resolution: {tarball: https://codeload.github.com/hmzakhalid/semaphore-noir/tar.gz/caad5529009ebdeb1613c552c4e188a54b681a43}
-    version: 4.9.1
-
   '@semaphore-protocol/data@4.13.0':
     resolution: {integrity: sha512-91dgssYuh4lbcelmNe/Mbq6riXr+zFIUQnUNCq8mxbCrDeX6RnUOQFfQ5XzGF1RNJQN4+wiESzipM7SrB4mhsQ==}
 
   '@semaphore-protocol/group@4.13.0':
     resolution: {integrity: sha512-wj2g6lAa1l2eg6U9wu9PvjtgsynWLaXnRU5GGzOBwOZkOW66VdfyIE6a7tLxrvVVyZVRylIZ0Juhlo6NJVfwAA==}
 
-  '@semaphore-protocol/group@https://codeload.github.com/hmzakhalid/semaphore-noir/tar.gz/8c41614a00c121ec96e07d73145dc542739eefa8':
-    resolution: {tarball: https://codeload.github.com/hmzakhalid/semaphore-noir/tar.gz/8c41614a00c121ec96e07d73145dc542739eefa8}
-    version: 4.9.1
-
   '@semaphore-protocol/identity@4.13.0':
     resolution: {integrity: sha512-lszEOQFMMI12HmDL1rzPz6OQvlW1e2QVZsbKI5K4CnPYsnIh+yZ3i5PQKnCu7slT0mmObNlPQU2cpBbe4Vo9DQ==}
 
-  '@semaphore-protocol/identity@https://codeload.github.com/hmzakhalid/semaphore-noir/tar.gz/4137e5d6cf645af3fc8eb720b6c8ee33a125d0ef':
-    resolution: {tarball: https://codeload.github.com/hmzakhalid/semaphore-noir/tar.gz/4137e5d6cf645af3fc8eb720b6c8ee33a125d0ef}
-    version: 4.9.1
-
-  '@semaphore-protocol/proof@https://codeload.github.com/hmzakhalid/semaphore-noir/tar.gz/d8989c48201f05245965f992e4fc4f0bddb7725e':
-    resolution: {tarball: https://codeload.github.com/hmzakhalid/semaphore-noir/tar.gz/d8989c48201f05245965f992e4fc4f0bddb7725e}
-    version: 4.9.1
-    peerDependencies:
-      '@semaphore-protocol/group': 4.9.1
-      '@semaphore-protocol/identity': 4.9.1
-
   '@semaphore-protocol/utils@4.13.0':
     resolution: {integrity: sha512-5F05Hfbs+zuXgIMaefgnURCSQ5GW6Q0R8Ew1L+f9eFrHOrolPE9Oz3RV1dLw0zmA6s9PlUESo2g6S73XHhkLYg==}
 
@@ -3944,11 +3927,6 @@ packages:
   '@walletconnect/window-metadata@1.0.1':
     resolution: {integrity: sha512-9koTqyGrM2cqFRW517BPY/iEtUDx2r1+Pwwu5m7sJ7ka79wi3EyqhqcICk/yDmv6jAS1rjKgTKXlEhanYjijcA==}
 
-  '@zk-kit/artifacts@https://codeload.github.com/hmzakhalid/snark-artifacts/tar.gz/a8eb62a0e3f1d4917f7895bf4511ee1f7f221dc3':
-    resolution: {tarball: https://codeload.github.com/hmzakhalid/snark-artifacts/tar.gz/a8eb62a0e3f1d4917f7895bf4511ee1f7f221dc3}
-    version: 2.0.1
-    hasBin: true
-
   '@zk-kit/baby-jubjub@1.0.3':
     resolution: {integrity: sha512-Wl+QfV6XGOMk1yU2JTqHXeKWfJVXp83is0+dtqfj9wx4wsAPpb+qzYvwAxW5PBx5/Nu71Bh7jp/5vM+6QgHSwA==}
 
@@ -3961,9 +3939,6 @@ packages:
   '@zk-kit/lean-imt.sol@2.0.1':
     resolution: {integrity: sha512-2dy/wfzch2vy5QtDCFmQwN7E4GZP0xBcucTb2mfZoJP5V69cjPRdy6KcbS0YOcBMH/Lb7BgXLsekRYjh9JNKEw==}
 
-  '@zk-kit/lean-imt@2.2.3':
-    resolution: {integrity: sha512-T6NXLzMuwFjp+hg6WJZqzJ2qyyTmbS9JmxiWW/lmp+VxxJLAO9byAvqd5p/7616AXdHyTbwku0tdX0JDq9Pkng==}
-
   '@zk-kit/lean-imt@2.2.4':
     resolution: {integrity: sha512-uoRl99DID9Z5EuhfecDuIGP0KLrGEndVH0+texwVQBmlXTvve+grkKT4w06C+VFzRmfYNVuRo9tXvqIzQ3dqPA==}
 
@@ -9864,7 +9839,7 @@ snapshots:
     dependencies:
       comlink: 4.4.2
       commander: 12.1.0
-      debug: 4.4.1(supports-color@5.5.0)
+      debug: 4.4.1(supports-color@8.1.1)
       fflate: 0.8.2
       pako: 2.1.0
       tslib: 2.8.1
@@ -9875,7 +9850,7 @@ snapshots:
     dependencies:
       comlink: 4.4.2
       commander: 12.1.0
-      debug: 4.4.1(supports-color@5.5.0)
+      debug: 4.4.1(supports-color@8.1.1)
       fflate: 0.8.2
       pako: 2.1.0
       tslib: 2.8.1
@@ -9900,10 +9875,10 @@ snapshots:
       '@babel/helpers': 7.28.3
       '@babel/parser': 7.28.3
       '@babel/template': 7.27.2
-      '@babel/traverse': 7.28.3(supports-color@5.5.0)
+      '@babel/traverse': 7.28.3
       '@babel/types': 7.28.2
       convert-source-map: 2.0.0
-      debug: 4.4.1(supports-color@5.5.0)
+      debug: 4.4.1(supports-color@8.1.1)
       gensync: 1.0.0-beta.2
       json5: 2.2.3
       semver: 6.3.1
@@ -9912,7 +9887,7 @@ snapshots:
 
   '@babel/generator@7.17.7':
     dependencies:
-      '@babel/types': 7.17.0
+      '@babel/types': 7.28.2
       jsesc: 2.5.2
       source-map: 0.5.7
 
@@ -9944,7 +9919,7 @@ snapshots:
       '@babel/helper-optimise-call-expression': 7.27.1
       '@babel/helper-replace-supers': 7.27.1(@babel/core@7.28.3)
       '@babel/helper-skip-transparent-expression-wrappers': 7.27.1
-      '@babel/traverse': 7.28.3(supports-color@5.5.0)
+      '@babel/traverse': 7.28.3
       semver: 6.3.1
     transitivePeerDependencies:
       - supports-color
@@ -9961,7 +9936,7 @@ snapshots:
       '@babel/core': 7.28.3
       '@babel/helper-compilation-targets': 7.27.2
       '@babel/helper-plugin-utils': 7.27.1
-      debug: 4.4.1(supports-color@5.5.0)
+      debug: 4.4.1(supports-color@8.1.1)
       lodash.debounce: 4.0.8
       resolve: 1.22.10
     transitivePeerDependencies:
@@ -9984,7 +9959,14 @@ snapshots:
 
   '@babel/helper-member-expression-to-functions@7.27.1':
     dependencies:
-      '@babel/traverse': 7.28.3(supports-color@5.5.0)
+      '@babel/traverse': 7.28.3
+      '@babel/types': 7.28.2
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/helper-module-imports@7.27.1':
+    dependencies:
+      '@babel/traverse': 7.28.3
       '@babel/types': 7.28.2
     transitivePeerDependencies:
       - supports-color
@@ -9999,9 +9981,9 @@ snapshots:
   '@babel/helper-module-transforms@7.28.3(@babel/core@7.28.3)':
     dependencies:
       '@babel/core': 7.28.3
-      '@babel/helper-module-imports': 7.27.1(supports-color@5.5.0)
+      '@babel/helper-module-imports': 7.27.1
       '@babel/helper-validator-identifier': 7.27.1
-      '@babel/traverse': 7.28.3(supports-color@5.5.0)
+      '@babel/traverse': 7.28.3
     transitivePeerDependencies:
       - supports-color
 
@@ -10016,7 +9998,7 @@ snapshots:
       '@babel/core': 7.28.3
       '@babel/helper-annotate-as-pure': 7.27.3
       '@babel/helper-wrap-function': 7.28.3
-      '@babel/traverse': 7.28.3(supports-color@5.5.0)
+      '@babel/traverse': 7.28.3
     transitivePeerDependencies:
       - supports-color
 
@@ -10025,13 +10007,13 @@ snapshots:
       '@babel/core': 7.28.3
       '@babel/helper-member-expression-to-functions': 7.27.1
       '@babel/helper-optimise-call-expression': 7.27.1
-      '@babel/traverse': 7.28.3(supports-color@5.5.0)
+      '@babel/traverse': 7.28.3
     transitivePeerDependencies:
       - supports-color
 
   '@babel/helper-skip-transparent-expression-wrappers@7.27.1':
     dependencies:
-      '@babel/traverse': 7.28.3(supports-color@5.5.0)
+      '@babel/traverse': 7.28.3
       '@babel/types': 7.28.2
     transitivePeerDependencies:
       - supports-color
@@ -10049,7 +10031,7 @@ snapshots:
   '@babel/helper-wrap-function@7.28.3':
     dependencies:
       '@babel/template': 7.27.2
-      '@babel/traverse': 7.28.3(supports-color@5.5.0)
+      '@babel/traverse': 7.28.3
       '@babel/types': 7.28.2
     transitivePeerDependencies:
       - supports-color
@@ -10067,7 +10049,7 @@ snapshots:
     dependencies:
       '@babel/core': 7.28.3
       '@babel/helper-plugin-utils': 7.27.1
-      '@babel/traverse': 7.28.3(supports-color@5.5.0)
+      '@babel/traverse': 7.28.3
     transitivePeerDependencies:
       - supports-color
 
@@ -10094,7 +10076,7 @@ snapshots:
     dependencies:
       '@babel/core': 7.28.3
       '@babel/helper-plugin-utils': 7.27.1
-      '@babel/traverse': 7.28.3(supports-color@5.5.0)
+      '@babel/traverse': 7.28.3
     transitivePeerDependencies:
       - supports-color
 
@@ -10138,14 +10120,14 @@ snapshots:
       '@babel/core': 7.28.3
       '@babel/helper-plugin-utils': 7.27.1
       '@babel/helper-remap-async-to-generator': 7.27.1(@babel/core@7.28.3)
-      '@babel/traverse': 7.28.3(supports-color@5.5.0)
+      '@babel/traverse': 7.28.3
     transitivePeerDependencies:
       - supports-color
 
   '@babel/plugin-transform-async-to-generator@7.27.1(@babel/core@7.28.3)':
     dependencies:
       '@babel/core': 7.28.3
-      '@babel/helper-module-imports': 7.27.1(supports-color@5.5.0)
+      '@babel/helper-module-imports': 7.27.1
       '@babel/helper-plugin-utils': 7.27.1
       '@babel/helper-remap-async-to-generator': 7.27.1(@babel/core@7.28.3)
     transitivePeerDependencies:
@@ -10185,7 +10167,7 @@ snapshots:
       '@babel/helper-globals': 7.28.0
       '@babel/helper-plugin-utils': 7.27.1
       '@babel/helper-replace-supers': 7.27.1(@babel/core@7.28.3)
-      '@babel/traverse': 7.28.3(supports-color@5.5.0)
+      '@babel/traverse': 7.28.3
     transitivePeerDependencies:
       - supports-color
 
@@ -10199,7 +10181,7 @@ snapshots:
     dependencies:
       '@babel/core': 7.28.3
       '@babel/helper-plugin-utils': 7.27.1
-      '@babel/traverse': 7.28.3(supports-color@5.5.0)
+      '@babel/traverse': 7.28.3
     transitivePeerDependencies:
       - supports-color
 
@@ -10256,7 +10238,7 @@ snapshots:
       '@babel/core': 7.28.3
       '@babel/helper-compilation-targets': 7.27.2
       '@babel/helper-plugin-utils': 7.27.1
-      '@babel/traverse': 7.28.3(supports-color@5.5.0)
+      '@babel/traverse': 7.28.3
     transitivePeerDependencies:
       - supports-color
 
@@ -10302,7 +10284,7 @@ snapshots:
       '@babel/helper-module-transforms': 7.28.3(@babel/core@7.28.3)
       '@babel/helper-plugin-utils': 7.27.1
       '@babel/helper-validator-identifier': 7.27.1
-      '@babel/traverse': 7.28.3(supports-color@5.5.0)
+      '@babel/traverse': 7.28.3
     transitivePeerDependencies:
       - supports-color
 
@@ -10342,7 +10324,7 @@ snapshots:
       '@babel/helper-plugin-utils': 7.27.1
       '@babel/plugin-transform-destructuring': 7.28.0(@babel/core@7.28.3)
       '@babel/plugin-transform-parameters': 7.27.7(@babel/core@7.28.3)
-      '@babel/traverse': 7.28.3(supports-color@5.5.0)
+      '@babel/traverse': 7.28.3
     transitivePeerDependencies:
       - supports-color
 
@@ -10425,7 +10407,7 @@ snapshots:
     dependencies:
       '@babel/core': 7.28.3
       '@babel/helper-annotate-as-pure': 7.27.3
-      '@babel/helper-module-imports': 7.27.1(supports-color@5.5.0)
+      '@babel/helper-module-imports': 7.27.1
       '@babel/helper-plugin-utils': 7.27.1
       '@babel/plugin-syntax-jsx': 7.27.1(@babel/core@7.28.3)
       '@babel/types': 7.28.2
@@ -10640,11 +10622,23 @@ snapshots:
       '@babel/helper-split-export-declaration': 7.24.7
       '@babel/parser': 7.28.3
       '@babel/types': 7.28.2
-      debug: 4.4.1(supports-color@5.5.0)
+      debug: 4.4.1(supports-color@8.1.1)
       globals: 11.12.0
     transitivePeerDependencies:
       - supports-color
 
+  '@babel/traverse@7.28.3':
+    dependencies:
+      '@babel/code-frame': 7.27.1
+      '@babel/generator': 7.28.3
+      '@babel/helper-globals': 7.28.0
+      '@babel/parser': 7.28.3
+      '@babel/template': 7.27.2
+      '@babel/types': 7.28.2
+      debug: 4.4.1(supports-color@8.1.1)
+    transitivePeerDependencies:
+      - supports-color
+
   '@babel/traverse@7.28.3(supports-color@5.5.0)':
     dependencies:
       '@babel/code-frame': 7.27.1
@@ -10918,7 +10912,7 @@ snapshots:
 
   '@emotion/babel-plugin@11.13.5':
     dependencies:
-      '@babel/helper-module-imports': 7.27.1(supports-color@5.5.0)
+      '@babel/helper-module-imports': 7.27.1
       '@babel/runtime': 7.28.3
       '@emotion/hash': 0.9.2
       '@emotion/memoize': 0.9.0
@@ -10996,6 +10990,87 @@ snapshots:
 
   '@emotion/weak-memoize@0.4.0': {}
 
+  '@enclave-e3/config@0.0.10-test(tsup@8.5.0(@microsoft/api-extractor@7.52.11(@types/node@22.7.5))(@swc/core@1.13.5)(jiti@1.21.7)(postcss@8.5.6)(tsx@4.20.5)(typescript@5.8.3)(yaml@2.8.1))':
+    dependencies:
+      tsup: 8.5.0(@microsoft/api-extractor@7.52.11(@types/node@22.7.5))(@swc/core@1.13.5)(jiti@1.21.7)(postcss@8.5.6)(tsx@4.20.5)(typescript@5.8.3)(yaml@2.8.1)
+
+  '@enclave-e3/contracts@0.0.10-test':
+    dependencies:
+      '@excubiae/contracts': 0.4.0
+      solady: 0.1.26
+
+  '@enclave-e3/sdk@0.0.10-test(@types/node@22.7.5)(bufferutil@4.0.9)(rollup@4.49.0)(typescript@5.8.3)(utf-8-validate@5.0.10)(vite@5.4.19(@types/node@22.7.5))(zod@3.25.76)':
+    dependencies:
+      '@aztec/bb.js': 0.82.3
+      '@enclave-e3/contracts': 0.0.10-test
+      '@enclave-e3/wasm': 0.0.10-test
+      '@noir-lang/noir_js': 1.0.0-beta.3
+      comlink: 4.4.2
+      viem: 2.30.6(bufferutil@4.0.9)(typescript@5.8.3)(utf-8-validate@5.0.10)(zod@3.25.76)
+      vite-plugin-top-level-await: 1.6.0(rollup@4.49.0)(vite@5.4.19(@types/node@22.7.5))
+      vite-plugin-wasm: 3.5.0(vite@5.4.19(@types/node@22.7.5))
+      vitest: 1.6.1(@types/node@22.7.5)
+      web-worker: 1.5.0
+    transitivePeerDependencies:
+      - '@edge-runtime/vm'
+      - '@swc/helpers'
+      - '@types/node'
+      - '@vitest/browser'
+      - '@vitest/ui'
+      - bufferutil
+      - happy-dom
+      - jsdom
+      - less
+      - lightningcss
+      - rollup
+      - sass
+      - sass-embedded
+      - stylus
+      - sugarss
+      - supports-color
+      - terser
+      - typescript
+      - utf-8-validate
+      - vite
+      - zod
+
+  '@enclave-e3/sdk@0.0.10-test(@types/node@22.7.5)(bufferutil@4.0.9)(typescript@5.8.3)(utf-8-validate@5.0.10)(vite@6.3.5(@types/node@22.7.5)(jiti@1.21.7)(tsx@4.20.5)(yaml@2.8.1))(zod@3.25.76)':
+    dependencies:
+      '@aztec/bb.js': 0.82.3
+      '@enclave-e3/contracts': 0.0.10-test
+      '@enclave-e3/wasm': 0.0.10-test
+      '@noir-lang/noir_js': 1.0.0-beta.3
+      comlink: 4.4.2
+      viem: 2.30.6(bufferutil@4.0.9)(typescript@5.8.3)(utf-8-validate@5.0.10)(zod@3.25.76)
+      vite-plugin-top-level-await: 1.6.0(vite@6.3.5(@types/node@22.7.5)(jiti@1.21.7)(tsx@4.20.5)(yaml@2.8.1))
+      vite-plugin-wasm: 3.5.0(vite@6.3.5(@types/node@22.7.5)(jiti@1.21.7)(tsx@4.20.5)(yaml@2.8.1))
+      vitest: 1.6.1(@types/node@22.7.5)
+      web-worker: 1.5.0
+    transitivePeerDependencies:
+      - '@edge-runtime/vm'
+      - '@swc/helpers'
+      - '@types/node'
+      - '@vitest/browser'
+      - '@vitest/ui'
+      - bufferutil
+      - happy-dom
+      - jsdom
+      - less
+      - lightningcss
+      - rollup
+      - sass
+      - sass-embedded
+      - stylus
+      - sugarss
+      - supports-color
+      - terser
+      - typescript
+      - utf-8-validate
+      - vite
+      - zod
+
+  '@enclave-e3/wasm@0.0.10-test': {}
+
   '@esbuild/aix-ppc64@0.20.0':
     optional: true
 
@@ -11222,7 +11297,7 @@ snapshots:
   '@eslint/eslintrc@2.1.4':
     dependencies:
       ajv: 6.12.6
-      debug: 4.4.1(supports-color@5.5.0)
+      debug: 4.4.1(supports-color@8.1.1)
       espree: 9.6.1
       globals: 13.24.0
       ignore: 5.3.2
@@ -11593,7 +11668,7 @@ snapshots:
   '@humanwhocodes/config-array@0.13.0':
     dependencies:
       '@humanwhocodes/object-schema': 2.0.3
-      debug: 4.4.1(supports-color@5.5.0)
+      debug: 4.4.1(supports-color@8.1.1)
       minimatch: 3.1.2
     transitivePeerDependencies:
       - supports-color
@@ -11917,7 +11992,7 @@ snapshots:
       bufferutil: 4.0.9
       cross-fetch: 4.1.0
       date-fns: 2.30.0
-      debug: 4.4.1(supports-color@5.5.0)
+      debug: 4.4.1(supports-color@8.1.1)
       eciesjs: 0.4.15
       eventemitter2: 6.4.9
       readable-stream: 3.6.2
@@ -11941,7 +12016,7 @@ snapshots:
       '@paulmillr/qr': 0.2.1
       bowser: 2.12.1
       cross-fetch: 4.1.0
-      debug: 4.4.1(supports-color@5.5.0)
+      debug: 4.4.1(supports-color@8.1.1)
       eciesjs: 0.4.15
       eth-rpc-errors: 4.0.3
       eventemitter2: 6.4.9
@@ -11967,7 +12042,7 @@ snapshots:
       '@noble/hashes': 1.8.0
       '@scure/base': 1.2.6
       '@types/debug': 4.1.12
-      debug: 4.4.1(supports-color@5.5.0)
+      debug: 4.4.1(supports-color@8.1.1)
       lodash.memoize: 4.1.2
       pony-cause: 2.1.11
       semver: 7.7.2
@@ -11979,7 +12054,7 @@ snapshots:
     dependencies:
       '@ethereumjs/tx': 4.2.0
       '@types/debug': 4.1.12
-      debug: 4.4.1(supports-color@5.5.0)
+      debug: 4.4.1(supports-color@8.1.1)
       semver: 7.7.2
       superstruct: 1.0.4
     transitivePeerDependencies:
@@ -11992,7 +12067,7 @@ snapshots:
       '@noble/hashes': 1.8.0
       '@scure/base': 1.2.6
       '@types/debug': 4.1.12
-      debug: 4.4.1(supports-color@5.5.0)
+      debug: 4.4.1(supports-color@8.1.1)
       pony-cause: 2.1.11
       semver: 7.7.2
       uuid: 9.0.1
@@ -12006,7 +12081,7 @@ snapshots:
       '@noble/hashes': 1.8.0
       '@scure/base': 1.2.6
       '@types/debug': 4.1.12
-      debug: 4.4.1(supports-color@5.5.0)
+      debug: 4.4.1(supports-color@8.1.1)
       pony-cause: 2.1.11
       semver: 7.7.2
       uuid: 9.0.1
@@ -12302,7 +12377,7 @@ snapshots:
 
   '@nomicfoundation/hardhat-ethers@3.1.0(ethers@6.15.0(bufferutil@4.0.9)(utf-8-validate@5.0.10))(hardhat@2.26.3(bufferutil@4.0.9)(ts-node@10.9.2(@swc/core@1.13.5)(@swc/wasm@1.13.5)(@types/node@22.7.5)(typescript@5.8.3))(typescript@5.8.3)(utf-8-validate@5.0.10))':
     dependencies:
-      debug: 4.4.1(supports-color@5.5.0)
+      debug: 4.4.1(supports-color@8.1.1)
       ethers: 6.15.0(bufferutil@4.0.9)(utf-8-validate@5.0.10)
       hardhat: 2.26.3(bufferutil@4.0.9)(ts-node@10.9.2(@swc/core@1.13.5)(@swc/wasm@1.13.5)(@types/node@22.7.5)(typescript@5.8.3))(typescript@5.8.3)(utf-8-validate@5.0.10)
       lodash.isequal: 4.5.0
@@ -12328,7 +12403,7 @@ snapshots:
       '@nomicfoundation/ignition-core': 0.15.13(bufferutil@4.0.9)(utf-8-validate@5.0.10)
       '@nomicfoundation/ignition-ui': 0.15.12
       chalk: 4.1.2
-      debug: 4.4.1(supports-color@5.5.0)
+      debug: 4.4.1(supports-color@8.1.1)
       fs-extra: 10.1.0
       hardhat: 2.26.3(bufferutil@4.0.9)(ts-node@10.9.2(@swc/core@1.13.5)(@swc/wasm@1.13.5)(@types/node@22.7.5)(typescript@5.8.3))(typescript@5.8.3)(utf-8-validate@5.0.10)
       json5: 2.2.3
@@ -12409,7 +12484,7 @@ snapshots:
       '@ethersproject/abi': 5.8.0
       '@ethersproject/address': 5.8.0
       cbor: 8.1.0
-      debug: 4.4.1(supports-color@5.5.0)
+      debug: 4.4.1(supports-color@8.1.1)
       hardhat: 2.26.3(bufferutil@4.0.9)(ts-node@10.9.2(@swc/core@1.13.5)(@swc/wasm@1.13.5)(@types/node@22.7.5)(typescript@5.8.3))(typescript@5.8.3)(utf-8-validate@5.0.10)
       lodash.clonedeep: 4.5.0
       picocolors: 1.1.1
@@ -12424,7 +12499,7 @@ snapshots:
       '@ethersproject/address': 5.6.1
       '@nomicfoundation/solidity-analyzer': 0.1.2
       cbor: 9.0.2
-      debug: 4.4.1(supports-color@5.5.0)
+      debug: 4.4.1(supports-color@8.1.1)
       ethers: 6.15.0(bufferutil@4.0.9)(utf-8-validate@5.0.10)
       fs-extra: 10.1.0
       immer: 10.0.2
@@ -12927,7 +13002,7 @@ snapshots:
 
   '@scure/bip32@1.7.0':
     dependencies:
-      '@noble/curves': 1.9.1
+      '@noble/curves': 1.9.7
       '@noble/hashes': 1.8.0
       '@scure/base': 1.2.6
 
@@ -12950,18 +13025,6 @@ snapshots:
     dependencies:
       '@zk-kit/lean-imt.sol': 2.0.1
 
-  '@semaphore-protocol/core@https://codeload.github.com/hmzakhalid/semaphore-noir/tar.gz/caad5529009ebdeb1613c552c4e188a54b681a43(@types/snarkjs@0.7.9)(bufferutil@4.0.9)(commander@13.1.0)(utf-8-validate@5.0.10)':
-    dependencies:
-      '@semaphore-protocol/group': https://codeload.github.com/hmzakhalid/semaphore-noir/tar.gz/8c41614a00c121ec96e07d73145dc542739eefa8
-      '@semaphore-protocol/identity': https://codeload.github.com/hmzakhalid/semaphore-noir/tar.gz/4137e5d6cf645af3fc8eb720b6c8ee33a125d0ef
-      '@semaphore-protocol/proof': https://codeload.github.com/hmzakhalid/semaphore-noir/tar.gz/d8989c48201f05245965f992e4fc4f0bddb7725e(@semaphore-protocol/group@https://codeload.github.com/hmzakhalid/semaphore-noir/tar.gz/8c41614a00c121ec96e07d73145dc542739eefa8)(@semaphore-protocol/identity@https://codeload.github.com/hmzakhalid/semaphore-noir/tar.gz/4137e5d6cf645af3fc8eb720b6c8ee33a125d0ef)(@types/snarkjs@0.7.9)(bufferutil@4.0.9)(commander@13.1.0)(utf-8-validate@5.0.10)
-    transitivePeerDependencies:
-      - '@types/snarkjs'
-      - bufferutil
-      - commander
-      - supports-color
-      - utf-8-validate
-
   '@semaphore-protocol/data@4.13.0(bufferutil@4.0.9)(typescript@5.8.3)(utf-8-validate@5.0.10)(zod@3.25.76)':
     dependencies:
       '@semaphore-protocol/utils': 4.13.0(bufferutil@4.0.9)(utf-8-validate@5.0.10)
@@ -12985,12 +13048,6 @@ snapshots:
       - bufferutil
       - utf-8-validate
 
-  '@semaphore-protocol/group@https://codeload.github.com/hmzakhalid/semaphore-noir/tar.gz/8c41614a00c121ec96e07d73145dc542739eefa8':
-    dependencies:
-      '@zk-kit/lean-imt': 2.2.3
-      '@zk-kit/utils': 1.3.0
-      poseidon-lite: 0.3.0
-
   '@semaphore-protocol/identity@4.13.0':
     dependencies:
       '@zk-kit/baby-jubjub': 1.0.3
@@ -12998,32 +13055,6 @@ snapshots:
       '@zk-kit/utils': 1.3.0
       poseidon-lite: 0.3.0
 
-  '@semaphore-protocol/identity@https://codeload.github.com/hmzakhalid/semaphore-noir/tar.gz/4137e5d6cf645af3fc8eb720b6c8ee33a125d0ef':
-    dependencies:
-      '@zk-kit/baby-jubjub': 1.0.3
-      '@zk-kit/eddsa-poseidon': 1.0.4
-      '@zk-kit/utils': 1.3.0
-      poseidon-lite: 0.3.0
-
-  '@semaphore-protocol/proof@https://codeload.github.com/hmzakhalid/semaphore-noir/tar.gz/d8989c48201f05245965f992e4fc4f0bddb7725e(@semaphore-protocol/group@https://codeload.github.com/hmzakhalid/semaphore-noir/tar.gz/8c41614a00c121ec96e07d73145dc542739eefa8)(@semaphore-protocol/identity@https://codeload.github.com/hmzakhalid/semaphore-noir/tar.gz/4137e5d6cf645af3fc8eb720b6c8ee33a125d0ef)(@types/snarkjs@0.7.9)(bufferutil@4.0.9)(commander@13.1.0)(utf-8-validate@5.0.10)':
-    dependencies:
-      '@aztec/bb.js': 0.82.2
-      '@noir-lang/noir_js': 1.0.0-beta.3
-      '@noir-lang/noir_wasm': 1.0.0-beta.3
-      '@semaphore-protocol/group': https://codeload.github.com/hmzakhalid/semaphore-noir/tar.gz/8c41614a00c121ec96e07d73145dc542739eefa8
-      '@semaphore-protocol/identity': https://codeload.github.com/hmzakhalid/semaphore-noir/tar.gz/4137e5d6cf645af3fc8eb720b6c8ee33a125d0ef
-      '@semaphore-protocol/utils': 4.9.1(bufferutil@4.0.9)(utf-8-validate@5.0.10)
-      '@zk-kit/artifacts': https://codeload.github.com/hmzakhalid/snark-artifacts/tar.gz/a8eb62a0e3f1d4917f7895bf4511ee1f7f221dc3(@types/snarkjs@0.7.9)(commander@13.1.0)
-      '@zk-kit/utils': 1.3.0
-      ethers: 6.13.4(bufferutil@4.0.9)(utf-8-validate@5.0.10)
-      snarkjs: 0.7.4
-    transitivePeerDependencies:
-      - '@types/snarkjs'
-      - bufferutil
-      - commander
-      - supports-color
-      - utf-8-validate
-
   '@semaphore-protocol/utils@4.13.0(bufferutil@4.0.9)(utf-8-validate@5.0.10)':
     dependencies:
       ethers: 6.15.0(bufferutil@4.0.9)(utf-8-validate@5.0.10)
@@ -13278,7 +13309,7 @@ snapshots:
       - utf-8-validate
       - zod
 
-  '@synthetixio/synpress-cache@0.0.12(@microsoft/api-extractor@7.52.11(@types/node@22.7.5))(@swc/core@1.13.5)(playwright-core@1.52.0)(postcss@8.5.6)(typescript@5.8.3)':
+  '@synthetixio/synpress-cache@0.0.12(@microsoft/api-extractor@7.52.11(@types/node@22.7.5))(@swc/core@1.13.5)(jiti@1.21.7)(playwright-core@1.52.0)(postcss@8.5.6)(tsx@4.20.5)(typescript@5.8.3)(yaml@2.8.1)':
     dependencies:
       axios: 1.6.7
       chalk: 5.3.0
@@ -13304,7 +13335,7 @@ snapshots:
       - typescript
       - yaml
 
-  '@synthetixio/synpress-cache@0.0.13(@microsoft/api-extractor@7.52.11(@types/node@22.7.5))(@swc/core@1.13.5)(playwright-core@1.52.0)(postcss@8.5.6)(typescript@5.8.3)':
+  '@synthetixio/synpress-cache@0.0.13(@microsoft/api-extractor@7.52.11(@types/node@22.7.5))(@swc/core@1.13.5)(jiti@1.21.7)(playwright-core@1.52.0)(postcss@8.5.6)(tsx@4.20.5)(typescript@5.8.3)(yaml@2.8.1)':
     dependencies:
       axios: 1.6.7
       chalk: 5.3.0
@@ -13334,10 +13365,10 @@ snapshots:
     dependencies:
       '@playwright/test': 1.52.0
 
-  '@synthetixio/synpress-metamask@0.0.13(@microsoft/api-extractor@7.52.11(@types/node@22.7.5))(@playwright/test@1.52.0)(@swc/core@1.13.5)(bufferutil@4.0.9)(playwright-core@1.52.0)(postcss@8.5.6)(typescript@5.8.3)(utf-8-validate@5.0.10)':
+  '@synthetixio/synpress-metamask@0.0.13(@microsoft/api-extractor@7.52.11(@types/node@22.7.5))(@playwright/test@1.52.0)(@swc/core@1.13.5)(bufferutil@4.0.9)(jiti@1.21.7)(playwright-core@1.52.0)(postcss@8.5.6)(tsx@4.20.5)(typescript@5.8.3)(utf-8-validate@5.0.10)(yaml@2.8.1)':
     dependencies:
       '@playwright/test': 1.52.0
-      '@synthetixio/synpress-cache': 0.0.13(@microsoft/api-extractor@7.52.11(@types/node@22.7.5))(@swc/core@1.13.5)(playwright-core@1.52.0)(postcss@8.5.6)(typescript@5.8.3)
+      '@synthetixio/synpress-cache': 0.0.13(@microsoft/api-extractor@7.52.11(@types/node@22.7.5))(@swc/core@1.13.5)(jiti@1.21.7)(playwright-core@1.52.0)(postcss@8.5.6)(tsx@4.20.5)(typescript@5.8.3)(yaml@2.8.1)
       '@synthetixio/synpress-core': 0.0.13(@playwright/test@1.52.0)
       '@viem/anvil': 0.0.7(bufferutil@4.0.9)(utf-8-validate@5.0.10)
       fs-extra: 11.2.0
@@ -13356,10 +13387,10 @@ snapshots:
       - utf-8-validate
       - yaml
 
-  '@synthetixio/synpress-phantom@0.0.13(@microsoft/api-extractor@7.52.11(@types/node@22.7.5))(@playwright/test@1.52.0)(@swc/core@1.13.5)(bufferutil@4.0.9)(playwright-core@1.52.0)(postcss@8.5.6)(typescript@5.8.3)(utf-8-validate@5.0.10)':
+  '@synthetixio/synpress-phantom@0.0.13(@microsoft/api-extractor@7.52.11(@types/node@22.7.5))(@playwright/test@1.52.0)(@swc/core@1.13.5)(bufferutil@4.0.9)(jiti@1.21.7)(playwright-core@1.52.0)(postcss@8.5.6)(tsx@4.20.5)(typescript@5.8.3)(utf-8-validate@5.0.10)(yaml@2.8.1)':
     dependencies:
       '@playwright/test': 1.52.0
-      '@synthetixio/synpress-cache': 0.0.13(@microsoft/api-extractor@7.52.11(@types/node@22.7.5))(@swc/core@1.13.5)(playwright-core@1.52.0)(postcss@8.5.6)(typescript@5.8.3)
+      '@synthetixio/synpress-cache': 0.0.13(@microsoft/api-extractor@7.52.11(@types/node@22.7.5))(@swc/core@1.13.5)(jiti@1.21.7)(playwright-core@1.52.0)(postcss@8.5.6)(tsx@4.20.5)(typescript@5.8.3)(yaml@2.8.1)
       '@synthetixio/synpress-core': 0.0.13(@playwright/test@1.52.0)
       '@viem/anvil': 0.0.7(bufferutil@4.0.9)(utf-8-validate@5.0.10)
       fs-extra: 11.2.0
@@ -13378,14 +13409,14 @@ snapshots:
       - utf-8-validate
       - yaml
 
-  '@synthetixio/synpress@4.1.1(@depay/solana-web3.js@1.98.3)(@depay/web3-blockchains@9.8.6)(@microsoft/api-extractor@7.52.11(@types/node@22.7.5))(@playwright/test@1.52.0)(@swc/core@1.13.5)(bufferutil@4.0.9)(ethers@6.15.0(bufferutil@4.0.9)(utf-8-validate@5.0.10))(playwright-core@1.52.0)(postcss@8.5.6)(typescript@5.8.3)(utf-8-validate@5.0.10)(zod@3.25.76)':
+  '@synthetixio/synpress@4.1.1(@depay/solana-web3.js@1.98.3)(@depay/web3-blockchains@9.8.6)(@microsoft/api-extractor@7.52.11(@types/node@22.7.5))(@playwright/test@1.52.0)(@swc/core@1.13.5)(bufferutil@4.0.9)(ethers@6.15.0(bufferutil@4.0.9)(utf-8-validate@5.0.10))(jiti@1.21.7)(playwright-core@1.52.0)(postcss@8.5.6)(tsx@4.20.5)(typescript@5.8.3)(utf-8-validate@5.0.10)(yaml@2.8.1)(zod@3.25.76)':
     dependencies:
       '@playwright/test': 1.52.0
       '@synthetixio/ethereum-wallet-mock': 0.0.13(@depay/solana-web3.js@1.98.3)(@depay/web3-blockchains@9.8.6)(@playwright/test@1.52.0)(bufferutil@4.0.9)(ethers@6.15.0(bufferutil@4.0.9)(utf-8-validate@5.0.10))(typescript@5.8.3)(utf-8-validate@5.0.10)(zod@3.25.76)
-      '@synthetixio/synpress-cache': 0.0.13(@microsoft/api-extractor@7.52.11(@types/node@22.7.5))(@swc/core@1.13.5)(playwright-core@1.52.0)(postcss@8.5.6)(typescript@5.8.3)
+      '@synthetixio/synpress-cache': 0.0.13(@microsoft/api-extractor@7.52.11(@types/node@22.7.5))(@swc/core@1.13.5)(jiti@1.21.7)(playwright-core@1.52.0)(postcss@8.5.6)(tsx@4.20.5)(typescript@5.8.3)(yaml@2.8.1)
       '@synthetixio/synpress-core': 0.0.13(@playwright/test@1.52.0)
-      '@synthetixio/synpress-metamask': 0.0.13(@microsoft/api-extractor@7.52.11(@types/node@22.7.5))(@playwright/test@1.52.0)(@swc/core@1.13.5)(bufferutil@4.0.9)(playwright-core@1.52.0)(postcss@8.5.6)(typescript@5.8.3)(utf-8-validate@5.0.10)
-      '@synthetixio/synpress-phantom': 0.0.13(@microsoft/api-extractor@7.52.11(@types/node@22.7.5))(@playwright/test@1.52.0)(@swc/core@1.13.5)(bufferutil@4.0.9)(playwright-core@1.52.0)(postcss@8.5.6)(typescript@5.8.3)(utf-8-validate@5.0.10)
+      '@synthetixio/synpress-metamask': 0.0.13(@microsoft/api-extractor@7.52.11(@types/node@22.7.5))(@playwright/test@1.52.0)(@swc/core@1.13.5)(bufferutil@4.0.9)(jiti@1.21.7)(playwright-core@1.52.0)(postcss@8.5.6)(tsx@4.20.5)(typescript@5.8.3)(utf-8-validate@5.0.10)(yaml@2.8.1)
+      '@synthetixio/synpress-phantom': 0.0.13(@microsoft/api-extractor@7.52.11(@types/node@22.7.5))(@playwright/test@1.52.0)(@swc/core@1.13.5)(bufferutil@4.0.9)(jiti@1.21.7)(playwright-core@1.52.0)(postcss@8.5.6)(tsx@4.20.5)(typescript@5.8.3)(utf-8-validate@5.0.10)(yaml@2.8.1)
     transitivePeerDependencies:
       - '@depay/solana-web3.js'
       - '@depay/web3-blockchains'
@@ -13717,7 +13748,7 @@ snapshots:
       '@typescript-eslint/types': 7.18.0
       '@typescript-eslint/typescript-estree': 7.18.0(typescript@5.8.3)
       '@typescript-eslint/visitor-keys': 7.18.0
-      debug: 4.4.1(supports-color@5.5.0)
+      debug: 4.4.1(supports-color@8.1.1)
       eslint: 8.57.1
     optionalDependencies:
       typescript: 5.8.3
@@ -13733,7 +13764,7 @@ snapshots:
     dependencies:
       '@typescript-eslint/typescript-estree': 7.18.0(typescript@5.8.3)
       '@typescript-eslint/utils': 7.18.0(eslint@8.57.1)(typescript@5.8.3)
-      debug: 4.4.1(supports-color@5.5.0)
+      debug: 4.4.1(supports-color@8.1.1)
       eslint: 8.57.1
       ts-api-utils: 1.4.3(typescript@5.8.3)
     optionalDependencies:
@@ -13747,7 +13778,7 @@ snapshots:
     dependencies:
       '@typescript-eslint/types': 7.18.0
       '@typescript-eslint/visitor-keys': 7.18.0
-      debug: 4.4.1(supports-color@5.5.0)
+      debug: 4.4.1(supports-color@8.1.1)
       globby: 11.1.0
       is-glob: 4.0.3
       minimatch: 9.0.5
@@ -14484,19 +14515,6 @@ snapshots:
       '@walletconnect/window-getters': 1.0.1
       tslib: 1.14.1
 
-  '@zk-kit/artifacts@https://codeload.github.com/hmzakhalid/snark-artifacts/tar.gz/a8eb62a0e3f1d4917f7895bf4511ee1f7f221dc3(@types/snarkjs@0.7.9)(commander@13.1.0)':
-    dependencies:
-      '@commander-js/extra-typings': 12.1.0(commander@13.1.0)
-      '@inquirer/input': 2.3.0
-      '@inquirer/select': 2.5.0
-      '@noir-lang/noir_js': 1.0.0-beta.3
-      circomkit: 0.2.1(@types/snarkjs@0.7.9)(snarkjs@0.7.4)
-      ora: 5.4.1
-      snarkjs: 0.7.4
-    transitivePeerDependencies:
-      - '@types/snarkjs'
-      - commander
-
   '@zk-kit/baby-jubjub@1.0.3':
     dependencies:
       '@zk-kit/utils': 1.2.1
@@ -14516,10 +14534,6 @@ snapshots:
     dependencies:
       poseidon-solidity: 0.0.5
 
-  '@zk-kit/lean-imt@2.2.3':
-    dependencies:
-      '@zk-kit/utils': 1.3.0
-
   '@zk-kit/lean-imt@2.2.4(bufferutil@4.0.9)(utf-8-validate@5.0.10)':
     dependencies:
       '@zk-kit/utils': 1.4.1(bufferutil@4.0.9)(utf-8-validate@5.0.10)
@@ -14555,6 +14569,11 @@ snapshots:
       typescript: 5.8.3
       zod: 3.25.76
 
+  abitype@1.0.9(typescript@5.8.3)(zod@3.22.4):
+    optionalDependencies:
+      typescript: 5.8.3
+      zod: 3.22.4
+
   abitype@1.0.9(typescript@5.8.3)(zod@3.25.76):
     optionalDependencies:
       typescript: 5.8.3
@@ -14585,7 +14604,7 @@ snapshots:
 
   agent-base@6.0.2:
     dependencies:
-      debug: 4.4.1(supports-color@5.5.0)
+      debug: 4.4.1(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
 
@@ -14919,7 +14938,7 @@ snapshots:
     dependencies:
       bytes: 3.1.2
       content-type: 1.0.5
-      debug: 4.4.1(supports-color@5.5.0)
+      debug: 4.4.1(supports-color@8.1.1)
       http-errors: 2.0.0
       iconv-lite: 0.6.3
       on-finished: 2.4.1
@@ -16200,7 +16219,7 @@ snapshots:
       ajv: 6.12.6
       chalk: 4.1.2
       cross-spawn: 7.0.6
-      debug: 4.4.1(supports-color@5.5.0)
+      debug: 4.4.1(supports-color@8.1.1)
       doctrine: 3.0.0
       escape-string-regexp: 4.0.0
       eslint-scope: 7.2.2
@@ -16521,7 +16540,7 @@ snapshots:
       content-type: 1.0.5
       cookie: 0.7.2
       cookie-signature: 1.2.2
-      debug: 4.4.1(supports-color@5.5.0)
+      debug: 4.4.1(supports-color@8.1.1)
       encodeurl: 2.0.0
       escape-html: 1.0.3
       etag: 1.8.1
@@ -16647,7 +16666,7 @@ snapshots:
 
   finalhandler@2.1.0:
     dependencies:
-      debug: 4.4.1(supports-color@5.5.0)
+      debug: 4.4.1(supports-color@8.1.1)
       encodeurl: 2.0.0
       escape-html: 1.0.3
       on-finished: 2.4.1
@@ -16706,7 +16725,7 @@ snapshots:
 
   follow-redirects@1.15.11(debug@4.4.1):
     optionalDependencies:
-      debug: 4.4.1(supports-color@5.5.0)
+      debug: 4.4.1(supports-color@8.1.1)
 
   for-each@0.3.5:
     dependencies:
@@ -17058,7 +17077,7 @@ snapshots:
       axios: 0.21.4(debug@4.4.1)
       chalk: 4.1.2
       chokidar: 3.6.0
-      debug: 4.4.1(supports-color@5.5.0)
+      debug: 4.4.1(supports-color@8.1.1)
       enquirer: 2.4.1
       ethers: 5.8.0(bufferutil@4.0.9)(utf-8-validate@5.0.10)
       form-data: 4.0.4
@@ -17101,7 +17120,7 @@ snapshots:
       lodash: 4.17.21
       markdown-table: 2.0.0
       sha1: 1.1.1
-      viem: 2.30.6(bufferutil@4.0.9)(typescript@5.8.3)(utf-8-validate@5.0.10)(zod@3.22.4)
+      viem: 2.30.6(bufferutil@4.0.9)(typescript@5.8.3)(utf-8-validate@5.0.10)
     transitivePeerDependencies:
       - bufferutil
       - debug
@@ -17122,7 +17141,7 @@ snapshots:
       boxen: 5.1.2
       chokidar: 4.0.3
       ci-info: 2.0.0
-      debug: 4.4.1(supports-color@5.5.0)
+      debug: 4.4.1(supports-color@8.1.1)
       enquirer: 2.4.1
       env-paths: 2.2.1
       ethereum-cryptography: 1.2.0
@@ -17409,7 +17428,7 @@ snapshots:
   https-proxy-agent@5.0.1:
     dependencies:
       agent-base: 6.0.2
-      debug: 4.4.1(supports-color@5.5.0)
+      debug: 4.4.1(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
 
@@ -18587,7 +18606,7 @@ snapshots:
   micromark@3.2.0:
     dependencies:
       '@types/debug': 4.1.12
-      debug: 4.4.1(supports-color@5.5.0)
+      debug: 4.4.1(supports-color@8.1.1)
       decode-named-character-reference: 1.2.0
       micromark-core-commonmark: 1.1.0
       micromark-factory-space: 1.1.0
@@ -18609,7 +18628,7 @@ snapshots:
   micromark@4.0.2:
     dependencies:
       '@types/debug': 4.1.12
-      debug: 4.4.1(supports-color@5.5.0)
+      debug: 4.4.1(supports-color@8.1.1)
       decode-named-character-reference: 1.2.0
       devlop: 1.1.0
       micromark-core-commonmark: 2.0.3
@@ -19074,15 +19093,30 @@ snapshots:
     transitivePeerDependencies:
       - zod
 
+  ox@0.7.1(typescript@5.8.3):
+    dependencies:
+      '@adraffy/ens-normalize': 1.11.0
+      '@noble/ciphers': 1.3.0
+      '@noble/curves': 1.9.7
+      '@noble/hashes': 1.8.0
+      '@scure/bip32': 1.7.0
+      '@scure/bip39': 1.6.0
+      abitype: 1.0.9(typescript@5.8.3)(zod@3.25.76)
+      eventemitter3: 5.0.1
+    optionalDependencies:
+      typescript: 5.8.3
+    transitivePeerDependencies:
+      - zod
+
   ox@0.7.1(typescript@5.8.3)(zod@3.22.4):
     dependencies:
       '@adraffy/ens-normalize': 1.11.0
       '@noble/ciphers': 1.3.0
-      '@noble/curves': 1.9.1
+      '@noble/curves': 1.9.7
       '@noble/hashes': 1.8.0
       '@scure/bip32': 1.7.0
       '@scure/bip39': 1.6.0
-      abitype: 1.0.8(typescript@5.8.3)(zod@3.22.4)
+      abitype: 1.0.9(typescript@5.8.3)(zod@3.22.4)
       eventemitter3: 5.0.1
     optionalDependencies:
       typescript: 5.8.3
@@ -19093,11 +19127,11 @@ snapshots:
     dependencies:
       '@adraffy/ens-normalize': 1.11.0
       '@noble/ciphers': 1.3.0
-      '@noble/curves': 1.9.1
+      '@noble/curves': 1.9.7
       '@noble/hashes': 1.8.0
       '@scure/bip32': 1.7.0
       '@scure/bip39': 1.6.0
-      abitype: 1.0.8(typescript@5.8.3)(zod@3.25.76)
+      abitype: 1.0.9(typescript@5.8.3)(zod@3.25.76)
       eventemitter3: 5.0.1
     optionalDependencies:
       typescript: 5.8.3
@@ -19925,7 +19959,7 @@ snapshots:
 
   router@2.2.0:
     dependencies:
-      debug: 4.4.1(supports-color@5.5.0)
+      debug: 4.4.1(supports-color@8.1.1)
       depd: 2.0.0
       is-promise: 4.0.0
       parseurl: 1.3.3
@@ -20011,7 +20045,7 @@ snapshots:
 
   send@1.2.0:
     dependencies:
-      debug: 4.4.1(supports-color@5.5.0)
+      debug: 4.4.1(supports-color@8.1.1)
       encodeurl: 2.0.0
       escape-html: 1.0.3
       etag: 1.8.1
@@ -20786,7 +20820,7 @@ snapshots:
       cac: 6.7.14
       chokidar: 4.0.3
       consola: 3.4.2
-      debug: 4.4.1(supports-color@5.5.0)
+      debug: 4.4.1(supports-color@8.1.1)
       esbuild: 0.25.9
       fix-dts-default-cjs-exports: 1.0.1
       joycon: 3.1.1
@@ -20846,7 +20880,7 @@ snapshots:
   typechain@8.3.2(typescript@5.8.3):
     dependencies:
       '@types/prettier': 2.7.3
-      debug: 4.4.1(supports-color@5.5.0)
+      debug: 4.4.1(supports-color@8.1.1)
       fs-extra: 7.0.1
       glob: 7.1.7
       js-sha3: 0.8.0
@@ -21145,6 +21179,23 @@ snapshots:
       '@types/unist': 3.0.3
       vfile-message: 4.0.3
 
+  viem@2.30.6(bufferutil@4.0.9)(typescript@5.8.3)(utf-8-validate@5.0.10):
+    dependencies:
+      '@noble/curves': 1.9.1
+      '@noble/hashes': 1.8.0
+      '@scure/bip32': 1.7.0
+      '@scure/bip39': 1.6.0
+      abitype: 1.0.8(typescript@5.8.3)(zod@3.25.76)
+      isows: 1.0.7(ws@8.18.2(bufferutil@4.0.9)(utf-8-validate@5.0.10))
+      ox: 0.7.1(typescript@5.8.3)
+      ws: 8.18.2(bufferutil@4.0.9)(utf-8-validate@5.0.10)
+    optionalDependencies:
+      typescript: 5.8.3
+    transitivePeerDependencies:
+      - bufferutil
+      - utf-8-validate
+      - zod
+
   viem@2.30.6(bufferutil@4.0.9)(typescript@5.8.3)(utf-8-validate@5.0.10)(zod@3.22.4):
     dependencies:
       '@noble/curves': 1.9.1
@@ -21182,7 +21233,7 @@ snapshots:
   vite-node@1.6.1(@types/node@22.7.5):
     dependencies:
       cac: 6.7.14
-      debug: 4.4.1(supports-color@5.5.0)
+      debug: 4.4.1(supports-color@8.1.1)
       pathe: 1.1.2
       picocolors: 1.1.1
       vite: 5.4.19(@types/node@22.7.5)
@@ -21204,7 +21255,7 @@ snapshots:
       '@volar/typescript': 2.4.23
       '@vue/language-core': 2.2.0(typescript@5.8.3)
       compare-versions: 6.1.1
-      debug: 4.4.1(supports-color@5.5.0)
+      debug: 4.4.1(supports-color@8.1.1)
       kolorist: 1.8.0
       local-pkg: 1.1.2
       magic-string: 0.30.18
@@ -21246,6 +21297,17 @@ snapshots:
       - '@swc/helpers'
       - rollup
 
+  vite-plugin-top-level-await@1.6.0(vite@6.3.5(@types/node@22.7.5)(jiti@1.21.7)(tsx@4.20.5)(yaml@2.8.1)):
+    dependencies:
+      '@rollup/plugin-virtual': 3.0.2(rollup@4.49.0)
+      '@swc/core': 1.13.5
+      '@swc/wasm': 1.13.5
+      uuid: 10.0.0
+      vite: 6.3.5(@types/node@22.7.5)(jiti@1.21.7)(tsx@4.20.5)(yaml@2.8.1)
+    transitivePeerDependencies:
+      - '@swc/helpers'
+      - rollup
+
   vite-plugin-wasm@3.5.0(vite@5.4.19(@types/node@22.7.5)):
     dependencies:
       vite: 5.4.19(@types/node@22.7.5)
@@ -21256,7 +21318,7 @@ snapshots:
 
   vite-tsconfig-paths@4.3.2(typescript@5.8.3)(vite@5.4.19(@types/node@22.7.5)):
     dependencies:
-      debug: 4.4.1(supports-color@5.5.0)
+      debug: 4.4.1(supports-color@8.1.1)
       globrex: 0.1.2
       tsconfck: 3.1.6(typescript@5.8.3)
     optionalDependencies:
@@ -21298,7 +21360,7 @@ snapshots:
       '@vitest/utils': 1.6.1
       acorn-walk: 8.3.4
       chai: 4.5.0
-      debug: 4.4.1(supports-color@5.5.0)
+      debug: 4.4.1(supports-color@8.1.1)
       execa: 8.0.1
       local-pkg: 0.5.1
       magic-string: 0.30.18
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index 583bb22d50..553cb8700f 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -6,6 +6,6 @@ packages:
   - packages/enclave-config
   - packages/enclave-react
   - packages/enclave-sdk
-  - packages/evm
+  - packages/enclave-contracts
   - templates/default
   - templates/default/client
diff --git a/templates/default/client/package.json b/templates/default/client/package.json
index a1b2199c21..5fc3aac870 100644
--- a/templates/default/client/package.json
+++ b/templates/default/client/package.json
@@ -15,9 +15,8 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "@gnosis-guild/enclave": "workspace:*",
-    "@gnosis-guild/enclave-react": "workspace:*",
-    "@gnosis-guild/enclave-sdk": "workspace:*",
+    "@enclave-e3/react": "workspace:*",
+    "@enclave-e3/sdk": "workspace:*",
     "@phosphor-icons/react": "^2.1.4",
     "@tanstack/react-query": "^5.74.3",
     "@wagmi/core": "^2.14.16",
diff --git a/templates/default/client/src/pages/WizardSDK.tsx b/templates/default/client/src/pages/WizardSDK.tsx
index 648ba9095b..06d2914a26 100644
--- a/templates/default/client/src/pages/WizardSDK.tsx
+++ b/templates/default/client/src/pages/WizardSDK.tsx
@@ -15,7 +15,7 @@ import EnvironmentError from './components/EnvironmentError'
 import Spinner from './components/Spinner'
 
 // SDK and utilities
-import { useEnclaveSDK } from '@gnosis-guild/enclave-react'
+import { useEnclaveSDK } from '@enclave-e3/react'
 import {
   encodeBfvParams,
   encodeComputeProviderParams,
@@ -23,8 +23,8 @@ import {
   decodePlaintextOutput,
   DEFAULT_COMPUTE_PROVIDER_PARAMS,
   DEFAULT_E3_CONFIG,
-  bfvVerifiableEncryptNumber,
-} from '@gnosis-guild/enclave-sdk'
+  FheProtocol,
+} from '@enclave-e3/sdk'
 import { HAS_MISSING_ENV_VARS, MISSING_ENV_VARS, getContractAddresses } from '@/utils/env-config'
 import { formatContractError } from '@/utils/error-formatting'
 
@@ -558,6 +558,7 @@ const WizardSDK: React.FC = () => {
         enclave: contracts.enclave,
         ciphernodeRegistry: contracts.ciphernodeRegistry,
       },
+      protocol: FheProtocol.BFV,
     }),
     [contracts.enclave, contracts.ciphernodeRegistry],
   )
@@ -572,6 +573,7 @@ const WizardSDK: React.FC = () => {
     off,
     EnclaveEventType,
     RegistryEventType,
+    sdk,
   } = useEnclaveSDK(sdkConfig)
 
   // Component state
@@ -786,20 +788,20 @@ const WizardSDK: React.FC = () => {
       const publicKeyBytes = hexToBytes(e3State.publicKey)
 
       // Encrypt both inputs
-      const encryptedInput1 = await bfvVerifiableEncryptNumber(num1, publicKeyBytes)
-      const encryptedInput2 = await bfvVerifiableEncryptNumber(num2, publicKeyBytes)
+      const encryptedInput1 = await sdk?.encryptNumber(num1, publicKeyBytes)
+      const encryptedInput2 = await sdk?.encryptNumber(num2, publicKeyBytes)
 
       if (!encryptedInput1 || !encryptedInput2) {
         throw new Error('Failed to encrypt inputs')
       }
 
       // Publish first input
-      await publishInput(e3State.id, `0x${Array.from(encryptedInput1.encryptedVote, (b) => b.toString(16).padStart(2, '0')).join('')}` as `0x${string}`)
+      await publishInput(e3State.id, `0x${Array.from(encryptedInput1, (b) => b.toString(16).padStart(2, '0')).join('')}` as `0x${string}`)
 
       // Publish second input
       const hash2 = await publishInput(
         e3State.id,
-        `0x${Array.from(encryptedInput2.encryptedVote, (b) => b.toString(16).padStart(2, '0')).join('')}` as `0x${string}`,
+        `0x${Array.from(encryptedInput2, (b) => b.toString(16).padStart(2, '0')).join('')}` as `0x${string}`,
       )
 
       setLastTransactionHash(hash2)
diff --git a/templates/default/client/vite.config.ts b/templates/default/client/vite.config.ts
index 4beab599b7..99e24b3685 100644
--- a/templates/default/client/vite.config.ts
+++ b/templates/default/client/vite.config.ts
@@ -17,7 +17,7 @@ export default defineConfig({
     global: 'globalThis',
   },
   optimizeDeps: {
-    exclude: ['@rollup/browser', '@gnosis-guild/e3-wasm'],
+    exclude: ['@rollup/browser', '@enclave-e3/wasm'],
   },
   build: {
     commonjsOptions: {
diff --git a/templates/default/contracts/InputValidator.sol b/templates/default/contracts/InputValidator.sol
index 7d5b938667..157ea2e386 100644
--- a/templates/default/contracts/InputValidator.sol
+++ b/templates/default/contracts/InputValidator.sol
@@ -5,7 +5,7 @@
 // or FITNESS FOR A PARTICULAR PURPOSE.
 pragma solidity >=0.8.27;
 
-import {IInputValidator} from "@gnosis-guild/enclave/contracts/interfaces/IInputValidator.sol";
+import {IInputValidator} from "@enclave-e3/contracts/contracts/interfaces/IInputValidator.sol";
 
 contract InputValidator is IInputValidator {
     error EmptyInputData();
diff --git a/templates/default/contracts/MyProgram.sol b/templates/default/contracts/MyProgram.sol
index efeae897dd..abef1bf734 100755
--- a/templates/default/contracts/MyProgram.sol
+++ b/templates/default/contracts/MyProgram.sol
@@ -6,9 +6,9 @@
 pragma solidity >=0.8.27;
 
 import {IRiscZeroVerifier} from "@risc0/ethereum/contracts/src/IRiscZeroVerifier.sol";
-import {IE3Program} from "@gnosis-guild/enclave/contracts/interfaces/IE3Program.sol";
-import {IInputValidator} from "@gnosis-guild/enclave/contracts/interfaces/IInputValidator.sol";
-import {IEnclave} from "@gnosis-guild/enclave/contracts/interfaces/IEnclave.sol";
+import {IE3Program} from "@enclave-e3/contracts/contracts/interfaces/IE3Program.sol";
+import {IInputValidator} from "@enclave-e3/contracts/contracts/interfaces/IInputValidator.sol";
+import {IEnclave} from "@enclave-e3/contracts/contracts/interfaces/IEnclave.sol";
 import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";
 
 contract MyProgram is IE3Program, Ownable {
diff --git a/templates/default/deploy/enclave.ts b/templates/default/deploy/enclave.ts
index 1ebb0d6530..51969b5393 100644
--- a/templates/default/deploy/enclave.ts
+++ b/templates/default/deploy/enclave.ts
@@ -4,8 +4,8 @@
 // without even the implied warranty of MERCHANTABILITY
 // or FITNESS FOR A PARTICULAR PURPOSE.
 
-import deployEnclave from "@gnosis-guild/enclave/deploy/enclave";
-import deployMocks from "@gnosis-guild/enclave/deploy/mocks";
+import deployEnclave from "@enclave-e3/contracts/deploy/enclave";
+import deployMocks from "@enclave-e3/contracts/deploy/mocks";
 import { DeployFunction } from "hardhat-deploy/types";
 import { HardhatRuntimeEnvironment } from "hardhat/types";
 
diff --git a/templates/default/hardhat.config.ts b/templates/default/hardhat.config.ts
index a9b2e4b86c..cbff13d0e6 100644
--- a/templates/default/hardhat.config.ts
+++ b/templates/default/hardhat.config.ts
@@ -6,7 +6,7 @@
 
 import "@nomicfoundation/hardhat-toolbox";
 import "hardhat-deploy";
-import "@gnosis-guild/enclave/deploy/enclave";
+import "@enclave-e3/contracts/deploy/enclave";
 import { task } from "hardhat/config";
 import type { TaskArguments } from "hardhat/types";
 import type { HardhatUserConfig } from "hardhat/config";
@@ -51,7 +51,7 @@ const config: HardhatUserConfig = {
   external: {
     contracts: [
       {
-        artifacts: "node_modules/@gnosis-guild/enclave/artifacts",
+        artifacts: "node_modules/@enclave-e3/contracts/artifacts",
       },
     ],
   },
diff --git a/templates/default/package.json b/templates/default/package.json
index a8fde872c4..15794fb9da 100644
--- a/templates/default/package.json
+++ b/templates/default/package.json
@@ -1,5 +1,7 @@
 {
   "name": "enclave-example",
+  "version": "0.0.0",
+  "private": true,
   "scripts": {
     "ciphernode:add": "hardhat run scripts/ciphernode-add.ts -- ",
     "compile": "hardhat compile",
@@ -16,8 +18,8 @@
     "test:integration": "./scripts/test_integration.sh"
   },
   "dependencies": {
-    "@gnosis-guild/enclave": "workspace:*",
-    "@gnosis-guild/enclave-sdk": "workspace:*",
+    "@enclave-e3/contracts": "workspace:*",
+    "@enclave-e3/sdk": "workspace:*",
     "@types/yargs": "^17.0.33",
     "viem": "2.30.6",
     "yargs": "^18.0.0"
diff --git a/templates/default/scripts/deploy-local.ts b/templates/default/scripts/deploy-local.ts
index ac774ff8b3..930935b479 100644
--- a/templates/default/scripts/deploy-local.ts
+++ b/templates/default/scripts/deploy-local.ts
@@ -9,7 +9,7 @@ import { DeployFunction } from "hardhat-deploy/types";
 import { HardhatRuntimeEnvironment } from "hardhat/types";
 // Import the deployment logic from your published package
 // This assumes your package exports the deployment function
-import deployEnclave from "@gnosis-guild/enclave/deploy/enclave";
+import deployEnclave from "@enclave-e3/contracts/deploy/enclave";
 
 async function main() {
   console.log("🚀 Deploying Enclave protocol locally...");
diff --git a/templates/default/server/index.ts b/templates/default/server/index.ts
index 1900e83983..b324ac0b26 100644
--- a/templates/default/server/index.ts
+++ b/templates/default/server/index.ts
@@ -11,7 +11,7 @@ import {
   type E3ActivatedData,
   type InputPublishedData,
   FheProtocol,
-} from "@gnosis-guild/enclave-sdk";
+} from "@enclave-e3/sdk";
 import { handleTestInteraction } from "./testHandler";
 import { getCheckedEnvVars } from "./utils";
 import { callFheRunner } from "./runner";
diff --git a/templates/default/tests/integration.spec.ts b/templates/default/tests/integration.spec.ts
index 1a98eef7dd..325014d263 100644
--- a/templates/default/tests/integration.spec.ts
+++ b/templates/default/tests/integration.spec.ts
@@ -17,7 +17,7 @@ import {
   encodeComputeProviderParams,
   RegistryEventType,
   FheProtocol,
-} from "@gnosis-guild/enclave-sdk";
+} from "@enclave-e3/sdk";
 import { hexToBytes } from "viem";
 import assert from "assert";