Skip to content

Commit

Permalink
fix: re-adding contracts/ back into the monorepo (#595)
Browse files Browse the repository at this point in the history
* Separate build:deploy command for compiling for deployment
* Fixing our node version to 18.15.0 for now while we wait for a fix for
  NomicFoundation/hardhat#3877
  • Loading branch information
ryscheng committed Apr 26, 2023
1 parent 84a1ae4 commit 2aa2410
Show file tree
Hide file tree
Showing 6 changed files with 2,882 additions and 205 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci-default.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ jobs:
- name: Set up Node.js 18
uses: actions/setup-node@v3
with:
node-version: "18.x"
node-version: "18.15.0"
cache: "yarn"
- name: Install Foundry
uses: foundry-rs/foundry-toolchain@v1
Expand Down
2 changes: 1 addition & 1 deletion contracts/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ Deployment of the contract to EVM compatible net is managed by
management and safety checks.

```sh
yarn build:hardhat
yarn build:deploy
yarn hardhat deploy --network goerli
```

Expand Down
10 changes: 6 additions & 4 deletions contracts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"@primitivefi/hardhat-dodoc": "^0.2.3",
"@rollup/plugin-commonjs": "^24.1.0",
"@rollup/plugin-json": "^6.0.0",
"@rollup/plugin-typescript": "^11.1.0",
"@rollup/plugin-node-resolve": "^15.0.2",
"@trivago/prettier-plugin-sort-imports": "^3.3.0",
"@typechain/ethers-v5": "^10.2.0",
"@typechain/hardhat": "^6.1.5",
Expand All @@ -66,8 +66,10 @@
"prettier-plugin-solidity": "^1.0.0-beta.24",
"rimraf": "^3.0.2",
"rollup": "^3.20.7",
"rollup-plugin-auto-external": "^2.0.0",
"rollup-plugin-delete": "^2.0.0",
"rollup-plugin-dts": "^5.3.0",
"rollup-plugin-node-polyfills": "^0.2.1",
"rollup-plugin-typescript2": "^0.34.1",
"shx": "^0.3.4",
"solhint": "^3.3.7",
Expand All @@ -88,14 +90,14 @@
"template"
],
"scripts": {
"build": "rollup -c",
"build": "yarn build:deploy",
"build:deploy": "yarn build:hardhat && rollup -c",
"build:forge": "forge build",
"build:hardhat": "hardhat compile",
"clean": "rimraf cache out abi dist cache_hardhat artifacts",
"docs": "hardhat dodoc",
"lint": "yarn lint:sol && yarn prettier:check",
"lint:disabled": "yarn lint:sol && yarn prettier:check",
"lint:sol": "solhint \"{src,test}/**/*.sol\"",
"prebuild": "yarn clean && yarn build:hardhat",
"prettier": "prettier --config \"./.prettierrc.yml\" --write \"**/*.{json,md,sol,yml}\"",
"prettier:check": "prettier --config \"./.prettierrc.yml\" --check \"**/*.{json,md,sol,yml}\"",
"slither": "slither ./src",
Expand Down
2 changes: 1 addition & 1 deletion frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"@emotion/react": "^11.10.5",
"@emotion/styled": "^11.10.5",
"@graphprotocol/client-cli": "^2.2.16",
"@hypercerts-org/hypercerts-protocol": "0.0.10",
"@hypercerts-org/hypercerts-protocol": "*",
"@hypercerts-org/hypercerts-sdk": "*",
"@mui/icons-material": "^5.11.9",
"@mui/material": "^5.11.2",
Expand Down
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
"private": true,
"workspaces": {
"packages": [
"contracts",
"cors-proxy",
"defender",
"docs",
Expand Down

0 comments on commit 2aa2410

Please sign in to comment.