From 5f29da69be96ebda258594b2ef92f058e6fb2bcf Mon Sep 17 00:00:00 2001
From: jimjimvalkema <jjvalkema@protonmail.com>
Date: Thu, 2 Oct 2025 22:01:28 +0200
Subject: [PATCH 1/3] "fixed" it

---
 .gitignore     | 2 ++
 package.json   | 5 ++++-
 remappings.txt | 3 +++
 3 files changed, 9 insertions(+), 1 deletion(-)
 create mode 100644 remappings.txt

diff --git a/.gitignore b/.gitignore
index 72524f9..077c696 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,3 +36,5 @@ gas_benchmark.diff
 /bench-out
 
 /coverage
+
+node_modules
\ No newline at end of file
diff --git a/package.json b/package.json
index b03c1aa..80e3ea2 100644
--- a/package.json
+++ b/package.json
@@ -15,5 +15,8 @@
     "slither": "forge clean && forge build --build-info --skip '*/test/**' --force && slither . --checklist --ignore-compile --show-ignored-findings --config-file ./slither.config.json | tee slither_output.md",
     "slither-has-diff": "./slither_has_diff.sh"
   },
-  "packageManager": "yarn@4.5.2"
+  "packageManager": "yarn@4.5.2",
+  "dependencies": {
+    "@openzeppelin/contracts": "^5.4.0"
+  }
 }
diff --git a/remappings.txt b/remappings.txt
new file mode 100644
index 0000000..54aaae5
--- /dev/null
+++ b/remappings.txt
@@ -0,0 +1,3 @@
+@oz/=node_modules/@openzeppelin/contracts
+@aztec/=src
+@test/=test
\ No newline at end of file

From 20e6219ca83e97913fbd744d6ccdfca00dcb567c Mon Sep 17 00:00:00 2001
From: jimjimvalkema <jjvalkema@protonmail.com>
Date: Thu, 2 Oct 2025 22:39:52 +0200
Subject: [PATCH 2/3] silly little fixes

---
 README.md      |  3 +++
 package.json   | 15 ++++++++-------
 remappings.txt |  1 +
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index cb9437d..7fdcd08 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,6 @@
+# WARNING this is a unofficial hacky fix
+install: `yarn add aztec-l1-contracts-hardhat-fix`
+
 # L1 Contracts
 
 This directory contains the Ethereum smart contracts for progressing the state of the Rollup.
diff --git a/package.json b/package.json
index 80e3ea2..bdae9db 100644
--- a/package.json
+++ b/package.json
@@ -1,13 +1,17 @@
 {
-  "name": "@aztec/l1-contracts",
-  "version": "2.0.3",
+  "name": "aztec-l1-contracts-hardhat-fix",
+  "version": "2.0.6",
   "license": "Apache-2.0",
   "description": "Aztec contracts for the Ethereum mainnet and testnets",
   "devDependencies": {
-    "@openzeppelin/merkle-tree": "^1.0.8",
     "ox": "^0.8.3",
     "solhint": "5.1.0"
   },
+  "dependencies": {
+    "@openzeppelin/contracts": "5.4.0",
+    "@openzeppelin/merkle-tree": "^1.0.8",
+    "forge-std": "git+https://github.com/foundry-rs/forge-std.git"
+  },
   "scripts": {
     "format": "forge fmt",
     "lint": "solhint --config ./.solhint.json \"src/**/*.sol\"",
@@ -15,8 +19,5 @@
     "slither": "forge clean && forge build --build-info --skip '*/test/**' --force && slither . --checklist --ignore-compile --show-ignored-findings --config-file ./slither.config.json | tee slither_output.md",
     "slither-has-diff": "./slither_has_diff.sh"
   },
-  "packageManager": "yarn@4.5.2",
-  "dependencies": {
-    "@openzeppelin/contracts": "^5.4.0"
-  }
+  "packageManager": "yarn@4.5.2"
 }
diff --git a/remappings.txt b/remappings.txt
index 54aaae5..10a9990 100644
--- a/remappings.txt
+++ b/remappings.txt
@@ -1,3 +1,4 @@
 @oz/=node_modules/@openzeppelin/contracts
+forge-std/=node_modules/forge-std/src/
 @aztec/=src
 @test/=test
\ No newline at end of file

From bcdc59df4b40ff821cba4c784cad24dd15df9740 Mon Sep 17 00:00:00 2001
From: jimjimvalkema <jjvalkema@protonmail.com>
Date: Thu, 2 Oct 2025 22:50:10 +0200
Subject: [PATCH 3/3] cleanup

---
 README.md    | 3 ---
 package.json | 4 ++--
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 7fdcd08..cb9437d 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,3 @@
-# WARNING this is a unofficial hacky fix
-install: `yarn add aztec-l1-contracts-hardhat-fix`
-
 # L1 Contracts
 
 This directory contains the Ethereum smart contracts for progressing the state of the Rollup.
diff --git a/package.json b/package.json
index bdae9db..876a825 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
-  "name": "aztec-l1-contracts-hardhat-fix",
-  "version": "2.0.6",
+  "name": "@aztec/l1-contracts",
+  "version": "2.0.3",
   "license": "Apache-2.0",
   "description": "Aztec contracts for the Ethereum mainnet and testnets",
   "devDependencies": {