From 00d9e46e8ea502fa2e9d68d938d26674ea44b621 Mon Sep 17 00:00:00 2001 From: Saleel Date: Fri, 24 Mar 2023 10:24:09 +0530 Subject: [PATCH] chore: rename to bandada in packages --- CONTRIBUTING.md | 2 +- README.md | 56 +++--- apps/api/package.json | 2 +- .../api/src/app/groups/groups.service.test.ts | 2 +- apps/api/src/app/groups/groups.service.ts | 2 +- .../src/app/invites/invites.service.test.ts | 2 +- apps/api/zk-groups.db | Bin 0 -> 53248 bytes apps/client/package.json | 2 +- apps/client/src/components/navbar.tsx | 2 +- .../client/src/hooks/usePermissionedGroups.ts | 2 +- apps/contracts/contracts/README.md | 32 ++-- apps/contracts/contracts/package.json | 11 +- apps/dashboard/package.json | 2 +- apps/dashboard/src/api/bandadaAPI.ts | 2 +- .../src/components/add-member-modal.tsx | 2 +- .../src/components/create-group-modal.tsx | 2 +- apps/dashboard/src/components/navbar.tsx | 2 +- docker-compose.dev.yml | 10 +- docker-compose.yml | 18 +- jest.config.ts | 4 +- libs/hardhat/README.md | 30 +-- libs/hardhat/package.json | 10 +- libs/hardhat/src/index.ts | 4 +- .../src/tasks/deploy-bandada-semaphore.ts | 4 +- libs/hardhat/src/tasks/deploy-bandada.ts | 2 +- libs/utils/README.md | 26 +-- libs/utils/package.json | 8 +- package.json | 8 +- tsconfig.json | 2 +- yarn.lock | 176 +++++++++--------- 30 files changed, 213 insertions(+), 214 deletions(-) create mode 100644 apps/api/zk-groups.db diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 57b1802..673cf63 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -10,7 +10,7 @@ We're really glad you're reading this, because we need volunteer developers to h ## Issues -The best way to contribute to our projects is by opening a [new issue](https://github.com/semaphore-protocol/zk-groups/issues/new/choose) or tackling one of the issues listed [here](https://github.com/semaphore-protocol/zk-groups/contribute). +The best way to contribute to our projects is by opening a [new issue](https://github.com/privacy-scaling-explorations/bandada/issues/new/choose) or tackling one of the issues listed [here](https://github.com/privacy-scaling-explorations/bandada/contribute). ## Pull Requests diff --git a/README.md b/README.md index a287cd5..100d6a0 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@

- ZK-Groups + Bandada

