chore: yarn workspaces

.husky/commit-msg

@@ -1,4 +1,4 @@
 #!/bin/sh
 . "$(dirname "$0")/_/husky.sh"
 
-yarn dlx commitlint --edit $1
+npx commitlint --edit $1

.husky/pre-commit

@@ -1,4 +1,4 @@
 #!/bin/sh
 . "$(dirname "$0")/_/husky.sh"
 
-yarn dlx lint-staged
+npx lint-staged

.yarnrc.yml

@@ -3,5 +3,3 @@ nodeLinker: node-modules
 plugins:
   - path: ".yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs"
     spec: "@yarnpkg/plugin-interactive-tools"
-
-yarnPath: .yarn/releases/yarn-3.2.1.cjs

package.json

@@ -1,30 +1,23 @@
 {
   "private": true,
-  "name": "hashi",
   "description": "",
   "author": {
     "name": "gnosis",
     "url": "https://github.com/gnosis"
   },
   "scripts": {
     "prepare": "husky install",
-    "preinstall": "yarn contracts:install",
-    "build": "yarn contracts:build",
-    "test": "yarn contracts:test",
-    "lint": "yarn contracts:lint",
-    "coverage": "yarn contracts:coverage",
-    "contracts:install": "cd packages/evm && yarn install",
-    "contracts:build": "cd packages/evm && yarn build",
-    "contracts:test": "cd packages/evm && yarn test",
-    "contracts:lint": "cd packages/evm && yarn lint",
-    "contracts:coverage": "cd packages/evm && yarn coverage"
+    "postinstall": "patch-package"
   },
   "devDependencies": {
     "@commitlint/cli": "^17.5.1",
     "@commitlint/config-conventional": "^17.4.4",
     "husky": "^8.0.3",
+    "patch-package": "8.0.0",
     "prettier": "^2.8.7",
     "prettier-plugin-solidity": "^1.0.0"
   },
-  "packageManager": "[email protected]"
+  "workspaces": [
+    "packages/*"
+  ]
 }

packages/evm/contracts/adapters/Electron/ElectronAdapter.sol

@@ -1,11 +1,11 @@
 // SPDX-License-Identifier: LGPL-3.0-only
 pragma solidity ^0.8.20;
 
+import { Ownable } from "@openzeppelin/contracts/access/Ownable.sol";
 import { BlockHashAdapter } from "../BlockHashAdapter.sol";
 import { ILightClient } from "./interfaces/ILightClient.sol";
 import { Merkle } from "./lib/Merkle.sol";
 import { Receipt } from "./lib/Receipt.sol";
-import { Ownable } from "openzeppelin/access/Ownable.sol";
 
 contract ElectronAdapter is BlockHashAdapter, Ownable {
     ILightClient public lightClient;

packages/evm/contracts/adapters/Router/RouterReporter.sol

@@ -2,7 +2,6 @@
 pragma solidity ^0.8.20;
 
 import { Ownable } from "@openzeppelin/contracts/access/Ownable.sol";
-import { Strings } from "@openzeppelin/contracts/utils/Strings.sol";
 import { Reporter } from "../Reporter.sol";
 import { IGateway } from "@routerprotocol/evm-gateway-contracts/contracts/IGateway.sol";
 import { Strings } from "@openzeppelin/contracts/utils/Strings.sol";

packages/evm/package.json

@@ -1,5 +1,6 @@
 {
-  "name": "@gnosis/hashi",
+  "name": "@gnosis/hashi-evm",
+  "private": true,
   "description": "",
   "version": "0.1.1",
   "author": {
@@ -19,6 +20,7 @@
     "@nomicfoundation/hardhat-toolbox": "^2.0.0",
     "@nomiclabs/hardhat-ethers": "^2.2.1",
     "@nomiclabs/hardhat-etherscan": "^3.1.2",
+    "@openzeppelin/contracts-upgradeable": "^4.8.1",
     "@trivago/prettier-plugin-sort-imports": "^4.0.0",
     "@typechain/ethers-v5": "^10.1.1",
     "@typechain/hardhat": "^6.1.4",
@@ -37,7 +39,7 @@
     "eslint-config-prettier": "^8.5.0",
     "ethers": "^5.7.2",
     "fs-extra": "^10.1.0",
-    "hardhat": "^2.19.4",
+    "hardhat": "2.19.4",
     "hardhat-gas-reporter": "^1.0.9",
     "lint-staged": "^13.0.4",
     "lodash": "^4.17.21",
@@ -74,17 +76,11 @@
   },
   "scripts": {
     "clean": "shx rm -rf ./artifacts ./cache ./coverage ./types ./coverage.json && yarn typechain",
-    "commit": "git-cz",
     "build": "hardhat compile",
-    "compile": "cross-env TS_NODE_TRANSPILE_ONLY=true hardhat compile",
     "coverage": "hardhat coverage --solcoverjs ./.solcover.js --temp artifacts --testfiles \"test/**/*.ts\" && yarn typechain",
-    "deploy:hashi": "hardhat deploy:Hashi",
-    "deploy:girigiribashi": "hardhat deploy:ShoyuBashi",
-    "deploy:headerstorage": "hardhat deploy:HeaderStorage",
     "lint": "yarn lint:sol && yarn lint:ts && yarn prettier:check",
     "lint:sol": "solhint --max-warnings 0 \"contracts/**/*.sol\"",
     "lint:ts": "eslint --ignore-path ./.eslintignore --ext .js,.ts .",
-    "postinstall": "DOTENV_CONFIG_PATH=./.env.example yarn typechain",
     "postpublish": "pinst --enable",
     "prepublishOnly": "pinst --disable",
     "prettier:check": "prettier --check \"**/*.{js,json,md,sol,ts,yml}\"",
@@ -97,12 +93,10 @@
     "@chainlink/contracts-ccip": "^0.7.6",
     "@connext/interfaces": "^2.0.0",
     "@hyperlane-xyz/core": "^3.1.10",
-    "@openzeppelin/contracts-upgradeable": "^4.8.1",
     "@polytope-labs/solidity-merkle-trees": "^0.2.1",
     "@routerprotocol/evm-gateway-contracts": "^1.1.13",
     "hardhat-change-network": "^0.0.7",
     "hardhat-deploy": "^0.11.31",
-    "openzeppelin": "npm:@openzeppelin/[email protected]",
     "solidity-rlp": "^2.0.8"
   }
 }