From 261c40e7b949b61c3bdd9707654fdc1f65f4ac8a Mon Sep 17 00:00:00 2001
From: Xi Zhang <xizhang@oasislabs.com>
Date: Wed, 13 Mar 2024 18:12:49 -0500
Subject: [PATCH] Fix contracts dependencies

- prettify lockfile settings
---
 contracts/package.json |  8 +++++---
 pnpm-lock.yaml         | 21 +++++++++++++--------
 2 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/contracts/package.json b/contracts/package.json
index b895bb21..cb176c80 100644
--- a/contracts/package.json
+++ b/contracts/package.json
@@ -27,10 +27,9 @@
   "devDependencies": {
     "@nomicfoundation/hardhat-chai-matchers": "^2.0.0",
     "@nomicfoundation/hardhat-ethers": "^3.0.5",
-    "@oasisprotocol/sapphire-paratime": "workspace:^",
-    "@oasisprotocol/sapphire-hardhat": "workspace:^",
     "@oasisprotocol/client": "^0.1.1-alpha.2",
-    "@openzeppelin/contracts": "^4.7.3",
+    "@oasisprotocol/sapphire-hardhat": "workspace:^",
+    "@oasisprotocol/sapphire-paratime": "workspace:^",
     "@typechain/ethers-v6": "^0.5.1",
     "@typechain/hardhat": "^9.1.0",
     "@types/chai": "^4.3.3",
@@ -53,5 +52,8 @@
     "ts-node": "^10.9.1",
     "typechain": "^8.3.2",
     "typescript": "^4.8.3"
+  },
+  "dependencies": {
+    "@openzeppelin/contracts": "^5.0.2"
   }
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 73a6236e..0ef0ea05 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -1,9 +1,5 @@
 lockfileVersion: '6.0'
 
-settings:
-  autoInstallPeers: true
-  excludeLinksFromLockfile: false
-
 importers:
 
   clients/js:
@@ -92,6 +88,10 @@ importers:
         version: 4.2.0(typescript@4.9.5)
 
   contracts:
+    dependencies:
+      '@openzeppelin/contracts':
+        specifier: ^5.0.2
+        version: 5.0.2
     devDependencies:
       '@nomicfoundation/hardhat-chai-matchers':
         specifier: ^2.0.0
@@ -108,9 +108,6 @@ importers:
       '@oasisprotocol/sapphire-paratime':
         specifier: workspace:^
         version: link:../clients/js
-      '@openzeppelin/contracts':
-        specifier: ^4.7.3
-        version: 4.9.2
       '@typechain/ethers-v6':
         specifier: ^0.5.1
         version: 0.5.1(ethers@6.9.0)(typechain@8.3.2)(typescript@4.9.5)
@@ -3860,6 +3857,11 @@ packages:
 
   /@openzeppelin/contracts@4.9.2:
     resolution: {integrity: sha512-mO+y6JaqXjWeMh9glYVzVu8HYPGknAAnWyxTRhGeckOruyXQMNnlcW6w/Dx9ftLeIQk6N+ZJFuVmTwF7lEIFrg==}
+    dev: false
+
+  /@openzeppelin/contracts@5.0.2:
+    resolution: {integrity: sha512-ytPc6eLGcHHnapAZ9S+5qsdomhjo6QBHTDRRBFfTxXIpsicMhVPouPgmUPebZZZGX7vt9USA+Z+0M0dSVtSUEA==}
+    dev: false
 
   /@pmmmwh/react-refresh-webpack-plugin@0.5.11(react-refresh@0.11.0)(webpack-dev-server@4.15.1)(webpack@5.89.0):
     resolution: {integrity: sha512-7j/6vdTym0+qZ6u4XbSAxrWBGYSdCfTzySkj7WAFgDLmSyWlOrWvpyzxlFh5jtw9dn0oL/jtW+06XfFiisN3JQ==}
@@ -8556,7 +8558,6 @@ packages:
     dependencies:
       is-hex-prefixed: 1.0.0
       strip-hex-prefix: 1.0.0
-    bundledDependencies: false
 
   /eventemitter3@4.0.4:
     resolution: {integrity: sha512-rlaVLnVxtxvoyLsQQFBx53YmXHDxRIzzTLbdfxqi4yocpSjAxXwkU0cScM5JgSKMqEhrZpnvQ2D9gjylR0AimQ==}
@@ -18361,3 +18362,7 @@ packages:
   /zod@3.22.4:
     resolution: {integrity: sha512-iC+8Io04lddc+mVqQ9AZ7OQ2MrUKGN+oIQyq1vemgt46jwCwLfhq7/pwnBnNXXXZb8VTVLKwp9EDkx+ryxIWmg==}
     dev: false
+
+settings:
+  autoInstallPeers: true
+  excludeLinksFromLockfile: false