@@ -8,17 +8,17 @@ - - Github license + + Github license - - GitHub Workflow test + + GitHub Workflow test - - GitHub Workflow style + + GitHub Workflow style - - Coveralls + + Coveralls Linter eslint @@ -39,7 +39,7 @@ 🤝 Code of conduct   |   - + 🔎 Issues   |   @@ -64,57 +64,57 @@ - @zk-groups/hardhat + @bandada/hardhat - - NPM version + + NPM version - - Downloads + + Downloads - @zk-groups/contracts + @bandada/contracts - - NPM version + + NPM version - - Downloads + + Downloads - @zk-groups/utils + @bandada/utils - - NPM version + + NPM version - - Downloads + + Downloads @@ -126,13 +126,13 @@ Clone this repository: ```bash -git clone https://github.com/privacy-scaling-explorations/zk-groups.git +git clone https://github.com/privacy-scaling-explorations/bandada.git ``` and install the dependencies: ```bash -cd zk-groups && yarn +cd bandada && yarn ``` ## 📜 Usage @@ -207,7 +207,7 @@ yarn test ### Running in Docker -You can also run the entire `zk-groups` using docker by running below command in the project root: +You can also run the entire `bandada` using docker by running below command in the project root: ```sh docker-compose up -d diff --git a/apps/api/package.json b/apps/api/package.json index 1f3dd59..cdd73f4 100644 --- a/apps/api/package.json +++ b/apps/api/package.json @@ -8,6 +8,7 @@ "build": "nest build" }, "dependencies": { + "@bandada/utils": "0.4.0", "@ethersproject/hash": "^5.7.0", "@nestjs/common": "^9.0.0", "@nestjs/core": "^9.0.0", @@ -18,7 +19,6 @@ "@nestjs/schedule": "^2.2.0", "@nestjs/typeorm": "^9.0.1", "@semaphore-protocol/group": "3.4.0", - "@zk-groups/utils": "0.4.0", "class-transformer": "^0.5.1", "class-validator": "^0.14.0", "cookie-parser": "^1.4.6", diff --git a/apps/api/src/app/groups/groups.service.test.ts b/apps/api/src/app/groups/groups.service.test.ts index 971660c..cf13dc3 100644 --- a/apps/api/src/app/groups/groups.service.test.ts +++ b/apps/api/src/app/groups/groups.service.test.ts @@ -7,7 +7,7 @@ import { Group } from "./entities/group.entity" import { Member } from "./entities/member.entity" import { GroupsService } from "./groups.service" -jest.mock("@zk-groups/utils", () => ({ +jest.mock("@zbandada/utils", () => ({ __esModule: true, getBandadaContract: () => ({ updateGroups: jest.fn(() => ({ diff --git a/apps/api/src/app/groups/groups.service.ts b/apps/api/src/app/groups/groups.service.ts index 048962b..1f9e6a7 100644 --- a/apps/api/src/app/groups/groups.service.ts +++ b/apps/api/src/app/groups/groups.service.ts @@ -14,7 +14,7 @@ import { getBandadaContract, Network, BandadaContract -} from "@zk-groups/utils" +} from "@bandada/utils" import { Repository } from "typeorm" import { InvitesService } from "../invites/invites.service" import { AddMemberDto } from "./dto/add-member.dto" diff --git a/apps/api/src/app/invites/invites.service.test.ts b/apps/api/src/app/invites/invites.service.test.ts index 89d161d..c30a2b2 100644 --- a/apps/api/src/app/invites/invites.service.test.ts +++ b/apps/api/src/app/invites/invites.service.test.ts @@ -7,7 +7,7 @@ import { GroupsService } from "../groups/groups.service" import { Invite } from "./entities/invite.entity" import { InvitesService } from "./invites.service" -jest.mock("@zk-groups/utils", () => ({ +jest.mock("@bandada/utils", () => ({ __esModule: true, getBandadaContract: () => ({ updateGroups: jest.fn(() => ({ diff --git a/apps/api/zk-groups.db b/apps/api/zk-groups.db new file mode 100644 index 0000000000000000000000000000000000000000..05cbec3ce9ae30afc41cf75b68da57e3d6bc650d GIT binary patch literal 53248 zcmeI*+i%lW90zc_fu`w&P8w1aRh3Kt(FjUyA79ZXmbEU*Xp=TgG|DtZj(yTb%caCl zDGz&S#r}sqpuOx5VE+Ms!2Sg!9`~}xY0o>hlPrOjn>HcB*Yd4C@v+ax=XYEujKqFA(lCj_0|r1cBqY7#rr;Fv*4qHq5i(92@!_-=BHSG{)U@xVgj=ZaRLI zyYTCU?YZA)ex7|cvpCgA{1(4D{Y&BrOGF0&2tWV=5cn_xi6=ZwuB`BnJvR4UI9KuQ zYJ>W;dC)#tn~NtG7Wl`}vU=-~oin}OK_c64Je;X<;c{chf?><b6n%d^!st$azy7uZnV*tj92owiHU!lB)9_U+DaLWjDPHYv-m z+HN7aJBc z$QOj{YAMGSu)e&t7Pt(SWlol7B1S2sZPI3ycD&wXc9gNVw9nW#8D<=Y>rmULZq`o= zE}QY|O?rw@KWXV&tNrj==B>S`ZZah{qHjC0=kB%PTxrZ@F}G zF8DW$q zWyNr-lH(dguG+R?+p=2i)!dohfhgy5+ht40<=3oxLi+Wqri0@>T=m16oDq({NQ6iH zq!1qQ(ZHD=J>sVY&W{)3$#>lSey;z;?mwDhn@{n_ivvAPHC;(D2$3|KRRhDWxx_X_ zP0_;0^Acy`oxNs+7p*^tsgo;{@nkB+KfWBwMXAv^KI%5I;&9xLv^hh;(z2VUw=ypE zoKF3~ueV!+24oOMtZ}j3X8rUOzeDL7J@EJcZSaOR=)7-q`u5(d84kC2nd|Y%ia5s;W(FM`De?VVaKZIPGrB_s*SJVb5MSs<8bWf-2kfXeX>z8DVQ;GI{+vzZ(+w z8YquG=+c%$U-~mPQjuRuTnh5L!Pd;2+~?!T#YO(7c$jB@yZ!0JNG|FA;{KWAold~4 z7>9L-MTbw1{Nbt}6maOYI-JBdNIkFA{(+tz8y#BfP;YV~LlL?Wsv z5;oFJq8gf}5S_h?s1Sw7d;9H*oGn|L-u?D|QLjIGsEYTus*j|-&2QH3tSW_V#jPDU zN1olFw6PP8_kI7syS1_sy({3|jCLz{Q^9Go&m3C*O{d*l>8?mb(KN}_Zy$cC$f8V^ zMY1d_f=F(u`YlNguKy?I|KR5TVk2}AfB*y_009U<00Izz00bZa0SJ7|0y7h_#YF$s zh-p5yFx9)=YMPabpZ}X00bZa0SG_<0uX=z1Rwx` zF%yWM|M!%ee>!FbLvbJg0SG_<0uX=z1Rwwb2tWV=AFn`xpW6KVQi>;2hNcr!Hbs>X zU1mS#LsUuCMME*A@YhL*?YXQMY)|lPH@esV;w#VpQ^e@||IfMk=N~T$_8bBbfB*y_ z009U<00Izz00bcLDGOYVZ6@CIHUX~xKjj*NvO@p@5P$##AOHafKmY;|fWSBiyzTWr zp8q!vM;m2;00bZa0SG_<0uX=z1Rwwb2%IetKJX9E|34cDDG-1F1Rwwb2tWV=5P$## zAOL|e5Ww&Mjln@g5g-5o2tWV=5P$##AOHafKmY=75WwgEZva9v1Rwwb2tWV=5P$## NAOHafKwu06{sGpIH1q%f literal 0 HcmV?d00001 diff --git a/apps/client/package.json b/apps/client/package.json index 0b76067..c82f332 100644 --- a/apps/client/package.json +++ b/apps/client/package.json @@ -8,13 +8,13 @@ "preview": "vite preview" }, "dependencies": { + "@bandada/utils": "0.4.0", "@chakra-ui/react": "^2.5.1", "@emotion/react": "^11.10.6", "@emotion/styled": "^11.10.6", "@semaphore-protocol/identity": "3.4.0", "@web3-react/core": "^6.1.9", "@web3-react/injected-connector": "^6.0.7", - "@zk-groups/utils": "0.4.0", "ethers": "^5.4.7", "framer-motion": "^10.0.1", "react": "^18.2.0", diff --git a/apps/client/src/components/navbar.tsx b/apps/client/src/components/navbar.tsx index 54bea5e..a62ba10 100644 --- a/apps/client/src/components/navbar.tsx +++ b/apps/client/src/components/navbar.tsx @@ -11,7 +11,7 @@ import { } from "@chakra-ui/react" import { useWeb3React } from "@web3-react/core" import { InjectedConnector } from "@web3-react/injected-connector" -import { shortenAddress } from "@zk-groups/utils" +import { shortenAddress } from "@bandada/utils" import { providers } from "ethers" import { useEffect } from "react" import { Link } from "react-router-dom" diff --git a/apps/client/src/hooks/usePermissionedGroups.ts b/apps/client/src/hooks/usePermissionedGroups.ts index b089395..e3eede2 100644 --- a/apps/client/src/hooks/usePermissionedGroups.ts +++ b/apps/client/src/hooks/usePermissionedGroups.ts @@ -1,5 +1,5 @@ import { Identity } from "@semaphore-protocol/identity" -import { request } from "@zk-groups/utils" +import { request } from "@bandada/utils" import { Signer } from "ethers" import { useCallback, useState } from "react" import { Invite } from "../types/invite" diff --git a/apps/contracts/contracts/README.md b/apps/contracts/contracts/README.md index e53122f..b48beb5 100644 --- a/apps/contracts/contracts/README.md +++ b/apps/contracts/contracts/README.md @@ -1,36 +1,36 @@

