From 41d2999e175a500d473e638534b3c7fe3f6461f8 Mon Sep 17 00:00:00 2001
From: Tadas <vtadas25@gmail.com>
Date: Mon, 18 Nov 2024 17:58:25 +0200
Subject: [PATCH] Fix some things in the way deps are specified

* ethers was missing from contracts/* packages' dep list;
* pnpm does not install peer deps automatically and in general it makes
  sense for orclient and ortypes to have some deps like ethers as direct
deps specified since they won't work without them. So now specifying
these deps both as deps and peer deps. Checkout out [this](https://github.com/npm/rfcs/issues/324) for how it should work.
---
 contracts/orec/package.json            |  3 ++-
 contracts/respect1155/package.json     |  3 ++-
 libs/orclient/package.json             |  3 +++
 libs/ortypes/package.json              |  4 +++-
 libs/privy-react-orclient/package.json |  3 +++
 package-lock.json                      | 16 +++++++++++++---
 6 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/contracts/orec/package.json b/contracts/orec/package.json
index 8e89a89..28f9de6 100644
--- a/contracts/orec/package.json
+++ b/contracts/orec/package.json
@@ -85,7 +85,8 @@
   },
   "dependencies": {
     "@openzeppelin/contracts": "^5.0.2",
-    "dotenv": "^16.4.5"
+    "dotenv": "^16.4.5",
+    "ethers": "^6.13.4"
   },
   "publishConfig": {
     "access": "public",
diff --git a/contracts/respect1155/package.json b/contracts/respect1155/package.json
index 6e80ac2..450b1d2 100644
--- a/contracts/respect1155/package.json
+++ b/contracts/respect1155/package.json
@@ -76,7 +76,8 @@
   },
   "dependencies": {
     "@openzeppelin/contracts": "^5.1.0",
-    "@ordao/orec": "^1.0.9"
+    "@ordao/orec": "^1.0.9",
+    "ethers": "^6.13.4"
   },
   "publishConfig": {
     "access": "public",
diff --git a/libs/orclient/package.json b/libs/orclient/package.json
index f5eb8c7..25eb449 100644
--- a/libs/orclient/package.json
+++ b/libs/orclient/package.json
@@ -50,6 +50,9 @@
   },
   "dependencies": {
     "@ordao/ts-utils": "^1.0.5",
+    "@ordao/ortypes": "^1.0.3",
+    "ethers": "^6.13.0",
+    "zod": "^3.23.8",
     "chai": "^5.1.1",
     "tsconfig-to-dual-package": "^1.2.0",
     "zod-to-json-schema": "^3.23.1"
diff --git a/libs/ortypes/package.json b/libs/ortypes/package.json
index e7751e1..34ab68d 100644
--- a/libs/ortypes/package.json
+++ b/libs/ortypes/package.json
@@ -67,8 +67,10 @@
     "@ordao/orec": "^1.0.9",
     "@ordao/respect1155": "^1.0.9",
     "@ordao/ts-utils": "^1.0.5",
-    "chai": "^5.1.1",
     "op-fractal-sc": "github:Optimystics/op-fractal-sc#main",
+    "ethers": "^6.13.0",
+    "zod": "^3.23.8",
+    "chai": "^5.1.1",
     "tsconfig-to-dual-package": "^1.2.0",
     "utility-types": "^3.11.0"
   },
diff --git a/libs/privy-react-orclient/package.json b/libs/privy-react-orclient/package.json
index 2092ecf..c3b0657 100644
--- a/libs/privy-react-orclient/package.json
+++ b/libs/privy-react-orclient/package.json
@@ -36,6 +36,9 @@
     "@privy-io/react-auth": "^1.93.0",
     "react": "^18.3.1"
   },
+  "dependencies": {
+    "@ordao/orclient": "^1.0.6"
+  },
   "keywords": [
     "ordao",
     "orclient",
diff --git a/package-lock.json b/package-lock.json
index d710edc..70f0af6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -281,7 +281,8 @@
       "license": "GPL-3.0",
       "dependencies": {
         "@openzeppelin/contracts": "^5.0.2",
-        "dotenv": "^16.4.5"
+        "dotenv": "^16.4.5",
+        "ethers": "^6.13.4"
       },
       "devDependencies": {
         "@nomicfoundation/hardhat-chai-matchers": "^2.0.8",
@@ -330,7 +331,8 @@
       "license": "GPL-3.0",
       "dependencies": {
         "@openzeppelin/contracts": "^5.1.0",
-        "@ordao/orec": "^1.0.9"
+        "@ordao/orec": "^1.0.9",
+        "ethers": "^6.13.4"
       },
       "devDependencies": {
         "@nomicfoundation/hardhat-chai-matchers": "^2.0.8",
@@ -486,9 +488,12 @@
       "version": "1.0.11",
       "license": "GPL-3.0",
       "dependencies": {
+        "@ordao/ortypes": "^1.0.3",
         "@ordao/ts-utils": "^1.0.5",
         "chai": "^5.1.1",
+        "ethers": "^6.13.0",
         "tsconfig-to-dual-package": "^1.2.0",
+        "zod": "^3.23.8",
         "zod-to-json-schema": "^3.23.1"
       },
       "devDependencies": {
@@ -528,9 +533,11 @@
         "@ordao/respect1155": "^1.0.9",
         "@ordao/ts-utils": "^1.0.5",
         "chai": "^5.1.1",
+        "ethers": "^6.13.0",
         "op-fractal-sc": "github:Optimystics/op-fractal-sc#main",
         "tsconfig-to-dual-package": "^1.2.0",
-        "utility-types": "^3.11.0"
+        "utility-types": "^3.11.0",
+        "zod": "^3.23.8"
       },
       "devDependencies": {
         "@typechain/ethers-v6": "^0.5.1",
@@ -563,6 +570,9 @@
       "name": "@ordao/privy-react-orclient",
       "version": "1.0.10",
       "license": "GPL-3.0",
+      "dependencies": {
+        "@ordao/orclient": "^1.0.6"
+      },
       "devDependencies": {
         "typescript": "^5.4.5"
       },