refactor: upgrade ethers dependency in libs

apps/api/package.json

@@ -10,7 +10,6 @@
     "dependencies": {
         "@bandada/credentials": "2.1.1",
         "@bandada/utils": "2.1.1",
-        "@ethersproject/hash": "^5.7.0",
         "@nestjs/common": "^9.0.0",
         "@nestjs/core": "^9.0.0",
         "@nestjs/mapped-types": "^1.2.2",

apps/api/src/app/admins/admins.service.ts

@@ -1,8 +1,9 @@
 /* istanbul ignore file */
-import { id } from "@ethersproject/hash"
+
 import { Injectable } from "@nestjs/common"
 import { InjectRepository } from "@nestjs/typeorm"
 import { FindOptionsWhere, Repository } from "typeorm"
+import { id } from "ethers"
 import { CreateAdminDTO } from "./dto/create-admin.dto"
 import { Admin } from "./entities/admin.entity"
 

apps/api/src/app/credentials/credentials.service.ts

@@ -7,7 +7,6 @@ import {
     Web2Context,
     BlockchainContext
 } from "@bandada/credentials"
-import { id } from "@ethersproject/hash"
 import {
     BadRequestException,
     forwardRef,
@@ -18,6 +17,7 @@ import {
 import { InjectRepository } from "@nestjs/typeorm"
 import { Repository } from "typeorm"
 import { v4 } from "uuid"
+import { id } from "ethers"
 import { GroupsService } from "../groups/groups.service"
 import { OAuthAccount } from "./entities/credentials-account.entity"
 import { OAuthState } from "./types"

apps/api/src/app/groups/groups.service.ts

@@ -1,5 +1,4 @@
 // import { BandadaContract, getBandadaContract, Network } from "@bandada/utils"
-import { id } from "@ethersproject/hash"
 import {
     BadRequestException,
     forwardRef,
@@ -13,6 +12,7 @@ import { InjectRepository } from "@nestjs/typeorm"
 import { Group as CachedGroup } from "@semaphore-protocol/group"
 import { Repository } from "typeorm"
 import { v4 } from "uuid"
+import { id } from "ethers"
 import { InvitesService } from "../invites/invites.service"
 import { CreateGroupDto } from "./dto/create-group.dto"
 import { UpdateGroupDto } from "./dto/update-group.dto"

apps/contracts/package.json

@@ -17,9 +17,6 @@
         "lint": "solhint 'contracts/**/*.sol'"
     },
     "devDependencies": {
-        "@ethersproject/abi": "^5.4.7",
-        "@ethersproject/bytes": "^5.4.7",
-        "@ethersproject/providers": "^5.4.7",
         "@nomicfoundation/hardhat-chai-matchers": "^1.0.0",
         "@nomicfoundation/hardhat-network-helpers": "^1.0.0",
         "@nomicfoundation/hardhat-toolbox": "latest",
@@ -35,7 +32,7 @@
         "@types/node": ">=12.0.0",
         "chai": "^4.2.0",
         "dotenv": "^16.0.3",
-        "ethers": "^5.4.7",
+        "ethers": "^6.11.1",
         "hardhat": "^2.11.0",
         "hardhat-dependency-compiler": "^1.1.3",
         "hardhat-gas-reporter": "^1.0.8",

apps/contracts/tasks/deploy-bandada-semaphore.ts

@@ -1,4 +1,4 @@
-import { Contract } from "ethers"
+import type { Contract } from "ethers"
 import { task, types } from "hardhat/config"
 
 task("deploy:bandada-semaphore", "Deploy a BandadaSemaphore contract")

apps/contracts/tasks/deploy-bandada.ts

@@ -1,4 +1,4 @@
-import { Contract } from "ethers"
+import type { Contract } from "ethers"
 import { task, types } from "hardhat/config"
 
 task("deploy:bandada", "Deploy a Bandada contract")

apps/contracts/test/Bandada.ts

@@ -1,7 +1,7 @@
 import { Group } from "@semaphore-protocol/group"
 import { Identity } from "@semaphore-protocol/identity"
 import { expect } from "chai"
-import { BigNumber, utils } from "ethers"
+import { ethers } from "ethers"
 import { run } from "hardhat"
 // @ts-ignore: typechain folder will be generated after contracts compilation.
 // eslint-disable-next-line import/extensions
@@ -10,9 +10,9 @@ import { Bandada } from "../typechain-types"
 describe("Bandada", () => {
     let bandada: Bandada
 
-    const groupId = utils.formatBytes32String("Name")
+    const groupId = ethers.encodeBytes32String("Name")
     const identities = [0, 1].map((i) => new Identity(i.toString()))
-    const group = new Group(BigNumber.from(groupId).toBigInt(), 20)
+    const group = new Group(BigInt(groupId), 20)
 
     group.addMembers(identities.map(({ commitment }) => commitment))
 

apps/contracts/test/BandadaSemaphore.ts

@@ -2,7 +2,7 @@ import { Group } from "@semaphore-protocol/group"
 import { Identity } from "@semaphore-protocol/identity"
 import { FullProof, generateProof } from "@semaphore-protocol/proof"
 import { expect } from "chai"
-import { BigNumber, utils } from "ethers"
+import { ethers } from "ethers"
 import { run } from "hardhat"
 // @ts-ignore: typechain folder will be generated after contracts compilation.
 // eslint-disable-next-line import/extensions
@@ -12,9 +12,9 @@ describe("BandadaSemaphore", () => {
     let bandada: Bandada
     let bandadaSemaphore: BandadaSemaphore
 
-    const groupId = utils.formatBytes32String("Name")
+    const groupId = ethers.encodeBytes32String("Name")
     const identities = [0, 1].map((i) => new Identity(i.toString()))
-    const group = new Group(BigNumber.from(groupId).toBigInt())
+    const group = new Group(BigInt(groupId))
 
     group.addMembers(identities.map(({ commitment }) => commitment))
 
@@ -40,7 +40,7 @@ describe("BandadaSemaphore", () => {
         const wasmFilePath = `../../snark-artifacts/semaphore.wasm`
         const zkeyFilePath = `../../snark-artifacts/semaphore.zkey`
 
-        const signal = utils.formatBytes32String("Hello World")
+        const signal = ethers.encodeBytes32String("Hello World")
 
         let fullProof: FullProof
 

apps/dashboard/package.json

@@ -18,7 +18,7 @@
         "@fontsource-variable/unbounded": "^5.0.5",
         "@rainbow-me/rainbowkit": "^0.12.8",
         "@semaphore-protocol/data": "3.10.0",
-        "ethers": "5.5.1",
+        "ethers": "^6.11.1",
         "framer-motion": "^10.0.1",
         "react": "^18.2.0",
         "react-dom": "^18.2.0",

apps/dashboard/src/components/new-group-stepper/final-preview-step.tsx

@@ -1,9 +1,9 @@
-import { formatBytes32String } from "@ethersproject/strings"
 import { getSemaphoreContract } from "@bandada/utils"
 import { Box, Button, Heading, HStack, VStack } from "@chakra-ui/react"
 import { useCallback, useState } from "react"
 import { useNavigate } from "react-router-dom"
 import { useSigner } from "wagmi"
+import { encodeBytes32String } from "ethers"
 import * as bandadaAPI from "../../api/bandadaAPI"
 import image3 from "../../assets/image3.svg"
 import GroupCard from "../group-card"
@@ -30,7 +30,7 @@ export default function FinalPreviewStep({
 
                 await semaphore.createGroup(group.name, group.treeDepth, admin)
 
-                const groupId = BigInt(formatBytes32String(group.name))
+                const groupId = BigInt(encodeBytes32String(group.name))
                 navigate(`/groups/on-chain/${groupId}`)
             } catch (error) {
                 setLoading(false)

apps/dashboard/src/utils/parseGroupName.ts

@@ -1,4 +1,4 @@
-import { BigNumber, utils } from "ethers"
+import { ethers } from "ethers"
 
 /**
  * It converts a group name as a big number to a string.
@@ -7,9 +7,7 @@ import { BigNumber, utils } from "ethers"
  */
 export default function parseGroupName(groupNameBN: string) {
     try {
-        return utils.parseBytes32String(
-            BigNumber.from(groupNameBN).toHexString()
-        )
+        return ethers.decodeBytes32String(BigInt(groupNameBN).toString())
     } catch (error) {
         // If not parse-able as a string, it returns the original value.
         return groupNameBN

libs/credentials/package.json

@@ -30,7 +30,7 @@
     },
     "dependencies": {
         "@bandada/utils": "2.1.1",
-        "ethers": "5.7.0"
+        "ethers": "^6.11.1"
     },
     "devDependencies": {
         "@rollup/plugin-typescript": "^11.0.0",

libs/credentials/src/getJsonRpcProvider.ts

@@ -1,6 +1,6 @@
-import { providers } from "ethers"
+import { ethers } from "ethers"
 
 export default function getJsonRpcProvider(url: string): any {
-    const jsonRpcProvider = new providers.JsonRpcProvider(url)
+    const jsonRpcProvider = new ethers.JsonRpcProvider(url)
     return jsonRpcProvider
 }

libs/credentials/src/providers/blockchain/index.ts

@@ -1,4 +1,5 @@
-import { utils, BigNumberish } from "ethers"
+import { ethers } from "ethers"
+import type { BigNumberish } from "ethers"
 import { BlockchainProvider } from "../.."
 import getJsonRpcProvider from "../../getJsonRpcProvider"
 
@@ -9,7 +10,7 @@ const provider: BlockchainProvider = {
         message: string,
         signature: string
     ): Promise<BigNumberish> {
-        const address = await utils.verifyMessage(message, signature)
+        const address = await ethers.verifyMessage(message, signature)
 
         return address
     },

libs/credentials/src/types/index.ts

@@ -1,4 +1,4 @@
-import { BigNumberish } from "ethers"
+import type { BigNumberish } from "ethers"
 
 export enum EASNetworks {
     ETHEREUM = "ethereum",

libs/credentials/src/validators/blockchainBalance/index.test.ts

@@ -1,4 +1,3 @@
-import { BigNumber } from "ethers"
 import { validateCredentials } from "../.."
 import blockchainBalance from "./index"
 
@@ -8,7 +7,7 @@ describe("BlockchainBalance", () => {
     }
 
     it("Should return true if an account has a balance greater than or equal to 10", async () => {
-        jsonRpcProviderMocked.getBalance.mockReturnValue(BigNumber.from(12))
+        jsonRpcProviderMocked.getBalance.mockReturnValue(BigInt(12))
 
         const result = await validateCredentials(
             {
@@ -27,7 +26,7 @@ describe("BlockchainBalance", () => {
     })
 
     it("Should return true if an account has a balance greater than or equal to 10 using the block number", async () => {
-        jsonRpcProviderMocked.getBalance.mockReturnValue(BigNumber.from(12))
+        jsonRpcProviderMocked.getBalance.mockReturnValue(BigInt(12))
 
         const result = await validateCredentials(
             {

libs/credentials/src/validators/blockchainBalance/index.ts

@@ -1,4 +1,3 @@
-import { BigNumber } from "ethers"
 import { BlockchainContext, Validator } from "../.."
 
 export type Criteria = {
@@ -39,7 +38,7 @@ const validator: Validator = {
                 (context as BlockchainContext).address,
                 blockNumber
             )
-            return balance >= BigNumber.from(criteria.minBalance)
+            return balance >= BigInt(criteria.minBalance)
         }
         throw new Error("No address value found")
     }

libs/hardhat/package.json

@@ -29,9 +29,9 @@
         "access": "public"
     },
     "devDependencies": {
-        "@nomiclabs/hardhat-ethers": "^2.0.0",
+        "@nomiclabs/hardhat-ethers": "^2.2.3",
         "@rollup/plugin-typescript": "^11.0.0",
-        "ethers": "^5.4.7",
+        "ethers": "^6.11.1",
         "hardhat": "^2.11.0",
         "rimraf": "^4.1.2",
         "rollup": "^3.17.2",
@@ -40,9 +40,9 @@
     },
     "peerDependencies": {
         "@bandada/contracts": "2.1.1",
-        "@nomiclabs/hardhat-ethers": "^2.0.0",
+        "@nomiclabs/hardhat-ethers": "^2.2.3",
         "@semaphore-protocol/contracts": "3.4.0",
-        "ethers": "^5.4.7",
+        "ethers": "^6.11.1",
         "hardhat": "^2.11.0"
     },
     "dependencies": {

libs/utils/package.json

@@ -40,12 +40,7 @@
         "typescript": "^4.9.5"
     },
     "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",
-        "axios": "^1.3.3"
+        "axios": "^1.3.3",
+        "ethers": "^6.11.1"
     }
 }

libs/utils/src/getBandadaContract.ts

@@ -1,7 +1,6 @@
 /* istanbul ignore file */
 
-import { Signer } from "@ethersproject/abstract-signer"
-import { Contract, ContractReceipt } from "@ethersproject/contracts"
+import type { Contract, Signer, ContractTransactionReceipt } from "ethers"
 import getContract from "./getContract"
 import { Network, OnchainBandadaGroup } from "./types"
 
@@ -14,7 +13,7 @@ export class BandadaContract {
 
     async updateGroups(
         groups: OnchainBandadaGroup[]
-    ): Promise<ContractReceipt> {
+    ): Promise<ContractTransactionReceipt> {
         const transaction = await this.contract.updateGroups(groups)
 
         return transaction.wait(1)
@@ -33,7 +32,7 @@ export class BandadaContract {
     async updateFingerprintDuration(
         groupId: BigInt,
         fingerprintDuration: BigInt
-    ): Promise<ContractReceipt> {
+    ): Promise<ContractTransactionReceipt> {
         const transaction = await this.contract.updateFingerprintDuration(
             groupId,
             fingerprintDuration

libs/utils/src/getContract.ts

@@ -1,8 +1,6 @@
 /* istanbul ignore file */
 
-import { Signer } from "@ethersproject/abstract-signer"
-import { Contract } from "@ethersproject/contracts"
-import { Provider } from "@ethersproject/providers"
+import { type Contract, type Signer, type Provider, ethers } from "ethers"
 import { getContractAddresses } from "./contractAddresses"
 import { abi as SemaphoreABI } from "./contractArtifacts/Semaphore.json"
 import { abi as BandadaABI } from "./contractArtifacts/Bandada.json"
@@ -32,9 +30,9 @@ export default function getContract(
 
     switch (contractName) {
         case "Bandada":
-            return new Contract(contractAddress, BandadaABI, providerOrWallet)
+            return new ethers.Contract(contractAddress, BandadaABI, providerOrWallet)
         case "Semaphore":
-            return new Contract(contractAddress, SemaphoreABI, providerOrWallet)
+            return new ethers.Contract(contractAddress, SemaphoreABI, providerOrWallet)
         default:
             throw new TypeError(`'${contractName}' contract does not exist`)
     }

libs/utils/src/getProvider.ts

@@ -1,6 +1,6 @@
 /* istanbul ignore file */
 
-import { InfuraProvider, JsonRpcProvider } from "@ethersproject/providers"
+import { ethers, type JsonRpcProvider } from "ethers"
 import { Network } from "./types"
 
 export default function getProvider(
@@ -9,9 +9,9 @@ export default function getProvider(
 ): JsonRpcProvider {
     switch (network) {
         case "localhost":
-            return new JsonRpcProvider("http://127.0.0.1:8545")
+            return new ethers.JsonRpcProvider("http://127.0.0.1:8545")
         case "sepolia":
-            return new InfuraProvider(network, apiKey)
+            return new ethers.InfuraProvider(network, apiKey)
         default:
             throw new TypeError(`'${network}' network is not supported`)
     }