- ZK-Groups contracts + Bandada contracts

-

Zk-groups smart contracts to manage off-chain groups and verify their zero-knowledge proofs.

+

Bandada smart contracts to manage off-chain groups and verify their zero-knowledge proofs.

- + - - Github license + + Github license - - NPM version + + NPM version - - Downloads + + Downloads

- + 👥 Contributing   |   - + 🤝 Code of conduct   |   - + 🔎 Issues   |   @@ -46,16 +46,16 @@ ### npm or yarn -Install the `@zk-groups/contracts` package with npm: +Install the `@bandada/contracts` package with npm: ```bash -npm i @zk-groups/contracts +npm i @bandada/contracts ``` or yarn: ```bash -yarn add @zk-groups/contracts +yarn add @bandada/contracts ``` ## 📜 Usage @@ -90,7 +90,7 @@ yarn test:report-gas ### Deploy contracts -Deploy a zk-groups contract: +Deploy a bandada contract: ```bash yarn deploy:bandada diff --git a/apps/contracts/contracts/package.json b/apps/contracts/contracts/package.json index cbb7e01..a19d458 100644 --- a/apps/contracts/contracts/package.json +++ b/apps/contracts/contracts/package.json @@ -1,7 +1,7 @@ { - "name": "@zk-groups/contracts", + "name": "@bandada/contracts", "version": "0.4.0", - "description": "Zk-groups smart contracts to manage off-chain groups and verify their zero-knowledge proofs.", + "description": "Bandada smart contracts to manage off-chain groups and verify their zero-knowledge proofs.", "license": "MIT", "files": [ "**/*.sol", @@ -14,17 +14,16 @@ "ethereum", "hardhat", "smart-contracts", - "zk-groups", "solidity", "zero-knowledge", "zk-snarks", "zero-knowledge-proofs", "proof-of-membership" ], - "repository": "https://github.com/privacy-scaling-explorations/zk-groups", - "homepage": "https://github.com/privacy-scaling-explorations/zk-groups/tree/main/packages/contracts", + "repository": "https://github.com/privacy-scaling-explorations/bandada", + "homepage": "https://github.com/privacy-scaling-explorations/bandada/tree/main/packages/contracts", "bugs": { - "url": "https://github.com/privacy-scaling-explorations/zk-groups.git/issues" + "url": "https://github.com/privacy-scaling-explorations/bandada.git/issues" }, "publishConfig": { "access": "public" diff --git a/apps/dashboard/package.json b/apps/dashboard/package.json index 6465cb9..43c8598 100644 --- a/apps/dashboard/package.json +++ b/apps/dashboard/package.json @@ -8,6 +8,7 @@ "preview": "vite preview" }, "dependencies": { + "@bandada/utils": "0.4.0", "@chakra-ui/react": "^2.5.1", "@chakra-ui/theme-tools": "^2.0.16", "@emotion/react": "^11.10.6", @@ -17,7 +18,6 @@ "@semaphore-protocol/data": "3.4.0", "@web3-react/core": "^6.1.9", "@web3-react/injected-connector": "^6.0.7", - "@zk-groups/utils": "0.4.0", "ethers": "^5.4.7", "framer-motion": "^10.0.1", "react": "^18.2.0", diff --git a/apps/dashboard/src/api/bandadaAPI.ts b/apps/dashboard/src/api/bandadaAPI.ts index 2857499..9c7858e 100644 --- a/apps/dashboard/src/api/bandadaAPI.ts +++ b/apps/dashboard/src/api/bandadaAPI.ts @@ -1,4 +1,4 @@ -import { request } from "@zk-groups/utils" +import { request } from "@bandada/utils" import { Group } from "../types/groups" const API_URL = import.meta.env.VITE_API_URL diff --git a/apps/dashboard/src/components/add-member-modal.tsx b/apps/dashboard/src/components/add-member-modal.tsx index b36a059..9640858 100644 --- a/apps/dashboard/src/components/add-member-modal.tsx +++ b/apps/dashboard/src/components/add-member-modal.tsx @@ -15,7 +15,7 @@ import { Text, UseDisclosureProps } from "@chakra-ui/react" -import { getSemaphoreContract } from "@zk-groups/utils" +import { getSemaphoreContract } from "@bandada/utils" import { useCallback, useState } from "react" import { useSigner } from "wagmi" diff --git a/apps/dashboard/src/components/create-group-modal.tsx b/apps/dashboard/src/components/create-group-modal.tsx index 31f61af..f67c887 100644 --- a/apps/dashboard/src/components/create-group-modal.tsx +++ b/apps/dashboard/src/components/create-group-modal.tsx @@ -16,7 +16,7 @@ import { Spinner, Text } from "@chakra-ui/react" -import { getSemaphoreContract } from "@zk-groups/utils" +import { getSemaphoreContract } from "@bandada/utils" import { useCallback, useEffect, useState } from "react" import { useSearchParams } from "react-router-dom" import { useSigner } from "wagmi" diff --git a/apps/dashboard/src/components/navbar.tsx b/apps/dashboard/src/components/navbar.tsx index ed9a255..a1d287e 100644 --- a/apps/dashboard/src/components/navbar.tsx +++ b/apps/dashboard/src/components/navbar.tsx @@ -10,7 +10,7 @@ import { Tooltip, useClipboard } from "@chakra-ui/react" -import { shortenAddress } from "@zk-groups/utils" +import { shortenAddress } from "@bandada/utils" import { useCallback } from "react" import { useLocation, useNavigate } from "react-router-dom" import { useAccount, useDisconnect } from "wagmi" diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index 86d493e..9958739 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -17,7 +17,7 @@ services: "npm install ganache && npx ganache --database.dbPath /ganache/data -h 0.0.0.0 -i 1337 -l 8000000 --account 0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80,100000000000000000000 -p 8545" ] networks: - - zk-groups-dev + - bandada-dev graph-node: image: graphprotocol/graph-node @@ -42,7 +42,7 @@ services: GRAPH_LOG: info GRAPH_ALLOW_NON_DETERMINISTIC_IPFS: 1 networks: - - zk-groups-dev + - bandada-dev ipfs: image: ipfs/go-ipfs:v0.4.23 @@ -51,7 +51,7 @@ services: volumes: - ./.data/ipfs:/data/ipfs networks: - - zk-groups-dev + - bandada-dev postgres: image: postgres @@ -63,11 +63,11 @@ services: POSTGRES_PASSWORD: let-me-in POSTGRES_DB: graph-node networks: - - zk-groups-dev + - bandada-dev volumes: - ./.data/postgres:/var/lib/postgresql/data networks: - zk-groups-dev: + bandada-dev: internal: false driver: bridge diff --git a/docker-compose.yml b/docker-compose.yml index 4b052a5..e0fbc87 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -6,28 +6,28 @@ services: build: context: ./ dockerfile: ./apps/api/Dockerfile - image: zk-groups-api:latest + image: bandada-api:latest restart: unless-stopped env_file: - apps/api/.env ports: - "3000:3000" networks: - - zk-groups + - bandada client: container_name: client build: context: ./ dockerfile: ./apps/client/Dockerfile - image: zk-groups-client:latest + image: bandada-client:latest restart: unless-stopped environment: - NODE_ENV=production ports: - "3002:80" networks: - - zk-groups + - bandada depends_on: - api @@ -36,14 +36,14 @@ services: build: context: ./ dockerfile: ./apps/dashboard/Dockerfile - image: zk-groups-dashboard:latest + image: bandada-dashboard:latest restart: unless-stopped environment: - NODE_ENV=production ports: - "3001:80" networks: - - zk-groups + - bandada depends_on: - api @@ -53,7 +53,7 @@ services: # environment: # POSTGRES_USER: root # POSTGRES_PASSWORD: helloworld -# POSTGRES_DB: zk-groups +# POSTGRES_DB: bandada # PGDATA: /data/postgres # volumes: # - postgres:/data/postgres @@ -63,10 +63,10 @@ services: # restart: unless-stopped # command: postgres -c listen_addresses='*' # networks: -# - zk-groups +# - bandada networks: - zk-groups: + bandada: internal: false driver: bridge diff --git a/jest.config.ts b/jest.config.ts index b151cf4..b7aaeca 100644 --- a/jest.config.ts +++ b/jest.config.ts @@ -9,7 +9,7 @@ const libs: any = fs rootDir: `libs/${name}/src`, testRegex: ".*\\.test\\.ts$", moduleNameMapper: { - "@zk-groups/(.*)": "/../$1/src/index.ts" + "@bandada/(.*)": "/../$1/src/index.ts" }, moduleFileExtensions: ["js", "ts", "json"], transform: { @@ -25,7 +25,7 @@ export default async (): Promise => ({ rootDir: "apps/api/src", testRegex: ".*\\.test\\.ts$", moduleNameMapper: { - "@zk-groups/(.*)": "/../../../libs/$1/src/index.ts" + "@bandada/(.*)": "/../../../libs/$1/src/index.ts" }, moduleFileExtensions: ["js", "ts", "json"], transform: { diff --git a/libs/hardhat/README.md b/libs/hardhat/README.md index be7e082..46ff9ba 100644 --- a/libs/hardhat/README.md +++ b/libs/hardhat/README.md @@ -6,17 +6,17 @@

