Merge pull request #405 from asimpk/upgrade-workspace-packages

Upgrade workspace packages
kumo-earth · Sep 29, 2023 · bed4547 · bed4547
2 parents c622b35 + 5e0e88f
commit bed4547
Show file tree

Hide file tree

Showing 132 changed files with 9,757 additions and 12,224 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -61,7 +61,7 @@ jobs:
         env:
           FORCE_COLOR: 0
         with:
-          node-version: 16.16.0
+          node-version: 18.17.1
           cache: 'yarn'
 
       - run: yarn install --frozen-lockfile
@@ -115,7 +115,7 @@ jobs:
         env:
           FORCE_COLOR: 0
         with:
-          node-version: 16.16.0
+          node-version: 18.17.1
           cache: 'yarn'
 
       - run: yarn install --frozen-lockfile

diff --git a/.github/workflows/test-contracts.yml b/.github/workflows/test-contracts.yml
@@ -30,7 +30,7 @@ jobs:
         env:
           FORCE_COLOR: 0
         with:
-          node-version: 16.16.0
+          node-version: 18.17.1
           cache: 'yarn'
 
       - run: yarn install --frozen-lockfile
@@ -52,7 +52,7 @@ jobs:
         env:
           FORCE_COLOR: 0
         with:
-          node-version: 16.16.0
+          node-version: 18.17.1
           cache: 'yarn'
 
       - run: yarn install --frozen-lockfile

diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-16.16.0
+18.17.1
diff --git a/.prettierignore b/.prettierignore
@@ -50,4 +50,5 @@ Makefile
 *.archive
 *.sh
 .vscode/settings.json
-.yarn/
+.yarn/
+.nvmrc
diff --git a/package.json b/package.json
@@ -3,7 +3,13 @@
   "private": true,
   "workspaces": {
     "packages": [
-      "packages/*"
+      "packages/contracts",
+      "packages/dev-frontend",
+      "packages/lib-base",
+      "packages/lib-ethers",
+      "packages/lib-react",
+      "packages/lib-react",
+      "packages/providers"
     ],
     "nohoist": [
       "**/web3-eth-abi/@ethersproject/abi",
@@ -42,21 +48,17 @@
   "scripts": {
     "build": "run-s build:*",
     "build:dev-frontend": "yarn workspace @kumodao/dev-frontend build",
-    "build:subgraph": "yarn workspace @kumodao/subgraph build",
     "deploy": "yarn workspace @kumodao/lib-ethers hardhat deploy",
     "docs": "run-s docs:*",
     "docs:collect-sdk-apis": "node scripts/collect-sdk-apis.js",
     "docs:api-documenter": "api-documenter generate -i temp/sdk-apis -o docs/sdk",
-    "fuzzer": "yarn workspace @kumodao/fuzzer fuzzer",
     "postinstall": "husky install",
     "prepare": "run-s prepare:*",
     "prepare:contracts": "yarn workspace @kumodao/contracts prepare",
     "prepare:lib-base": "yarn workspace @kumodao/lib-base prepare",
     "prepare:lib-ethers": "yarn workspace @kumodao/lib-ethers prepare",
     "prepare:lib-react": "yarn workspace @kumodao/lib-react prepare",
-    "prepare:lib-subgraph": "yarn workspace @kumodao/lib-subgraph prepare",
     "prepare:providers": "yarn workspace @kumodao/providers prepare",
-    "prepare:subgraph": "yarn workspace @kumodao/subgraph prepare",
     "prepare:docs": "run-s docs",
     "prettier:check": "prettier --check .",
     "prettier:write": "prettier --write .",
@@ -100,23 +102,18 @@
   },
   "devDependencies": {
     "@commitlint/cli": "^17.7.1",
-    "@commitlint/config-conventional": "^16.2.1",
-    "@microsoft/api-documenter": "^7.17.14",
-    "fs-extra": "^9.1.0",
+    "@commitlint/config-conventional": "^17.7.0",
+    "@microsoft/api-documenter": "^7.23.0",
+    "fs-extra": "^11.1.1",
     "husky": "^8.0.3",
     "lint-staged": "^14.0.0",
     "npm-run-all": "^4.1.5",
-    "prettier": "^3.0.1",
-    "semantic-release": "^19.0.3",
-    "semantic-release-monorepo": "^7.0.4"
+    "prettier": "^3.0.3",
+    "semantic-release": "^21.1.2",
+    "semantic-release-monorepo": "^7.0.5"
   },
   "engineStrict": true,
   "engines": {
-    "node": "16.16.0"
-  },
-  "resolutions": {
-    "react-error-overlay": "6.0.9",
-    "@types/react": "^17.0.3",
-    "@types/react-dom": "^18.0.2"
+    "node": "^18.17.1"
   }
 }
diff --git a/packages/contracts/package.json b/packages/contracts/package.json
@@ -20,28 +20,29 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "decimal.js": "^10.3.1",
+    "@ethersproject/experimental": "^5.7.0",
+    "decimal.js": "^10.4.3",
     "eth-mutants": "^0.1.1",
     "ethereumjs-util": "^7.1.5",
-    "ethers": "~5.6.9",
-    "solc": "^0.8.13",
-    "xmlhttprequest": "^1.8.0",
-    "@ethersproject/experimental": "^5.7.0"
+    "ethers": "~5.7.2",
+    "solc": "^0.8.21",
+    "xmlhttprequest": "^1.8.0"
   },
   "devDependencies": {
-    "@nomiclabs/hardhat-ethers": "^2.2.2",
-    "@nomiclabs/hardhat-etherscan": "^3.0.1",
-    "@nomiclabs/hardhat-truffle5": "^2.0.4",
+    "@nomiclabs/hardhat-ethers": "^2.2.3",
+    "@nomiclabs/hardhat-etherscan": "^3.1.7",
+    "@nomiclabs/hardhat-truffle5": "^2.0.7",
     "@nomiclabs/hardhat-web3": "^2.0.0",
-    "@openzeppelin/contracts": "^4.6.0",
-    "@openzeppelin/test-helpers": "^0.5.13",
-    "eth-gas-reporter": "^0.2.22",
-    "hardhat": "^2.9.9",
-    "hardhat-contract-sizer": "^2.6.1",
+    "@openzeppelin/contracts": "^4.9.3",
+    "@openzeppelin/contracts-upgradeable": "^4.9.3",
+    "@openzeppelin/test-helpers": "^0.5.16",
+    "eth-gas-reporter": "^0.2.25",
+    "hardhat": "^2.17.3",
+    "hardhat-contract-sizer": "^2.10.0",
     "hardhat-diamond-abi": "^3.0.1",
-    "hardhat-gas-reporter": "^1.0.8",
+    "hardhat-gas-reporter": "^1.0.9",
     "npm-run-all": "^4.1.5",
-    "solidity-coverage": "^0.7.20",
+    "solidity-coverage": "^0.8.4",
     "web3": "^1.3.4"
   }
 }
