diff --git a/apps/consumer-client/src/pages/examples/group-proof.tsx b/apps/consumer-client/src/pages/examples/group-proof.tsx index 72d1c047de..9ac097e665 100644 --- a/apps/consumer-client/src/pages/examples/group-proof.tsx +++ b/apps/consumer-client/src/pages/examples/group-proof.tsx @@ -60,7 +60,7 @@ export default function Page(): JSX.Element {

The underlying PCD that this example uses is{" "} - SempahoreGroupPCD. You can find more documentation + SemaphoreGroupPCD. You can find more documentation regarding this PCD{" "} here on GitHub diff --git a/apps/passport-client/components/modals/FrogCryptoUpdateTelegramModal.tsx b/apps/passport-client/components/modals/FrogCryptoUpdateTelegramModal.tsx index cd5c06c9ce..11c463749d 100644 --- a/apps/passport-client/components/modals/FrogCryptoUpdateTelegramModal.tsx +++ b/apps/passport-client/components/modals/FrogCryptoUpdateTelegramModal.tsx @@ -60,7 +60,7 @@ export function FrogCryptoUpdateTelegramModal({ appConfig.zupassServer, { pcd: await credentialManager.requestCredential({ - signatureType: "sempahore-signature-pcd" + signatureType: "semaphore-signature-pcd" }), reveal: !revealed } diff --git a/apps/passport-client/components/modals/RequireAddPasswordModal.tsx b/apps/passport-client/components/modals/RequireAddPasswordModal.tsx index 40f2edab04..af22a3d129 100644 --- a/apps/passport-client/components/modals/RequireAddPasswordModal.tsx +++ b/apps/passport-client/components/modals/RequireAddPasswordModal.tsx @@ -56,7 +56,7 @@ export function RequireAddPasswordModal(): JSX.Element { dispatch, update, await credentialManager.requestCredential({ - signatureType: "sempahore-signature-pcd" + signatureType: "semaphore-signature-pcd" }) ); diff --git a/apps/passport-client/components/modals/UpgradeAccountModal.tsx b/apps/passport-client/components/modals/UpgradeAccountModal.tsx index 4d34f7ba30..ce4debb54a 100644 --- a/apps/passport-client/components/modals/UpgradeAccountModal.tsx +++ b/apps/passport-client/components/modals/UpgradeAccountModal.tsx @@ -56,7 +56,7 @@ export function UpgradeAccountModal(): JSX.Element | null { dispatch, update, await credentialManager.requestCredential({ - signatureType: "sempahore-signature-pcd" + signatureType: "semaphore-signature-pcd" }) ); diff --git a/apps/passport-client/components/screens/AddSubscriptionScreen.tsx b/apps/passport-client/components/screens/AddSubscriptionScreen.tsx index 5d1d8e1c8d..595ad5b3ef 100644 --- a/apps/passport-client/components/screens/AddSubscriptionScreen.tsx +++ b/apps/passport-client/components/screens/AddSubscriptionScreen.tsx @@ -389,7 +389,7 @@ function SubscribeSection({ // Check that we can actually generate the credential that the feed wants const missingCredentialPCD = !credentialManager.canGenerateCredential({ - signatureType: "sempahore-signature-pcd", + signatureType: "semaphore-signature-pcd", pcdType: info.credentialRequest.pcdType }); diff --git a/apps/passport-client/components/screens/ChangePasswordScreen.tsx b/apps/passport-client/components/screens/ChangePasswordScreen.tsx index 8d4e51fbb7..afbb85a203 100644 --- a/apps/passport-client/components/screens/ChangePasswordScreen.tsx +++ b/apps/passport-client/components/screens/ChangePasswordScreen.tsx @@ -92,7 +92,7 @@ export function ChangePasswordScreen(): JSX.Element | null { dispatch, update, await credentialManager.requestCredential({ - signatureType: "sempahore-signature-pcd" + signatureType: "semaphore-signature-pcd" }) ); diff --git a/apps/passport-client/components/screens/FrogScreens/FrogCryptoHomeSection.tsx b/apps/passport-client/components/screens/FrogScreens/FrogCryptoHomeSection.tsx index d13dc8e2c4..b3cc66e47c 100644 --- a/apps/passport-client/components/screens/FrogScreens/FrogCryptoHomeSection.tsx +++ b/apps/passport-client/components/screens/FrogScreens/FrogCryptoHomeSection.tsx @@ -229,7 +229,7 @@ export function useUserFeedState(subscriptions: Subscription[]): { const refreshUserState = useCallback(async () => { try { const pcd = await credentialManager.requestCredential({ - signatureType: "sempahore-signature-pcd" + signatureType: "semaphore-signature-pcd" }); const state = await requestFrogCryptoGetUserState( diff --git a/apps/passport-client/components/screens/FrogScreens/ManageFeedsSection.tsx b/apps/passport-client/components/screens/FrogScreens/ManageFeedsSection.tsx index 99a002b4e9..fc7d4177fe 100644 --- a/apps/passport-client/components/screens/FrogScreens/ManageFeedsSection.tsx +++ b/apps/passport-client/components/screens/FrogScreens/ManageFeedsSection.tsx @@ -112,7 +112,7 @@ function useFeeds(): { useEffect(() => { const fetchPcd = async (): Promise => { const pcd = await credentialManager.requestCredential({ - signatureType: "sempahore-signature-pcd" + signatureType: "semaphore-signature-pcd" }); setPcd(pcd); }; diff --git a/apps/passport-client/components/screens/FrogScreens/ManageFrogsSection.tsx b/apps/passport-client/components/screens/FrogScreens/ManageFrogsSection.tsx index 5835ad09c1..03d274c8cd 100644 --- a/apps/passport-client/components/screens/FrogScreens/ManageFrogsSection.tsx +++ b/apps/passport-client/components/screens/FrogScreens/ManageFrogsSection.tsx @@ -117,7 +117,7 @@ function useFrogs(): { useEffect(() => { const fetchPcd = async (): Promise => { const pcd = await credentialManager.requestCredential({ - signatureType: "sempahore-signature-pcd" + signatureType: "semaphore-signature-pcd" }); setPcd(pcd); }; diff --git a/apps/passport-client/components/screens/FrogScreens/useUsername.ts b/apps/passport-client/components/screens/FrogScreens/useUsername.ts index cb8f80be50..bfa930b723 100644 --- a/apps/passport-client/components/screens/FrogScreens/useUsername.ts +++ b/apps/passport-client/components/screens/FrogScreens/useUsername.ts @@ -4,7 +4,7 @@ import { useCallback, useEffect, useState } from "react"; import { bigintToUint8Array, uint8arrayToBigint } from "../../../src/util"; export function useUsernameGenerator(): - | ((sempahoreId: string, lowercase?: boolean) => string) + | ((semaphoreId: string, lowercase?: boolean) => string) | null { const [pcdCrypto, setPCDCrypto] = useState(null); useEffect(() => { @@ -12,7 +12,7 @@ export function useUsernameGenerator(): }, []); const generator = useCallback( - (sempahoreId: string, lowercase = false) => { + (semaphoreId: string, lowercase = false) => { try { if (!pcdCrypto) { throw new Error("pcdCrypto is not initialized"); @@ -20,7 +20,7 @@ export function useUsernameGenerator(): const randomBytes = pcdCrypto.randombytesDeterministic( 32, - bigintToUint8Array(BigInt(sempahoreId)) + bigintToUint8Array(BigInt(semaphoreId)) ); if (randomBytes === null) { throw new Error("Could not generate random data"); diff --git a/apps/passport-client/src/dispatch.ts b/apps/passport-client/src/dispatch.ts index d4b73d8856..493cc91cc3 100644 --- a/apps/passport-client/src/dispatch.ts +++ b/apps/passport-client/src/dispatch.ts @@ -1109,7 +1109,7 @@ async function doSync( state.credentialCache ); const credential = await credentialManager.requestCredential({ - signatureType: "sempahore-signature-pcd" + signatureType: "semaphore-signature-pcd" }); const upRes = await uploadSerializedStorage( @@ -1466,7 +1466,7 @@ async function deleteAccount(state: AppState, update: ZuUpdate): Promise { ); const pcd = await credentialManager.requestCredential({ - signatureType: "sempahore-signature-pcd" + signatureType: "semaphore-signature-pcd" }); const res = await requestDeleteAccount(appConfig.zupassServer, { pcd }); diff --git a/apps/passport-server/src/database/queries/frogcrypto.ts b/apps/passport-server/src/database/queries/frogcrypto.ts index c5ccfdd722..515570e125 100644 --- a/apps/passport-server/src/database/queries/frogcrypto.ts +++ b/apps/passport-server/src/database/queries/frogcrypto.ts @@ -393,7 +393,7 @@ function toFeedData(dbFeedData: FrogCryptoDbFeedData): FrogCryptoFeed { inputPCDType: undefined, partialArgs: undefined, credentialRequest: { - signatureType: "sempahore-signature-pcd" + signatureType: "semaphore-signature-pcd" }, permissions: [ { diff --git a/apps/passport-server/src/database/queries/telegram/fetchTelegramUsername.ts b/apps/passport-server/src/database/queries/telegram/fetchTelegramUsername.ts index e4fc4a6135..b12b5fa490 100644 --- a/apps/passport-server/src/database/queries/telegram/fetchTelegramUsername.ts +++ b/apps/passport-server/src/database/queries/telegram/fetchTelegramUsername.ts @@ -3,7 +3,7 @@ import { sqlQuery } from "../../sqlQuery"; export async function fetchTelegramUsernameFromSemaphoreId( client: Pool, - sempahoreId: string + semaphoreId: string ): Promise { const result = await sqlQuery( client, @@ -11,7 +11,7 @@ export async function fetchTelegramUsernameFromSemaphoreId( select telegram_username from telegram_bot_conversations where semaphore_id = $1 `, - [sempahoreId] + [semaphoreId] ); if (result.rowCount === 0) { return null; diff --git a/apps/passport-server/src/services/generic-issuance/pipelines/LemonadePipeline.ts b/apps/passport-server/src/services/generic-issuance/pipelines/LemonadePipeline.ts index 0e54f356be..922b6d40dc 100644 --- a/apps/passport-server/src/services/generic-issuance/pipelines/LemonadePipeline.ts +++ b/apps/passport-server/src/services/generic-issuance/pipelines/LemonadePipeline.ts @@ -567,7 +567,7 @@ export class LemonadePipeline implements BasePipeline { private async manualTicketToTicketData( manualTicket: ManualTicket, - sempahoreId: string + semaphoreId: string ): Promise { const event = this.getEventById(manualTicket.eventId); const product = this.getTicketTypeById(event, manualTicket.productId); @@ -583,7 +583,7 @@ export class LemonadePipeline implements BasePipeline { productId: manualTicket.productId, attendeeEmail: manualTicket.attendeeEmail, attendeeName: manualTicket.attendeeName, - attendeeSemaphoreId: sempahoreId, + attendeeSemaphoreId: semaphoreId, isConsumed: checkIn ? true : false, isRevoked: false, timestampSigned: Date.now(), diff --git a/apps/passport-server/src/services/generic-issuance/pipelines/PretixPipeline.ts b/apps/passport-server/src/services/generic-issuance/pipelines/PretixPipeline.ts index c354e45c94..a81d3baac1 100644 --- a/apps/passport-server/src/services/generic-issuance/pipelines/PretixPipeline.ts +++ b/apps/passport-server/src/services/generic-issuance/pipelines/PretixPipeline.ts @@ -854,7 +854,7 @@ export class PretixPipeline implements BasePipeline { private async manualTicketToTicketData( manualTicket: ManualTicket, - sempahoreId: string + semaphoreId: string ): Promise { const event = this.getEventById(manualTicket.eventId); const product = this.getProductById(event, manualTicket.productId); @@ -870,7 +870,7 @@ export class PretixPipeline implements BasePipeline { productId: manualTicket.productId, attendeeEmail: manualTicket.attendeeEmail, attendeeName: manualTicket.attendeeName, - attendeeSemaphoreId: sempahoreId, + attendeeSemaphoreId: semaphoreId, imageUrl: this.imageOptionsToImageUrl(event.imageOptions, !!checkIn), isConsumed: checkIn ? true : false, isRevoked: false, diff --git a/apps/passport-server/src/services/generic-issuance/subservices/PipelineAPISubservice.ts b/apps/passport-server/src/services/generic-issuance/subservices/PipelineAPISubservice.ts index 441d57d301..3d8095bddc 100644 --- a/apps/passport-server/src/services/generic-issuance/subservices/PipelineAPISubservice.ts +++ b/apps/passport-server/src/services/generic-issuance/subservices/PipelineAPISubservice.ts @@ -231,7 +231,7 @@ export class PipelineAPISubservice { } ], credentialRequest: { - signatureType: "sempahore-signature-pcd", + signatureType: "semaphore-signature-pcd", pcdType: "email-pcd" } } satisfies Feed @@ -467,7 +467,7 @@ export class PipelineAPISubservice { /** * Returns whether the given @param rootHash is a valid root hash of the given - * Sempahore group at some point in time. + * Semaphore group at some point in time. */ public async handleGetValidSemaphoreGroup( pipelineId: string, diff --git a/apps/passport-server/src/services/issuanceService.ts b/apps/passport-server/src/services/issuanceService.ts index 7e5d1d04eb..627edc9dd2 100644 --- a/apps/passport-server/src/services/issuanceService.ts +++ b/apps/passport-server/src/services/issuanceService.ts @@ -213,7 +213,7 @@ export class IssuanceService { description: "Get your Devconnect tickets here!", partialArgs: undefined, credentialRequest: { - signatureType: "sempahore-signature-pcd" + signatureType: "semaphore-signature-pcd" }, permissions: [ { @@ -262,7 +262,7 @@ export class IssuanceService { inputPCDType: undefined, partialArgs: undefined, credentialRequest: { - signatureType: "sempahore-signature-pcd" + signatureType: "semaphore-signature-pcd" }, permissions: [ { diff --git a/packages/lib/passport-interface/src/CredentialManager.ts b/packages/lib/passport-interface/src/CredentialManager.ts index 9fab911b2a..4f4d6db49e 100644 --- a/packages/lib/passport-interface/src/CredentialManager.ts +++ b/packages/lib/passport-interface/src/CredentialManager.ts @@ -36,11 +36,11 @@ const CACHE_TTL = ONE_HOUR_MS; */ export const PODBOX_CREDENTIAL_REQUEST: CredentialRequest = { pcdType: "email-pcd", - signatureType: "sempahore-signature-pcd" + signatureType: "semaphore-signature-pcd" }; export const ZUPASS_CREDENTIAL_REQUEST: CredentialRequest = { - signatureType: "sempahore-signature-pcd" + signatureType: "semaphore-signature-pcd" }; // Creates an in-memory cache with a TTL of one hour. diff --git a/packages/lib/passport-interface/src/SubscriptionManager.ts b/packages/lib/passport-interface/src/SubscriptionManager.ts index 02c4f481e6..216498944e 100644 --- a/packages/lib/passport-interface/src/SubscriptionManager.ts +++ b/packages/lib/passport-interface/src/SubscriptionManager.ts @@ -283,7 +283,7 @@ export class FeedSubscriptionManager { const pcdCredential: SerializedPCD | undefined = authKey ? await this.makeAlternateCredentialPCD(authKey) : await credentialManager.requestCredential({ - signatureType: "sempahore-signature-pcd", + signatureType: "semaphore-signature-pcd", pcdType: subscription.feed.credentialRequest.pcdType }); @@ -587,7 +587,7 @@ export class FeedSubscriptionManager { description: sub.feed.description, permissions: sub.feed.permissions, credentialRequest: { - signatureType: "sempahore-signature-pcd", + signatureType: "semaphore-signature-pcd", ...(sub.feed.credentialType === "email-pcd" ? { pcdType: sub.feed.credentialType } : {}) @@ -678,7 +678,7 @@ export interface SubscriptionProvider { // The configuration of the credential required by a feed server export interface CredentialRequest { // Can be extended as more signature types are supported - signatureType: "sempahore-signature-pcd"; + signatureType: "semaphore-signature-pcd"; // Can be extended as more PCD types are supported // Including a PCD in the credential is optional. We might also want to // query on more than just type of PCD in future. diff --git a/packages/lib/passport-interface/src/ZupassDefaultSubscriptions.ts b/packages/lib/passport-interface/src/ZupassDefaultSubscriptions.ts index a3a5a141a6..d6110e00bb 100644 --- a/packages/lib/passport-interface/src/ZupassDefaultSubscriptions.ts +++ b/packages/lib/passport-interface/src/ZupassDefaultSubscriptions.ts @@ -14,7 +14,7 @@ export const zupassDefaultSubscriptions: Record< "used to request PCDs from other PCD feeds.", partialArgs: undefined, credentialRequest: { - signatureType: "sempahore-signature-pcd" + signatureType: "semaphore-signature-pcd" }, permissions: [ { @@ -34,7 +34,7 @@ export const zupassDefaultSubscriptions: Record< description: "EdDSATicketPCDs representing Zuzalu Tickets.", partialArgs: undefined, credentialRequest: { - signatureType: "sempahore-signature-pcd" + signatureType: "semaphore-signature-pcd" }, permissions: [ { @@ -54,7 +54,7 @@ export const zupassDefaultSubscriptions: Record< description: "EdDSATicketPCDs representing Zuconnect Tickets.", partialArgs: undefined, credentialRequest: { - signatureType: "sempahore-signature-pcd" + signatureType: "semaphore-signature-pcd" }, permissions: [ { diff --git a/packages/lib/passport-interface/test/MockFeedApi.ts b/packages/lib/passport-interface/test/MockFeedApi.ts index 002ab7d337..27f5ce75a4 100644 --- a/packages/lib/passport-interface/test/MockFeedApi.ts +++ b/packages/lib/passport-interface/test/MockFeedApi.ts @@ -64,7 +64,7 @@ export class MockFeedApi implements IFeedApi { inputPCDType: undefined, partialArgs: undefined, credentialRequest: { - signatureType: "sempahore-signature-pcd" + signatureType: "semaphore-signature-pcd" } }, @@ -113,7 +113,7 @@ export class MockFeedApi implements IFeedApi { inputPCDType: undefined, partialArgs: undefined, credentialRequest: { - signatureType: "sempahore-signature-pcd" + signatureType: "semaphore-signature-pcd" } }, handleRequest: async ( @@ -157,7 +157,7 @@ export class MockFeedApi implements IFeedApi { partialArgs: undefined, credentialRequest: { pcdType: "email-pcd", - signatureType: "sempahore-signature-pcd" + signatureType: "semaphore-signature-pcd" } }, diff --git a/packages/lib/passport-interface/test/SubscriptionManager.spec.ts b/packages/lib/passport-interface/test/SubscriptionManager.spec.ts index 5a5b59bb47..2f89e0ea4e 100644 --- a/packages/lib/passport-interface/test/SubscriptionManager.spec.ts +++ b/packages/lib/passport-interface/test/SubscriptionManager.spec.ts @@ -47,7 +47,7 @@ describe("Subscription Manager", async function () { inputPCDType: undefined, partialArgs: undefined, credentialRequest: { - signatureType: "sempahore-signature-pcd" + signatureType: "semaphore-signature-pcd" } }); } @@ -122,7 +122,7 @@ describe("Subscription Manager", async function () { inputPCDType: undefined, partialArgs: undefined, credentialRequest: { - signatureType: "sempahore-signature-pcd" + signatureType: "semaphore-signature-pcd" } }; @@ -169,7 +169,7 @@ describe("Subscription Manager", async function () { inputPCDType: undefined, partialArgs: undefined, credentialRequest: { - signatureType: "sempahore-signature-pcd" + signatureType: "semaphore-signature-pcd" } }; @@ -213,7 +213,7 @@ describe("Subscription Manager", async function () { inputPCDType: undefined, partialArgs: undefined, credentialRequest: { - signatureType: "sempahore-signature-pcd" + signatureType: "semaphore-signature-pcd" } }; diff --git a/packages/pcd/semaphore-group-pcd/src/SemaphoreGroupPCD.ts b/packages/pcd/semaphore-group-pcd/src/SemaphoreGroupPCD.ts index bddda863d9..ce9e1cf04d 100644 --- a/packages/pcd/semaphore-group-pcd/src/SemaphoreGroupPCD.ts +++ b/packages/pcd/semaphore-group-pcd/src/SemaphoreGroupPCD.ts @@ -10,7 +10,7 @@ import { SerializedSemaphoreGroup } from "./SerializedSemaphoreGroup"; export const SemaphoreGroupPCDTypeName = "semaphore-group-signal"; -export interface SempahoreGroupPCDInitArgs { +export interface SemaphoreGroupPCDInitArgs { // TODO: how do we distribute these in-package, so that consumers // of the package don't have to copy-paste these artifacts? // TODO: how do we account for different versions of the same type diff --git a/packages/pcd/semaphore-group-pcd/src/SemaphoreGroupPCDPackage.ts b/packages/pcd/semaphore-group-pcd/src/SemaphoreGroupPCDPackage.ts index 0358ed0ae3..202bcbe5da 100644 --- a/packages/pcd/semaphore-group-pcd/src/SemaphoreGroupPCDPackage.ts +++ b/packages/pcd/semaphore-group-pcd/src/SemaphoreGroupPCDPackage.ts @@ -13,15 +13,15 @@ import { SemaphoreGroupPCD, SemaphoreGroupPCDArgs, SemaphoreGroupPCDClaim, + SemaphoreGroupPCDInitArgs, SemaphoreGroupPCDProof, - SemaphoreGroupPCDTypeName, - SempahoreGroupPCDInitArgs + SemaphoreGroupPCDTypeName } from "./SemaphoreGroupPCD"; import { deserializeSemaphoreGroup } from "./SerializedSemaphoreGroup"; -let initArgs: SempahoreGroupPCDInitArgs | undefined = undefined; +let initArgs: SemaphoreGroupPCDInitArgs | undefined = undefined; -export async function init(args: SempahoreGroupPCDInitArgs): Promise { +export async function init(args: SemaphoreGroupPCDInitArgs): Promise { initArgs = args; } @@ -144,7 +144,7 @@ export const SemaphoreGroupPCDPackage: PCDPackage< SemaphoreGroupPCDClaim, SemaphoreGroupPCDProof, SemaphoreGroupPCDArgs, - SempahoreGroupPCDInitArgs + SemaphoreGroupPCDInitArgs > = { name: SemaphoreGroupPCDTypeName, getDisplayOptions, diff --git a/packages/ui/semaphore-identity-pcd-ui/src/CardBody.tsx b/packages/ui/semaphore-identity-pcd-ui/src/CardBody.tsx index e70e0b8658..a416935ed7 100644 --- a/packages/ui/semaphore-identity-pcd-ui/src/CardBody.tsx +++ b/packages/ui/semaphore-identity-pcd-ui/src/CardBody.tsx @@ -14,7 +14,7 @@ function SemaphoreIdentityCardBody({ return (

- This PCD represents a Sempahore Identity, which can be used to send + This PCD represents a Semaphore Identity, which can be used to send anonymous group signals, log into websites, etc.

diff --git a/test-packaging/zupass-feed-server/src/feeds.ts b/test-packaging/zupass-feed-server/src/feeds.ts index 07cee0e6db..d26ecd72fd 100644 --- a/test-packaging/zupass-feed-server/src/feeds.ts +++ b/test-packaging/zupass-feed-server/src/feeds.ts @@ -55,7 +55,7 @@ export async function initFeedHost() { ]; }), credentialRequest: { - signatureType: "sempahore-signature-pcd", + signatureType: "semaphore-signature-pcd", pcdType: "email-pcd" } },