- + - - Github license + + Github license - - NPM version + + NPM version - - Downloads + + Downloads Linter eslint @@ -28,15 +28,15 @@

- + 👥 Contributing   |   - + 🤝 Code of conduct   |   - + 🔎 Issues   |   @@ -53,16 +53,16 @@ ### npm or yarn -Install the `@zk-groups/hardhat` package with npm: +Install the `@bandada/hardhat` package with npm: ```bash -npm i @zk-groups/hardhat +npm i @bandada/hardhat ``` or yarn: ```bash -yarn add @zk-groups/hardhat +yarn add @bandada/hardhat ``` ## 📜 Usage @@ -70,7 +70,7 @@ yarn add @zk-groups/hardhat Import the plugin in your `hardhat.config.ts` file: ```typescript -import "@zk-groups/hardhat" +import "@bandada/hardhat" import "./tasks/deploy" const hardhatConfig: HardhatUserConfig = { @@ -88,7 +88,7 @@ import { task, types } from "hardhat/config" task("deploy", "Deploy a Greeter contract") .addOptionalParam("logs", "Print the logs", true, types.boolean) .setAction(async ({ logs }, { ethers, run }) => { - const { bandada } = await run("deploy:zk-groups", { + const { bandada } = await run("deploy:bandada", { logs }) diff --git a/libs/hardhat/package.json b/libs/hardhat/package.json index 1c72f5d..8eb2458 100644 --- a/libs/hardhat/package.json +++ b/libs/hardhat/package.json @@ -1,5 +1,5 @@ { - "name": "@zk-groups/hardhat", + "name": "@bandada/hardhat", "version": "0.4.0", "description": "A Hardhat plugin which provides tasks to deploy Bandada contracts.", "license": "MIT", @@ -15,10 +15,10 @@ "LICENSE", "README.md" ], - "repository": "https://github.com/privacy-scaling-explorations/zk-groups", - "homepage": "https://github.com/privacy-scaling-explorations/zk-groups/tree/main/libs/hardhat", + "repository": "https://github.com/privacy-scaling-explorations/bandada", + "homepage": "https://github.com/privacy-scaling-explorations/bandada/tree/main/libs/hardhat", "bugs": { - "url": "https://github.com/privacy-scaling-explorations/zk-groups.git/issues" + "url": "https://github.com/privacy-scaling-explorations/bandada.git/issues" }, "scripts": { "build:watch": "rollup -c rollup.config.ts -w --configPlugin typescript", @@ -39,9 +39,9 @@ "typescript": "^4.9.5" }, "peerDependencies": { + "@bandada/contracts": "0.4.0", "@nomiclabs/hardhat-ethers": "^2.0.0", "@semaphore-protocol/contracts": "3.4.0", - "@zk-groups/contracts": "0.4.0", "ethers": "^5.4.7", "hardhat": "^2.11.0" }, diff --git a/libs/hardhat/src/index.ts b/libs/hardhat/src/index.ts index 32979a2..d28cfd8 100644 --- a/libs/hardhat/src/index.ts +++ b/libs/hardhat/src/index.ts @@ -9,8 +9,8 @@ import "./tasks/deploy-bandada-semaphore" extendConfig( (config: HardhatConfig, userConfig: Readonly) => { config.dependencyCompiler.paths = [ - "@zk-groups/contracts/Bandada.sol", - "@zk-groups/contracts/protocols/BandadaSemaphore.sol", + "@bandada/contracts/Bandada.sol", + "@bandada/contracts/protocols/BandadaSemaphore.sol", "@semaphore-protocol/contracts/base/Pairing.sol", "@semaphore-protocol/contracts/base/SemaphoreVerifier.sol" ] diff --git a/libs/hardhat/src/tasks/deploy-bandada-semaphore.ts b/libs/hardhat/src/tasks/deploy-bandada-semaphore.ts index 6dfb919..a36f00a 100644 --- a/libs/hardhat/src/tasks/deploy-bandada-semaphore.ts +++ b/libs/hardhat/src/tasks/deploy-bandada-semaphore.ts @@ -1,6 +1,6 @@ import { task, types } from "hardhat/config" -task("deploy:zk-groups-semaphore", "Deploy a BandadaSemaphore contract") +task("deploy:bandada-semaphore", "Deploy BandadaSemaphore contract") .addOptionalParam( "pairing", "Pairing library address", @@ -70,7 +70,7 @@ task("deploy:zk-groups-semaphore", "Deploy a BandadaSemaphore contract") } if (!bandadaAddress) { - const bandada = await run("deploy:zk-groups", { logs }) + const bandada = await run("deploy:bandada", { logs }) bandadaAddress = bandada.address } diff --git a/libs/hardhat/src/tasks/deploy-bandada.ts b/libs/hardhat/src/tasks/deploy-bandada.ts index 73b37c6..aa5923c 100644 --- a/libs/hardhat/src/tasks/deploy-bandada.ts +++ b/libs/hardhat/src/tasks/deploy-bandada.ts @@ -1,6 +1,6 @@ import { task, types } from "hardhat/config" -task("deploy:zk-groups", "Deploy a Bandada contract") +task("deploy:bandada", "Deploy a Bandada contract") .addOptionalParam("logs", "Print the logs", true, types.boolean) .setAction(async ({ logs }, { ethers }): Promise => { const BandadaFactory = await ethers.getContractFactory("Bandada") diff --git a/libs/utils/README.md b/libs/utils/README.md index a895f77..7415775 100644 --- a/libs/utils/README.md +++ b/libs/utils/README.md @@ -6,17 +6,17 @@