diff --git a/packages/contracts/test/BorrowerOperationsTest.js b/packages/contracts/test/BorrowerOperationsTest.js
@@ -6779,7 +6779,7 @@ contract("BorrowerOperations", async accounts => {
       assert.equal(status_Before, 0);
 
       const KUSDRequest = MIN_NET_DEBT;
-      borrowerOperations.openTrove(
+      await borrowerOperations.openTrove(
         assetAddress1,
         dec(100, "ether"),
         th._100pct,

diff --git a/packages/dev-frontend/.env.local b/packages/dev-frontend/.env.local
@@ -1,11 +1,10 @@
-REACT_APP_CHAIN_NAME='localhost'
-REACT_APP_CHAIN_ID=17
-REACT_APP_CURRENCY_NAME=ETHER
-REACT_APP_CURRENCY_SYMBOL=ETH
-REACT_APP_NETWORK_URL=localhost
-REACT_APP_RPC_URL= http://${REACT_APP_NETWORK_URL}:8545
-REACT_APP_RPC_URL_WALLET= ${REACT_APP_RPC_URL}
-REACT_APP_WSS_URL= ws://${REACT_APP_NETWORK_URL}:8546
+VITE_CHAIN_NAME=localhost
+VITE_CHAIN_ID=17
+VITE_CURRENCY_NAME=ETHER
+VITE_CURRENCY_SYMBOL=ETH
+VITE_RPC_URL= http://localhost:8545
+VITE_RPC_URL_WALLET= http://localhost:8545
+VITE_WSS_URL= ws://localhost:8546
 
 SECRET_WORDS= 'test test test test test test test test test test test junk'
 NETWORK_NAME= 'Localhost'

diff --git a/packages/dev-frontend/public/index.html → packages/dev-frontend/index.html b/packages/dev-frontend/public/index.html → packages/dev-frontend/index.html
@@ -2,21 +2,21 @@
 <html lang="en">
   <head>
     <meta charset="utf-8" />
-    <link rel="icon" href="%PUBLIC_URL%/kumo-icon-bright.png" />
+    <link rel="icon" href="/kumo-icon-bright.png" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <meta name="theme-color" content="#000000" />
     <meta
       name="description"
       content="KUMO App. Borrow KUSD against your carbon credits"
     />
-    <link rel="apple-touch-icon" href="%PUBLIC_URL%/logo256.png" />
+    <link rel="apple-touch-icon" href="/logo256.png" />
     <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto">
     <link href="https://fonts.googleapis.com/css?family=Quicksand::300,400,500,700,800,900|Lato::300,400,500,700,800,900" rel="stylesheet">
     <!--
       manifest.json provides metadata used when your web app is installed on a
       user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
     -->
-    <link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
+    <link rel="manifest" href="/manifest.json" />
     <!--
       Notice the use of %PUBLIC_URL% in the tags above.
       It will be replaced with the URL of the `public` folder during the build.
@@ -41,5 +41,6 @@
       To begin the development, run `npm start` or `yarn start`.
       To create a production bundle, use `npm run build` or `yarn build`.
     -->
+    <script type="module" src="./src/index.tsx"></script>
   </body>
 </html>
diff --git a/packages/dev-frontend/package.json b/packages/dev-frontend/package.json
@@ -4,60 +4,82 @@
   "private": true,
   "homepage": "https://dev.kumo.earth/",
   "dependencies": {
-    "@ethersproject/abi": "5.7.0",
-    "@fortawesome/fontawesome-svg-core": "1.2.34",
-    "@fortawesome/free-regular-svg-icons": "5.15.2",
-    "@fortawesome/free-solid-svg-icons": "5.15.2",
-    "@fortawesome/react-fontawesome": "0.1.14",
-    "@metamask/providers": "^9.0.0",
-    "@popperjs/core": "2.9.1",
-    "@testing-library/dom": "8.14.0",
-    "@testing-library/jest-dom": "5.11.9",
-    "@testing-library/react": "12.1.5",
-    "@testing-library/user-event": "14.3.0",
-    "@tippyjs/react": "4.2.6",
-    "@types/jest": "27.5.1",
-    "@types/lodash": "^4.14.186",
-    "@types/react": "17.0.3",
-    "@types/react-copy-to-clipboard": "5.0.0",
-    "@types/react-dom": "17.0.14",
-    "@types/react-router-dom": "5.3.3",
-    "@types/recharts": "^1.8.23",
-    "@types/testing-library__jest-dom": "5.14.3",
-    "@types/testing-library__react": "10.2.0",
-    "@types/testing-library__user-event": "4.2.0",
+    "@emotion/react": "^11.11.1",
+    "@ethersproject/abi": "^5.7.0",
+    "@ethersproject/experimental": "^5.7.0",
+    "@fortawesome/fontawesome-svg-core": "^6.4.2",
+    "@fortawesome/free-regular-svg-icons": "^6.4.2",
+    "@fortawesome/free-solid-svg-icons": "^6.4.2",
+    "@fortawesome/react-fontawesome": "^0.2.0",
+    "@metamask/providers": "^13.0.0",
+    "@popperjs/core": "^2.11.8",
+    "@tippyjs/react": "^4.2.6",
+    "@walletconnect/types": "^2.10.1",
     "@web3-react/core": "6.1.9",
     "@web3-react/injected-connector": "6.0.7",
     "@web3-react/network-connector": "^6.2.9",
     "@web3-react/types": "6.0.7",
     "@web3-react/walletconnect-connector": "^6.2.13",
-    "cross-env": "7.0.3",
     "env-cmd": "^10.1.0",
-    "ethers": "6.2.2",
-    "npm-run-all": "4.1.5",
-    "react": "17.0.1",
-    "react-circular-progressbar": "2.0.4",
-    "react-copy-to-clipboard": "5.1.0",
-    "react-dom": "17.0.1",
-    "react-is": "17.0.1",
-    "react-popper": "2.3.0",
-    "react-router-dom": "5.2.0",
-    "react-scripts": "4.0.3",
+    "ethers": "^6.7.1",
+    "lodash": "^4.17.21",
+    "react": "^18.2.0",
+    "react-circular-progressbar": "^2.1.0",
+    "react-copy-to-clipboard": "^5.1.0",
+    "react-dom": "^18.2.0",
+    "react-popper": "^2.3.0",
+    "react-router-dom": "^6.16.0",
+    "react-scripts": "^5.0.1",
     "reakit": "^1.3.11",
-    "recharts": "^2.1.16",
-    "source-map-explorer": "2.5.2",
-    "theme-ui": "0.6.0-canary.1544.5359f8a1e408a4dfeb74a9ae39688270286e534a.0",
-    "typescript": "4.1.5",
-    "web3-providers-http": "^1.7.3"
+    "recharts": "^2.8.0",
+    "theme-ui": "^0.16.1",
+    "typescript": "^5.2.2",
+    "web3-providers-http": "^4.0.6"
+  },
+  "devDependencies": {
+    "@esbuild-plugins/node-modules-polyfill": "^0.2.2",
+    "@synthetixio/synpress": "^3.7.2-beta.7",
+    "@testing-library/dom": "^9.3.3",
+    "@testing-library/jest-dom": "^6.1.3",
+    "@testing-library/react": "^14.0.0",
+    "@testing-library/user-event": "^14.5.1",
+    "@types/lodash": "^4.14.199",
+    "@types/react": "^18.2.22",
+    "@types/react-copy-to-clipboard": "^5.0.4",
+    "@types/react-dom": "^18.2.7",
+    "@types/react-router-dom": "^5.3.3",
+    "@types/testing-library__react": "^10.2.0",
+    "@types/testing-library__user-event": "^4.2.0",
+    "@typescript-eslint/eslint-plugin": "^6.7.2",
+    "@typescript-eslint/parser": "^6.7.2",
+    "@vitejs/plugin-react": "^4.0.4",
+    "@vitejs/plugin-react-refresh": "^1.3.6",
+    "@vitejs/plugin-react-swc": "^3.3.2",
+    "cypress": "^13.2.0",
+    "eslint": "^8.49.0",
+    "eslint-plugin-react-hooks": "^4.6.0",
+    "eslint-plugin-react-refresh": "^0.4.3",
+    "jsdom": "22",
+    "node-fetch": "^3.3.2",
+    "npm-run-all": "^4.1.5",
+    "rollup-plugin-polyfill-node": "^0.12.0",
+    "source-map-explorer": "2.5.3",
+    "start-server-and-test": "^2.0.1",
+    "typescript": "^5.2.2",
+    "vite": "^4.4.9",
+    "vite-plugin-svgr": "^4.0.0",
+    "vitest": "^0.34.5",
+    "yalc": "1.0.0-pre.53"
   },
   "scripts": {
     "analyze": "source-map-explorer 'build/static/js/*.js'",
-    "start": "env-cmd -f .env react-scripts start",
-    "start:local": "env-cmd -f .env.local react-scripts start",
-    "start-demo": "cross-env REACT_APP_DEMO_MODE=true run-s start",
+    "start": "env-cmd -f .env vite --force",
+    "start:local": "env-cmd -f .env.local vite --force",
+    "start-demo": "env-cmd VITE_APP_DEMO_MODE=true vite --force",
     "build": "run-s build:*",
     "build:set-version": "node scripts/set-version.js",
-    "build:react": "env-cmd -f .env react-scripts build",
+    "build:tsc": "tsc",
+    "build:vite": "env-cmd -f .env vite build",
     "test": "env-cmd -f .env.local synpress run --configFile synpress.config.js",
     "ci": "start-server-and-test 'yarn start:local' http://localhost:3000 'yarn test'",
     "eject": "react-scripts eject"
@@ -76,10 +98,5 @@
       "last 1 firefox version",
       "last 1 safari version"
     ]
-  },
-  "devDependencies": {
-    "@synthetixio/synpress": "^3.7.2-beta.6",
-    "cypress": "^12.14.0",
-    "start-server-and-test": "^2.0.0"
   }
 }
diff --git a/packages/dev-frontend/src/App.test.tsx b/packages/dev-frontend/src/App.test.tsx
@@ -1,10 +1,5 @@
-import React from "react";
-import { render, fireEvent } from "@testing-library/react";
-
 import { Decimal, KUSD_MINIMUM_NET_DEBT, Trove } from "@kumodao/lib-base";
 
-import App from "./App";
-
 const params = { depositCollateral: Decimal.from(20), borrowKUSD: KUSD_MINIMUM_NET_DEBT };
 const trove = Trove.create(params);