From 0dda621ea7884cfa2a4cbaf382f14e86ddfdcb67 Mon Sep 17 00:00:00 2001 From: cedoor Date: Thu, 8 Aug 2024 12:25:10 +0200 Subject: [PATCH] chore: include contracts in scripts --- package.json | 10 +-- packages/contracts/contracts/README.md | 2 +- packages/contracts/contracts/package.json | 2 +- packages/contracts/package.json | 4 +- yarn.lock | 86 +++++++++++------------ 5 files changed, 52 insertions(+), 52 deletions(-) diff --git a/package.json b/package.json index d4f537d..0484296 100644 --- a/package.json +++ b/package.json @@ -3,16 +3,16 @@ "private": true, "packageManager": "yarn@4.1.1", "scripts": { - "build": "yarn build:libraries", + "build": "yarn build:libraries && yarn compile:libraries", "build:libraries": "yarn workspaces foreach -A --no-private run build", - "compile:contracts": "yarn workspace extension-contracts compile", - "test": "yarn test:libraries && yarn test:circuits", + "compile:contracts": "yarn workspace contract-extensions compile", + "test": "yarn test:libraries && yarn test:contracts && yarn test:circuits", "test:libraries": "jest --coverage", "test:library": "jest packages/${0}", "test:circuits": "yarn workspace @semaphore-extensions/identity-proof.circom test", - "test:contracts": "yarn workspace extension-contracts test:coverage", + "test:contracts": "yarn workspace contract-extensions test:coverage", "lint:eslint": "eslint . --ext .js,.ts,.tsx", - "lint": "yarn lint:eslint && yarn workspace extension-contracts lint", + "lint": "yarn lint:eslint && yarn workspace contract-extensions lint", "lint:fix": "yarn lint:eslint --fix", "format:prettier": "prettier -c .", "format:prettier:write": "prettier -w .", diff --git a/packages/contracts/contracts/README.md b/packages/contracts/contracts/README.md index e39bf7b..aacda92 100644 --- a/packages/contracts/contracts/README.md +++ b/packages/contracts/contracts/README.md @@ -2,7 +2,7 @@

Semaphore Extension Contracts

-

Solidity contracts to enhance Semaphore with extra features and customization

+

Solidity contracts to enhance Semaphore with extra features and customization.

diff --git a/packages/contracts/contracts/package.json b/packages/contracts/contracts/package.json index 0fce6a0..04f6c64 100644 --- a/packages/contracts/contracts/package.json +++ b/packages/contracts/contracts/package.json @@ -1,7 +1,7 @@ { "name": "@semaphore-extensions/contracts", "version": "0.1.0", - "description": "Solidity contracts to enhance Semaphore with extra features and customization", + "description": "Solidity contracts to enhance Semaphore with extra features and customization.", "license": "MIT", "files": [ "**/*.sol", diff --git a/packages/contracts/package.json b/packages/contracts/package.json index ff04d57..e8df6e6 100644 --- a/packages/contracts/package.json +++ b/packages/contracts/package.json @@ -1,6 +1,6 @@ { - "name": "extension-contracts", - "description": "Solidity contracts to enhance Semaphore with extra features and customization", + "name": "contract-extensions", + "description": "Solidity contracts to enhance Semaphore with extra features and customization.", "publishConfig": { "access": "public" }, diff --git a/yarn.lock b/yarn.lock index 0a7f80a..9628614 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6987,6 +6987,49 @@ __metadata: languageName: node linkType: hard +"contract-extensions@workspace:packages/contracts": + version: 0.0.0-use.local + resolution: "contract-extensions@workspace:packages/contracts" + dependencies: + "@nomicfoundation/hardhat-chai-matchers": "npm:^2.0.0" + "@nomicfoundation/hardhat-ethers": "npm:^3.0.0" + "@nomicfoundation/hardhat-network-helpers": "npm:^1.0.0" + "@nomicfoundation/hardhat-toolbox": "npm:^4.0.0" + "@nomicfoundation/hardhat-verify": "npm:^2.0.0" + "@semaphore-protocol/contracts": "npm:4.0.1" + "@semaphore-protocol/core": "npm:4.0.0-beta.16" + "@semaphore-protocol/hardhat": "npm:4.0.0-beta.16" + "@semaphore-protocol/utils": "npm:4.0.0-beta.16" + "@typechain/ethers-v6": "npm:^0.5.0" + "@typechain/hardhat": "npm:^9.0.0" + "@types/chai": "npm:^4.2.0" + "@types/circomlibjs": "npm:^0" + "@types/eslint": "npm:^8" + "@types/mocha": "npm:>=9.1.0" + "@types/node": "npm:^20.11.20" + "@typescript-eslint/eslint-plugin": "npm:^7.0.2" + "@typescript-eslint/parser": "npm:^7.0.2" + chai: "npm:^4.2.0" + dotenv: "npm:^16.4.5" + eslint: "npm:^8.57.0" + eslint-config-airbnb-base: "npm:^15.0.0" + eslint-config-airbnb-typescript: "npm:^17.1.0" + eslint-config-prettier: "npm:^9.1.0" + eslint-plugin-import: "npm:^2.29.1" + ethers: "npm:^6.4.0" + hardhat: "npm:^2.20.1" + hardhat-gas-reporter: "npm:^1.0.8" + prettier: "npm:^3.2.5" + prettier-plugin-solidity: "npm:^1.3.1" + solhint: "npm:^4.1.1" + solhint-plugin-prettier: "npm:^0.1.0" + solidity-coverage: "npm:^0.8.1" + ts-node: "npm:^10.9.2" + typechain: "npm:^8.3.0" + typescript: "npm:^5.3.3" + languageName: unknown + linkType: soft + "conventional-changelog-angular@npm:^7.0.0": version: 7.0.0 resolution: "conventional-changelog-angular@npm:7.0.0" @@ -8685,49 +8728,6 @@ __metadata: languageName: node linkType: hard -"extension-contracts@workspace:packages/contracts": - version: 0.0.0-use.local - resolution: "extension-contracts@workspace:packages/contracts" - dependencies: - "@nomicfoundation/hardhat-chai-matchers": "npm:^2.0.0" - "@nomicfoundation/hardhat-ethers": "npm:^3.0.0" - "@nomicfoundation/hardhat-network-helpers": "npm:^1.0.0" - "@nomicfoundation/hardhat-toolbox": "npm:^4.0.0" - "@nomicfoundation/hardhat-verify": "npm:^2.0.0" - "@semaphore-protocol/contracts": "npm:4.0.0-beta.16" - "@semaphore-protocol/core": "npm:4.0.0-beta.16" - "@semaphore-protocol/hardhat": "npm:4.0.0-beta.16" - "@semaphore-protocol/utils": "npm:4.0.0-beta.16" - "@typechain/ethers-v6": "npm:^0.5.0" - "@typechain/hardhat": "npm:^9.0.0" - "@types/chai": "npm:^4.2.0" - "@types/circomlibjs": "npm:^0" - "@types/eslint": "npm:^8" - "@types/mocha": "npm:>=9.1.0" - "@types/node": "npm:^20.11.20" - "@typescript-eslint/eslint-plugin": "npm:^7.0.2" - "@typescript-eslint/parser": "npm:^7.0.2" - chai: "npm:^4.2.0" - dotenv: "npm:^16.4.5" - eslint: "npm:^8.57.0" - eslint-config-airbnb-base: "npm:^15.0.0" - eslint-config-airbnb-typescript: "npm:^17.1.0" - eslint-config-prettier: "npm:^9.1.0" - eslint-plugin-import: "npm:^2.29.1" - ethers: "npm:^6.4.0" - hardhat: "npm:^2.20.1" - hardhat-gas-reporter: "npm:^1.0.8" - prettier: "npm:^3.2.5" - prettier-plugin-solidity: "npm:^1.3.1" - solhint: "npm:^4.1.1" - solhint-plugin-prettier: "npm:^0.1.0" - solidity-coverage: "npm:^0.8.1" - ts-node: "npm:^10.9.2" - typechain: "npm:^8.3.0" - typescript: "npm:^5.3.3" - languageName: unknown - linkType: soft - "fast-deep-equal@npm:^3.1.1, fast-deep-equal@npm:^3.1.3": version: 3.1.3 resolution: "fast-deep-equal@npm:3.1.3"