- + - - Github license + + Github license - - NPM version + + NPM version - - Downloads + + Downloads Linter eslint @@ -28,15 +28,15 @@

- + 👥 Contributing   |   - + 🤝 Code of conduct   |   - + 🔎 Issues   |   @@ -53,14 +53,14 @@ ### npm or yarn -Install the `@zk-groups/utils` package with npm: +Install the `@bandada/utils` package with npm: ```bash -npm i @zk-groups/utils +npm i @bandada/utils ``` or yarn: ```bash -yarn add @zk-groups/utils +yarn add @bandada/utils ``` diff --git a/libs/utils/package.json b/libs/utils/package.json index bc1ded4..8bd9dc6 100644 --- a/libs/utils/package.json +++ b/libs/utils/package.json @@ -1,5 +1,5 @@ { - "name": "@zk-groups/utils", + "name": "@bandada/utils", "version": "0.4.0", "description": "General Bandada utility functions.", "license": "MIT", @@ -15,10 +15,10 @@ "LICENSE", "README.md" ], - "repository": "https://github.com/privacy-scaling-explorations/zk-groups", - "homepage": "https://github.com/privacy-scaling-explorations/zk-groups/tree/main/libs/utils", + "repository": "https://github.com/privacy-scaling-explorations/bandada", + "homepage": "https://github.com/privacy-scaling-explorations/bandada/tree/main/libs/utils", "bugs": { - "url": "https://github.com/privacy-scaling-explorations/zk-groups.git/issues" + "url": "https://github.com/privacy-scaling-explorations/bandada.git/issues" }, "scripts": { "build:watch": "rollup -c rollup.config.ts -w --configPlugin typescript", diff --git a/package.json b/package.json index 866ebbe..084fe55 100644 --- a/package.json +++ b/package.json @@ -1,10 +1,10 @@ { - "name": "zk-groups", + "name": "bandada", "description": "A system for managing privacy-preserving groups.", "license": "MIT", - "repository": "git@github.com:privacy-scaling-explorations/zk-groups.git", - "homepage": "https://github.com/privacy-scaling-explorations/zk-groups", - "bugs": "https://github.com/privacy-scaling-explorations/zk-groups/issues", + "repository": "git@github.com:privacy-scaling-explorations/bandada.git", + "homepage": "https://github.com/privacy-scaling-explorations/bandada", + "bugs": "https://github.com/privacy-scaling-explorations/bandada/issues", "private": true, "scripts": { "start": "yarn workspaces foreach -pi run start", diff --git a/tsconfig.json b/tsconfig.json index 275e62e..743a21a 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -17,7 +17,7 @@ "allowSyntheticDefaultImports": true, "declarationDir": "types", "paths": { - "@zk-groups/*": ["libs/*/src"] + "@bandada/*": ["libs/*/src"] } } } diff --git a/yarn.lock b/yarn.lock index e5db48d..2a41b68 100644 --- a/yarn.lock +++ b/yarn.lock @@ -815,6 +815,57 @@ __metadata: languageName: node linkType: hard +"@bandada/contracts@workspace:apps/contracts/contracts": + version: 0.0.0-use.local + resolution: "@bandada/contracts@workspace:apps/contracts/contracts" + dependencies: + "@openzeppelin/contracts": 4.7.3 + "@semaphore-protocol/contracts": 3.4.0 + languageName: unknown + linkType: soft + +"@bandada/hardhat@workspace:libs/hardhat": + version: 0.0.0-use.local + resolution: "@bandada/hardhat@workspace:libs/hardhat" + dependencies: + "@nomiclabs/hardhat-ethers": ^2.0.0 + "@rollup/plugin-typescript": ^11.0.0 + ethers: ^5.4.7 + hardhat: ^2.11.0 + hardhat-dependency-compiler: ^1.1.3 + rimraf: ^4.1.2 + rollup: ^3.17.2 + rollup-plugin-cleanup: ^3.2.1 + typescript: ^4.9.5 + peerDependencies: + "@bandada/contracts": 0.4.0 + "@nomiclabs/hardhat-ethers": ^2.0.0 + "@semaphore-protocol/contracts": 3.4.0 + ethers: ^5.4.7 + hardhat: ^2.11.0 + languageName: unknown + linkType: soft + +"@bandada/utils@0.4.0, @bandada/utils@workspace:libs/utils": + version: 0.0.0-use.local + resolution: "@bandada/utils@workspace:libs/utils" + dependencies: + "@ethersproject/abstract-signer": ^5.7.0 + "@ethersproject/address": ^5.7.0 + "@ethersproject/contracts": ^5.7.0 + "@ethersproject/providers": ^5.7.0 + "@ethersproject/strings": ^5.7.0 + "@ethersproject/wallet": ^5.7.0 + "@rollup/plugin-json": ^6.0.0 + "@rollup/plugin-typescript": ^11.0.0 + axios: ^1.3.3 + rimraf: ^4.1.2 + rollup: ^3.17.2 + rollup-plugin-cleanup: ^3.2.1 + typescript: ^4.9.5 + languageName: unknown + linkType: soft + "@bcoe/v8-coverage@npm:^0.2.3": version: 0.2.3 resolution: "@bcoe/v8-coverage@npm:0.2.3" @@ -6624,57 +6675,6 @@ __metadata: languageName: node linkType: hard -"@zk-groups/contracts@workspace:apps/contracts/contracts": - version: 0.0.0-use.local - resolution: "@zk-groups/contracts@workspace:apps/contracts/contracts" - dependencies: - "@openzeppelin/contracts": 4.7.3 - "@semaphore-protocol/contracts": 3.4.0 - languageName: unknown - linkType: soft - -"@zk-groups/hardhat@workspace:libs/hardhat": - version: 0.0.0-use.local - resolution: "@zk-groups/hardhat@workspace:libs/hardhat" - dependencies: - "@nomiclabs/hardhat-ethers": ^2.0.0 - "@rollup/plugin-typescript": ^11.0.0 - ethers: ^5.4.7 - hardhat: ^2.11.0 - hardhat-dependency-compiler: ^1.1.3 - rimraf: ^4.1.2 - rollup: ^3.17.2 - rollup-plugin-cleanup: ^3.2.1 - typescript: ^4.9.5 - peerDependencies: - "@nomiclabs/hardhat-ethers": ^2.0.0 - "@semaphore-protocol/contracts": 3.4.0 - "@zk-groups/contracts": 0.4.0 - ethers: ^5.4.7 - hardhat: ^2.11.0 - languageName: unknown - linkType: soft - -"@zk-groups/utils@0.4.0, @zk-groups/utils@workspace:libs/utils": - version: 0.0.0-use.local - resolution: "@zk-groups/utils@workspace:libs/utils" - dependencies: - "@ethersproject/abstract-signer": ^5.7.0 - "@ethersproject/address": ^5.7.0 - "@ethersproject/contracts": ^5.7.0 - "@ethersproject/providers": ^5.7.0 - "@ethersproject/strings": ^5.7.0 - "@ethersproject/wallet": ^5.7.0 - "@rollup/plugin-json": ^6.0.0 - "@rollup/plugin-typescript": ^11.0.0 - axios: ^1.3.3 - rimraf: ^4.1.2 - rollup: ^3.17.2 - rollup-plugin-cleanup: ^3.2.1 - typescript: ^4.9.5 - languageName: unknown - linkType: soft - "@zk-kit/incremental-merkle-tree.sol@npm:1.3.3": version: 1.3.3 resolution: "@zk-kit/incremental-merkle-tree.sol@npm:1.3.3" @@ -7085,6 +7085,7 @@ __metadata: version: 0.0.0-use.local resolution: "api@workspace:apps/api" dependencies: + "@bandada/utils": 0.4.0 "@ethersproject/hash": ^5.7.0 "@nestjs/cli": ^9.0.0 "@nestjs/common": ^9.0.0 @@ -7105,7 +7106,6 @@ __metadata: "@types/passport-github": ^1.1.7 "@types/passport-jwt": ^3.0.8 "@types/passport-twitter": ^1.0.37 - "@zk-groups/utils": 0.4.0 class-transformer: ^0.5.1 class-validator: ^0.14.0 cookie-parser: ^1.4.6 @@ -7644,6 +7644,38 @@ __metadata: languageName: node linkType: hard +"bandada@workspace:.": + version: 0.0.0-use.local + resolution: "bandada@workspace:." + dependencies: + "@commitlint/cli": ^17.0.0 + "@commitlint/config-conventional": ^17.4.3 + "@types/jest": 29.4.0 + "@types/node": 18.11.18 + "@typescript-eslint/eslint-plugin": ^5.13.0 + "@typescript-eslint/parser": ^5.0.0 + changelogithub: 0.12.7 + commitizen: ^4.2.4 + cz-conventional-changelog: ^3.3.0 + eslint: ^8.2.0 + eslint-config-airbnb: ^19.0.4 + eslint-config-airbnb-typescript: ^17.0.0 + eslint-config-prettier: ^8.6.0 + eslint-plugin-import: ^2.25.3 + eslint-plugin-jest: ^27.2.1 + eslint-plugin-jsx-a11y: ^6.5.1 + eslint-plugin-react: ^7.28.0 + eslint-plugin-react-hooks: ^4.3.0 + husky: ^8.0.0 + jest: 29.4.3 + lint-staged: ^12.4.2 + prettier: ^2.8.4 + ts-jest: 29.0.5 + tslib: ^2.5.0 + typescript: ^4.7.0 + languageName: unknown + linkType: soft + "base-x@npm:^3.0.2": version: 3.0.9 resolution: "base-x@npm:3.0.9" @@ -8349,9 +8381,9 @@ __metadata: languageName: node linkType: hard -"changelogithub@patch:changelogithub@npm:0.12.7#.yarn/patches/changelogithub-npm-0.12.7-72f348805d.patch::locator=zk-groups%40workspace%3A.": +"changelogithub@patch:changelogithub@npm:0.12.7#.yarn/patches/changelogithub-npm-0.12.7-72f348805d.patch::locator=bandada%40workspace%3A.": version: 0.12.7 - resolution: "changelogithub@patch:changelogithub@npm%3A0.12.7#.yarn/patches/changelogithub-npm-0.12.7-72f348805d.patch::version=0.12.7&hash=f5a921&locator=zk-groups%40workspace%3A." + resolution: "changelogithub@patch:changelogithub@npm%3A0.12.7#.yarn/patches/changelogithub-npm-0.12.7-72f348805d.patch::version=0.12.7&hash=f5a921&locator=bandada%40workspace%3A." dependencies: "@antfu/utils": ^0.7.2 c12: ^1.1.0 @@ -8641,6 +8673,7 @@ __metadata: version: 0.0.0-use.local resolution: "client@workspace:apps/client" dependencies: + "@bandada/utils": 0.4.0 "@chakra-ui/react": ^2.5.1 "@emotion/react": ^11.10.6 "@emotion/styled": ^11.10.6 @@ -8650,7 +8683,6 @@ __metadata: "@vitejs/plugin-react": ^3.1.0 "@web3-react/core": ^6.1.9 "@web3-react/injected-connector": ^6.0.7 - "@zk-groups/utils": 0.4.0 ethers: ^5.4.7 framer-motion: ^10.0.1 react: ^18.2.0 @@ -9420,6 +9452,7 @@ __metadata: version: 0.0.0-use.local resolution: "dashboard@workspace:apps/dashboard" dependencies: + "@bandada/utils": 0.4.0 "@chakra-ui/react": ^2.5.1 "@chakra-ui/theme-tools": ^2.0.16 "@emotion/react": ^11.10.6 @@ -9432,7 +9465,6 @@ __metadata: "@vitejs/plugin-react": ^3.1.0 "@web3-react/core": ^6.1.9 "@web3-react/injected-connector": ^6.0.7 - "@zk-groups/utils": 0.4.0 ethers: ^5.4.7 framer-motion: ^10.0.1 react: ^18.2.0 @@ -21054,38 +21086,6 @@ __metadata: languageName: node linkType: hard -"zk-groups@workspace:.": - version: 0.0.0-use.local - resolution: "zk-groups@workspace:." - dependencies: - "@commitlint/cli": ^17.0.0 - "@commitlint/config-conventional": ^17.4.3 - "@types/jest": 29.4.0 - "@types/node": 18.11.18 - "@typescript-eslint/eslint-plugin": ^5.13.0 - "@typescript-eslint/parser": ^5.0.0 - changelogithub: 0.12.7 - commitizen: ^4.2.4 - cz-conventional-changelog: ^3.3.0 - eslint: ^8.2.0 - eslint-config-airbnb: ^19.0.4 - eslint-config-airbnb-typescript: ^17.0.0 - eslint-config-prettier: ^8.6.0 - eslint-plugin-import: ^2.25.3 - eslint-plugin-jest: ^27.2.1 - eslint-plugin-jsx-a11y: ^6.5.1 - eslint-plugin-react: ^7.28.0 - eslint-plugin-react-hooks: ^4.3.0 - husky: ^8.0.0 - jest: 29.4.3 - lint-staged: ^12.4.2 - prettier: ^2.8.4 - ts-jest: 29.0.5 - tslib: ^2.5.0 - typescript: ^4.7.0 - languageName: unknown - linkType: soft - "zustand@npm:^4.3.1": version: 4.3.2 resolution: "zustand@npm:4.3.2"