diff --git a/.github/workflows/rainix.yaml b/.github/workflows/rainix.yaml
index 2c827a9a..ca3eeb49 100644
--- a/.github/workflows/rainix.yaml
+++ b/.github/workflows/rainix.yaml
@@ -16,6 +16,9 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
+        with:
+          submodules: recursive
+          fetch-depth: 0
 
       - uses: DeterminateSystems/nix-installer-action@v4
       - uses: DeterminateSystems/magic-nix-cache-action@v2
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 00000000..91bc8b82
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,4 @@
+[submodule "lib/magic-string"]
+	path = lib/magic-string
+	url = https://github.com/rouzwelt/magic-string-rs
+	branch = fix-memory-leak
diff --git a/Cargo.lock b/Cargo.lock
index fb0189fe..a2cc6533 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -67,9 +67,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-primitives"
-version = "0.6.4"
+version = "0.7.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "600d34d8de81e23b6d909c094e23b3d357e01ca36b78a8c5424c501eedbe86f0"
+checksum = "ccb3ead547f4532bc8af961649942f0b9c16ee9226e26caa3f38420651cc0bf4"
 dependencies = [
  "alloy-rlp",
  "bytes",
@@ -688,7 +688,7 @@ dependencies = [
 name = "dotrain"
 version = "6.0.1-alpha.21"
 dependencies = [
- "alloy-primitives 0.6.4",
+ "alloy-primitives 0.7.7",
  "anyhow",
  "async-recursion",
  "clap",
@@ -717,7 +717,7 @@ dependencies = [
 name = "dotrain-lsp"
 version = "6.0.1-alpha.21"
 dependencies = [
- "alloy-primitives 0.6.4",
+ "alloy-primitives 0.7.7",
  "anyhow",
  "dotrain",
  "js-sys",
@@ -823,6 +823,17 @@ dependencies = [
  "bytes",
 ]
 
+[[package]]
+name = "fastrlp"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce8dba4714ef14b8274c371879b175aa55b16b30f269663f19d576f380018dc4"
+dependencies = [
+ "arrayvec",
+ "auto_impl",
+ "bytes",
+]
+
 [[package]]
 name = "ff"
 version = "0.13.0"
@@ -1313,7 +1324,6 @@ dependencies = [
  "elliptic-curve",
  "once_cell",
  "sha2",
- "signature",
 ]
 
 [[package]]
@@ -1382,8 +1392,6 @@ dependencies = [
 [[package]]
 name = "magic_string"
 version = "0.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c8033ce8c43f7ccb207e4699f30eed50d7526379ee08fab47159f80b7934e18"
 dependencies = [
  "base64 0.13.1",
  "regex",
@@ -1720,9 +1728,9 @@ dependencies = [
 
 [[package]]
 name = "proptest"
-version = "1.4.0"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31b476131c3c86cb68032fdc5cb6d5a1045e3e42d96b69fa599fd77701e1f5bf"
+checksum = "b4c2511913b88df1637da85cc8d96ec8e43a3f8bb8ccb71ee1ac240d6f3df58d"
 dependencies = [
  "bit-set",
  "bit-vec",
@@ -1927,16 +1935,18 @@ dependencies = [
 
 [[package]]
 name = "ruint"
-version = "1.11.1"
+version = "1.12.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "608a5726529f2f0ef81b8fde9873c4bb829d6b5b5ca6be4d97345ddf0749c825"
+checksum = "f5ef8fb1dd8de3870cb8400d51b4c2023854bbafd5431a3ac7e7317243e22d2f"
 dependencies = [
  "alloy-rlp",
  "ark-ff 0.3.0",
  "ark-ff 0.4.2",
  "bytes",
- "fastrlp",
+ "fastrlp 0.3.1",
+ "fastrlp 0.4.0",
  "num-bigint",
+ "num-integer",
  "num-traits",
  "parity-scale-codec",
  "primitive-types",
@@ -1951,9 +1961,9 @@ dependencies = [
 
 [[package]]
 name = "ruint-macro"
-version = "1.1.0"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e666a5496a0b2186dbcd0ff6106e29e093c15591bde62c20d3842007c6978a09"
+checksum = "48fd7bd8a6377e15ad9d42a8ec25371b94ddc67abe7c8b9127bec79bebaaae18"
 
 [[package]]
 name = "rustc-demangle"
diff --git a/Cargo.toml b/Cargo.toml
index 45ad37ec..8d1904bd 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,7 @@
 [workspace]
 members = ["crates/*"]
 resolver = "2"
+exclude = ["lib"]
 
 [workspace.package]
 edition = "2021"
@@ -12,7 +13,7 @@ repository = "https://github.com/rainlanguage/dotrain"
 regex = "1.10.2"
 anyhow = "1.0.75"
 once_cell = "1.18.0"
-alloy-primitives = "0.6.3"
+alloy-primitives = "0.7.7"
 rain-metadata = "0.0.2-alpha.2"
 
 [workspace.dependencies.dotrain]
diff --git a/crates/dotrain/Cargo.toml b/crates/dotrain/Cargo.toml
index 8aee3d5b..f0667dbd 100644
--- a/crates/dotrain/Cargo.toml
+++ b/crates/dotrain/Cargo.toml
@@ -26,7 +26,7 @@ serde_json = "1.0.108"
 serde_repr = "0.1.17"
 serde_bytes = "0.11.12"
 futures = "0.3.29"
-magic_string = "0.3.4"
+magic_string = { path = "../../lib/magic-string/core" }
 async-recursion = "1.0.5"
 getrandom = { version = "0.2.11", features = ["js", "js-sys"] }
 anyhow = { workspace = true }
diff --git a/lib/magic-string b/lib/magic-string
new file mode 160000
index 00000000..20da9e7d
--- /dev/null
+++ b/lib/magic-string
@@ -0,0 +1 @@
+Subproject commit 20da9e7d9d65b12da5f80b54d72a528f37f9cceb