diff --git a/apps/anon-message-client/CHANGELOG.md b/apps/anon-message-client/CHANGELOG.md index 0d1b463a49..e2be4ad32d 100644 --- a/apps/anon-message-client/CHANGELOG.md +++ b/apps/anon-message-client/CHANGELOG.md @@ -1,5 +1,17 @@ # sbc-client +## 0.2.2 + +### Patch Changes + +- Updated dependencies + - @pcd/passport-interface@0.15.0 + - @pcd/pcd-types@0.15.0 + - @pcd/util@0.9.0 + - @pcd/eddsa-ticket-pcd@0.10.0 + - @pcd/semaphore-identity-pcd@0.15.0 + - @pcd/zk-eddsa-event-ticket-pcd@0.10.0 + ## 0.2.1 ### Patch Changes diff --git a/apps/anon-message-client/package.json b/apps/anon-message-client/package.json index 0a4ccad0c5..7590a9c542 100644 --- a/apps/anon-message-client/package.json +++ b/apps/anon-message-client/package.json @@ -1,6 +1,6 @@ { "name": "anon-message-client", - "version": "0.2.1", + "version": "0.2.2", "license": "GPL-3.0-or-later", "private": true, "scripts": { @@ -11,12 +11,12 @@ "lint": "next lint" }, "dependencies": { - "@pcd/eddsa-ticket-pcd": "0.9.0", - "@pcd/passport-interface": "^0.14.0", - "@pcd/pcd-types": "0.14.0", - "@pcd/semaphore-identity-pcd": "0.14.0", - "@pcd/util": "^0.8.0", - "@pcd/zk-eddsa-event-ticket-pcd": "0.9.0", + "@pcd/eddsa-ticket-pcd": "0.10.0", + "@pcd/passport-interface": "^0.15.0", + "@pcd/pcd-types": "0.15.0", + "@pcd/semaphore-identity-pcd": "0.15.0", + "@pcd/util": "^0.9.0", + "@pcd/zk-eddsa-event-ticket-pcd": "0.10.0", "@types/node": "20.4.10", "@types/react": "18.2.20", "@types/react-dom": "18.2.7", @@ -31,7 +31,7 @@ "typescript": "5.3.3" }, "devDependencies": { - "@pcd/eslint-config-custom": "0.14.0", + "@pcd/eslint-config-custom": "0.15.0", "eslint": "8.57.0", "nodemon": "^3.0.1", "ts-node": "^10.9.2" diff --git a/apps/consumer-client/CHANGELOG.md b/apps/consumer-client/CHANGELOG.md index 39965f7d3b..64394ef58f 100644 --- a/apps/consumer-client/CHANGELOG.md +++ b/apps/consumer-client/CHANGELOG.md @@ -1,5 +1,31 @@ # consumer-client +## 0.0.51 + +### Patch Changes + +- Updated dependencies + - @pcd/client-shared@0.4.0 + - @pcd/gpc@0.4.0 + - @pcd/passport-interface@0.15.0 + - @pcd/pcd-types@0.15.0 + - @pcd/pod@0.5.0 + - @pcd/util@0.9.0 + - @pcd/zuauth@1.8.0 + - @pcd/eddsa-frog-pcd@0.7.0 + - @pcd/eddsa-pcd@0.10.0 + - @pcd/eddsa-ticket-pcd@0.10.0 + - @pcd/ethereum-group-pcd@0.9.0 + - @pcd/ethereum-ownership-pcd@0.15.0 + - @pcd/gpc-pcd@0.4.0 + - @pcd/pod-pcd@0.5.0 + - @pcd/semaphore-group-pcd@0.15.0 + - @pcd/semaphore-identity-pcd@0.15.0 + - @pcd/semaphore-signature-pcd@0.15.0 + - @pcd/webauthn-pcd@0.15.0 + - @pcd/zk-eddsa-event-ticket-pcd@0.10.0 + - @pcd/zk-eddsa-frog-pcd@0.7.0 + ## 0.0.50 ### Patch Changes diff --git a/apps/consumer-client/package.json b/apps/consumer-client/package.json index 6b4d573dbb..1683a521c2 100644 --- a/apps/consumer-client/package.json +++ b/apps/consumer-client/package.json @@ -1,6 +1,6 @@ { "name": "consumer-client", - "version": "0.0.50", + "version": "0.0.51", "license": "GPL-3.0-or-later", "private": true, "scripts": { @@ -13,26 +13,26 @@ }, "dependencies": { "@babel/core": "^7.24.0", - "@pcd/client-shared": "0.3.0", - "@pcd/eddsa-frog-pcd": "0.6.0", - "@pcd/eddsa-pcd": "0.9.0", - "@pcd/eddsa-ticket-pcd": "0.9.0", - "@pcd/ethereum-group-pcd": "0.8.0", - "@pcd/ethereum-ownership-pcd": "0.14.0", - "@pcd/gpc": "0.3.0", - "@pcd/gpc-pcd": "0.3.0", - "@pcd/passport-interface": "0.14.0", - "@pcd/pcd-types": "0.14.0", - "@pcd/pod": "0.4.0", - "@pcd/pod-pcd": "0.4.0", - "@pcd/semaphore-group-pcd": "0.14.0", - "@pcd/semaphore-identity-pcd": "0.14.0", - "@pcd/semaphore-signature-pcd": "0.14.0", - "@pcd/util": "0.8.0", - "@pcd/webauthn-pcd": "0.14.0", - "@pcd/zk-eddsa-event-ticket-pcd": "0.9.0", - "@pcd/zk-eddsa-frog-pcd": "0.6.0", - "@pcd/zuauth": "1.7.0", + "@pcd/client-shared": "0.4.0", + "@pcd/eddsa-frog-pcd": "0.7.0", + "@pcd/eddsa-pcd": "0.10.0", + "@pcd/eddsa-ticket-pcd": "0.10.0", + "@pcd/ethereum-group-pcd": "0.9.0", + "@pcd/ethereum-ownership-pcd": "0.15.0", + "@pcd/gpc": "0.4.0", + "@pcd/gpc-pcd": "0.4.0", + "@pcd/passport-interface": "0.15.0", + "@pcd/pcd-types": "0.15.0", + "@pcd/pod": "0.5.0", + "@pcd/pod-pcd": "0.5.0", + "@pcd/semaphore-group-pcd": "0.15.0", + "@pcd/semaphore-identity-pcd": "0.15.0", + "@pcd/semaphore-signature-pcd": "0.15.0", + "@pcd/util": "0.9.0", + "@pcd/webauthn-pcd": "0.15.0", + "@pcd/zk-eddsa-event-ticket-pcd": "0.10.0", + "@pcd/zk-eddsa-frog-pcd": "0.7.0", + "@pcd/zuauth": "1.8.0", "@personaelabs/spartan-ecdsa": "^2.1.4", "@semaphore-protocol/identity": "^3.15.2", "@simplewebauthn/browser": "^7.2.0", @@ -53,7 +53,7 @@ "devDependencies": { "@esbuild-plugins/node-globals-polyfill": "^0.2.3", "@esbuild-plugins/node-modules-polyfill": "^0.2.2", - "@pcd/eslint-config-custom": "0.14.0", + "@pcd/eslint-config-custom": "0.15.0", "@types/json-bigint": "^1.0.1", "@types/react": "^18.2.6", "@types/react-dom": "^18.0.7", diff --git a/apps/consumer-server/CHANGELOG.md b/apps/consumer-server/CHANGELOG.md index b49a89ac60..d1e519400b 100644 --- a/apps/consumer-server/CHANGELOG.md +++ b/apps/consumer-server/CHANGELOG.md @@ -1,5 +1,17 @@ # consumer-server +## 0.0.34 + +### Patch Changes + +- Updated dependencies + - @pcd/passport-interface@0.15.0 + - @pcd/util@0.9.0 + - @pcd/zuauth@1.8.0 + - @pcd/eddsa-ticket-pcd@0.10.0 + - @pcd/semaphore-signature-pcd@0.15.0 + - @pcd/zk-eddsa-event-ticket-pcd@0.10.0 + ## 0.0.33 ### Patch Changes diff --git a/apps/consumer-server/package.json b/apps/consumer-server/package.json index 204612e52b..72d09ee07f 100644 --- a/apps/consumer-server/package.json +++ b/apps/consumer-server/package.json @@ -1,6 +1,6 @@ { "name": "consumer-server", - "version": "0.0.33", + "version": "0.0.34", "license": "GPL-3.0-or-later", "private": true, "scripts": { @@ -16,12 +16,12 @@ "@opentelemetry/api": "1.3.0", "@opentelemetry/auto-instrumentations-node": "^0.36.0", "@opentelemetry/sdk-node": "^0.34.0", - "@pcd/eddsa-ticket-pcd": "^0.9.0", - "@pcd/passport-interface": "^0.14.0", - "@pcd/semaphore-signature-pcd": "^0.14.0", - "@pcd/util": "^0.8.0", - "@pcd/zk-eddsa-event-ticket-pcd": "^0.9.0", - "@pcd/zuauth": "1.7.0", + "@pcd/eddsa-ticket-pcd": "^0.10.0", + "@pcd/passport-interface": "^0.15.0", + "@pcd/semaphore-signature-pcd": "^0.15.0", + "@pcd/util": "^0.9.0", + "@pcd/zk-eddsa-event-ticket-pcd": "^0.10.0", + "@pcd/zuauth": "1.8.0", "cors": "^2.8.5", "express": "^4.18.2", "iron-session": "^8.0.2", @@ -30,8 +30,8 @@ "ts-node": "^10.9.2" }, "devDependencies": { - "@pcd/eslint-config-custom": "0.14.0", - "@pcd/tsconfig": "0.14.0", + "@pcd/eslint-config-custom": "0.15.0", + "@pcd/tsconfig": "0.15.0", "@types/express": "^4.17.16", "@types/mocha": "^10.0.1", "@types/morgan": "^1.9.4", diff --git a/apps/generic-issuance-client/CHANGELOG.md b/apps/generic-issuance-client/CHANGELOG.md index 0a0b63c952..d6492aa565 100644 --- a/apps/generic-issuance-client/CHANGELOG.md +++ b/apps/generic-issuance-client/CHANGELOG.md @@ -1,5 +1,16 @@ # generic-issuance-client +## 0.0.15 + +### Patch Changes + +- Updated dependencies + - @pcd/client-shared@0.4.0 + - @pcd/passport-interface@0.15.0 + - @pcd/pod@0.5.0 + - @pcd/podbox-shared@0.4.0 + - @pcd/util@0.9.0 + ## 0.0.14 ### Patch Changes diff --git a/apps/generic-issuance-client/package.json b/apps/generic-issuance-client/package.json index 7caa41e80e..337ee15743 100644 --- a/apps/generic-issuance-client/package.json +++ b/apps/generic-issuance-client/package.json @@ -1,6 +1,6 @@ { "name": "generic-issuance-client", - "version": "0.0.14", + "version": "0.0.15", "license": "GPL-3.0-or-later", "private": true, "scripts": { @@ -18,11 +18,11 @@ "@emotion/react": "^11.11.3", "@emotion/styled": "^11.11.0", "@monaco-editor/react": "^4.6.0", - "@pcd/client-shared": "0.3.0", - "@pcd/passport-interface": "0.14.0", - "@pcd/pod": "0.4.0", - "@pcd/podbox-shared": "0.3.0", - "@pcd/util": "0.8.0", + "@pcd/client-shared": "0.4.0", + "@pcd/passport-interface": "0.15.0", + "@pcd/pod": "0.5.0", + "@pcd/podbox-shared": "0.4.0", + "@pcd/util": "0.9.0", "@rollbar/react": "^0.11.2", "@stytch/react": "^15.0.0", "@stytch/vanilla-js": "^4.4.2", @@ -38,6 +38,7 @@ "monaco-editor": "^0.47.0", "monaco-themes": "^0.4.4", "pretty-bytes": "^6.1.1", + "pretty-ms": "^9.1.0", "prop-types": "^15.8.1", "react": "^18.2.0", "react-dom": "^18.2.0", @@ -52,7 +53,7 @@ "devDependencies": { "@esbuild-plugins/node-globals-polyfill": "^0.2.3", "@esbuild-plugins/node-modules-polyfill": "^0.2.2", - "@pcd/eslint-config-custom": "0.14.0", + "@pcd/eslint-config-custom": "0.15.0", "@types/javascript-time-ago": "^2.0.8", "@types/lodash": "^4.14.202", "@types/react": "^18.2.6", diff --git a/apps/generic-issuance-client/src/pages/dashboard/PipelineTable.tsx b/apps/generic-issuance-client/src/pages/dashboard/PipelineTable.tsx index 4fc392c57a..e6da5bade5 100644 --- a/apps/generic-issuance-client/src/pages/dashboard/PipelineTable.tsx +++ b/apps/generic-issuance-client/src/pages/dashboard/PipelineTable.tsx @@ -14,6 +14,7 @@ import { getSortedRowModel, useReactTable } from "@tanstack/react-table"; +import prettyMilliseconds from "pretty-ms"; import { ReactNode, useCallback, useMemo, useState } from "react"; import styled, { FlattenSimpleInterpolation, css } from "styled-components"; import { PodLink } from "../../components/Core"; @@ -50,7 +51,7 @@ export type PipelineRow = { id: string; loadTraceLink: string; allTraceLink: string; - lastLoad?: string; + lastLoadDetails?: string; name?: string; displayName: string; pipeline: PipelineDefinition; @@ -88,7 +89,16 @@ export function PipelineTable({ id: entry.pipeline.id, loadTraceLink: getLoadTraceHoneycombLinkForPipeline(entry.pipeline.id), allTraceLink: getAllHoneycombLinkForPipeline(entry.pipeline.id), - lastLoad: entry.extraInfo.lastLoad?.lastRunEndTimestamp, + lastLoadDetails: entry.extraInfo.lastLoad + ? timeAgoStr(entry.extraInfo.lastLoad.lastRunEndTimestamp) + + " ago in " + + prettyMilliseconds( + new Date(entry.extraInfo.lastLoad.lastRunEndTimestamp).getTime() - + new Date( + entry.extraInfo.lastLoad.lastRunStartTimestamp + ).getTime() + ) + : "n/a", name: entry.pipeline.options?.name, displayName: pipelineDisplayNameStr(entry.pipeline), pipeline: entry.pipeline @@ -169,9 +179,9 @@ export function PipelineTable({ ) }), - columnHelper.accessor("lastLoad", { + columnHelper.accessor("lastLoadDetails", { header: "Last Load", - cell: (props) => timeAgoStr(props.row.original.lastLoad) + cell: (props) => props.row.original.lastLoadDetails }), isAdminView diff --git a/apps/passport-client/.env.example b/apps/passport-client/.env.example index 7bc4e57c2d..be27c545aa 100644 --- a/apps/passport-client/.env.example +++ b/apps/passport-client/.env.example @@ -55,3 +55,9 @@ DISABLE_CONSOLE_LOG= # Some origins are allowed to query Devcon tickets directly. Origins not in this list cannot do so: DEVCON_TICKET_QUERY_ORIGINS='["http://example.com", "http://localhost:3200"]' + +# If IGNORE_NON_PRIORITY_FEEDS=true, then non-priority feeds will be ignored. +IGNORE_NON_PRIORITY_FEEDS=false + +# URLs of feed providers that are priority feeds. +PRIORITY_FEED_PROVIDER_URLS='[]' diff --git a/apps/passport-client/CHANGELOG.md b/apps/passport-client/CHANGELOG.md index a2d9e05623..09bf1cd5e4 100644 --- a/apps/passport-client/CHANGELOG.md +++ b/apps/passport-client/CHANGELOG.md @@ -1,5 +1,60 @@ # passport-client +## 0.0.41 + +### Patch Changes + +- Updated dependencies + - @pcd/client-shared@0.4.0 + - @pcd/emitter@0.9.0 + - @pcd/gpc@0.4.0 + - @pcd/gpcircuits@0.5.0 + - @pcd/passport-crypto@0.15.0 + - @pcd/passport-interface@0.15.0 + - @pcd/passport-ui@0.15.0 + - @pcd/pcd-collection@0.15.0 + - @pcd/pcd-types@0.15.0 + - @pcd/pod@0.5.0 + - @pcd/util@0.9.0 + - @pcd/eddsa-frog-pcd@0.7.0 + - @pcd/eddsa-pcd@0.10.0 + - @pcd/eddsa-ticket-pcd@0.10.0 + - @pcd/email-pcd@0.10.0 + - @pcd/ethereum-ownership-pcd@0.15.0 + - @pcd/gpc-pcd@0.4.0 + - @pcd/halo-nonce-pcd@0.11.0 + - @pcd/message-pcd@0.5.0 + - @pcd/pod-pcd@0.5.0 + - @pcd/pod-ticket-pcd@0.5.0 + - @pcd/rsa-image-pcd@0.9.0 + - @pcd/rsa-pcd@0.10.0 + - @pcd/rsa-ticket-pcd@0.10.0 + - @pcd/semaphore-group-pcd@0.15.0 + - @pcd/semaphore-identity-pcd@0.15.0 + - @pcd/semaphore-signature-pcd@0.15.0 + - @pcd/unknown-pcd@0.4.0 + - @pcd/zk-eddsa-event-ticket-pcd@0.10.0 + - @pcd/zk-eddsa-frog-pcd@0.7.0 + - @pcd/eddsa-frog-pcd-ui@0.6.0 + - @pcd/eddsa-pcd-ui@0.6.0 + - @pcd/eddsa-ticket-pcd-ui@0.6.0 + - @pcd/email-pcd-ui@0.6.0 + - @pcd/ethereum-ownership-pcd-ui@0.6.0 + - @pcd/gpc-pcd-ui@0.4.0 + - @pcd/halo-nonce-pcd-ui@0.6.0 + - @pcd/message-pcd-ui@0.5.0 + - @pcd/pod-pcd-ui@0.5.0 + - @pcd/pod-ticket-pcd-ui@0.5.0 + - @pcd/rsa-image-pcd-ui@0.6.0 + - @pcd/rsa-pcd-ui@0.6.0 + - @pcd/rsa-ticket-pcd-ui@0.6.0 + - @pcd/semaphore-group-pcd-ui@0.6.0 + - @pcd/semaphore-identity-pcd-ui@0.6.0 + - @pcd/semaphore-signature-pcd-ui@0.6.0 + - @pcd/unknown-pcd-ui@0.4.0 + - @pcd/zk-eddsa-event-ticket-pcd-ui@0.6.0 + - @pcd/zk-eddsa-frog-pcd-ui@0.6.0 + ## 0.0.40 ### Patch Changes diff --git a/apps/passport-client/build.ts b/apps/passport-client/build.ts index b4c464ffe5..911601d97c 100644 --- a/apps/passport-client/build.ts +++ b/apps/passport-client/build.ts @@ -87,6 +87,20 @@ const define = { process.env.DEVCON_TICKET_QUERY_ORIGINS ) } + : {}), + ...(process.env.IGNORE_NON_PRIORITY_FEEDS !== undefined + ? { + "process.env.IGNORE_NON_PRIORITY_FEEDS": JSON.stringify( + process.env.IGNORE_NON_PRIORITY_FEEDS + ) + } + : {}), + ...(process.env.PRIORITY_FEED_PROVIDER_URLS !== undefined + ? { + "process.env.PRIORITY_FEED_PROVIDER_URLS": JSON.stringify( + process.env.PRIORITY_FEED_PROVIDER_URLS + ) + } : {}) }; diff --git a/apps/passport-client/components/modals/ErrorPopup.tsx b/apps/passport-client/components/modals/ErrorPopup.tsx index f331c68827..556a7905bf 100644 --- a/apps/passport-client/components/modals/ErrorPopup.tsx +++ b/apps/passport-client/components/modals/ErrorPopup.tsx @@ -38,7 +38,6 @@ const ErrorBg = styled.div` right: 0; overflow-y: scroll; background: rgba(0, 0, 0, 0.5); - backdrop-filter: blur(4px); z-index: 999; display: flex; justify-content: flex-start; diff --git a/apps/passport-client/components/modals/Modal.tsx b/apps/passport-client/components/modals/Modal.tsx index 0b8a3e4f9b..dc72b36623 100644 --- a/apps/passport-client/components/modals/Modal.tsx +++ b/apps/passport-client/components/modals/Modal.tsx @@ -153,7 +153,6 @@ const ModalBg = styled.div<{ $fullScreen?: boolean }>` overflow-x: hidden; overflow-y: hidden; background: rgba(0, 0, 0, 0.5); - backdrop-filter: blur(4px); z-index: 9999; ${({ $fullScreen }: { $fullScreen?: boolean }): FlattenSimpleInterpolation => diff --git a/apps/passport-client/components/screens/EmbeddedScreens/EmbeddedGPCProofScreen.tsx b/apps/passport-client/components/screens/EmbeddedScreens/EmbeddedGPCProofScreen.tsx index 6bc62b4bfd..0d9c4beb64 100644 --- a/apps/passport-client/components/screens/EmbeddedScreens/EmbeddedGPCProofScreen.tsx +++ b/apps/passport-client/components/screens/EmbeddedScreens/EmbeddedGPCProofScreen.tsx @@ -21,11 +21,12 @@ import { usePCDCollection, useZappOrigin } from "../../../src/appHooks"; +import { BANNER_HEIGHT } from "../../../src/sharedConstants"; import { useSyncE2EEStorage } from "../../../src/useSyncE2EEStorage"; import { getGPCArtifactsURL } from "../../../src/util"; import { getPODsForCollections } from "../../../src/zapp/collections"; import { AppContainer } from "../../shared/AppContainer"; -import Select from "../../shared/Select"; +import { NativeSelect } from "../../shared/NativeSelect"; import { displayPODValue } from "../../shared/uiUtil"; export function EmbeddedGPCProofScreen({ @@ -190,9 +191,10 @@ function ProvePODInfo({ }) .filter( ([_, entry]) => - !!entry.isMemberOf || - !!entry.isNotMemberOf || - !!(entry.type === "int" && entry.inRange) + entry.type !== "null" && + (!!entry.isMemberOf || + !!entry.isNotMemberOf || + !!(entry.type === "int" && entry.inRange)) ); const defaultOption = { value: "", @@ -221,7 +223,7 @@ function ProvePODInfo({ > {name.toUpperCase()} - @@ -119,6 +124,8 @@ export const NewPasswordForm2 = ({ placeholder="Current password" error={getErrorMessage("change")} variant="secondary" + showPassword={showPassword} + onTogglePassword={togglePassword} /> )} - + {textOrLoader(submitButtonText)} - + Back {showSkipConfirm && ( - + Skip for now )} @@ -166,7 +177,7 @@ export const NewPasswordForm2 = ({ ); }; -const PasswordForm = styled.div` +const PasswordForm = styled.form` display: flex; flex-direction: column; gap: 12px; diff --git a/apps/passport-client/new-components/shared/Login/PasswordInput2.tsx b/apps/passport-client/new-components/shared/Login/PasswordInput2.tsx index 7ecfddf0af..58e4dcd9e6 100644 --- a/apps/passport-client/new-components/shared/Login/PasswordInput2.tsx +++ b/apps/passport-client/new-components/shared/Login/PasswordInput2.tsx @@ -3,23 +3,43 @@ import EyeSlashIcon from "@heroicons/react/16/solid/EyeSlashIcon"; import { ForwardedRef, forwardRef, useState } from "react"; import { Input2, NewInputProps } from "../Input"; +interface PasswordInputProps extends NewInputProps { + showPassword?: boolean; + onTogglePassword?: () => void; +} + export const PasswordInput2 = forwardRef( - (props: NewInputProps, ref: ForwardedRef): JSX.Element => { - const [showPassword, setShowPassword] = useState(false); + ( + props: PasswordInputProps, + ref: ForwardedRef + ): JSX.Element => { + const [localShowPassword, setLocalShowPassword] = useState(false); + const { showPassword, onTogglePassword, ...inputProps } = props; + + // Use local state if not provided + const isPasswordVisible = showPassword ?? localShowPassword; + const handleToggle = (): void => { + if (onTogglePassword) { + onTogglePassword(); + } else { + setLocalShowPassword((prev) => !prev); + } + }; return ( setShowPassword(true)} + onClick={handleToggle} color="#8B94AC" + cursor="pointer" /> ) : ( - setShowPassword(false)} color="#8B94AC" /> + ) } /> diff --git a/apps/passport-client/new-components/shared/Modals/HelpModal.tsx b/apps/passport-client/new-components/shared/Modals/HelpModal.tsx index c0e5524116..91c20d75bc 100644 --- a/apps/passport-client/new-components/shared/Modals/HelpModal.tsx +++ b/apps/passport-client/new-components/shared/Modals/HelpModal.tsx @@ -29,7 +29,10 @@ export const HelpModal = (): JSX.Element => { onClick: () => { dispatch({ type: "set-bottom-modal", - modal: { modalType: "manage-emails", goBackToSupport: true } + modal: { + modalType: "manage-emails", + prevModal: { modalType: "help-modal" } + } }); } }} diff --git a/apps/passport-client/new-components/shared/Modals/ManageEmailsModal.tsx b/apps/passport-client/new-components/shared/Modals/ManageEmailsModal.tsx index 761f046b24..8525871533 100644 --- a/apps/passport-client/new-components/shared/Modals/ManageEmailsModal.tsx +++ b/apps/passport-client/new-components/shared/Modals/ManageEmailsModal.tsx @@ -24,6 +24,7 @@ import { useStateContext } from "../../../src/appHooks"; import { getEmailUpdateErrorMessage } from "../../../src/errorMessage"; +import { AppState } from "../../../src/state"; import { BottomModal, BottomModalHeader } from "../BottomModal"; import { Button2 } from "../Button"; import { Input2 } from "../Input"; @@ -82,14 +83,14 @@ export const ManageEmailModal = (): JSX.Element => { const backBtn = ( { - let goBackToSupport = false; + let prevModal: AppState["bottomModal"] = { modalType: "settings" }; const isManageModal = activeBottomModal.modalType === "manage-emails"; - if (isManageModal) { - goBackToSupport = !!activeBottomModal.goBackToSupport; + if (isManageModal && activeBottomModal.prevModal) { + prevModal = activeBottomModal.prevModal; } dispatch({ type: "set-bottom-modal", - modal: { modalType: goBackToSupport ? "help-modal" : "settings" } + modal: prevModal }); reset(); }} @@ -195,6 +196,8 @@ export const ManageEmailModal = (): JSX.Element => { stateContext.update({ extraSubscriptionFetchRequested: true }); + setConfirmationCode(""); + setNewEmail(""); } else { setError( `Couldn't add '${newEmail}', please wait and try again later.` @@ -358,8 +361,8 @@ export const ManageEmailModal = (): JSX.Element => { /> {textOrLoader("Delete")} @@ -372,8 +375,7 @@ export const ManageEmailModal = (): JSX.Element => { <> The email you are about to change is:{" "} @@ -393,6 +395,7 @@ export const ManageEmailModal = (): JSX.Element => { setNewEmail(e.target.value); setError(""); }} + error={error} /> {emailManagerState === EmailManagerState.changeEmailEnterConfirmationCode && ( @@ -413,12 +416,7 @@ export const ManageEmailModal = (): JSX.Element => { )} { - emailManagerState === - EmailManagerState.changeEmailEnterConfirmationCode - ? onChangeEmail() - : sendConfirmationCode(); - }} + type="submit" disabled={ errorOrLoading || (emailManagerState === @@ -433,11 +431,11 @@ export const ManageEmailModal = (): JSX.Element => { : "Get confirmation code" )} - {backToManageBtn} ); + const addEmailView = ( <> { error={error} /> - sendConfirmationCode()} - disabled={errorOrLoading} - > + {textOrLoader("Get confirmation code")} {backToManageBtn} ); + const emailListView = ( <> { setOldEmail(email); setEmailManagerState(EmailManagerState.changeEmail); }} + key={email} /> ))} {self && self.emails.length < 5 && ( setEmailManagerState(EmailManagerState.addEmail)} + onClick={(e) => { + e.preventDefault(); + setEmailManagerState(EmailManagerState.addEmail); + }} disabled={errorOrLoading} > Add email @@ -511,8 +511,11 @@ export const ManageEmailModal = (): JSX.Element => { { - setConfirmationCode(e.target.value); + setConfirmationCode(e.target.value.replace(/\D/g, "")); setError(""); }} value={confirmationCode} @@ -520,10 +523,7 @@ export const ManageEmailModal = (): JSX.Element => { placeholder="Enter confirmation code" /> - verifyCode()} - disabled={errorOrLoading || !confirmationCode} - > + {textOrLoader("Verify")} {backToManageBtn} @@ -548,12 +548,47 @@ export const ManageEmailModal = (): JSX.Element => { return emailListView; } }; + return ( reset()} isOpen={activeBottomModal.modalType === "manage-emails"} > - {getComponentState(emailManagerState)} + { + e.preventDefault(); + if (emailManagerState) { + switch (emailManagerState) { + case EmailManagerState.addEmail: + sendConfirmationCode(); + break; + case EmailManagerState.changeEmail: + sendConfirmationCode(); + break; + case EmailManagerState.changeEmailEnterConfirmationCode: + onChangeEmail(); + break; + case EmailManagerState.deleteEmail: + if (emailToRemove === emailToRemoveText) { + onRemoveEmail(); + } + break; + case EmailManagerState.enterConfirmationCode: + if (confirmationCode) { + verifyCode(); + } + break; + } + } + }} + > + {getComponentState(emailManagerState)} + ); }; @@ -631,6 +666,7 @@ const EmailInput = ({ ); }; + const EmailsContainer = styled.div` display: flex; flex-direction: column; @@ -643,7 +679,7 @@ const ButtonsContainer = styled.div` gap: 8px; `; -const Container = styled.div` +const Container = styled.form` display: flex; flex-direction: column; gap: 24px; diff --git a/apps/passport-client/new-components/shared/Modals/PodsCollectionBottomModal.tsx b/apps/passport-client/new-components/shared/Modals/PodsCollectionBottomModal.tsx index 1c0d1191fd..2078f33684 100644 --- a/apps/passport-client/new-components/shared/Modals/PodsCollectionBottomModal.tsx +++ b/apps/passport-client/new-components/shared/Modals/PodsCollectionBottomModal.tsx @@ -10,7 +10,6 @@ import { import { isPODTicketPCD } from "@pcd/pod-ticket-pcd"; import { isUnknownPCD } from "@pcd/unknown-pcd"; import { isZKEdDSAFrogPCD } from "@pcd/zk-eddsa-frog-pcd"; -import intersectionWith from "lodash/intersectionWith"; import { ReactElement, ReactNode, @@ -29,7 +28,7 @@ import { useDispatch, usePCDCollection } from "../../../src/appHooks"; -import { ScrollIndicator } from "../../screens/Home/NewHomeScreen"; +import { ScrollIndicator } from "../../screens/Home/ScrollIndicator"; import { Avatar } from "../Avatar"; import { BottomModal } from "../BottomModal"; import { Button2 } from "../Button"; @@ -38,11 +37,30 @@ import { GroupType, List } from "../List"; import { Typography } from "../Typography"; import { POD_FOLDER_DISPLAY_SEPERATOR, + hideScrollCSS, replaceDotWithSlash, - useOrientation, - hideScrollCSS + useOrientation } from "../utils"; +const filterOverlappingEdDSATickets = ( + pcds: PCD[] +): PCD[] => { + const eddsaTickets = pcds.filter(isEdDSATicketPCD); + const podTickets = pcds.filter(isPODTicketPCD); + const overlapping = eddsaTickets + .filter((eddsa) => + podTickets.find( + (pod) => + pod.claim.ticket.attendeeEmail === eddsa.claim.ticket.attendeeEmail && + pod.claim.ticket.eventId === eddsa.claim.ticket.eventId + ) + ) + .map((eddsa) => eddsa.id); + + const noEmails = pcds.filter((p) => !isEmailPCD(p)); + + return noEmails.filter((pcd) => !overlapping.includes(pcd.id)); +}; const getPcdName = (pcd: PCD): string => { switch (true) { case isEdDSATicketPCD(pcd) || isPODTicketPCD(pcd): @@ -99,18 +117,7 @@ export const PodsCollectionList = ({ const podsCollectionList = useMemo(() => { const allPcds = pcdCollection.getAll(); - // If we have the same ticket in both POD and EDSA, we want to show only the POD one - const podTickets = allPcds.filter(isPODTicketPCD); - const eddsaTickets = allPcds.filter(isEdDSATicketPCD); - const badTicketsIds = intersectionWith(eddsaTickets, podTickets, (a, b) => { - return a.claim.ticket.ticketId === b.claim.ticket.ticketId; - }).map((ticket) => ticket.id); - const filteredPcds = allPcds.filter( - (pcd) => - (!isEdDSATicketPCD(pcd) || !badTicketsIds.includes(pcd.id)) && - !isEmailPCD(pcd) - ); - + const filteredPods = filterOverlappingEdDSATickets(allPcds); // Group PCDs by folder and create a list of groups with the items inside const result: Record = {}; @@ -121,7 +128,7 @@ export const PodsCollectionList = ({ if (!result[value]) { const isItTheFirstGroup = !Object.keys(result).length; const shouldExpandedByDefault = - isItTheFirstGroup || filteredPcds.length < 20; + isItTheFirstGroup || filteredPods.length < 20; result[value] = { title: value.replace(/\//g, ` ${POD_FOLDER_DISPLAY_SEPERATOR} `), id: value, // setting the folder path as a key @@ -133,7 +140,7 @@ export const PodsCollectionList = ({ }; } - const pcd = filteredPcds.find((pcd) => pcd.id === key); + const pcd = filteredPods.find((pcd) => pcd.id === key); if (!pcd) continue; result[value].children.push({ @@ -145,7 +152,6 @@ export const PodsCollectionList = ({ LeftIcon: getPCDImage(pcd) }); } - return Object.values(result) .map((group) => { if (!searchQuery) { @@ -209,6 +215,7 @@ export const PodsCollectionBottomModal = (): JSX.Element | null => { const dispatch = useDispatch(); const [params, setParams] = useSearchParams(); const orientation = useOrientation(); + const isLandscape = orientation.type === "landscape-primary" || orientation.type === "landscape-secondary"; @@ -326,7 +333,37 @@ export const PodsCollectionBottomModal = (): JSX.Element | null => { }} > {activePod ? ( - + => { + if ( + !confirm( + "Are you sure you want to delete this? This action is not reversible." + ) + ) { + return; + } + await dispatch({ type: "remove-pcd", id: activePod.id }); + if (modalGoBackBehavior === "back") { + dispatch({ + type: "set-bottom-modal", + modal: { + modalType: "pods-collection" + } + }); + } else { + dispatch({ + type: "set-bottom-modal", + modal: { modalType: "none" } + }); + } + } + : undefined + } + /> ) : ( <> ` flex-direction: column; // 50px comes from 24px padding we have on the bottom modal max-height: calc( - 100vh - ${({ isLandscape }): number => (isLandscape ? 50 : 120)}px + 100vh - ${({ isLandscape }): number => (isLandscape ? 80 : 150)}px ); `; const ContainerWithPadding = styled.div` diff --git a/apps/passport-client/new-components/shared/Modals/ProveModal.tsx b/apps/passport-client/new-components/shared/Modals/ProveModal.tsx index 150d46f309..d84cb43d5a 100644 --- a/apps/passport-client/new-components/shared/Modals/ProveModal.tsx +++ b/apps/passport-client/new-components/shared/Modals/ProveModal.tsx @@ -6,7 +6,7 @@ import { getScreen } from "../../../components/screens/ProveScreen/ProveScreen"; export const ProveModal = (): ReactElement | null => { const activeModal = useBottomModal(); const dispatch = useDispatch(); - if (activeModal.modalType !== "prove") { + if (activeModal.modalType !== "prove" || !activeModal.request) { return null; } diff --git a/apps/passport-client/new-components/shared/Modals/SessionExpiredModal.tsx b/apps/passport-client/new-components/shared/Modals/SessionExpiredModal.tsx index 10193cdbc5..252aa129b8 100644 --- a/apps/passport-client/new-components/shared/Modals/SessionExpiredModal.tsx +++ b/apps/passport-client/new-components/shared/Modals/SessionExpiredModal.tsx @@ -1,10 +1,10 @@ -import React, { ReactElement, useCallback } from "react"; -import { BottomModal } from "../BottomModal"; -import { Typography } from "../Typography"; +import { ReactElement, useCallback } from "react"; +import styled from "styled-components"; import { useBottomModal, useDispatch } from "../../../src/appHooks"; +import { BottomModal } from "../BottomModal"; import { Button2 } from "../Button"; +import { Typography } from "../Typography"; import { useExport } from "../utils"; -import styled from "styled-components"; const optionsList = [ "Reload this page", @@ -101,7 +101,7 @@ export const SessionExpiredModal = (): ReactElement => { {optionsList.map((option, i) => ( - + {i + 1} diff --git a/apps/passport-client/new-components/shared/NewLoader.tsx b/apps/passport-client/new-components/shared/NewLoader.tsx index bb777e96d5..fe70571c8d 100644 --- a/apps/passport-client/new-components/shared/NewLoader.tsx +++ b/apps/passport-client/new-components/shared/NewLoader.tsx @@ -5,21 +5,34 @@ type LoaderProps = { rows?: number; columns?: number; color?: string; + size?: number; + gap?: number; }; -const Rect = styled.div<{ active: boolean; color: string }>` - width: 8px; - height: 8px; +const Rect = styled.div<{ active: boolean; color: string; size: number }>` + width: ${({ size }): number => size}px; + height: ${({ size }): number => size}px; background: ${({ color }): string => color}; opacity: ${({ active }): number => (active ? 1 : 0.2)}; `; -const Container = styled.div<{ rows: number; columns: number }>` +const Container = styled.div<{ + rows: number; + columns: number; + size: number; + gap: number; +}>` display: grid; place-items: center; - grid-template-rows: repeat(${({ rows }): number => rows}, 8px); - grid-template-columns: repeat(${({ columns }): number => columns}, 8px); - gap: 5px; + grid-template-rows: repeat( + ${({ rows }): number => rows}, + ${({ size }): number => size}px + ); + grid-template-columns: repeat( + ${({ columns }): number => columns}, + ${({ size }): number => size}px + ); + gap: ${({ gap }): number => gap}px; `; const generateStaticNoise = (rows: number, columns: number): number[][] => { @@ -37,6 +50,8 @@ const generateStaticNoise = (rows: number, columns: number): number[][] => { export const NewLoader = ({ rows = 5, columns = 5, + gap = 5, + size = 8, color }: LoaderProps): ReactElement => { const [noise, setNoise] = useState(generateStaticNoise(rows, columns)); @@ -55,6 +70,7 @@ export const NewLoader = ({ row.push( + {grid} ); diff --git a/apps/passport-client/new-components/shared/SwipeViewContainer.tsx b/apps/passport-client/new-components/shared/SwipeViewContainer.tsx index 2331ca50d3..59017aafa3 100644 --- a/apps/passport-client/new-components/shared/SwipeViewContainer.tsx +++ b/apps/passport-client/new-components/shared/SwipeViewContainer.tsx @@ -2,6 +2,8 @@ import styled from "styled-components"; export const SwipeViewContainer = styled.div<{ isZapp?: boolean }>` position: relative; - width: min(100vw, 420px); - height: ${({ isZapp }): string => (isZapp ? "100vh" : "inherit")}; + ${({ isZapp }): string => (isZapp ? "height: 100vh;" : "")}; + display: flex; + flex-direction: column; + width: 100%; `; diff --git a/apps/passport-client/new-components/shared/TicketCard.tsx b/apps/passport-client/new-components/shared/TicketCard.tsx index e909e555b5..197c756c92 100644 --- a/apps/passport-client/new-components/shared/TicketCard.tsx +++ b/apps/passport-client/new-components/shared/TicketCard.tsx @@ -1,6 +1,6 @@ import { Property } from "csstype"; -import { forwardRef } from "react"; -import styled from "styled-components"; +import { forwardRef, useState } from "react"; +import styled, { keyframes } from "styled-components"; import { Typography } from "./Typography"; export const TicketCardHeight = 300; @@ -33,15 +33,56 @@ const TicketCardContainer = styled.div<{ 0px 4px 6px -1px rgba(0, 0, 0, 0.1); `; -const TicketCardImage = styled.div<{ src?: string }>` - ${({ src }): string | undefined => - src ? `background: url(${src});` : undefined} +const TicketCardImage = styled.img<{ src?: string }>` background-size: cover; background-position: 50% 50%; width: 100%; height: 100%; `; +const shimmer = keyframes` + 0% { + transform: translateX(-100%); + } + 100% { + transform: translateX(100%); + } +`; + +const LoaderContainer = styled.div` + height: 100%; + display: flex; + justify-content: center; + align-items: center; + + /* Skeleton styling */ + .skeleton { + width: 100%; + height: 100%; + background-color: #e0e0e0; + position: relative; + overflow: hidden; + border-radius: 8px; + + &::before { + content: ""; + display: block; + position: absolute; + top: 0; + left: 0; + width: 200%; + height: 100%; + background-image: linear-gradient( + 90deg, + rgba(255, 255, 255, 0) 0%, + rgba(255, 255, 255, 0.4) 50%, + /* Increased opacity for more contrast */ rgba(255, 255, 255, 0) 100% + ); + animation: ${shimmer} 2s infinite linear; + } + } +`; + const TicketCardImageContainer = styled.div` position: relative; width: 100%; @@ -72,6 +113,7 @@ export const TicketCard = forwardRef( { imgSource, title, address, ticketCount, cardColor, ticketWidth }, ref ): JSX.Element => { + const [imageLoading, setImageLoading] = useState(true); return ( ( $borderColor={CARD_COLORS[cardColor]} > - + {imageLoading && ( + +
+ + )} + { + setImageLoading(false); + }} + src={imgSource} + /> diff --git a/apps/passport-client/new-components/shared/Typography.tsx b/apps/passport-client/new-components/shared/Typography.tsx index 844b7a1238..4718227016 100644 --- a/apps/passport-client/new-components/shared/Typography.tsx +++ b/apps/passport-client/new-components/shared/Typography.tsx @@ -3,7 +3,7 @@ import React from "react"; import styled from "styled-components"; export type FontWeight = 400 | 500 | 600 | 700 | 800 | 900; -export type FontSize = 10 | 12 | 14 | 16 | 18 | 20 | 24; +export type FontSize = 10 | 12 | 14 | 16 | 18 | 20 | 24 | 28; export type FontFamily = "Barlow" | "Rubik"; const LINE_HEIGHT: Record = { "10": 13.5, @@ -12,7 +12,8 @@ const LINE_HEIGHT: Record = { "16": 21.6, "18": 24.3, "20": 27, - "24": 32.4 + "24": 32.4, + "28": 37.8 }; const TypographyText = styled.span<{ diff --git a/apps/passport-client/new-components/shared/utils.ts b/apps/passport-client/new-components/shared/utils.ts index 88056242af..8628c593dd 100644 --- a/apps/passport-client/new-components/shared/utils.ts +++ b/apps/passport-client/new-components/shared/utils.ts @@ -1,11 +1,11 @@ import { serializeStorage } from "@pcd/passport-interface"; import { useCallback, useEffect, useState } from "react"; +import { css } from "styled-components"; import { usePCDCollection, useSelf, useSubscriptions } from "../../src/appHooks"; -import { css } from "styled-components"; export const useExport = (): (() => Promise) => { const user = useSelf(); @@ -40,7 +40,7 @@ export const isMobile = /Mobi|Android/i.test(navigator.userAgent); export const useOrientation = (): ScreenOrientation => { const [state, setState] = useState( - window.screen.orientation + window.screen?.orientation ?? { type: "portrait-primary" } ); useEffect(() => { @@ -48,7 +48,7 @@ export const useOrientation = (): ScreenOrientation => { let mounted = true; const onChange = (): void => { - if (mounted) { + if (mounted && screen.orientation) { const { orientation } = screen; setState(orientation); @@ -86,3 +86,14 @@ export const hideScrollCSS = css` -ms-overflow-style: none; /* IE and Edge */ scrollbar-width: none; /* Firefox */ `; + +declare global { + interface Window { + TelegramWebviewProxy: { + postEvent: (...args: unknown[]) => unknown; + }; + } +} + +export const isInWebview = (): boolean => + !!window?.TelegramWebviewProxy?.postEvent; diff --git a/apps/passport-client/package.json b/apps/passport-client/package.json index 39baa34fac..6f61646afd 100644 --- a/apps/passport-client/package.json +++ b/apps/passport-client/package.json @@ -1,6 +1,6 @@ { "name": "passport-client", - "version": "0.0.40", + "version": "0.0.41", "license": "GPL-3.0-or-later", "private": true, "type": "module", @@ -18,59 +18,58 @@ "dependencies": { "@babel/runtime": "^7.24.0", "@heroicons/react": "^2.1.5", - "iframe-resizer-react": "1.1.0", - "@parcnet-js/client-helpers": "^1.0.7", - "@parcnet-js/client-rpc": "^1.1.6", - "@parcnet-js/podspec": "^1.1.3", - "@pcd/client-shared": "0.3.0", - "@pcd/eddsa-frog-pcd": "0.6.0", - "@pcd/eddsa-frog-pcd-ui": "0.5.0", - "@pcd/eddsa-pcd": "0.9.0", - "@pcd/eddsa-pcd-ui": "0.5.0", - "@pcd/eddsa-ticket-pcd": "0.9.0", - "@pcd/eddsa-ticket-pcd-ui": "0.5.0", - "@pcd/email-pcd": "0.9.0", - "@pcd/email-pcd-ui": "0.5.0", - "@pcd/emitter": "0.8.0", - "@pcd/ethereum-ownership-pcd": "0.14.0", - "@pcd/ethereum-ownership-pcd-ui": "0.5.0", - "@pcd/gpc": "0.3.0", - "@pcd/gpc-pcd": "0.3.0", - "@pcd/gpc-pcd-ui": "0.3.0", - "@pcd/gpcircuits": "0.4.0", - "@pcd/halo-nonce-pcd": "0.10.0", - "@pcd/halo-nonce-pcd-ui": "0.5.0", - "@pcd/message-pcd": "0.4.0", - "@pcd/message-pcd-ui": "0.4.0", - "@pcd/passport-crypto": "0.14.0", - "@pcd/passport-interface": "0.14.0", - "@pcd/passport-ui": "0.14.0", - "@pcd/pcd-collection": "0.14.0", - "@pcd/pcd-types": "0.14.0", - "@pcd/pod": "0.4.0", - "@pcd/pod-pcd": "0.4.0", - "@pcd/pod-pcd-ui": "0.4.0", - "@pcd/pod-ticket-pcd": "0.4.0", - "@pcd/pod-ticket-pcd-ui": "0.4.0", - "@pcd/rsa-image-pcd": "0.8.0", - "@pcd/rsa-image-pcd-ui": "0.5.0", - "@pcd/rsa-pcd": "0.9.0", - "@pcd/rsa-pcd-ui": "0.5.0", - "@pcd/rsa-ticket-pcd": "0.9.0", - "@pcd/rsa-ticket-pcd-ui": "0.5.0", - "@pcd/semaphore-group-pcd": "0.14.0", - "@pcd/semaphore-group-pcd-ui": "0.5.0", - "@pcd/semaphore-identity-pcd": "0.14.0", - "@pcd/semaphore-identity-pcd-ui": "0.5.0", - "@pcd/semaphore-signature-pcd": "0.14.0", - "@pcd/semaphore-signature-pcd-ui": "0.5.0", - "@pcd/unknown-pcd": "0.3.0", - "@pcd/unknown-pcd-ui": "0.3.0", - "@pcd/util": "^0.8.0", - "@pcd/zk-eddsa-event-ticket-pcd": "0.9.0", - "@pcd/zk-eddsa-event-ticket-pcd-ui": "0.5.0", - "@pcd/zk-eddsa-frog-pcd": "0.6.0", - "@pcd/zk-eddsa-frog-pcd-ui": "0.5.0", + "@parcnet-js/client-helpers": "^1.0.8", + "@parcnet-js/client-rpc": "^1.2.0", + "@parcnet-js/podspec": "^1.2.0", + "@pcd/client-shared": "0.4.0", + "@pcd/eddsa-frog-pcd": "0.7.0", + "@pcd/eddsa-frog-pcd-ui": "0.6.0", + "@pcd/eddsa-pcd": "0.10.0", + "@pcd/eddsa-pcd-ui": "0.6.0", + "@pcd/eddsa-ticket-pcd": "0.10.0", + "@pcd/eddsa-ticket-pcd-ui": "0.6.0", + "@pcd/email-pcd": "0.10.0", + "@pcd/email-pcd-ui": "0.6.0", + "@pcd/emitter": "0.9.0", + "@pcd/ethereum-ownership-pcd": "0.15.0", + "@pcd/ethereum-ownership-pcd-ui": "0.6.0", + "@pcd/gpc": "0.4.0", + "@pcd/gpc-pcd": "0.4.0", + "@pcd/gpc-pcd-ui": "0.4.0", + "@pcd/gpcircuits": "0.5.0", + "@pcd/halo-nonce-pcd": "0.11.0", + "@pcd/halo-nonce-pcd-ui": "0.6.0", + "@pcd/message-pcd": "0.5.0", + "@pcd/message-pcd-ui": "0.5.0", + "@pcd/passport-crypto": "0.15.0", + "@pcd/passport-interface": "0.15.0", + "@pcd/passport-ui": "0.15.0", + "@pcd/pcd-collection": "0.15.0", + "@pcd/pcd-types": "0.15.0", + "@pcd/pod": "0.5.0", + "@pcd/pod-pcd": "0.5.0", + "@pcd/pod-pcd-ui": "0.5.0", + "@pcd/pod-ticket-pcd": "0.5.0", + "@pcd/pod-ticket-pcd-ui": "0.5.0", + "@pcd/rsa-image-pcd": "0.9.0", + "@pcd/rsa-image-pcd-ui": "0.6.0", + "@pcd/rsa-pcd": "0.10.0", + "@pcd/rsa-pcd-ui": "0.6.0", + "@pcd/rsa-ticket-pcd": "0.10.0", + "@pcd/rsa-ticket-pcd-ui": "0.6.0", + "@pcd/semaphore-group-pcd": "0.15.0", + "@pcd/semaphore-group-pcd-ui": "0.6.0", + "@pcd/semaphore-identity-pcd": "0.15.0", + "@pcd/semaphore-identity-pcd-ui": "0.6.0", + "@pcd/semaphore-signature-pcd": "0.15.0", + "@pcd/semaphore-signature-pcd-ui": "0.6.0", + "@pcd/unknown-pcd": "0.4.0", + "@pcd/unknown-pcd-ui": "0.4.0", + "@pcd/util": "^0.9.0", + "@pcd/zk-eddsa-event-ticket-pcd": "0.10.0", + "@pcd/zk-eddsa-event-ticket-pcd-ui": "0.6.0", + "@pcd/zk-eddsa-frog-pcd": "0.7.0", + "@pcd/zk-eddsa-frog-pcd-ui": "0.6.0", "@rollbar/react": "^0.11.1", "@semaphore-protocol/identity": "^3.15.2", "@types/react-swipeable-views": "^0.13.5", @@ -81,7 +80,6 @@ "email-validator": "^2.0.4", "fast-json-stable-stringify": "^2.1.0", "handlebars": "^4.7.7", - "iframe-resizer-react": "1.1.0", "isomorphic-timers-promises": "^1.0.1", "js-sha256": "^0.11.0", "lodash": "^4.17.21", @@ -118,7 +116,7 @@ "devDependencies": { "@esbuild-plugins/node-globals-polyfill": "^0.2.3", "@esbuild-plugins/node-modules-polyfill": "^0.2.2", - "@pcd/eslint-config-custom": "0.14.0", + "@pcd/eslint-config-custom": "0.15.0", "@pcd/proto-pod-gpc-artifacts": "0.13.0", "@types/email-validator": "^1.0.6", "@types/express": "^4.17.17", diff --git a/apps/passport-client/pages/index.tsx b/apps/passport-client/pages/index.tsx index e28431ccc5..8fc881a33d 100644 --- a/apps/passport-client/pages/index.tsx +++ b/apps/passport-client/pages/index.tsx @@ -50,8 +50,7 @@ import { ConnectPopupScreen } from "../components/screens/ZappScreens/ConnectPop import { AppContainer, Background, - CenterColumn, - GlobalBackground + CenterColumn } from "../components/shared/AppContainer"; import { useTsParticles } from "../components/shared/useTsParticles"; import { NewHomeScreen } from "../new-components/screens/Home"; @@ -83,6 +82,21 @@ import { ListenMode, useZappServer } from "../src/zapp/useZappServer"; enableLiveReload(); +// Delete local storage and reload if forceNewSession is set +if (typeof window !== "undefined") { + const params = new URLSearchParams(window.location.search); + if (params.has("forceNewSession")) { + localStorage.clear(); + const newParams = new URLSearchParams(window.location.search); + newParams.delete("forceNewSession"); + const newSearch = newParams.toString(); + const newPath = `${window.location.pathname}${ + newSearch ? `?${newSearch}` : "" + }${window.location.hash}`; + window.location.replace(newPath); + } +} + function App(): JSX.Element { useBackgroundJobs(); useZappServer(ListenMode.LISTEN_IF_EMBEDDED); @@ -208,7 +222,7 @@ function RouterImpl(): JSX.Element { element={} /> */} } /> - - + diff --git a/apps/passport-client/public/global-zupass.css b/apps/passport-client/public/global-zupass.css index d4dfca3a01..0c9876ce46 100644 --- a/apps/passport-client/public/global-zupass.css +++ b/apps/passport-client/public/global-zupass.css @@ -22,7 +22,7 @@ html { --text-tertiary: #8b94ac; --text-primary: #1e2c50; - --core-accent: #01685c; + --core-accent: #0077ff; --dot-bg: #ececec; --dot-color: #e4e4e4; @@ -51,13 +51,22 @@ html { system-ui, sans-serif; line-height: 1.5; + + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; } body { + overflow: auto; + height: 100%; + overflow-y: scroll; - -webkit-user-select: none; /* Safari */ - -ms-user-select: none; /* IE 10 and IE 11 */ - user-select: none; /* Standard syntax */ + -webkit-user-select: none; + /* Safari */ + -ms-user-select: none; + /* IE 10 and IE 11 */ + user-select: none; + /* Standard syntax */ } a, diff --git a/apps/passport-client/public/images/devcon/devcon-landscape.webp b/apps/passport-client/public/images/devcon/devcon-landscape.webp new file mode 100644 index 0000000000..3e1c7c883c Binary files /dev/null and b/apps/passport-client/public/images/devcon/devcon-landscape.webp differ diff --git a/apps/passport-client/public/images/devcon/devcon-portrait.webp b/apps/passport-client/public/images/devcon/devcon-portrait.webp new file mode 100644 index 0000000000..96283211ba Binary files /dev/null and b/apps/passport-client/public/images/devcon/devcon-portrait.webp differ diff --git a/apps/passport-client/public/images/zuzalu/zuconnect-landscape.webp b/apps/passport-client/public/images/zuzalu/zuconnect-landscape.webp new file mode 100644 index 0000000000..ae5cbe0e50 Binary files /dev/null and b/apps/passport-client/public/images/zuzalu/zuconnect-landscape.webp differ diff --git a/apps/passport-client/public/images/zuzalu/zuzalu-landscape.webp b/apps/passport-client/public/images/zuzalu/zuzalu-landscape.webp new file mode 100644 index 0000000000..cfb938bd26 Binary files /dev/null and b/apps/passport-client/public/images/zuzalu/zuzalu-landscape.webp differ diff --git a/apps/passport-client/src/appConfig.ts b/apps/passport-client/src/appConfig.ts index 8b124b9503..d97c5aedfe 100644 --- a/apps/passport-client/src/appConfig.ts +++ b/apps/passport-client/src/appConfig.ts @@ -21,6 +21,10 @@ interface AppConfig { embeddedZapps: Record; // origins that are allowed to query Devcon tickets directly devconTicketQueryOrigins: string[]; + // If IGNORE_NON_PRIORITY_FEEDS=true, then non-priority feeds will be ignored. + ignoreNonPriorityFeeds: boolean; + // URLs of feed providers that are priority feeds. + priorityFeedProviderUrls: string[]; } if ( @@ -84,7 +88,11 @@ export const appConfig: AppConfig = { zappRestrictOrigins: process.env.ZAPP_RESTRICT_ORIGINS === "true", zappAllowedSignerOrigins: zappAllowedSignerOrigins, embeddedZapps: embeddedZapps, - devconTicketQueryOrigins: devconTicketQueryOrigins + devconTicketQueryOrigins: devconTicketQueryOrigins, + ignoreNonPriorityFeeds: process.env.IGNORE_NON_PRIORITY_FEEDS === "true", + priorityFeedProviderUrls: process.env.PRIORITY_FEED_PROVIDER_URLS + ? JSON.parse(process.env.PRIORITY_FEED_PROVIDER_URLS) + : [] }; console.log("App Config: " + JSON.stringify(appConfig)); diff --git a/apps/passport-client/src/appHooks.ts b/apps/passport-client/src/appHooks.ts index 9153c99620..a0b32f360b 100644 --- a/apps/passport-client/src/appHooks.ts +++ b/apps/passport-client/src/appHooks.ts @@ -199,6 +199,10 @@ export function useLoadedIssuedPCDs(): boolean { return useSelector((s) => !!s.loadedIssuedPCDs, []); } +export function useExtraSubscriptionFetchRequested(): boolean { + return useSelector((s) => !!s.extraSubscriptionFetchRequested, []); +} + export function useIsDownloaded(): boolean { return useSelector((s) => !!s.downloadedPCDs, []); } @@ -231,7 +235,6 @@ export function useUserShouldAgreeNewPrivacyNotice(): void { export function useIsSyncSettled(): boolean { const isDownloaded = useIsDownloaded(); const loadedIssued = useLoadedIssuedPCDs(); - return isDownloaded && loadedIssued; } @@ -410,6 +413,7 @@ export const useAutoLoginFromOneClick = (): { loading: boolean } => { const [oneClickRedirect, setOneClickRedirect] = useState( localStorage.getItem(ONE_CLICK_REDIRECT_KEY) ); + const [redirectHash] = useState(location.hash); useEffect(() => { if (attemptedLogin.current) return; @@ -425,7 +429,10 @@ export const useAutoLoginFromOneClick = (): { loading: boolean } => { if (self?.emails?.includes(email)) throw new Error("User is already logged in"); - location.hash = `#${oneClickRedirect}`; + const base = `#${oneClickRedirect.trim()}`; + window.location.hash = redirectHash + ? `${base}?redirectHash=${encodeURIComponent(redirectHash.trim())}` + : base; } catch (error) { console.error("Unable to auto-login", error); } finally { @@ -435,7 +442,7 @@ export const useAutoLoginFromOneClick = (): { loading: boolean } => { }; attemptAutoLogin(); - }, [dispatch, self, oneClickRedirect]); + }, [dispatch, self, oneClickRedirect, redirectHash]); return { loading: !!oneClickRedirect }; }; diff --git a/apps/passport-client/src/dispatch.ts b/apps/passport-client/src/dispatch.ts index 8295910c59..d9b0d25a25 100644 --- a/apps/passport-client/src/dispatch.ts +++ b/apps/passport-client/src/dispatch.ts @@ -399,6 +399,8 @@ async function oneClickLogin( state: AppState, update: ZuUpdate ): Promise { + if (state.self) throw new Error("User is already logged in"); + update({ modal: { modalType: "none" } }); @@ -1158,14 +1160,23 @@ async function doSync( onSubscriptionResult, state.subscriptions .getActiveSubscriptions() - .filter( - (s) => - s.id !== + .filter((s) => { + if ( + s.id === state.subscriptions.findSubscription( ZUPASS_FEED_URL, ZupassFeedIds.Email )?.id - ) + ) { + return false; + } + + if (appConfig.ignoreNonPriorityFeeds) { + return appConfig.priorityFeedProviderUrls.includes(s.providerUrl); + } + + return true; + }) .map((s) => s.id) ); diff --git a/apps/passport-client/src/password.ts b/apps/passport-client/src/password.ts index 09ba781354..407df89094 100644 --- a/apps/passport-client/src/password.ts +++ b/apps/passport-client/src/password.ts @@ -41,7 +41,7 @@ export const setPassword = async ( ); } else if (res.error.name === "Conflict") { update({ extraDownloadRequested: true }); - throw new Error(`Cannot change password while PCDs are syncing. + throw new Error(`Cannot change password while PODs are syncing. Wait for download to complete or reload the page and try again.`); } else { throw new Error( diff --git a/apps/passport-client/src/sharedConstants.ts b/apps/passport-client/src/sharedConstants.ts index de948cdf66..cab834dae5 100644 --- a/apps/passport-client/src/sharedConstants.ts +++ b/apps/passport-client/src/sharedConstants.ts @@ -25,7 +25,7 @@ export const OUTDATED_BROWSER_ERROR_MESSAGE = export const OOM_ERROR_MESSAGE = "Out of memory"; -export const MAX_WIDTH_SCREEN = 420; +export const MAX_WIDTH_SCREEN = 440; // Environment variable configure how we fetch GPC artifacts, however we // default to fetching from the Zupass server rather than jsdelivr. @@ -45,3 +45,4 @@ export const GPC_ARTIFACTS_CONFIG = export const ZUPASS_GPC_ARTIFACT_BASE_PATH = `/artifacts/proto-pod-gpc`; export const ZUPASS_GPC_ARTIFACT_PATH = ZUPASS_GPC_ARTIFACT_BASE_PATH + `/${ARTIFACTS_NPM_VERSION}`; +export const BANNER_HEIGHT = 0; diff --git a/apps/passport-client/src/state.ts b/apps/passport-client/src/state.ts index 8535888452..124f500378 100644 --- a/apps/passport-client/src/state.ts +++ b/apps/passport-client/src/state.ts @@ -44,8 +44,12 @@ export interface AppState { | { modalType: "success-modal"; title: string; description: string } | { modalType: "about"; modalGoBackBehavior?: "close" | "back" } | { modalType: "import" } - | { modalType: "prove"; request: PCDGetRequest } - | { modalType: "manage-emails"; goBackToSupport?: boolean } + | { modalType: "prove"; request?: PCDGetRequest } + | { + modalType: "manage-emails"; + prevModal?: AppState["bottomModal"]; + dismissble?: boolean; + } | { modalType: "delete-account" } | { modalType: "ticket-add-ons"; addOns: TicketType[] } | { modalType: "help-modal" } diff --git a/apps/passport-client/src/worker/service-worker.ts b/apps/passport-client/src/worker/service-worker.ts index c6779ac419..8dbcb26d78 100644 --- a/apps/passport-client/src/worker/service-worker.ts +++ b/apps/passport-client/src/worker/service-worker.ts @@ -117,6 +117,8 @@ const STABLE_CACHE_RESOURCES = new Set([ "/images/social.webp", "/images/star.webp", "/images/wristband.webp", + "/images/devcon/devcon-portrait.webp", + "/images/devcon/devcon-landscape.webp", "fonts/Rubik-Black.ttf", "fonts/Rubik-BlackItalic.ttf", "fonts/Rubik-Bold.ttf", diff --git a/apps/passport-client/src/zapp/ZappServer.ts b/apps/passport-client/src/zapp/ZappServer.ts index 9091cd9ba1..c3b0c8c687 100644 --- a/apps/passport-client/src/zapp/ZappServer.ts +++ b/apps/passport-client/src/zapp/ZappServer.ts @@ -27,7 +27,6 @@ import { ticketToPOD } from "@pcd/pod-ticket-pcd"; import { v3tov4Identity } from "@pcd/semaphore-identity-pcd"; -import { v4 as uuidv4 } from "uuid"; import { appConfig } from "../appConfig"; import { StateContextValue } from "../dispatch"; import { EmbeddedScreenType } from "../embedded"; @@ -164,7 +163,7 @@ class ZupassPODRPC extends BaseZappServer implements ParcnetPODRPC { ) { throw new MissingPermissionError("INSERT_POD", "pod.insert"); } - const id = uuidv4(); + const id = `pod-${podData.signature}`; const podPCD = new PODPCD( id, POD.load(podData.entries, podData.signature, podData.signerPublicKey) diff --git a/apps/passport-client/src/zapp/useZappServer.ts b/apps/passport-client/src/zapp/useZappServer.ts index cbb11b5946..6bb35f2a1c 100644 --- a/apps/passport-client/src/zapp/useZappServer.ts +++ b/apps/passport-client/src/zapp/useZappServer.ts @@ -8,6 +8,7 @@ import { useEffect } from "react"; import * as v from "valibot"; import { useStateContext } from "../appHooks"; import { StateContextValue } from "../dispatch"; +import { useSyncE2EEStorage } from "../useSyncE2EEStorage"; import { ZupassRPCProcessor } from "./ZappServer"; export enum ListenMode { @@ -34,11 +35,21 @@ async function waitForAuthentication( async function waitForFirstSync(context: StateContextValue): Promise { return new Promise((resolve) => { - if (context.getState().completedFirstSync) { + if ( + context.getState().downloadedPCDs && + context.getState().pcds.getAllPCDsInFolder("Devcon SEA").length > 0 + ) { resolve(); return; } const unlisten = context.stateEmitter.listen((state) => { + if ( + context.getState().downloadedPCDs && + context.getState().pcds.getAllPCDsInFolder("Devcon SEA").length > 0 + ) { + resolve(); + return; + } if (state.completedFirstSync) { unlisten(); resolve(); @@ -105,6 +116,7 @@ function isAlreadyAuthorized( export function useZappServer(mode: ListenMode): void { const context = useStateContext(); + useSyncE2EEStorage(); useEffect(() => { if ( diff --git a/apps/passport-server/.env.example b/apps/passport-server/.env.example index cc9fc78cc4..c71e0e3dbd 100644 --- a/apps/passport-server/.env.example +++ b/apps/passport-server/.env.example @@ -1,6 +1,6 @@ # This file is intended to be used as a starting point for local # development. You should be able to copy it as-is into a file -# named `.env` as a sibling of this file, and be able to run +# named `.env` as a sibling of this file, and be able to run # passport-server ################################################################## @@ -16,7 +16,7 @@ PASSPORT_SERVER_URL="http://localhost:3002" PASSPORT_CLIENT_URL="http://localhost:3000" # To enable notifications from the server to be sent to Discord -# +# # DISCORD_TOKEN= # DISCORD_ALERTS_CHANNEL_ID= @@ -47,11 +47,11 @@ DATABASE_DB_NAME=postgres DATABASE_SSL=false # To enable honeycomb tracing set this API key -# +# # HONEYCOMB_API_KEY= # To enable error reporting, both these environment variables must be set -# +# # ROLLBAR_TOKEN= # ROLLBAR_ENV_NAME= @@ -122,13 +122,13 @@ WORKER_QUANTITY=1 ################################################################## # So that Podbox server knows the url of where its corresponding client lives. -# +# GENERIC_ISSUANCE_CLIENT_URL="http://localhost:3005" -# To enable server-issued PCDs using the generic issuance feature, the server needs an an EdDSA -# private key. You can generate one using the following command at the root of the project, +# To enable server-issued PCDs using the generic issuance feature, the server needs an an EdDSA +# private key. You can generate one using the following command at the root of the project, # after installing dependencies and building the project: -# +# # node -e 'console.log(require("@pcd/eddsa-pcd").newEdDSAPrivateKey())' | pbcopy GENERIC_ISSUANCE_EDDSA_PRIVATE_KEY="129806f9d68c3cf87450a968748fd31f01ba4e6f2078d80f24ebab23d98df7cf" @@ -143,7 +143,7 @@ GENERIC_ISSUANCE_ZUPASS_PUBLIC_KEY=["00f669040a1c31ff18b8e221b94ac36580da68a05c6 # in the generic issuance service # e.g. you could set the value to be ["ivan@0xparc.org"] to make the server # set the user with that email address to be an admin on start-up. -# +# GENERIC_ISSUANCE_ADMINS=["ivan@0xparc.org", "admin@podbox.dev"] # if true, and both `STYTCH_PROJECT_ID` and `STYTCH_SECRET` are @@ -172,7 +172,7 @@ IS_LOCAL_HTTPS=false # TELEGRAM_BOT_DISABLED= # For anonymous message posting rate limit (per topic) -# +# # MAX_DAILY_ANON_TOPIC_POSTS_PER_USER=3 # url for anon-message-client # TELEGRAM_BOT_ANON_WEBSITE= @@ -187,15 +187,14 @@ IS_LOCAL_HTTPS=false # The anonymous message client, like https://dev.local:4000 or https://zk-tg.com # TELEGRAM_ANON_WEBSITE= - ################################################################## ################################################################## # Legacy Integration ################################################################## ################################################################## -# Zuzalu 2023 -# +# Zuzalu 2023 +# # PRETIX_TOKEN= # PRETIX_ORG_URL= # PRETIX_ZU_EVENT_ID= @@ -205,7 +204,7 @@ IS_LOCAL_HTTPS=false # ZUCONNECT_MOCK_TICKETS='["test@example.com", "another@example.com"]' # Devconnect 2023 -# +# # To disable syncing tickets from Pretix for local development # PRETIX_SYNC_DISABLED= @@ -229,4 +228,15 @@ IS_LOCAL_HTTPS=false # If true, the generic issuance service will not schedule pipeline loads on a loop, # but will instead load pipelines on demand. -# GENERIC_ISSUANCE_TEST_MODE="true" \ No newline at end of file +# GENERIC_ISSUANCE_TEST_MODE="true" + +# The list of Pretix organizer urls to enable batching order requests for. If +# batching is enabled for an organizer, the server will fetch 30 pages of orders +# at a time, rather than sequentially one page at a time. Instead of checking +# whether we've loaded all orders by checking that the last page does not have the +# `next` field in its response, we instead know that we've loaded all orders when +# there are 404 errors for pages that are not the first page, and no other errors. +# PRETIX_BATCH_ENABLED_FOR=[""] + +# The number of database connections to keep open. +# DB_POOL_SIZE=32 diff --git a/apps/passport-server/CHANGELOG.md b/apps/passport-server/CHANGELOG.md index 68dcc02cc5..154ab47055 100644 --- a/apps/passport-server/CHANGELOG.md +++ b/apps/passport-server/CHANGELOG.md @@ -1,5 +1,35 @@ # passport-server +## 0.0.41 + +### Patch Changes + +- Updated dependencies + - @pcd/passport-crypto@0.15.0 + - @pcd/passport-interface@0.15.0 + - @pcd/pcd-collection@0.15.0 + - @pcd/pcd-types@0.15.0 + - @pcd/pod@0.5.0 + - @pcd/podbox-shared@0.4.0 + - @pcd/server-shared@0.4.0 + - @pcd/util@0.9.0 + - @pcd/eddsa-frog-pcd@0.7.0 + - @pcd/eddsa-pcd@0.10.0 + - @pcd/eddsa-ticket-pcd@0.10.0 + - @pcd/email-pcd@0.10.0 + - @pcd/message-pcd@0.5.0 + - @pcd/pod-pcd@0.5.0 + - @pcd/pod-ticket-pcd@0.5.0 + - @pcd/rln-pcd@0.14.0 + - @pcd/rsa-image-pcd@0.9.0 + - @pcd/rsa-pcd@0.10.0 + - @pcd/rsa-ticket-pcd@0.10.0 + - @pcd/semaphore-group-pcd@0.15.0 + - @pcd/semaphore-identity-pcd@0.15.0 + - @pcd/semaphore-signature-pcd@0.15.0 + - @pcd/zk-eddsa-event-ticket-pcd@0.10.0 + - @pcd/zk-eddsa-frog-pcd@0.7.0 + ## 0.0.40 ### Patch Changes diff --git a/apps/passport-server/package.json b/apps/passport-server/package.json index b4f6ec17eb..8146638515 100644 --- a/apps/passport-server/package.json +++ b/apps/passport-server/package.json @@ -1,6 +1,6 @@ { "name": "passport-server", - "version": "0.0.40", + "version": "0.0.41", "license": "GPL-3.0-or-later", "private": true, "scripts": { @@ -23,30 +23,30 @@ "@opentelemetry/auto-instrumentations-node": "^0.36.0", "@opentelemetry/sdk-node": "^0.34.0", "@pagerduty/pdjs": "^2.2.4", - "@pcd/eddsa-frog-pcd": "0.6.0", - "@pcd/eddsa-pcd": "0.9.0", - "@pcd/eddsa-ticket-pcd": "0.9.0", - "@pcd/email-pcd": "0.9.0", - "@pcd/message-pcd": "0.4.0", - "@pcd/passport-crypto": "0.14.0", - "@pcd/passport-interface": "0.14.0", - "@pcd/pcd-collection": "0.14.0", - "@pcd/pcd-types": "0.14.0", - "@pcd/pod": "0.4.0", - "@pcd/pod-pcd": "0.4.0", - "@pcd/pod-ticket-pcd": "0.4.0", - "@pcd/podbox-shared": "0.3.0", - "@pcd/rln-pcd": "0.13.0", - "@pcd/rsa-image-pcd": "0.8.0", - "@pcd/rsa-pcd": "0.9.0", - "@pcd/rsa-ticket-pcd": "0.9.0", - "@pcd/semaphore-group-pcd": "0.14.0", - "@pcd/semaphore-identity-pcd": "0.14.0", - "@pcd/semaphore-signature-pcd": "0.14.0", - "@pcd/server-shared": "0.3.0", - "@pcd/util": "^0.8.0", - "@pcd/zk-eddsa-event-ticket-pcd": "0.9.0", - "@pcd/zk-eddsa-frog-pcd": "0.6.0", + "@pcd/eddsa-frog-pcd": "0.7.0", + "@pcd/eddsa-pcd": "0.10.0", + "@pcd/eddsa-ticket-pcd": "0.10.0", + "@pcd/email-pcd": "0.10.0", + "@pcd/message-pcd": "0.5.0", + "@pcd/passport-crypto": "0.15.0", + "@pcd/passport-interface": "0.15.0", + "@pcd/pcd-collection": "0.15.0", + "@pcd/pcd-types": "0.15.0", + "@pcd/pod": "0.5.0", + "@pcd/pod-pcd": "0.5.0", + "@pcd/pod-ticket-pcd": "0.5.0", + "@pcd/podbox-shared": "0.4.0", + "@pcd/rln-pcd": "0.14.0", + "@pcd/rsa-image-pcd": "0.9.0", + "@pcd/rsa-pcd": "0.10.0", + "@pcd/rsa-ticket-pcd": "0.10.0", + "@pcd/semaphore-group-pcd": "0.15.0", + "@pcd/semaphore-identity-pcd": "0.15.0", + "@pcd/semaphore-signature-pcd": "0.15.0", + "@pcd/server-shared": "0.4.0", + "@pcd/util": "^0.9.0", + "@pcd/zk-eddsa-event-ticket-pcd": "0.10.0", + "@pcd/zk-eddsa-frog-pcd": "0.7.0", "@semaphore-protocol/group": "^3.15.2", "@semaphore-protocol/identity": "^3.15.2", "@sendgrid/mail": "^7.7.0", @@ -98,8 +98,8 @@ "devDependencies": { "@grammyjs/auto-retry": "^1.1.1", "@grammyjs/menu": "^1.2.1", - "@pcd/eslint-config-custom": "0.14.0", - "@pcd/tsconfig": "0.14.0", + "@pcd/eslint-config-custom": "0.15.0", + "@pcd/tsconfig": "0.15.0", "@types/async-lock": "^1.4.2", "@types/chai": "^4.3.5", "@types/chai-as-promised": "^7.1.5", diff --git a/apps/passport-server/resources/one-click-page/error.html b/apps/passport-server/resources/one-click-page/error.html index eb4f172f88..d63c492d95 100644 --- a/apps/passport-server/resources/one-click-page/error.html +++ b/apps/passport-server/resources/one-click-page/error.html @@ -6,6 +6,13 @@ + + + + Missing ticket + .modal__button_container { + display: flex; + flex-direction: column; + width: 100%; + gap: 8px; + } + -
- - - - - - - - -
-
- Whoops, looks like you don't have a ticket. - +
+
+ NO UPCOMING EVENTS + Don't see your ticket? Learn more +
+
+ + +
+
+
+ + DON'T SEE YOUR TICKET? + + + The ticket that this link refers to either does not exist or was updated. + +
+
+ + +
+
+
diff --git a/apps/passport-server/resources/one-click-page/index.html b/apps/passport-server/resources/one-click-page/index.html index f0c4ee11dc..52da662208 100644 --- a/apps/passport-server/resources/one-click-page/index.html +++ b/apps/passport-server/resources/one-click-page/index.html @@ -7,7 +7,7 @@ -
- - - - - - - - -
-
+
+
- {{eventName}} + WELCOME TO {{eventName}}
{{eventLocation}} · @@ -466,71 +510,80 @@ 1 Ticket {{/isMoreThanOne}}
-
-
- -
- {{attendeeName}} -
- {{attendeeEmail}} - · - {{ticketName}} -
+
+ + + {{#tickets}} +
+ +
+ {{attendeeName}} +
+ {{attendeeEmail}} + · + {{ticketName}}
- {{#addonsCount}} - - {{/addonsCount}} - {{^addonsCount}} - -
- {{/addonsCount}} +
+ {{#showAddons}} + + {{/showAddons}} + {{^showAddons}} + +
+ {{/showAddons}} +
+ QR POD • ZK powered by ZUPASS
+ {{/tickets}}
@@ -563,14 +616,15 @@ fill="#154133" />
-
+ {{#tickets}} +
{{#addons}}
- +
{{name}}
@@ -578,7 +632,6 @@ {{/addons}}
- {{#moreThanOneAddon}}
+ {{/tickets}}
@@ -611,11 +665,11 @@ diff --git a/apps/passport-server/src/apis/pretix/genericPretixAPI.ts b/apps/passport-server/src/apis/pretix/genericPretixAPI.ts index 6df14cdab0..5137b94fd2 100644 --- a/apps/passport-server/src/apis/pretix/genericPretixAPI.ts +++ b/apps/passport-server/src/apis/pretix/genericPretixAPI.ts @@ -12,6 +12,7 @@ import { GenericPretixProductCategorySchema, GenericPretixProductSchema } from "@pcd/passport-interface"; +import { toError } from "@pcd/util"; import { setMaxListeners } from "events"; import PQueue from "p-queue"; import { z } from "zod"; @@ -29,6 +30,7 @@ export interface IGenericPretixAPI { orgUrl: string, token: string, eventID: string, + batch: boolean, abortController?: AbortController ): Promise; /** @@ -91,9 +93,8 @@ export interface IGenericPretixAPI { } export interface GenericPretixAPIOptions { - requestsPerInterval?: number; - concurrency?: number; - intervalMs?: number; + maxRequestsPerMinute?: number; + maxConcurrency?: number; } /** @@ -107,9 +108,9 @@ export interface GenericPretixAPIOptions { * occur at a time. */ class OrganizerRequestQueue { + private readonly interval = 60_000; private readonly maxConcurrentRequests: number; private readonly intervalCap: number; - private readonly interval: number; private cancelController: AbortController; private requestQueue: PQueue; @@ -118,13 +119,12 @@ class OrganizerRequestQueue { cancelController: AbortController, onIdle: () => void ) { - this.intervalCap = options.requestsPerInterval; - this.maxConcurrentRequests = options.concurrency; - this.interval = options.intervalMs; + this.intervalCap = options.maxRequestsPerMinute; + this.maxConcurrentRequests = options.maxConcurrency; this.cancelController = cancelController; this.requestQueue = new PQueue({ - concurrency: this.maxConcurrentRequests, interval: this.interval, + concurrency: this.maxConcurrentRequests, intervalCap: this.intervalCap }); // The "idle" handler can be used by the caller to delete this queue once @@ -193,31 +193,23 @@ class OrganizerRequestQueue { */ export class GenericPretixAPI implements IGenericPretixAPI { private cancelController: AbortController; - private readonly maxConcurrentRequests: number; - private readonly intervalCap: number; - private readonly interval: number; + + private readonly defaultMaxRequestsPerMinute = 100; + private readonly defaultMaxConcurrentRequests = 1; + + private readonly batchedMaxRequestsPerMinute = 200; + private readonly batchedMaxConcurrentRequests = 30; + private organizerQueues: Record; - public constructor(options?: GenericPretixAPIOptions) { - // These configuration options apply to the per-organizer queues: - // By default, allow 100 requests per organizer per minute. Pretix maximum - // is 300. - this.intervalCap = options?.requestsPerInterval ?? 100; - // By default, allow one request at a time (per organizer). - this.maxConcurrentRequests = options?.concurrency ?? 1; - // Rate limit time period is 60 seconds (one minute). - this.interval = options?.intervalMs ?? 60_000; - // No organizer queues exist at startup. + public constructor() { this.organizerQueues = {}; - // Used to cancel all pending requests. this.cancelController = this.newCancelController(); } private newCancelController(): AbortController { const ac = new AbortController(); - // Since we never have more than maxConcurrentRequests at the same time, - // there should never be more than that number of event listeners. - setMaxListeners(this.maxConcurrentRequests, ac.signal); + setMaxListeners(1000, ac.signal); return ac; } @@ -226,6 +218,26 @@ export class GenericPretixAPI implements IGenericPretixAPI { this.cancelController = this.newCancelController(); } + /** + * Check if batching is enabled for a given organizer. Enabled by the + * `PRETIX_BATCH_ENABLED_FOR` environment variable. See + * `apps/passport-server/.env.example` for more details. + */ + private isBatchingEnabled(orgUrl: string): boolean { + try { + const enabledFor = JSON.parse( + process.env.PRETIX_BATCH_ENABLED_FOR ?? "[]" + ); + return enabledFor instanceof Array && enabledFor.includes(orgUrl); + } catch (e) { + logger( + `[GENERIC PRETIX] Error checking if batching is enabled for ${orgUrl}`, + e + ); + return false; + } + } + /** * Given an orgUrl, find an existing queue for that organizer, or create a * new one and store a reference to it, then return the queue. @@ -237,11 +249,16 @@ export class GenericPretixAPI implements IGenericPretixAPI { private getOrCreateQueue(orgUrl: string): OrganizerRequestQueue { let queue: OrganizerRequestQueue = this.organizerQueues[orgUrl]; if (!queue) { + const batchingEnabled = this.isBatchingEnabled(orgUrl); + queue = new OrganizerRequestQueue( { - intervalMs: this.interval, - requestsPerInterval: this.intervalCap, - concurrency: this.maxConcurrentRequests + maxRequestsPerMinute: batchingEnabled + ? this.batchedMaxRequestsPerMinute + : this.defaultMaxRequestsPerMinute, + maxConcurrency: batchingEnabled + ? this.batchedMaxConcurrentRequests + : this.defaultMaxConcurrentRequests }, this.cancelController, () => { @@ -461,13 +478,196 @@ export class GenericPretixAPI implements IGenericPretixAPI { }); } + // Fetch all orders for a given event in parallel batches, which is faster + // than fetching them sequentially. + private async fetchOrdersParallelBatch( + orgUrl: string, + token: string, + eventID: string, + abortController?: AbortController + ): Promise { + return traced(TRACE_SERVICE, "fetchOrdersParallelBatch", async (span) => { + /** + * This type is only relevant internally to this function. It represents a + * response by the Pretix API to a request for a page of orders in a particular event. + */ + type PageResult = + | { + orders: GenericPretixOrder[]; + error?: never; + reachedEnd?: never; + } + | { + orders?: never; + error: Error; + reachedEnd?: never; + } + | { + orders?: never; + error?: never; + reachedEnd: true; + }; + + /** + * An 'actual error' is an error that is *NOT* due to reaching the end of + * the list of orders. I.e. a 404 error for the first page, or *ANY* other + * error for any other page. + */ + function findActualErrors(pageResults: PageResult[]): PageResult[] { + return pageResults.filter((pageResult) => pageResult.error); + } + + /** + * We 'reached the end' when we get a 404 on a request for a page of orders + * that is not the first page. We've not reached the end successfully if there + * is an 'actual error', as defined by the implementation of {@link findActualErrors}. + */ + function reachedEnd(pageResults: PageResult[]): boolean { + if (findActualErrors(pageResults).length !== 0) { + return false; + } + + return pageResults.some((pageResult) => pageResult.reachedEnd); + } + + /** + * The quantity of pages of orders to fetch in parallel in a single 'batch'. + */ + const batchSize = 30; + + /** + * The maximum page index that this batch loading mechanism will fetch. It's intended + * to prevent infinite loops in case of bugs in the Pretix API or this code. + */ + const maxPages = 1000; + + const orders: GenericPretixOrder[] = []; + let cursor = 0; + + span?.setAttribute("org_url", orgUrl); + + // to prevent infinite loops, limit the number of pages we fetch to `maxPages` + while (cursor < maxPages - batchSize) { + const pageIndexes = new Array(batchSize) + .fill(0) + .map((_, i) => i + cursor); + + // for each page index, load that page. none of these promises should throw, + // the page load result state is encapsulated in the `PageResult` type, which is + // why we can use `Promise.all` here. + const batchOfPages = await Promise.all( + pageIndexes.map(async (pageIndex): Promise => { + try { + const pageUrl = + `${orgUrl}/events/${eventID}/orders/` + + (pageIndex > 0 ? `?page=${pageIndex}` : ""); + + logger(`[GENERIC PRETIX] Fetching orders ${pageUrl}`); + + const res = await this.getOrCreateQueue(orgUrl).fetch( + pageUrl, + { + headers: { Authorization: `Token ${token}` } + }, + 0, + abortController + ); + + // an error could be legitimate, or because we've reached the end of the set of orders. + if (!res.ok) { + // if we get a 404 for anything other than the first page, that is ok, since that means + // we've reached the end of the list of orders. + if (res.status === 404 && pageIndex !== 0) { + return { + reachedEnd: true + }; + } + // otherwise, all other errors are actual errors + else { + return { + error: new Error( + `[GENERIC PRETIX] Error fetching ${pageUrl}: ${res.status} ${res.statusText}` + ) + }; + } + } + + const page = await res.json(); + const results = z + .array(GenericPretixOrderSchema) + .safeParse(page.results); + + // the page must parse successfully - incorrectly formatted responses are considered + // to be 'real' errors. + if (results.success) { + return { + orders: results.data + }; + } else { + return { + error: new Error( + `[GENERIC PRETIX] Error parsing response from ${pageUrl}: ${results.error.message}` + ) + }; + } + } catch (e) { + return { + error: toError(e) + }; + } + }) + ); + + const fetchedOrdersInBatch: GenericPretixOrder[] = batchOfPages + .map((result) => result.orders ?? []) + .flat(); + + orders.push(...fetchedOrdersInBatch); + + const actualErrors = findActualErrors(batchOfPages); + + // an actual error happens when we get an error other than a 404 on fetching a page + // of orders, or when we get a 404 response to a request for the first page. If we have + // an actual error, we throw it. + if (actualErrors.length !== 0) { + throw actualErrors[0].error; + } + // if we haven't encountered a real error yet, and also haven't reached the end of + // the set of pages of orders, then we increment the cursor and continue in this loop + // to fetch the next batch of pages. + else if (!reachedEnd(batchOfPages)) { + cursor += batchSize; + continue; + } + // otherwise, if we haven't encountered a real error, and we've 'reached the end' of the + // list of pages of orders, then we are done fetching all the orders, and we break + // out of the loop. + else { + break; + } + } + + return orders; + }); + } + // Fetch all orders for a given event. public async fetchOrders( orgUrl: string, token: string, eventID: string, + batch: boolean, abortController?: AbortController ): Promise { + if (batch && this.isBatchingEnabled(orgUrl)) { + return this.fetchOrdersParallelBatch( + orgUrl, + token, + eventID, + abortController + ); + } + return traced(TRACE_SERVICE, "fetchOrders", async (span) => { span?.setAttribute("org_url", orgUrl); const orders = []; diff --git a/apps/passport-server/src/application.ts b/apps/passport-server/src/application.ts index 4733feb96d..137d61aff6 100644 --- a/apps/passport-server/src/application.ts +++ b/apps/passport-server/src/application.ts @@ -40,10 +40,13 @@ export async function startApplication( logger(`[INIT] Starting application in mode ${mode}`); const dbPool = await getDB(); + const internalPool = await getDB(10); + const honeyClient = getHoneycombAPI(); const context: ApplicationContext = { dbPool, + internalPool, honeyClient, resourcesDir: path.join(process.cwd(), "resources"), publicResourcesDir: path.join(process.cwd(), "public"), @@ -87,6 +90,7 @@ export async function stopApplication(app?: Zupass): Promise { await stopServices(app.services); await stopHttpServer(app); await app.context.dbPool.end(); + await app.context.internalPool.end(); } async function getOverridenApis( diff --git a/apps/passport-server/src/database/postgresConfiguration.ts b/apps/passport-server/src/database/postgresConfiguration.ts index dc7ee0187f..8b84afb246 100644 --- a/apps/passport-server/src/database/postgresConfiguration.ts +++ b/apps/passport-server/src/database/postgresConfiguration.ts @@ -9,7 +9,9 @@ export interface DBConfiguration extends ClientConfig { port: number; } -export function getDatabaseConfiguration(): PoolOptionsExplicit & SslSettings { +export function getDatabaseConfiguration( + overwriteMaxConnections?: number +): PoolOptionsExplicit & SslSettings { if (process.env.DATABASE_USERNAME === undefined) { throw new Error("Missing environment variable: DATABASE_USERNAME"); } @@ -26,6 +28,19 @@ export function getDatabaseConfiguration(): PoolOptionsExplicit & SslSettings { throw new Error("Missing or incorrect env variable: DATABASE_SSL"); } + let poolSize = 32; + if (process.env.DB_POOL_SIZE !== undefined) { + poolSize = parseInt(process.env.DB_POOL_SIZE, 10); + if (isNaN(poolSize)) { + poolSize = 32; + } + poolSize = Math.min(Math.max(poolSize, 32), 500); + } + + if (overwriteMaxConnections !== undefined) { + poolSize = overwriteMaxConnections; + } + // defaults here: https://github.com/postgres-pool/postgres-pool/blob/9d623823dc365b5edea3303cab6ae519bfaa94f7/src/index.ts#L264C10-L290 // docs here: https://github.com/postgres-pool/postgres-pool/blob/9d623823dc365b5edea3303cab6ae519bfaa94f7/src/index.ts#L29-L130 return { @@ -43,7 +58,7 @@ export function getDatabaseConfiguration(): PoolOptionsExplicit & SslSettings { // Pool configuration connectionTimeoutMillis: 16_000, idleTimeoutMillis: 8_000, - poolSize: 32, // max connection # on render is 97 + poolSize: poolSize, // max connection # on render is 97 waitForAvailableConnectionTimeoutMillis: 30_000, databaseStartupTimeoutMillis: 30_000, readOnlyTransactionReconnectTimeoutMillis: 30_000, diff --git a/apps/passport-server/src/database/postgresPool.ts b/apps/passport-server/src/database/postgresPool.ts index faac776ff7..c5c58556b8 100644 --- a/apps/passport-server/src/database/postgresPool.ts +++ b/apps/passport-server/src/database/postgresPool.ts @@ -3,11 +3,11 @@ import { logger } from "../util/logger"; import { getDatabaseConfiguration } from "./postgresConfiguration"; import { migrateDatabase } from "./postgresMigrations"; -export async function getDB(): Promise { +export async function getDB(overwriteMaxConnections?: number): Promise { logger("[INIT] Initializing Postgres client"); try { - const pool = new Pool(getDatabaseConfiguration()); + const pool = new Pool(getDatabaseConfiguration(overwriteMaxConnections)); const client = await pool.connect(); await migrateDatabase(client); client.release(); diff --git a/apps/passport-server/src/database/queries/users.ts b/apps/passport-server/src/database/queries/users.ts index 6b5253deb1..4be8d4fab1 100644 --- a/apps/passport-server/src/database/queries/users.ts +++ b/apps/passport-server/src/database/queries/users.ts @@ -84,6 +84,18 @@ export async function deleteUserByUUID( client: PoolClient, uuid: string ): Promise { + const user = await fetchUserByUUID(client, uuid); + + if (!user) { + throw new Error(`user '${uuid}' not found`); + } + + await sqlQuery( + client, + `DELETE FROM telegram_bot_conversations WHERE semaphore_id = $1`, + [user.commitment] + ); + await sqlQuery(client, `DELETE FROM users WHERE uuid = $1`, [uuid]); } diff --git a/apps/passport-server/src/database/sqlQuery.ts b/apps/passport-server/src/database/sqlQuery.ts index 87e3ea364a..c6c54971ad 100644 --- a/apps/passport-server/src/database/sqlQuery.ts +++ b/apps/passport-server/src/database/sqlQuery.ts @@ -63,6 +63,18 @@ export function sqlTransaction( ); } +export async function sqlQueryWithPool( + pool: Pool, + func: (client: PoolClient) => Promise +): Promise { + const client = await pool.connect(); + try { + return await func(client); + } finally { + client.release(); + } +} + /** * Executes a given function inside a transaction against the database, and * traces its performance. Retries queries that fail due to a connection error. diff --git a/apps/passport-server/src/routing/pcdHttpError.ts b/apps/passport-server/src/routing/pcdHttpError.ts index ed2bb963a6..fd100aa5be 100644 --- a/apps/passport-server/src/routing/pcdHttpError.ts +++ b/apps/passport-server/src/routing/pcdHttpError.ts @@ -47,7 +47,7 @@ export function respondWithError( if (!e.message) { res.sendStatus(e.code); } else { - res.status(e.code).send(e.message); + res.status(e.code).type("text").send(e.message); } } else if (e instanceof PCDHTTPJSONError) { res.status(e.code).json(e.json); diff --git a/apps/passport-server/src/routing/routes/accountRoutes.ts b/apps/passport-server/src/routing/routes/accountRoutes.ts index 0b57d72ae1..f17f8f72ad 100644 --- a/apps/passport-server/src/routing/routes/accountRoutes.ts +++ b/apps/passport-server/src/routing/routes/accountRoutes.ts @@ -13,7 +13,11 @@ import { } from "@pcd/passport-interface"; import { normalizeEmail } from "@pcd/util"; import express, { Request, Response } from "express"; -import { namedSqlTransaction } from "../../database/sqlQuery"; +import { + namedSqlTransaction, + sqlQueryWithPool, + sqlTransaction +} from "../../database/sqlQuery"; import { ApplicationContext, GlobalServices } from "../../types"; import { logger } from "../../util/logger"; import { checkExistsForRoute } from "../../util/util"; @@ -43,10 +47,8 @@ export function initAccountRoutes( checkExistsForRoute(userService); const email = normalizeEmail(checkQueryParam(req, "email")); - const result = await namedSqlTransaction( - context.dbPool, - "/account/salt", - (client) => userService.getSaltByEmail(client, email) + const result = await sqlQueryWithPool(context.dbPool, (client) => + userService.getSaltByEmail(client, email) ); res.send(result satisfies SaltResponseValue); @@ -86,10 +88,8 @@ export function initAccountRoutes( const force = checkBody(req, "force") === "true"; - const result = await namedSqlTransaction( - context.dbPool, - "/account/send-login-email", - (client) => userService.handleSendTokenEmail(client, email, force) + const result = await sqlQueryWithPool(context.dbPool, (client) => + userService.handleSendTokenEmail(client, email, force) ); if (result) { @@ -115,10 +115,8 @@ export function initAccountRoutes( const token = checkBody(req, "token"); const email = checkBody(req, "email"); - const result = await namedSqlTransaction( - context.dbPool, - "/account/verify-token", - (client) => userService.handleVerifyToken(client, token, email) + const result = await sqlQueryWithPool(context.dbPool, (client) => + userService.handleVerifyToken(client, token, email) ); res.status(200).json(result); @@ -148,18 +146,15 @@ export function initAccountRoutes( "encryptionKey" ); - const result = await namedSqlTransaction( - context.dbPool, - "/account/one-click-login", - (client) => - userService.handleOneClickLogin( - client, - email, - code, - commitment, - semaphore_v4_pubkey, - encryptionKey - ) + const result = await sqlTransaction(context.dbPool, (client) => + userService.handleOneClickLogin( + client, + email, + code, + commitment, + semaphore_v4_pubkey, + encryptionKey + ) ); res.status(200).json(result); @@ -209,20 +204,17 @@ export function initAccountRoutes( "commitment" ); - const result = await namedSqlTransaction( - context.dbPool, - "/account/new-participant", - (client) => - userService.handleNewUser( - client, - token, - email, - commitment, - semaphore_v4_pubkey, - salt, - encryptionKey, - autoRegister - ) + const result = await sqlTransaction(context.dbPool, (client) => + userService.handleNewUser( + client, + token, + email, + commitment, + semaphore_v4_pubkey, + salt, + encryptionKey, + autoRegister + ) ); res.status(200).json(result); @@ -241,16 +233,14 @@ export function initAccountRoutes( checkExistsForRoute(userService); const pcd = checkBody(req, "pcd"); - const result = await namedSqlTransaction( - context.dbPool, - "/account/upgrade-with-v4-commitment", - (client) => userService.handleAddV4Commitment(client, pcd) + const result = await sqlTransaction(context.dbPool, (client) => + userService.handleAddV4Commitment(client, pcd) ); if (result.success) { res.status(200).json(result.value); } else { - res.status(403).send(result.error); + res.status(403).type("text").send(result.error); } } ); @@ -265,16 +255,14 @@ export function initAccountRoutes( checkExistsForRoute(userService); const pcd = checkBody(req, "pcd"); - const result = await namedSqlTransaction( - context.dbPool, - "/account/agree-terms", - (client) => userService.handleAgreeTerms(client, pcd) + const result = await sqlTransaction(context.dbPool, (client) => + userService.handleAgreeTerms(client, pcd) ); if (result.success) { res.status(200).json(result.value); } else { - res.status(403).send(result.error); + res.status(403).type("text").send(result.error); } } ); @@ -304,11 +292,8 @@ export function initAccountRoutes( clusterProxy(), async (req: Request, res: Response) => { checkExistsForRoute(userService); - const result = await namedSqlTransaction( - context.dbPool, - "/v2/account/user/:uuid", - (client) => - userService.handleGetUser(client, checkUrlParam(req, "uuid")) + const result = await sqlQueryWithPool(context.dbPool, (client) => + userService.handleGetUser(client, checkUrlParam(req, "uuid")) ); res.status(200).json(result); @@ -323,11 +308,8 @@ export function initAccountRoutes( clusterProxy(), async (req: Request, res: Response) => { checkExistsForRoute(userService); - const result = await namedSqlTransaction( - context.dbPool, - "/pcdpass/participant/:uuid", - (client) => - userService.handleGetUser(client, checkUrlParam(req, "uuid")) + const result = await sqlQueryWithPool(context.dbPool, (client) => + userService.handleGetUser(client, checkUrlParam(req, "uuid")) ); res.status(200).json(result); @@ -342,11 +324,8 @@ export function initAccountRoutes( clusterProxy(), async (req: Request, res: Response) => { checkExistsForRoute(userService); - const result = await namedSqlTransaction( - context.dbPool, - "/zuzalu/participant/:uuid", - (client) => - userService.handleGetUser(client, checkUrlParam(req, "uuid")) + const result = await sqlQueryWithPool(context.dbPool, (client) => + userService.handleGetUser(client, checkUrlParam(req, "uuid")) ); res.status(200).json(result); diff --git a/apps/passport-server/src/routing/routes/e2eeRoutes.ts b/apps/passport-server/src/routing/routes/e2eeRoutes.ts index c8527248ae..f686cbfb8d 100644 --- a/apps/passport-server/src/routing/routes/e2eeRoutes.ts +++ b/apps/passport-server/src/routing/routes/e2eeRoutes.ts @@ -3,7 +3,7 @@ import { UploadEncryptedStorageRequest } from "@pcd/passport-interface"; import express, { Request, Response } from "express"; -import { namedSqlTransaction } from "../../database/sqlQuery"; +import { sqlQueryWithPool, sqlTransaction } from "../../database/sqlQuery"; import { ApplicationContext, GlobalServices } from "../../types"; import { logger } from "../../util/logger"; import { checkExistsForRoute } from "../../util/util"; @@ -30,10 +30,8 @@ export function initE2EERoutes( checkExistsForRoute(e2eeService); const request = req.body as ChangeBlobKeyRequest; - const result = await namedSqlTransaction( - context.dbPool, - "/sync/v3/changeBlobKey", - (client) => e2eeService.handleChangeBlobKey(client, request) + const result = await sqlTransaction(context.dbPool, (client) => + e2eeService.handleChangeBlobKey(client, request) ); res.status(200).json(result); @@ -55,15 +53,12 @@ export function initE2EERoutes( clusterProxy(), async (req: Request, res: Response) => { checkExistsForRoute(e2eeService); - const result = await namedSqlTransaction( - context.dbPool, - "/sync/v3/load/", - (client) => - e2eeService.handleLoad( - client, - checkQueryParam(req, "blobKey"), - checkOptionalQueryParam(req, "knownRevision") - ) + const result = await sqlQueryWithPool(context.dbPool, (client) => + e2eeService.handleLoad( + client, + checkQueryParam(req, "blobKey"), + checkOptionalQueryParam(req, "knownRevision") + ) ); res.status(200).json(result); @@ -88,10 +83,8 @@ export function initE2EERoutes( async (req: Request, res: Response) => { checkExistsForRoute(e2eeService); const request = req.body as UploadEncryptedStorageRequest; - const result = await namedSqlTransaction( - context.dbPool, - "/sync/v3/save", - (client) => e2eeService.handleSave(client, request) + const result = await sqlQueryWithPool(context.dbPool, (client) => + e2eeService.handleSave(client, request) ); res.status(200).json(result); diff --git a/apps/passport-server/src/routing/routes/frogcryptoRoutes.ts b/apps/passport-server/src/routing/routes/frogcryptoRoutes.ts index e578f416c7..bb42298dc3 100644 --- a/apps/passport-server/src/routing/routes/frogcryptoRoutes.ts +++ b/apps/passport-server/src/routing/routes/frogcryptoRoutes.ts @@ -15,7 +15,7 @@ import { } from "@pcd/passport-interface"; import express, { Request, Response } from "express"; import urljoin from "url-join"; -import { namedSqlTransaction } from "../../database/sqlQuery"; +import { sqlQueryWithPool } from "../../database/sqlQuery"; import { ApplicationContext, GlobalServices } from "../../types"; import { logger } from "../../util/logger"; import { checkExistsForRoute } from "../../util/util"; @@ -72,10 +72,8 @@ export function initFrogcryptoRoutes( app.get("/frogcrypto/scoreboard", clusterProxy(), async (req, res) => { checkExistsForRoute(frogcryptoService); - const result = await namedSqlTransaction( - context.dbPool, - "/frogcrypto/scoreboard", - (client) => frogcryptoService.getScoreboard(client) + const result = await sqlQueryWithPool(context.dbPool, (client) => + frogcryptoService.getScoreboard(client) ); res.json(result); }); @@ -85,14 +83,11 @@ export function initFrogcryptoRoutes( clusterProxy(), async (req, res) => { checkExistsForRoute(frogcryptoService); - const result = await namedSqlTransaction( - context.dbPool, - "/frogcrypto/telegram-handle-sharing", - (client) => - frogcryptoService.updateTelegramHandleSharing( - client, - req.body as FrogCryptoShareTelegramHandleRequest - ) + const result = await sqlQueryWithPool(context.dbPool, (client) => + frogcryptoService.updateTelegramHandleSharing( + client, + req.body as FrogCryptoShareTelegramHandleRequest + ) ); res.json(result satisfies FrogCryptoShareTelegramHandleResponseValue); } @@ -100,14 +95,11 @@ export function initFrogcryptoRoutes( app.post("/frogcrypto/user-state", clusterProxy(), async (req, res) => { checkExistsForRoute(frogcryptoService); - const result = await namedSqlTransaction( - context.dbPool, - "/frogcrypto/user-state", - (client) => - frogcryptoService.getUserState( - client, - req.body as FrogCryptoUserStateRequest - ) + const result = await sqlQueryWithPool(context.dbPool, (client) => + frogcryptoService.getUserState( + client, + req.body as FrogCryptoUserStateRequest + ) ); res.json(result satisfies FrogCryptoUserStateResponseValue); }); @@ -124,14 +116,11 @@ export function initFrogcryptoRoutes( app.post("/frogcrypto/admin/frogs", clusterProxy(), async (req, res) => { checkExistsForRoute(frogcryptoService); - const result = await namedSqlTransaction( - context.dbPool, - "/frogcrypto/admin/frogs", - (client) => - frogcryptoService.updateFrogData( - client, - req.body as FrogCryptoUpdateFrogsRequest - ) + const result = await sqlQueryWithPool(context.dbPool, (client) => + frogcryptoService.updateFrogData( + client, + req.body as FrogCryptoUpdateFrogsRequest + ) ); res.json(result satisfies FrogCryptoUpdateFrogsResponseValue); }); @@ -141,14 +130,11 @@ export function initFrogcryptoRoutes( clusterProxy(), async (req, res) => { checkExistsForRoute(frogcryptoService); - const result = await namedSqlTransaction( - context.dbPool, - "/frogcrypto/admin/delete-frogs", - (client) => - frogcryptoService.deleteFrogData( - client, - req.body as FrogCryptoDeleteFrogsRequest - ) + const result = await sqlQueryWithPool(context.dbPool, (client) => + frogcryptoService.deleteFrogData( + client, + req.body as FrogCryptoDeleteFrogsRequest + ) ); res.json(result satisfies FrogCryptoDeleteFrogsResponseValue); } @@ -156,14 +142,11 @@ export function initFrogcryptoRoutes( app.post("/frogcrypto/admin/feeds", clusterProxy(), async (req, res) => { checkExistsForRoute(frogcryptoService); - const result = await namedSqlTransaction( - context.dbPool, - "/frogcrypto/admin/feeds", - (client) => - frogcryptoService.updateFeedData( - client, - req.body as FrogCryptoUpdateFeedsRequest - ) + const result = await sqlQueryWithPool(context.dbPool, (client) => + frogcryptoService.updateFeedData( + client, + req.body as FrogCryptoUpdateFeedsRequest + ) ); res.json(result satisfies FrogCryptoUpdateFeedsResponseValue); }); diff --git a/apps/passport-server/src/routing/routes/genericIssuanceRoutes.ts b/apps/passport-server/src/routing/routes/genericIssuanceRoutes.ts index fd49fb9e6b..13a986a73c 100644 --- a/apps/passport-server/src/routing/routes/genericIssuanceRoutes.ts +++ b/apps/passport-server/src/routing/routes/genericIssuanceRoutes.ts @@ -26,16 +26,15 @@ import { TicketPreviewResultValue } from "@pcd/passport-interface"; import { SerializedSemaphoreGroup } from "@pcd/semaphore-group-pcd"; -import { sleep } from "@pcd/util"; +import { ZUPASS_SUPPORT_EMAIL, sleep } from "@pcd/util"; import express from "express"; -import fs from "fs"; import { sha256 } from "js-sha256"; import Mustache from "mustache"; import path from "path"; import * as QRCode from "qrcode"; import urljoin from "url-join"; import { PipelineCheckinDB } from "../../database/queries/pipelineCheckinDB"; -import { namedSqlTransaction, sqlTransaction } from "../../database/sqlQuery"; +import { namedSqlTransaction, sqlQueryWithPool } from "../../database/sqlQuery"; import { getAllGenericIssuanceHTTPQuery, getAllGenericIssuanceQuery, @@ -46,6 +45,7 @@ import { import { PretixPipeline } from "../../services/generic-issuance/pipelines/PretixPipeline"; import { createQueryUrl } from "../../services/telemetryService"; import { ApplicationContext, GlobalServices } from "../../types"; +import { readFileWithCache } from "../../util/file"; import { IS_PROD } from "../../util/isProd"; import { logger } from "../../util/logger"; import { checkExistsForRoute } from "../../util/util"; @@ -74,7 +74,7 @@ export function initGenericIssuanceRoutes( */ app.post("/generic-issuance/api/self", async (req, res) => { checkExistsForRoute(genericIssuanceService); - const user = await sqlTransaction(context.dbPool, (client) => + const user = await sqlQueryWithPool(context.dbPool, (client) => genericIssuanceService.authSession(client, req) ); @@ -110,7 +110,7 @@ export function initGenericIssuanceRoutes( const checkinDb = new PipelineCheckinDB(); const tickets = await pipeline.getAllTickets(); - const checkins = await sqlTransaction(context.dbPool, (client) => + const checkins = await sqlQueryWithPool(context.dbPool, (client) => checkinDb.getByPipelineId(client, pragueId) ); @@ -499,7 +499,7 @@ export function initGenericIssuanceRoutes( "/generic-issuance/api/fetch-pretix-products", async (req: express.Request, res: express.Response) => { checkExistsForRoute(genericIssuanceService); - const user = await sqlTransaction(context.dbPool, (client) => + const user = await sqlQueryWithPool(context.dbPool, (client) => genericIssuanceService.authSession(client, req) ); traceUser(user); @@ -780,71 +780,102 @@ export function initGenericIssuanceRoutes( return ( imageToRender ?? - (ticket.ticketSecret - ? await QRCode.toDataURL(ticket.ticketSecret, { + (ticketData.ticketSecret + ? await QRCode.toDataURL(ticketData.ticketSecret, { type: "image/webp", scale: 10, - margin: 0 + margin: 1, + color: { + dark: "#000000", + light: "#ffffff" + } }) : "") ); }; const absPath = path.resolve("./resources/one-click-page/index.html"); - const result = await genericIssuanceService.handleGetTicketPreview( - email, - code, - pipeline - ); - if (!result.tickets.length) { - res.sendFile(absPath.replace("index", "error")); - return; - } - const main: TicketPreviewResultValue["tickets"] = []; - const addOns: TicketPreviewResultValue["tickets"] = []; + try { + const result = await genericIssuanceService.handleGetTicketPreview( + email, + code, + pipeline + ); - for (const ticket of result.tickets) { - if (ticket.isAddOn) { - addOns.push(ticket); - } else { - main.push(ticket); - } - } - const file = fs.readFileSync(absPath).toString(); + const main: TicketPreviewResultValue["tickets"] = []; + const addOns: TicketPreviewResultValue["tickets"] = []; - const ticket = main[0]; + for (const ticket of result.tickets) { + if (ticket.isAddOn) { + addOns.push(ticket); + } else { + main.push(ticket); + } + } - // filter out add-ons - const ticketsCount = result.tickets.filter((t) => !t.isAddOn).length; + if (!main.length) { + throw new PCDHTTPError( + 400, + `No ticket found with order code ${code} and email ${email}. Please contact support@zupass.org immediately.` + ); + } - const addOnsQrs = await Promise.all( - addOns.map(async (addon) => { - const image = await getTicketImage(addon); - const name = addon.ticketName.toUpperCase(); - return { image, name }; - }) - ); + const file = await readFileWithCache(absPath); + const ticket = main[0]; + + // filter out add-ons + const ticketsCount = main.length; + + const tickets = await Promise.all( + main.map(async (ticket) => { + // Find all add-ons that belong to this main ticket + const ticketAddons = addOns + .filter((addon) => addon.parentTicketId === ticket.ticketId) + .map(async (addon) => ({ + image: await getTicketImage(addon), + name: addon.ticketName + })); + + return { + attendeeName: + ticket.attendeeName !== "" + ? ticket.attendeeName.toUpperCase() + : ticket.eventName.toUpperCase(), + attendeeEmail: ticket.attendeeEmail, + ticketName: ticket.ticketName, + qr: await getTicketImage(ticket), + showAddons: ticketAddons.length > 0, + id: ticket.ticketId, + moreThanOneAddon: ticketAddons.length > 1, + addonsCount: ticketAddons.length, + addons: await Promise.all(ticketAddons) + }; + }) + ); - const rendered = Mustache.render(file, { - eventName: ticket.eventName.toUpperCase(), - attendeeName: - ticket.attendeeName !== "" - ? ticket.attendeeName.toUpperCase() - : ticket.eventName.toUpperCase(), - attendeeEmail: ticket.attendeeEmail, - ticketName: ticket.ticketName, - eventLocation: ticket.eventLocation, - qr: await getTicketImage(ticket), - backgroundImage: ticket.imageUrl, - count: ticketsCount, - isMoreThanOne: ticketsCount > 1, - zupassUrl: process.env.PASSPORT_CLIENT_URL, - addons: addOnsQrs, - addonsCount: addOnsQrs.length, - moreThanOneAddon: addOnsQrs.length > 1, - startDate: ticket.eventStartDate - }); - res.send(rendered); + const rendered = Mustache.render(file, { + tickets, + eventName: ticket?.eventName.toUpperCase(), + eventLocation: ticket?.eventLocation, + backgroundImage: ticket?.imageUrl, + count: ticketsCount, + isMoreThanOne: ticketsCount > 1, + zupassUrl: process.env.PASSPORT_CLIENT_URL, + startDate: ticket?.eventStartDate + }); + res.send(rendered); + } catch { + const errorFilePath = path.resolve( + "./resources/one-click-page/error.html" + ); + const file = await readFileWithCache(errorFilePath); + const rendered = Mustache.render(file, { + zupassSupport: ZUPASS_SUPPORT_EMAIL, + email: email, + orderCode: code + }); + res.send(rendered); + } } ); } diff --git a/apps/passport-server/src/routing/routes/healthCheckRoutes.ts b/apps/passport-server/src/routing/routes/healthCheckRoutes.ts index 1ef3fd093e..b67c539701 100644 --- a/apps/passport-server/src/routing/routes/healthCheckRoutes.ts +++ b/apps/passport-server/src/routing/routes/healthCheckRoutes.ts @@ -32,6 +32,7 @@ export function initHealthcheckRoutes( async (req: Request, res: Response) => { res .status(200) + .type("text") .send(`Zupass Server - Cluster Test OK! PID: ${process.pid}`); } ); @@ -46,6 +47,7 @@ export function initHealthcheckRoutes( async (req: Request, res: Response) => { res .status(200) + .type("text") .send( `Zupass Server - Cluster Test OK! PID: ${ process.pid @@ -62,6 +64,7 @@ export function initHealthcheckRoutes( async (req: Request, res: Response) => { res .status(200) + .type("text") .send( `Zupass Server - Cluster Test OK! PID: ${ process.pid diff --git a/apps/passport-server/src/routing/routes/miscRoutes.ts b/apps/passport-server/src/routing/routes/miscRoutes.ts index eb4869916a..3ac5db36e9 100644 --- a/apps/passport-server/src/routing/routes/miscRoutes.ts +++ b/apps/passport-server/src/routing/routes/miscRoutes.ts @@ -1,7 +1,7 @@ import { bigintToPseudonymNumber, emailToBigint } from "@pcd/util"; import express, { Request, Response } from "express"; import { kvGetByPrefix } from "../../database/queries/kv"; -import { sqlTransaction } from "../../database/sqlQuery"; +import { sqlQueryWithPool } from "../../database/sqlQuery"; import { ApplicationContext, GlobalServices } from "../../types"; import { logger } from "../../util/logger"; @@ -15,7 +15,7 @@ export function initMiscRoutes( app.get( "/misc/protocol-worlds-scoreboard", async (req: Request, res: Response) => { - const scores = (await sqlTransaction(context.dbPool, (client) => + const scores = (await sqlQueryWithPool(context.dbPool, (client) => kvGetByPrefix(client, "protocol_worlds_score:") )) as Array<{ email: string; score: number }>; diff --git a/apps/passport-server/src/routing/routes/pcdIssuanceRoutes.ts b/apps/passport-server/src/routing/routes/pcdIssuanceRoutes.ts index 8c2067ef9c..d73a876109 100644 --- a/apps/passport-server/src/routing/routes/pcdIssuanceRoutes.ts +++ b/apps/passport-server/src/routing/routes/pcdIssuanceRoutes.ts @@ -10,7 +10,7 @@ import { VerifyTicketResult } from "@pcd/passport-interface"; import express, { Request, Response } from "express"; -import { namedSqlTransaction } from "../../database/sqlQuery"; +import { sqlQueryWithPool } from "../../database/sqlQuery"; import { ApplicationContext, GlobalServices } from "../../types"; import { logger } from "../../util/logger"; import { checkExistsForRoute } from "../../util/util"; @@ -117,17 +117,13 @@ export function initPCDIssuanceRoutes( clusterProxy(), async (req: Request, res: Response) => { checkExistsForRoute(issuanceService); - await namedSqlTransaction( - context.dbPool, - "/issue/verify-ticket", - async (client) => { - const result = await issuanceService.handleVerifyTicketRequest( - client, - req.body as VerifyTicketRequest - ); - return res.json(result satisfies VerifyTicketResult); - } - ); + await sqlQueryWithPool(context.dbPool, async (client) => { + const result = await issuanceService.handleVerifyTicketRequest( + client, + req.body as VerifyTicketRequest + ); + return res.json(result satisfies VerifyTicketResult); + }); } ); @@ -136,15 +132,11 @@ export function initPCDIssuanceRoutes( clusterProxy(), async (req: Request, res: Response) => { checkExistsForRoute(issuanceService); - await namedSqlTransaction( - context.dbPool, - "/issue/known-ticket-types", - async (client) => { - const result = - await issuanceService.handleKnownTicketTypesRequest(client); - return res.json(result satisfies KnownTicketTypesResult); - } - ); + await sqlQueryWithPool(context.dbPool, async (client) => { + const result = + await issuanceService.handleKnownTicketTypesRequest(client); + return res.json(result satisfies KnownTicketTypesResult); + }); } ); } diff --git a/apps/passport-server/src/routing/routes/poapRoutes.ts b/apps/passport-server/src/routing/routes/poapRoutes.ts index d37c580586..de7809d524 100644 --- a/apps/passport-server/src/routing/routes/poapRoutes.ts +++ b/apps/passport-server/src/routing/routes/poapRoutes.ts @@ -1,5 +1,5 @@ import express, { Request, Response } from "express"; -import { namedSqlTransaction } from "../../database/sqlQuery"; +import { sqlQueryWithPool } from "../../database/sqlQuery"; import { ApplicationContext, GlobalServices } from "../../types"; import { logger } from "../../util/logger"; import { checkExistsForRoute } from "../../util/util"; @@ -23,15 +23,11 @@ export function initPoapRoutes( ); } - await namedSqlTransaction( - context.dbPool, - "/poap/devconnect/callback", - async (client) => { - res.redirect( - await poapService.getDevconnectPoapRedirectUrl(client, proof) - ); - } - ); + await sqlQueryWithPool(context.dbPool, async (client) => { + res.redirect( + await poapService.getDevconnectPoapRedirectUrl(client, proof) + ); + }); }); app.get("/poap/zuzalu23/callback", async (req: Request, res: Response) => { @@ -44,15 +40,9 @@ export function initPoapRoutes( ); } - await namedSqlTransaction( - context.dbPool, - "/poap/zuzalu23/callback", - async (client) => { - res.redirect( - await poapService.getZuzalu23PoapRedirectUrl(client, proof) - ); - } - ); + await sqlQueryWithPool(context.dbPool, async (client) => { + res.redirect(await poapService.getZuzalu23PoapRedirectUrl(client, proof)); + }); }); app.get("/poap/zuconnect/callback", async (req: Request, res: Response) => { @@ -65,15 +55,11 @@ export function initPoapRoutes( ); } - await namedSqlTransaction( - context.dbPool, - "/poap/devconnect/callback", - async (client) => { - res.redirect( - await poapService.getZuConnectPoapRedirectUrl(client, proof) - ); - } - ); + await sqlQueryWithPool(context.dbPool, async (client) => { + res.redirect( + await poapService.getZuConnectPoapRedirectUrl(client, proof) + ); + }); }); app.get("/poap/vitalia/callback", async (req: Request, res: Response) => { @@ -86,15 +72,9 @@ export function initPoapRoutes( ); } - await namedSqlTransaction( - context.dbPool, - "/poap/vitalia/callback", - async (client) => { - res.redirect( - await poapService.getVitaliaPoapRedirectUrl(client, proof) - ); - } - ); + await sqlQueryWithPool(context.dbPool, async (client) => { + res.redirect(await poapService.getVitaliaPoapRedirectUrl(client, proof)); + }); }); app.get( @@ -109,15 +89,11 @@ export function initPoapRoutes( ); } - await namedSqlTransaction( - context.dbPool, - "/poap/edgecitydenver/callback", - async (client) => { - res.redirect( - await poapService.getEdgeCityDenverPoapRedirectUrl(client, proof) - ); - } - ); + await sqlQueryWithPool(context.dbPool, async (client) => { + res.redirect( + await poapService.getEdgeCityDenverPoapRedirectUrl(client, proof) + ); + }); } ); @@ -131,14 +107,8 @@ export function initPoapRoutes( ); } - await namedSqlTransaction( - context.dbPool, - "/poap/ethlatam/callback", - async (client) => { - res.redirect( - await poapService.getETHLatamPoapRedirectUrl(client, proof) - ); - } - ); + await sqlQueryWithPool(context.dbPool, async (client) => { + res.redirect(await poapService.getETHLatamPoapRedirectUrl(client, proof)); + }); }); } diff --git a/apps/passport-server/src/routing/routes/semaphoreRoutes.ts b/apps/passport-server/src/routing/routes/semaphoreRoutes.ts index 7c3b1072d7..39ea6eaeb2 100644 --- a/apps/passport-server/src/routing/routes/semaphoreRoutes.ts +++ b/apps/passport-server/src/routing/routes/semaphoreRoutes.ts @@ -4,7 +4,7 @@ import { serializeSemaphoreGroup } from "@pcd/semaphore-group-pcd"; import express, { Request, Response } from "express"; -import { sqlTransaction } from "../../database/sqlQuery"; +import { sqlQueryWithPool } from "../../database/sqlQuery"; import { ApplicationContext, GlobalServices } from "../../types"; import { logger } from "../../util/logger"; import { checkExistsForRoute } from "../../util/util"; @@ -40,7 +40,7 @@ export function initSemaphoreRoutes( const groupId = checkUrlParam(req, "id"); const roothash = checkUrlParam(req, "root"); - const historicGroupValid = await sqlTransaction( + const historicGroupValid = await sqlQueryWithPool( context.dbPool, (client) => semaphoreService.getHistoricSemaphoreGroupValid( @@ -70,7 +70,7 @@ export function initSemaphoreRoutes( "/semaphore/historic/:id/:root", async (req: Request, res: Response) => { checkExistsForRoute(semaphoreService); - const historicGroup = await sqlTransaction(context.dbPool, (client) => + const historicGroup = await sqlQueryWithPool(context.dbPool, (client) => semaphoreService.getHistoricSemaphoreGroup( client, checkUrlParam(req, "id"), @@ -99,7 +99,7 @@ export function initSemaphoreRoutes( app.get("/semaphore/latest-root/:id", async (req: Request, res: Response) => { checkExistsForRoute(semaphoreService); const id = checkUrlParam(req, "id"); - const latestGroups = await sqlTransaction(context.dbPool, (client) => + const latestGroups = await sqlQueryWithPool(context.dbPool, (client) => semaphoreService.getLatestSemaphoreGroups(client) ); const matchingGroup = latestGroups.find((g) => g.groupId.toString() === id); diff --git a/apps/passport-server/src/routing/routes/telegramRoutes.ts b/apps/passport-server/src/routing/routes/telegramRoutes.ts index 43ee85ff72..c54886cc5a 100644 --- a/apps/passport-server/src/routing/routes/telegramRoutes.ts +++ b/apps/passport-server/src/routing/routes/telegramRoutes.ts @@ -1,6 +1,6 @@ import { AnonWebAppPayload, PayloadType } from "@pcd/passport-interface"; import express, { Request, Response } from "express"; -import { namedSqlTransaction, sqlTransaction } from "../../database/sqlQuery"; +import { sqlQueryWithPool } from "../../database/sqlQuery"; import { startTelegramService } from "../../services/telegramService"; import { ApplicationContext, GlobalServices } from "../../types"; import { logger } from "../../util/logger"; @@ -66,17 +66,14 @@ export function initTelegramRoutes( if (!telegramService) { throw new Error("Telegram service not initialized"); } - await namedSqlTransaction( - context.dbPool, - "/telegram/verify", - (client) => - telegramService.handleVerification( - client, - proof, - parseInt(telegram_user_id), - telegram_chat_id, - telegram_username - ) + await sqlQueryWithPool(context.dbPool, (client) => + telegramService.handleVerification( + client, + proof, + parseInt(telegram_user_id), + telegram_chat_id, + telegram_username + ) ); logger( `[TELEGRAM] Redirecting to telegram for user id ${telegram_user_id}` + @@ -214,7 +211,7 @@ export function initTelegramRoutes( } case PayloadType.ReactData: { - const proofUrl = await sqlTransaction(context.dbPool, (client) => + const proofUrl = await sqlQueryWithPool(context.dbPool, (client) => telegramService.handleRequestReactProofLink(client, anonPayload) ); res.redirect(proofUrl); @@ -248,21 +245,17 @@ export function initTelegramRoutes( "nullifierHash field needs to be a string and be non-empty" ); } - await namedSqlTransaction( - context.dbPool, - "/telegram/anonget/:nullifier", - async (client) => { - const messages = await telegramService.handleGetAnonMessages( - client, - nullifierHash - ); - const totalKarma = await telegramService.handleGetAnonTotalKarma( - client, - nullifierHash - ); - res.json({ messages, totalKarma }); - } - ); + await sqlQueryWithPool(context.dbPool, async (client) => { + const messages = await telegramService.handleGetAnonMessages( + client, + nullifierHash + ); + const totalKarma = await telegramService.handleGetAnonTotalKarma( + client, + nullifierHash + ); + res.json({ messages, totalKarma }); + }); } catch (e) { logger("[TELEGRAM] failed to get posts", e); } @@ -280,17 +273,14 @@ export function initTelegramRoutes( throw new Error("Telegram service not initialized"); } - await namedSqlTransaction( - context.dbPool, - "/telegram/anonreact", - (client) => - telegramService.handleReactAnonymousMessage( - client, - proof, - chatId, - anonMessageId, - reaction - ) + await sqlQueryWithPool(context.dbPool, (client) => + telegramService.handleReactAnonymousMessage( + client, + proof, + chatId, + anonMessageId, + reaction + ) ); res.setHeader("Content-Type", "text/html"); diff --git a/apps/passport-server/src/services/devconnect/organizerSync.ts b/apps/passport-server/src/services/devconnect/organizerSync.ts index d07b71be34..2d248d072d 100644 --- a/apps/passport-server/src/services/devconnect/organizerSync.ts +++ b/apps/passport-server/src/services/devconnect/organizerSync.ts @@ -41,7 +41,7 @@ import { softDeletePretixItemInfo, updatePretixItemsInfo } from "../../database/queries/pretixItemInfo"; -import { namedSqlTransaction, sqlTransaction } from "../../database/sqlQuery"; +import { sqlQueryWithPool } from "../../database/sqlQuery"; import { mostRecentCheckinEvent, pretixTicketsDifferent @@ -481,7 +481,7 @@ export class OrganizerSync { checkinListId: string ): Promise { return traced(NAME, "syncEventInfos", async (span) => { - await namedSqlTransaction(this.pool, "syncEventInfos", async (client) => { + await sqlQueryWithPool(this.pool, async (client) => { span?.setAttribute("org_url", organizer.orgURL); span?.setAttribute("event_slug", event.eventID); span?.setAttribute("event_name", eventInfo.name?.en); @@ -535,7 +535,7 @@ export class OrganizerSync { itemsFromAPI: DevconnectPretixItem[] ): Promise { return traced(NAME, "syncItemInfos", async (span) => { - await namedSqlTransaction(this.pool, "syncItemInfos", async (client) => { + await sqlQueryWithPool(this.pool, async (client) => { span?.setAttribute("org_url", organizer.orgURL); span?.setAttribute("event_slug", event.eventID); span?.setAttribute( @@ -751,7 +751,7 @@ export class OrganizerSync { pretixOrders: DevconnectPretixOrder[] ): Promise { return traced(NAME, "syncTickets", async (span) => { - await namedSqlTransaction(this.pool, "syncTickets", async (client) => { + await sqlQueryWithPool(this.pool, async (client) => { span?.setAttribute("org_url", organizer.orgURL); span?.setAttribute("event_slug", event.eventID); @@ -986,7 +986,7 @@ export class OrganizerSync { */ private async pushCheckins(): Promise { // Get the tickets which have been checked in but not yet synced - const ticketsToSync = await sqlTransaction(this.pool, (client) => + const ticketsToSync = await sqlQueryWithPool(this.pool, async (client) => fetchDevconnectTicketsAwaitingSync(client, this.organizer.orgURL) ); @@ -1002,7 +1002,7 @@ export class OrganizerSync { checkinTimestamp.toISOString() ); - await sqlTransaction(this.pool, (client) => + await sqlQueryWithPool(this.pool, (client) => updateDevconnectPretixTicket(client, { ...ticket, pretix_checkin_timestamp: checkinTimestamp diff --git a/apps/passport-server/src/services/devconnectPretixSyncService.ts b/apps/passport-server/src/services/devconnectPretixSyncService.ts index 74d3da3b6c..17bc3c38a0 100644 --- a/apps/passport-server/src/services/devconnectPretixSyncService.ts +++ b/apps/passport-server/src/services/devconnectPretixSyncService.ts @@ -12,7 +12,7 @@ import { fetchKnownTicketTypesByGroup, setKnownTicketType } from "../database/queries/knownTicketTypes"; -import { namedSqlTransaction, sqlTransaction } from "../database/sqlQuery"; +import { sqlQueryWithPool } from "../database/sqlQuery"; import { ApplicationContext, ServerMode } from "../types"; import { logger } from "../util/logger"; import { OrganizerSync } from "./devconnect/organizerSync"; @@ -107,7 +107,7 @@ export class DevconnectPretixSyncService { * (Re)load Pretix configuration, and set up organizers. */ private async setupOrganizers(): Promise { - const devconnectPretixConfig = await sqlTransaction(this.pool, (client) => + const devconnectPretixConfig = await sqlQueryWithPool(this.pool, (client) => getDevconnectPretixConfig(client) ); @@ -213,42 +213,38 @@ export class DevconnectPretixSyncService { * See also {@link setupKnownTicketTypes} in the issuance service. */ public async setDevconnectTicketTypes(): Promise { - return namedSqlTransaction( - this.pool, - "setDevconnectTicketTypes", - async (client) => { - const products = await fetchDevconnectProducts(client); - const savedProductIds = []; - - for (const product of products) { - await setKnownTicketType( - client, - `sync-${product.product_id}`, - product.event_id, - product.product_id, - ZUPASS_TICKET_PUBLIC_KEY_NAME, - KnownPublicKeyType.EdDSA, - // This works since we're only using this sync service for Devconnect - KnownTicketGroup.Devconnect23, - "Devconnect '23" - ); - - savedProductIds.push(product.product_id); - } + return sqlQueryWithPool(this.pool, async (client) => { + const products = await fetchDevconnectProducts(client); + const savedProductIds = []; - // Check to see if there are any tickets in the DB which were not present - // in the sync, and delete them. - const existingTicketTypes = await fetchKnownTicketTypesByGroup( + for (const product of products) { + await setKnownTicketType( client, - KnownTicketGroup.Devconnect23 + `sync-${product.product_id}`, + product.event_id, + product.product_id, + ZUPASS_TICKET_PUBLIC_KEY_NAME, + KnownPublicKeyType.EdDSA, + // This works since we're only using this sync service for Devconnect + KnownTicketGroup.Devconnect23, + "Devconnect '23" ); - for (const existingType of existingTicketTypes) { - if (!savedProductIds.find((p) => p === existingType.product_id)) { - await deleteKnownTicketType(client, existingType.identifier); - } + + savedProductIds.push(product.product_id); + } + + // Check to see if there are any tickets in the DB which were not present + // in the sync, and delete them. + const existingTicketTypes = await fetchKnownTicketTypesByGroup( + client, + KnownTicketGroup.Devconnect23 + ); + for (const existingType of existingTicketTypes) { + if (!savedProductIds.find((p) => p === existingType.product_id)) { + await deleteKnownTicketType(client, existingType.identifier); } } - ); + }); } } diff --git a/apps/passport-server/src/services/discordService.ts b/apps/passport-server/src/services/discordService.ts index ca1b6be024..fa586e4b23 100644 --- a/apps/passport-server/src/services/discordService.ts +++ b/apps/passport-server/src/services/discordService.ts @@ -26,6 +26,9 @@ export class DiscordService { this.alertsChannelId ) as TextBasedChannel; + // max discord message length is 4000 + msg = msg.substring(0, 3500); + logger(`[DISCORD] sending alert ${msg}`); return alertsChannel?.send(msg); }); diff --git a/apps/passport-server/src/services/frogcryptoService.ts b/apps/passport-server/src/services/frogcryptoService.ts index 3b2123e13a..113dc43866 100644 --- a/apps/passport-server/src/services/frogcryptoService.ts +++ b/apps/passport-server/src/services/frogcryptoService.ts @@ -46,7 +46,7 @@ import { upsertFrogData } from "../database/queries/frogcrypto"; import { fetchUserByV3Commitment } from "../database/queries/users"; -import { namedSqlTransaction } from "../database/sqlQuery"; +import { sqlQueryWithPool } from "../database/sqlQuery"; import { PCDHTTPError } from "../routing/pcdHttpError"; import { ApplicationContext } from "../types"; import { @@ -78,33 +78,29 @@ export class FrogcryptoService { (feed: FrogCryptoFeed) => async (req: PollFeedRequest): Promise => { try { - return namedSqlTransaction( - this.context.dbPool, - "pollFeed", - async (client) => { - if (feed.activeUntil <= Date.now() / 1000) { - throw new PCDHTTPError(403, "Feed is not active"); - } - - if (req.pcd === undefined) { - throw new PCDHTTPError(400, `Missing credential`); - } - await this.issuanceService.verifyCredential(req.pcd); - - return { - actions: [ - { - pcds: await this.issuanceService.issueEdDSAFrogPCDs( - req.pcd, - await this.reserveFrogData(client, req.pcd, feed) - ), - folder: FrogCryptoFolderName, - type: PCDActionType.AppendToFolder - } - ] - }; + return sqlQueryWithPool(this.context.dbPool, async (client) => { + if (feed.activeUntil <= Date.now() / 1000) { + throw new PCDHTTPError(403, "Feed is not active"); } - ); + + if (req.pcd === undefined) { + throw new PCDHTTPError(400, `Missing credential`); + } + await this.issuanceService.verifyCredential(req.pcd); + + return { + actions: [ + { + pcds: await this.issuanceService.issueEdDSAFrogPCDs( + req.pcd, + await this.reserveFrogData(client, req.pcd, feed) + ), + folder: FrogCryptoFolderName, + type: PCDActionType.AppendToFolder + } + ] + }; + }); } catch (e) { if (e instanceof PCDHTTPError) { throw e; diff --git a/apps/passport-server/src/services/generic-issuance/GenericIssuanceService.ts b/apps/passport-server/src/services/generic-issuance/GenericIssuanceService.ts index e7f0f5e6fa..24c7f41eeb 100644 --- a/apps/passport-server/src/services/generic-issuance/GenericIssuanceService.ts +++ b/apps/passport-server/src/services/generic-issuance/GenericIssuanceService.ts @@ -65,9 +65,9 @@ import { import { PCDHTTPError } from "../../routing/pcdHttpError"; import { ApplicationContext } from "../../types"; import { logger } from "../../util/logger"; +import { LocalFileService } from "../LocalFileService"; import { DiscordService } from "../discordService"; import { EmailService } from "../emailService"; -import { LocalFileService } from "../LocalFileService"; import { PagerDutyService } from "../pagerDutyService"; import { PersistentCacheService } from "../persistentCacheService"; import { InMemoryPipelineAtomDB } from "./InMemoryPipelineAtomDB"; @@ -438,13 +438,17 @@ export class GenericIssuanceService { ); } - const tickets = await pipeline.getAllTickets(); + const tickets = await pipeline.getAllTicketsForEmail(email); - const matchingTickets = tickets.atoms.filter( - (atom) => atom.email === email && atom.orderCode === orderCode + // Check that a valid atom exists with the given orderCode + const validAtom = tickets.atoms.find( + (atom) => atom.orderCode === orderCode ); + if (!validAtom) { + return { tickets: [] } satisfies TicketPreviewResultValue; + } - const ticketDatas = matchingTickets.map( + const ticketDatas = tickets.atoms.map( (atom) => pipeline.atomToPODTicketData(atom, "1") // fake semaphore id as it's not needed for the ticket preview ); diff --git a/apps/passport-server/src/services/generic-issuance/SemaphoreGroupProvider.ts b/apps/passport-server/src/services/generic-issuance/SemaphoreGroupProvider.ts index 41c110de8a..23ee968b81 100644 --- a/apps/passport-server/src/services/generic-issuance/SemaphoreGroupProvider.ts +++ b/apps/passport-server/src/services/generic-issuance/SemaphoreGroupProvider.ts @@ -13,7 +13,7 @@ import _ from "lodash"; import { PoolClient } from "postgres-pool"; import { IPipelineConsumerDB } from "../../database/queries/pipelineConsumerDB"; import { IPipelineSemaphoreHistoryDB } from "../../database/queries/pipelineSemaphoreHistoryDB"; -import { sqlTransaction } from "../../database/sqlQuery"; +import { sqlQueryWithPool } from "../../database/sqlQuery"; import { ApplicationContext } from "../../types"; import { traced } from "../telemetryService"; import { makeGenericIssuanceSemaphoreGroupUrl } from "./capabilities/SemaphoreGroupCapability"; @@ -146,7 +146,7 @@ export class SemaphoreGroupProvider { return traced(LOG_NAME, "start", async (span) => { span?.setAttribute("pipeline_id", this.pipelineId); - await sqlTransaction(this.context.dbPool, async (client) => { + await sqlQueryWithPool(this.context.dbPool, async (client) => { // This should be called during pipeline startup. // If an exception throws, it will stop the pipeline from starting. const latestGroups = diff --git a/apps/passport-server/src/services/generic-issuance/pipelines/CSVPipeline/CSVPipeline.ts b/apps/passport-server/src/services/generic-issuance/pipelines/CSVPipeline/CSVPipeline.ts index a6720c1f41..09042ac646 100644 --- a/apps/passport-server/src/services/generic-issuance/pipelines/CSVPipeline/CSVPipeline.ts +++ b/apps/passport-server/src/services/generic-issuance/pipelines/CSVPipeline/CSVPipeline.ts @@ -25,7 +25,7 @@ import { } from "../../../../database/queries/pipelineAtomDB"; import { IPipelineConsumerDB } from "../../../../database/queries/pipelineConsumerDB"; import { IPipelineSemaphoreHistoryDB } from "../../../../database/queries/pipelineSemaphoreHistoryDB"; -import { sqlTransaction } from "../../../../database/sqlQuery"; +import { sqlQueryWithPool } from "../../../../database/sqlQuery"; import { ApplicationContext } from "../../../../types"; import { logger } from "../../../../util/logger"; import { setError, traced } from "../../../telemetryService"; @@ -110,7 +110,7 @@ export class CSVPipeline implements BasePipeline { getSerializedLatestGroup: async ( groupId: string ): Promise => { - return sqlTransaction( + return sqlQueryWithPool( this.context.dbPool, async (client) => this.semaphoreGroupProvider?.getSerializedLatestGroup( @@ -122,7 +122,7 @@ export class CSVPipeline implements BasePipeline { getLatestGroupRoot: async ( groupId: string ): Promise => { - return sqlTransaction( + return sqlQueryWithPool( this.context.dbPool, async (client) => this.semaphoreGroupProvider?.getLatestGroupRoot(client, groupId) @@ -132,7 +132,7 @@ export class CSVPipeline implements BasePipeline { groupId: string, rootHash: string ): Promise => { - return sqlTransaction( + return sqlQueryWithPool( this.context.dbPool, async (client) => this.semaphoreGroupProvider?.getSerializedHistoricalGroup( @@ -196,30 +196,30 @@ export class CSVPipeline implements BasePipeline { requesterSemaphoreV4Id = semaphoreV4Id; // Consumer is validated, so save them in the consumer list - let didUpdate = false; - - await sqlTransaction(this.context.dbPool, async (client) => { - for (const email of emails) { - didUpdate = - didUpdate || - (await this.consumerDB.save( - client, - this.id, - email.email, - semaphoreId, - new Date() - )); - } - - if (this.definition.options.semaphoreGroupName) { - // If the user's Semaphore commitment has changed, `didUpdate` will be - // true, and we need to update the Semaphore groups - if (didUpdate) { - span?.setAttribute("semaphore_groups_updated", true); - await this.triggerSemaphoreGroupUpdate(client); - } - } - }); + // let didUpdate = false; + + // await sqlTransaction(this.context.dbPool, async (client) => { + // for (const email of emails) { + // didUpdate = + // didUpdate || + // (await this.consumerDB.save( + // client, + // this.id, + // email.email, + // semaphoreId, + // new Date() + // )); + // } + + // if (this.definition.options.semaphoreGroupName) { + // // If the user's Semaphore commitment has changed, `didUpdate` will be + // // true, and we need to update the Semaphore groups + // if (didUpdate) { + // span?.setAttribute("semaphore_groups_updated", true); + // await this.triggerSemaphoreGroupUpdate(client); + // } + // } + // }); } catch (e) { logger(LOG_TAG, "credential PCD not verified for req", req); } diff --git a/apps/passport-server/src/services/generic-issuance/pipelines/CSVTicketPipeline/CSVTicketPipeline.ts b/apps/passport-server/src/services/generic-issuance/pipelines/CSVTicketPipeline/CSVTicketPipeline.ts index e15caa2288..4e22175935 100644 --- a/apps/passport-server/src/services/generic-issuance/pipelines/CSVTicketPipeline/CSVTicketPipeline.ts +++ b/apps/passport-server/src/services/generic-issuance/pipelines/CSVTicketPipeline/CSVTicketPipeline.ts @@ -33,7 +33,7 @@ import { } from "../../../../database/queries/pipelineAtomDB"; import { IPipelineConsumerDB } from "../../../../database/queries/pipelineConsumerDB"; import { IPipelineSemaphoreHistoryDB } from "../../../../database/queries/pipelineSemaphoreHistoryDB"; -import { sqlTransaction } from "../../../../database/sqlQuery"; +import { sqlQueryWithPool } from "../../../../database/sqlQuery"; import { ApplicationContext } from "../../../../types"; import { logger } from "../../../../util/logger"; import { PersistentCacheService } from "../../../persistentCacheService"; @@ -133,7 +133,7 @@ export class CSVTicketPipeline implements BasePipeline { getSerializedLatestGroup: async ( groupId: string ): Promise => { - return sqlTransaction( + return sqlQueryWithPool( this.context.dbPool, async (client) => this.semaphoreGroupProvider?.getSerializedLatestGroup( @@ -145,7 +145,7 @@ export class CSVTicketPipeline implements BasePipeline { getLatestGroupRoot: async ( groupId: string ): Promise => { - return sqlTransaction( + return sqlQueryWithPool( this.context.dbPool, async (client) => this.semaphoreGroupProvider?.getLatestGroupRoot(client, groupId) @@ -155,7 +155,7 @@ export class CSVTicketPipeline implements BasePipeline { groupId: string, rootHash: string ): Promise => { - return sqlTransaction( + return sqlQueryWithPool( this.context.dbPool, async (client) => this.semaphoreGroupProvider?.getSerializedHistoricalGroup( @@ -216,29 +216,29 @@ export class CSVTicketPipeline implements BasePipeline { requesterSemaphoreId = semaphoreId; requesterSemaphoreV4Id = semaphoreV4Id; // Consumer is validated, so save them in the consumer list - let didUpdate = false; - await sqlTransaction(this.context.dbPool, async (client) => { - for (const email of emails) { - didUpdate = - didUpdate || - (await this.consumerDB.save( - client, - this.id, - email.email, - semaphoreId, - new Date() - )); - } - - if (this.definition.options.semaphoreGroupName) { - // If the user's Semaphore commitment has changed, `didUpdate` will be - // true, and we need to update the Semaphore groups - if (didUpdate) { - span?.setAttribute("semaphore_groups_updated", true); - await this.triggerSemaphoreGroupUpdate(client); - } - } - }); + // let didUpdate = false; + // await sqlTransaction(this.context.dbPool, async (client) => { + // for (const email of emails) { + // didUpdate = + // didUpdate || + // (await this.consumerDB.save( + // client, + // this.id, + // email.email, + // semaphoreId, + // new Date() + // )); + // } + + // if (this.definition.options.semaphoreGroupName) { + // // If the user's Semaphore commitment has changed, `didUpdate` will be + // // true, and we need to update the Semaphore groups + // if (didUpdate) { + // span?.setAttribute("semaphore_groups_updated", true); + // await this.triggerSemaphoreGroupUpdate(client); + // } + // } + // }); } catch (e) { logger(LOG_TAG, "credential PCD not verified for req", req); } 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 7900052050..94b253516d 100644 --- a/apps/passport-server/src/services/generic-issuance/pipelines/LemonadePipeline.ts +++ b/apps/passport-server/src/services/generic-issuance/pipelines/LemonadePipeline.ts @@ -13,6 +13,7 @@ import { BadgeConfig, CONTACT_EVENT_NAME, GenericIssuanceSendPipelineEmailResponseValue, + ImageOptions, LemonadePipelineDefinition, LemonadePipelineEventConfig, LemonadePipelineTicketTypeConfig, @@ -61,10 +62,7 @@ import { IBadgeGiftingDB, IContactSharingDB } from "../../../database/queries/ticketActionDBs"; -import { - namedSqlTransaction, - sqlTransaction -} from "../../../database/sqlQuery"; +import { sqlQueryWithPool } from "../../../database/sqlQuery"; import { PCDHTTPError } from "../../../routing/pcdHttpError"; import { ApplicationContext } from "../../../types"; import { logger } from "../../../util/logger"; @@ -221,7 +219,7 @@ export class LemonadePipeline implements BasePipeline { getSerializedLatestGroup: async ( groupId: string ): Promise => { - return sqlTransaction( + return sqlQueryWithPool( this.context.dbPool, async (client) => this.semaphoreGroupProvider?.getSerializedLatestGroup( @@ -233,7 +231,7 @@ export class LemonadePipeline implements BasePipeline { getLatestGroupRoot: async ( groupId: string ): Promise => { - return sqlTransaction( + return sqlQueryWithPool( this.context.dbPool, async (client) => this.semaphoreGroupProvider?.getLatestGroupRoot(client, groupId) @@ -243,7 +241,7 @@ export class LemonadePipeline implements BasePipeline { groupId: string, rootHash: string ): Promise => { - return sqlTransaction( + return sqlQueryWithPool( this.context.dbPool, async (client) => this.semaphoreGroupProvider?.getSerializedHistoricalGroup( @@ -488,9 +486,7 @@ export class LemonadePipeline implements BasePipeline { ); if ((this.definition.options.semaphoreGroups ?? []).length > 0) { - await sqlTransaction(this.context.dbPool, (client) => - this.triggerSemaphoreGroupUpdate(client) - ); + this.triggerSemaphoreGroupUpdate(); } return { @@ -544,7 +540,7 @@ export class LemonadePipeline implements BasePipeline { * Marked as public so that it can be called from tests, but otherwise should * not be called from outside the class. */ - public async triggerSemaphoreGroupUpdate(client: PoolClient): Promise { + public async triggerSemaphoreGroupUpdate(): Promise { return traced(LOG_NAME, "triggerSemaphoreGroupUpdate", async (_span) => { tracePipeline(this.definition); // Whenever an update is triggered, we want to make sure that the @@ -557,9 +553,15 @@ export class LemonadePipeline implements BasePipeline { // queuing update requests. // By returning this promise, we allow the caller to await on the update // having been processed. + return this.semaphoreUpdateQueue.add(async () => { const data = await this.semaphoreGroupData(); - await this.semaphoreGroupProvider?.update(client, data); + await sqlQueryWithPool(this.context.dbPool, async (client) => { + if (!this.semaphoreGroupProvider) { + return; + } + return this.semaphoreGroupProvider.update(client, data); + }); }); }); } @@ -589,6 +591,40 @@ export class LemonadePipeline implements BasePipeline { }); } + private imageOptionsToImageUrl( + imageOptions: ImageOptions | undefined, + isCheckedIn: boolean + ): string | undefined { + if (!imageOptions) return undefined; + if (imageOptions.requireCheckedIn && !isCheckedIn) return undefined; + return imageOptions.imageUrl; + } + + private atomToQrCodeOverrideImageUrl( + ticketAtom: LemonadeAtom + ): string | undefined { + const event = this.lemonadeAtomToEvent(ticketAtom); + return event.imageOptions?.qrCodeOverrideImageUrl; + } + + private atomToImageUrl(ticketAtom: LemonadeAtom): string | undefined { + const event = this.lemonadeAtomToEvent(ticketAtom); + return this.imageOptionsToImageUrl( + event.imageOptions, + ticketAtom.checkinDate !== undefined + ); + } + + private atomToEventLocation(atom: LemonadeAtom): string | undefined { + const event = this.lemonadeAtomToEvent(atom); + return event.imageOptions?.eventLocation; + } + + private atomToEventStartDate(atom: LemonadeAtom): string | undefined { + const event = this.lemonadeAtomToEvent(atom); + return event.imageOptions?.eventStartDate; + } + private async manualTicketToTicketData( client: PoolClient, manualTicket: ManualTicket, @@ -611,6 +647,10 @@ export class LemonadePipeline implements BasePipeline { attendeeName: manualTicket.attendeeName, attendeeSemaphoreId: sempahoreId, isConsumed: checkIn ? true : false, + imageUrl: this.imageOptionsToImageUrl(event.imageOptions, !!checkIn), + qrCodeOverrideImageUrl: event.imageOptions?.qrCodeOverrideImageUrl, + eventStartDate: event.imageOptions?.eventStartDate, + eventLocation: event.imageOptions?.eventLocation, isRevoked: false, timestampSigned: Date.now(), timestampConsumed: checkIn ? checkIn.timestamp.getTime() : 0, @@ -784,184 +824,145 @@ export class LemonadePipeline implements BasePipeline { email: string, identityCommitment: string ): Promise { - // Load atom-backed tickets - const relevantTickets = await this.db.loadByEmail(this.id, email); + return traced(LOG_NAME, "getTicketsForEmail", async () => { + // Load atom-backed tickets + const relevantTickets = await this.db.loadByEmail(this.id, email); - // Load check-in data - const checkIns = await this.checkinDB.getByTicketIds( - client, - this.id, - relevantTickets.map((ticket) => ticket.id) - ); - const checkInsById = _.keyBy(checkIns, (checkIn) => checkIn.ticketId); + // Load check-in data + const checkIns = await traced(LOG_NAME, "get checkins", async () => + this.checkinDB.getByTicketIds( + client, + this.id, + relevantTickets.map((ticket) => ticket.id) + ) + ); + const checkInsById = _.keyBy(checkIns, (checkIn) => checkIn.ticketId); - // Convert atoms to ticket data - const ticketDatas = relevantTickets.map((t) => { - if (checkInsById[t.id]) { - t.checkinDate = checkInsById[t.id].timestamp; - } - return this.atomToTicketData(t, identityCommitment); - }); - // Load manual tickets from the definition - const manualTickets = this.getManualTicketsForEmail(email); - // Convert manual tickets to ticket data and add to array - ticketDatas.push( - ...(await Promise.all( - manualTickets.map((manualTicket) => - this.manualTicketToTicketData( - client, - manualTicket, - identityCommitment + // Convert atoms to ticket data + const ticketDatas = relevantTickets.map((t) => { + if (checkInsById[t.id]) { + t.checkinDate = checkInsById[t.id].timestamp; + } + return this.atomToTicketData(t, identityCommitment); + }); + // Load manual tickets from the definition + const manualTickets = this.getManualTicketsForEmail(email); + // Convert manual tickets to ticket data and add to array + ticketDatas.push( + ...(await Promise.all( + manualTickets.map((manualTicket) => + this.manualTicketToTicketData( + client, + manualTicket, + identityCommitment + ) ) - ) - )) - ); + )) + ); - // Turn ticket data into PCDs - const tickets = await Promise.all( - ticketDatas.map((t) => this.getOrGenerateTicket(t)) - ); + // Turn ticket data into PCDs + const tickets = await Promise.all( + ticketDatas.map((t) => this.getOrGenerateTicket(t)) + ); - return tickets; + return tickets; + }); } private async issueLemonadeTicketPCDs( req: PollFeedRequest ): Promise { return traced(LOG_NAME, "issueLemonadeTicketPCDs", async (span) => { - return namedSqlTransaction( - this.context.dbPool, - "issueLemonadeTicketPCDs", - async (client) => { - tracePipeline(this.definition); - - if (!req.pcd) { - throw new Error("missing credential pcd"); - } + tracePipeline(this.definition); + if (!req.pcd) { + throw new Error("missing credential pcd"); + } - if ( - this.definition.options.paused && - !(await this.db.hasLoaded(this.id)) - ) { - return { actions: [] }; - } + if ( + this.definition.options.paused && + !(await this.db.hasLoaded(this.id)) + ) { + return { actions: [] }; + } - const credential = - await this.credentialSubservice.verifyAndExpectZupassEmail(req.pcd); + const credential = + await this.credentialSubservice.verifyAndExpectZupassEmail(req.pcd); - const { emails, semaphoreId } = credential; + const { emails, semaphoreId } = credential; - if (!emails || emails.length === 0) { - throw new Error("missing emails in credential"); - } + if (!emails || emails.length === 0) { + throw new Error("missing emails in credential"); + } - span?.setAttribute("emails", emails.map((e) => e.email).join(",")); - span?.setAttribute("semaphore_id", semaphoreId); + span?.setAttribute("emails", emails.map((e) => e.email).join(",")); + span?.setAttribute("semaphore_id", semaphoreId); - let didUpdate = false; - for (const email of emails) { - // Consumer is validated, so save them in the consumer list - didUpdate = - didUpdate || - (await this.consumerDB.save( - client, - this.id, - email.email, - semaphoreId, - new Date() - )); - } + let didUpdate = false; + await sqlQueryWithPool(this.context.dbPool, async (client) => { + for (const email of emails) { + // Consumer is validated, so save them in the consumer list + didUpdate = + didUpdate || + (await this.consumerDB.save( + client, + this.id, + email.email, + semaphoreId, + new Date() + )); + } + }); - if ((this.definition.options.semaphoreGroups ?? []).length > 0) { - // If the user's Semaphore commitment has changed, `didUpdate` will be - // true, and we need to update the Semaphore groups - if (didUpdate) { - span?.setAttribute("semaphore_groups_updated", true); - await this.triggerSemaphoreGroupUpdate(client); - } - } + if ((this.definition.options.semaphoreGroups ?? []).length > 0) { + // If the user's Semaphore commitment has changed, `didUpdate` will be + // true, and we need to update the Semaphore groups + if (didUpdate) { + span?.setAttribute("semaphore_groups_updated", true); + await this.triggerSemaphoreGroupUpdate(); + } + } - const tickets = ( + const tickets = await sqlQueryWithPool( + this.context.dbPool, + async (client) => { + return ( await Promise.all( emails.map((e) => this.getTicketsForEmail(client, e.email, semaphoreId) ) ) ).flat(); + } + ); - const ticketActions: PCDAction[] = []; - - if (await this.db.hasLoaded(this.id)) { - ticketActions.push({ - type: PCDActionType.DeleteFolder, - folder: this.definition.options.feedOptions.feedFolder, - recursive: true - }); - } - - const ticketPCDs = await Promise.all( - tickets.map((t) => EdDSATicketPCDPackage.serialize(t)) - ); - - ticketActions.push({ - type: PCDActionType.ReplaceInFolder, - folder: this.definition.options.feedOptions.feedFolder, - pcds: ticketPCDs - }); + const ticketActions: PCDAction[] = []; - const contactsFolder = `${this.definition.options.feedOptions.feedFolder}/contacts`; - const contacts = ( - await Promise.all( - emails.map((e) => - this.getReceivedContactsForEmail(client, e.email) - ) - ) - ).flat(); - const contactActions: PCDAction[] = [ - { - type: PCDActionType.DeleteFolder, - folder: contactsFolder, - recursive: true - }, - { - type: PCDActionType.ReplaceInFolder, - folder: contactsFolder, - pcds: contacts - } - ]; + if (await this.db.hasLoaded(this.id)) { + ticketActions.push({ + type: PCDActionType.DeleteFolder, + folder: this.definition.options.feedOptions.feedFolder, + recursive: true + }); + } - const badgeFolder = `${this.definition.options.feedOptions.feedFolder}/badges`; + const ticketPCDs = await traced(LOG_NAME, "serialize tickets", async () => + Promise.all(tickets.map((t) => EdDSATicketPCDPackage.serialize(t))) + ); - const badges = ( - await Promise.all( - emails.map((e) => this.getReceivedBadgesForEmail(client, e.email)) - ) - ).flat(); - const badgeActions: PCDAction[] = [ - { - type: PCDActionType.DeleteFolder, - folder: badgeFolder, - recursive: true - }, - { - type: PCDActionType.ReplaceInFolder, - folder: badgeFolder, - pcds: badges - } - ]; + ticketActions.push({ + type: PCDActionType.ReplaceInFolder, + folder: this.definition.options.feedOptions.feedFolder, + pcds: ticketPCDs + }); - traceFlattenedObject(span, { - pcds_issued: tickets.length + badges.length + contacts.length, - tickets_issued: tickets.length, - badges_issued: badges.length, - contacts_issued: contacts.length - }); + traceFlattenedObject(span, { + pcds_issued: tickets.length, + tickets_issued: tickets.length + }); - return { - actions: [...ticketActions, ...contactActions, ...badgeActions] - }; - } - ); + return { + actions: [...ticketActions] + }; }); } @@ -1202,6 +1203,10 @@ export class LemonadePipeline implements BasePipeline { timestampConsumed: atom.checkinDate instanceof Date ? atom.checkinDate.getTime() : 0, timestampSigned: Date.now(), + imageUrl: this.atomToImageUrl(atom), + qrCodeOverrideImageUrl: this.atomToQrCodeOverrideImageUrl(atom), + eventStartDate: this.atomToEventStartDate(atom), + eventLocation: this.atomToEventLocation(atom), attendeeSemaphoreId: semaphoreId, isConsumed: atom.checkinDate instanceof Date, isRevoked: false, // Not clear what concept this maps to in Lemonade @@ -1373,219 +1378,206 @@ export class LemonadePipeline implements BasePipeline { LOG_NAME, "precheckTicketAction", async (span): Promise => { - return namedSqlTransaction( - this.context.dbPool, - "precheckTicketAction", - async (client) => { - tracePipeline(this.definition); - - let actorEmails: string[]; - - // This method can only be used to pre-check for check-ins. - // There is no pre-check for any other kind of action at this time. - if (request.action.checkin !== true) { - throw new PCDHTTPError(400, "Not supported"); - } + return sqlQueryWithPool(this.context.dbPool, async (client) => { + tracePipeline(this.definition); - const result: ActionConfigResponseValue = { - success: true, - giveBadgeActionInfo: undefined, - checkinActionInfo: undefined, - getContactActionInfo: undefined - }; + let actorEmails: string[]; - // 1) verify that the requester is who they say they are - try { - span?.setAttribute("ticket_id", request.ticketId); - const credential = - await this.credentialSubservice.verifyAndExpectZupassEmail( - request.credential - ); + // This method can only be used to pre-check for check-ins. + // There is no pre-check for any other kind of action at this time. + if (request.action.checkin !== true) { + throw new PCDHTTPError(400, "Not supported"); + } - const { emails, semaphoreId } = credential; - if (!emails || emails.length === 0) { - throw new Error("missing emails in credential"); - } + const result: ActionConfigResponseValue = { + success: true, + giveBadgeActionInfo: undefined, + checkinActionInfo: undefined, + getContactActionInfo: undefined + }; - span?.setAttribute( - "checker_emails", - emails.map((e) => e.email) + // 1) verify that the requester is who they say they are + try { + span?.setAttribute("ticket_id", request.ticketId); + const credential = + await this.credentialSubservice.verifyAndExpectZupassEmail( + request.credential ); - span?.setAttribute("checked_semaphore_id", semaphoreId); - actorEmails = emails.map((e) => e.email); - } catch (e) { - logger( - `${LOG_TAG} Failed to verify credential due to error: `, - e - ); - setError(e, span); - span?.setAttribute("precheck_error", "InvalidSignature"); - return { - success: false, - error: { name: "InvalidSignature" } - }; + const { emails, semaphoreId } = credential; + if (!emails || emails.length === 0) { + throw new Error("missing emails in credential"); } - let eventConfig: LemonadePipelineEventConfig; - const manualTicket = this.getManualTicketById(request.ticketId); - const ticketAtom = await this.db.loadById( - this.id, - request.ticketId + span?.setAttribute( + "checker_emails", + emails.map((e) => e.email) ); - let ticketInfo: TicketInfo; - let notCheckedIn; - - if (ticketAtom) { - eventConfig = this.lemonadeAtomToEvent(ticketAtom); - ticketInfo = { - eventName: eventConfig.name, - ticketName: this.lemonadeAtomToTicketName(ticketAtom), - attendeeEmail: ticketAtom.email, - attendeeName: ticketAtom.name - }; - notCheckedIn = await this.notCheckedIn(ticketAtom); - } else if (manualTicket) { - eventConfig = this.getEventById(manualTicket.eventId); - const ticketType = this.getTicketTypeById( - eventConfig, - manualTicket.productId - ); - ticketInfo = { - eventName: eventConfig.name, - ticketName: ticketType.name, - attendeeEmail: manualTicket.attendeeEmail, - attendeeName: manualTicket.attendeeName - }; - notCheckedIn = await this.notCheckedInManual( - client, - manualTicket - ); - } else { - return { - success: false, - error: { name: "InvalidTicket" } - }; - } + span?.setAttribute("checked_semaphore_id", semaphoreId); - // 1) checkin action - const canCheckIn = await this.canCheckInForEvent( - request.eventId, - actorEmails + actorEmails = emails.map((e) => e.email); + } catch (e) { + logger(`${LOG_TAG} Failed to verify credential due to error: `, e); + setError(e, span); + span?.setAttribute("precheck_error", "InvalidSignature"); + return { + success: false, + error: { name: "InvalidSignature" } + }; + } + + let eventConfig: LemonadePipelineEventConfig; + const manualTicket = this.getManualTicketById(request.ticketId); + const ticketAtom = await this.db.loadById(this.id, request.ticketId); + let ticketInfo: TicketInfo; + let notCheckedIn; + + if (ticketAtom) { + eventConfig = this.lemonadeAtomToEvent(ticketAtom); + ticketInfo = { + eventName: eventConfig.name, + ticketName: this.lemonadeAtomToTicketName(ticketAtom), + attendeeEmail: ticketAtom.email, + attendeeName: ticketAtom.name + }; + notCheckedIn = await this.notCheckedIn(ticketAtom); + } else if (manualTicket) { + eventConfig = this.getEventById(manualTicket.eventId); + const ticketType = this.getTicketTypeById( + eventConfig, + manualTicket.productId ); - if (canCheckIn !== true) { - result.checkinActionInfo = { - permissioned: false, - canCheckIn: false, - reason: { name: "NotSuperuser" } - }; - } else if (notCheckedIn !== true) { - result.checkinActionInfo = { - permissioned: true, - canCheckIn: false, - reason: notCheckedIn, - ticket: ticketInfo - }; - } else { - result.checkinActionInfo = { - permissioned: true, - canCheckIn: true, - ticket: ticketInfo - }; - } + ticketInfo = { + eventName: eventConfig.name, + ticketName: ticketType.name, + attendeeEmail: manualTicket.attendeeEmail, + attendeeName: manualTicket.attendeeName + }; + notCheckedIn = await this.notCheckedInManual(client, manualTicket); + } else { + return { + success: false, + error: { name: "InvalidTicket" } + }; + } - // 2) badge action - if (this.definition.options.ticketActions?.badges?.enabled) { - const badgesGivenToTicketHolder = await this.badgeDB.getBadges( - client, - this.id, - ticketInfo.attendeeEmail - ); + // 1) checkin action + const canCheckIn = await this.canCheckInForEvent( + request.eventId, + actorEmails + ); + if (canCheckIn !== true) { + result.checkinActionInfo = { + permissioned: false, + canCheckIn: false, + reason: { name: "NotSuperuser" } + }; + } else if (notCheckedIn !== true) { + result.checkinActionInfo = { + permissioned: true, + canCheckIn: false, + reason: notCheckedIn, + ticket: ticketInfo + }; + } else { + result.checkinActionInfo = { + permissioned: true, + canCheckIn: true, + ticket: ticketInfo + }; + } - const badgesGiveableByUser = ( - await Promise.all( - actorEmails.map((e) => this.getBadgesGiveableByEmail(e)) - ) - ).flat(); + // 2) badge action + if (this.definition.options.ticketActions?.badges?.enabled) { + const badgesGivenToTicketHolder = await this.badgeDB.getBadges( + client, + this.id, + ticketInfo.attendeeEmail + ); - const rateLimitedGiveableByUser = badgesGiveableByUser.filter( - (b) => b.maxPerDay !== undefined - ); + const badgesGiveableByUser = ( + await Promise.all( + actorEmails.map((e) => this.getBadgesGiveableByEmail(e)) + ) + ).flat(); - const notAlreadyGivenBadges = badgesGiveableByUser.filter( - (c) => !badgesGivenToTicketHolder.find((b) => b.id === c.id) - ); + const rateLimitedGiveableByUser = badgesGiveableByUser.filter( + (b) => b.maxPerDay !== undefined + ); + + const notAlreadyGivenBadges = badgesGiveableByUser.filter( + (c) => !badgesGivenToTicketHolder.find((b) => b.id === c.id) + ); + + const intervalMs = 24 * 60 * 60 * 1000; + const alreadyGivenRateLimited = ( + await Promise.all( + actorEmails.map((e) => + this.badgeDB.getGivenBadges( + client, + this.id, + e, + rateLimitedGiveableByUser.map((b) => b.id), + intervalMs + ) + ) + ) + ).flat(); + + result.giveBadgeActionInfo = { + permissioned: badgesGiveableByUser.length > 0, + giveableBadges: notAlreadyGivenBadges, + rateLimitedBadges: badgesGiveableByUser + .filter(isPerDayBadge) + .filter(() => { + return !actorEmails.includes(ticketInfo.attendeeEmail); + }) + .map((b) => ({ + alreadyGivenInInterval: alreadyGivenRateLimited.filter( + (g) => g.id === b.id + ).length, + id: b.id, + eventName: b.eventName, + productName: b.productName, + intervalMs, + maxInInterval: b.maxPerDay, + timestampsGiven: alreadyGivenRateLimited + .filter((g) => g.id === b.id) + .map((g) => g.timeCreated) + })), + ticket: ticketInfo + }; + } - const intervalMs = 24 * 60 * 60 * 1000; - const alreadyGivenRateLimited = ( + // 3) contact action + if (this.definition.options.ticketActions?.contacts?.enabled) { + if (actorEmails.includes(ticketInfo.attendeeEmail)) { + result.getContactActionInfo = { + permissioned: false, + alreadyReceived: false + }; + } else { + const received = ( await Promise.all( actorEmails.map((e) => - this.badgeDB.getGivenBadges( - client, - this.id, - e, - rateLimitedGiveableByUser.map((b) => b.id), - intervalMs - ) + this.contactDB.getContacts(client, this.id, e) ) ) ).flat(); - - result.giveBadgeActionInfo = { - permissioned: badgesGiveableByUser.length > 0, - giveableBadges: notAlreadyGivenBadges, - rateLimitedBadges: badgesGiveableByUser - .filter(isPerDayBadge) - .filter(() => { - return !actorEmails.includes(ticketInfo.attendeeEmail); - }) - .map((b) => ({ - alreadyGivenInInterval: alreadyGivenRateLimited.filter( - (g) => g.id === b.id - ).length, - id: b.id, - eventName: b.eventName, - productName: b.productName, - intervalMs, - maxInInterval: b.maxPerDay, - timestampsGiven: alreadyGivenRateLimited - .filter((g) => g.id === b.id) - .map((g) => g.timeCreated) - })), + result.getContactActionInfo = { + permissioned: true, + alreadyReceived: received.includes(ticketInfo.attendeeEmail), ticket: ticketInfo }; } + } - // 3) contact action - if (this.definition.options.ticketActions?.contacts?.enabled) { - if (actorEmails.includes(ticketInfo.attendeeEmail)) { - result.getContactActionInfo = { - permissioned: false, - alreadyReceived: false - }; - } else { - const received = ( - await Promise.all( - actorEmails.map((e) => - this.contactDB.getContacts(client, this.id, e) - ) - ) - ).flat(); - result.getContactActionInfo = { - permissioned: true, - alreadyReceived: received.includes(ticketInfo.attendeeEmail), - ticket: ticketInfo - }; - } - } - - // 4) screen config - result.actionScreenConfig = - this.definition.options.ticketActions?.screenConfig; + // 4) screen config + result.actionScreenConfig = + this.definition.options.ticketActions?.screenConfig; - return result; - } - ); + return result; + }); } ); } @@ -1611,223 +1603,215 @@ export class LemonadePipeline implements BasePipeline { LOG_NAME, "executeTicketAction", async (span): Promise => { - return namedSqlTransaction( - this.context.dbPool, - "executeTicketAction", - async (client) => { - tracePipeline(this.definition); + return sqlQueryWithPool(this.context.dbPool, async (client) => { + tracePipeline(this.definition); - let emails: string[]; - try { - const verifiedCredential = - await this.credentialSubservice.verifyAndExpectZupassEmail( - request.credential - ); - if ( - !verifiedCredential.emails || - verifiedCredential.emails.length === 0 - ) { - throw new Error("missing emails in credential"); - } - emails = verifiedCredential.emails.map((e) => e.email); - } catch (e) { - logger( - `${LOG_TAG} Failed to verify credential due to error: `, - e + let emails: string[]; + try { + const verifiedCredential = + await this.credentialSubservice.verifyAndExpectZupassEmail( + request.credential ); - setError(e, span); - span?.setAttribute("checkin_error", "InvalidSignature"); - return { success: false, error: { name: "InvalidSignature" } }; + if ( + !verifiedCredential.emails || + verifiedCredential.emails.length === 0 + ) { + throw new Error("missing emails in credential"); } + emails = verifiedCredential.emails.map((e) => e.email); + } catch (e) { + logger(`${LOG_TAG} Failed to verify credential due to error: `, e); + setError(e, span); + span?.setAttribute("checkin_error", "InvalidSignature"); + return { success: false, error: { name: "InvalidSignature" } }; + } - const precheck = await this.precheckTicketAction(request); - logger( - LOG_TAG, - `got request to execute ticket action ${str( - request - )} - precheck - ${str(precheck)}` - ); + const precheck = await this.precheckTicketAction(request); + logger( + LOG_TAG, + `got request to execute ticket action ${str( + request + )} - precheck - ${str(precheck)}` + ); + + if (!precheck.success) { + return precheck; + } - if (!precheck.success) { - return precheck; + if (request.action.getContact) { + if (!precheck.getContactActionInfo?.permissioned) { + return { + success: false, + error: { name: "InvalidTicket" } + }; } - if (request.action.getContact) { - if (!precheck.getContactActionInfo?.permissioned) { - return { - success: false, - error: { name: "InvalidTicket" } - }; - } + if (precheck.getContactActionInfo?.alreadyReceived) { + return { + success: false, + error: { name: "AlreadyReceived" } + }; + } - if (precheck.getContactActionInfo?.alreadyReceived) { - return { - success: false, - error: { name: "AlreadyReceived" } - }; - } + const ticketId = request.ticketId; + const ticket = await this.db.loadById(this.id, ticketId); + const manualTicket = this.getManualTicketById(ticketId); + const scaneeEmail = ticket?.email ?? manualTicket?.attendeeEmail; - const ticketId = request.ticketId; - const ticket = await this.db.loadById(this.id, ticketId); - const manualTicket = this.getManualTicketById(ticketId); - const scaneeEmail = ticket?.email ?? manualTicket?.attendeeEmail; + if (scaneeEmail) { + await this.contactDB.saveContact( + client, + this.id, + emails[0], + scaneeEmail + ); - if (scaneeEmail) { - await this.contactDB.saveContact( - client, - this.id, - emails[0], - scaneeEmail - ); + return { + success: true + }; + } else { + return { + success: false, + error: { name: "InvalidTicket" } + }; + } + } else if (request.action.giftBadge) { + const ticketId = request.ticketId; + const ticket = await this.db.loadById(this.id, ticketId); + const manualTicket = this.getManualTicketById(ticketId); + const recipientEmail = ticket?.email ?? manualTicket?.attendeeEmail; + + const matchingBadges: BadgeConfig[] = + request.action.giftBadge.badgeIds + .map((id) => + ( + this.definition.options?.ticketActions?.badges?.choices ?? + [] + ).find((badge) => badge.id === id) + ) + .filter((badge) => !!badge) as BadgeConfig[]; - return { - success: true - }; - } else { - return { - success: false, - error: { name: "InvalidTicket" } - }; - } - } else if (request.action.giftBadge) { - const ticketId = request.ticketId; - const ticket = await this.db.loadById(this.id, ticketId); - const manualTicket = this.getManualTicketById(ticketId); - const recipientEmail = - ticket?.email ?? manualTicket?.attendeeEmail; - - const matchingBadges: BadgeConfig[] = - request.action.giftBadge.badgeIds - .map((id) => - ( - this.definition.options?.ticketActions?.badges?.choices ?? - [] - ).find((badge) => badge.id === id) - ) - .filter((badge) => !!badge) as BadgeConfig[]; - - const allowedBadges = matchingBadges.filter((b) => { - const matchingRateLimitedBadge = - precheck.giveBadgeActionInfo?.rateLimitedBadges?.find( - (r) => r.id === b.id - ); - - // prevent too many rate limited badges from being given - if (matchingRateLimitedBadge) { - if ( - matchingRateLimitedBadge.alreadyGivenInInterval >= - matchingRateLimitedBadge.maxInInterval - ) { - return false; - } - } + const allowedBadges = matchingBadges.filter((b) => { + const matchingRateLimitedBadge = + precheck.giveBadgeActionInfo?.rateLimitedBadges?.find( + (r) => r.id === b.id + ); - // prevent wrong ppl from issuing wrong badges + // prevent too many rate limited badges from being given + if (matchingRateLimitedBadge) { if ( - !b.givers?.includes("*") && - !b.givers?.find((e) => emails.includes(e)) + matchingRateLimitedBadge.alreadyGivenInInterval >= + matchingRateLimitedBadge.maxInInterval ) { return false; } + } + + // prevent wrong ppl from issuing wrong badges + if ( + !b.givers?.includes("*") && + !b.givers?.find((e) => emails.includes(e)) + ) { + return false; + } + + return true; + }); + + if (recipientEmail) { + await this.badgeDB.giveBadges( + client, + this.id, + emails[0], + recipientEmail, + allowedBadges + ); + + return { + success: true + }; + } else { + return { + success: false, + error: { name: "InvalidTicket" } + }; + } + } else if (request.action?.checkin) { + if (precheck.checkinActionInfo?.reason) { + return { + success: false, + error: precheck.checkinActionInfo?.reason + }; + } - return true; - }); + const autoGrantBadges: BadgeConfig[] = ( + this.definition.options?.ticketActions?.badges?.choices ?? [] + ).filter((badge) => badge.grantOnCheckin); - if (recipientEmail) { + // First see if we have an atom which matches the ticket ID + const ticketAtom = await this.db.loadById( + this.id, + request.ticketId + ); + if ( + ticketAtom && + // Ensure that the checker-provided event ID matches the ticket + this.lemonadeAtomToZupassEventId(ticketAtom) === request.eventId + ) { + if (ticketAtom.email) { await this.badgeDB.giveBadges( client, this.id, emails[0], - recipientEmail, - allowedBadges + ticketAtom.email, + autoGrantBadges ); - - return { - success: true - }; - } else { - return { - success: false, - error: { name: "InvalidTicket" } - }; } - } else if (request.action?.checkin) { - if (precheck.checkinActionInfo?.reason) { - return { - success: false, - error: precheck.checkinActionInfo?.reason - }; - } - - const autoGrantBadges: BadgeConfig[] = ( - this.definition.options?.ticketActions?.badges?.choices ?? [] - ).filter((badge) => badge.grantOnCheckin); - // First see if we have an atom which matches the ticket ID - const ticketAtom = await this.db.loadById( - this.id, - request.ticketId + return this.podboxLocalCheckIn( + { + id: ticketAtom.id, + eventId: ticketAtom.genericIssuanceEventId, + productId: ticketAtom.genericIssuanceProductId, + attendeeName: ticketAtom.name, + attendeeEmail: ticketAtom.email + }, + emails[0] ); - if ( - ticketAtom && - // Ensure that the checker-provided event ID matches the ticket - this.lemonadeAtomToZupassEventId(ticketAtom) === request.eventId - ) { - if (ticketAtom.email) { - await this.badgeDB.giveBadges( - client, - this.id, - emails[0], - ticketAtom.email, - autoGrantBadges - ); - } - - return this.podboxLocalCheckIn( - { - id: ticketAtom.id, - eventId: ticketAtom.genericIssuanceEventId, - productId: ticketAtom.genericIssuanceProductId, - attendeeName: ticketAtom.name, - attendeeEmail: ticketAtom.email - }, - emails[0] + } else { + // No valid Lemonade atom found, try looking for a manual ticket + const manualTicket = this.getManualTicketById(request.ticketId); + if (manualTicket && manualTicket.eventId === request.eventId) { + await this.badgeDB.giveBadges( + client, + this.id, + emails[0], + manualTicket.attendeeEmail, + autoGrantBadges ); - } else { - // No valid Lemonade atom found, try looking for a manual ticket - const manualTicket = this.getManualTicketById(request.ticketId); - if (manualTicket && manualTicket.eventId === request.eventId) { - await this.badgeDB.giveBadges( - client, - this.id, - emails[0], - manualTicket.attendeeEmail, - autoGrantBadges - ); - // Manual ticket found, check in with the DB - return this.podboxLocalCheckIn(manualTicket, emails[0]); - } else { - // Didn't find any matching ticket - logger( - `${LOG_TAG} Could not find ticket ${request.ticketId} ` + - `for event ${ - request.eventId - } for checkin requested by ${JSON.stringify(emails)} ` + - `on pipeline ${this.id}` - ); - span?.setAttribute("checkin_error", "InvalidTicket"); - return { success: false, error: { name: "InvalidTicket" } }; - } + // Manual ticket found, check in with the DB + return this.podboxLocalCheckIn(manualTicket, emails[0]); + } else { + // Didn't find any matching ticket + logger( + `${LOG_TAG} Could not find ticket ${request.ticketId} ` + + `for event ${ + request.eventId + } for checkin requested by ${JSON.stringify(emails)} ` + + `on pipeline ${this.id}` + ); + span?.setAttribute("checkin_error", "InvalidTicket"); + return { success: false, error: { name: "InvalidTicket" } }; } - } else { - return { - success: false, - error: { name: "ServerError" } - }; } + } else { + return { + success: false, + error: { name: "ServerError" } + }; } - ); + }); } ); } @@ -1843,71 +1827,67 @@ export class LemonadePipeline implements BasePipeline { LOG_NAME, "checkInManualTicket", async (span): Promise => { - return namedSqlTransaction( - this.context.dbPool, - "checkInManualTicket", - async (client) => { - const pendingCheckin = this.pendingCheckIns.get(manualTicket.id); - if (pendingCheckin) { - span?.setAttribute("checkin_error", "AlreadyCheckedIn"); - return { - success: false, - error: { - name: "AlreadyCheckedIn", - checkinTimestamp: new Date( - pendingCheckin.timestamp - ).toISOString(), - checker: LEMONADE_CHECKER - } - }; - } + return sqlQueryWithPool(this.context.dbPool, async (client) => { + const pendingCheckin = this.pendingCheckIns.get(manualTicket.id); + if (pendingCheckin) { + span?.setAttribute("checkin_error", "AlreadyCheckedIn"); + return { + success: false, + error: { + name: "AlreadyCheckedIn", + checkinTimestamp: new Date( + pendingCheckin.timestamp + ).toISOString(), + checker: LEMONADE_CHECKER + } + }; + } - try { - await this.checkinDB.checkIn( + try { + await this.checkinDB.checkIn( + client, + this.id, + manualTicket.id, + new Date(), + checkerEmail + ); + this.pendingCheckIns.set(manualTicket.id, { + status: CheckinStatus.Success, + timestamp: Date.now() + }); + } catch (e) { + logger( + `${LOG_TAG} Failed to check in ticket ${manualTicket.id} for event ${manualTicket.eventId} on behalf of checker ${checkerEmail} on pipeline ${this.id}` + ); + setError(e, span); + this.pendingCheckIns.delete(manualTicket.id); + + if (e instanceof DatabaseError) { + // We may have received a DatabaseError due to an insertion conflict + // Detect this conflict by looking for an existing check-in. + const existingCheckin = await this.checkinDB.getByTicketId( client, this.id, - manualTicket.id, - new Date(), - checkerEmail - ); - this.pendingCheckIns.set(manualTicket.id, { - status: CheckinStatus.Success, - timestamp: Date.now() - }); - } catch (e) { - logger( - `${LOG_TAG} Failed to check in ticket ${manualTicket.id} for event ${manualTicket.eventId} on behalf of checker ${checkerEmail} on pipeline ${this.id}` + manualTicket.id ); - setError(e, span); - this.pendingCheckIns.delete(manualTicket.id); - - if (e instanceof DatabaseError) { - // We may have received a DatabaseError due to an insertion conflict - // Detect this conflict by looking for an existing check-in. - const existingCheckin = await this.checkinDB.getByTicketId( - client, - this.id, - manualTicket.id - ); - if (existingCheckin) { - span?.setAttribute("checkin_error", "AlreadyCheckedIn"); - return { - success: false, - error: { - name: "AlreadyCheckedIn", - checkinTimestamp: existingCheckin.timestamp.toISOString(), - checker: LEMONADE_CHECKER - } - }; - } + if (existingCheckin) { + span?.setAttribute("checkin_error", "AlreadyCheckedIn"); + return { + success: false, + error: { + name: "AlreadyCheckedIn", + checkinTimestamp: existingCheckin.timestamp.toISOString(), + checker: LEMONADE_CHECKER + } + }; } - span?.setAttribute("checkin_error", "ServerError"); - return { success: false, error: { name: "ServerError" } }; } - - return { success: true }; + span?.setAttribute("checkin_error", "ServerError"); + return { success: false, error: { name: "ServerError" } }; } - ); + + return { success: true }; + }); } ); } @@ -2024,51 +2004,41 @@ export class LemonadePipeline implements BasePipeline { */ private async getManualCheckinSummary(): Promise { return traced(LOG_NAME, "getManualCheckinSummary", async (span) => { - return namedSqlTransaction( - this.context.dbPool, - "getManualCheckinSummary", - async (client) => { - const results: PipelineCheckinSummary[] = []; - const checkIns = await this.checkinDB.getByPipelineId( - client, - this.id - ); - const checkInsById = _.keyBy(checkIns, (checkIn) => checkIn.ticketId); - - for (const ticketAtom of await this.db.load(this.id)) { - const checkIn = checkInsById[ticketAtom.id]; - results.push({ - ticketId: ticketAtom.id, - ticketName: this.lemonadeAtomToTicketName(ticketAtom), - email: ticketAtom.email, - timestamp: checkIn ? checkIn.timestamp.toISOString() : "", - checkerEmail: checkIn ? checkIn.checkerEmail : undefined, - checkedIn: !!checkIn - }); - } - - for (const manualTicket of this.definition.options.manualTickets ?? - []) { - const checkIn = checkInsById[manualTicket.id]; - const event = this.getEventById(manualTicket.eventId); - const product = this.getTicketTypeById( - event, - manualTicket.productId - ); - results.push({ - ticketId: manualTicket.id, - ticketName: product.name, - email: manualTicket.attendeeEmail, - timestamp: checkIn ? checkIn.timestamp.toISOString() : "", - checkerEmail: checkIn ? checkIn.checkerEmail : undefined, - checkedIn: !!checkIn - }); - } + return sqlQueryWithPool(this.context.dbPool, async (client) => { + const results: PipelineCheckinSummary[] = []; + const checkIns = await this.checkinDB.getByPipelineId(client, this.id); + const checkInsById = _.keyBy(checkIns, (checkIn) => checkIn.ticketId); + + for (const ticketAtom of await this.db.load(this.id)) { + const checkIn = checkInsById[ticketAtom.id]; + results.push({ + ticketId: ticketAtom.id, + ticketName: this.lemonadeAtomToTicketName(ticketAtom), + email: ticketAtom.email, + timestamp: checkIn ? checkIn.timestamp.toISOString() : "", + checkerEmail: checkIn ? checkIn.checkerEmail : undefined, + checkedIn: !!checkIn + }); + } - span?.setAttribute("result_count", results.length); - return results; + for (const manualTicket of this.definition.options.manualTickets ?? + []) { + const checkIn = checkInsById[manualTicket.id]; + const event = this.getEventById(manualTicket.eventId); + const product = this.getTicketTypeById(event, manualTicket.productId); + results.push({ + ticketId: manualTicket.id, + ticketName: product.name, + email: manualTicket.attendeeEmail, + timestamp: checkIn ? checkIn.timestamp.toISOString() : "", + checkerEmail: checkIn ? checkIn.checkerEmail : undefined, + checkedIn: !!checkIn + }); } - ); + + span?.setAttribute("result_count", results.length); + return results; + }); }); } @@ -2078,47 +2048,43 @@ export class LemonadePipeline implements BasePipeline { checkerEmail: string ): Promise { return traced(LOG_NAME, "setManualCheckInState", async (span) => { - return namedSqlTransaction( - this.context.dbPool, - "getManualCheckinSummary", - async (client) => { - span?.setAttribute("ticket_id", ticketId); - span?.setAttribute("checkin_state", checkInState); - span?.setAttribute("checker_email", checkerEmail); - const atom = await this.db.loadById(this.id, ticketId); - if (!atom) { - const manualTicket = ( - this.definition.options.manualTickets ?? [] - ).find((m) => m.id === ticketId); - if (!manualTicket) { - throw new PCDHTTPError( - 404, - `Ticket ${ticketId} does not exist on pipeline ${this.id}` - ); - } - } - - logger( - `${LOG_TAG} Setting manual check-in state to ${ - checkInState ? "checked-in" : "checked-out" - } for ticket ${ticketId} on pipeline ${this.id}` - ); - - if (checkInState) { - await this.checkinDB.checkIn( - client, - this.id, - ticketId, - new Date(), - checkerEmail + return sqlQueryWithPool(this.context.dbPool, async (client) => { + span?.setAttribute("ticket_id", ticketId); + span?.setAttribute("checkin_state", checkInState); + span?.setAttribute("checker_email", checkerEmail); + const atom = await this.db.loadById(this.id, ticketId); + if (!atom) { + const manualTicket = ( + this.definition.options.manualTickets ?? [] + ).find((m) => m.id === ticketId); + if (!manualTicket) { + throw new PCDHTTPError( + 404, + `Ticket ${ticketId} does not exist on pipeline ${this.id}` ); - } else { - await this.checkinDB.deleteCheckIn(client, this.id, ticketId); } + } + + logger( + `${LOG_TAG} Setting manual check-in state to ${ + checkInState ? "checked-in" : "checked-out" + } for ticket ${ticketId} on pipeline ${this.id}` + ); - return { checkInState }; + if (checkInState) { + await this.checkinDB.checkIn( + client, + this.id, + ticketId, + new Date(), + checkerEmail + ); + } else { + await this.checkinDB.deleteCheckIn(client, this.id, ticketId); } - ); + + return { checkInState }; + }); }); } diff --git a/apps/passport-server/src/services/generic-issuance/pipelines/PODPipeline/PODPipeline.ts b/apps/passport-server/src/services/generic-issuance/pipelines/PODPipeline/PODPipeline.ts index b88a3af142..64d9c0fb40 100644 --- a/apps/passport-server/src/services/generic-issuance/pipelines/PODPipeline/PODPipeline.ts +++ b/apps/passport-server/src/services/generic-issuance/pipelines/PODPipeline/PODPipeline.ts @@ -25,7 +25,7 @@ import { PipelineAtom } from "../../../../database/queries/pipelineAtomDB"; import { IPipelineConsumerDB } from "../../../../database/queries/pipelineConsumerDB"; -import { sqlTransaction } from "../../../../database/sqlQuery"; +import { sqlQueryWithPool } from "../../../../database/sqlQuery"; import { ApplicationContext } from "../../../../types"; import { logger } from "../../../../util/logger"; import { PersistentCacheService } from "../../../persistentCacheService"; @@ -343,7 +343,7 @@ export class PODPipeline implements BasePipeline { span?.setAttribute("email", emails?.map((e) => e.email)?.join(",") ?? ""); span?.setAttribute("semaphore_id", semaphoreId); - await sqlTransaction(this.context.dbPool, async (client) => { + await sqlQueryWithPool(this.context.dbPool, async (client) => { for (const e of emails ?? []) { await this.consumerDB.save( client, 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 aec8a29955..bfa35d641a 100644 --- a/apps/passport-server/src/services/generic-issuance/pipelines/PretixPipeline.ts +++ b/apps/passport-server/src/services/generic-issuance/pipelines/PretixPipeline.ts @@ -60,10 +60,7 @@ import { IPipelineConsumerDB } from "../../../database/queries/pipelineConsumerD import { IPipelineDefinitionDB } from "../../../database/queries/pipelineDefinitionDB"; import { IPipelineManualTicketDB } from "../../../database/queries/pipelineManualTicketDB"; import { IPipelineSemaphoreHistoryDB } from "../../../database/queries/pipelineSemaphoreHistoryDB"; -import { - namedSqlTransaction, - sqlTransaction -} from "../../../database/sqlQuery"; +import { sqlQueryWithPool } from "../../../database/sqlQuery"; import { PCDHTTPError } from "../../../routing/pcdHttpError"; import { ApplicationContext } from "../../../types"; import { mostRecentCheckinEvent } from "../../../util/devconnectTicket"; @@ -107,6 +104,24 @@ const VALID_PRETIX_EVENT_SETTINGS: GenericPretixEventSettings = { attendee_emails_required: true }; +const VARIATION_NUMBER_TO_VARIATION_NAME: Record = { + 2: "S", + 3: "M", + 4: "L", + 5: "XL", + 6: "XXL", + 7: "S", + 8: "M", + 9: "L", + 10: "XL", + 11: "XXL", + 12: "S", + 13: "M", + 14: "L", + 15: "XL", + 16: "XXL" +}; + /** * Class encapsulating the complete set of behaviors that a {@link Pipeline} which * loads data from Pretix is capable of. @@ -235,7 +250,7 @@ export class PretixPipeline implements BasePipeline { getSerializedLatestGroup: async ( groupId: string ): Promise => { - return sqlTransaction( + return sqlQueryWithPool( this.context.dbPool, async (client) => this.semaphoreGroupProvider?.getSerializedLatestGroup( @@ -247,7 +262,7 @@ export class PretixPipeline implements BasePipeline { getLatestGroupRoot: async ( groupId: string ): Promise => { - return sqlTransaction( + return sqlQueryWithPool( this.context.dbPool, async (client) => this.semaphoreGroupProvider?.getLatestGroupRoot(client, groupId) @@ -257,7 +272,7 @@ export class PretixPipeline implements BasePipeline { groupId: string, rootHash: string ): Promise => { - return sqlTransaction( + return sqlQueryWithPool( this.context.dbPool, async (client) => this.semaphoreGroupProvider?.getSerializedHistoricalGroup( @@ -289,7 +304,7 @@ export class PretixPipeline implements BasePipeline { throw new Error(`pipeline ${this.id} already stopped`); } logger(`starting pretix pipeline with id ${this.definition.id}`); - await sqlTransaction(this.context.dbPool, (client) => + await sqlQueryWithPool(this.context.dbPool, (client) => this.cleanUpManualCheckins(client) ); await this.semaphoreGroupProvider?.start(); @@ -391,6 +406,10 @@ export class PretixPipeline implements BasePipeline { name: ticket.full_name, eventId: ticket.event.genericIssuanceId, productId: ticket.product.genericIssuanceId, + variationName: ticket.variation + ? VARIATION_NUMBER_TO_VARIATION_NAME[ticket.variation] ?? + `Unknown (${ticket.variation})` + : null, // Use the event ID as the "namespace" when hashing the position ID. // The event ID is a UUID that is part of our configuration, and is // globally unique. The position ID is not globally unique, but is @@ -399,94 +418,116 @@ export class PretixPipeline implements BasePipeline { secret: ticket.secret, timestampConsumed: ticket.pretix_checkin_timestamp, isConsumed: !!ticket.pretix_checkin_timestamp, - orderCode: ticket.order_code + orderCode: ticket.order_code, + parentAtomId: ticket.addon_to_position_id + ? uuidv5( + ticket.addon_to_position_id, + ticket.event.genericIssuanceId + ) + : null }; }); + // Make a map from atom id to atom + const atomMap = new Map(); + atomsToSave.forEach((a) => { + atomMap.set(a.id, a); + }); + + // For each atom, if it has a parentAtomId, set the email to the parent atom's email + atomsToSave.forEach((a) => { + if (a.parentAtomId) { + const parentAtom = atomMap.get(a.parentAtomId); + if (parentAtom) { + a.email = parentAtom.email; + } else { + logger( + LOG_TAG, + `parent atom ${a.parentAtomId} not found for atom ${a.id} in pipeline ${this.id}` + ); + } + } + }); + logger( LOG_TAG, `saving ${atomsToSave.length} atoms for pipeline id '${this.id}' of type ${this.type}` ); - return namedSqlTransaction( - this.context.dbPool, - "load", - async (client) => { - if (this.autoIssuanceProvider) { - const newManualTickets = - await this.autoIssuanceProvider.dripNewManualTickets( - client, - this.consumerDB, - await this.getAllManualTickets(client), - atomsToSave - ); - - await Promise.allSettled( - newManualTickets.map((t) => - this.manualTicketDB.save(client, this.id, t) - ) + return sqlQueryWithPool(this.context.dbPool, async (client) => { + if (this.autoIssuanceProvider) { + const newManualTickets = + await this.autoIssuanceProvider.dripNewManualTickets( + client, + this.consumerDB, + await this.getAllManualTickets(client), + atomsToSave ); - } - await this.db.clear(this.definition.id); - await this.db.save(this.definition.id, atomsToSave); - await this.db.markAsLoaded(this.id); + await Promise.allSettled( + newManualTickets.map((t) => + this.manualTicketDB.save(client, this.id, t) + ) + ); + } - logs.push(makePLogInfo(`saved ${atomsToSave.length} items`)); + await this.db.clear(this.definition.id); + await this.db.save(this.definition.id, atomsToSave); + await this.db.markAsLoaded(this.id); - const loadEnd = Date.now(); + logs.push(makePLogInfo(`saved ${atomsToSave.length} items`)); - logger( - LOG_TAG, - `loaded ${atomsToSave.length} atoms for pipeline id ${ - this.id - } in ${loadEnd - startTime.getTime()}ms` - ); - - span?.setAttribute("atoms_saved", atomsToSave.length); - - // Remove any pending check-ins that succeeded before loading started. - // Those that succeeded after loading started might not be represented in - // the data we fetched, so we can remove them on the next run. - // Pending checkins with the "Pending" status should not be removed, as - // they are still in-progress. - this.pendingCheckIns.forEach((value, key) => { - if ( - value.status === CheckinStatus.Success && - value.timestamp <= startTime.getTime() - ) { - this.pendingCheckIns.delete(key); - } - }); + const loadEnd = Date.now(); - const end = new Date(); - logs.push( - makePLogInfo( - `load finished in ${end.getTime() - startTime.getTime()}ms` - ) - ); + logger( + LOG_TAG, + `loaded ${atomsToSave.length} atoms for pipeline id ${this.id} in ${ + loadEnd - startTime.getTime() + }ms` + ); - if ((this.definition.options.semaphoreGroups ?? []).length > 0) { - await this.triggerSemaphoreGroupUpdate(client); + span?.setAttribute("atoms_saved", atomsToSave.length); + + // Remove any pending check-ins that succeeded before loading started. + // Those that succeeded after loading started might not be represented in + // the data we fetched, so we can remove them on the next run. + // Pending checkins with the "Pending" status should not be removed, as + // they are still in-progress. + this.pendingCheckIns.forEach((value, key) => { + if ( + value.status === CheckinStatus.Success && + value.timestamp <= startTime.getTime() + ) { + this.pendingCheckIns.delete(key); } + }); - const loadSummary: PipelineLoadSummary = { - paused: false, - fromCache: false, - lastRunEndTimestamp: end.toISOString(), - lastRunStartTimestamp: startTime.toISOString(), - latestLogs: logs, - atomsLoaded: atomsToSave.length, - atomsExpected: atomsToSave.length, - errorMessage: undefined, - semaphoreGroups: - this.semaphoreGroupProvider?.getSupportedGroups(), - success: true - }; + const end = new Date(); + logs.push( + makePLogInfo( + `load finished in ${end.getTime() - startTime.getTime()}ms` + ) + ); - return loadSummary; + if ((this.definition.options.semaphoreGroups ?? []).length > 0) { + await this.triggerSemaphoreGroupUpdate(client); } - ); + + const loadSummary: PipelineLoadSummary = { + paused: false, + fromCache: false, + lastRunEndTimestamp: end.toISOString(), + lastRunStartTimestamp: startTime.toISOString(), + latestLogs: logs, + atomsLoaded: atomsToSave.length, + atomsExpected: atomsToSave.length, + errorMessage: undefined, + semaphoreGroups: this.semaphoreGroupProvider?.getSupportedGroups(), + success: true + }; + + return loadSummary; + }); } ); } @@ -625,6 +666,7 @@ export class PretixPipeline implements BasePipeline { orgUrl, token, eventId, + this.definition.options.batchFetch ?? false, this.abort ); const checkinLists = await this.api.fetchEventCheckinLists( @@ -861,7 +903,9 @@ export class PretixPipeline implements BasePipeline { attendee_email, secret, checkins, - answers + answers, + addon_to, + variation } = position; const product = products.get(item.toString()); @@ -929,7 +973,9 @@ export class PretixPipeline implements BasePipeline { position_id: id.toString(), secret, pretix_checkin_timestamp, - order_code: order.code + order_code: order.code, + addon_to_position_id: addon_to?.toString() ?? null, + variation }); } } @@ -1133,9 +1179,8 @@ export class PretixPipeline implements BasePipeline { span?.setAttribute("email", emails.map((e) => e.email).join(",")); span?.setAttribute("semaphore_id", semaphoreId); - let didUpdate = false; - - return namedSqlTransaction(this.context.dbPool, "", async (client) => { + await sqlQueryWithPool(this.context.dbPool, async (client) => { + let didUpdate = false; for (const e of emails) { didUpdate = didUpdate || @@ -1148,27 +1193,6 @@ export class PretixPipeline implements BasePipeline { )); } - const provider = this.autoIssuanceProvider; - if (provider) { - const newManualTickets = ( - await Promise.all( - emails.map(async (e) => - provider.maybeIssueForUser( - e.email, - await this.getAllManualTickets(client), - await this.db.loadByEmail(this.id, e.email) - ) - ) - ) - ).flat(); - - await Promise.allSettled( - newManualTickets.map((t) => - this.manualTicketDB.save(client, this.id, t) - ) - ); - } - // If the user's Semaphore commitment has changed, `didUpdate` will be // true, and we need to update the Semaphore groups if ((this.definition.options.semaphoreGroups ?? []).length > 0) { @@ -1177,61 +1201,102 @@ export class PretixPipeline implements BasePipeline { await this.triggerSemaphoreGroupUpdate(client); } } + }); - const tickets = ( + const provider = this.autoIssuanceProvider; + if (provider) { + const allManualTickets = await sqlQueryWithPool( + this.context.dbPool, + async (client) => await this.getAllManualTickets(client) + ); + const newManualTickets = ( await Promise.all( - emails.map((e) => - this.getEdDSATicketsForEmail(client, e.email, semaphoreId) + emails.map(async (e) => + provider.maybeIssueForUser( + e.email, + allManualTickets, + await this.db.loadByEmail(this.id, e.email) + ) ) ) ).flat(); - span?.setAttribute("pcds_issued", tickets.length); - - const actions: PCDAction[] = []; - - if (await this.db.hasLoaded(this.id)) { - actions.push({ - type: PCDActionType.DeleteFolder, - folder: this.definition.options.feedOptions.feedFolder, - recursive: true - }); - } - - const ticketPCDs = await Promise.all( - tickets.map((t) => EdDSATicketPCDPackage.serialize(t)) + await sqlQueryWithPool(this.context.dbPool, async (client) => + Promise.allSettled( + newManualTickets.map((t) => + this.manualTicketDB.save(client, this.id, t) + ) + ) ); + } - if (this.definition.options.enablePODTickets) { - const podTickets = ( + const tickets = await sqlQueryWithPool( + this.context.dbPool, + async (client) => { + return ( await Promise.all( emails.map((e) => - e.semaphoreV4Id - ? this.getPODTicketsForEmail(client, e.email, e.semaphoreV4Id) - : undefined + this.getEdDSATicketsForEmail(client, e.email, semaphoreId) ) ) - ) - .flat() - .filter((t) => t !== undefined) as PODTicketPCD[]; - - ticketPCDs.push( - ...(await Promise.all( - podTickets.map((t) => PODTicketPCDPackage.serialize(t)) - )) - ); + ).flat(); } + ); + + span?.setAttribute("pcds_issued", tickets.length); + + const actions: PCDAction[] = []; + if (await this.db.hasLoaded(this.id)) { actions.push({ - type: PCDActionType.ReplaceInFolder, + type: PCDActionType.DeleteFolder, folder: this.definition.options.feedOptions.feedFolder, - pcds: ticketPCDs + recursive: true }); + } + + const ticketPCDs = await Promise.all( + tickets.map((t) => EdDSATicketPCDPackage.serialize(t)) + ); + + if (this.definition.options.enablePODTickets) { + const podTickets = await sqlQueryWithPool( + this.context.dbPool, + async (client) => { + return ( + await Promise.all( + emails.map((e) => + e.semaphoreV4Id + ? this.getPODTicketsForEmail( + client, + e.email, + e.semaphoreV4Id + ) + : undefined + ) + ) + ) + .flat() + .filter((t) => t !== undefined) as PODTicketPCD[]; + } + ); - const result: PollFeedResponseValue = { actions }; + ticketPCDs.push( + ...(await Promise.all( + podTickets.map((t) => PODTicketPCDPackage.serialize(t)) + )) + ); + } - return result; + actions.push({ + type: PCDActionType.ReplaceInFolder, + folder: this.definition.options.feedOptions.feedFolder, + pcds: ticketPCDs }); + + const result: PollFeedResponseValue = { actions }; + + return result; }); } @@ -1253,17 +1318,18 @@ export class PretixPipeline implements BasePipeline { ticketId: atom.id, eventId: atom.eventId, productId: atom.productId, - timestampConsumed: atom.timestampConsumed?.getTime() ?? 0, + timestampConsumed: atom?.timestampConsumed?.getTime() ?? 0, timestampSigned: Date.now(), owner: semaphoreV4Id, imageUrl: this.atomToImageUrl(atom), qrCodeOverrideImageUrl: this.atomToQrCodeOverrideImageUrl(atom), eventStartDate: this.atomToEventStartDate(atom), eventLocation: this.atomToEventLocation(atom), - isAddOn: this.atomToIsAddOn(atom), + isAddOn: !!atom.parentAtomId, isConsumed: atom.isConsumed, isRevoked: false, - ticketCategory: TicketCategory.Generic + ticketCategory: TicketCategory.Generic, + parentTicketId: atom.parentAtomId ?? undefined }; } @@ -1295,10 +1361,11 @@ export class PretixPipeline implements BasePipeline { qrCodeOverrideImageUrl: this.atomToQrCodeOverrideImageUrl(atom), eventStartDate: this.atomToEventStartDate(atom), eventLocation: this.atomToEventLocation(atom), - isAddOn: this.atomToIsAddOn(atom), + isAddOn: !!atom.parentAtomId, isConsumed: atom.isConsumed, isRevoked: false, - ticketCategory: TicketCategory.Generic + ticketCategory: TicketCategory.Generic, + parentTicketId: atom.parentAtomId ?? undefined }; } @@ -1735,95 +1802,141 @@ export class PretixPipeline implements BasePipeline { LOG_NAME, "checkPretixTicketPCDCanBeCheckedIn", async (span): Promise => { - return namedSqlTransaction( - this.context.dbPool, - "checkPretixTicketPCDCanBeCheckedIn", - async (client) => { - tracePipeline(this.definition); - - let checkerEmails: string[]; - const { eventId, ticketId } = request; + return sqlQueryWithPool(this.context.dbPool, async (client) => { + tracePipeline(this.definition); - // This method can only be used to pre-check for check-ins. - // There is no pre-check for any other kind of action at this time. - if (request.action.checkin !== true) { - throw new PCDHTTPError(400, "Not supported"); - } + let checkerEmails: string[]; + const { eventId, ticketId } = request; - try { - span?.setAttribute("ticket_id", ticketId); + // This method can only be used to pre-check for check-ins. + // There is no pre-check for any other kind of action at this time. + if (request.action.checkin !== true) { + throw new PCDHTTPError(400, "Not supported"); + } - const { emails, semaphoreId } = - await this.credentialSubservice.verifyAndExpectZupassEmail( - request.credential - ); + try { + span?.setAttribute("ticket_id", ticketId); - span?.setAttribute( - "checker_email", - emails?.map((e) => e.email).join(",") ?? "" + const { emails, semaphoreId } = + await this.credentialSubservice.verifyAndExpectZupassEmail( + request.credential ); - span?.setAttribute("checked_semaphore_id", semaphoreId); - checkerEmails = emails?.map((e) => e.email) ?? []; - if (checkerEmails.length === 0) { - throw new Error("missing emails in credential"); + span?.setAttribute( + "checker_email", + emails?.map((e) => e.email).join(",") ?? "" + ); + span?.setAttribute("checked_semaphore_id", semaphoreId); + + checkerEmails = emails?.map((e) => e.email) ?? []; + if (checkerEmails.length === 0) { + throw new Error("missing emails in credential"); + } + } catch (e) { + logger(`${LOG_TAG} Failed to verify credential due to error: `, e); + setError(e, span); + span?.setAttribute("precheck_error", "InvalidSignature"); + return { + success: true, + checkinActionInfo: { + canCheckIn: false, + permissioned: false, + reason: { name: "InvalidSignature" } } - } catch (e) { - logger( - `${LOG_TAG} Failed to verify credential due to error: `, - e - ); - setError(e, span); - span?.setAttribute("precheck_error", "InvalidSignature"); + }; + } + + const realTicket = await this.db.loadById(this.id, ticketId); + const manualTicket = await this.getManualTicketById(client, ticketId); + const checkinInProductId = + realTicket?.productId ?? manualTicket?.productId; + if (!checkinInProductId) { + throw new Error(`ticket with id '${ticketId}' does not exist`); + } + + try { + // Verify that checker can check in tickets for the specified event + const canCheckInResult = await this.canCheckInForEvent( + client, + eventId, + checkinInProductId, + checkerEmails + ); + + if (canCheckInResult !== true) { + span?.setAttribute("precheck_error", canCheckInResult.name); return { success: true, checkinActionInfo: { - canCheckIn: false, permissioned: false, - reason: { name: "InvalidSignature" } + canCheckIn: false, + reason: canCheckInResult } }; } - const realTicket = await this.db.loadById(this.id, ticketId); - const manualTicket = await this.getManualTicketById( - client, - ticketId - ); - const checkinInProductId = - realTicket?.productId ?? manualTicket?.productId; - if (!checkinInProductId) { - throw new Error(`ticket with id '${ticketId}' does not exist`); - } - - try { - // Verify that checker can check in tickets for the specified event - const canCheckInResult = await this.canCheckInForEvent( - client, - eventId, - checkinInProductId, - checkerEmails - ); - - if (canCheckInResult !== true) { - span?.setAttribute("precheck_error", canCheckInResult.name); + // First see if we have an atom which matches the ticket ID + const ticketAtom = await this.db.loadById(this.id, ticketId); + if (ticketAtom && ticketAtom.eventId === eventId) { + const canCheckInTicketResult = + await this.canCheckInPretixTicket(ticketAtom); + if (canCheckInTicketResult !== true) { + if (canCheckInTicketResult.name === "AlreadyCheckedIn") { + return { + success: true, + checkinActionInfo: { + permissioned: true, + canCheckIn: false, + reason: canCheckInTicketResult, + ticket: { + eventName: this.atomToEventName(ticketAtom), + ticketName: this.atomToTicketName(ticketAtom), + attendeeEmail: ticketAtom.email as string, + attendeeName: ticketAtom.name + } + } + }; + } return { success: true, checkinActionInfo: { permissioned: false, canCheckIn: false, - reason: canCheckInResult + reason: canCheckInTicketResult + } + }; + } else { + return { + success: true, + checkinActionInfo: { + permissioned: true, + canCheckIn: true, + ticket: { + eventName: this.atomToEventName(ticketAtom), + ticketName: this.atomToTicketName(ticketAtom), + attendeeEmail: ticketAtom.email as string, + attendeeName: ticketAtom.name + } } }; } - - // First see if we have an atom which matches the ticket ID - const ticketAtom = await this.db.loadById(this.id, ticketId); - if (ticketAtom && ticketAtom.eventId === eventId) { + } else { + // No Pretix atom found, try looking for a manual ticket + const manualTicket = await this.getManualTicketById( + client, + ticketId + ); + if (manualTicket && manualTicket.eventId === eventId) { + // Manual ticket found const canCheckInTicketResult = - await this.canCheckInPretixTicket(ticketAtom); + await this.canCheckInManualTicket(client, manualTicket); if (canCheckInTicketResult !== true) { if (canCheckInTicketResult.name === "AlreadyCheckedIn") { + const eventConfig = this.getEventById(manualTicket.eventId); + const ticketType = this.getProductById( + eventConfig, + manualTicket.productId + ); return { success: true, checkinActionInfo: { @@ -1831,10 +1944,10 @@ export class PretixPipeline implements BasePipeline { canCheckIn: false, reason: canCheckInTicketResult, ticket: { - eventName: this.atomToEventName(ticketAtom), - ticketName: this.atomToTicketName(ticketAtom), - attendeeEmail: ticketAtom.email as string, - attendeeName: ticketAtom.name + eventName: eventConfig.name, + ticketName: ticketType.name, + attendeeEmail: manualTicket.attendeeEmail, + attendeeName: manualTicket.attendeeName } } }; @@ -1848,108 +1961,35 @@ export class PretixPipeline implements BasePipeline { } }; } else { + const eventConfig = this.getEventById(manualTicket.eventId); + const ticketType = this.getProductById( + eventConfig, + manualTicket.productId + ); return { success: true, checkinActionInfo: { permissioned: true, canCheckIn: true, ticket: { - eventName: this.atomToEventName(ticketAtom), - ticketName: this.atomToTicketName(ticketAtom), - attendeeEmail: ticketAtom.email as string, - attendeeName: ticketAtom.name + eventName: eventConfig.name, + ticketName: ticketType.name, + attendeeEmail: manualTicket.attendeeEmail, + attendeeName: manualTicket.attendeeName } } }; } - } else { - // No Pretix atom found, try looking for a manual ticket - const manualTicket = await this.getManualTicketById( - client, - ticketId - ); - if (manualTicket && manualTicket.eventId === eventId) { - // Manual ticket found - const canCheckInTicketResult = - await this.canCheckInManualTicket(client, manualTicket); - if (canCheckInTicketResult !== true) { - if (canCheckInTicketResult.name === "AlreadyCheckedIn") { - const eventConfig = this.getEventById( - manualTicket.eventId - ); - const ticketType = this.getProductById( - eventConfig, - manualTicket.productId - ); - return { - success: true, - checkinActionInfo: { - permissioned: true, - canCheckIn: false, - reason: canCheckInTicketResult, - ticket: { - eventName: eventConfig.name, - ticketName: ticketType.name, - attendeeEmail: manualTicket.attendeeEmail, - attendeeName: manualTicket.attendeeName - } - } - }; - } - return { - success: true, - checkinActionInfo: { - permissioned: false, - canCheckIn: false, - reason: canCheckInTicketResult - } - }; - } else { - const eventConfig = this.getEventById(manualTicket.eventId); - const ticketType = this.getProductById( - eventConfig, - manualTicket.productId - ); - return { - success: true, - checkinActionInfo: { - permissioned: true, - canCheckIn: true, - ticket: { - eventName: eventConfig.name, - ticketName: ticketType.name, - attendeeEmail: manualTicket.attendeeEmail, - attendeeName: manualTicket.attendeeName - } - } - }; - } - } } - } catch (e) { - logger( - `${LOG_TAG} Error when finding ticket ${ticketId} for checkin by ${JSON.stringify( - checkerEmails - )} on pipeline ${this.id}`, - e - ); - setError(e); - span?.setAttribute("checkin_error", "InvalidTicket"); - return { - success: true, - checkinActionInfo: { - permissioned: false, - canCheckIn: false, - reason: { name: "InvalidTicket" } - } - }; } - // Didn't find any matching ticket + } catch (e) { logger( - `${LOG_TAG} Could not find ticket ${ticketId} for event ${eventId} for checkin requested by ${JSON.stringify( + `${LOG_TAG} Error when finding ticket ${ticketId} for checkin by ${JSON.stringify( checkerEmails - )} on pipeline ${this.id}` + )} on pipeline ${this.id}`, + e ); + setError(e); span?.setAttribute("checkin_error", "InvalidTicket"); return { success: true, @@ -1960,7 +2000,22 @@ export class PretixPipeline implements BasePipeline { } }; } - ); + // Didn't find any matching ticket + logger( + `${LOG_TAG} Could not find ticket ${ticketId} for event ${eventId} for checkin requested by ${JSON.stringify( + checkerEmails + )} on pipeline ${this.id}` + ); + span?.setAttribute("checkin_error", "InvalidTicket"); + return { + success: true, + checkinActionInfo: { + permissioned: false, + canCheckIn: false, + reason: { name: "InvalidTicket" } + } + }; + }); } ); } @@ -1975,89 +2030,82 @@ export class PretixPipeline implements BasePipeline { request: PodboxTicketActionRequest ): Promise { return traced(LOG_NAME, "checkinPretixTicketPCDs", async (span) => { - return namedSqlTransaction( - this.context.dbPool, - "checkinPretixTicketPCDs", - async (client) => { - tracePipeline(this.definition); - - logger( - LOG_TAG, - `got request to check in tickets with request ${JSON.stringify( - request - )}` - ); + return sqlQueryWithPool(this.context.dbPool, async (client) => { + tracePipeline(this.definition); - let checkerEmails: string[]; - const { ticketId, eventId } = request; + logger( + LOG_TAG, + `got request to check in tickets with request ${JSON.stringify( + request + )}` + ); - try { - span?.setAttribute("ticket_id", ticketId); - const { emails, semaphoreId } = - await this.credentialSubservice.verifyAndExpectZupassEmail( - request.credential - ); + let checkerEmails: string[]; + const { ticketId, eventId } = request; - span?.setAttribute( - "checker_email", - emails?.map((e) => e.email).join(",") ?? "" + try { + span?.setAttribute("ticket_id", ticketId); + const { emails, semaphoreId } = + await this.credentialSubservice.verifyAndExpectZupassEmail( + request.credential ); - span?.setAttribute("checked_semaphore_id", semaphoreId); - checkerEmails = emails?.map((e) => e.email) ?? []; - if (checkerEmails.length === 0) { - throw new Error("missing emails in credential"); - } - } catch (e) { - logger(`${LOG_TAG} Failed to verify credential due to error: `, e); - setError(e, span); - span?.setAttribute("checkin_error", "InvalidSignature"); - return { success: false, error: { name: "InvalidSignature" } }; - } - - const realTicket = await this.db.loadById(this.id, ticketId); - const manualTicket = await this.getManualTicketById(client, ticketId); - const checkinInProductId = - realTicket?.productId ?? manualTicket?.productId; - if (!checkinInProductId) { - throw new Error(`ticket with id '${ticketId}' does not exist`); - } - const canCheckInResult = await this.canCheckInForEvent( - client, - eventId, - checkinInProductId, - checkerEmails + span?.setAttribute( + "checker_email", + emails?.map((e) => e.email).join(",") ?? "" ); + span?.setAttribute("checked_semaphore_id", semaphoreId); + checkerEmails = emails?.map((e) => e.email) ?? []; - if (canCheckInResult !== true) { - return { success: false, error: canCheckInResult }; + if (checkerEmails.length === 0) { + throw new Error("missing emails in credential"); } + } catch (e) { + logger(`${LOG_TAG} Failed to verify credential due to error: `, e); + setError(e, span); + span?.setAttribute("checkin_error", "InvalidSignature"); + return { success: false, error: { name: "InvalidSignature" } }; + } - // First see if we have an atom which matches the ticket ID - const ticketAtom = await this.db.loadById(this.id, ticketId); - if (ticketAtom && ticketAtom.eventId === eventId) { - return this.checkInPretixTicket(ticketAtom, checkerEmails[0]); + const realTicket = await this.db.loadById(this.id, ticketId); + const manualTicket = await this.getManualTicketById(client, ticketId); + const checkinInProductId = + realTicket?.productId ?? manualTicket?.productId; + if (!checkinInProductId) { + throw new Error(`ticket with id '${ticketId}' does not exist`); + } + const canCheckInResult = await this.canCheckInForEvent( + client, + eventId, + checkinInProductId, + checkerEmails + ); + + if (canCheckInResult !== true) { + return { success: false, error: canCheckInResult }; + } + + // First see if we have an atom which matches the ticket ID + const ticketAtom = await this.db.loadById(this.id, ticketId); + if (ticketAtom && ticketAtom.eventId === eventId) { + return this.checkInPretixTicket(ticketAtom, checkerEmails[0]); + } else { + const manualTicket = await this.getManualTicketById(client, ticketId); + if (manualTicket && manualTicket.eventId === eventId) { + // Manual ticket found, check in with the DB + return this.checkInManualTicket(manualTicket, checkerEmails[0]); } else { - const manualTicket = await this.getManualTicketById( - client, - ticketId + // Didn't find any matching ticket + logger( + `${LOG_TAG} Could not find ticket ${ticketId} for event ${eventId} for checkin requested by ${JSON.stringify( + checkerEmails + )} on pipeline ${this.id}` ); - if (manualTicket && manualTicket.eventId === eventId) { - // Manual ticket found, check in with the DB - return this.checkInManualTicket(manualTicket, checkerEmails[0]); - } else { - // Didn't find any matching ticket - logger( - `${LOG_TAG} Could not find ticket ${ticketId} for event ${eventId} for checkin requested by ${JSON.stringify( - checkerEmails - )} on pipeline ${this.id}` - ); - span?.setAttribute("checkin_error", "InvalidTicket"); - return { success: false, error: { name: "InvalidTicket" } }; - } + span?.setAttribute("checkin_error", "InvalidTicket"); + return { success: false, error: { name: "InvalidTicket" } }; } } - ); + }); }); } @@ -2072,70 +2120,66 @@ export class PretixPipeline implements BasePipeline { LOG_NAME, "checkInManualTicket", async (span): Promise => { - return namedSqlTransaction( - this.context.dbPool, - "checkInManualTicket", - async (client) => { - const pendingCheckin = this.pendingCheckIns.get(manualTicket.id); - if (pendingCheckin) { - span?.setAttribute("checkin_error", "AlreadyCheckedIn"); - return { - success: false, - error: { - name: "AlreadyCheckedIn", - checkinTimestamp: new Date( - pendingCheckin.timestamp - ).toISOString(), - checker: PRETIX_CHECKER - } - }; - } + return sqlQueryWithPool(this.context.dbPool, async (client) => { + const pendingCheckin = this.pendingCheckIns.get(manualTicket.id); + if (pendingCheckin) { + span?.setAttribute("checkin_error", "AlreadyCheckedIn"); + return { + success: false, + error: { + name: "AlreadyCheckedIn", + checkinTimestamp: new Date( + pendingCheckin.timestamp + ).toISOString(), + checker: PRETIX_CHECKER + } + }; + } - try { - await this.checkinDB.checkIn( + try { + await this.checkinDB.checkIn( + client, + this.id, + manualTicket.id, + new Date(), + checkerEmail + ); + this.pendingCheckIns.set(manualTicket.id, { + status: CheckinStatus.Success, + timestamp: Date.now() + }); + } catch (e) { + logger( + `${LOG_TAG} Failed to check in ticket ${manualTicket.id} for event ${manualTicket.eventId} on behalf of checker ${checkerEmail} on pipeline ${this.id}` + ); + setError(e, span); + this.pendingCheckIns.delete(manualTicket.id); + + if (e instanceof DatabaseError) { + // We may have received a DatabaseError due to an insertion conflict + // Detect this conflict by looking for an existing check-in. + const existingCheckin = await this.checkinDB.getByTicketId( client, this.id, - manualTicket.id, - new Date(), - checkerEmail - ); - this.pendingCheckIns.set(manualTicket.id, { - status: CheckinStatus.Success, - timestamp: Date.now() - }); - } catch (e) { - logger( - `${LOG_TAG} Failed to check in ticket ${manualTicket.id} for event ${manualTicket.eventId} on behalf of checker ${checkerEmail} on pipeline ${this.id}` + manualTicket.id ); - setError(e, span); - this.pendingCheckIns.delete(manualTicket.id); - - if (e instanceof DatabaseError) { - // We may have received a DatabaseError due to an insertion conflict - // Detect this conflict by looking for an existing check-in. - const existingCheckin = await this.checkinDB.getByTicketId( - client, - this.id, - manualTicket.id - ); - if (existingCheckin) { - span?.setAttribute("checkin_error", "AlreadyCheckedIn"); - return { - success: false, - error: { - name: "AlreadyCheckedIn", - checkinTimestamp: existingCheckin.timestamp.toISOString(), - checker: PRETIX_CHECKER - } - }; - } + if (existingCheckin) { + span?.setAttribute("checkin_error", "AlreadyCheckedIn"); + return { + success: false, + error: { + name: "AlreadyCheckedIn", + checkinTimestamp: existingCheckin.timestamp.toISOString(), + checker: PRETIX_CHECKER + } + }; } - span?.setAttribute("checkin_error", "ServerError"); - return { success: false, error: { name: "ServerError" } }; } - return { success: true }; + span?.setAttribute("checkin_error", "ServerError"); + return { success: false, error: { name: "ServerError" } }; } - ); + return { success: true }; + }); } ); } @@ -2239,6 +2283,9 @@ export class PretixPipeline implements BasePipeline { private atomToTicketName(atom: PretixAtom): string { const event = this.getEventById(atom.eventId); const product = this.getProductById(event, atom.productId); + if (atom.variationName) { + return `${product.name} (${atom.variationName})`; + } return product.name; } @@ -2304,6 +2351,18 @@ export class PretixPipeline implements BasePipeline { }; } + public async getAllTicketsForEmail(email: string): Promise<{ + atoms: PretixAtom[]; + manual: ManualTicket[]; + }> { + return { + atoms: await this.db.loadByEmail(this.id, email.toLowerCase()), + manual: (this.definition.options.manualTickets ?? []).filter( + (mt) => mt.attendeeEmail.toLowerCase() === email.toLowerCase() + ) + }; + } + public static is(p: Pipeline | undefined): p is PretixPipeline { return p?.type === PipelineType.Pretix; } @@ -2375,7 +2434,9 @@ export interface PretixTicket { secret: string; order_code: string; position_id: string; + variation: number | null; pretix_checkin_timestamp: Date | null; + addon_to_position_id: string | null; } export interface PretixAtom extends PipelineAtom { @@ -2386,6 +2447,8 @@ export interface PretixAtom extends PipelineAtom { secret: string; timestampConsumed: Date | null; isConsumed: boolean; + variationName: string | null; + parentAtomId: string | null; } export function isPretixAtom(atom: PipelineAtom): atom is PretixAtom { diff --git a/apps/passport-server/src/services/generic-issuance/subservices/CredentialSubservice.ts b/apps/passport-server/src/services/generic-issuance/subservices/CredentialSubservice.ts index af2dbb025d..d5b9fd1625 100644 --- a/apps/passport-server/src/services/generic-issuance/subservices/CredentialSubservice.ts +++ b/apps/passport-server/src/services/generic-issuance/subservices/CredentialSubservice.ts @@ -9,6 +9,7 @@ import { import { LRUCache } from "lru-cache"; import { Pool } from "postgres-pool"; import { loadZupassEdDSAPublicKey } from "../../issuanceService"; +import { traced } from "../../telemetryService"; /** * Manages server-side verification of credential PCDs. @@ -23,7 +24,7 @@ export class CredentialSubservice { private dbPool: Pool | undefined; public constructor(zupassPublicKey: EdDSAPublicKey, dbPool?: Pool) { - this.verificationCache = new LRUCache({ max: 1000 }); + this.verificationCache = new LRUCache({ max: 20000 }); this.zupassPublicKey = zupassPublicKey; this.dbPool = dbPool; } @@ -62,26 +63,35 @@ export class CredentialSubservice { public async verifyAndExpectZupassEmail( credential: Credential ): Promise { - const verifiedCredential = await this.verify(credential); + return traced( + "CredentialSubservice", + "verifyAndExpectZupassEmail", + async () => { + const verifiedCredential = await this.verify(credential); - if (!verifiedCredential.emails || verifiedCredential.emails.length === 0) { - throw new VerificationError("Missing Email PCDs"); - } + if ( + !verifiedCredential.emails || + verifiedCredential.emails.length === 0 + ) { + throw new VerificationError("Missing Email PCDs"); + } - for (const signedEmail of verifiedCredential.emails) { - const { email, semaphoreId, signer } = signedEmail; + for (const signedEmail of verifiedCredential.emails) { + const { email, semaphoreId, signer } = signedEmail; - if (!email || !semaphoreId) { - throw new VerificationError("Missing email PCD in credential"); - } - if (!verifiedCredential.authKey && !this.isZupassPublicKey(signer)) { - throw new VerificationError( - `Email PCD not signed by Zupass. expected ${this.zupassPublicKey} but got ${signer}` - ); - } - } + if (!email || !semaphoreId) { + throw new VerificationError("Missing email PCD in credential"); + } + if (!verifiedCredential.authKey && !this.isZupassPublicKey(signer)) { + throw new VerificationError( + `Email PCD not signed by Zupass. expected ${this.zupassPublicKey} but got ${signer}` + ); + } + } - return { ...verifiedCredential, emails: verifiedCredential.emails }; + return { ...verifiedCredential, emails: verifiedCredential.emails }; + } + ); } /** 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 8a99630984..38ebd07fc4 100644 --- a/apps/passport-server/src/services/generic-issuance/subservices/PipelineAPISubservice.ts +++ b/apps/passport-server/src/services/generic-issuance/subservices/PipelineAPISubservice.ts @@ -20,7 +20,7 @@ import { str } from "@pcd/util"; import _ from "lodash"; import { PoolClient } from "postgres-pool"; import { IPipelineConsumerDB } from "../../../database/queries/pipelineConsumerDB"; -import { sqlTransaction } from "../../../database/sqlQuery"; +import { sqlQueryWithPool } from "../../../database/sqlQuery"; import { PCDHTTPError } from "../../../routing/pcdHttpError"; import { ApplicationContext } from "../../../types"; import { logger } from "../../../util/logger"; @@ -152,7 +152,7 @@ export class PipelineAPISubservice { pipelineHasSemaphoreGroups = true; } - const latestConsumers = await sqlTransaction( + const latestConsumers = await sqlQueryWithPool( this.context.dbPool, (client) => this.consumerDB.loadAll(client, pipelineInstance.id) ); @@ -167,7 +167,7 @@ export class PipelineAPISubservice { (await this.localFileService?.hasCachedLoad(pipelineId)) ?? false, cachedBytes: (await this.localFileService?.getCachedLoadSize(pipelineId)) ?? 0, - loading: !!pipelineSlot.loadPromise, + loading: pipelineSlot.loading, latestAtoms, lastLoad, diff --git a/apps/passport-server/src/services/generic-issuance/subservices/PipelineExecutorSubservice.ts b/apps/passport-server/src/services/generic-issuance/subservices/PipelineExecutorSubservice.ts index 56420be2b2..f792b092c8 100644 --- a/apps/passport-server/src/services/generic-issuance/subservices/PipelineExecutorSubservice.ts +++ b/apps/passport-server/src/services/generic-issuance/subservices/PipelineExecutorSubservice.ts @@ -3,18 +3,14 @@ import { PipelineLoadSummary } from "@pcd/passport-interface"; import { RollbarService } from "@pcd/server-shared"; -import { sleep, str } from "@pcd/util"; +import { str } from "@pcd/util"; import _ from "lodash"; import { PoolClient } from "postgres-pool"; import { IPipelineAtomDB } from "../../../database/queries/pipelineAtomDB"; import { IPipelineDefinitionDB } from "../../../database/queries/pipelineDefinitionDB"; -import { - namedSqlTransaction, - sqlTransaction -} from "../../../database/sqlQuery"; +import { sqlQueryWithPool } from "../../../database/sqlQuery"; import { ApplicationContext } from "../../../types"; import { logger } from "../../../util/logger"; -import { isAbortError } from "../../../util/util"; import { DiscordService } from "../../discordService"; import { LocalFileService, @@ -48,10 +44,10 @@ export class PipelineExecutorSubservice { * 2. save that data, represented by {@link PipelineAtom}, and a corresponding * {@link PipelineLoadSummary}, which contains information about that particular * data load. - * 3. wait {@link PIPELINE_REFRESH_INTERVAL_MS} milliseconds + * 3. wait until the time is at least {@link PIPELINE_REFRESH_INTERVAL_MS} milliseconds after the last load started * 4. go back to step one */ - private static readonly PIPELINE_REFRESH_INTERVAL_MS = 60_000; + private static readonly PIPELINE_REFRESH_INTERVAL_MS = 60_000; // 1 minute /** * Podbox maintains an instance of a {@link PipelineSlot} for each pipeline @@ -67,6 +63,8 @@ export class PipelineExecutorSubservice { private discordService: DiscordService | null; private rollbarService: RollbarService | null; private nextLoadTimeout: NodeJS.Timeout | undefined; + private lastLoadStartedTimestamp: number | undefined; + private lastLoadCompletedTimestamp: number | undefined; private db: IPipelineAtomDB; private pipelineDB: IPipelineDefinitionDB; private localFileService: LocalFileService | null; @@ -99,7 +97,7 @@ export class PipelineExecutorSubservice { * schedules a load loop which loads data for each {@link Pipeline} once per minute. */ public async start(startLoadLoop?: boolean): Promise { - await sqlTransaction(this.context.dbPool, (client) => + await sqlQueryWithPool(this.context.internalPool, (client) => this.loadAndInstantiatePipelines(client) ); @@ -189,7 +187,8 @@ export class PipelineExecutorSubservice { owner: await this.userSubservice.getUserById( client, definition.ownerUserId - ) + ), + loading: false }; this.pipelineSlots.push(pipelineSlot); } else { @@ -202,13 +201,10 @@ export class PipelineExecutorSubservice { tracePipeline(pipelineSlot.definition); traceUser(pipelineSlot.owner); - const existingInstance = pipelineSlot.instance; - const stopPipeline = async (): Promise => { - if (existingInstance && !existingInstance.isStopped()) { - span?.setAttribute("stopping", true); - await existingInstance.stop(); - } - }; + if (pipelineSlot.instance && !pipelineSlot.instance.isStopped()) { + span?.setAttribute("stopping", true); + await pipelineSlot.instance.stop(); + } pipelineSlot.instance = await instantiatePipeline( this.context, @@ -219,9 +215,9 @@ export class PipelineExecutorSubservice { pipelineSlot.definition = definition; if (dontLoad !== true) { - await this.performPipelineLoad(pipelineSlot, stopPipeline); - } else { - await stopPipeline(); + this.performPipelineLoad(pipelineSlot).catch((e) => { + logger(LOG_TAG, "failed to perform pipeline load", e); + }); } }); } @@ -252,6 +248,7 @@ export class PipelineExecutorSubservice { this.pipelineSlots.map(async (entry) => { if (entry.instance && !entry.instance.isStopped()) { await entry.instance.stop(); + entry.loading = false; } }) ); @@ -267,7 +264,8 @@ export class PipelineExecutorSubservice { owner: await this.userSubservice.getUserById( client, pipelineDefinition.ownerUserId - ) + ), + loading: false }); // attempt to instantiate a {@link Pipeline} @@ -311,8 +309,7 @@ export class PipelineExecutorSubservice { * If load result caching is enabled globally and for this pipeline, takes care of that too. */ public async performPipelineLoad( - pipelineSlot: PipelineSlot, - loadStarted?: () => Promise + pipelineSlot: PipelineSlot ): Promise { return traced( SERVICE_NAME, @@ -355,14 +352,13 @@ export class PipelineExecutorSubservice { } let runInfo = await performPipelineLoad( - this.context.dbPool, + this.context.internalPool, pipelineSlot, this.pipelineSubservice, this.userSubservice, this.discordService, this.pagerdutyService, - this.rollbarService, - loadStarted + this.rollbarService ); if (cachedLoadFromDisk) { @@ -425,6 +421,8 @@ export class PipelineExecutorSubservice { */ private async performAllPipelineLoads(): Promise { return traced(SERVICE_NAME, "performAllPipelineLoads", async (span) => { + this.lastLoadStartedTimestamp = Date.now(); + const pipelineIds = str(this.pipelineSlots.map((p) => p.definition.id)); logger( LOG_TAG, @@ -434,44 +432,13 @@ export class PipelineExecutorSubservice { await Promise.allSettled( this.pipelineSlots.map(async (slot: PipelineSlot): Promise => { - try { - if (slot.loadPromise) { - await slot.loadPromise; - } else { - await this.performPipelineLoad(slot); - } - } catch (e) { - // an abort means a podbox user either deleted or edited (and thus restarted) - // this pipeline. in the case that it was deleted, `slot.loadPromise` will be - // set to `undefined`. In the case that it was edited, Podbox will restart the - // pipeline, and set `slot.loadPromise` to a new promise representing the - // pipeline's load operation. - if (isAbortError(e)) { - while (slot.loadPromise) { - try { - await slot.loadPromise; - slot.loadPromise = undefined; - break; - } catch (e) { - if (isAbortError(e)) { - await sleep(50); - } - } - } - // no load promise means we're done here - return; - } - - logger( - LOG_TAG, - `failed to perform pipeline load for pipeline ${slot.definition.id}`, - e - ); - } + await this.performPipelineLoad(slot); }) ); logger(LOG_TAG, "finished performing all pipeline loads"); + + this.lastLoadCompletedTimestamp = Date.now(); }); } @@ -495,30 +462,36 @@ export class PipelineExecutorSubservice { // and re-instantiate the pipeline. do NOT call the pipeline's 'load' // function - that will be done the next time `startPipelineLoadLoop` // is called. - await namedSqlTransaction( - this.context.dbPool, - "startPipelineLoadLoop", - async (client) => { - await this.loadAndInstantiatePipelines(client); - await Promise.allSettled( - this.pipelineSlots - .slice() - .map((s) => this.restartPipeline(client, s.definition.id, true)) - ); - } + await sqlQueryWithPool(this.context.internalPool, async (client) => { + await this.loadAndInstantiatePipelines(client); + await Promise.allSettled( + this.pipelineSlots + .slice() + .map((s) => this.restartPipeline(client, s.definition.id, true)) + ); + }); + + // we schedule the next load to happen `PIPELINE_REFRESH_INTERVAL_MS` after + // the last load *started*. Thus, we cap the amount of pipeline reloads to be + // one per `PIPELINE_REFRESH_INTERVAL_MS`. + const nextLoadTimestamp = + (this.lastLoadStartedTimestamp ?? Date.now()) + + PipelineExecutorSubservice.PIPELINE_REFRESH_INTERVAL_MS; + + const msUntilNextLoadTimestamp = Math.max( + nextLoadTimestamp - Date.now(), + 1000 ); logger( LOG_TAG, "scheduling next pipeline refresh for", - Math.floor( - PipelineExecutorSubservice.PIPELINE_REFRESH_INTERVAL_MS / 1000 - ), + Math.floor(msUntilNextLoadTimestamp / 1000), "s from now" ); this.nextLoadTimeout = setTimeout(() => { this.startPipelineLoadLoop(); - }, PipelineExecutorSubservice.PIPELINE_REFRESH_INTERVAL_MS); + }, msUntilNextLoadTimestamp); } } diff --git a/apps/passport-server/src/services/generic-issuance/subservices/PipelineSubservice.ts b/apps/passport-server/src/services/generic-issuance/subservices/PipelineSubservice.ts index 6d586a1447..4f2b7f1dc0 100644 --- a/apps/passport-server/src/services/generic-issuance/subservices/PipelineSubservice.ts +++ b/apps/passport-server/src/services/generic-issuance/subservices/PipelineSubservice.ts @@ -293,7 +293,7 @@ export class PipelineSubservice { await this.pipelineDB.deleteDefinition(client, pipelineId); await this.pipelineDB.saveLoadSummary(pipelineId, undefined); await this.pipelineAtomDB.clear(pipelineId); - await this.executorSubservice.restartPipeline(client, pipelineId); + await this.executorSubservice.restartPipeline(client, pipelineId, true); await this.localFileService?.clearPipelineCache(pipelineId); }); } @@ -308,7 +308,7 @@ export class PipelineSubservice { await this.localFileService?.clearPipelineCache(pipelineId); await this.pipelineDB.saveLoadSummary(pipelineId, undefined); await this.pipelineAtomDB.clear(pipelineId); - await this.executorSubservice.restartPipeline(client, pipelineId); + await this.executorSubservice.restartPipeline(client, pipelineId, true); } public async getPipelineEditHistory( @@ -429,7 +429,7 @@ export class PipelineSubservice { return { extraInfo: { ownerEmail: owner?.email, - loading: !!slot.loadPromise, + loading: slot.loading, lastLoad: summary, hasCachedLoad: (await this.localFileService?.hasCachedLoad( diff --git a/apps/passport-server/src/services/generic-issuance/subservices/UserSubservice.ts b/apps/passport-server/src/services/generic-issuance/subservices/UserSubservice.ts index 596f288b73..4796fce3f2 100644 --- a/apps/passport-server/src/services/generic-issuance/subservices/UserSubservice.ts +++ b/apps/passport-server/src/services/generic-issuance/subservices/UserSubservice.ts @@ -7,7 +7,7 @@ import { IPipelineUserDB, PipelineUserDB } from "../../../database/queries/pipelineUserDB"; -import { sqlTransaction } from "../../../database/sqlQuery"; +import { sqlQueryWithPool } from "../../../database/sqlQuery"; import { PCDHTTPError } from "../../../routing/pcdHttpError"; import { ApplicationContext } from "../../../types"; import { logger } from "../../../util/logger"; @@ -42,7 +42,7 @@ export class UserSubservice { * Should be called immediately after instantiation. */ public async start(): Promise { - await sqlTransaction(this.context.dbPool, (client) => + await sqlQueryWithPool(this.context.dbPool, (client) => this.maybeSetupAdmins(client) ); } diff --git a/apps/passport-server/src/services/generic-issuance/subservices/utils/maybeAlertForPipelineRun.ts b/apps/passport-server/src/services/generic-issuance/subservices/utils/maybeAlertForPipelineRun.ts index 23003ceb3a..f4adec1a1b 100644 --- a/apps/passport-server/src/services/generic-issuance/subservices/utils/maybeAlertForPipelineRun.ts +++ b/apps/passport-server/src/services/generic-issuance/subservices/utils/maybeAlertForPipelineRun.ts @@ -86,7 +86,7 @@ export async function maybeAlertForPipelineRun( ); } - const alertReason = alertReasons.join("\n\n"); + const alertReason = alertReasons.join("\n\n").substring(0, 800); // in the if - send alert beginnings if (shouldAlert) { diff --git a/apps/passport-server/src/services/generic-issuance/subservices/utils/performPipelineLoad.ts b/apps/passport-server/src/services/generic-issuance/subservices/utils/performPipelineLoad.ts index 1a642a626e..804fc379b9 100644 --- a/apps/passport-server/src/services/generic-issuance/subservices/utils/performPipelineLoad.ts +++ b/apps/passport-server/src/services/generic-issuance/subservices/utils/performPipelineLoad.ts @@ -1,8 +1,9 @@ import { getActiveSpan } from "@opentelemetry/api/build/src/trace/context-utils"; import { PipelineLoadSummary } from "@pcd/passport-interface"; import { RollbarService } from "@pcd/server-shared"; +import { sleep } from "@pcd/util"; import { Pool } from "postgres-pool"; -import { sqlTransaction } from "../../../../database/sqlQuery"; +import { sqlQueryWithPool } from "../../../../database/sqlQuery"; import { logger } from "../../../../util/logger"; import { isAbortError } from "../../../../util/util"; import { DiscordService } from "../../../discordService"; @@ -21,6 +22,7 @@ import { UserSubservice } from "../UserSubservice"; import { maybeAlertForPipelineRun } from "./maybeAlertForPipelineRun"; const LOG_TAG = `[performPipelineLoad]`; +const PIPELINE_LOAD_TIMEOUT_MS = 1000 * 60 * 10; // 10 minutes /** * Performs a {@link Pipeline#load} for the given {@link Pipeline}, and @@ -34,8 +36,7 @@ export async function performPipelineLoad( userSubservice: UserSubservice, discordService: DiscordService | null, pagerdutyService: PagerDutyService | null, - rollbarService: RollbarService | null, - loadStarted?: () => Promise + rollbarService: RollbarService | null ): Promise { const startTime = new Date(); const pipelineId = pipelineSlot.definition.id; @@ -46,7 +47,7 @@ export async function performPipelineLoad( ` of type '${pipeline?.type}'` + ` belonging to ${pipelineSlot.definition.ownerUserId}` ); - const owner = await sqlTransaction(pool, async (client) => + const owner = await sqlQueryWithPool(pool, async (client) => userSubservice.getUserById(client, pipelineSlot.definition.ownerUserId) ); @@ -110,20 +111,18 @@ export async function performPipelineLoad( `loading data for pipeline with id '${pipelineId}'` + ` of type '${pipelineSlot.definition.type}'` ); - const loadPromise = pipeline.load(); - pipelineSlot.loadPromise = loadPromise; - try { - // we `.stop()` the previous instance of this pipeline - // here, so that by the time the `AbortError` is thrown/caught, - // we're ready for it with the above `pipelineSlot.loadPromise` - // which can be awaited again, until the load either succeeds - // or fails with an error other than `AbortError`. - await loadStarted?.(); - } catch (e) { - logger(LOG_TAG, "failed to run loadStarted callback", e); - } - const summary = await loadPromise; - pipelineSlot.loadPromise = undefined; + + pipelineSlot.loading = true; + + // in case a pipeline hangs, continue after 10 minutes. + const summary = await Promise.race([ + pipeline.load(), + (async (): Promise => { + await sleep(PIPELINE_LOAD_TIMEOUT_MS); + throw new Error(`TIME_OUT: ${pipeline.id}`); + })() + ]); + logger( LOG_TAG, `successfully loaded data for pipeline with id '${pipelineId}'` + @@ -170,5 +169,7 @@ export async function performPipelineLoad( discordService ); return summary; + } finally { + pipelineSlot.loading = false; } } diff --git a/apps/passport-server/src/services/generic-issuance/subservices/utils/upsertPipelineDefinition.ts b/apps/passport-server/src/services/generic-issuance/subservices/utils/upsertPipelineDefinition.ts index 35b826dbde..5122ae3783 100644 --- a/apps/passport-server/src/services/generic-issuance/subservices/utils/upsertPipelineDefinition.ts +++ b/apps/passport-server/src/services/generic-issuance/subservices/utils/upsertPipelineDefinition.ts @@ -187,8 +187,8 @@ export async function upsertPipelineDefinition( // so that the `AbortError` that is thrown by the `stop()` method can be // handled properly upstream. if (existingSlot.instance && !existingSlot.instance.isStopped()) { - existingSlot.loadPromise = undefined; await existingSlot.instance?.stop(); + existingSlot.loading = false; } if (validatedNewDefinition.options.disableCache) { @@ -213,6 +213,7 @@ export async function upsertPipelineDefinition( } } + existingSlot.loading = true; existingSlot.owner = await userSubservice.getUserById( client, validatedNewDefinition.ownerUserId @@ -223,7 +224,8 @@ export async function upsertPipelineDefinition( // which can take an arbitrary amount of time. const restartPromise = executorSubservice.restartPipeline( client, - validatedNewDefinition.id + validatedNewDefinition.id, + true ); // To get accurate timestamps, we need to load the pipeline definition diff --git a/apps/passport-server/src/services/generic-issuance/types.ts b/apps/passport-server/src/services/generic-issuance/types.ts index fe8c69250a..4c42299667 100644 --- a/apps/passport-server/src/services/generic-issuance/types.ts +++ b/apps/passport-server/src/services/generic-issuance/types.ts @@ -1,7 +1,4 @@ -import { - PipelineDefinition, - PipelineLoadSummary -} from "@pcd/passport-interface"; +import { PipelineDefinition } from "@pcd/passport-interface"; import { PipelineCapability } from "./capabilities/types"; import { Pipeline, PipelineUser } from "./pipelines/types"; @@ -41,5 +38,5 @@ export interface PipelineSlot { owner?: PipelineUser; loadIncidentId?: string; lastLoadDiscordMsgTimestamp?: Date; - loadPromise?: Promise; + loading: boolean; } diff --git a/apps/passport-server/src/services/issuanceService.ts b/apps/passport-server/src/services/issuanceService.ts index d961f83c89..a84eeb2f3f 100644 --- a/apps/passport-server/src/services/issuanceService.ts +++ b/apps/passport-server/src/services/issuanceService.ts @@ -64,7 +64,7 @@ import { import { fetchUserByV3Commitment } from "../database/queries/users"; import { fetchZuconnectTicketsByEmail } from "../database/queries/zuconnect/fetchZuconnectTickets"; import { fetchAllUsersWithZuzaluTickets } from "../database/queries/zuzalu_pretix_tickets/fetchZuzaluUser"; -import { namedSqlTransaction, sqlTransaction } from "../database/sqlQuery"; +import { sqlQueryWithPool } from "../database/sqlQuery"; import { PCDHTTPError } from "../routing/pcdHttpError"; import { ApplicationContext } from "../types"; import { logger } from "../util/logger"; @@ -115,7 +115,7 @@ export class IssuanceService { string, Promise >({ - max: 1000 + max: 20000 }); this.feedHost = new FeedHost( @@ -168,37 +168,31 @@ export class IssuanceService { const actions: PCDAction[] = []; try { - await namedSqlTransaction( - this.context.dbPool, - "issueEmailPCDs", - async (client) => { - if (req.pcd === undefined) { - throw new Error(`Missing credential`); - } - const verifiedCredential = await this.verifyCredential( - req.pcd - ); - const pcds = await this.issueEmailPCDs( - client, - verifiedCredential - ); - - // Clear out the folder - actions.push({ - type: PCDActionType.DeleteFolder, - folder: "Email", - recursive: false - }); - - actions.push({ - type: PCDActionType.ReplaceInFolder, - folder: "Email", - pcds: await Promise.all( - pcds.map((pcd) => EmailPCDPackage.serialize(pcd)) - ) - }); + await sqlQueryWithPool(this.context.dbPool, async (client) => { + if (req.pcd === undefined) { + throw new Error(`Missing credential`); } - ); + const verifiedCredential = await this.verifyCredential(req.pcd); + const pcds = await this.issueEmailPCDs( + client, + verifiedCredential + ); + + // Clear out the folder + actions.push({ + type: PCDActionType.DeleteFolder, + folder: "Email", + recursive: false + }); + + actions.push({ + type: PCDActionType.ReplaceInFolder, + folder: "Email", + pcds: await Promise.all( + pcds.map((pcd) => EmailPCDPackage.serialize(pcd)) + ) + }); + }); } catch (e) { logger(`Error encountered while serving feed:`, e); this.rollbarService?.reportError(e); @@ -215,38 +209,32 @@ export class IssuanceService { const actions: PCDAction[] = []; try { - await namedSqlTransaction( - this.context.dbPool, - "issueZuzaluTicketPCDs", - async (client) => { - if (req.pcd === undefined) { - throw new Error(`Missing credential`); - } - - const verifiedCredential = await this.verifyCredential( - req.pcd - ); - const pcds = await this.issueZuzaluTicketPCDs( - client, - verifiedCredential - ); - - // Clear out the folder - actions.push({ - type: PCDActionType.DeleteFolder, - folder: "Zuzalu '23", - recursive: false - }); - - actions.push({ - type: PCDActionType.ReplaceInFolder, - folder: "Zuzalu '23", - pcds: await Promise.all( - pcds.map((pcd) => EdDSATicketPCDPackage.serialize(pcd)) - ) - }); + await sqlQueryWithPool(this.context.dbPool, async (client) => { + if (req.pcd === undefined) { + throw new Error(`Missing credential`); } - ); + + const verifiedCredential = await this.verifyCredential(req.pcd); + const pcds = await this.issueZuzaluTicketPCDs( + client, + verifiedCredential + ); + + // Clear out the folder + actions.push({ + type: PCDActionType.DeleteFolder, + folder: "Zuzalu '23", + recursive: false + }); + + actions.push({ + type: PCDActionType.ReplaceInFolder, + folder: "Zuzalu '23", + pcds: await Promise.all( + pcds.map((pcd) => EdDSATicketPCDPackage.serialize(pcd)) + ) + }); + }); } catch (e) { logger(`Error encountered while serving feed:`, e); this.rollbarService?.reportError(e); @@ -263,44 +251,38 @@ export class IssuanceService { const actions: PCDAction[] = []; try { - await namedSqlTransaction( - this.context.dbPool, - "issueZuconnectTicketPCDs", - async (client) => { - if (req.pcd === undefined) { - throw new Error(`Missing credential`); - } - const verifiedCredential = await this.verifyCredential( - req.pcd - ); - const pcds = await this.issueZuconnectTicketPCDs( - client, - verifiedCredential - ); - - // Clear out the old folder - actions.push({ - type: PCDActionType.DeleteFolder, - folder: "Zuconnect", - recursive: false - }); - - // Clear out the folder - actions.push({ - type: PCDActionType.DeleteFolder, - folder: "ZuConnect", - recursive: false - }); - - actions.push({ - type: PCDActionType.ReplaceInFolder, - folder: "ZuConnect", - pcds: await Promise.all( - pcds.map((pcd) => EdDSATicketPCDPackage.serialize(pcd)) - ) - }); + await sqlQueryWithPool(this.context.dbPool, async (client) => { + if (req.pcd === undefined) { + throw new Error(`Missing credential`); } - ); + const verifiedCredential = await this.verifyCredential(req.pcd); + const pcds = await this.issueZuconnectTicketPCDs( + client, + verifiedCredential + ); + + // Clear out the old folder + actions.push({ + type: PCDActionType.DeleteFolder, + folder: "Zuconnect", + recursive: false + }); + + // Clear out the folder + actions.push({ + type: PCDActionType.DeleteFolder, + folder: "ZuConnect", + recursive: false + }); + + actions.push({ + type: PCDActionType.ReplaceInFolder, + folder: "ZuConnect", + pcds: await Promise.all( + pcds.map((pcd) => EdDSATicketPCDPackage.serialize(pcd)) + ) + }); + }); } catch (e) { logger(`Error encountered while serving feed:`, e); this.rollbarService?.reportError(e); @@ -702,8 +684,19 @@ export class IssuanceService { isConsumed: false, isRevoked: false, ticketCategory: TicketCategory.Zuzalu, - imageUrl: urljoin(imageServerUrl, "images/zuzalu", "zuzalu.png"), - imageAltText: "Zuzalu logo" + imageUrl: urljoin( + imageServerUrl, + "images/zuzalu", + "zuzalu-landscape.webp" + ), + qrCodeOverrideImageUrl: urljoin( + imageServerUrl, + "images/zuzalu", + "zuzalu.png" + ), + imageAltText: "Zuzalu logo", + eventLocation: "Lustica Bay, Montenegro", + eventStartDate: "2023-03-11T00:00:00.000Z" }) ); } @@ -777,11 +770,18 @@ export class IssuanceService { isRevoked: false, ticketCategory: TicketCategory.ZuConnect, imageUrl: urljoin( + imageServerUrl, + "images/zuzalu", + "zuconnect-landscape.webp" + ), + qrCodeOverrideImageUrl: urljoin( imageServerUrl, "images/zuzalu", "zuconnect.png" ), - imageAltText: "ZuConnect" + imageAltText: "ZuConnect", + eventLocation: "Istanbul, Turkey", + eventStartDate: "2023-10-29T00:00:00.000Z" }) ); } @@ -975,7 +975,7 @@ export async function startIssuanceService( return null; } - await sqlTransaction(context.dbPool, async (client) => + await sqlQueryWithPool(context.dbPool, async (client) => setupKnownTicketTypes(client, await getEdDSAPublicKey(zupassEddsaKey)) ); diff --git a/apps/passport-server/src/services/metricsService.ts b/apps/passport-server/src/services/metricsService.ts index b439e92ea1..4daa18180b 100644 --- a/apps/passport-server/src/services/metricsService.ts +++ b/apps/passport-server/src/services/metricsService.ts @@ -2,7 +2,7 @@ import { RollbarService } from "@pcd/server-shared"; import { getCacheSize } from "../database/queries/cache"; import { fetchE2EEStorageCount } from "../database/queries/e2ee"; import { fetchUserCount } from "../database/queries/users"; -import { namedSqlTransaction } from "../database/sqlQuery"; +import { sqlQueryWithPool } from "../database/sqlQuery"; import { ApplicationContext, ServerMode } from "../types"; import { logger } from "../util/logger"; import { traced } from "./telemetryService"; @@ -54,19 +54,15 @@ export class MetricsService { } private async collectMetrics(): Promise { - return await namedSqlTransaction( - this.context.dbPool, - "collectMetrics", - async (client) => { - const metrics: Metrics = { - usersCount: await fetchUserCount(client), - e2eeCount: await fetchE2EEStorageCount(client), - cacheSize: await getCacheSize(client) - }; + return await sqlQueryWithPool(this.context.dbPool, async (client) => { + const metrics: Metrics = { + usersCount: await fetchUserCount(client), + e2eeCount: await fetchE2EEStorageCount(client), + cacheSize: await getCacheSize(client) + }; - return metrics; - } - ); + return metrics; + }); } private async reportMetrics(metrics: Metrics): Promise { diff --git a/apps/passport-server/src/services/persistentCacheService.ts b/apps/passport-server/src/services/persistentCacheService.ts index 8fa8b8c499..1a4a9fc174 100644 --- a/apps/passport-server/src/services/persistentCacheService.ts +++ b/apps/passport-server/src/services/persistentCacheService.ts @@ -6,7 +6,7 @@ import { getCacheValue, setCacheValue } from "../database/queries/cache"; -import { namedSqlTransaction } from "../database/sqlQuery"; +import { sqlQueryWithPool } from "../database/sqlQuery"; import { logger } from "../util/logger"; import { traced } from "./telemetryService"; @@ -61,7 +61,7 @@ export class PersistentCacheService { public async setValue(key: string, value: string): Promise { return traced("Cache", "setValue", async (span) => { span?.setAttribute("cache_key", key); - await namedSqlTransaction(this.pool, "setValue", (client) => + await sqlQueryWithPool(this.pool, async (client) => setCacheValue(client, key, value) ); }); @@ -70,7 +70,7 @@ export class PersistentCacheService { public async getValue(key: string): Promise { return traced("Cache", "getValue", async (span) => { span?.setAttribute("cache_key", key); - return await namedSqlTransaction(this.pool, "getValue", (client) => { + return await sqlQueryWithPool(this.pool, async (client) => { const value = getCacheValue(client, key); span?.setAttribute("hit", !!value); return value; @@ -79,18 +79,14 @@ export class PersistentCacheService { } private async tryExpireOldEntries(): Promise { - return namedSqlTransaction( - this.pool, - "tryExpireOldEntries", - async (client): Promise => { - try { - return this.expireOldEntries(client); - } catch (e) { - logger("failed to expire old cache entries", e); - this.rollbarService?.reportError(e); - } + return sqlQueryWithPool(this.pool, async (client): Promise => { + try { + return this.expireOldEntries(client); + } catch (e) { + logger("failed to expire old cache entries", e); + this.rollbarService?.reportError(e); } - ); + }); } private async expireOldEntries(client: PoolClient): Promise { diff --git a/apps/passport-server/src/services/rateLimitService.ts b/apps/passport-server/src/services/rateLimitService.ts index 52447075db..31c7a224c7 100644 --- a/apps/passport-server/src/services/rateLimitService.ts +++ b/apps/passport-server/src/services/rateLimitService.ts @@ -6,7 +6,7 @@ import { deleteUnsupportedRateLimitBuckets, pruneRateLimitBuckets } from "../database/queries/rateLimit"; -import { sqlTransaction } from "../database/sqlQuery"; +import { sqlQueryWithPool } from "../database/sqlQuery"; import { ApplicationContext } from "../types"; import { logger } from "../util/logger"; import { traced } from "./telemetryService"; @@ -40,13 +40,13 @@ export class RateLimitService { this.context = context; this.rollbarService = rollbarService; const pruneExpiredBuckets = async (): Promise => { - await sqlTransaction(this.context.dbPool, (client) => + await sqlQueryWithPool(this.context.dbPool, (client) => this.pruneBuckets(client) ); this.pruneTimeout = setTimeout(() => pruneExpiredBuckets(), ONE_HOUR_MS); }; pruneExpiredBuckets(); - sqlTransaction(this.context.dbPool, (client) => + sqlQueryWithPool(this.context.dbPool, (client) => this.removeUnsupportedBuckets(client) ); this.disabled = disabled; @@ -96,14 +96,16 @@ export class RateLimitService { const limit = this.bucketConfig[actionType]; - const result = await sqlTransaction(pool, (client) => - consumeRateLimitToken( - client, - actionType, - actionId, - limit.maxActions, - limit.timePeriodMs - ) + const result = await sqlQueryWithPool( + pool, + async (client) => + await consumeRateLimitToken( + client, + actionType, + actionId, + limit.maxActions, + limit.timePeriodMs + ) ); // -1 indicates that the action should be declined diff --git a/apps/passport-server/src/services/semaphoreService.ts b/apps/passport-server/src/services/semaphoreService.ts index 5b41d21f18..312987efab 100644 --- a/apps/passport-server/src/services/semaphoreService.ts +++ b/apps/passport-server/src/services/semaphoreService.ts @@ -17,7 +17,7 @@ import { fetchAllUsersWithZuzaluTickets, UserWithZuzaluTickets } from "../database/queries/zuzalu_pretix_tickets/fetchZuzaluUser"; -import { sqlTransaction } from "../database/sqlQuery"; +import { sqlQueryWithPool } from "../database/sqlQuery"; import { PCDHTTPError } from "../routing/pcdHttpError"; import { ApplicationContext, ServerMode } from "../types"; import { logger } from "../util/logger"; @@ -57,7 +57,7 @@ export class SemaphoreService { public groupDevconnectOrganizers = (): NamedGroup => this.getNamedGroup("7"); public constructor(config: ApplicationContext) { - this.dbPool = config.dbPool; + this.dbPool = config.internalPool; this.groups = SemaphoreService.createGroups(); } @@ -134,13 +134,13 @@ export class SemaphoreService { logger(`[SEMA] Reloading semaphore service...`); - await sqlTransaction(this.dbPool, (client) => + await sqlQueryWithPool(this.dbPool, (client) => this.reloadZuzaluGroups(client) ); - await sqlTransaction(this.dbPool, (client) => + await sqlQueryWithPool(this.dbPool, (client) => this.reloadDevconnectGroups(client) ); - await sqlTransaction(this.dbPool, (client) => + await sqlQueryWithPool(this.dbPool, (client) => this.saveHistoricSemaphoreGroups(client) ); diff --git a/apps/passport-server/src/services/telegramService.ts b/apps/passport-server/src/services/telegramService.ts index ecbc79c48f..213c5d346e 100644 --- a/apps/passport-server/src/services/telegramService.ts +++ b/apps/passport-server/src/services/telegramService.ts @@ -72,7 +72,7 @@ import { insertTelegramVerification } from "../database/queries/telegram/insertTelegramConversation"; import { insertTelegramReaction } from "../database/queries/telegram/insertTelegramReaction"; -import { namedSqlTransaction, sqlTransaction } from "../database/sqlQuery"; +import { sqlQueryWithPool } from "../database/sqlQuery"; import { ApplicationContext, ServerMode } from "../types"; import { handleFrogVerification } from "../util/frogTelegramHelpers"; import { logger } from "../util/logger"; @@ -93,6 +93,7 @@ import { getChatsWithMembershipStatus, getDisplayEmojis, getGroupChat, + getProductIdFromTelegramChat, getSessionKey, helpResponse, isDirectMessage, @@ -181,7 +182,7 @@ export class TelegramService { `[TELEGRAM] Got chat join request for ${chatId} from ${userId}` ); // Check if this user is verified for the chat in question - const isVerified = await sqlTransaction( + const isVerified = await sqlQueryWithPool( this.context.dbPool, (client) => fetchTelegramVerificationStatus(client, userId, chatId) ); @@ -242,43 +243,36 @@ export class TelegramService { this.authBot.on("chat_member", async (ctx) => { return traced("telegram", "chat_member", async (span) => { try { - namedSqlTransaction( - this.context.dbPool, - "chat_member", - async (client) => { - const newMember = ctx.update.chat_member.new_chat_member; - span?.setAttribute("userId", newMember.user.id.toString()); - span?.setAttribute("status", newMember.status); - - if ( - newMember.status === "left" || - newMember.status === "kicked" - ) { - logger( - `[TELEGRAM] Deleting verification for user leaving ${ - newMember.user.username || newMember.user.first_name - } in chat ${ctx.chat.id}` - ); - await deleteTelegramVerification( - client, - newMember.user.id, - ctx.chat.id - ); - const chat = await getGroupChat(ctx.api, ctx.chat.id); - span?.setAttribute("chatId", chat.id); - span?.setAttribute("chatTitle", chat.title); + sqlQueryWithPool(this.context.dbPool, async (client) => { + const newMember = ctx.update.chat_member.new_chat_member; + span?.setAttribute("userId", newMember.user.id.toString()); + span?.setAttribute("status", newMember.status); - const userId = newMember.user.id; - if (!newMember.user.is_bot) { - await this.authBot.api.sendMessage( - userId, - `You left ${chat?.title}. To join again, you must re-verify by typing /start.`, - { parse_mode: "HTML" } - ); - } + if (newMember.status === "left" || newMember.status === "kicked") { + logger( + `[TELEGRAM] Deleting verification for user leaving ${ + newMember.user.username || newMember.user.first_name + } in chat ${ctx.chat.id}` + ); + await deleteTelegramVerification( + client, + newMember.user.id, + ctx.chat.id + ); + const chat = await getGroupChat(ctx.api, ctx.chat.id); + span?.setAttribute("chatId", chat.id); + span?.setAttribute("chatTitle", chat.title); + + const userId = newMember.user.id; + if (!newMember.user.is_bot) { + await this.authBot.api.sendMessage( + userId, + `You left ${chat?.title}. To join again, you must re-verify by typing /start.`, + { parse_mode: "HTML" } + ); } } - ); + }); } catch (e) { logger("[TELEGRAM] chat_member error", e); this.rollbarService?.reportError(e); @@ -301,7 +295,7 @@ export class TelegramService { const name = firstName || username; ctx.session.directLinkMode = false; if (ctx.match && Number.isInteger(Number(ctx.match))) { - const [chatWithMembership] = await sqlTransaction( + const [chatWithMembership] = await sqlQueryWithPool( ctx.session.dbPool, (client) => getChatsWithMembershipStatus( @@ -454,7 +448,7 @@ export class TelegramService { userId, `Loading tickets and events...` ); - const events = await sqlTransaction(ctx.session.dbPool, (client) => + const events = await sqlQueryWithPool(ctx.session.dbPool, (client) => fetchEventsWithTelegramChats(client, false) ); const eventsWithChats = await chatIDsToChats(ctx, events); @@ -499,75 +493,67 @@ export class TelegramService { this.authBot.on(":forum_topic_created", async (ctx) => { return traced("telegram", "forum_topic_created", async (span) => { - await namedSqlTransaction( - this.context.dbPool, - "forum_topic_created", - async (client) => { - const topicName = ctx.update?.message?.forum_topic_created.name; - const messageThreadId = ctx.update.message?.message_thread_id; - const chatId = ctx.chat.id; - span?.setAttributes({ topicName, messageThreadId, chatId }); + await sqlQueryWithPool(this.context.dbPool, async (client) => { + const topicName = ctx.update?.message?.forum_topic_created.name; + const messageThreadId = ctx.update.message?.message_thread_id; + const chatId = ctx.chat.id; + span?.setAttributes({ topicName, messageThreadId, chatId }); - if (!chatId || !topicName) - throw new Error(`Missing chatId or topic name`); + if (!chatId || !topicName) + throw new Error(`Missing chatId or topic name`); - await insertTelegramChat(client, chatId); - await insertTelegramTopic( - client, - chatId, - topicName, - messageThreadId, - false - ); + await insertTelegramChat(client, chatId); + await insertTelegramTopic( + client, + chatId, + topicName, + messageThreadId, + false + ); - logger(`[TELEGRAM CREATED]`, topicName, messageThreadId, chatId); - } - ); + logger(`[TELEGRAM CREATED]`, topicName, messageThreadId, chatId); + }); }); }); this.authBot.on(":forum_topic_edited", async (ctx) => { return traced("telegram", "forum_topic_edited", async (span) => { - await namedSqlTransaction( - this.context.dbPool, - "forum_topic_edited", - async (client) => { - const topicName = ctx.update?.message?.forum_topic_edited.name; - const chatId = ctx.chat.id; - const messageThreadId = ctx.update.message?.message_thread_id; - span?.setAttributes({ topicName, messageThreadId, chatId }); + await sqlQueryWithPool(this.context.dbPool, async (client) => { + const topicName = ctx.update?.message?.forum_topic_edited.name; + const chatId = ctx.chat.id; + const messageThreadId = ctx.update.message?.message_thread_id; + span?.setAttributes({ topicName, messageThreadId, chatId }); - if (!chatId || !topicName) - throw new Error(`Missing chatId or topic name`); + if (!chatId || !topicName) + throw new Error(`Missing chatId or topic name`); - const topic = await fetchTelegramTopic( + const topic = await fetchTelegramTopic( + client, + chatId, + messageThreadId + ); + + if (!topic) { + logger(`[TELEGRAM] adding topic ${topicName} to db`); + await insertTelegramChat(client, chatId); + await insertTelegramTopic( client, chatId, - messageThreadId + topicName, + messageThreadId, + false + ); + } else { + logger(`[TELEGRAM] updating topic ${topicName} in db`); + await insertTelegramTopic( + client, + topic.telegramChatID, + topicName, + topic.topic_id, + topic.is_anon_topic ); - - if (!topic) { - logger(`[TELEGRAM] adding topic ${topicName} to db`); - await insertTelegramChat(client, chatId); - await insertTelegramTopic( - client, - chatId, - topicName, - messageThreadId, - false - ); - } else { - logger(`[TELEGRAM] updating topic ${topicName} in db`); - await insertTelegramTopic( - client, - topic.telegramChatID, - topicName, - topic.topic_id, - topic.is_anon_topic - ); - } } - ); + }); }); }); @@ -596,86 +582,82 @@ export class TelegramService { }); try { - await namedSqlTransaction( - ctx.session.dbPool, - "incognito", - async (client) => { - const telegramEvents = await fetchTelegramEventsByChatId( - client, - ctx.chat.id - ); - - const hasLinked = telegramEvents.length > 0; - if (!hasLinked) { - await ctx.reply( - "This group is not linked to an event. If you're an admin, use /manage to link this group to an event.", - { message_thread_id: messageThreadId } - ); - return; - } + await sqlQueryWithPool(ctx.session.dbPool, async (client) => { + const telegramEvents = await fetchTelegramEventsByChatId( + client, + ctx.chat.id + ); - const topicToUpdate = await fetchTelegramTopic( - client, - ctx.chat.id, - messageThreadId + const hasLinked = telegramEvents.length > 0; + if (!hasLinked) { + await ctx.reply( + "This group is not linked to an event. If you're an admin, use /manage to link this group to an event.", + { message_thread_id: messageThreadId } ); + return; + } - if (!topicToUpdate) - throw new Error(`Couldn't find this topic in the db.`); + const topicToUpdate = await fetchTelegramTopic( + client, + ctx.chat.id, + messageThreadId + ); - if (topicToUpdate.is_anon_topic) { - await ctx.reply(`This topic is already anonymous.`, { - message_thread_id: messageThreadId - }); - return; - } + if (!topicToUpdate) + throw new Error(`Couldn't find this topic in the db.`); - const topicName = - topicToUpdate?.topic_name || - ctx.message?.reply_to_message?.forum_topic_created?.name; - if (!topicName) throw new Error(`No topic name found`); + if (topicToUpdate.is_anon_topic) { + await ctx.reply(`This topic is already anonymous.`, { + message_thread_id: messageThreadId + }); + return; + } - await insertTelegramTopic( - client, - ctx.chat.id, - topicName, - messageThreadId, - true - ); + const topicName = + topicToUpdate?.topic_name || + ctx.message?.reply_to_message?.forum_topic_created?.name; + if (!topicName) throw new Error(`No topic name found`); - await ctx.reply( - `Linked with topic name ${topicName}.\nIf this name is incorrect, edit this topic name to update`, - { - message_thread_id: messageThreadId, - parse_mode: "HTML" - } - ); + await insertTelegramTopic( + client, + ctx.chat.id, + topicName, + messageThreadId, + true + ); - const directLinkParams: RedirectTopicDataPayload = { - type: PayloadType.RedirectTopicData, - value: { - topicId: messageThreadId, - chatId: ctx.chat.id - } - }; + await ctx.reply( + `Linked with topic name ${topicName}.\nIf this name is incorrect, edit this topic name to update`, + { + message_thread_id: messageThreadId, + parse_mode: "HTML" + } + ); - const encodedPayload = Buffer.from( - JSON.stringify(directLinkParams), - "utf-8" - ).toString("base64"); + const directLinkParams: RedirectTopicDataPayload = { + type: PayloadType.RedirectTopicData, + value: { + topicId: messageThreadId, + chatId: ctx.chat.id + } + }; - const messageToPin = await ctx.reply("Click to post", { - message_thread_id: messageThreadId, - reply_markup: new InlineKeyboard().url( - "Post Anonymously", - // NOTE: The order and casing of the direct link params is VERY IMPORTANT. https://github.com/TelegramMessenger/Telegram-iOS/issues/1091 - `${process.env.TELEGRAM_ANON_BOT_DIRECT_LINK}?startApp=${encodedPayload}&startapp=${encodedPayload}` - ) - }); - ctx.pinChatMessage(messageToPin.message_id); - ctx.api.closeForumTopic(ctx.chat.id, messageThreadId); - } - ); + const encodedPayload = Buffer.from( + JSON.stringify(directLinkParams), + "utf-8" + ).toString("base64"); + + const messageToPin = await ctx.reply("Click to post", { + message_thread_id: messageThreadId, + reply_markup: new InlineKeyboard().url( + "Post Anonymously", + // NOTE: The order and casing of the direct link params is VERY IMPORTANT. https://github.com/TelegramMessenger/Telegram-iOS/issues/1091 + `${process.env.TELEGRAM_ANON_BOT_DIRECT_LINK}?startApp=${encodedPayload}&startapp=${encodedPayload}` + ) + }); + ctx.pinChatMessage(messageToPin.message_id); + ctx.api.closeForumTopic(ctx.chat.id, messageThreadId); + }); } catch (error) { logger(`[ERROR] ${error}`); await ctx.reply(`Failed to link anonymous chat. ${error} `, { @@ -708,109 +690,98 @@ export class TelegramService { if (this.forwardBot) { this.forwardBot.command("receive", async (ctx) => { - await namedSqlTransaction( - ctx.session.dbPool, - "receive", - async (client) => { - const messageThreadId = ctx.message?.message_thread_id; - try { - logger(`[TELEGRAM] running receive`); - if (isDirectMessage(ctx)) - return ctx.reply(`/receive can only be run in a group chat`); - - if (!ctx.from?.username) - return ctx.reply(`No username found`, { - reply_to_message_id: messageThreadId - }); + await sqlQueryWithPool(ctx.session.dbPool, async (client) => { + const messageThreadId = ctx.message?.message_thread_id; + try { + logger(`[TELEGRAM] running receive`); + if (isDirectMessage(ctx)) + return ctx.reply(`/receive can only be run in a group chat`); - if (!ALLOWED_TICKET_MANAGERS.includes(ctx.from.username)) - return ctx.reply( - `Only Zupass team members are allowed to run this command.`, - { reply_to_message_id: messageThreadId } - ); + if (!ctx.from?.username) + return ctx.reply(`No username found`, { + reply_to_message_id: messageThreadId + }); - // Look up topic. - const topic = await fetchTelegramTopic( - client, - ctx.chat.id, - messageThreadId + if (!ALLOWED_TICKET_MANAGERS.includes(ctx.from.username)) + return ctx.reply( + `Only Zupass team members are allowed to run this command.`, + { reply_to_message_id: messageThreadId } ); - if (!topic) - throw new Error( - `No topic found. Edit the topic name and try again!` - ); + // Look up topic. + const topic = await fetchTelegramTopic( + client, + ctx.chat.id, + messageThreadId + ); - await insertTelegramForward(client, null, topic.id); - logger(`[TELEGRAM] ${topic.topic_name} can receive messages`); - await ctx.reply( - `${topic.topic_name} can receive messages`, - { - reply_to_message_id: messageThreadId, - parse_mode: "HTML" - } + if (!topic) + throw new Error( + `No topic found. Edit the topic name and try again!` ); - } catch (error) { - ctx.reply(`${error}`, { - reply_to_message_id: messageThreadId - }); - } + + await insertTelegramForward(client, null, topic.id); + logger(`[TELEGRAM] ${topic.topic_name} can receive messages`); + await ctx.reply(`${topic.topic_name} can receive messages`, { + reply_to_message_id: messageThreadId, + parse_mode: "HTML" + }); + } catch (error) { + ctx.reply(`${error}`, { + reply_to_message_id: messageThreadId + }); } - ); + }); }); this.forwardBot.command("stopreceive", async (ctx) => { - await namedSqlTransaction( - ctx.session.dbPool, - "stopreceive", - async (client) => { - const messageThreadId = ctx.message?.message_thread_id; - try { - logger(`[TELEGRAM] running receive`); - if (isDirectMessage(ctx)) - return ctx.reply(`/receive can only be run in a group chat`); - - if (!ctx.from?.username) - return ctx.reply(`No username found`, { - reply_to_message_id: messageThreadId - }); + await sqlQueryWithPool(ctx.session.dbPool, async (client) => { + const messageThreadId = ctx.message?.message_thread_id; + try { + logger(`[TELEGRAM] running receive`); + if (isDirectMessage(ctx)) + return ctx.reply(`/receive can only be run in a group chat`); - if (!ALLOWED_TICKET_MANAGERS.includes(ctx.from.username)) - return ctx.reply( - `Only Zupass team members are allowed to run this command.`, - { reply_to_message_id: messageThreadId } - ); + if (!ctx.from?.username) + return ctx.reply(`No username found`, { + reply_to_message_id: messageThreadId + }); - // Look up topic. - const topic = await fetchTelegramTopic( - client, - ctx.chat.id, - messageThreadId + if (!ALLOWED_TICKET_MANAGERS.includes(ctx.from.username)) + return ctx.reply( + `Only Zupass team members are allowed to run this command.`, + { reply_to_message_id: messageThreadId } ); - if (!topic) - throw new Error( - `No topic found. Edit the topic name and try again!` - ); + // Look up topic. + const topic = await fetchTelegramTopic( + client, + ctx.chat.id, + messageThreadId + ); - await deleteTelegramForward(client, topic.id, null); - logger( - `[TELEGRAM] ${topic.topic_name} can no longer receive messages` + if (!topic) + throw new Error( + `No topic found. Edit the topic name and try again!` ); - await ctx.reply( - `${topic.topic_name} can no longer receive messages`, - { - reply_to_message_id: messageThreadId, - parse_mode: "HTML" - } - ); - } catch (error) { - ctx.reply(`${error}`, { - reply_to_message_id: messageThreadId - }); - } + + await deleteTelegramForward(client, topic.id, null); + logger( + `[TELEGRAM] ${topic.topic_name} can no longer receive messages` + ); + await ctx.reply( + `${topic.topic_name} can no longer receive messages`, + { + reply_to_message_id: messageThreadId, + parse_mode: "HTML" + } + ); + } catch (error) { + ctx.reply(`${error}`, { + reply_to_message_id: messageThreadId + }); } - ); + }); }); this.forwardBot.command("forward", async (ctx) => { @@ -838,96 +809,88 @@ export class TelegramService { this.forwardBot.on(":forum_topic_edited", async (ctx) => { return traced("telegram", "forum_topic_edited", async (span) => { - await namedSqlTransaction( - ctx.session.dbPool, - "forum_topic_edited", - async (client) => { - const topicName = ctx.update?.message?.forum_topic_edited.name; - const chatId = ctx.chat.id; - const messageThreadId = ctx.update.message?.message_thread_id; - span?.setAttributes({ topicName, messageThreadId, chatId }); - - if (!chatId || !topicName) - throw new Error(`Missing chatId or topic name`); - - const topic = await fetchTelegramTopic( + await sqlQueryWithPool(ctx.session.dbPool, async (client) => { + const topicName = ctx.update?.message?.forum_topic_edited.name; + const chatId = ctx.chat.id; + const messageThreadId = ctx.update.message?.message_thread_id; + span?.setAttributes({ topicName, messageThreadId, chatId }); + + if (!chatId || !topicName) + throw new Error(`Missing chatId or topic name`); + + const topic = await fetchTelegramTopic( + client, + chatId, + messageThreadId + ); + + if (!topic) { + logger(`[TELEGRAM] adding topic ${topicName} to db`); + await insertTelegramChat(client, chatId); + await insertTelegramTopic( client, chatId, - messageThreadId + topicName, + messageThreadId, + false + ); + } else { + logger(`[TELEGRAM] updating topic ${topicName} in db`); + await insertTelegramTopic( + client, + topic.telegramChatID, + topicName, + topic.topic_id, + topic.is_anon_topic ); - - if (!topic) { - logger(`[TELEGRAM] adding topic ${topicName} to db`); - await insertTelegramChat(client, chatId); - await insertTelegramTopic( - client, - chatId, - topicName, - messageThreadId, - false - ); - } else { - logger(`[TELEGRAM] updating topic ${topicName} in db`); - await insertTelegramTopic( - client, - topic.telegramChatID, - topicName, - topic.topic_id, - topic.is_anon_topic - ); - } } - ); + }); }); }); this.forwardBot.on("message", async (ctx) => { - await namedSqlTransaction( - ctx.session.dbPool, - "message", - async (client) => { - const text = ctx.message.text; - - if (isDirectMessage(ctx)) { - return await ctx.reply( - `I can only forward messages in a group chat` + await sqlQueryWithPool(ctx.session.dbPool, async (client) => { + const text = ctx.message.text; + + if (isDirectMessage(ctx)) { + return await ctx.reply( + `I can only forward messages in a group chat` + ); + } else { + const messageThreadId = ctx.message?.message_thread_id; + + try { + // Check to see if message is from a topic in the forwarding table + const forwardResults = await fetchTelegramTopicForwarding( + client, + ctx.chat.id, + messageThreadId ); - } else { - const messageThreadId = ctx.message?.message_thread_id; - - try { - // Check to see if message is from a topic in the forwarding table - const forwardResults = await fetchTelegramTopicForwarding( - client, - ctx.chat.id, - messageThreadId - ); - if (forwardResults?.length > 0) { - const sentMessages = forwardResults.map((f) => { - const destinationTopicID = f.receiverTopicID - ? parseInt(f.receiverTopicID) - : undefined; - logger( - `[TElEGRAM] forwarding message ${text} to ${f.receiverTopicName}` - ); - return ctx.api.forwardMessage( - f.receiverChatID, - f.senderChatID, - ctx.message.message_id, - { - message_thread_id: destinationTopicID - } - ); - }); - await Promise.allSettled(sentMessages); - } - } catch (error) { - ctx.reply(`${error}`, { reply_to_message_id: messageThreadId }); + if (forwardResults?.length > 0) { + const sentMessages = forwardResults.map((f) => { + const destinationTopicID = f.receiverTopicID + ? parseInt(f.receiverTopicID) + : undefined; + logger( + `[TElEGRAM] forwarding message ${text} to ${f.receiverTopicName}` + ); + return ctx.api.forwardMessage( + f.receiverChatID, + f.senderChatID, + ctx.message.message_id, + { + message_thread_id: destinationTopicID + } + ); + }); + await Promise.allSettled(sentMessages); } + } catch (error) { + ctx.reply(`${error}`, { reply_to_message_id: messageThreadId }); } } - ); + }); }); } @@ -1226,7 +1189,7 @@ export class TelegramService { ); } - const { attendeeSemaphoreId } = pcd.claim.partialTicket; + const { attendeeSemaphoreId, productId } = pcd.claim.partialTicket; if (!attendeeSemaphoreId) { throw new Error( @@ -1253,6 +1216,13 @@ export class TelegramService { throw new Error(`User submitted event Ids are invalid `); } + const expectedProductId = getProductIdFromTelegramChat(telegramChatId); + if (expectedProductId && productId !== expectedProductId) { + throw new Error( + `Product id ${productId} does not match expected product id ${expectedProductId}` + ); + } + logger( `[TELEGRAM] Verified PCD for ${telegramUserId}, chat ${telegramChatId}` + (telegramUsername && `, username ${telegramUsername}`) @@ -1459,140 +1429,137 @@ export class TelegramService { topicId: string ): Promise { return traced("telegram", "handleSendAnonymousMessage", async (span) => { - return namedSqlTransaction( - this.context.dbPool, - "handleSendAnonymousMessage", - async (client) => { - span?.setAttribute("topicId", topicId); - span?.setAttribute("message", rawMessage); + return sqlQueryWithPool(this.context.dbPool, async (client) => { + span?.setAttribute("topicId", topicId); + span?.setAttribute("message", rawMessage); - logger("[TELEGRAM] Verifying anonymous message"); + logger("[TELEGRAM] Verifying anonymous message"); - const pcd = await this.verifyZKEdDSAEventTicketPCD( - serializedZKEdDSATicket - ); + const pcd = await this.verifyZKEdDSAEventTicketPCD( + serializedZKEdDSATicket + ); - if (!pcd) { - throw new Error("Could not verify PCD for anonymous message"); - } + if (!pcd) { + throw new Error("Could not verify PCD for anonymous message"); + } - const { watermark, validEventIds, externalNullifier, nullifierHash } = - pcd.claim; + const { watermark, validEventIds, externalNullifier, nullifierHash } = + pcd.claim; - if (!validEventIds) { - throw new Error(`User did not submit any valid event ids`); - } + if (!validEventIds) { + throw new Error(`User did not submit any valid event ids`); + } - const eventsByChat = await fetchTelegramEventsByChatId( - client, - telegramChatId - ); - if (eventsByChat.length === 0) - throw new Error(`No valid events found for given chat`); - if (!verifyUserEventIds(eventsByChat, validEventIds)) { - throw new Error(`User submitted event Ids are invalid `); - } + const eventsByChat = await fetchTelegramEventsByChatId( + client, + telegramChatId + ); + if (eventsByChat.length === 0) + throw new Error(`No valid events found for given chat`); + if (!verifyUserEventIds(eventsByChat, validEventIds)) { + throw new Error(`User submitted event Ids are invalid `); + } - span?.setAttribute("chatId", telegramChatId); + span?.setAttribute("chatId", telegramChatId); - if (!watermark) { - throw new Error("Anonymous message PCD did not contain watermark"); - } - - if ( - getMessageWatermark(rawMessage).toString() !== watermark.toString() - ) { - throw new Error( - `Anonymous message string ${rawMessage} didn't match watermark. got ${watermark} and expected ${getMessageWatermark( - rawMessage - ).toString()}` - ); - } + if (!watermark) { + throw new Error("Anonymous message PCD did not contain watermark"); + } - logger( - `[TELEGRAM] Verified PCD for anonynmous message with events ${validEventIds}` + if ( + getMessageWatermark(rawMessage).toString() !== watermark.toString() + ) { + throw new Error( + `Anonymous message string ${rawMessage} didn't match watermark. got ${watermark} and expected ${getMessageWatermark( + rawMessage + ).toString()}` ); + } - const topic = await fetchTelegramTopic( - client, - parseInt(telegramChatId), - parseInt(topicId) - ); + logger( + `[TELEGRAM] Verified PCD for anonynmous message with events ${validEventIds}` + ); - if (!topic || !topic.is_anon_topic || !topic.topic_id) { - throw new Error(`this group doesn't have any anon topics`); - } + const topic = await fetchTelegramTopic( + client, + parseInt(telegramChatId), + parseInt(topicId) + ); - // The event is linked to a chat. Make sure we can access it. - const chat = await getGroupChat(this.anonBot.api, telegramChatId); - span?.setAttribute("chatTitle", chat.title); + if (!topic || !topic.is_anon_topic || !topic.topic_id) { + throw new Error(`this group doesn't have any anon topics`); + } + + // The event is linked to a chat. Make sure we can access it. + const chat = await getGroupChat(this.anonBot.api, telegramChatId); + span?.setAttribute("chatTitle", chat.title); + + if (!nullifierHash) throw new Error(`Nullifier hash not found`); - if (!nullifierHash) throw new Error(`Nullifier hash not found`); + const expectedExternalNullifier = getAnonTopicNullifier().toString(); - const expectedExternalNullifier = getAnonTopicNullifier().toString(); + if (externalNullifier !== expectedExternalNullifier) + throw new Error("Nullifier mismatch - try proving again."); + + const nullifierData = await fetchAnonTopicNullifier( + client, + nullifierHash, + topic.id + ); - if (externalNullifier !== expectedExternalNullifier) - throw new Error("Nullifier mismatch - try proving again."); + const currentTime = new Date(); + const timestamp = currentTime.toISOString(); - const nullifierData = await fetchAnonTopicNullifier( + if (!nullifierData) { + await insertOrUpdateTelegramNullifier( client, nullifierHash, + [timestamp], topic.id ); + } else { + const timestamps = nullifierData.message_timestamps.map((t) => + new Date(t).getTime() + ); + const maxDailyPostsPerTopic = parseInt( + process.env.MAX_DAILY_ANON_TOPIC_POSTS_PER_USER ?? "3" + ); + const rlDuration = ONE_HOUR_MS * 24; + const { rateLimitExceeded, newTimestamps } = + checkSlidingWindowRateLimit( + timestamps, + maxDailyPostsPerTopic, + rlDuration + ); + span?.setAttribute("rateLimitExceeded", rateLimitExceeded); - const currentTime = new Date(); - const timestamp = currentTime.toISOString(); - - if (!nullifierData) { + if (!rateLimitExceeded) { await insertOrUpdateTelegramNullifier( client, nullifierHash, - [timestamp], + newTimestamps, topic.id ); } else { - const timestamps = nullifierData.message_timestamps.map((t) => - new Date(t).getTime() + const rlError = new Error( + `You have exceeded the daily limit of ${maxDailyPostsPerTopic} messages for this topic.` ); - const maxDailyPostsPerTopic = parseInt( - process.env.MAX_DAILY_ANON_TOPIC_POSTS_PER_USER ?? "3" - ); - const rlDuration = ONE_HOUR_MS * 24; - const { rateLimitExceeded, newTimestamps } = - checkSlidingWindowRateLimit( - timestamps, - maxDailyPostsPerTopic, - rlDuration - ); - span?.setAttribute("rateLimitExceeded", rateLimitExceeded); - - if (!rateLimitExceeded) { - await insertOrUpdateTelegramNullifier( - client, - nullifierHash, - newTimestamps, - topic.id - ); - } else { - const rlError = new Error( - `You have exceeded the daily limit of ${maxDailyPostsPerTopic} messages for this topic.` - ); - rlError.name = "Rate limit exceeded"; - throw rlError; - } + rlError.name = "Rate limit exceeded"; + throw rlError; } + } - const payloadData: NullifierHashPayload = { - type: PayloadType.NullifierHash, - value: BigInt(nullifierHash).toString() - }; + const payloadData: NullifierHashPayload = { + type: PayloadType.NullifierHash, + value: BigInt(nullifierHash).toString() + }; - const encodedPayload = Buffer.from( - JSON.stringify(payloadData), - "utf-8" - ).toString("base64"); + const encodedPayload = Buffer.from( + JSON.stringify(payloadData), + "utf-8" + ).toString("base64"); - const formattedMessage = ` + const formattedMessage = ` ${bigIntToPseudonymEmoji(BigInt(nullifierHash))} ${bigIntToPseudonymName( @@ -1601,46 +1568,45 @@ export class TelegramService { "en-GB" )}\n----------------------------------------------------------`; - const anonMessageId = uuidV1(); + const anonMessageId = uuidV1(); - const payloads = getDisplayEmojis().map((emoji) => { - return { - emoji, - payload: encodePayload(buildReactPayload(emoji, anonMessageId)) - }; - }); - const link = process.env.TELEGRAM_ANON_BOT_DIRECT_LINK; - const buttons: InlineKeyboardButton[] = payloads.map((p) => { - return { - text: `${p.emoji}`, - url: `${link}?startApp=${p.payload}&startapp=${p.payload}` - }; - }); - - const replyMarkup: InlineKeyboardMarkup = { - inline_keyboard: [buttons] + const payloads = getDisplayEmojis().map((emoji) => { + return { + emoji, + payload: encodePayload(buildReactPayload(emoji, anonMessageId)) }; - const message = await this.sendToAnonymousChannel( - client, - chat.id, - parseInt(topic.topic_id), - formattedMessage, - replyMarkup - ); - if (!message) throw new Error(`Failed to send telegram message`); + }); + const link = process.env.TELEGRAM_ANON_BOT_DIRECT_LINK; + const buttons: InlineKeyboardButton[] = payloads.map((p) => { + return { + text: `${p.emoji}`, + url: `${link}?startApp=${p.payload}&startapp=${p.payload}` + }; + }); - await insertTelegramAnonMessage( - client, - anonMessageId, - nullifierHash, - topic.id, - rawMessage, - serializedZKEdDSATicket, - timestamp, - message.message_id - ); - } - ); + const replyMarkup: InlineKeyboardMarkup = { + inline_keyboard: [buttons] + }; + const message = await this.sendToAnonymousChannel( + client, + chat.id, + parseInt(topic.topic_id), + formattedMessage, + replyMarkup + ); + if (!message) throw new Error(`Failed to send telegram message`); + + await insertTelegramAnonMessage( + client, + anonMessageId, + nullifierHash, + topic.id, + rawMessage, + serializedZKEdDSATicket, + timestamp, + message.message_id + ); + }); }); } @@ -1652,49 +1618,45 @@ export class TelegramService { "telegram", "handleRequestAnonymousMessageLink", async (span) => { - return namedSqlTransaction( - this.context.dbPool, - "handleRequestAnonymousMessageLink", - async (client) => { - // Confirm that topicId exists and is anonymous - const topic = await fetchTelegramTopic( - client, - telegramChatId, - topicId - ); + return sqlQueryWithPool(this.context.dbPool, async (client) => { + // Confirm that topicId exists and is anonymous + const topic = await fetchTelegramTopic( + client, + telegramChatId, + topicId + ); - if (!topic || !topic.is_anon_topic || !topic.topic_id) - throw new Error(`No anonymous topic found`); + if (!topic || !topic.is_anon_topic || !topic.topic_id) + throw new Error(`No anonymous topic found`); - // Get valid eventIds for this chat - const telegramEvents = await fetchTelegramEventsByChatId( - client, - telegramChatId - ); - if (telegramEvents.length === 0) - throw new Error(`No events associated with this group`); - - const validEventIds = telegramEvents.map((e) => e.ticket_event_id); - - const encodedTopicData = encodeTopicData({ - type: PayloadType.AnonTopicDataPayload, - value: { - chatId: telegramChatId, - topicName: topic.topic_name, - topicId: parseInt(topic.topic_id), - validEventIds - } - }); + // Get valid eventIds for this chat + const telegramEvents = await fetchTelegramEventsByChatId( + client, + telegramChatId + ); + if (telegramEvents.length === 0) + throw new Error(`No events associated with this group`); + + const validEventIds = telegramEvents.map((e) => e.ticket_event_id); + + const encodedTopicData = encodeTopicData({ + type: PayloadType.AnonTopicDataPayload, + value: { + chatId: telegramChatId, + topicName: topic.topic_name, + topicId: parseInt(topic.topic_id), + validEventIds + } + }); - const url = `${process.env.TELEGRAM_ANON_WEBSITE}?tgWebAppStartParam=${encodedTopicData}`; - span?.setAttribute(`redirect url`, url); - logger( - `[TELEGRAM] generated redirect url to ${process.env.TELEGRAM_ANON_WEBSITE}` - ); + const url = `${process.env.TELEGRAM_ANON_WEBSITE}?tgWebAppStartParam=${encodedTopicData}`; + span?.setAttribute(`redirect url`, url); + logger( + `[TELEGRAM] generated redirect url to ${process.env.TELEGRAM_ANON_WEBSITE}` + ); - return url; - } - ); + return url; + }); } ); } diff --git a/apps/passport-server/src/services/zuzaluPretixSyncService.ts b/apps/passport-server/src/services/zuzaluPretixSyncService.ts index 1e8ac9ab8e..aabbd51700 100644 --- a/apps/passport-server/src/services/zuzaluPretixSyncService.ts +++ b/apps/passport-server/src/services/zuzaluPretixSyncService.ts @@ -11,7 +11,7 @@ import { deleteZuzaluTicket } from "../database/queries/zuzalu_pretix_tickets/de import { fetchAllZuzaluPretixTickets } from "../database/queries/zuzalu_pretix_tickets/fetchZuzaluUser"; import { insertZuzaluPretixTicket } from "../database/queries/zuzalu_pretix_tickets/insertZuzaluPretixTicket"; import { updateZuzaluPretixTicket } from "../database/queries/zuzalu_pretix_tickets/updateZuzaluPretixTicket"; -import { namedSqlTransaction } from "../database/sqlQuery"; +import { sqlQueryWithPool } from "../database/sqlQuery"; import { ApplicationContext, ServerMode } from "../types"; import { logger } from "../util/logger"; import { @@ -119,7 +119,7 @@ export class ZuzaluPretixSyncService { const { dbPool } = this.context; try { - await namedSqlTransaction(dbPool, "saveTickets", (client) => + await sqlQueryWithPool(dbPool, (client) => this.saveTickets(client, tickets) ); } catch (e) { diff --git a/apps/passport-server/src/types.ts b/apps/passport-server/src/types.ts index d88c78ce84..5c6f27584e 100644 --- a/apps/passport-server/src/types.ts +++ b/apps/passport-server/src/types.ts @@ -50,6 +50,7 @@ export enum ServerMode { export interface ApplicationContext { dbPool: Pool; + internalPool: Pool; honeyClient: Libhoney | null; resourcesDir: string; publicResourcesDir: string; diff --git a/apps/passport-server/src/util/file.ts b/apps/passport-server/src/util/file.ts new file mode 100644 index 0000000000..e707792f08 --- /dev/null +++ b/apps/passport-server/src/util/file.ts @@ -0,0 +1,28 @@ +import { promises as fs } from "fs"; + +interface FileCacheData { + content: string; + mtime: number; +} + +export const readFileWithCache = (() => { + const cache = new Map(); + + return async (filePath: string): Promise => { + const stats = await fs.stat(filePath); + const lastModified = stats.mtimeMs; // Last modified time in milliseconds + + // Check if file is in cache and has not changed + const cachedData = cache.get(filePath); + if (cachedData) { + if (cachedData.mtime === lastModified) { + return cachedData.content; + } + } + + // Read file from disk if not cached or modified + const content = await fs.readFile(filePath, "utf8"); + cache.set(filePath, { content, mtime: lastModified }); + return content; + }; +})(); diff --git a/apps/passport-server/src/util/frogcrypto.ts b/apps/passport-server/src/util/frogcrypto.ts index 10284c2007..e8cf2347e5 100644 --- a/apps/passport-server/src/util/frogcrypto.ts +++ b/apps/passport-server/src/util/frogcrypto.ts @@ -17,7 +17,7 @@ import { PCDPackage } from "@pcd/pcd-types"; import _ from "lodash"; import { Pool } from "postgres-pool"; import { getFeedData } from "../database/queries/frogcrypto"; -import { namedSqlTransaction } from "../database/sqlQuery"; +import { sqlQueryWithPool } from "../database/sqlQuery"; import { PCDHTTPError } from "../routing/pcdHttpError"; export class FrogCryptoFeedHost extends FeedHost { @@ -61,10 +61,8 @@ export class FrogCryptoFeedHost extends FeedHost { * Refetch the list of feeds that this server is hosting from the database. */ public async refreshFeeds(): Promise { - const feeds = await namedSqlTransaction( - this.dbPool, - "refreshFeeds", - (client) => getFeedData(client) + const feeds = await sqlQueryWithPool(this.dbPool, (client) => + getFeedData(client) ); this.hostedFeed.length = 0; this.hostedFeed.push( diff --git a/apps/passport-server/src/util/telegramHelpers.ts b/apps/passport-server/src/util/telegramHelpers.ts index 33d06b59ba..61fb64fc3b 100644 --- a/apps/passport-server/src/util/telegramHelpers.ts +++ b/apps/passport-server/src/util/telegramHelpers.ts @@ -52,7 +52,7 @@ import { insertTelegramEvent, insertTelegramForward } from "../database/queries/telegram/insertTelegramConversation"; -import { namedSqlTransaction, sqlTransaction } from "../database/sqlQuery"; +import { sqlQueryWithPool } from "../database/sqlQuery"; import { traced } from "../services/telemetryService"; import { generateFrogProofUrl } from "./frogTelegramHelpers"; import { logger } from "./logger"; @@ -352,7 +352,8 @@ const generateProofUrl = async ( telegramChatId: string, validEventIds: string[], eventNames: string[], - telegramUsername?: string + telegramUsername?: string, + productId?: string ): Promise => { if (eventNames.find((e) => e.endsWith(FROG_SLUG))) { logger(`[TELEGRAM] found frog event`, eventNames); @@ -367,7 +368,8 @@ const generateProofUrl = async ( telegramUserId, telegramChatId, validEventIds, - telegramUsername + telegramUsername, + productId ); }; @@ -375,7 +377,8 @@ const generateTicketProofUrl = async ( telegramUserId: number, telegramChatId: string, validEventIds: string[], - telegramUsername?: string + telegramUsername?: string, + productId?: string ): Promise => { return traced("telegram", "generateTicketProofUrl", async (span) => { span?.setAttribute("userId", telegramUserId.toString()); @@ -384,7 +387,7 @@ const generateTicketProofUrl = async ( const fieldsToReveal: EdDSATicketFieldsToReveal = { revealTicketId: false, revealEventId: false, - revealProductId: false, + revealProductId: !!productId, revealTimestampConsumed: false, revealTimestampSigned: false, revealAttendeeSemaphoreId: true, @@ -401,8 +404,8 @@ const generateTicketProofUrl = async ( displayName: "Your Ticket", description: "", validatorParams: { - eventIds: validEventIds, - productIds: [], + eventIds: productId ? [] : validEventIds, + productIds: productId ? [productId] : [], // TODO: surface which event ticket we are looking for notFoundMessage: "You don't have a ticket to this event." }, @@ -482,7 +485,7 @@ export const generateReactProofUrl = async ( const fieldsToReveal: EdDSATicketFieldsToReveal = { revealTicketId: false, revealEventId: false, - revealProductId: false, + revealProductId: true, revealTimestampConsumed: false, revealTimestampSigned: false, revealAttendeeSemaphoreId: false, @@ -619,7 +622,7 @@ export const eventsToLink = async ( .text( `Yes, ${event.isLinkedToCurrentChat ? "remove" : "add"}`, async (ctx) => { - await sqlTransaction(ctx.session.dbPool, async (client) => { + await sqlQueryWithPool(ctx.session.dbPool, async (client) => { let replyText = ""; if (!(await senderIsAdmin(ctx))) return; @@ -642,7 +645,7 @@ export const eventsToLink = async ( } // Otherwise, display all events to add or remove. else { - const events = await sqlTransaction(ctx.session.dbPool, (client) => + const events = await sqlQueryWithPool(ctx.session.dbPool, (client) => fetchEventsWithTelegramChats(client, true, chatId) ); @@ -685,7 +688,7 @@ export const chatsToJoin = async ( } span?.setAttribute("userId", userId?.toString()); - const chatsWithMembership = await sqlTransaction( + const chatsWithMembership = await sqlQueryWithPool( ctx.session.dbPool, (client) => getChatsWithMembershipStatus(client, ctx, userId) ); @@ -740,12 +743,14 @@ export const chatsToJoinV2 = async ( if (ctx.session.chatToJoin) { const chat = ctx.session.chatToJoin; const telegramUsername = ctx.from?.username; + const productId = getProductIdFromTelegramChat(chat.telegramChatID); const proofUrl = await generateProofUrl( userId, chat.telegramChatID, chat.ticketEventIds, chat.eventNames, - telegramUsername + telegramUsername, + productId ); if (chat.isChatMember) { @@ -766,7 +771,7 @@ export const chatsToJoinV2 = async ( }); } } else { - const chatsWithMembership = await sqlTransaction( + const chatsWithMembership = await sqlQueryWithPool( ctx.session.dbPool, (client) => getChatsWithMembershipStatus(client, ctx, userId) ); @@ -829,7 +834,7 @@ export const chatsToPostIn = async ( const chat = ctx.session.selectedChat; // Fetch anon topics for the selected chat - const { topics, telegramEvents } = await sqlTransaction( + const { topics, telegramEvents } = await sqlQueryWithPool( ctx.session.dbPool, async (client) => { const topics = await fetchTelegramAnonTopicsByChatId( @@ -891,7 +896,7 @@ export const chatsToPostIn = async ( // Otherwise, give the user a list of chats that they are members of. else { // Only show chats a user is in - const chatsWithMembership = await sqlTransaction( + const chatsWithMembership = await sqlQueryWithPool( ctx.session.dbPool, async (client) => (await getChatsWithMembershipStatus(client, ctx, userId)).filter( @@ -966,7 +971,7 @@ export const chatsToForwardTo = async ( return; } - await namedSqlTransaction(db, "chatsToForwardTo", async (client) => { + await sqlQueryWithPool(db, async (client) => { const userId = ctx.from?.id; if (!userId) { range.text(`User not found. Try again...`); @@ -1190,3 +1195,17 @@ export function getDisplayEmojis(messageTimestamp?: Date): string[] { return ["👍", "👎️", "🐸"]; } } + +export const getProductIdFromTelegramChat = ( + chatId: string | number +): string | undefined => { + try { + const chatToProductIds = JSON.parse( + process.env.TELEGRAM_CHAT_TO_PRODUCT_IDS || "{}" + ); + return chatToProductIds[String(chatId)]; + } catch (error) { + logger("[TELEGRAM] Error parsing TELEGRAM_CHAT_TO_PRODUCT_IDS:", error); + return undefined; + } +}; diff --git a/apps/passport-server/src/util/telegramWebApp.ts b/apps/passport-server/src/util/telegramWebApp.ts index 0f4e692502..8faba11036 100644 --- a/apps/passport-server/src/util/telegramWebApp.ts +++ b/apps/passport-server/src/util/telegramWebApp.ts @@ -22,7 +22,14 @@ export const closeWebviewHtml = ` `; export const errorHtmlWithDetails = (error: Error): string => { - const errorMessage = error ? error.message.replace(/\n/g, "
") : ""; + // Reformat linebreaks in error messages as
. Also replace any <> to + // avoid including of HTML (accidental, or XSS risks). + const errorMessage = error + ? error.message + .replace(/\n/g, "
") + .replace(//g, ">") + : ""; const errorStack = error instanceof Error && error.stack ? error.stack.replace(/\n/g, "
") diff --git a/apps/passport-server/test/frogcrypto.spec.ts b/apps/passport-server/test/frogcrypto.spec.ts index 61dddac5ad..c239df8f96 100644 --- a/apps/passport-server/test/frogcrypto.spec.ts +++ b/apps/passport-server/test/frogcrypto.spec.ts @@ -54,7 +54,7 @@ const DATE_EPOCH_1H = new Date(60 * 60 * 1000); const DATE_EPOCH_1H1M = new Date(DATE_EPOCH_1H.getTime() + 60 * 1000); const DATE_EPOCH_1H1M59S = new Date(DATE_EPOCH_1H1M.getTime() + 59 * 1000); -describe("frogcrypto functionality", function () { +describe.skip("frogcrypto functionality", function () { let pool: Pool; let client: PoolClient; let application: Zupass; diff --git a/apps/passport-server/test/generic-issuance/pipelines/pod-pipeline/utils.ts b/apps/passport-server/test/generic-issuance/pipelines/pod-pipeline/utils.ts index 7d1d7ed7f5..0d06aaccda 100644 --- a/apps/passport-server/test/generic-issuance/pipelines/pod-pipeline/utils.ts +++ b/apps/passport-server/test/generic-issuance/pipelines/pod-pipeline/utils.ts @@ -10,10 +10,7 @@ import { } from "@pcd/passport-interface"; import { randomUUID } from "@pcd/util"; import { PipelineUserDB } from "../../../../src/database/queries/pipelineUserDB"; -import { - namedSqlTransaction, - sqlTransaction -} from "../../../../src/database/sqlQuery"; +import { namedSqlTransaction } from "../../../../src/database/sqlQuery"; import { GenericIssuanceService } from "../../../../src/services/generic-issuance/GenericIssuanceService"; import { PODPipeline } from "../../../../src/services/generic-issuance/pipelines/PODPipeline/PODPipeline"; import { Zupass } from "../../../../src/types"; @@ -104,10 +101,7 @@ export async function updateAndRestartPipeline( "updateAndRestartPipeline", async (client) => { const userDB = new PipelineUserDB(); - const adminUser = await sqlTransaction( - giBackend.context.dbPool, - (client) => userDB.getUserById(client, adminGIUserId) - ); + const adminUser = await userDB.getUserById(client, adminGIUserId); expectToExist(adminUser); const pipelines = await giService.getAllPipelineInstances(); diff --git a/apps/passport-server/test/generic-issuance/pipelines/pretix/pretixPipelineMultiEmail.spec.ts b/apps/passport-server/test/generic-issuance/pipelines/pretix/pretixPipelineMultiEmail.spec.ts index ea6c65cf06..24e375fa3e 100644 --- a/apps/passport-server/test/generic-issuance/pipelines/pretix/pretixPipelineMultiEmail.spec.ts +++ b/apps/passport-server/test/generic-issuance/pipelines/pretix/pretixPipelineMultiEmail.spec.ts @@ -2,14 +2,14 @@ import { getEdDSAPublicKey } from "@pcd/eddsa-pcd"; import { EmailPCD, EmailPCDPackage, EmailPCDTypeName } from "@pcd/email-pcd"; import { EmailUpdateError, + ZUPASS_CREDENTIAL_REQUEST, + ZupassFeedIds, requestAddUserEmail, requestChangeUserEmail, requestPollFeed, - requestRemoveUserEmail, - ZUPASS_CREDENTIAL_REQUEST, - ZupassFeedIds + requestRemoveUserEmail } from "@pcd/passport-interface"; -import { isReplaceInFolderAction, PCDActionType } from "@pcd/pcd-collection"; +import { PCDActionType, isReplaceInFolderAction } from "@pcd/pcd-collection"; import { Identity } from "@semaphore-protocol/identity"; import { expect } from "chai"; import "mocha"; diff --git a/apps/passport-server/test/pretix/GenericPretixDataMocker.ts b/apps/passport-server/test/pretix/GenericPretixDataMocker.ts index 5b7883b2be..091e52c527 100644 --- a/apps/passport-server/test/pretix/GenericPretixDataMocker.ts +++ b/apps/passport-server/test/pretix/GenericPretixDataMocker.ts @@ -616,7 +616,9 @@ export class GenericPretixDataMocker { subevent: subEventId, secret: this.randomPositionSecret(), checkins: [], - answers + variation: null, + answers, + addon_to: null }; } diff --git a/apps/passport-server/test/semaphore/checkSemaphore.ts b/apps/passport-server/test/semaphore/checkSemaphore.ts index a81e6778d6..75daa50277 100644 --- a/apps/passport-server/test/semaphore/checkSemaphore.ts +++ b/apps/passport-server/test/semaphore/checkSemaphore.ts @@ -2,7 +2,7 @@ import { deserializeSemaphoreGroup } from "@pcd/semaphore-group-pcd"; import { BigNumberish, Group } from "@semaphore-protocol/group"; import { expect } from "chai"; import { fetchLatestHistoricSemaphoreGroups } from "../../src/database/queries/historicSemaphore"; -import { sqlTransaction } from "../../src/database/sqlQuery"; +import { sqlQueryWithPool } from "../../src/database/sqlQuery"; import { Zupass } from "../../src/types"; export interface SemaphoreGroups { @@ -97,7 +97,7 @@ function getCurrentSemaphoreServiceGroups( async function getLatestHistoricalSemaphoreGroups( application: Zupass ): Promise { - const latestGroups = await sqlTransaction( + const latestGroups = await sqlQueryWithPool( application.context.dbPool, (client) => fetchLatestHistoricSemaphoreGroups(client) ); diff --git a/apps/passport-server/test/user/testLogin.ts b/apps/passport-server/test/user/testLogin.ts index f8e35c500c..0ae1c4b456 100644 --- a/apps/passport-server/test/user/testLogin.ts +++ b/apps/passport-server/test/user/testLogin.ts @@ -15,7 +15,7 @@ import { randomUUID } from "@pcd/util"; import { Identity } from "@semaphore-protocol/identity"; import { expect } from "chai"; import { randomBytes } from "crypto"; -import { sqlTransaction } from "../../src/database/sqlQuery"; +import { sqlQueryWithPool } from "../../src/database/sqlQuery"; import { Zupass } from "../../src/types"; export async function testLogin( @@ -75,7 +75,7 @@ export async function testLogin( } token = confirmationEmailResult.value.devToken; } else { - const serverToken = await sqlTransaction( + const serverToken = await sqlQueryWithPool( application.context.dbPool, (client) => emailTokenService.getTokenForEmail(client, email) ); diff --git a/apps/passport-server/test/util/rateLimit.ts b/apps/passport-server/test/util/rateLimit.ts index 322f35b179..28d05df738 100644 --- a/apps/passport-server/test/util/rateLimit.ts +++ b/apps/passport-server/test/util/rateLimit.ts @@ -1,11 +1,11 @@ import { Pool } from "postgres-pool"; -import { sqlQuery, sqlTransaction } from "../../src/database/sqlQuery"; +import { sqlQuery, sqlQueryWithPool } from "../../src/database/sqlQuery"; /** * Deletes the rate limit buckets, resetting all rate limits. */ export async function resetRateLimitBuckets(pool: Pool): Promise { - await sqlTransaction(pool, (client) => + await sqlQueryWithPool(pool, (client) => sqlQuery(client, "DELETE FROM rate_limit_buckets") ); } diff --git a/apps/zupoll-client/CHANGELOG.md b/apps/zupoll-client/CHANGELOG.md index 80b4f3fb22..bcd58e78da 100644 --- a/apps/zupoll-client/CHANGELOG.md +++ b/apps/zupoll-client/CHANGELOG.md @@ -1,5 +1,18 @@ # zupoll-client +## 0.0.15 + +### Patch Changes + +- Updated dependencies + - @pcd/client-shared@0.4.0 + - @pcd/passport-interface@0.15.0 + - @pcd/pcd-types@0.15.0 + - @pcd/util@0.9.0 + - @pcd/zupoll-shared@0.4.0 + - @pcd/semaphore-group-pcd@0.15.0 + - @pcd/semaphore-identity-pcd@0.15.0 + ## 0.0.14 ### Patch Changes diff --git a/apps/zupoll-client/package.json b/apps/zupoll-client/package.json index 93b55cbb9d..c9e0243275 100644 --- a/apps/zupoll-client/package.json +++ b/apps/zupoll-client/package.json @@ -1,6 +1,6 @@ { "name": "zupoll-client", - "version": "0.0.14", + "version": "0.0.15", "license": "GPL-3.0-or-later", "private": true, "scripts": { @@ -17,13 +17,13 @@ "@headlessui/react": "^1.7.18", "@heroicons/react": "^2.1.3", "@hookform/resolvers": "^3.3.4", - "@pcd/client-shared": "0.3.0", - "@pcd/passport-interface": "0.14.0", - "@pcd/pcd-types": "0.14.0", - "@pcd/semaphore-group-pcd": "0.14.0", - "@pcd/semaphore-identity-pcd": "0.14.0", - "@pcd/util": "0.8.0", - "@pcd/zupoll-shared": "0.3.0", + "@pcd/client-shared": "0.4.0", + "@pcd/passport-interface": "0.15.0", + "@pcd/pcd-types": "0.15.0", + "@pcd/semaphore-group-pcd": "0.15.0", + "@pcd/semaphore-identity-pcd": "0.15.0", + "@pcd/util": "0.9.0", + "@pcd/zupoll-shared": "0.4.0", "@radix-ui/react-dialog": "^1.0.5", "@radix-ui/react-icons": "^1.3.0", "@radix-ui/react-label": "^2.0.2", @@ -64,8 +64,8 @@ "devDependencies": { "@babel/core": "^7.0.0", "@esbuild-plugins/node-globals-polyfill": "^0.2.3", - "@pcd/eslint-config-custom": "0.14.0", - "@pcd/tsconfig": "0.14.0", + "@pcd/eslint-config-custom": "0.15.0", + "@pcd/tsconfig": "0.15.0", "@types/expect": "^24.3.0", "@types/fuzzy-search": "^2.1.5", "@types/json-stable-stringify": "^1.0.34", diff --git a/apps/zupoll-client/src/@/components/ui/Overlay.tsx b/apps/zupoll-client/src/@/components/ui/Overlay.tsx index dad9822f13..a028da6bed 100644 --- a/apps/zupoll-client/src/@/components/ui/Overlay.tsx +++ b/apps/zupoll-client/src/@/components/ui/Overlay.tsx @@ -25,7 +25,6 @@ const ModalBg = styled.div` bottom: 0; right: 0; background: rgba(0, 0, 0, 0.5); - backdrop-filter: blur(4px); z-index: 999; `; @@ -36,7 +35,6 @@ const ModalWrap = styled.div` top: 4rem; left: 0; width: 100%; - max-width: 420px; margin: 4rem auto 0 auto; min-height: 480px; padding: 0.75rem; diff --git a/apps/zupoll-server/CHANGELOG.md b/apps/zupoll-server/CHANGELOG.md index 74ad482c15..8b1b409213 100644 --- a/apps/zupoll-server/CHANGELOG.md +++ b/apps/zupoll-server/CHANGELOG.md @@ -1,5 +1,17 @@ # zupoll-server +## 0.0.12 + +### Patch Changes + +- Updated dependencies + - @pcd/pcd-types@0.15.0 + - @pcd/server-shared@0.4.0 + - @pcd/util@0.9.0 + - @pcd/zupoll-shared@0.4.0 + - @pcd/semaphore-group-pcd@0.15.0 + - @pcd/semaphore-signature-pcd@0.15.0 + ## 0.0.11 ### Patch Changes diff --git a/apps/zupoll-server/package.json b/apps/zupoll-server/package.json index 7baa2ef4bc..bfb90a8d03 100644 --- a/apps/zupoll-server/package.json +++ b/apps/zupoll-server/package.json @@ -1,6 +1,6 @@ { "name": "zupoll-server", - "version": "0.0.11", + "version": "0.0.12", "license": "GPL-3.0-or-later", "private": true, "scripts": { @@ -19,12 +19,12 @@ "@honeycombio/opentelemetry-node": "^0.3.2", "@octokit/rest": "^19.0.7", "@opentelemetry/auto-instrumentations-node": "^0.36.0", - "@pcd/pcd-types": "0.14.0", - "@pcd/semaphore-group-pcd": "0.14.0", - "@pcd/semaphore-signature-pcd": "0.14.0", - "@pcd/server-shared": "0.3.0", - "@pcd/util": "^0.8.0", - "@pcd/zupoll-shared": "0.3.0", + "@pcd/pcd-types": "0.15.0", + "@pcd/semaphore-group-pcd": "0.15.0", + "@pcd/semaphore-signature-pcd": "0.15.0", + "@pcd/server-shared": "0.4.0", + "@pcd/util": "^0.9.0", + "@pcd/zupoll-shared": "0.4.0", "@prisma/client": "^4.12.0", "cors": "^2.8.5", "cron": "^3.1.6", @@ -52,8 +52,8 @@ "@babel/core": "^7.0.0", "@esbuild-plugins/node-globals-polyfill": "^0.2.3", "@esbuild-plugins/node-modules-polyfill": "^0.2.2", - "@pcd/eslint-config-custom": "0.14.0", - "@pcd/tsconfig": "0.14.0", + "@pcd/eslint-config-custom": "0.15.0", + "@pcd/tsconfig": "0.15.0", "@types/assert": "^1.5.10", "@types/chai": "^4.3.11", "@types/cors": "^2.8.13", diff --git a/apps/zupoll-server/src/routing/server.ts b/apps/zupoll-server/src/routing/server.ts index 7c31e43b3d..3da16d81f0 100644 --- a/apps/zupoll-server/src/routing/server.ts +++ b/apps/zupoll-server/src/routing/server.ts @@ -51,7 +51,7 @@ export async function startServer( ) => { console.error(`[ERROR] ${req.method} ${req.url}`); console.error(err.stack); - res.status(500).send(err.message); + res.status(500).type("text").send(err.message); } ); diff --git a/examples/pod-gpc-example/CHANGELOG.md b/examples/pod-gpc-example/CHANGELOG.md index 617d50b1cd..ec1804f90f 100644 --- a/examples/pod-gpc-example/CHANGELOG.md +++ b/examples/pod-gpc-example/CHANGELOG.md @@ -1,5 +1,21 @@ # @pcd/pod-gpc-example +## 0.4.0 + +### Minor Changes + +- GPC v4 enhancements, PODValue types, more GPC configurations + +### Patch Changes + +- Updated dependencies + - @pcd/gpc@0.4.0 + - @pcd/pcd-types@0.15.0 + - @pcd/pod@0.5.0 + - @pcd/gpc-pcd@0.4.0 + - @pcd/pod-pcd@0.5.0 + - @pcd/semaphore-identity-pcd@0.15.0 + ## 0.3.0 ### Minor Changes diff --git a/examples/pod-gpc-example/package.json b/examples/pod-gpc-example/package.json index 13b8664540..ea2551bf3d 100644 --- a/examples/pod-gpc-example/package.json +++ b/examples/pod-gpc-example/package.json @@ -1,6 +1,6 @@ { "name": "@pcd/pod-gpc-example", - "version": "0.3.0", + "version": "0.4.0", "license": "GPL-3.0-or-later", "main": "./dist/cjs/src/index.js", "module": "./dist/esm/src/index.js", @@ -26,21 +26,21 @@ "clean": "rm -rf dist node_modules *.tsbuildinfo" }, "dependencies": { - "@pcd/gpc": "0.3.0", - "@pcd/gpc-pcd": "0.3.0", - "@pcd/pcd-types": "0.14.0", - "@pcd/pod": "0.4.0", - "@pcd/pod-pcd": "0.4.0", - "@pcd/semaphore-identity-pcd": "0.14.0", - "@semaphore-protocol/identity": "^4.0.3", + "@pcd/gpc": "0.4.0", + "@pcd/gpc-pcd": "0.4.0", + "@pcd/pcd-types": "0.15.0", + "@pcd/pod": "0.5.0", + "@pcd/pod-pcd": "0.5.0", + "@pcd/semaphore-identity-pcd": "0.15.0", + "@semaphore-protocol/core": "^4.0.3", "lodash": "^4.17.21", "snarkjs": "^0.7.4", "uuid": "^9.0.0" }, "devDependencies": { - "@pcd/eslint-config-custom": "0.14.0", + "@pcd/eslint-config-custom": "0.15.0", "@pcd/proto-pod-gpc-artifacts": "0.13.0", - "@pcd/tsconfig": "0.14.0", + "@pcd/tsconfig": "0.15.0", "@types/chai": "^4.3.5", "@types/mocha": "^10.0.1", "@types/snarkjs": "^0.7.5", diff --git a/examples/pod-gpc-example/src/gpcExample.ts b/examples/pod-gpc-example/src/gpcExample.ts index 261c7c747a..3c17a754ae 100644 --- a/examples/pod-gpc-example/src/gpcExample.ts +++ b/examples/pod-gpc-example/src/gpcExample.ts @@ -38,7 +38,7 @@ import { SemaphoreIdentityPCDPackage, v4PublicKey } from "@pcd/semaphore-identity-pcd"; -import { Identity } from "@semaphore-protocol/identity"; +import { Identity } from "@semaphore-protocol/core"; import _ from "lodash"; import * as path from "path"; import { v4 as uuid } from "uuid"; diff --git a/examples/pod-gpc-example/src/podExample.ts b/examples/pod-gpc-example/src/podExample.ts index bbc7c6b1a4..788524d4ae 100644 --- a/examples/pod-gpc-example/src/podExample.ts +++ b/examples/pod-gpc-example/src/podExample.ts @@ -26,7 +26,7 @@ import { podValueToJSON } from "@pcd/pod"; import { PODPCD, PODPCDPackage } from "@pcd/pod-pcd"; -import { Identity } from "@semaphore-protocol/identity"; +import { Identity } from "@semaphore-protocol/core"; import { v4 as uuid } from "uuid"; /** diff --git a/examples/test-zapp/CHANGELOG.md b/examples/test-zapp/CHANGELOG.md index 05f53068bc..14a005a52a 100644 --- a/examples/test-zapp/CHANGELOG.md +++ b/examples/test-zapp/CHANGELOG.md @@ -1,5 +1,12 @@ # test-app +## 1.0.6 + +### Patch Changes + +- Updated dependencies + - @pcd/pod@0.5.0 + ## 1.0.5 ### Patch Changes diff --git a/examples/test-zapp/package.json b/examples/test-zapp/package.json index a691c3803e..f07e3b807c 100644 --- a/examples/test-zapp/package.json +++ b/examples/test-zapp/package.json @@ -1,6 +1,6 @@ { "name": "test-zapp", - "version": "1.0.5", + "version": "1.0.6", "private": true, "type": "module", "scripts": { @@ -10,7 +10,7 @@ "preview": "vite preview" }, "dependencies": { - "@pcd/pod": "^0.4.0", + "@pcd/pod": "^0.5.0", "@parcnet-js/podspec": "^1.1.3", "@parcnet-js/ticket-spec": "^1.1.8", "@parcnet-js/client-rpc": "^1.1.6", @@ -24,7 +24,7 @@ "vite-plugin-node-polyfills": "^0.22.0" }, "devDependencies": { - "@pcd/eslint-config-custom": "0.14.0", + "@pcd/eslint-config-custom": "0.15.0", "@tailwindcss/forms": "^0.5.7", "@tailwindcss/typography": "^0.5.14", "@types/json-bigint": "^1.0.1", diff --git a/examples/zuauth/CHANGELOG.md b/examples/zuauth/CHANGELOG.md index 9642bf3c17..988d31606d 100644 --- a/examples/zuauth/CHANGELOG.md +++ b/examples/zuauth/CHANGELOG.md @@ -1,5 +1,14 @@ # zuauth-example +## 0.1.21 + +### Patch Changes + +- Updated dependencies + - @pcd/passport-interface@0.15.0 + - @pcd/util@0.9.0 + - @pcd/zuauth@1.8.0 + ## 0.1.20 ### Patch Changes diff --git a/examples/zuauth/package.json b/examples/zuauth/package.json index 903a7aff64..a2db1a4749 100644 --- a/examples/zuauth/package.json +++ b/examples/zuauth/package.json @@ -1,6 +1,6 @@ { "name": "zuauth-example", - "version": "0.1.20", + "version": "0.1.21", "license": "GPL-3.0-or-later", "private": true, "scripts": { @@ -10,17 +10,17 @@ "lint": "next lint" }, "dependencies": { - "@pcd/util": "0.8.0", - "@pcd/passport-interface": "^0.14.0", - "@pcd/zuauth": "1.7.0", + "@pcd/util": "0.9.0", + "@pcd/passport-interface": "^0.15.0", + "@pcd/zuauth": "1.8.0", "iron-session": "^8.0.2", "next": "^14.1.4", "react": "^18.2.0", "react-dom": "^18.2.0" }, "devDependencies": { - "@pcd/eslint-config-custom": "0.14.0", - "@pcd/tsconfig": "0.14.0", + "@pcd/eslint-config-custom": "0.15.0", + "@pcd/tsconfig": "0.15.0", "@types/cookie": "^0.6.0", "@types/node": "^20", "@types/react": "^18", diff --git a/packages/lib/client-shared/CHANGELOG.md b/packages/lib/client-shared/CHANGELOG.md index 6eef51eb02..5d1016de8b 100644 --- a/packages/lib/client-shared/CHANGELOG.md +++ b/packages/lib/client-shared/CHANGELOG.md @@ -1,5 +1,16 @@ # @pcd/client-shared +## 0.4.0 + +### Minor Changes + +- GPC v4 enhancements, PODValue types, more GPC configurations + +### Patch Changes + +- Updated dependencies + - @pcd/util@0.9.0 + ## 0.3.0 ### Minor Changes diff --git a/packages/lib/client-shared/package.json b/packages/lib/client-shared/package.json index 401b767bd7..143de4c6c4 100644 --- a/packages/lib/client-shared/package.json +++ b/packages/lib/client-shared/package.json @@ -1,6 +1,6 @@ { "name": "@pcd/client-shared", - "version": "0.3.0", + "version": "0.4.0", "license": "GPL-3.0-or-later", "main": "./dist/cjs/src/index.js", "module": "./dist/esm/src/index.js", @@ -28,13 +28,13 @@ }, "dependencies": { "@rollbar/react": "^0.12.0-beta", - "@pcd/util": "0.8.0", + "@pcd/util": "0.9.0", "react": "^18.2.0", "rollbar": "^2.26.4" }, "devDependencies": { - "@pcd/eslint-config-custom": "0.14.0", - "@pcd/tsconfig": "0.14.0", + "@pcd/eslint-config-custom": "0.15.0", + "@pcd/tsconfig": "0.15.0", "@types/chai": "^4.3.5", "@types/mocha": "^10.0.1", "eslint": "^8.57.0", diff --git a/packages/lib/emitter/CHANGELOG.md b/packages/lib/emitter/CHANGELOG.md index 8f48530826..e158ea520e 100644 --- a/packages/lib/emitter/CHANGELOG.md +++ b/packages/lib/emitter/CHANGELOG.md @@ -1,5 +1,11 @@ # @pcd/emitter +## 0.9.0 + +### Minor Changes + +- GPC v4 enhancements, PODValue types, more GPC configurations + ## 0.8.0 ### Minor Changes diff --git a/packages/lib/emitter/package.json b/packages/lib/emitter/package.json index 7f619c30ef..9d92344446 100644 --- a/packages/lib/emitter/package.json +++ b/packages/lib/emitter/package.json @@ -1,6 +1,6 @@ { "name": "@pcd/emitter", - "version": "0.8.0", + "version": "0.9.0", "license": "MIT", "main": "./dist/cjs/src/index.js", "module": "./dist/esm/src/index.js", @@ -30,8 +30,8 @@ "chai": "^4.3.7" }, "devDependencies": { - "@pcd/eslint-config-custom": "0.14.0", - "@pcd/tsconfig": "0.14.0", + "@pcd/eslint-config-custom": "0.15.0", + "@pcd/tsconfig": "0.15.0", "@types/chai": "^4.3.5", "@types/mocha": "^10.0.1", "chai-spies": "^1.0.0", diff --git a/packages/lib/gpc/CHANGELOG.md b/packages/lib/gpc/CHANGELOG.md index 4e4041a664..a59edc345d 100644 --- a/packages/lib/gpc/CHANGELOG.md +++ b/packages/lib/gpc/CHANGELOG.md @@ -1,5 +1,19 @@ # @pcd/gpcircuits +## 0.4.0 + +### Minor Changes + +- GPC v4 enhancements, PODValue types, more GPC configurations + +### Patch Changes + +- Updated dependencies + - @pcd/gpcircuits@0.5.0 + - @pcd/pod@0.5.0 + - @pcd/semaphore-identity-v3-wrapper@0.1.0 + - @pcd/util@0.9.0 + ## 0.3.0 ### Minor Changes diff --git a/packages/lib/gpc/README.md b/packages/lib/gpc/README.md index 80705b68f4..384d52c674 100644 --- a/packages/lib/gpc/README.md +++ b/packages/lib/gpc/README.md @@ -18,7 +18,7 @@ Downloads
- + Developer Site @@ -34,26 +34,26 @@ A library for creating and verifying zero-knowledge proofs using General Purpose Circuits. For a full introduction, see the -[Developer Site](https://zupass.org/pod-developers). +[Developer Site](https://zupass.org/pod). -**POD** is a format enabling any app to flexibly create cryptographic data and -make zero-knowledge proofs about it. A POD could represent your ticket to an -event, a secure message, a collectible badge, or an item in a role-playing game. -Using PODs, developers can create ZK-enabled apps without the effort and risk of -developing their own cryptography. +**POD** libraries enable any app to create zero-knowledge proofs of cryptographic data. A POD could represent your ticket to an event, a secure +message, a collectible badge, or an item in a role-playing game. Using PODs, +developers can create ZK-enabled apps without the effort and risk of developing +custom cryptography. ZK proofs about PODs use General Purpose Circuits (**GPC**) which can prove many -different things about a POD without revealing it all. GPCs use human-readable -configuration and pre-compiled circuits so no knowledge of circuit programming -is required. +different things about PODs without revealing all details. GPCs use +human-readable configuration and pre-compiled circuits so no knowledge of +circuit programming is required. PODs and GPCs can be used in Zupass, or in your own apps without Zupass. ## What is a GPC? GPCs allow ZK proofs to be created from a simple proof configuration. You can -configure your proofs using a human-readable (JSON) format, which is used to -generate the specific circuit inputs needed for the proof. +configure your proofs using a human-readable JSON format (or equivalent +TypeScript code), which is used to generate the specific circuit inputs needed +for the proof. ```TypeScript const weaponProofConfig: GPCProofConfig = { @@ -69,10 +69,10 @@ const weaponProofConfig: GPCProofConfig = { }; ``` -The GPC library has a family of pre-compiled ZK circuits with different sizes -and capabilities. It will automatically select the right circuit to satisfy the -needs of each proof at run-time. No setup is required, and you don’t need any -knowledge of circuit programming (circom, halo2, noir, etc). +The GPC library inclues a family of pre-compiled ZK circuits with different +sizes and capabilities. It will automatically select the right circuit to +satisfy the needs of each proof at run-time. No setup is required, and you +don’t need any knowledge of circuit programming (circom, halo2, noir, etc). GPCs can prove properties of one POD or several PODs together. PODs can be proven to be owned by the prover, using their Semaphore identity. A GPC can @@ -83,13 +83,12 @@ in a list of valid values, and reveal the value of a fourth entry. ## Entry Points - The [`GPCProofConfig`](https://docs.pcd.team/types/_pcd_gpc.GPCProofConfig.html) - type configures a proof. Start there to learn what properties you can - prove about a POD. + type configures a proof. Start there to learn what you can prove about PODs. - The [`gpcProve`](https://docs.pcd.team/functions/_pcd_gpc.gpcProve.html) and [`gpcVerify`](https://docs.pcd.team/functions/_pcd_gpc.gpcVerify.html) functions allow you to generate and validate GPC proofs. - The [`gpcArtifactDownloadURL`](https://docs.pcd.team/functions/_pcd_gpc.gpcArtifactDownloadURL.html) - function can help you find the right place to download the necessary binary + function can help you find the right place to get the necessary binary artifacts (proving key, verification key, witness generator) to perform proof calculations. @@ -102,27 +101,28 @@ For more details on usage, check out the [`@pcd/pod`](https://github.com/proofcarryingdata/zupass/tree/main/packages/lib/pod) package. -- To interact with GPC proofs in the Zupass app, see the +- To see how GPC proofs are created and stored in the Zupass app, see the [`@pcd/gpc-pcd`](https://github.com/proofcarryingdata/zupass/tree/main/packages/pcd/gpc-pcd) package. - To find the binaries required to prove and verify, see the [`@pcd/proto-pod-gpc-artifacts`](https://github.com/proofcarryingdata/snark-artifacts/tree/pre-release/packages/proto-pod-gpc) package. Since these artifacts are large and numerous, you generally - won't want to depend on this package directly. + won't want to include this package directly into your app bundle. + +## Package Installation + +This package will work either in browser or in a Node.js server. Packaging for +a browser requires polyfill for some Node modules, including `buffer` and `constants`. + +There is a known issue with a dependency `fastfile` which can be resolved by polyfilling `constants` as you can see in [this example](https://github.com/proofcarryingdata/zukyc/pull/3). ## Stability and Security -POD and GPC libraries are experimental and subject to change. We encourage devs -to try them out and use them for apps, but maybe don’t rely on them for the most -sensitive use cases yet. +POD and GPC libraries are in beta and subject to change. We encourage devs to try them out and use them for apps, but be aware that updates will come in future. GPC proofs are considered ephemeral (for now), primarily intended for -transactional use cases. Saved proofs may not be verifiable with future -versions of code. Library interfaces may also change. Any breaking changes will -be reflected in the NPM versions using standard semantic versioning. - -These libraries should not be considered secure enough for highly-sensitive use -cases yet. The circuits are experimental and have not been audited. The -proving/verification keys were generated in good faith by a single author, but -are not the result of a distributed trusted setup ceremony. +transactional use cases. Saved proofs may not be verifiable with future versions +of code. + +These libraries should not be considered secure enough for highly-sensitive use cases yet. The cryptography, circuits, and configuration compiler have not been audited. The proving/verification keys were generated in good faith by a single author, but are not the result of a distributed trusted setup ceremony. diff --git a/packages/lib/gpc/package.json b/packages/lib/gpc/package.json index 1a0ffa3b6c..d0622f743c 100644 --- a/packages/lib/gpc/package.json +++ b/packages/lib/gpc/package.json @@ -1,6 +1,6 @@ { "name": "@pcd/gpc", - "version": "0.3.0", + "version": "0.4.0", "license": "GPL-3.0-or-later", "main": "./dist/cjs/src/index.js", "module": "./dist/esm/src/index.js", @@ -28,11 +28,11 @@ "clean": "rm -rf dist node_modules *.tsbuildinfo" }, "dependencies": { - "@pcd/gpcircuits": "0.4.0", - "@pcd/pod": "0.4.0", - "@pcd/semaphore-identity-v3-wrapper": "0.0.1", - "@pcd/util": "0.8.0", - "@semaphore-protocol/identity": "^4.5.0", + "@pcd/gpcircuits": "0.5.0", + "@pcd/pod": "0.5.0", + "@pcd/semaphore-identity-v3-wrapper": "0.1.0", + "@pcd/util": "0.9.0", + "@semaphore-protocol/core": "^4.5.0", "lodash": "^4.17.21", "json-bigint": "^1.0.0", "snarkjs": "^0.7.4", @@ -40,8 +40,8 @@ "valibot": "^0.42.1" }, "devDependencies": { - "@pcd/eslint-config-custom": "0.14.0", - "@pcd/tsconfig": "0.14.0", + "@pcd/eslint-config-custom": "0.15.0", + "@pcd/tsconfig": "0.15.0", "@types/chai": "^4.3.5", "@types/json-bigint": "^1.0.1", "@types/lodash": "^4.17.1", diff --git a/packages/lib/gpc/src/gpcTypes.ts b/packages/lib/gpc/src/gpcTypes.ts index 5fbe1554c2..d4dc37f0b3 100644 --- a/packages/lib/gpc/src/gpcTypes.ts +++ b/packages/lib/gpc/src/gpcTypes.ts @@ -1,6 +1,6 @@ import { POD, PODEntries, PODName, PODValue, PODValueTuple } from "@pcd/pod"; import { Identity as IdentityV3 } from "@pcd/semaphore-identity-v3-wrapper"; -import { Identity as IdentityV4 } from "@semaphore-protocol/identity"; +import { Identity as IdentityV4 } from "@semaphore-protocol/core"; import type { Groth16Proof } from "snarkjs"; /** diff --git a/packages/lib/gpc/test/common.ts b/packages/lib/gpc/test/common.ts index 3f2200c32a..fef411a4a3 100644 --- a/packages/lib/gpc/test/common.ts +++ b/packages/lib/gpc/test/common.ts @@ -7,7 +7,7 @@ import { } from "@pcd/pod"; import { Identity as IdentityV3 } from "@pcd/semaphore-identity-v3-wrapper"; import { BABY_JUB_NEGATIVE_ONE } from "@pcd/util"; -import { Identity as IdentityV4 } from "@semaphore-protocol/identity"; +import { Identity as IdentityV4 } from "@semaphore-protocol/core"; import { AssertionError, assert, expect } from "chai"; import { Circomkit } from "circomkit"; import { readFileSync } from "fs"; diff --git a/packages/lib/gpcircuits/CHANGELOG.md b/packages/lib/gpcircuits/CHANGELOG.md index 042ddf5b44..2f4657ad92 100644 --- a/packages/lib/gpcircuits/CHANGELOG.md +++ b/packages/lib/gpcircuits/CHANGELOG.md @@ -1,5 +1,16 @@ # @pcd/gpcircuits +## 0.5.0 + +### Minor Changes + +- GPC v4 enhancements, PODValue types, more GPC configurations + +### Patch Changes + +- Updated dependencies + - @pcd/pod@0.5.0 + ## 0.4.0 ### Minor Changes diff --git a/packages/lib/gpcircuits/README.md b/packages/lib/gpcircuits/README.md index 6c884d5bea..5898e7acb7 100644 --- a/packages/lib/gpcircuits/README.md +++ b/packages/lib/gpcircuits/README.md @@ -18,7 +18,7 @@ Downloads
- + Developer Site @@ -32,32 +32,31 @@ A collection of circom circuits and supporting code for zero-knowledge proofs on PODs (Provable Object Data) via the GPC (General Purpose Circuits) framework. For a full introduction, see the -[Developer Site](https://zupass.org/pod-developers). +[Developer Site](https://zupass.org/pod). -**POD** is a format enabling any app to flexibly create cryptographic data and -make zero-knowledge proofs about it. A POD could represent your ticket to an -event, a secure message, a collectible badge, or an item in a role-playing game. -Using PODs, developers can create ZK-enabled apps without the effort and risk of -developing their own cryptography. +**POD** libraries enable any app to create zero-knowledge proofs of cryptographic data. A POD could represent your ticket to an event, a secure +message, a collectible badge, or an item in a role-playing game. Using PODs, +developers can create ZK-enabled apps without the effort and risk of developing +custom cryptography. ZK proofs about PODs use General Purpose Circuits (**GPC**) which can prove many -different things about a POD without revealing it all. GPCs use human-readable -configuration and pre-compiled circuits so no knowledge of circuit programming -is required. +different things about PODs without revealing all details. GPCs use +human-readable configuration and pre-compiled circuits so no knowledge of +circuit programming is required. PODs and GPCs can be used in Zupass, or in your own apps without Zupass. ## What's in this package? -This package implements the first prototype family of GPC circuits, named -`proto-pod-gpc`. The primary use of the circuits in this package is via -a high-level configuration interpreted by the +This package implements the first family of GPC circuits, named `proto-pod-gpc`. +The primary use of the circuits in this package is via a high-level +configuration interpreted by the [`@pcd/gpc`](https://github.com/proofcarryingdata/zupass/tree/main/packages/lib/gpc) package. The top level circuit in the family is in [`proto-pod-gpc.circom`](https://github.com/proofcarryingdata/zupass/blob/main/packages/lib/gpcircuits/circuits/proto-pod-gpc.circom). -That circuit is built using a configurable number of different Modules defined +That circuit is built using a configurable number of various Modules defined in the other circom files. If you're a circom developer, you can reuse these modules to create your own circuits which prove things about PODs which the GPC configuration doesn't yet support. @@ -76,27 +75,28 @@ package. They are stored in a dedicated repo due to their size. [`@pcd/gpc`](https://github.com/proofcarryingdata/zupass/tree/main/packages/lib/gpc) package. -- To interact with GPC proofs in the Zupass app, see the +- To see how GPC proofs are created and stored in the Zupass app, see the [`@pcd/gpc-pcd`](https://github.com/proofcarryingdata/zupass/tree/main/packages/pcd/gpc-pcd) package. - To find the binaries required to prove and verify, see the [`@pcd/proto-pod-gpc-artifacts`](https://github.com/proofcarryingdata/snark-artifacts/tree/pre-release/packages/proto-pod-gpc) package. Since these artifacts are large and numerous, you generally - won't want to depend on this package directly. + won't want to include this package directly into your app bundle. + +## Package Installation + +This package will work either in browser or in a Node.js server. Packaging for +a browser requires polyfill for some Node modules, including `buffer` and `constants`. + +There is a known issue with a dependency `fastfile` which can be resolved by polyfilling `constants` as you can see in [this example](https://github.com/proofcarryingdata/zukyc/pull/3). ## Stability and Security -POD and GPC libraries are experimental and subject to change. We encourage devs -to try them out and use them for apps, but maybe don’t rely on them for the most -sensitive use cases yet. +POD and GPC libraries are in beta and subject to change. We encourage devs to try them out and use them for apps, but be aware that updates will come in future. GPC proofs are considered ephemeral (for now), primarily intended for -transactional use cases. Saved proofs may not be verifiable with future -versions of code. Library interfaces may also change. Any breaking changes will -be reflected in the NPM versions using standard semantic versioning. - -These libraries should not be considered secure enough for highly-sensitive use -cases yet. The circuits are experimental and have not been audited. The -proving/verification keys were generated in good faith by a single author, but -are not the result of a distributed trusted setup ceremony. +transactional use cases. Saved proofs may not be verifiable with future versions +of code. + +These libraries should not be considered secure enough for highly-sensitive use cases yet. The cryptography, circuits, and configuration compiler have not been audited. The proving/verification keys were generated in good faith by a single author, but are not the result of a distributed trusted setup ceremony. diff --git a/packages/lib/gpcircuits/package.json b/packages/lib/gpcircuits/package.json index ec2ed8819e..96607f4438 100644 --- a/packages/lib/gpcircuits/package.json +++ b/packages/lib/gpcircuits/package.json @@ -1,6 +1,6 @@ { "name": "@pcd/gpcircuits", - "version": "0.4.0", + "version": "0.5.0", "license": "GPL-3.0-or-later", "main": "./dist/cjs/src/index.js", "module": "./dist/esm/src/index.js", @@ -43,17 +43,17 @@ "copy-snark-artifacts": "./scripts/copy-snark-artifacts.sh" }, "dependencies": { - "@pcd/pod": "0.4.0", + "@pcd/pod": "0.5.0", "fastfile": "0.0.20", "snarkjs": "^0.7.4", "url-join": "4.0.1" }, "devDependencies": { - "@pcd/eslint-config-custom": "0.14.0", - "@pcd/semaphore-identity-v3-wrapper": "0.0.1", - "@pcd/tsconfig": "0.14.0", - "@pcd/util": "^0.8.0", - "@semaphore-protocol/identity": "^4.5.0", + "@pcd/eslint-config-custom": "0.15.0", + "@pcd/semaphore-identity-v3-wrapper": "0.1.0", + "@pcd/tsconfig": "0.15.0", + "@pcd/util": "^0.9.0", + "@semaphore-protocol/core": "^4.5.0", "@types/chai": "^4.3.5", "@types/mocha": "^10.0.1", "@types/snarkjs": "^0.7.5", diff --git a/packages/lib/gpcircuits/test/common.ts b/packages/lib/gpcircuits/test/common.ts index 9f96fdb002..80bad780d5 100644 --- a/packages/lib/gpcircuits/test/common.ts +++ b/packages/lib/gpcircuits/test/common.ts @@ -6,7 +6,7 @@ import { } from "@pcd/pod"; import { Identity as IdentityV3 } from "@pcd/semaphore-identity-v3-wrapper"; import { BABY_JUB_NEGATIVE_ONE } from "@pcd/util"; -import { Identity as IdentityV4 } from "@semaphore-protocol/identity"; +import { Identity as IdentityV4 } from "@semaphore-protocol/core"; import { Circomkit } from "circomkit"; import { readFileSync } from "fs"; import path from "path"; diff --git a/packages/lib/passport-crypto/CHANGELOG.md b/packages/lib/passport-crypto/CHANGELOG.md index 643709c253..7743695119 100644 --- a/packages/lib/passport-crypto/CHANGELOG.md +++ b/packages/lib/passport-crypto/CHANGELOG.md @@ -1,5 +1,11 @@ # @pcd/passport-crypto +## 0.15.0 + +### Minor Changes + +- GPC v4 enhancements, PODValue types, more GPC configurations + ## 0.14.0 ### Minor Changes diff --git a/packages/lib/passport-crypto/package.json b/packages/lib/passport-crypto/package.json index d9d587cdfe..5032d33cd7 100644 --- a/packages/lib/passport-crypto/package.json +++ b/packages/lib/passport-crypto/package.json @@ -1,6 +1,6 @@ { "name": "@pcd/passport-crypto", - "version": "0.14.0", + "version": "0.15.0", "license": "GPL-3.0-or-later", "main": "./dist/cjs/src/index.js", "module": "./dist/esm/src/index.js", @@ -31,8 +31,8 @@ "buffer": "^6.0.3" }, "devDependencies": { - "@pcd/eslint-config-custom": "0.14.0", - "@pcd/tsconfig": "0.14.0", + "@pcd/eslint-config-custom": "0.15.0", + "@pcd/tsconfig": "0.15.0", "libsodium-wrappers-sumo": "^0.7.15", "@types/react": "^18.0.22", "eslint": "^8.57.0", diff --git a/packages/lib/passport-interface/CHANGELOG.md b/packages/lib/passport-interface/CHANGELOG.md index ce129c720c..27e0832b7d 100644 --- a/packages/lib/passport-interface/CHANGELOG.md +++ b/packages/lib/passport-interface/CHANGELOG.md @@ -1,5 +1,31 @@ # @pcd/passport-interface +## 0.15.0 + +### Minor Changes + +- GPC v4 enhancements, PODValue types, more GPC configurations + +### Patch Changes + +- Updated dependencies + - @pcd/emitter@0.9.0 + - @pcd/passport-crypto@0.15.0 + - @pcd/pcd-collection@0.15.0 + - @pcd/pcd-types@0.15.0 + - @pcd/pod@0.5.0 + - @pcd/semaphore-identity-v3-wrapper@0.1.0 + - @pcd/util@0.9.0 + - @pcd/eddsa-frog-pcd@0.7.0 + - @pcd/eddsa-pcd@0.10.0 + - @pcd/eddsa-ticket-pcd@0.10.0 + - @pcd/email-pcd@0.10.0 + - @pcd/pod-pcd@0.5.0 + - @pcd/pod-ticket-pcd@0.5.0 + - @pcd/semaphore-group-pcd@0.15.0 + - @pcd/semaphore-identity-pcd@0.15.0 + - @pcd/semaphore-signature-pcd@0.15.0 + ## 0.14.0 ### Minor Changes diff --git a/packages/lib/passport-interface/package.json b/packages/lib/passport-interface/package.json index 5ad61bcdea..ccae2300b1 100644 --- a/packages/lib/passport-interface/package.json +++ b/packages/lib/passport-interface/package.json @@ -1,6 +1,6 @@ { "name": "@pcd/passport-interface", - "version": "0.14.0", + "version": "0.15.0", "license": "GPL-3.0-or-later", "main": "./dist/cjs/src/index.js", "module": "./dist/esm/src/index.js", @@ -57,22 +57,22 @@ "clean": "rm -rf dist node_modules *.tsbuildinfo" }, "dependencies": { - "@pcd/eddsa-frog-pcd": "0.6.0", - "@pcd/eddsa-pcd": "^0.9.0", - "@pcd/eddsa-ticket-pcd": "0.9.0", - "@pcd/email-pcd": "^0.9.0", - "@pcd/emitter": "0.8.0", - "@pcd/passport-crypto": "0.14.0", - "@pcd/pcd-collection": "0.14.0", - "@pcd/pcd-types": "0.14.0", - "@pcd/pod": "0.4.0", - "@pcd/pod-ticket-pcd": "0.4.0", - "@pcd/semaphore-group-pcd": "0.14.0", - "@pcd/semaphore-identity-pcd": "0.14.0", - "@pcd/pod-pcd": "0.4.0", - "@pcd/semaphore-identity-v3-wrapper": "0.0.1", - "@pcd/semaphore-signature-pcd": "0.14.0", - "@pcd/util": "0.8.0", + "@pcd/eddsa-frog-pcd": "0.7.0", + "@pcd/eddsa-pcd": "^0.10.0", + "@pcd/eddsa-ticket-pcd": "0.10.0", + "@pcd/email-pcd": "^0.10.0", + "@pcd/emitter": "0.9.0", + "@pcd/passport-crypto": "0.15.0", + "@pcd/pcd-collection": "0.15.0", + "@pcd/pcd-types": "0.15.0", + "@pcd/pod": "0.5.0", + "@pcd/pod-ticket-pcd": "0.5.0", + "@pcd/semaphore-group-pcd": "0.15.0", + "@pcd/semaphore-identity-pcd": "0.15.0", + "@pcd/pod-pcd": "0.5.0", + "@pcd/semaphore-identity-v3-wrapper": "0.1.0", + "@pcd/semaphore-signature-pcd": "0.15.0", + "@pcd/util": "0.9.0", "fast-json-stable-stringify": "^2.1.0", "js-sha256": "^0.10.1", "lodash": "^4.17.21", @@ -81,8 +81,8 @@ "zod": "^3.22.4" }, "devDependencies": { - "@pcd/eslint-config-custom": "0.14.0", - "@pcd/tsconfig": "0.14.0", + "@pcd/eslint-config-custom": "0.15.0", + "@pcd/tsconfig": "0.15.0", "@types/mocha": "^10.0.1", "@types/react": "^18.0.22", "@types/url-join": "4.0.1", diff --git a/packages/lib/passport-interface/src/genericIssuanceTypes.ts b/packages/lib/passport-interface/src/genericIssuanceTypes.ts index 80a526f42e..f4247408e6 100644 --- a/packages/lib/passport-interface/src/genericIssuanceTypes.ts +++ b/packages/lib/passport-interface/src/genericIssuanceTypes.ts @@ -182,6 +182,14 @@ const SemaphoreGroupListSchema = z { message: "Semaphore group names must be unique" } ); +const ImageOptionsSchema = z.object({ + imageUrl: z.string(), + requireCheckedIn: z.boolean(), + qrCodeOverrideImageUrl: z.string().optional(), + eventStartDate: z.string().optional(), + eventLocation: z.string().optional() +}); + /** * Generic Issuance-specific ticket type configuration - roughly corresponds to a * 'Product' in Pretix-land. @@ -206,7 +214,11 @@ const LemonadePipelineEventConfigSchema = z.object({ /** * Roughly translates to Products in {@link EdDSATicketPCD}. */ - ticketTypes: z.array(LemonadePipelineTicketTypeConfigSchema) + ticketTypes: z.array(LemonadePipelineTicketTypeConfigSchema), + /** + * Options to configure displaying an image instead of the QR code + */ + imageOptions: ImageOptionsSchema.optional() }); /** @@ -275,14 +287,6 @@ const FeedIssuanceOptionsSchema = z.object({ export type FeedIssuanceOptions = z.infer; -const ImageOptionsSchema = z.object({ - imageUrl: z.string(), - requireCheckedIn: z.boolean(), - qrCodeOverrideImageUrl: z.string().optional(), - eventStartDate: z.string().optional(), - eventLocation: z.string().optional() -}); - export type ImageOptions = z.infer; const LemonadePipelineOptionsSchema = BasePipelineOptionsSchema.extend({ @@ -460,7 +464,13 @@ const PretixPipelineOptionsSchema = BasePipelineOptionsSchema.extend({ semaphoreGroups: SemaphoreGroupListSchema, enablePODTickets: z.boolean().optional(), autoIssuance: z.array(AutoIssuanceOptionsSchema).optional(), - userPermissions: z.array(UserPermissionsOptionsSchema).optional() + userPermissions: z.array(UserPermissionsOptionsSchema).optional(), + /** + * The corresponding org url must be in the `PRETIX_BATCH_ENABLED_FOR` + * environment variable in order to enable batching for this pipeline, + * otherwise this field is a no-op. + */ + batchFetch: z.boolean().optional() }).refine((val) => { // Validate that the manual tickets have event and product IDs that match the // event configuration. diff --git a/packages/lib/passport-interface/src/genericPretixTypes.ts b/packages/lib/passport-interface/src/genericPretixTypes.ts index 751d913194..6916974e0c 100644 --- a/packages/lib/passport-interface/src/genericPretixTypes.ts +++ b/packages/lib/passport-interface/src/genericPretixTypes.ts @@ -50,6 +50,8 @@ const GenericPretixPositionSchema = z.object({ subevent: z.number().nullable(), secret: z.string(), checkins: z.array(GenericPretixCheckinSchema), + addon_to: z.number().nullable(), // id of the position this is an add-on to + variation: z.number().nullable(), // id of the purchased variation answers: z.array(GenericPretixAnswerSchema).optional() }); diff --git a/packages/lib/passport-ui/CHANGELOG.md b/packages/lib/passport-ui/CHANGELOG.md index 579c6b4feb..eb70acc8a2 100644 --- a/packages/lib/passport-ui/CHANGELOG.md +++ b/packages/lib/passport-ui/CHANGELOG.md @@ -1,5 +1,16 @@ # @pcd/passport-ui +## 0.15.0 + +### Minor Changes + +- GPC v4 enhancements, PODValue types, more GPC configurations + +### Patch Changes + +- Updated dependencies + - @pcd/message-pcd@0.5.0 + ## 0.14.0 ### Minor Changes diff --git a/packages/lib/passport-ui/package.json b/packages/lib/passport-ui/package.json index 577a8559cf..1cdf8d5414 100644 --- a/packages/lib/passport-ui/package.json +++ b/packages/lib/passport-ui/package.json @@ -1,6 +1,6 @@ { "name": "@pcd/passport-ui", - "version": "0.14.0", + "version": "0.15.0", "license": "GPL-3.0-or-later", "main": "./dist/cjs/src/index.js", "module": "./dist/esm/src/index.js", @@ -28,17 +28,17 @@ "clean": "rm -rf dist node_modules *.tsbuildinfo" }, "dependencies": { - "@pcd/message-pcd": "0.4.0", + "@pcd/message-pcd": "0.5.0", "medium-zoom": "^1.0.8", "pako": "^2.1.0", - "qr-image": "^3.2.0", + "qrcode": "^1.5.4", "react": "^18.2.0", "react-router-dom": "^6.9.0", "styled-components": "^5.3.9" }, "devDependencies": { - "@pcd/eslint-config-custom": "0.14.0", - "@pcd/tsconfig": "0.14.0", + "@pcd/eslint-config-custom": "0.15.0", + "@pcd/tsconfig": "0.15.0", "@types/mocha": "^10.0.1", "@types/pako": "^2.0.0", "@types/qr-image": "^3.2.7", diff --git a/packages/lib/passport-ui/src/QR.tsx b/packages/lib/passport-ui/src/QR.tsx index 5e5bc0d9f7..7413884f77 100644 --- a/packages/lib/passport-ui/src/QR.tsx +++ b/packages/lib/passport-ui/src/QR.tsx @@ -1,5 +1,5 @@ import { gzip, ungzip } from "pako"; -import qr, { SvgObject } from "qr-image"; +import * as QRCode from "qrcode"; import { useCallback, useEffect, useMemo, useState } from "react"; import styled, { FlattenSimpleInterpolation, css } from "./StyledWrapper"; @@ -152,28 +152,27 @@ export function QR({ fgColor: string; bgColor: string; }): JSX.Element { - const [svgObject, setSvgObject] = useState(); + const [dataURL, setDataURL] = useState(); useEffect(() => { - const svgObject = qr.svgObject(value, "L"); - setSvgObject(svgObject); + const generateQR = async (): Promise => { + const dataUrl = await QRCode.toDataURL(value, { + type: "image/webp", + scale: 10, + margin: 1, + color: { + dark: "#000000", + light: "#ffffff" + } + }); + setDataURL(dataUrl); + }; + generateQR(); }, [bgColor, fgColor, value]); return ( - {svgObject && ( - - - - )} + ); } @@ -182,7 +181,7 @@ const Container = styled.div` width: 100% !important; height: 100% !important; - svg { + img { position: absolute; width: 100%; height: 100%; diff --git a/packages/lib/pcd-collection/CHANGELOG.md b/packages/lib/pcd-collection/CHANGELOG.md index dd060cf8e5..b1d8e3572c 100644 --- a/packages/lib/pcd-collection/CHANGELOG.md +++ b/packages/lib/pcd-collection/CHANGELOG.md @@ -1,5 +1,19 @@ # @pcd/pcd-types +## 0.15.0 + +### Minor Changes + +- GPC v4 enhancements, PODValue types, more GPC configurations + +### Patch Changes + +- Updated dependencies + - @pcd/emitter@0.9.0 + - @pcd/passport-crypto@0.15.0 + - @pcd/pcd-types@0.15.0 + - @pcd/semaphore-identity-pcd@0.15.0 + ## 0.14.0 ### Minor Changes diff --git a/packages/lib/pcd-collection/package.json b/packages/lib/pcd-collection/package.json index 17ceb54513..cf41c41731 100644 --- a/packages/lib/pcd-collection/package.json +++ b/packages/lib/pcd-collection/package.json @@ -1,6 +1,6 @@ { "name": "@pcd/pcd-collection", - "version": "0.14.0", + "version": "0.15.0", "license": "MIT", "main": "./dist/cjs/src/index.js", "module": "./dist/esm/src/index.js", @@ -27,20 +27,20 @@ "clean": "rm -rf dist node_modules *.tsbuildinfo" }, "dependencies": { - "@pcd/emitter": "0.8.0", - "@pcd/passport-crypto": "0.14.0", - "@pcd/pcd-types": "0.14.0", - "@pcd/semaphore-identity-pcd": "0.14.0", + "@pcd/emitter": "0.9.0", + "@pcd/passport-crypto": "0.15.0", + "@pcd/pcd-types": "0.15.0", + "@pcd/semaphore-identity-pcd": "0.15.0", "chai": "^4.3.7", "fast-json-stable-stringify": "^2.1.0", "lodash": "^4.17.21", "uuid": "^9.0.0" }, "devDependencies": { - "@pcd/eslint-config-custom": "0.14.0", - "@pcd/rsa-pcd": "0.9.0", - "@pcd/tsconfig": "0.14.0", - "@pcd/unknown-pcd": "0.3.0", + "@pcd/eslint-config-custom": "0.15.0", + "@pcd/rsa-pcd": "0.10.0", + "@pcd/tsconfig": "0.15.0", + "@pcd/unknown-pcd": "0.4.0", "@types/chai": "^4.3.5", "@types/chai-as-promised": "^7.1.5", "@types/mocha": "^10.0.1", diff --git a/packages/lib/pcd-types/CHANGELOG.md b/packages/lib/pcd-types/CHANGELOG.md index 2de7ce9949..875b0a8ef3 100644 --- a/packages/lib/pcd-types/CHANGELOG.md +++ b/packages/lib/pcd-types/CHANGELOG.md @@ -1,5 +1,11 @@ # @pcd/pcd-types +## 0.15.0 + +### Minor Changes + +- GPC v4 enhancements, PODValue types, more GPC configurations + ## 0.14.0 ### Minor Changes diff --git a/packages/lib/pcd-types/package.json b/packages/lib/pcd-types/package.json index 444a2be730..fefdd16487 100644 --- a/packages/lib/pcd-types/package.json +++ b/packages/lib/pcd-types/package.json @@ -1,6 +1,6 @@ { "name": "@pcd/pcd-types", - "version": "0.14.0", + "version": "0.15.0", "license": "MIT", "main": "./dist/cjs/src/index.js", "module": "./dist/esm/src/index.js", @@ -26,8 +26,8 @@ "clean": "rm -rf dist node_modules *.tsbuildinfo" }, "devDependencies": { - "@pcd/eslint-config-custom": "0.14.0", - "@pcd/tsconfig": "0.14.0", + "@pcd/eslint-config-custom": "0.15.0", + "@pcd/tsconfig": "0.15.0", "@types/react": "^18.0.22", "eslint": "^8.57.0", "fix-esm-import-path": "^1.10.0", diff --git a/packages/lib/pod/CHANGELOG.md b/packages/lib/pod/CHANGELOG.md index f59d42bfd0..81f276912c 100644 --- a/packages/lib/pod/CHANGELOG.md +++ b/packages/lib/pod/CHANGELOG.md @@ -1,5 +1,16 @@ # @pcd/pod +## 0.5.0 + +### Minor Changes + +- GPC v4 enhancements, PODValue types, more GPC configurations + +### Patch Changes + +- Updated dependencies + - @pcd/util@0.9.0 + ## 0.4.0 ### Minor Changes diff --git a/packages/lib/pod/README.md b/packages/lib/pod/README.md index 69a6188f93..922e9f162e 100644 --- a/packages/lib/pod/README.md +++ b/packages/lib/pod/README.md @@ -18,7 +18,7 @@ Downloads
- + Developer Site @@ -34,27 +34,26 @@ A library for creating and manipulating objects in the Provable Object Data format. For a full introduction, see the -[Developer Site](https://zupass.org/pod-developers). +[Developer Site](https://zupass.org/pod). -**POD** is a format enabling any app to flexibly create cryptographic data and -make zero-knowledge proofs about it. A POD could represent your ticket to an -event, a secure message, a collectible badge, or an item in a role-playing game. -Using PODs, developers can create ZK-enabled apps without the effort and risk of -developing their own cryptography. +**POD** libraries enable any app to create zero-knowledge proofs of cryptographic data. A POD could represent your ticket to an event, a secure +message, a collectible badge, or an item in a role-playing game. Using PODs, +developers can create ZK-enabled apps without the effort and risk of developing +custom cryptography. ZK proofs about PODs use General Purpose Circuits (**GPC**) which can prove many -different things about a POD without revealing it all. GPCs use human-readable -configuration and pre-compiled circuits so no knowledge of circuit programming -is required. +different things about PODs without revealing all details. GPCs use +human-readable configuration and pre-compiled circuits so no knowledge of +circuit programming is required. PODs and GPCs can be used in Zupass, or in your own apps without Zupass. ## What is a POD? -For a user, a POD is a piece of cryptographic data attested by some issuing -authority. For a developer, a POD object is a key-value store which can contain +To a user, a POD is a piece of cryptographic data attested by some issuing +authority. For a developer, a POD object is a key-value store which can hold any data. The whole POD is signed by an issuer. Apps can verify the signature, -and trust the authenticity of the values in the POD. +to trust the authenticity of the values in the POD. When a POD is issued, its entries (key-value pairs) are hashed as part of a Merkle tree. This allows GPCs to selectively prove about individual entries @@ -67,7 +66,8 @@ const podSword = POD.sign( attack: { type: "int", value: 7n }, weaponType: { type: "string", value: "sword" }, itemSet: { type: "string", value: "celestial" }, - owner: { type: "cryptographic", value: purchaser.commitment } + isMagical: { type: "boolean", value: true }, + owner: { type: "eddsa_pubkey", value: purchaser.pubKey } } satisfies PODEntries, privateKey ); @@ -94,18 +94,20 @@ For more details on usage, check out the [`@pcd/gpc`](https://github.com/proofcarryingdata/zupass/tree/main/packages/lib/gpc) package. -- To interact with PODs in the Zupass app, see the +- To see how PODs are created and stored in the Zupass app, see the [`@pcd/pod-pcd`](https://github.com/proofcarryingdata/zupass/tree/main/packages/pcd/pod-pcd) package. +## Package Installation + +This package will work either in browser or in a Node.js server. Packaging for +a browser requires polyfill for some Node modules, including `buffer`. + ## Stability and Security -POD and GPC libraries are experimental and subject to change. We encourage devs -to try them out and use them for apps, but maybe don’t rely on them for the most -sensitive use cases yet. +POD and GPC libraries are in beta and subject to change. We encourage devs to try them out and use them for apps, but be aware that updates will come in future. The PODs themselves are persistent data, and we expect to maintain -backward-compatibility when we make changes to the format, but new code may be -required to handle formar versioning. Library interfaces may also change. Any -breaking changes will be reflected in the NPM versions using standard semantic -versioning. +backward-compatibility when we make changes to the format. Library interfaces +may also change. Any breaking changes will be reflected in the NPM versions +using standard semantic versioning. diff --git a/packages/lib/pod/package.json b/packages/lib/pod/package.json index 7e061f293e..83ada2fb62 100644 --- a/packages/lib/pod/package.json +++ b/packages/lib/pod/package.json @@ -1,6 +1,6 @@ { "name": "@pcd/pod", - "version": "0.4.0", + "version": "0.5.0", "license": "MIT", "main": "./dist/cjs/src/index.js", "module": "./dist/esm/src/index.js", @@ -38,7 +38,7 @@ "clean": "rm -rf dist node_modules *.tsbuildinfo" }, "dependencies": { - "@pcd/util": "0.8.0", + "@pcd/util": "0.9.0", "@zk-kit/eddsa-poseidon": "^1.1.0", "@zk-kit/lean-imt": "^2.2.1", "@zk-kit/utils": "^1.2.1", @@ -46,11 +46,11 @@ "poseidon-lite": "^0.3.0" }, "devDependencies": { - "@pcd/eddsa-pcd": "0.9.0", - "@pcd/eslint-config-custom": "0.14.0", - "@pcd/pcd-types": "0.14.0", - "@pcd/semaphore-identity-v3-wrapper": "0.0.1", - "@pcd/tsconfig": "0.14.0", + "@pcd/eddsa-pcd": "0.10.0", + "@pcd/eslint-config-custom": "0.15.0", + "@pcd/pcd-types": "0.15.0", + "@pcd/semaphore-identity-v3-wrapper": "0.1.0", + "@pcd/tsconfig": "0.15.0", "@types/circomlibjs": "^0.1.6", "@types/chai": "^4.3.5", "@types/mocha": "^10.0.1", diff --git a/packages/lib/podbox-shared/CHANGELOG.md b/packages/lib/podbox-shared/CHANGELOG.md index eb135437c8..4d079da41e 100644 --- a/packages/lib/podbox-shared/CHANGELOG.md +++ b/packages/lib/podbox-shared/CHANGELOG.md @@ -1,5 +1,18 @@ # @pcd/podbox-shared +## 0.4.0 + +### Minor Changes + +- GPC v4 enhancements, PODValue types, more GPC configurations + +### Patch Changes + +- Updated dependencies + - @pcd/passport-interface@0.15.0 + - @pcd/pod@0.5.0 + - @pcd/util@0.9.0 + ## 0.3.0 ### Minor Changes diff --git a/packages/lib/podbox-shared/package.json b/packages/lib/podbox-shared/package.json index eb99c7189e..3e25399bf3 100644 --- a/packages/lib/podbox-shared/package.json +++ b/packages/lib/podbox-shared/package.json @@ -1,7 +1,7 @@ { "name": "@pcd/podbox-shared", "private": false, - "version": "0.3.0", + "version": "0.4.0", "license": "GPL-3.0-or-later", "main": "./dist/cjs/src/index.js", "module": "./dist/esm/src/index.js", @@ -28,17 +28,17 @@ "clean": "rm -rf dist node_modules *.tsbuildinfo" }, "dependencies": { - "@pcd/passport-interface": "0.14.0", - "@pcd/pod": "0.4.0", - "@pcd/util": "0.8.0", + "@pcd/passport-interface": "0.15.0", + "@pcd/pod": "0.5.0", + "@pcd/util": "0.9.0", "csv-parse": "^5.5.3", "csv-stringify": "^6.4.5", "uuid": "^9.0.0", "zod": "^3.22.4" }, "devDependencies": { - "@pcd/eslint-config-custom": "0.14.0", - "@pcd/tsconfig": "0.14.0", + "@pcd/eslint-config-custom": "0.15.0", + "@pcd/tsconfig": "0.15.0", "@types/chai": "^4.3.5", "@types/mocha": "^10.0.1", "chai-as-promised": "^7.1.1", diff --git a/packages/lib/podspec/CHANGELOG.md b/packages/lib/podspec/CHANGELOG.md index f1389e1514..cad4afcc7d 100644 --- a/packages/lib/podspec/CHANGELOG.md +++ b/packages/lib/podspec/CHANGELOG.md @@ -1,5 +1,16 @@ # @pcd/podspec +## 0.4.0 + +### Minor Changes + +- GPC v4 enhancements, PODValue types, more GPC configurations + +### Patch Changes + +- Updated dependencies + - @pcd/pod@0.5.0 + ## 0.3.0 ### Minor Changes diff --git a/packages/lib/podspec/package.json b/packages/lib/podspec/package.json index b07249fe3a..555f8d8c3f 100644 --- a/packages/lib/podspec/package.json +++ b/packages/lib/podspec/package.json @@ -1,7 +1,7 @@ { "name": "@pcd/podspec", "private": true, - "version": "0.3.0", + "version": "0.4.0", "license": "GPL-3.0-or-later", "main": "./dist/cjs/src/index.js", "module": "./dist/esm/src/index.js", @@ -27,11 +27,11 @@ "clean": "rm -rf dist node_modules *.tsbuildinfo" }, "dependencies": { - "@pcd/pod": "0.4.0" + "@pcd/pod": "0.5.0" }, "devDependencies": { - "@pcd/eslint-config-custom": "0.14.0", - "@pcd/tsconfig": "0.14.0", + "@pcd/eslint-config-custom": "0.15.0", + "@pcd/tsconfig": "0.15.0", "@types/chai": "^4.3.5", "@types/mocha": "^10.0.1", "@types/uuid": "^9.0.0", diff --git a/packages/lib/semaphore-identity-v3-wrapper/CHANGELOG.md b/packages/lib/semaphore-identity-v3-wrapper/CHANGELOG.md new file mode 100644 index 0000000000..41388847bc --- /dev/null +++ b/packages/lib/semaphore-identity-v3-wrapper/CHANGELOG.md @@ -0,0 +1,7 @@ +# @pcd/semaphore-identity-v3-wrapper + +## 0.1.0 + +### Minor Changes + +- GPC v4 enhancements, PODValue types, more GPC configurations diff --git a/packages/lib/semaphore-identity-v3-wrapper/package.json b/packages/lib/semaphore-identity-v3-wrapper/package.json index 8cc2bab7bf..5c76ee1805 100644 --- a/packages/lib/semaphore-identity-v3-wrapper/package.json +++ b/packages/lib/semaphore-identity-v3-wrapper/package.json @@ -1,7 +1,7 @@ { "name": "@pcd/semaphore-identity-v3-wrapper", "private": false, - "version": "0.0.1", + "version": "0.1.0", "license": "MIT", "main": "./dist/cjs/src/index.js", "module": "./dist/esm/src/index.js", @@ -29,8 +29,8 @@ "@semaphore-protocol/identity": "^3.15.2" }, "devDependencies": { - "@pcd/eslint-config-custom": "0.13.0", - "@pcd/tsconfig": "0.13.0", + "@pcd/eslint-config-custom": "0.15.0", + "@pcd/tsconfig": "0.15.0", "eslint": "^8.57.0", "typescript": "^5.3.3" }, diff --git a/packages/lib/server-shared/CHANGELOG.md b/packages/lib/server-shared/CHANGELOG.md index cdb4f3c707..9938134a90 100644 --- a/packages/lib/server-shared/CHANGELOG.md +++ b/packages/lib/server-shared/CHANGELOG.md @@ -1,5 +1,11 @@ # @pcd/server-shared +## 0.4.0 + +### Minor Changes + +- GPC v4 enhancements, PODValue types, more GPC configurations + ## 0.3.0 ### Minor Changes diff --git a/packages/lib/server-shared/package.json b/packages/lib/server-shared/package.json index 62578c2788..c6438e98e2 100644 --- a/packages/lib/server-shared/package.json +++ b/packages/lib/server-shared/package.json @@ -1,6 +1,6 @@ { "name": "@pcd/server-shared", - "version": "0.3.0", + "version": "0.4.0", "license": "GPL-3.0-or-later", "main": "./dist/cjs/src/index.js", "module": "./dist/esm/src/index.js", @@ -30,9 +30,9 @@ "rollbar": "^2.26.4" }, "devDependencies": { - "@pcd/eslint-config-custom": "0.14.0", - "@pcd/tsconfig": "0.14.0", - "@pcd/util": "0.8.0", + "@pcd/eslint-config-custom": "0.15.0", + "@pcd/tsconfig": "0.15.0", + "@pcd/util": "0.9.0", "@types/chai": "^4.3.5", "@types/mocha": "^10.0.1", "eslint": "^8.57.0", diff --git a/packages/lib/util/CHANGELOG.md b/packages/lib/util/CHANGELOG.md index a11d281f27..ff2b9530e0 100644 --- a/packages/lib/util/CHANGELOG.md +++ b/packages/lib/util/CHANGELOG.md @@ -1,5 +1,11 @@ # @pcd/util +## 0.9.0 + +### Minor Changes + +- GPC v4 enhancements, PODValue types, more GPC configurations + ## 0.8.0 ### Minor Changes diff --git a/packages/lib/util/package.json b/packages/lib/util/package.json index 23d47de5f3..2909a60355 100644 --- a/packages/lib/util/package.json +++ b/packages/lib/util/package.json @@ -1,6 +1,6 @@ { "name": "@pcd/util", - "version": "0.8.0", + "version": "0.9.0", "license": "MIT", "main": "./dist/cjs/src/index.js", "module": "./dist/esm/src/index.js", @@ -34,8 +34,8 @@ "uuid": "^9.0.0" }, "devDependencies": { - "@pcd/eslint-config-custom": "0.14.0", - "@pcd/tsconfig": "0.14.0", + "@pcd/eslint-config-custom": "0.15.0", + "@pcd/tsconfig": "0.15.0", "@types/chai": "^4.3.5", "@types/email-validator": "^1.0.6", "@types/mocha": "^10.0.1", diff --git a/packages/lib/util/src/Errors.ts b/packages/lib/util/src/Errors.ts index 94852047ec..f00baff7c7 100644 --- a/packages/lib/util/src/Errors.ts +++ b/packages/lib/util/src/Errors.ts @@ -10,6 +10,18 @@ export function getErrorMessage(e: unknown | Error): string { return e + ""; } +/** + * If the value is an `Error`, this returns the value. Otherwise, it creates a + * new `Error` with the stringified value as the message. + */ +export function toError(e: unknown | Error): Error { + if (e instanceof Error) { + return e; + } + + return new Error(e + ""); +} + /** * Check if a parameter is defined. If not, it throws an error. * @param parameter Parameter to be checked. diff --git a/packages/lib/zuauth/CHANGELOG.md b/packages/lib/zuauth/CHANGELOG.md index 2aceb21271..b9a9ba95ac 100644 --- a/packages/lib/zuauth/CHANGELOG.md +++ b/packages/lib/zuauth/CHANGELOG.md @@ -1,5 +1,21 @@ # @pcd/zuauth +## 1.8.0 + +### Minor Changes + +- GPC v4 enhancements, PODValue types, more GPC configurations + +### Patch Changes + +- Updated dependencies + - @pcd/passport-interface@0.15.0 + - @pcd/pcd-types@0.15.0 + - @pcd/eddsa-pcd@0.10.0 + - @pcd/eddsa-ticket-pcd@0.10.0 + - @pcd/semaphore-identity-pcd@0.15.0 + - @pcd/zk-eddsa-event-ticket-pcd@0.10.0 + ## 1.7.0 ### Minor Changes diff --git a/packages/lib/zuauth/package.json b/packages/lib/zuauth/package.json index a11055d692..6354ebfa3f 100644 --- a/packages/lib/zuauth/package.json +++ b/packages/lib/zuauth/package.json @@ -1,7 +1,7 @@ { "name": "@pcd/zuauth", "private": false, - "version": "1.7.0", + "version": "1.8.0", "license": "GPL-3.0-or-later", "main": "./dist/cjs/src/index.js", "module": "./dist/esm/src/index.js", @@ -52,16 +52,16 @@ "clean": "rm -rf dist node_modules *.tsbuildinfo" }, "dependencies": { - "@pcd/eddsa-pcd": "^0.9.0", - "@pcd/eddsa-ticket-pcd": "^0.9.0", - "@pcd/passport-interface": "^0.14.0", - "@pcd/pcd-types": "^0.14.0", - "@pcd/semaphore-identity-pcd": "^0.14.0", - "@pcd/zk-eddsa-event-ticket-pcd": "^0.9.0" + "@pcd/eddsa-pcd": "^0.10.0", + "@pcd/eddsa-ticket-pcd": "^0.10.0", + "@pcd/passport-interface": "^0.15.0", + "@pcd/pcd-types": "^0.15.0", + "@pcd/semaphore-identity-pcd": "^0.15.0", + "@pcd/zk-eddsa-event-ticket-pcd": "^0.10.0" }, "devDependencies": { - "@pcd/eslint-config-custom": "0.14.0", - "@pcd/tsconfig": "0.14.0", + "@pcd/eslint-config-custom": "0.15.0", + "@pcd/tsconfig": "0.15.0", "@semaphore-protocol/identity": "^3.15.2", "@types/chai": "^4.3.5", "@types/chai-as-promised": "^7.1.5", diff --git a/packages/lib/zupoll-shared/CHANGELOG.md b/packages/lib/zupoll-shared/CHANGELOG.md index 3169ff812b..bd1de998fe 100644 --- a/packages/lib/zupoll-shared/CHANGELOG.md +++ b/packages/lib/zupoll-shared/CHANGELOG.md @@ -1,5 +1,11 @@ # @pcd/zupoll-shared +## 0.4.0 + +### Minor Changes + +- GPC v4 enhancements, PODValue types, more GPC configurations + ## 0.3.0 ### Minor Changes diff --git a/packages/lib/zupoll-shared/package.json b/packages/lib/zupoll-shared/package.json index 2f36a0b653..bf847c8dc3 100644 --- a/packages/lib/zupoll-shared/package.json +++ b/packages/lib/zupoll-shared/package.json @@ -1,7 +1,7 @@ { "name": "@pcd/zupoll-shared", "private": true, - "version": "0.3.0", + "version": "0.4.0", "license": "GPL-3.0-or-later", "main": "./dist/cjs/src/index.js", "module": "./dist/esm/src/index.js", @@ -32,8 +32,8 @@ "url-join": "^4.0.1" }, "devDependencies": { - "@pcd/eslint-config-custom": "0.14.0", - "@pcd/tsconfig": "0.14.0", + "@pcd/eslint-config-custom": "0.15.0", + "@pcd/tsconfig": "0.15.0", "@types/chai": "^4.3.5", "@types/mocha": "^10.0.1", "@types/url-join": "^4.0.3", diff --git a/packages/patched/circom_runtime/CHANGELOG.md b/packages/patched/circom_runtime/CHANGELOG.md index 1c84179a59..961ae5fca6 100644 --- a/packages/patched/circom_runtime/CHANGELOG.md +++ b/packages/patched/circom_runtime/CHANGELOG.md @@ -1,5 +1,11 @@ # @pcd/circom_runtime +## 0.5.0 + +### Minor Changes + +- GPC v4 enhancements, PODValue types, more GPC configurations + ## 0.4.0 ### Minor Changes diff --git a/packages/patched/circom_runtime/package.json b/packages/patched/circom_runtime/package.json index 65fe8fd7c0..cb94bb1946 100644 --- a/packages/patched/circom_runtime/package.json +++ b/packages/patched/circom_runtime/package.json @@ -1,6 +1,6 @@ { "name": "@pcd/circom_runtime", - "version": "0.4.0", + "version": "0.5.0", "description": "Circom runtime", "type": "module", "exports": { diff --git a/packages/patched/snarkjs/CHANGELOG.md b/packages/patched/snarkjs/CHANGELOG.md index 0abefab47e..9cad955652 100644 --- a/packages/patched/snarkjs/CHANGELOG.md +++ b/packages/patched/snarkjs/CHANGELOG.md @@ -1,5 +1,16 @@ # @pcd/snarkjs +## 0.11.0 + +### Minor Changes + +- GPC v4 enhancements, PODValue types, more GPC configurations + +### Patch Changes + +- Updated dependencies + - @pcd/circom_runtime@0.5.0 + ## 0.10.0 ### Minor Changes diff --git a/packages/patched/snarkjs/package.json b/packages/patched/snarkjs/package.json index 722ca447f1..f78714d19c 100644 --- a/packages/patched/snarkjs/package.json +++ b/packages/patched/snarkjs/package.json @@ -1,7 +1,7 @@ { "name": "@pcd/snarkjs", "type": "module", - "version": "0.10.0", + "version": "0.11.0", "description": "zkSNARKs implementation in JavaScript", "main": "./build/main.cjs", "module": "./main.js", @@ -59,7 +59,7 @@ "@iden3/binfileutils": "0.0.12", "bfj": "^7.0.2", "blake2b-wasm": "^2.4.0", - "@pcd/circom_runtime": "0.4.0", + "@pcd/circom_runtime": "0.5.0", "ejs": "^3.1.6", "fastfile": "0.0.20", "ffjavascript": "0.3.0", diff --git a/packages/pcd/eddsa-frog-pcd/CHANGELOG.md b/packages/pcd/eddsa-frog-pcd/CHANGELOG.md index 947d8418b7..801cd0175f 100644 --- a/packages/pcd/eddsa-frog-pcd/CHANGELOG.md +++ b/packages/pcd/eddsa-frog-pcd/CHANGELOG.md @@ -1,5 +1,18 @@ # @pcd/eddsa-frog-pcd +## 0.7.0 + +### Minor Changes + +- GPC v4 enhancements, PODValue types, more GPC configurations + +### Patch Changes + +- Updated dependencies + - @pcd/pcd-types@0.15.0 + - @pcd/util@0.9.0 + - @pcd/eddsa-pcd@0.10.0 + ## 0.6.0 ### Minor Changes diff --git a/packages/pcd/eddsa-frog-pcd/package.json b/packages/pcd/eddsa-frog-pcd/package.json index 989e7e3ca9..7b277a4aeb 100644 --- a/packages/pcd/eddsa-frog-pcd/package.json +++ b/packages/pcd/eddsa-frog-pcd/package.json @@ -1,6 +1,6 @@ { "name": "@pcd/eddsa-frog-pcd", - "version": "0.6.0", + "version": "0.7.0", "license": "GPL-3.0-or-later", "main": "./dist/cjs/src/index.js", "module": "./dist/esm/src/index.js", @@ -32,17 +32,17 @@ "clean": "rm -rf dist node_modules *.tsbuildinfo" }, "dependencies": { - "@pcd/eddsa-pcd": "0.9.0", - "@pcd/pcd-types": "0.14.0", - "@pcd/util": "0.8.0", + "@pcd/eddsa-pcd": "0.10.0", + "@pcd/pcd-types": "0.15.0", + "@pcd/util": "0.9.0", "chai": "^4.3.7", "json-bigint": "^1.0.0", "lodash": "^4.17.21", "uuid": "^9.0.0" }, "devDependencies": { - "@pcd/eslint-config-custom": "0.14.0", - "@pcd/tsconfig": "0.14.0", + "@pcd/eslint-config-custom": "0.15.0", + "@pcd/tsconfig": "0.15.0", "@types/json-bigint": "^1.0.1", "@types/lodash": "^4.14.191", "@types/mocha": "^10.0.1", diff --git a/packages/pcd/eddsa-pcd/CHANGELOG.md b/packages/pcd/eddsa-pcd/CHANGELOG.md index bb787daa07..f4a0abbfb3 100644 --- a/packages/pcd/eddsa-pcd/CHANGELOG.md +++ b/packages/pcd/eddsa-pcd/CHANGELOG.md @@ -1,5 +1,17 @@ # @pcd/eddsa-pcd +## 0.10.0 + +### Minor Changes + +- GPC v4 enhancements, PODValue types, more GPC configurations + +### Patch Changes + +- Updated dependencies + - @pcd/pcd-types@0.15.0 + - @pcd/util@0.9.0 + ## 0.9.0 ### Minor Changes diff --git a/packages/pcd/eddsa-pcd/package.json b/packages/pcd/eddsa-pcd/package.json index 227184b5c6..4a4f0e46d3 100644 --- a/packages/pcd/eddsa-pcd/package.json +++ b/packages/pcd/eddsa-pcd/package.json @@ -1,6 +1,6 @@ { "name": "@pcd/eddsa-pcd", - "version": "0.9.0", + "version": "0.10.0", "license": "GPL-3.0-or-later", "main": "./dist/cjs/src/index.js", "module": "./dist/esm/src/index.js", @@ -32,15 +32,15 @@ "clean": "rm -rf dist node_modules *.tsbuildinfo" }, "dependencies": { - "@pcd/pcd-types": "0.14.0", - "@pcd/util": "0.8.0", + "@pcd/pcd-types": "0.15.0", + "@pcd/util": "0.9.0", "@zk-kit/eddsa-poseidon": "^1.1.0", "poseidon-lite": "^0.3.0", "uuid": "^9.0.0" }, "devDependencies": { - "@pcd/eslint-config-custom": "0.14.0", - "@pcd/tsconfig": "0.14.0", + "@pcd/eslint-config-custom": "0.15.0", + "@pcd/tsconfig": "0.15.0", "@types/mocha": "^10.0.1", "@types/uuid": "^9.0.0", "chai": "^4.3.7", diff --git a/packages/pcd/eddsa-ticket-pcd/CHANGELOG.md b/packages/pcd/eddsa-ticket-pcd/CHANGELOG.md index 00776bed73..33f1ad40fe 100644 --- a/packages/pcd/eddsa-ticket-pcd/CHANGELOG.md +++ b/packages/pcd/eddsa-ticket-pcd/CHANGELOG.md @@ -1,5 +1,18 @@ # @pcd/eddsa-ticket-pcd +## 0.10.0 + +### Minor Changes + +- GPC v4 enhancements, PODValue types, more GPC configurations + +### Patch Changes + +- Updated dependencies + - @pcd/pcd-types@0.15.0 + - @pcd/util@0.9.0 + - @pcd/eddsa-pcd@0.10.0 + ## 0.9.0 ### Minor Changes diff --git a/packages/pcd/eddsa-ticket-pcd/package.json b/packages/pcd/eddsa-ticket-pcd/package.json index fd122a5ab8..63700b12e3 100644 --- a/packages/pcd/eddsa-ticket-pcd/package.json +++ b/packages/pcd/eddsa-ticket-pcd/package.json @@ -1,6 +1,6 @@ { "name": "@pcd/eddsa-ticket-pcd", - "version": "0.9.0", + "version": "0.10.0", "license": "GPL-3.0-or-later", "main": "./dist/cjs/src/index.js", "module": "./dist/esm/src/index.js", @@ -32,9 +32,9 @@ "clean": "rm -rf dist node_modules *.tsbuildinfo" }, "dependencies": { - "@pcd/eddsa-pcd": "0.9.0", - "@pcd/pcd-types": "0.14.0", - "@pcd/util": "0.8.0", + "@pcd/eddsa-pcd": "0.10.0", + "@pcd/pcd-types": "0.15.0", + "@pcd/util": "0.9.0", "chai": "^4.3.7", "json-bigint": "^1.0.0", "lodash": "^4.17.21", @@ -42,8 +42,8 @@ "uuid": "^9.0.0" }, "devDependencies": { - "@pcd/eslint-config-custom": "0.14.0", - "@pcd/tsconfig": "0.14.0", + "@pcd/eslint-config-custom": "0.15.0", + "@pcd/tsconfig": "0.15.0", "@types/json-bigint": "^1.0.1", "@types/lodash": "^4.14.191", "@types/mocha": "^10.0.1", diff --git a/packages/pcd/eddsa-ticket-pcd/src/EdDSATicketPCD.ts b/packages/pcd/eddsa-ticket-pcd/src/EdDSATicketPCD.ts index 13462464d2..bff0999fcd 100644 --- a/packages/pcd/eddsa-ticket-pcd/src/EdDSATicketPCD.ts +++ b/packages/pcd/eddsa-ticket-pcd/src/EdDSATicketPCD.ts @@ -64,6 +64,7 @@ export interface ITicketData { eventLocation?: string; eventStartDate?: string; isAddOn?: boolean; + parentTicketId?: string; } /** diff --git a/packages/pcd/email-pcd/CHANGELOG.md b/packages/pcd/email-pcd/CHANGELOG.md index 83c81e0935..27fc15b1e3 100644 --- a/packages/pcd/email-pcd/CHANGELOG.md +++ b/packages/pcd/email-pcd/CHANGELOG.md @@ -1,5 +1,18 @@ # @pcd/email-pcd +## 0.10.0 + +### Minor Changes + +- GPC v4 enhancements, PODValue types, more GPC configurations + +### Patch Changes + +- Updated dependencies + - @pcd/pcd-types@0.15.0 + - @pcd/util@0.9.0 + - @pcd/eddsa-pcd@0.10.0 + ## 0.9.0 ### Minor Changes diff --git a/packages/pcd/email-pcd/package.json b/packages/pcd/email-pcd/package.json index ef62b55417..a79106e6f1 100644 --- a/packages/pcd/email-pcd/package.json +++ b/packages/pcd/email-pcd/package.json @@ -1,6 +1,6 @@ { "name": "@pcd/email-pcd", - "version": "0.9.0", + "version": "0.10.0", "license": "GPL-3.0-or-later", "main": "./dist/cjs/src/index.js", "module": "./dist/esm/src/index.js", @@ -32,17 +32,17 @@ "clean": "rm -rf dist node_modules *.tsbuildinfo" }, "dependencies": { - "@pcd/eddsa-pcd": "0.9.0", - "@pcd/pcd-types": "0.14.0", - "@pcd/util": "0.8.0", + "@pcd/eddsa-pcd": "0.10.0", + "@pcd/pcd-types": "0.15.0", + "@pcd/util": "0.9.0", "chai": "^4.3.7", "json-bigint": "^1.0.0", "lodash": "^4.17.21", "uuid": "^9.0.0" }, "devDependencies": { - "@pcd/eslint-config-custom": "0.14.0", - "@pcd/tsconfig": "0.14.0", + "@pcd/eslint-config-custom": "0.15.0", + "@pcd/tsconfig": "0.15.0", "@types/json-bigint": "^1.0.1", "@types/lodash": "^4.14.191", "@types/mocha": "^10.0.1", diff --git a/packages/pcd/ethereum-group-pcd/CHANGELOG.md b/packages/pcd/ethereum-group-pcd/CHANGELOG.md index dc7d73809f..f583aaf65f 100644 --- a/packages/pcd/ethereum-group-pcd/CHANGELOG.md +++ b/packages/pcd/ethereum-group-pcd/CHANGELOG.md @@ -1,5 +1,19 @@ # @pcd/ethereum-group-pcd +## 0.9.0 + +### Minor Changes + +- GPC v4 enhancements, PODValue types, more GPC configurations + +### Patch Changes + +- Updated dependencies + - @pcd/pcd-types@0.15.0 + - @pcd/util@0.9.0 + - @pcd/semaphore-identity-pcd@0.15.0 + - @pcd/semaphore-signature-pcd@0.15.0 + ## 0.8.0 ### Minor Changes diff --git a/packages/pcd/ethereum-group-pcd/package.json b/packages/pcd/ethereum-group-pcd/package.json index 0e5fa31d6c..e1f6ec1651 100644 --- a/packages/pcd/ethereum-group-pcd/package.json +++ b/packages/pcd/ethereum-group-pcd/package.json @@ -1,6 +1,6 @@ { "name": "@pcd/ethereum-group-pcd", - "version": "0.8.0", + "version": "0.9.0", "license": "GPL-3.0-or-later", "main": "./dist/cjs/src/index.js", "module": "./dist/esm/src/index.js", @@ -33,10 +33,10 @@ "clean": "rm -rf dist node_modules *.tsbuildinfo" }, "dependencies": { - "@pcd/pcd-types": "0.14.0", - "@pcd/semaphore-identity-pcd": "0.14.0", - "@pcd/semaphore-signature-pcd": "0.14.0", - "@pcd/util": "0.8.0", + "@pcd/pcd-types": "0.15.0", + "@pcd/semaphore-identity-pcd": "0.15.0", + "@pcd/semaphore-signature-pcd": "0.15.0", + "@pcd/util": "0.9.0", "@personaelabs/spartan-ecdsa": "^2.1.4", "@semaphore-protocol/identity": "^3.15.2", "ethers": "^5.7.2", @@ -44,8 +44,8 @@ "uuid": "^9.0.0" }, "devDependencies": { - "@pcd/eslint-config-custom": "0.14.0", - "@pcd/tsconfig": "0.14.0", + "@pcd/eslint-config-custom": "0.15.0", + "@pcd/tsconfig": "0.15.0", "@types/json-bigint": "^1.0.1", "@types/mocha": "^10.0.1", "eslint": "^8.57.0", diff --git a/packages/pcd/ethereum-ownership-pcd/CHANGELOG.md b/packages/pcd/ethereum-ownership-pcd/CHANGELOG.md index 8fcf24869e..a80a17379b 100644 --- a/packages/pcd/ethereum-ownership-pcd/CHANGELOG.md +++ b/packages/pcd/ethereum-ownership-pcd/CHANGELOG.md @@ -1,5 +1,19 @@ # @pcd/semaphore-signature-pcd +## 0.15.0 + +### Minor Changes + +- GPC v4 enhancements, PODValue types, more GPC configurations + +### Patch Changes + +- Updated dependencies + - @pcd/pcd-types@0.15.0 + - @pcd/util@0.9.0 + - @pcd/semaphore-identity-pcd@0.15.0 + - @pcd/semaphore-signature-pcd@0.15.0 + ## 0.14.0 ### Minor Changes diff --git a/packages/pcd/ethereum-ownership-pcd/package.json b/packages/pcd/ethereum-ownership-pcd/package.json index deb251e49e..21faf67ae0 100644 --- a/packages/pcd/ethereum-ownership-pcd/package.json +++ b/packages/pcd/ethereum-ownership-pcd/package.json @@ -1,6 +1,6 @@ { "name": "@pcd/ethereum-ownership-pcd", - "version": "0.14.0", + "version": "0.15.0", "license": "GPL-3.0-or-later", "main": "./dist/cjs/src/index.js", "module": "./dist/esm/src/index.js", @@ -33,18 +33,18 @@ "clean": "rm -rf dist node_modules *.tsbuildinfo" }, "dependencies": { - "@pcd/pcd-types": "0.14.0", - "@pcd/semaphore-identity-pcd": "0.14.0", - "@pcd/semaphore-signature-pcd": "0.14.0", - "@pcd/util": "0.8.0", + "@pcd/pcd-types": "0.15.0", + "@pcd/semaphore-identity-pcd": "0.15.0", + "@pcd/semaphore-signature-pcd": "0.15.0", + "@pcd/util": "0.9.0", "@semaphore-protocol/identity": "^3.15.2", "ethers": "^5.7.2", "json-bigint": "^1.0.0", "uuid": "^9.0.0" }, "devDependencies": { - "@pcd/eslint-config-custom": "0.14.0", - "@pcd/tsconfig": "0.14.0", + "@pcd/eslint-config-custom": "0.15.0", + "@pcd/tsconfig": "0.15.0", "@types/json-bigint": "^1.0.1", "@types/mocha": "^10.0.1", "eslint": "^8.57.0", diff --git a/packages/pcd/gpc-pcd/CHANGELOG.md b/packages/pcd/gpc-pcd/CHANGELOG.md index 668a47fd03..a1a75636d1 100644 --- a/packages/pcd/gpc-pcd/CHANGELOG.md +++ b/packages/pcd/gpc-pcd/CHANGELOG.md @@ -1,5 +1,20 @@ # @pcd/gpc-pcd +## 0.4.0 + +### Minor Changes + +- GPC v4 enhancements, PODValue types, more GPC configurations + +### Patch Changes + +- Updated dependencies + - @pcd/gpc@0.4.0 + - @pcd/pcd-types@0.15.0 + - @pcd/util@0.9.0 + - @pcd/pod-pcd@0.5.0 + - @pcd/semaphore-identity-pcd@0.15.0 + ## 0.3.0 ### Minor Changes diff --git a/packages/pcd/gpc-pcd/README.md b/packages/pcd/gpc-pcd/README.md index 64514d0968..02f747b379 100644 --- a/packages/pcd/gpc-pcd/README.md +++ b/packages/pcd/gpc-pcd/README.md @@ -18,7 +18,7 @@ Downloads
- + Developer Site @@ -34,25 +34,24 @@ A PCD representating a ZK proof about one or more POD (Provable Object Data) objects using a GPC (General Purpose Circuit). For a full introduction, see the -[Developer Site](https://zupass.org/pod-developers). +[Developer Site](https://zupass.org/pod). -**POD** is a format enabling any app to flexibly create cryptographic data and -make zero-knowledge proofs about it. A POD could represent your ticket to an -event, a secure message, a collectible badge, or an item in a role-playing game. -Using PODs, developers can create ZK-enabled apps without the effort and risk of -developing their own cryptography. +**POD** libraries enable any app to create zero-knowledge proofs of cryptographic data. A POD could represent your ticket to an event, a secure +message, a collectible badge, or an item in a role-playing game. Using PODs, +developers can create ZK-enabled apps without the effort and risk of developing +custom cryptography. ZK proofs about PODs use General Purpose Circuits (**GPC**) which can prove many -different things about a POD without revealing it all. GPCs use human-readable -configuration and pre-compiled circuits so no knowledge of circuit programming -is required. +different things about PODs without revealing all details. GPCs use +human-readable configuration and pre-compiled circuits so no knowledge of +circuit programming is required. See the [`GPCPCD`](https://docs.pcd.team/classes/_pcd_pod_pcd.PODPCD.html) class for more details on the data of a GPC PCD. ## Related Packages -- For information about making POD objects in Zupass, see the +- For information about POD objects in Zupass, see the [`@pcd/pod-pcd`](https://github.com/proofcarryingdata/zupass/tree/main/packages/pcd/pod-pcd) package. @@ -63,20 +62,21 @@ class for more details on the data of a GPC PCD. - To find the binaries required to prove and verify, see the [`@pcd/proto-pod-gpc-artifacts`](https://github.com/proofcarryingdata/snark-artifacts/tree/pre-release/packages/proto-pod-gpc) package. Since these artifacts are large and numerous, you generally - won't want to depend on this package directly. + won't want to include this package directly into your app bundle. + +## Package Installation + +This package will work either in browser or in a Node.js server. Packaging for +a browser requires polyfill for some Node modules, including `buffer` and `constants`. + +There is a known issue with a dependency `fastfile` which can be resolved by polyfilling `constants` as you can see in [this example](https://github.com/proofcarryingdata/zukyc/pull/3). ## Stability and Security -POD and GPC libraries are experimental and subject to change. We encourage devs -to try them out and use them for apps, but maybe don’t rely on them for the most -sensitive use cases yet. +POD and GPC libraries are in beta and subject to change. We encourage devs to try them out and use them for apps, but be aware that updates will come in future. GPC proofs are considered ephemeral (for now), primarily intended for -transactional use cases. Saved proofs may not be verifiable with future -versions of code. Library interfaces may also change. Any breaking changes will -be reflected in the NPM versions using standard semantic versioning. - -These libraries should not be considered secure enough for highly-sensitive use -cases yet. The circuits are experimental and have not been audited. The -proving/verification keys were generated in good faith by a single author, but -are not the result of a distributed trusted setup ceremony. +transactional use cases. Saved proofs may not be verifiable with future versions +of code. + +These libraries should not be considered secure enough for highly-sensitive use cases yet. The cryptography, circuits, and configuration compiler have not been audited. The proving/verification keys were generated in good faith by a single author, but are not the result of a distributed trusted setup ceremony. diff --git a/packages/pcd/gpc-pcd/package.json b/packages/pcd/gpc-pcd/package.json index 413df9655d..3bfcb1b6df 100644 --- a/packages/pcd/gpc-pcd/package.json +++ b/packages/pcd/gpc-pcd/package.json @@ -1,6 +1,6 @@ { "name": "@pcd/gpc-pcd", - "version": "0.3.0", + "version": "0.4.0", "license": "GPL-3.0-or-later", "main": "./dist/cjs/src/index.js", "module": "./dist/esm/src/index.js", @@ -28,11 +28,11 @@ "clean": "rm -rf dist node_modules *.tsbuildinfo" }, "dependencies": { - "@pcd/gpc": "0.3.0", - "@pcd/pcd-types": "0.14.0", - "@pcd/pod-pcd": "0.4.0", - "@pcd/semaphore-identity-pcd": "0.14.0", - "@pcd/util": "0.8.0", + "@pcd/gpc": "0.4.0", + "@pcd/pcd-types": "0.15.0", + "@pcd/pod-pcd": "0.5.0", + "@pcd/semaphore-identity-pcd": "0.15.0", + "@pcd/util": "0.9.0", "@types/lodash": "^4.17.5", "json-bigint": "^1.0.0", "lodash": "^4.17.21", @@ -40,11 +40,11 @@ "uuid": "^9.0.0" }, "devDependencies": { - "@pcd/eslint-config-custom": "0.14.0", - "@pcd/pod": "0.4.0", + "@pcd/eslint-config-custom": "0.15.0", + "@pcd/pod": "0.5.0", "@pcd/proto-pod-gpc-artifacts": "0.13.0", - "@pcd/semaphore-identity-v3-wrapper": "0.0.1", - "@pcd/tsconfig": "0.14.0", + "@pcd/semaphore-identity-v3-wrapper": "0.1.0", + "@pcd/tsconfig": "0.15.0", "@types/chai": "^4.3.5", "@types/mocha": "^10.0.1", "@types/snarkjs": "^0.7.5", diff --git a/packages/pcd/halo-nonce-pcd/CHANGELOG.md b/packages/pcd/halo-nonce-pcd/CHANGELOG.md index 8c599a382a..a6ac87729a 100644 --- a/packages/pcd/halo-nonce-pcd/CHANGELOG.md +++ b/packages/pcd/halo-nonce-pcd/CHANGELOG.md @@ -1,5 +1,17 @@ # @pcd/halo-nonce-pcd +## 0.11.0 + +### Minor Changes + +- GPC v4 enhancements, PODValue types, more GPC configurations + +### Patch Changes + +- Updated dependencies + - @pcd/pcd-types@0.15.0 + - @pcd/util@0.9.0 + ## 0.10.0 ### Minor Changes diff --git a/packages/pcd/halo-nonce-pcd/package.json b/packages/pcd/halo-nonce-pcd/package.json index b0526ac4ef..3dc38c062e 100644 --- a/packages/pcd/halo-nonce-pcd/package.json +++ b/packages/pcd/halo-nonce-pcd/package.json @@ -1,6 +1,6 @@ { "name": "@pcd/halo-nonce-pcd", - "version": "0.10.0", + "version": "0.11.0", "license": "GPL-3.0-or-later", "main": "./dist/cjs/src/index.js", "module": "./dist/esm/src/index.js", @@ -32,15 +32,15 @@ "clean": "rm -rf dist node_modules *.tsbuildinfo" }, "dependencies": { - "@pcd/pcd-types": "0.14.0", - "@pcd/util": "0.8.0", + "@pcd/pcd-types": "0.15.0", + "@pcd/util": "0.9.0", "elliptic": "^6.5.4", "js-sha256": "^0.10.1", "uuid": "^9.0.0" }, "devDependencies": { - "@pcd/eslint-config-custom": "0.14.0", - "@pcd/tsconfig": "0.14.0", + "@pcd/eslint-config-custom": "0.15.0", + "@pcd/tsconfig": "0.15.0", "@types/elliptic": "^6.4.14", "@types/mocha": "^10.0.1", "@types/uuid": "^9.0.0", diff --git a/packages/pcd/input-test-pcd/CHANGELOG.md b/packages/pcd/input-test-pcd/CHANGELOG.md index 2577692b31..5f31f902f5 100644 --- a/packages/pcd/input-test-pcd/CHANGELOG.md +++ b/packages/pcd/input-test-pcd/CHANGELOG.md @@ -1,5 +1,16 @@ # @pcd/input-test-pcd +## 0.15.0 + +### Minor Changes + +- GPC v4 enhancements, PODValue types, more GPC configurations + +### Patch Changes + +- Updated dependencies + - @pcd/pcd-types@0.15.0 + ## 0.14.0 ### Minor Changes diff --git a/packages/pcd/input-test-pcd/package.json b/packages/pcd/input-test-pcd/package.json index 86e1832c4e..946e424944 100644 --- a/packages/pcd/input-test-pcd/package.json +++ b/packages/pcd/input-test-pcd/package.json @@ -1,6 +1,6 @@ { "name": "@pcd/input-test-pcd", - "version": "0.14.0", + "version": "0.15.0", "license": "GPL-3.0-or-later", "main": "./dist/cjs/src/index.js", "module": "./dist/esm/src/index.js", @@ -32,13 +32,13 @@ "clean": "rm -rf dist node_modules *.tsbuildinfo" }, "dependencies": { - "@pcd/pcd-types": "0.14.0", + "@pcd/pcd-types": "0.15.0", "json-bigint": "^1.0.0", "uuid": "^9.0.0" }, "devDependencies": { - "@pcd/eslint-config-custom": "0.14.0", - "@pcd/tsconfig": "0.14.0", + "@pcd/eslint-config-custom": "0.15.0", + "@pcd/tsconfig": "0.15.0", "@types/json-bigint": "^1.0.1", "@types/mocha": "^10.0.1", "@types/uuid": "^9.0.0", diff --git a/packages/pcd/message-pcd/CHANGELOG.md b/packages/pcd/message-pcd/CHANGELOG.md index 789a46ad47..b0c4230fe4 100644 --- a/packages/pcd/message-pcd/CHANGELOG.md +++ b/packages/pcd/message-pcd/CHANGELOG.md @@ -1,5 +1,18 @@ # @pcd/message-pcd +## 0.5.0 + +### Minor Changes + +- GPC v4 enhancements, PODValue types, more GPC configurations + +### Patch Changes + +- Updated dependencies + - @pcd/pcd-types@0.15.0 + - @pcd/eddsa-pcd@0.10.0 + - @pcd/semaphore-signature-pcd@0.15.0 + ## 0.4.0 ### Minor Changes diff --git a/packages/pcd/message-pcd/package.json b/packages/pcd/message-pcd/package.json index 1c1fb21a72..d88befdcd0 100644 --- a/packages/pcd/message-pcd/package.json +++ b/packages/pcd/message-pcd/package.json @@ -1,6 +1,6 @@ { "name": "@pcd/message-pcd", - "version": "0.4.0", + "version": "0.5.0", "license": "GPL-3.0-or-later", "main": "./dist/cjs/src/index.js", "module": "./dist/esm/src/index.js", @@ -32,9 +32,9 @@ "clean": "rm -rf dist node_modules *.tsbuildinfo" }, "dependencies": { - "@pcd/eddsa-pcd": "0.9.0", - "@pcd/pcd-types": "0.14.0", - "@pcd/semaphore-signature-pcd": "0.14.0", + "@pcd/eddsa-pcd": "0.10.0", + "@pcd/pcd-types": "0.15.0", + "@pcd/semaphore-signature-pcd": "0.15.0", "@trufflesuite/bigint-buffer": "^1.1.10", "chai": "^4.3.7", "json-bigint": "^1.0.0", @@ -43,8 +43,8 @@ }, "devDependencies": { "@types/chai-as-promised": "^7.1.5", - "@pcd/eslint-config-custom": "0.14.0", - "@pcd/tsconfig": "0.14.0", + "@pcd/eslint-config-custom": "0.15.0", + "@pcd/tsconfig": "0.15.0", "@types/json-bigint": "^1.0.1", "@types/mocha": "^10.0.1", "@types/uuid": "^9.0.0", diff --git a/packages/pcd/obj-pcd/CHANGELOG.md b/packages/pcd/obj-pcd/CHANGELOG.md index b6680658b8..ccf48efae8 100644 --- a/packages/pcd/obj-pcd/CHANGELOG.md +++ b/packages/pcd/obj-pcd/CHANGELOG.md @@ -1,5 +1,17 @@ # @pcd/obj-pcd +## 0.4.0 + +### Minor Changes + +- GPC v4 enhancements, PODValue types, more GPC configurations + +### Patch Changes + +- Updated dependencies + - @pcd/pcd-types@0.15.0 + - @pcd/util@0.9.0 + ## 0.3.0 ### Minor Changes diff --git a/packages/pcd/obj-pcd/package.json b/packages/pcd/obj-pcd/package.json index 635f6d4fc0..b7cd3ab238 100644 --- a/packages/pcd/obj-pcd/package.json +++ b/packages/pcd/obj-pcd/package.json @@ -1,6 +1,6 @@ { "name": "@pcd/obj-pcd", - "version": "0.3.0", + "version": "0.4.0", "license": "GPL-3.0-or-later", "main": "./dist/cjs/src/index.js", "module": "./dist/esm/src/index.js", @@ -27,13 +27,13 @@ "clean": "rm -rf dist node_modules *.tsbuildinfo" }, "dependencies": { - "@pcd/pcd-types": "^0.14.0", - "@pcd/util": "^0.8.0", + "@pcd/pcd-types": "^0.15.0", + "@pcd/util": "^0.9.0", "uuid": "^9.0.1" }, "devDependencies": { - "@pcd/eslint-config-custom": "0.14.0", - "@pcd/tsconfig": "0.14.0", + "@pcd/eslint-config-custom": "0.15.0", + "@pcd/tsconfig": "0.15.0", "@types/chai": "^4.3.5", "@types/mocha": "^10.0.1", "@types/uuid": "^9.0.8", diff --git a/packages/pcd/pod-pcd/CHANGELOG.md b/packages/pcd/pod-pcd/CHANGELOG.md index 54efdefaf6..d21a6f1664 100644 --- a/packages/pcd/pod-pcd/CHANGELOG.md +++ b/packages/pcd/pod-pcd/CHANGELOG.md @@ -1,5 +1,18 @@ # @pcd/pod-pcd +## 0.5.0 + +### Minor Changes + +- GPC v4 enhancements, PODValue types, more GPC configurations + +### Patch Changes + +- Updated dependencies + - @pcd/pcd-types@0.15.0 + - @pcd/pod@0.5.0 + - @pcd/util@0.9.0 + ## 0.4.0 ### Minor Changes diff --git a/packages/pcd/pod-pcd/README.md b/packages/pcd/pod-pcd/README.md index 7bce14f4a7..2e5963f924 100644 --- a/packages/pcd/pod-pcd/README.md +++ b/packages/pcd/pod-pcd/README.md @@ -18,7 +18,7 @@ Downloads
- + Developer Site @@ -35,18 +35,17 @@ A PCD representating an object in the **POD** (Provable Object Data) format, allowing it to be manipulated by generic apps like Zupass. For a full introduction, see the -[Developer Site](https://zupass.org/pod-developers). +[Developer Site](https://zupass.org/pod). -**POD** is a format enabling any app to flexibly create cryptographic data and -make zero-knowledge proofs about it. A POD could represent your ticket to an -event, a secure message, a collectible badge, or an item in a role-playing game. -Using PODs, developers can create ZK-enabled apps without the effort and risk of -developing their own cryptography. +**POD** libraries enable any app to create zero-knowledge proofs of cryptographic data. A POD could represent your ticket to an event, a secure +message, a collectible badge, or an item in a role-playing game. Using PODs, +developers can create ZK-enabled apps without the effort and risk of developing +custom cryptography. ZK proofs about PODs use General Purpose Circuits (**GPC**) which can prove many -different things about a POD without revealing it all. GPCs use human-readable -configuration and pre-compiled circuits so no knowledge of circuit programming -is required. +different things about PODs without revealing all details. GPCs use +human-readable configuration and pre-compiled circuits so no knowledge of +circuit programming is required. See the [`PODPCD`](https://docs.pcd.team/classes/_pcd_pod_pcd.PODPCD.html) class for more details on the data of a POD PCD. @@ -61,14 +60,16 @@ class for more details on the data of a POD PCD. [`@pcd/gpc-pcd`](https://github.com/proofcarryingdata/zupass/tree/main/packages/pcd/gpc-pcd) package. +## Package Installation + +This package will work either in browser or in a Node.js server. Packaging for +a browser requires polyfill for some Node modules, including `buffer`. + ## Stability and Security -POD and GPC libraries are experimental and subject to change. We encourage devs -to try them out and use them for apps, but maybe don’t rely on them for the most -sensitive use cases yet. +POD and GPC libraries are in beta and subject to change. We encourage devs to try them out and use them for apps, but be aware that updates will come in future. The PODs themselves are persistent data, and we expect to maintain -backward-compatibility when we make changes to the format, but new code may be -required to handle formar versioning. Library interfaces may also change. Any -breaking changes will be reflected in the NPM versions using standard semantic -versioning. +backward-compatibility when we make changes to the format. Library interfaces +may also change. Any breaking changes will be reflected in the NPM versions +using standard semantic versioning. diff --git a/packages/pcd/pod-pcd/package.json b/packages/pcd/pod-pcd/package.json index b6b80c5639..ac06bcc3a0 100644 --- a/packages/pcd/pod-pcd/package.json +++ b/packages/pcd/pod-pcd/package.json @@ -1,6 +1,6 @@ { "name": "@pcd/pod-pcd", - "version": "0.4.0", + "version": "0.5.0", "license": "GPL-3.0-or-later", "main": "./dist/cjs/src/index.js", "module": "./dist/esm/src/index.js", @@ -33,15 +33,15 @@ "clean": "rm -rf dist node_modules *.tsbuildinfo" }, "dependencies": { - "@pcd/pcd-types": "0.14.0", - "@pcd/pod": "0.4.0", - "@pcd/util": "0.8.0", + "@pcd/pcd-types": "0.15.0", + "@pcd/pod": "0.5.0", + "@pcd/util": "0.9.0", "json-bigint": "^1.0.0", "uuid": "^9.0.0" }, "devDependencies": { - "@pcd/eslint-config-custom": "0.14.0", - "@pcd/tsconfig": "0.14.0", + "@pcd/eslint-config-custom": "0.15.0", + "@pcd/tsconfig": "0.15.0", "@types/chai": "^4.3.5", "@types/mocha": "^10.0.1", "eslint": "^8.57.0", diff --git a/packages/pcd/pod-ticket-pcd/CHANGELOG.md b/packages/pcd/pod-ticket-pcd/CHANGELOG.md index b313c01724..6c5e72cbba 100644 --- a/packages/pcd/pod-ticket-pcd/CHANGELOG.md +++ b/packages/pcd/pod-ticket-pcd/CHANGELOG.md @@ -1,5 +1,19 @@ # @pcd/pod-ticket-pcd +## 0.5.0 + +### Minor Changes + +- GPC v4 enhancements, PODValue types, more GPC configurations + +### Patch Changes + +- Updated dependencies + - @pcd/pcd-types@0.15.0 + - @pcd/pod@0.5.0 + - @pcd/util@0.9.0 + - @pcd/pod-pcd@0.5.0 + ## 0.4.0 ### Minor Changes diff --git a/packages/pcd/pod-ticket-pcd/package.json b/packages/pcd/pod-ticket-pcd/package.json index 8d079311ba..449214ee91 100644 --- a/packages/pcd/pod-ticket-pcd/package.json +++ b/packages/pcd/pod-ticket-pcd/package.json @@ -1,6 +1,6 @@ { "name": "@pcd/pod-ticket-pcd", - "version": "0.4.0", + "version": "0.5.0", "license": "GPL-3.0-or-later", "main": "./dist/cjs/src/index.js", "module": "./dist/esm/src/index.js", @@ -32,17 +32,17 @@ "clean": "rm -rf dist node_modules *.tsbuildinfo" }, "dependencies": { - "@pcd/pcd-types": "0.14.0", - "@pcd/pod": "0.4.0", - "@pcd/pod-pcd": "0.4.0", - "@pcd/util": "0.8.0", + "@pcd/pcd-types": "0.15.0", + "@pcd/pod": "0.5.0", + "@pcd/pod-pcd": "0.5.0", + "@pcd/util": "0.9.0", "json-bigint": "^1.0.0", "uuid": "^9.0.0", "zod": "^3.22.4" }, "devDependencies": { - "@pcd/eslint-config-custom": "0.14.0", - "@pcd/tsconfig": "0.14.0", + "@pcd/eslint-config-custom": "0.15.0", + "@pcd/tsconfig": "0.15.0", "@types/chai": "^4.3.5", "@types/mocha": "^10.0.1", "eslint": "^8.57.0", diff --git a/packages/pcd/pod-ticket-pcd/src/schema.ts b/packages/pcd/pod-ticket-pcd/src/schema.ts index cb511efeef..736d634934 100644 --- a/packages/pcd/pod-ticket-pcd/src/schema.ts +++ b/packages/pcd/pod-ticket-pcd/src/schema.ts @@ -43,7 +43,8 @@ export const TicketDataSchema = z.object({ ticketSecret: z.string().optional(), eventLocation: z.string().optional(), eventStartDate: z.string().optional(), - isAddOn: z.boolean().optional() + isAddOn: z.boolean().optional(), + parentTicketId: z.string().uuid().optional() // the "parent" ticket that this is an add-on to }); export type IPODTicketData = z.infer; diff --git a/packages/pcd/rln-pcd/CHANGELOG.md b/packages/pcd/rln-pcd/CHANGELOG.md index 48650783f1..2e8b14e41b 100644 --- a/packages/pcd/rln-pcd/CHANGELOG.md +++ b/packages/pcd/rln-pcd/CHANGELOG.md @@ -1,5 +1,20 @@ # @pcd/rln-pcd +## 0.14.0 + +### Minor Changes + +- GPC v4 enhancements, PODValue types, more GPC configurations + +### Patch Changes + +- Updated dependencies + - @pcd/pcd-types@0.15.0 + - @pcd/semaphore-identity-v3-wrapper@0.1.0 + - @pcd/util@0.9.0 + - @pcd/semaphore-group-pcd@0.15.0 + - @pcd/semaphore-identity-pcd@0.15.0 + ## 0.13.0 ### Minor Changes diff --git a/packages/pcd/rln-pcd/package.json b/packages/pcd/rln-pcd/package.json index b764aa61d4..c59f5b8974 100644 --- a/packages/pcd/rln-pcd/package.json +++ b/packages/pcd/rln-pcd/package.json @@ -1,6 +1,6 @@ { "name": "@pcd/rln-pcd", - "version": "0.13.0", + "version": "0.14.0", "license": "GPL-3.0-or-later", "main": "./dist/cjs/src/index.js", "module": "./dist/esm/src/index.js", @@ -33,19 +33,19 @@ "clean": "rm -rf dist node_modules *.tsbuildinfo" }, "dependencies": { - "@pcd/pcd-types": "^0.14.0", - "@pcd/semaphore-group-pcd": "^0.14.0", - "@pcd/semaphore-identity-pcd": "^0.14.0", - "@pcd/semaphore-identity-v3-wrapper": "0.0.1", - "@pcd/util": "0.8.0", + "@pcd/pcd-types": "^0.15.0", + "@pcd/semaphore-group-pcd": "^0.15.0", + "@pcd/semaphore-identity-pcd": "^0.15.0", + "@pcd/semaphore-identity-v3-wrapper": "0.1.0", + "@pcd/util": "0.9.0", "@semaphore-protocol/group": "^3.15.2", "json-bigint": "^1.0.0", "rlnjs": "^2.0.8", "uuid": "^9.0.0" }, "devDependencies": { - "@pcd/eslint-config-custom": "0.14.0", - "@pcd/tsconfig": "0.14.0", + "@pcd/eslint-config-custom": "0.15.0", + "@pcd/tsconfig": "0.15.0", "@types/json-bigint": "^1.0.1", "@types/mocha": "^10.0.1", "eslint": "^8.57.0", diff --git a/packages/pcd/rsa-image-pcd/CHANGELOG.md b/packages/pcd/rsa-image-pcd/CHANGELOG.md index 570f6b9231..909aac91a0 100644 --- a/packages/pcd/rsa-image-pcd/CHANGELOG.md +++ b/packages/pcd/rsa-image-pcd/CHANGELOG.md @@ -1,5 +1,17 @@ # @pcd/rsa-image-pcd +## 0.9.0 + +### Minor Changes + +- GPC v4 enhancements, PODValue types, more GPC configurations + +### Patch Changes + +- Updated dependencies + - @pcd/pcd-types@0.15.0 + - @pcd/rsa-pcd@0.10.0 + ## 0.8.0 ### Minor Changes diff --git a/packages/pcd/rsa-image-pcd/package.json b/packages/pcd/rsa-image-pcd/package.json index 9b9c14f55b..5a3e7f10b6 100644 --- a/packages/pcd/rsa-image-pcd/package.json +++ b/packages/pcd/rsa-image-pcd/package.json @@ -1,6 +1,6 @@ { "name": "@pcd/rsa-image-pcd", - "version": "0.8.0", + "version": "0.9.0", "license": "GPL-3.0-or-later", "main": "./dist/cjs/src/index.js", "module": "./dist/esm/src/index.js", @@ -32,16 +32,16 @@ "clean": "rm -rf dist node_modules *.tsbuildinfo" }, "dependencies": { - "@pcd/pcd-types": "0.14.0", - "@pcd/rsa-pcd": "0.9.0", + "@pcd/pcd-types": "0.15.0", + "@pcd/rsa-pcd": "0.10.0", "chai": "^4.3.7", "json-bigint": "^1.0.0", "node-rsa": "^1.1.1", "uuid": "^9.0.0" }, "devDependencies": { - "@pcd/eslint-config-custom": "0.14.0", - "@pcd/tsconfig": "0.14.0", + "@pcd/eslint-config-custom": "0.15.0", + "@pcd/tsconfig": "0.15.0", "@types/json-bigint": "^1.0.1", "@types/mocha": "^10.0.1", "@types/node-rsa": "^1.1.1", diff --git a/packages/pcd/rsa-pcd/CHANGELOG.md b/packages/pcd/rsa-pcd/CHANGELOG.md index 6af1a10b24..45e6c92390 100644 --- a/packages/pcd/rsa-pcd/CHANGELOG.md +++ b/packages/pcd/rsa-pcd/CHANGELOG.md @@ -1,5 +1,17 @@ # @pcd/rsa-pcd +## 0.10.0 + +### Minor Changes + +- GPC v4 enhancements, PODValue types, more GPC configurations + +### Patch Changes + +- Updated dependencies + - @pcd/pcd-types@0.15.0 + - @pcd/util@0.9.0 + ## 0.9.0 ### Minor Changes diff --git a/packages/pcd/rsa-pcd/package.json b/packages/pcd/rsa-pcd/package.json index 5a26ba63e4..78755f08b1 100644 --- a/packages/pcd/rsa-pcd/package.json +++ b/packages/pcd/rsa-pcd/package.json @@ -1,6 +1,6 @@ { "name": "@pcd/rsa-pcd", - "version": "0.9.0", + "version": "0.10.0", "license": "GPL-3.0-or-later", "main": "./dist/cjs/src/index.js", "module": "./dist/esm/src/index.js", @@ -32,16 +32,16 @@ "clean": "rm -rf dist node_modules *.tsbuildinfo" }, "dependencies": { - "@pcd/pcd-types": "0.14.0", - "@pcd/util": "0.8.0", + "@pcd/pcd-types": "0.15.0", + "@pcd/util": "0.9.0", "chai": "^4.3.7", "json-bigint": "^1.0.0", "node-rsa": "^1.1.1", "uuid": "^9.0.0" }, "devDependencies": { - "@pcd/eslint-config-custom": "0.14.0", - "@pcd/tsconfig": "0.14.0", + "@pcd/eslint-config-custom": "0.15.0", + "@pcd/tsconfig": "0.15.0", "@types/json-bigint": "^1.0.1", "@types/mocha": "^10.0.1", "@types/node-rsa": "^1.1.1", diff --git a/packages/pcd/rsa-ticket-pcd/CHANGELOG.md b/packages/pcd/rsa-ticket-pcd/CHANGELOG.md index fcff57eb19..3b73fb1f58 100644 --- a/packages/pcd/rsa-ticket-pcd/CHANGELOG.md +++ b/packages/pcd/rsa-ticket-pcd/CHANGELOG.md @@ -1,5 +1,17 @@ # @pcd/rsa-ticket-pcd +## 0.10.0 + +### Minor Changes + +- GPC v4 enhancements, PODValue types, more GPC configurations + +### Patch Changes + +- Updated dependencies + - @pcd/pcd-types@0.15.0 + - @pcd/rsa-pcd@0.10.0 + ## 0.9.0 ### Minor Changes diff --git a/packages/pcd/rsa-ticket-pcd/package.json b/packages/pcd/rsa-ticket-pcd/package.json index 12a1a49828..ecc380d283 100644 --- a/packages/pcd/rsa-ticket-pcd/package.json +++ b/packages/pcd/rsa-ticket-pcd/package.json @@ -1,6 +1,6 @@ { "name": "@pcd/rsa-ticket-pcd", - "version": "0.9.0", + "version": "0.10.0", "license": "GPL-3.0-or-later", "main": "./dist/cjs/src/index.js", "module": "./dist/esm/src/index.js", @@ -32,16 +32,16 @@ "clean": "rm -rf dist node_modules *.tsbuildinfo" }, "dependencies": { - "@pcd/pcd-types": "0.14.0", - "@pcd/rsa-pcd": "0.9.0", + "@pcd/pcd-types": "0.15.0", + "@pcd/rsa-pcd": "0.10.0", "chai": "^4.3.7", "json-bigint": "^1.0.0", "node-rsa": "^1.1.1", "uuid": "^9.0.0" }, "devDependencies": { - "@pcd/eslint-config-custom": "0.14.0", - "@pcd/tsconfig": "0.14.0", + "@pcd/eslint-config-custom": "0.15.0", + "@pcd/tsconfig": "0.15.0", "@types/json-bigint": "^1.0.1", "@types/mocha": "^10.0.1", "@types/node-rsa": "^1.1.1", diff --git a/packages/pcd/semaphore-group-pcd/CHANGELOG.md b/packages/pcd/semaphore-group-pcd/CHANGELOG.md index bee644aea0..4c3218d707 100644 --- a/packages/pcd/semaphore-group-pcd/CHANGELOG.md +++ b/packages/pcd/semaphore-group-pcd/CHANGELOG.md @@ -1,5 +1,19 @@ # @pcd/semaphore-group-pcd +## 0.15.0 + +### Minor Changes + +- GPC v4 enhancements, PODValue types, more GPC configurations + +### Patch Changes + +- Updated dependencies + - @pcd/pcd-types@0.15.0 + - @pcd/util@0.9.0 + - @pcd/semaphore-identity-pcd@0.15.0 + - @pcd/semaphore-signature-pcd@0.15.0 + ## 0.14.0 ### Minor Changes diff --git a/packages/pcd/semaphore-group-pcd/package.json b/packages/pcd/semaphore-group-pcd/package.json index dcf3f148c2..011c953786 100644 --- a/packages/pcd/semaphore-group-pcd/package.json +++ b/packages/pcd/semaphore-group-pcd/package.json @@ -1,6 +1,6 @@ { "name": "@pcd/semaphore-group-pcd", - "version": "0.14.0", + "version": "0.15.0", "license": "GPL-3.0-or-later", "main": "./dist/cjs/src/index.js", "module": "./dist/esm/src/index.js", @@ -33,10 +33,10 @@ "clean": "rm -rf dist node_modules *.tsbuildinfo" }, "dependencies": { - "@pcd/pcd-types": "0.14.0", - "@pcd/semaphore-identity-pcd": "0.14.0", - "@pcd/semaphore-signature-pcd": "0.14.0", - "@pcd/util": "0.8.0", + "@pcd/pcd-types": "0.15.0", + "@pcd/semaphore-identity-pcd": "0.15.0", + "@pcd/semaphore-signature-pcd": "0.15.0", + "@pcd/util": "0.9.0", "@semaphore-protocol/group": "^3.15.2", "@semaphore-protocol/identity": "^3.15.2", "@semaphore-protocol/proof": "npm:@pcd/semaphore-proof-v3@^3.15.2", @@ -45,8 +45,8 @@ "uuid": "^9.0.0" }, "devDependencies": { - "@pcd/eslint-config-custom": "0.14.0", - "@pcd/tsconfig": "0.14.0", + "@pcd/eslint-config-custom": "0.15.0", + "@pcd/tsconfig": "0.15.0", "@types/json-bigint": "^1.0.1", "@types/mocha": "^10.0.1", "@types/uuid": "^9.0.0", diff --git a/packages/pcd/semaphore-identity-pcd/CHANGELOG.md b/packages/pcd/semaphore-identity-pcd/CHANGELOG.md index 66d9debadd..9e24832231 100644 --- a/packages/pcd/semaphore-identity-pcd/CHANGELOG.md +++ b/packages/pcd/semaphore-identity-pcd/CHANGELOG.md @@ -1,5 +1,19 @@ # @pcd/semaphore-identity-pcd +## 0.15.0 + +### Minor Changes + +- GPC v4 enhancements, PODValue types, more GPC configurations + +### Patch Changes + +- Updated dependencies + - @pcd/pcd-types@0.15.0 + - @pcd/pod@0.5.0 + - @pcd/semaphore-identity-v3-wrapper@0.1.0 + - @pcd/util@0.9.0 + ## 0.14.0 ### Minor Changes diff --git a/packages/pcd/semaphore-identity-pcd/package.json b/packages/pcd/semaphore-identity-pcd/package.json index 24d02b5f2a..f5fbfc920f 100644 --- a/packages/pcd/semaphore-identity-pcd/package.json +++ b/packages/pcd/semaphore-identity-pcd/package.json @@ -1,6 +1,6 @@ { "name": "@pcd/semaphore-identity-pcd", - "version": "0.14.0", + "version": "0.15.0", "license": "GPL-3.0-or-later", "main": "./dist/cjs/src/index.js", "module": "./dist/esm/src/index.js", @@ -32,11 +32,11 @@ "clean": "rm -rf dist node_modules *.tsbuildinfo" }, "dependencies": { - "@pcd/pcd-types": "0.14.0", - "@pcd/pod": "0.4.0", - "@pcd/semaphore-identity-v3-wrapper": "0.0.1", - "@pcd/util": "0.8.0", - "@semaphore-protocol/identity": "^4.5.0", + "@pcd/pcd-types": "0.15.0", + "@pcd/pod": "0.5.0", + "@pcd/semaphore-identity-v3-wrapper": "0.1.0", + "@pcd/util": "0.9.0", + "@semaphore-protocol/core": "^4.5.0", "@types/json-bigint": "^1.0.3", "@zk-kit/eddsa-poseidon": "^1.1.0", "@zk-kit/utils": "^1.2.1", @@ -46,8 +46,8 @@ "uuid": "^9.0.0" }, "devDependencies": { - "@pcd/eslint-config-custom": "0.14.0", - "@pcd/tsconfig": "0.14.0", + "@pcd/eslint-config-custom": "0.15.0", + "@pcd/tsconfig": "0.15.0", "@types/json-bigint": "^1.0.1", "@types/mocha": "^10.0.1", "@types/uuid": "^9.0.0", diff --git a/packages/pcd/semaphore-identity-pcd/src/forwardedTypes.ts b/packages/pcd/semaphore-identity-pcd/src/forwardedTypes.ts index 73132a14bd..bc11dc21ab 100644 --- a/packages/pcd/semaphore-identity-pcd/src/forwardedTypes.ts +++ b/packages/pcd/semaphore-identity-pcd/src/forwardedTypes.ts @@ -4,4 +4,4 @@ // both versions, we re-export both here, to make the available throughout the rest // of our codebase. export { Identity as IdentityV3 } from "@pcd/semaphore-identity-v3-wrapper"; -export { Identity as IdentityV4 } from "@semaphore-protocol/identity"; +export { Identity as IdentityV4 } from "@semaphore-protocol/core"; diff --git a/packages/pcd/semaphore-signature-pcd/CHANGELOG.md b/packages/pcd/semaphore-signature-pcd/CHANGELOG.md index f89984ac6e..b31c499768 100644 --- a/packages/pcd/semaphore-signature-pcd/CHANGELOG.md +++ b/packages/pcd/semaphore-signature-pcd/CHANGELOG.md @@ -1,5 +1,18 @@ # @pcd/semaphore-signature-pcd +## 0.15.0 + +### Minor Changes + +- GPC v4 enhancements, PODValue types, more GPC configurations + +### Patch Changes + +- Updated dependencies + - @pcd/pcd-types@0.15.0 + - @pcd/util@0.9.0 + - @pcd/semaphore-identity-pcd@0.15.0 + ## 0.14.0 ### Minor Changes diff --git a/packages/pcd/semaphore-signature-pcd/package.json b/packages/pcd/semaphore-signature-pcd/package.json index 9873e03066..ab767ad8cb 100644 --- a/packages/pcd/semaphore-signature-pcd/package.json +++ b/packages/pcd/semaphore-signature-pcd/package.json @@ -1,6 +1,6 @@ { "name": "@pcd/semaphore-signature-pcd", - "version": "0.14.0", + "version": "0.15.0", "license": "GPL-3.0-or-later", "main": "./dist/cjs/src/index.js", "module": "./dist/esm/src/index.js", @@ -33,9 +33,9 @@ "clean": "rm -rf dist node_modules *.tsbuildinfo" }, "dependencies": { - "@pcd/pcd-types": "0.14.0", - "@pcd/semaphore-identity-pcd": "0.14.0", - "@pcd/util": "0.8.0", + "@pcd/pcd-types": "0.15.0", + "@pcd/semaphore-identity-pcd": "0.15.0", + "@pcd/util": "0.9.0", "@semaphore-protocol/group": "^3.15.2", "@semaphore-protocol/identity": "^3.15.2", "@semaphore-protocol/proof": "npm:@pcd/semaphore-proof-v3@^3.15.2", @@ -43,8 +43,8 @@ "uuid": "^9.0.0" }, "devDependencies": { - "@pcd/eslint-config-custom": "0.14.0", - "@pcd/tsconfig": "0.14.0", + "@pcd/eslint-config-custom": "0.15.0", + "@pcd/tsconfig": "0.15.0", "@types/json-bigint": "^1.0.1", "@types/mocha": "^10.0.1", "@types/uuid": "^9.0.0", diff --git a/packages/pcd/unknown-pcd/CHANGELOG.md b/packages/pcd/unknown-pcd/CHANGELOG.md index 77ca663e8d..270db9cd52 100644 --- a/packages/pcd/unknown-pcd/CHANGELOG.md +++ b/packages/pcd/unknown-pcd/CHANGELOG.md @@ -1,5 +1,16 @@ # @pcd/unknown-pcd +## 0.4.0 + +### Minor Changes + +- GPC v4 enhancements, PODValue types, more GPC configurations + +### Patch Changes + +- Updated dependencies + - @pcd/pcd-types@0.15.0 + ## 0.3.0 ### Minor Changes diff --git a/packages/pcd/unknown-pcd/package.json b/packages/pcd/unknown-pcd/package.json index fb78fa357f..6d8909870b 100644 --- a/packages/pcd/unknown-pcd/package.json +++ b/packages/pcd/unknown-pcd/package.json @@ -1,6 +1,6 @@ { "name": "@pcd/unknown-pcd", - "version": "0.3.0", + "version": "0.4.0", "license": "MIT", "main": "./dist/cjs/src/index.js", "module": "./dist/esm/src/index.js", @@ -26,13 +26,13 @@ "clean": "rm -rf dist node_modules *.tsbuildinfo" }, "dependencies": { - "@pcd/pcd-types": "0.14.0", + "@pcd/pcd-types": "0.15.0", "json-bigint": "^1.0.0", "uuid": "^9.0.0" }, "devDependencies": { - "@pcd/eslint-config-custom": "0.14.0", - "@pcd/tsconfig": "0.14.0", + "@pcd/eslint-config-custom": "0.15.0", + "@pcd/tsconfig": "0.15.0", "@types/chai": "^4.3.5", "@types/json-bigint": "^1.0.1", "@types/mocha": "^10.0.1", diff --git a/packages/pcd/webauthn-pcd/CHANGELOG.md b/packages/pcd/webauthn-pcd/CHANGELOG.md index be0958f317..adf7e001c7 100644 --- a/packages/pcd/webauthn-pcd/CHANGELOG.md +++ b/packages/pcd/webauthn-pcd/CHANGELOG.md @@ -1,5 +1,18 @@ # @pcd/webauthn-pcd +## 0.15.0 + +### Minor Changes + +- GPC v4 enhancements, PODValue types, more GPC configurations + +### Patch Changes + +- Updated dependencies + - @pcd/passport-crypto@0.15.0 + - @pcd/pcd-types@0.15.0 + - @pcd/util@0.9.0 + ## 0.14.0 ### Minor Changes diff --git a/packages/pcd/webauthn-pcd/package.json b/packages/pcd/webauthn-pcd/package.json index d3fb226746..61c6459a02 100644 --- a/packages/pcd/webauthn-pcd/package.json +++ b/packages/pcd/webauthn-pcd/package.json @@ -1,6 +1,6 @@ { "name": "@pcd/webauthn-pcd", - "version": "0.14.0", + "version": "0.15.0", "license": "GPL-3.0-or-later", "main": "./dist/cjs/src/index.js", "module": "./dist/esm/src/index.js", @@ -32,9 +32,9 @@ "clean": "rm -rf dist node_modules *.tsbuildinfo" }, "dependencies": { - "@pcd/passport-crypto": "0.14.0", - "@pcd/pcd-types": "0.14.0", - "@pcd/util": "0.8.0", + "@pcd/passport-crypto": "0.15.0", + "@pcd/pcd-types": "0.15.0", + "@pcd/util": "0.9.0", "@simplewebauthn/browser": "^7.2.0", "@simplewebauthn/server": "^7.2.0", "@simplewebauthn/typescript-types": "^7.0.0", @@ -43,8 +43,8 @@ "uuid": "^9.0.0" }, "devDependencies": { - "@pcd/eslint-config-custom": "0.14.0", - "@pcd/tsconfig": "0.14.0", + "@pcd/eslint-config-custom": "0.15.0", + "@pcd/tsconfig": "0.15.0", "@types/jest": "^29.5.0", "@types/json-bigint": "^1.0.1", "eslint": "^8.57.0", diff --git a/packages/pcd/zk-eddsa-event-ticket-pcd/CHANGELOG.md b/packages/pcd/zk-eddsa-event-ticket-pcd/CHANGELOG.md index 5a82457b3d..5eecde40ad 100644 --- a/packages/pcd/zk-eddsa-event-ticket-pcd/CHANGELOG.md +++ b/packages/pcd/zk-eddsa-event-ticket-pcd/CHANGELOG.md @@ -1,5 +1,22 @@ # @pcd/zk-eddsa-event-ticket-pcd +## 0.10.0 + +### Minor Changes + +- GPC v4 enhancements, PODValue types, more GPC configurations + +### Patch Changes + +- Updated dependencies + - @pcd/pcd-types@0.15.0 + - @pcd/util@0.9.0 + - @pcd/snarkjs@0.11.0 + - @pcd/eddsa-pcd@0.10.0 + - @pcd/eddsa-ticket-pcd@0.10.0 + - @pcd/semaphore-identity-pcd@0.15.0 + - @pcd/semaphore-signature-pcd@0.15.0 + ## 0.9.0 ### Minor Changes diff --git a/packages/pcd/zk-eddsa-event-ticket-pcd/package.json b/packages/pcd/zk-eddsa-event-ticket-pcd/package.json index 6c1c683ef2..55f50e36f1 100644 --- a/packages/pcd/zk-eddsa-event-ticket-pcd/package.json +++ b/packages/pcd/zk-eddsa-event-ticket-pcd/package.json @@ -1,6 +1,6 @@ { "name": "@pcd/zk-eddsa-event-ticket-pcd", - "version": "0.9.0", + "version": "0.10.0", "license": "GPL-3.0-or-later", "main": "./dist/cjs/src/index.js", "module": "./dist/esm/src/index.js", @@ -34,13 +34,13 @@ "artifacts:generate": "pcd-artifacts generate && cp artifacts/* ../../apps/passport-client/public/artifacts/zk-eddsa-event-ticket-pcd && cp artifacts/* ../../apps/passport-server/public/artifacts/zk-eddsa-event-ticket-pcd && cp -f ./artifacts/circuit.json ./src/circuit.json" }, "dependencies": { - "@pcd/eddsa-pcd": "0.9.0", - "@pcd/eddsa-ticket-pcd": "0.9.0", - "@pcd/pcd-types": "^0.14.0", - "@pcd/semaphore-identity-pcd": "0.14.0", - "@pcd/semaphore-signature-pcd": "0.14.0", - "@pcd/snarkjs": "0.10.0", - "@pcd/util": "0.8.0", + "@pcd/eddsa-pcd": "0.10.0", + "@pcd/eddsa-ticket-pcd": "0.10.0", + "@pcd/pcd-types": "^0.15.0", + "@pcd/semaphore-identity-pcd": "0.15.0", + "@pcd/semaphore-signature-pcd": "0.15.0", + "@pcd/snarkjs": "0.11.0", + "@pcd/util": "0.9.0", "@semaphore-protocol/identity": "^3.15.2", "@zk-kit/eddsa-poseidon": "^1.1.0", "json-bigint": "^1.0.0", @@ -48,9 +48,9 @@ "uuid": "^9.0.0" }, "devDependencies": { - "@pcd/artifacts": "0.7.0", - "@pcd/eslint-config-custom": "0.14.0", - "@pcd/tsconfig": "0.14.0", + "@pcd/artifacts": "0.8.0", + "@pcd/eslint-config-custom": "0.15.0", + "@pcd/tsconfig": "0.15.0", "@types/json-bigint": "^1.0.1", "@types/mocha": "^10.0.1", "@types/snarkjs": "^0.7.5", diff --git a/packages/pcd/zk-eddsa-frog-pcd/CHANGELOG.md b/packages/pcd/zk-eddsa-frog-pcd/CHANGELOG.md index 5c69ada26a..2a74a8d79b 100644 --- a/packages/pcd/zk-eddsa-frog-pcd/CHANGELOG.md +++ b/packages/pcd/zk-eddsa-frog-pcd/CHANGELOG.md @@ -1,5 +1,21 @@ # @pcd/zk-eddsa-frog-pcd +## 0.7.0 + +### Minor Changes + +- GPC v4 enhancements, PODValue types, more GPC configurations + +### Patch Changes + +- Updated dependencies + - @pcd/pcd-types@0.15.0 + - @pcd/util@0.9.0 + - @pcd/eddsa-frog-pcd@0.7.0 + - @pcd/eddsa-pcd@0.10.0 + - @pcd/semaphore-identity-pcd@0.15.0 + - @pcd/semaphore-signature-pcd@0.15.0 + ## 0.6.0 ### Minor Changes diff --git a/packages/pcd/zk-eddsa-frog-pcd/package.json b/packages/pcd/zk-eddsa-frog-pcd/package.json index 6a0246fee8..95eb6e77a0 100644 --- a/packages/pcd/zk-eddsa-frog-pcd/package.json +++ b/packages/pcd/zk-eddsa-frog-pcd/package.json @@ -1,6 +1,6 @@ { "name": "@pcd/zk-eddsa-frog-pcd", - "version": "0.6.0", + "version": "0.7.0", "license": "GPL-3.0-or-later", "main": "./dist/cjs/src/index.js", "module": "./dist/esm/src/index.js", @@ -34,12 +34,12 @@ "artifacts:generate": "pcd-artifacts generate -o src/artifacts && cp src/artifacts/* ../../apps/passport-client/public/artifacts/zk-eddsa-frog-pcd && cp src/artifacts/* ../../apps/passport-server/public/artifacts/zk-eddsa-frog-pcd && cp -f ./artifacts/circuit.json ./src/circuit.json" }, "dependencies": { - "@pcd/eddsa-frog-pcd": "^0.6.0", - "@pcd/eddsa-pcd": "0.9.0", - "@pcd/pcd-types": "^0.14.0", - "@pcd/semaphore-identity-pcd": "0.14.0", - "@pcd/semaphore-signature-pcd": "0.14.0", - "@pcd/util": "0.8.0", + "@pcd/eddsa-frog-pcd": "^0.7.0", + "@pcd/eddsa-pcd": "0.10.0", + "@pcd/pcd-types": "^0.15.0", + "@pcd/semaphore-identity-pcd": "0.15.0", + "@pcd/semaphore-signature-pcd": "0.15.0", + "@pcd/util": "0.9.0", "@semaphore-protocol/identity": "^3.15.2", "@zk-kit/eddsa-poseidon": "^1.1.0", "json-bigint": "^1.0.0", @@ -47,9 +47,9 @@ "uuid": "^9.0.0" }, "devDependencies": { - "@pcd/artifacts": "0.7.0", - "@pcd/eslint-config-custom": "0.14.0", - "@pcd/tsconfig": "0.14.0", + "@pcd/artifacts": "0.8.0", + "@pcd/eslint-config-custom": "0.15.0", + "@pcd/tsconfig": "0.15.0", "@types/json-bigint": "^1.0.1", "@types/mocha": "^10.0.1", "@types/snarkjs": "^0.7.5", diff --git a/packages/tools/artifacts/CHANGELOG.md b/packages/tools/artifacts/CHANGELOG.md index 2806c3dc05..6f3868af6c 100644 --- a/packages/tools/artifacts/CHANGELOG.md +++ b/packages/tools/artifacts/CHANGELOG.md @@ -1,5 +1,11 @@ # @pcd/util +## 0.8.0 + +### Minor Changes + +- GPC v4 enhancements, PODValue types, more GPC configurations + ## 0.7.0 ### Minor Changes diff --git a/packages/tools/artifacts/package.json b/packages/tools/artifacts/package.json index a92272540f..a5bc985fd8 100644 --- a/packages/tools/artifacts/package.json +++ b/packages/tools/artifacts/package.json @@ -1,7 +1,7 @@ { "name": "@pcd/artifacts", "type": "module", - "version": "0.7.0", + "version": "0.8.0", "description": "A command line utility designed to manage PCD artifacts.", "license": "GPL-3.0-or-later", "bin": { @@ -30,7 +30,7 @@ "snarkjs": "^0.7.4" }, "devDependencies": { - "@pcd/eslint-config-custom": "0.14.0", + "@pcd/eslint-config-custom": "0.15.0", "eslint": "^8.57.0" }, "publishConfig": { diff --git a/packages/tools/eslint-config-custom/CHANGELOG.md b/packages/tools/eslint-config-custom/CHANGELOG.md index f847b752c1..8b40f919a8 100644 --- a/packages/tools/eslint-config-custom/CHANGELOG.md +++ b/packages/tools/eslint-config-custom/CHANGELOG.md @@ -1,5 +1,11 @@ # @pcd/eslint-config-custom +## 0.15.0 + +### Minor Changes + +- GPC v4 enhancements, PODValue types, more GPC configurations + ## 0.14.0 ### Minor Changes diff --git a/packages/tools/eslint-config-custom/package.json b/packages/tools/eslint-config-custom/package.json index d0d6552cdb..478a0f3c38 100644 --- a/packages/tools/eslint-config-custom/package.json +++ b/packages/tools/eslint-config-custom/package.json @@ -1,6 +1,6 @@ { "name": "@pcd/eslint-config-custom", - "version": "0.14.0", + "version": "0.15.0", "main": "index.js", "license": "MIT", "scripts": { diff --git a/packages/tools/perftest/CHANGELOG.md b/packages/tools/perftest/CHANGELOG.md index 13d3316f1e..0609b42eb9 100644 --- a/packages/tools/perftest/CHANGELOG.md +++ b/packages/tools/perftest/CHANGELOG.md @@ -1,5 +1,26 @@ # @pcd/perftest +## 0.4.0 + +### Minor Changes + +- GPC v4 enhancements, PODValue types, more GPC configurations + +### Patch Changes + +- Updated dependencies + - @pcd/gpc@0.4.0 + - @pcd/pcd-types@0.15.0 + - @pcd/pod@0.5.0 + - @pcd/semaphore-identity-v3-wrapper@0.1.0 + - @pcd/util@0.9.0 + - @pcd/eddsa-ticket-pcd@0.10.0 + - @pcd/gpc-pcd@0.4.0 + - @pcd/pod-pcd@0.5.0 + - @pcd/semaphore-identity-pcd@0.15.0 + - @pcd/semaphore-signature-pcd@0.15.0 + - @pcd/zk-eddsa-event-ticket-pcd@0.10.0 + ## 0.3.0 ### Minor Changes diff --git a/packages/tools/perftest/package.json b/packages/tools/perftest/package.json index d2e5c6913c..e4f79bdff4 100644 --- a/packages/tools/perftest/package.json +++ b/packages/tools/perftest/package.json @@ -1,7 +1,7 @@ { "name": "@pcd/perftest", "private": true, - "version": "0.3.0", + "version": "0.4.0", "license": "GPL-3.0-or-later", "scripts": { "start": "yarn ts-node src/index.ts", @@ -14,22 +14,22 @@ "conf": "^11.0.2", "log-symbols": "^4.1.0", "uuid": "^9.0.0", - "@pcd/eddsa-ticket-pcd": "^0.9.0", - "@pcd/gpc": "^0.3.0", - "@pcd/gpc-pcd": "^0.3.0", - "@pcd/pcd-types": "^0.14.0", - "@pcd/pod": "^0.4.0", - "@pcd/pod-pcd": "^0.4.0", - "@pcd/semaphore-identity-pcd": "^0.14.0", - "@pcd/semaphore-signature-pcd": "^0.14.0", - "@pcd/semaphore-identity-v3-wrapper": "0.0.1", - "@pcd/util": "^0.8.0", - "@pcd/zk-eddsa-event-ticket-pcd": "^0.9.0" + "@pcd/eddsa-ticket-pcd": "^0.10.0", + "@pcd/gpc": "^0.4.0", + "@pcd/gpc-pcd": "^0.4.0", + "@pcd/pcd-types": "^0.15.0", + "@pcd/pod": "^0.5.0", + "@pcd/pod-pcd": "^0.5.0", + "@pcd/semaphore-identity-pcd": "^0.15.0", + "@pcd/semaphore-signature-pcd": "^0.15.0", + "@pcd/semaphore-identity-v3-wrapper": "0.1.0", + "@pcd/util": "^0.9.0", + "@pcd/zk-eddsa-event-ticket-pcd": "^0.10.0" }, "devDependencies": { "ts-node": "*", - "@pcd/eslint-config-custom": "0.14.0", - "@pcd/tsconfig": "0.14.0", + "@pcd/eslint-config-custom": "0.15.0", + "@pcd/tsconfig": "0.15.0", "eslint": "^8.57.0", "typescript": "^5.3.3" }, diff --git a/packages/tools/tsconfig/CHANGELOG.md b/packages/tools/tsconfig/CHANGELOG.md index 720db1d3e8..bf6ac5a36c 100644 --- a/packages/tools/tsconfig/CHANGELOG.md +++ b/packages/tools/tsconfig/CHANGELOG.md @@ -1,5 +1,11 @@ # @pcd/tsconfig +## 0.15.0 + +### Minor Changes + +- GPC v4 enhancements, PODValue types, more GPC configurations + ## 0.14.0 ### Minor Changes diff --git a/packages/tools/tsconfig/package.json b/packages/tools/tsconfig/package.json index eb1cebd6b4..e37737d8a8 100644 --- a/packages/tools/tsconfig/package.json +++ b/packages/tools/tsconfig/package.json @@ -1,6 +1,6 @@ { "name": "@pcd/tsconfig", - "version": "0.14.0", + "version": "0.15.0", "license": "MIT", "private": false, "files": [ diff --git a/packages/ui/eddsa-frog-pcd-ui/CHANGELOG.md b/packages/ui/eddsa-frog-pcd-ui/CHANGELOG.md index 544bdf5622..b215c1b8ee 100644 --- a/packages/ui/eddsa-frog-pcd-ui/CHANGELOG.md +++ b/packages/ui/eddsa-frog-pcd-ui/CHANGELOG.md @@ -1,5 +1,18 @@ # @pcd/eddsa-frog-pcd-ui +## 0.6.0 + +### Minor Changes + +- GPC v4 enhancements, PODValue types, more GPC configurations + +### Patch Changes + +- Updated dependencies + - @pcd/passport-ui@0.15.0 + - @pcd/pcd-types@0.15.0 + - @pcd/eddsa-frog-pcd@0.7.0 + ## 0.5.0 ### Minor Changes diff --git a/packages/ui/eddsa-frog-pcd-ui/package.json b/packages/ui/eddsa-frog-pcd-ui/package.json index 42e42804b0..9a38f286e6 100644 --- a/packages/ui/eddsa-frog-pcd-ui/package.json +++ b/packages/ui/eddsa-frog-pcd-ui/package.json @@ -1,6 +1,6 @@ { "name": "@pcd/eddsa-frog-pcd-ui", - "version": "0.5.0", + "version": "0.6.0", "license": "GPL-3.0-or-later", "main": "./dist/cjs/src/index.js", "module": "./dist/esm/src/index.js", @@ -26,14 +26,14 @@ "clean": "rm -rf dist node_modules *.tsbuildinfo" }, "dependencies": { - "@pcd/eddsa-frog-pcd": "0.6.0", - "@pcd/passport-ui": "0.14.0", - "@pcd/pcd-types": "0.14.0", + "@pcd/eddsa-frog-pcd": "0.7.0", + "@pcd/passport-ui": "0.15.0", + "@pcd/pcd-types": "0.15.0", "lodash": "^4.17.21" }, "devDependencies": { - "@pcd/eslint-config-custom": "0.14.0", - "@pcd/tsconfig": "0.14.0", + "@pcd/eslint-config-custom": "0.15.0", + "@pcd/tsconfig": "0.15.0", "@types/lodash": "^4.14.191", "@types/react": "^18.0.22", "@types/react-dom": "^18.0.7", diff --git a/packages/ui/eddsa-frog-pcd-ui/src/CardBody.tsx b/packages/ui/eddsa-frog-pcd-ui/src/CardBody.tsx index 0fba32ca96..92d848f047 100644 --- a/packages/ui/eddsa-frog-pcd-ui/src/CardBody.tsx +++ b/packages/ui/eddsa-frog-pcd-ui/src/CardBody.tsx @@ -17,7 +17,10 @@ import { PCDUI } from "@pcd/pcd-types"; import _ from "lodash"; import { useCallback, useEffect, useMemo, useState } from "react"; -export const EdDSAFrogPCDUI: PCDUI = { +export const EdDSAFrogPCDUI: PCDUI< + EdDSAFrogPCD, + { deletePcd?: () => Promise } +> = { renderCardBody: EdDSAFrogCardBody, getHeader: Header }; @@ -57,7 +60,13 @@ function Header({ pcd }: { pcd: EdDSAFrogPCD }): JSX.Element { ); } -function EdDSAFrogCardBody({ pcd }: { pcd: EdDSAFrogPCD }): JSX.Element { +function EdDSAFrogCardBody({ + pcd, + deletePcd +}: { + pcd: EdDSAFrogPCD; + deletePcd?: () => Promise; +}): JSX.Element { const frogData = useMemo(() => getEdDSAFrogData(pcd), [pcd]); const [showMore, setShowMore] = useState(false); const [showPCD, setShowPCD] = useState(false); @@ -118,9 +127,19 @@ function EdDSAFrogCardBody({ pcd }: { pcd: EdDSAFrogPCD }): JSX.Element { /> )} - setShowMore(!showMore)}> - {showMore ? "Collapse" : "See more"} - +
+ setShowMore(!showMore)}> + {showMore ? "Collapse" : "See more"} + + {deletePcd && ( + deletePcd()} + > + Delete + + )} +
{showMore && ( <> {frogData.description} diff --git a/packages/ui/eddsa-pcd-ui/CHANGELOG.md b/packages/ui/eddsa-pcd-ui/CHANGELOG.md index 4cda1fb7dd..b9dde4e378 100644 --- a/packages/ui/eddsa-pcd-ui/CHANGELOG.md +++ b/packages/ui/eddsa-pcd-ui/CHANGELOG.md @@ -1,5 +1,18 @@ # @pcd/eddsa-pcd-ui +## 0.6.0 + +### Minor Changes + +- GPC v4 enhancements, PODValue types, more GPC configurations + +### Patch Changes + +- Updated dependencies + - @pcd/passport-ui@0.15.0 + - @pcd/pcd-types@0.15.0 + - @pcd/eddsa-pcd@0.10.0 + ## 0.5.0 ### Minor Changes diff --git a/packages/ui/eddsa-pcd-ui/package.json b/packages/ui/eddsa-pcd-ui/package.json index e1a763cf4f..7b6cefc07b 100644 --- a/packages/ui/eddsa-pcd-ui/package.json +++ b/packages/ui/eddsa-pcd-ui/package.json @@ -1,6 +1,6 @@ { "name": "@pcd/eddsa-pcd-ui", - "version": "0.5.0", + "version": "0.6.0", "license": "GPL-3.0-or-later", "main": "./dist/cjs/src/index.js", "module": "./dist/esm/src/index.js", @@ -26,13 +26,13 @@ "clean": "rm -rf dist node_modules *.tsbuildinfo" }, "dependencies": { - "@pcd/eddsa-pcd": "0.9.0", - "@pcd/passport-ui": "0.14.0", - "@pcd/pcd-types": "0.14.0" + "@pcd/eddsa-pcd": "0.10.0", + "@pcd/passport-ui": "0.15.0", + "@pcd/pcd-types": "0.15.0" }, "devDependencies": { - "@pcd/eslint-config-custom": "0.14.0", - "@pcd/tsconfig": "0.14.0", + "@pcd/eslint-config-custom": "0.15.0", + "@pcd/tsconfig": "0.15.0", "@types/react": "^18.0.22", "@types/react-dom": "^18.0.7", "eslint": "^8.57.0", diff --git a/packages/ui/eddsa-ticket-pcd-ui/CHANGELOG.md b/packages/ui/eddsa-ticket-pcd-ui/CHANGELOG.md index 786b69b6d9..3986f1b21b 100644 --- a/packages/ui/eddsa-ticket-pcd-ui/CHANGELOG.md +++ b/packages/ui/eddsa-ticket-pcd-ui/CHANGELOG.md @@ -1,5 +1,19 @@ # @pcd/eddsa-ticket-pcd-ui +## 0.6.0 + +### Minor Changes + +- GPC v4 enhancements, PODValue types, more GPC configurations + +### Patch Changes + +- Updated dependencies + - @pcd/passport-interface@0.15.0 + - @pcd/passport-ui@0.15.0 + - @pcd/pcd-types@0.15.0 + - @pcd/eddsa-ticket-pcd@0.10.0 + ## 0.5.0 ### Minor Changes diff --git a/packages/ui/eddsa-ticket-pcd-ui/package.json b/packages/ui/eddsa-ticket-pcd-ui/package.json index c9ac471d30..5baf64a2fe 100644 --- a/packages/ui/eddsa-ticket-pcd-ui/package.json +++ b/packages/ui/eddsa-ticket-pcd-ui/package.json @@ -1,6 +1,6 @@ { "name": "@pcd/eddsa-ticket-pcd-ui", - "version": "0.5.0", + "version": "0.6.0", "license": "GPL-3.0-or-later", "main": "./dist/cjs/src/index.js", "module": "./dist/esm/src/index.js", @@ -27,15 +27,14 @@ "clean": "rm -rf dist node_modules *.tsbuildinfo" }, "dependencies": { - "@pcd/eddsa-ticket-pcd": "0.9.0", - "@pcd/passport-interface": "^0.14.0", - "@pcd/passport-ui": "0.14.0", - "@pcd/pcd-types": "0.14.0", - "html-to-image": "^1.11.11" + "@pcd/eddsa-ticket-pcd": "0.10.0", + "@pcd/passport-interface": "^0.15.0", + "@pcd/passport-ui": "0.15.0", + "@pcd/pcd-types": "0.15.0" }, "devDependencies": { - "@pcd/eslint-config-custom": "0.14.0", - "@pcd/tsconfig": "0.14.0", + "@pcd/eslint-config-custom": "0.15.0", + "@pcd/tsconfig": "0.15.0", "@types/react": "^18.0.22", "@types/react-dom": "^18.0.7", "eslint": "^8.57.0", diff --git a/packages/ui/eddsa-ticket-pcd-ui/src/CardBody.tsx b/packages/ui/eddsa-ticket-pcd-ui/src/CardBody.tsx index de6da17f63..3a2fd3c3ee 100644 --- a/packages/ui/eddsa-ticket-pcd-ui/src/CardBody.tsx +++ b/packages/ui/eddsa-ticket-pcd-ui/src/CardBody.tsx @@ -7,8 +7,7 @@ import { import { ZUCONNECT_23_DAY_PASS_PRODUCT_ID } from "@pcd/passport-interface"; import { styled } from "@pcd/passport-ui"; import { PCDUI } from "@pcd/pcd-types"; -import { toCanvas } from "html-to-image"; -import { useRef, useState } from "react"; +import { useRef } from "react"; import { TicketQR } from "./TicketQR"; type NEW_UI__AddOns = { @@ -29,8 +28,6 @@ export interface EdDSATicketPCDCardProps { hidePadding?: boolean; // when clicked on the the addons sections, if there is any, do something addOns?: NEW_UI__AddOns; - // defined by if the image has QR code displayed and by this flag. - showDownloadButton?: boolean; } export const EdDSATicketPCDUI: PCDUI = @@ -43,21 +40,18 @@ function EdDSATicketPCDCardBody({ pcd, verifyURL, idBasedVerifyURL, - addOns, - showDownloadButton + addOns }: { pcd: EdDSATicketPCD; } & EdDSATicketPCDCardProps): JSX.Element { const ticketImageRef = useRef(null); const ticketData = getEdDSATicketData(pcd); - const [downloading, setDownloading] = useState(false); // If ticket has an `eventStartDate` render the `qrCodeOverrideImageUrl`, if it exists // Else, render the `imageUrl`, if it existss - const imageToRender = - ticketData?.eventStartDate && idBasedVerifyURL !== undefined - ? ticketData.qrCodeOverrideImageUrl - : ticketData?.imageUrl; + const imageToRender = ticketData?.eventStartDate + ? ticketData.qrCodeOverrideImageUrl + : ticketData?.imageUrl; return ( @@ -96,32 +90,19 @@ function EdDSATicketPCDCardBody({
- {!imageToRender && showDownloadButton && ( - { - if (downloading) return; - setDownloading(true); - const ticketElement = ticketImageRef.current; - if (!ticketElement) return; - await shareOrDownloadImage( - ticketElement, - (ticketData?.eventName || "event-ticket-data") + ".jpeg" - ); - setDownloading(false); - }} - > - - Download ticket - - - - )} {addOns && ( {addOns.text} )} + + + QR POD • ZK powered by ZUPASS + +
); @@ -166,7 +147,7 @@ const NEW_UI__Container = styled.div` font-family: Rubik; border-radius: 16px; border: 2px solid var(--text-white, #fff); - background: var(--bg-white-transparent, rgba(255, 255, 255, 0.8)); + background: #fff; /* shadow-sm */ box-shadow: 0px 1px 2px 0px rgba(0, 0, 0, 0.05); @@ -238,19 +219,17 @@ const NEW_UI__ExtraSectionText = styled.div<{ $disabled?: boolean }>` line-height: 135%; `; -const DownloadIcon = (): JSX.Element => ( - - - - -); +const ExtraSectionSecondaryText = styled.div` + color: var(--text-tertiary); + text-align: center; + + /* text-xs (12px)/regular-rubik */ + font-family: Rubik; + font-size: 12px; + font-style: normal; + font-weight: 400; + line-height: 135%; /* 16.2px */ +`; const QRIcon = (): JSX.Element => ( ( ); - -const shareOrDownloadImage = async ( - ticketElement: HTMLElement | null, - fileName: string -): Promise => { - if (!ticketElement) return; - - const canvas: HTMLCanvasElement = await toCanvas(ticketElement); - const blob: Blob | null = await new Promise((resolve) => - canvas.toBlob(resolve, "image/jpeg") - ); - if (!blob) return; // Ensure the blob exists before proceeding - - const downloadImage = (blob: Blob, fileName: string): void => { - const url = URL.createObjectURL(blob); - const link = document.createElement("a"); - link.href = url; - link.download = fileName; - link.click(); - URL.revokeObjectURL(url); - }; - const file = new File([blob], fileName, { type: "image/jpeg" }); - if (navigator.share && navigator.canShare({ files: [file] })) { - try { - await navigator.share({ - files: [file] - }); - } catch (e) { - console.error("Error sharing image", e); - // Ignore errors related to the user aborting the share or a share already in progress - if ( - e instanceof Error && - ["AbortError", "InvalidStateError"].includes(e.name) - ) - return; - downloadImage(blob, fileName); - } - } else { - downloadImage(blob, fileName); - } -}; diff --git a/packages/ui/email-pcd-ui/CHANGELOG.md b/packages/ui/email-pcd-ui/CHANGELOG.md index caf8837d65..f45da47d10 100644 --- a/packages/ui/email-pcd-ui/CHANGELOG.md +++ b/packages/ui/email-pcd-ui/CHANGELOG.md @@ -1,5 +1,18 @@ # @pcd/email-pcd-ui +## 0.6.0 + +### Minor Changes + +- GPC v4 enhancements, PODValue types, more GPC configurations + +### Patch Changes + +- Updated dependencies + - @pcd/passport-ui@0.15.0 + - @pcd/pcd-types@0.15.0 + - @pcd/email-pcd@0.10.0 + ## 0.5.0 ### Minor Changes diff --git a/packages/ui/email-pcd-ui/package.json b/packages/ui/email-pcd-ui/package.json index c0e3e5fe28..8dd989104b 100644 --- a/packages/ui/email-pcd-ui/package.json +++ b/packages/ui/email-pcd-ui/package.json @@ -1,6 +1,6 @@ { "name": "@pcd/email-pcd-ui", - "version": "0.5.0", + "version": "0.6.0", "license": "GPL-3.0-or-later", "main": "./dist/cjs/src/index.js", "module": "./dist/esm/src/index.js", @@ -26,13 +26,13 @@ "clean": "rm -rf dist node_modules *.tsbuildinfo" }, "dependencies": { - "@pcd/email-pcd": "0.9.0", - "@pcd/passport-ui": "0.14.0", - "@pcd/pcd-types": "0.14.0" + "@pcd/email-pcd": "0.10.0", + "@pcd/passport-ui": "0.15.0", + "@pcd/pcd-types": "0.15.0" }, "devDependencies": { - "@pcd/eslint-config-custom": "0.14.0", - "@pcd/tsconfig": "0.14.0", + "@pcd/eslint-config-custom": "0.15.0", + "@pcd/tsconfig": "0.15.0", "@types/react": "^18.0.22", "@types/react-dom": "^18.0.7", "eslint": "^8.57.0", diff --git a/packages/ui/ethereum-group-pcd-ui/CHANGELOG.md b/packages/ui/ethereum-group-pcd-ui/CHANGELOG.md index 33a7d5bf69..dfd94c6efc 100644 --- a/packages/ui/ethereum-group-pcd-ui/CHANGELOG.md +++ b/packages/ui/ethereum-group-pcd-ui/CHANGELOG.md @@ -1,5 +1,19 @@ # @pcd/ethereum-group-pcd-ui +## 0.6.0 + +### Minor Changes + +- GPC v4 enhancements, PODValue types, more GPC configurations + +### Patch Changes + +- Updated dependencies + - @pcd/passport-ui@0.15.0 + - @pcd/pcd-types@0.15.0 + - @pcd/ethereum-group-pcd@0.9.0 + - @pcd/semaphore-signature-pcd@0.15.0 + ## 0.5.0 ### Minor Changes diff --git a/packages/ui/ethereum-group-pcd-ui/package.json b/packages/ui/ethereum-group-pcd-ui/package.json index 91bea95426..e5b65a5bfb 100644 --- a/packages/ui/ethereum-group-pcd-ui/package.json +++ b/packages/ui/ethereum-group-pcd-ui/package.json @@ -1,6 +1,6 @@ { "name": "@pcd/ethereum-group-pcd-ui", - "version": "0.5.0", + "version": "0.6.0", "license": "GPL-3.0-or-later", "main": "./dist/cjs/src/index.js", "module": "./dist/esm/src/index.js", @@ -26,14 +26,14 @@ "clean": "rm -rf dist node_modules *.tsbuildinfo" }, "dependencies": { - "@pcd/ethereum-group-pcd": "0.8.0", - "@pcd/passport-ui": "0.14.0", - "@pcd/pcd-types": "0.14.0", - "@pcd/semaphore-signature-pcd": "0.14.0" + "@pcd/ethereum-group-pcd": "0.9.0", + "@pcd/passport-ui": "0.15.0", + "@pcd/pcd-types": "0.15.0", + "@pcd/semaphore-signature-pcd": "0.15.0" }, "devDependencies": { - "@pcd/eslint-config-custom": "0.14.0", - "@pcd/tsconfig": "0.14.0", + "@pcd/eslint-config-custom": "0.15.0", + "@pcd/tsconfig": "0.15.0", "@types/react": "^18.0.22", "@types/react-dom": "^18.0.7", "eslint": "^8.57.0", diff --git a/packages/ui/ethereum-ownership-pcd-ui/CHANGELOG.md b/packages/ui/ethereum-ownership-pcd-ui/CHANGELOG.md index 0f3747e367..ab3a64b54f 100644 --- a/packages/ui/ethereum-ownership-pcd-ui/CHANGELOG.md +++ b/packages/ui/ethereum-ownership-pcd-ui/CHANGELOG.md @@ -1,5 +1,19 @@ # @pcd/ethereum-ownership-pcd-ui +## 0.6.0 + +### Minor Changes + +- GPC v4 enhancements, PODValue types, more GPC configurations + +### Patch Changes + +- Updated dependencies + - @pcd/passport-ui@0.15.0 + - @pcd/pcd-types@0.15.0 + - @pcd/ethereum-ownership-pcd@0.15.0 + - @pcd/semaphore-signature-pcd@0.15.0 + ## 0.5.0 ### Minor Changes diff --git a/packages/ui/ethereum-ownership-pcd-ui/package.json b/packages/ui/ethereum-ownership-pcd-ui/package.json index a60de8971a..946002a5f1 100644 --- a/packages/ui/ethereum-ownership-pcd-ui/package.json +++ b/packages/ui/ethereum-ownership-pcd-ui/package.json @@ -1,6 +1,6 @@ { "name": "@pcd/ethereum-ownership-pcd-ui", - "version": "0.5.0", + "version": "0.6.0", "license": "GPL-3.0-or-later", "main": "./dist/cjs/src/index.js", "module": "./dist/esm/src/index.js", @@ -26,14 +26,14 @@ "clean": "rm -rf dist node_modules *.tsbuildinfo" }, "dependencies": { - "@pcd/ethereum-ownership-pcd": "0.14.0", - "@pcd/passport-ui": "0.14.0", - "@pcd/pcd-types": "0.14.0", - "@pcd/semaphore-signature-pcd": "0.14.0" + "@pcd/ethereum-ownership-pcd": "0.15.0", + "@pcd/passport-ui": "0.15.0", + "@pcd/pcd-types": "0.15.0", + "@pcd/semaphore-signature-pcd": "0.15.0" }, "devDependencies": { - "@pcd/eslint-config-custom": "0.14.0", - "@pcd/tsconfig": "0.14.0", + "@pcd/eslint-config-custom": "0.15.0", + "@pcd/tsconfig": "0.15.0", "@types/react": "^18.0.22", "@types/react-dom": "^18.0.7", "eslint": "^8.57.0", diff --git a/packages/ui/gpc-pcd-ui/CHANGELOG.md b/packages/ui/gpc-pcd-ui/CHANGELOG.md index 62a10d80fc..732ec32dc2 100644 --- a/packages/ui/gpc-pcd-ui/CHANGELOG.md +++ b/packages/ui/gpc-pcd-ui/CHANGELOG.md @@ -1,5 +1,21 @@ # @pcd/gpc-pcd-ui +## 0.4.0 + +### Minor Changes + +- GPC v4 enhancements, PODValue types, more GPC configurations + +### Patch Changes + +- Updated dependencies + - @pcd/gpc@0.4.0 + - @pcd/passport-ui@0.15.0 + - @pcd/pcd-types@0.15.0 + - @pcd/pod@0.5.0 + - @pcd/util@0.9.0 + - @pcd/gpc-pcd@0.4.0 + ## 0.3.0 ### Minor Changes diff --git a/packages/ui/gpc-pcd-ui/README.md b/packages/ui/gpc-pcd-ui/README.md index c0fdee9df2..9c9970b25c 100644 --- a/packages/ui/gpc-pcd-ui/README.md +++ b/packages/ui/gpc-pcd-ui/README.md @@ -18,7 +18,7 @@ Downloads
- + Developer Site @@ -33,4 +33,4 @@ This package provides React UI for [`@pcd/gpc-pcd`](https://github.com/proofcarryingdata/zupass/tree/main/packages/pcd/gpc-pcd). See that package for more details on functionality. -For a full introduction, see the [Developer Site](https://zupass.org/pod-developers). +For a full introduction, see the [Developer Site](https://zupass.org/pod). diff --git a/packages/ui/gpc-pcd-ui/package.json b/packages/ui/gpc-pcd-ui/package.json index 424da929f9..6f58f8d4a5 100644 --- a/packages/ui/gpc-pcd-ui/package.json +++ b/packages/ui/gpc-pcd-ui/package.json @@ -1,6 +1,6 @@ { "name": "@pcd/gpc-pcd-ui", - "version": "0.3.0", + "version": "0.4.0", "license": "GPL-3.0-or-later", "main": "./dist/cjs/src/index.js", "module": "./dist/esm/src/index.js", @@ -26,18 +26,18 @@ "clean": "rm -rf dist node_modules *.tsbuildinfo" }, "dependencies": { - "@pcd/gpc": "0.3.0", - "@pcd/gpc-pcd": "0.3.0", - "@pcd/pod": "0.4.0", - "@pcd/passport-ui": "0.14.0", - "@pcd/pcd-types": "0.14.0", - "@pcd/util": "0.8.0", + "@pcd/gpc": "0.4.0", + "@pcd/gpc-pcd": "0.4.0", + "@pcd/pod": "0.5.0", + "@pcd/passport-ui": "0.15.0", + "@pcd/pcd-types": "0.15.0", + "@pcd/util": "0.9.0", "@semaphore-protocol/identity": "^3.15.2", "react": "^18.2.0" }, "devDependencies": { - "@pcd/eslint-config-custom": "0.14.0", - "@pcd/tsconfig": "0.14.0", + "@pcd/eslint-config-custom": "0.15.0", + "@pcd/tsconfig": "0.15.0", "@types/chai": "^4.3.5", "@types/mocha": "^10.0.1", "eslint": "^8.57.0", diff --git a/packages/ui/halo-nonce-pcd-ui/CHANGELOG.md b/packages/ui/halo-nonce-pcd-ui/CHANGELOG.md index 83b6532ef3..5e77abec9d 100644 --- a/packages/ui/halo-nonce-pcd-ui/CHANGELOG.md +++ b/packages/ui/halo-nonce-pcd-ui/CHANGELOG.md @@ -1,5 +1,18 @@ # @pcd/halo-nonce-pcd-ui +## 0.6.0 + +### Minor Changes + +- GPC v4 enhancements, PODValue types, more GPC configurations + +### Patch Changes + +- Updated dependencies + - @pcd/passport-ui@0.15.0 + - @pcd/pcd-types@0.15.0 + - @pcd/halo-nonce-pcd@0.11.0 + ## 0.5.0 ### Minor Changes diff --git a/packages/ui/halo-nonce-pcd-ui/package.json b/packages/ui/halo-nonce-pcd-ui/package.json index 0d93b43a46..64a4d0beda 100644 --- a/packages/ui/halo-nonce-pcd-ui/package.json +++ b/packages/ui/halo-nonce-pcd-ui/package.json @@ -1,6 +1,6 @@ { "name": "@pcd/halo-nonce-pcd-ui", - "version": "0.5.0", + "version": "0.6.0", "license": "GPL-3.0-or-later", "main": "./dist/cjs/src/index.js", "module": "./dist/esm/src/index.js", @@ -26,14 +26,14 @@ "clean": "rm -rf dist node_modules *.tsbuildinfo" }, "dependencies": { - "@pcd/halo-nonce-pcd": "0.10.0", - "@pcd/passport-ui": "0.14.0", - "@pcd/pcd-types": "0.14.0", + "@pcd/halo-nonce-pcd": "0.11.0", + "@pcd/passport-ui": "0.15.0", + "@pcd/pcd-types": "0.15.0", "airtable": "^0.11.6" }, "devDependencies": { - "@pcd/eslint-config-custom": "0.14.0", - "@pcd/tsconfig": "0.14.0", + "@pcd/eslint-config-custom": "0.15.0", + "@pcd/tsconfig": "0.15.0", "@types/react": "^18.0.22", "@types/react-dom": "^18.0.7", "eslint": "^8.57.0", diff --git a/packages/ui/message-pcd-ui/CHANGELOG.md b/packages/ui/message-pcd-ui/CHANGELOG.md index b6faefb8f5..180753ba1a 100644 --- a/packages/ui/message-pcd-ui/CHANGELOG.md +++ b/packages/ui/message-pcd-ui/CHANGELOG.md @@ -1,5 +1,18 @@ # @pcd/message-pcd-ui +## 0.5.0 + +### Minor Changes + +- GPC v4 enhancements, PODValue types, more GPC configurations + +### Patch Changes + +- Updated dependencies + - @pcd/passport-ui@0.15.0 + - @pcd/pcd-types@0.15.0 + - @pcd/message-pcd@0.5.0 + ## 0.4.0 ### Minor Changes diff --git a/packages/ui/message-pcd-ui/package.json b/packages/ui/message-pcd-ui/package.json index a269e9abf1..aab2eaafe2 100644 --- a/packages/ui/message-pcd-ui/package.json +++ b/packages/ui/message-pcd-ui/package.json @@ -1,6 +1,6 @@ { "name": "@pcd/message-pcd-ui", - "version": "0.4.0", + "version": "0.5.0", "license": "GPL-3.0-or-later", "main": "./dist/cjs/src/index.js", "module": "./dist/esm/src/index.js", @@ -26,15 +26,15 @@ "clean": "rm -rf dist node_modules *.tsbuildinfo" }, "dependencies": { - "@pcd/message-pcd": "0.4.0", - "@pcd/passport-ui": "0.14.0", - "@pcd/pcd-types": "0.14.0", + "@pcd/message-pcd": "0.5.0", + "@pcd/passport-ui": "0.15.0", + "@pcd/pcd-types": "0.15.0", "Buffer": "^0.0.0", "react-markdown": "^9.0.1" }, "devDependencies": { - "@pcd/eslint-config-custom": "0.14.0", - "@pcd/tsconfig": "0.14.0", + "@pcd/eslint-config-custom": "0.15.0", + "@pcd/tsconfig": "0.15.0", "@types/react": "^18.0.22", "@types/react-dom": "^18.0.7", "eslint": "^8.57.0", diff --git a/packages/ui/pod-pcd-ui/CHANGELOG.md b/packages/ui/pod-pcd-ui/CHANGELOG.md index d311feef88..a85a87a766 100644 --- a/packages/ui/pod-pcd-ui/CHANGELOG.md +++ b/packages/ui/pod-pcd-ui/CHANGELOG.md @@ -1,5 +1,20 @@ # @pcd/pod-pcd-ui +## 0.5.0 + +### Minor Changes + +- GPC v4 enhancements, PODValue types, more GPC configurations + +### Patch Changes + +- Updated dependencies + - @pcd/passport-ui@0.15.0 + - @pcd/pcd-types@0.15.0 + - @pcd/pod@0.5.0 + - @pcd/util@0.9.0 + - @pcd/pod-pcd@0.5.0 + ## 0.4.0 ### Minor Changes diff --git a/packages/ui/pod-pcd-ui/README.md b/packages/ui/pod-pcd-ui/README.md index 00e2f95200..52ac7171d7 100644 --- a/packages/ui/pod-pcd-ui/README.md +++ b/packages/ui/pod-pcd-ui/README.md @@ -18,7 +18,7 @@ Downloads
- + Developer Site @@ -33,4 +33,4 @@ This package provides React UI for [`@pcd/pod-pcd`](https://github.com/proofcarryingdata/zupass/tree/main/packages/pcd/pod-pcd). See that package for more details on functionality. -For a full introduction, see the [Developer Site](https://zupass.org/pod-developers). +For a full introduction, see the [Developer Site](https://zupass.org/pod). diff --git a/packages/ui/pod-pcd-ui/package.json b/packages/ui/pod-pcd-ui/package.json index 8a7eb768c7..3ea5be0f3b 100644 --- a/packages/ui/pod-pcd-ui/package.json +++ b/packages/ui/pod-pcd-ui/package.json @@ -1,6 +1,6 @@ { "name": "@pcd/pod-pcd-ui", - "version": "0.4.0", + "version": "0.5.0", "license": "GPL-3.0-or-later", "main": "./dist/cjs/src/index.js", "module": "./dist/esm/src/index.js", @@ -27,16 +27,16 @@ "clean": "rm -rf dist node_modules *.tsbuildinfo" }, "dependencies": { - "@pcd/passport-ui": "0.14.0", - "@pcd/pcd-types": "0.14.0", - "@pcd/pod": "0.4.0", - "@pcd/pod-pcd": "0.4.0", - "@pcd/util": "0.8.0", + "@pcd/passport-ui": "0.15.0", + "@pcd/pcd-types": "0.15.0", + "@pcd/pod": "0.5.0", + "@pcd/pod-pcd": "0.5.0", + "@pcd/util": "0.9.0", "react": "^18.2.0" }, "devDependencies": { - "@pcd/eslint-config-custom": "0.14.0", - "@pcd/tsconfig": "0.14.0", + "@pcd/eslint-config-custom": "0.15.0", + "@pcd/tsconfig": "0.15.0", "@types/chai": "^4.3.5", "@types/mocha": "^10.0.1", "eslint": "^8.57.0", diff --git a/packages/ui/pod-pcd-ui/src/CardBody.tsx b/packages/ui/pod-pcd-ui/src/CardBody.tsx index d97d692a2a..4a419eb79b 100644 --- a/packages/ui/pod-pcd-ui/src/CardBody.tsx +++ b/packages/ui/pod-pcd-ui/src/CardBody.tsx @@ -1,13 +1,19 @@ import { ErrorContainer, SlidingTabs, styled, VIcon } from "@pcd/passport-ui"; import { PCDUI } from "@pcd/pcd-types"; -import { getImageUrlEntry, PODPCD, PODPCDPackage } from "@pcd/pod-pcd"; +import { + getDescriptionEntry, + getImageUrlEntry, + getTitleEntry, + PODPCD, + PODPCDPackage +} from "@pcd/pod-pcd"; import { getErrorMessage } from "@pcd/util"; import { useMemo, useState } from "react"; import { CollectablePODPCDCardBody } from "./renderers/CollectablePODPCDCardBody"; import { DefaultPODPCDCardBody } from "./renderers/DefaultPODPCDCardBody"; import { Container } from "./shared"; -export const PODPCDUI: PCDUI = { +export const PODPCDUI: PCDUI Promise }> = { renderCardBody: PODPCDCardBody }; @@ -29,13 +35,25 @@ enum PODDisplayFormat { /** * This component renders the body of a 'Card' that Zupass uses to display PCDs to the user. */ -function PODPCDCardBody({ pcd }: { pcd: PODPCD }): JSX.Element { +function PODPCDCardBody({ + pcd, + deletePcd +}: { + pcd: PODPCD; + deletePcd?: () => Promise; +}): JSX.Element { const [sigStatus, setSigStatus] = useState(0); const [error, setError] = useState(); const hasCollectableContent = useMemo(() => { const imageUrlEntry = getImageUrlEntry(pcd); - return imageUrlEntry?.type === "string" && imageUrlEntry.value !== ""; + const titleEntry = getTitleEntry(pcd); + const descriptionEntry = getDescriptionEntry(pcd); + return ( + (imageUrlEntry?.type === "string" && imageUrlEntry.value !== "") || + (titleEntry?.type === "string" && titleEntry.value !== "") || + (descriptionEntry?.type === "string" && descriptionEntry.value !== "") + ); }, [pcd]); const availableDisplayFormat = getPreferredDisplayFormat(pcd); @@ -76,9 +94,15 @@ function PODPCDCardBody({ pcd }: { pcd: PODPCD }): JSX.Element { style={{ color: isValidSig ? "#5B952C" : undefined, textDecoration: isValidSig ? "none" : undefined + // TODO: remove cursor pointer when we have a valid signature }} > - + {sigStatus === 0 ? "Check signature" : isValidSig @@ -86,12 +110,29 @@ function PODPCDCardBody({ pcd }: { pcd: PODPCD }): JSX.Element { : error !== undefined ? "Signature error!" : "Bad signature!"} - - {isValidSig && } + + {isValidSig && ( + + + + )} {error === undefined ? null : ( {error} )} + + {deletePcd && ( + + Delete + + )}
{hasCollectableContent && ( )} + + POD • ZK powered by ZUPASS + ); } +const ExtraSectionSecondaryText = styled.div` + color: var(--text-tertiary); + text-align: center; + + /* text-xs (12px)/regular-rubik */ + font-family: Rubik; + font-size: 12px; + font-style: normal; + font-weight: 400; + line-height: 135%; /* 16.2px */ +`; + function getFormatDisplayName(displayFormat: PODDisplayFormat): string { switch (displayFormat) { case PODDisplayFormat.POD: @@ -156,3 +212,11 @@ async function verifySignature(pcd: PODPCD): Promise<{ return { isValid: false, errorMessage: getErrorMessage(e) }; } } + +const Text = styled.span` + font-family: Rubik; + font-size: 14px; + font-style: normal; + font-weight: 500; + line-height: 135%; /* 18.9px */ +`; diff --git a/packages/ui/pod-pcd-ui/src/renderers/DefaultPODPCDCardBody.tsx b/packages/ui/pod-pcd-ui/src/renderers/DefaultPODPCDCardBody.tsx index c21df9dba4..3f47b4c2a8 100644 --- a/packages/ui/pod-pcd-ui/src/renderers/DefaultPODPCDCardBody.tsx +++ b/packages/ui/pod-pcd-ui/src/renderers/DefaultPODPCDCardBody.tsx @@ -1,4 +1,10 @@ -import { Card, HiddenText, styled, TextContainer } from "@pcd/passport-ui"; +import { + Card, + CardWithCopy, + HiddenText, + styled, + TextContainer +} from "@pcd/passport-ui"; import { podEntriesToJSON } from "@pcd/pod"; import { PODPCD } from "@pcd/pod-pcd"; @@ -12,26 +18,38 @@ const StyledPre = styled.pre` export function DefaultPODPCDCardBody({ pcd }: { pcd: PODPCD }): JSX.Element { return (
- { + return navigator.clipboard.writeText( + JSON.stringify(pcd.pod.toJSON(), null, 2) + ); }} > - - {JSON.stringify(podEntriesToJSON(pcd.claim.entries), null, 2)} - - - - - - - - + + + {JSON.stringify(podEntriesToJSON(pcd.claim.entries), null, 2)} + + + + + + + + +
); } diff --git a/packages/ui/pod-pcd-ui/tsconfig.json b/packages/ui/pod-pcd-ui/tsconfig.json index 2d6c0e587f..0f13ff40d6 100644 --- a/packages/ui/pod-pcd-ui/tsconfig.json +++ b/packages/ui/pod-pcd-ui/tsconfig.json @@ -1,23 +1,15 @@ { "extends": "@pcd/tsconfig/ts-library.json", "compilerOptions": { - "lib": [], + "lib": ["DOM"], "outDir": "dist", "declarationDir": "dist/types", // Include all source files, including tests "rootDir": "." }, // Some artifact-including packages need to import a JSON file - "include": [ - "src", - "test", - "artifacts/*.json" - ], - "exclude": [ - "dist", - "build", - "node_modules" - ], + "include": ["src", "test", "artifacts/*.json"], + "exclude": ["dist", "build", "node_modules"], // DO NOT MODIFY MANUALLY BEYOND THIS POINT // References are automatically maintained by `yarn fix-references` "references": [ diff --git a/packages/ui/pod-ticket-pcd-ui/CHANGELOG.md b/packages/ui/pod-ticket-pcd-ui/CHANGELOG.md index 99cf379c33..0f788527b0 100644 --- a/packages/ui/pod-ticket-pcd-ui/CHANGELOG.md +++ b/packages/ui/pod-ticket-pcd-ui/CHANGELOG.md @@ -1,5 +1,18 @@ # @pcd/pod-ticket-pcd-ui +## 0.5.0 + +### Minor Changes + +- GPC v4 enhancements, PODValue types, more GPC configurations + +### Patch Changes + +- Updated dependencies + - @pcd/passport-ui@0.15.0 + - @pcd/pcd-types@0.15.0 + - @pcd/pod-ticket-pcd@0.5.0 + ## 0.4.0 ### Minor Changes diff --git a/packages/ui/pod-ticket-pcd-ui/package.json b/packages/ui/pod-ticket-pcd-ui/package.json index adf84ade5a..3a1fe98cee 100644 --- a/packages/ui/pod-ticket-pcd-ui/package.json +++ b/packages/ui/pod-ticket-pcd-ui/package.json @@ -1,6 +1,6 @@ { "name": "@pcd/pod-ticket-pcd-ui", - "version": "0.4.0", + "version": "0.5.0", "license": "GPL-3.0-or-later", "main": "./dist/cjs/src/index.js", "module": "./dist/esm/src/index.js", @@ -26,15 +26,14 @@ "clean": "rm -rf dist node_modules *.tsbuildinfo" }, "dependencies": { - "@pcd/passport-ui": "0.14.0", - "@pcd/pcd-types": "0.14.0", - "@pcd/pod-ticket-pcd": "0.4.0", - "html-to-image": "^1.11.11", + "@pcd/passport-ui": "0.15.0", + "@pcd/pcd-types": "0.15.0", + "@pcd/pod-ticket-pcd": "0.5.0", "url-join": "4.0.1" }, "devDependencies": { - "@pcd/eslint-config-custom": "0.14.0", - "@pcd/tsconfig": "0.14.0", + "@pcd/eslint-config-custom": "0.15.0", + "@pcd/tsconfig": "0.15.0", "@types/react": "^18.0.22", "@types/react-dom": "^18.0.7", "eslint": "^8.57.0", diff --git a/packages/ui/pod-ticket-pcd-ui/src/CardBody.tsx b/packages/ui/pod-ticket-pcd-ui/src/CardBody.tsx index 87ccf7e042..f2e8a5c8ea 100644 --- a/packages/ui/pod-ticket-pcd-ui/src/CardBody.tsx +++ b/packages/ui/pod-ticket-pcd-ui/src/CardBody.tsx @@ -2,8 +2,7 @@ import { QRDisplayWithRegenerateAndStorage, styled } from "@pcd/passport-ui"; import { PCDUI } from "@pcd/pcd-types"; import { PODTicketPCD } from "@pcd/pod-ticket-pcd"; import { IPODTicketData } from "@pcd/pod-ticket-pcd/src/schema"; -import { toCanvas } from "html-to-image"; -import { useCallback, useRef, useState } from "react"; +import { useCallback, useRef } from "react"; import urlJoin from "url-join"; type NEW_UI__AddOns = { @@ -14,7 +13,6 @@ export interface PODTicketPCDCardProps { ticketData: IPODTicketData; idBasedVerifyURL: string; addOns?: NEW_UI__AddOns; - showDownoladButton?: boolean; } export const PODTicketPCDUI: PCDUI = { @@ -24,17 +22,14 @@ export const PODTicketPCDUI: PCDUI = { function PODTicketCardBody({ pcd, idBasedVerifyURL, - addOns, - showDownoladButton + addOns }: { pcd: PODTicketPCD; idBasedVerifyURL: string; addOns?: NEW_UI__AddOns; - showDownoladButton?: boolean; }): JSX.Element { return ( (null); - const [downloading, setDownloading] = useState(false); - // If ticket has an `eventStartDate` render the `qrCodeOverrideImageUrl`, if it exists // Else, render the `imageUrl`, if it existss const imageToRender = ticketData?.eventStartDate @@ -94,32 +86,19 @@ export function PODTicketCardBodyImpl({
- {showDownoladButton && !imageToRender && ( - { - if (downloading) return; - setDownloading(true); - const ticketElement = ticketImageRef.current; - if (!ticketElement) return; - await shareOrDownloadImage( - ticketElement, - (ticketData?.eventName || "event-ticket-data") + ".jpeg" - ); - setDownloading(false); - }} - > - - Download ticket - - - - )} {addOns && ( {addOns.text} )} + + + QR POD • ZK powered by ZUPASS + +
); @@ -197,7 +176,7 @@ const NEW_UI__Container = styled.div` font-family: Rubik; border-radius: 16px; border: 2px solid var(--text-white, #fff); - background: var(--bg-white-transparent, rgba(255, 255, 255, 0.8)); + background: #fff; /* shadow-sm */ box-shadow: 0px 1px 2px 0px rgba(0, 0, 0, 0.05); @@ -270,19 +249,17 @@ const NEW_UI__ExtraSectionText = styled.div<{ $disabled?: boolean }>` line-height: 135%; `; -const DownloadIcon = (): JSX.Element => ( - - - - -); +const ExtraSectionSecondaryText = styled.div` + color: var(--text-tertiary); + text-align: center; + + /* text-xs (12px)/regular-rubik */ + font-family: Rubik; + font-size: 12px; + font-style: normal; + font-weight: 400; + line-height: 135%; /* 16.2px */ +`; const QRIcon = (): JSX.Element => ( ( ); - -const shareOrDownloadImage = async ( - ticketElement: HTMLElement | null, - fileName: string -): Promise => { - if (!ticketElement) return; - - const canvas: HTMLCanvasElement = await toCanvas(ticketElement); - const blob: Blob | null = await new Promise((resolve) => - canvas.toBlob(resolve, "image/jpeg") - ); - if (!blob) return; // Ensure the blob exists before proceeding - - const downloadImage = (blob: Blob, fileName: string): void => { - const url = URL.createObjectURL(blob); - const link = document.createElement("a"); - link.href = url; - link.download = fileName; - link.click(); - URL.revokeObjectURL(url); - }; - const file = new File([blob], fileName, { type: "image/jpeg" }); - if (navigator.share && navigator.canShare({ files: [file] })) { - try { - await navigator.share({ - files: [file] - }); - } catch (e) { - console.error("Error sharing image", e); - // Ignore errors related to the user aborting the share or a share already in progress - if ( - e instanceof Error && - ["AbortError", "InvalidStateError"].includes(e.name) - ) - return; - downloadImage(blob, fileName); - } - } else { - downloadImage(blob, fileName); - } -}; diff --git a/packages/ui/rsa-image-pcd-ui/CHANGELOG.md b/packages/ui/rsa-image-pcd-ui/CHANGELOG.md index 2fc26b10d1..b0942f684b 100644 --- a/packages/ui/rsa-image-pcd-ui/CHANGELOG.md +++ b/packages/ui/rsa-image-pcd-ui/CHANGELOG.md @@ -1,5 +1,18 @@ # @pcd/rsa-image-pcd-ui +## 0.6.0 + +### Minor Changes + +- GPC v4 enhancements, PODValue types, more GPC configurations + +### Patch Changes + +- Updated dependencies + - @pcd/passport-ui@0.15.0 + - @pcd/pcd-types@0.15.0 + - @pcd/rsa-image-pcd@0.9.0 + ## 0.5.0 ### Minor Changes diff --git a/packages/ui/rsa-image-pcd-ui/package.json b/packages/ui/rsa-image-pcd-ui/package.json index e798176e7d..cdfa012dd3 100644 --- a/packages/ui/rsa-image-pcd-ui/package.json +++ b/packages/ui/rsa-image-pcd-ui/package.json @@ -1,6 +1,6 @@ { "name": "@pcd/rsa-image-pcd-ui", - "version": "0.5.0", + "version": "0.6.0", "license": "GPL-3.0-or-later", "main": "./dist/cjs/src/index.js", "module": "./dist/esm/src/index.js", @@ -26,13 +26,13 @@ "clean": "rm -rf dist node_modules *.tsbuildinfo" }, "dependencies": { - "@pcd/rsa-image-pcd": "0.8.0", - "@pcd/passport-ui": "0.14.0", - "@pcd/pcd-types": "0.14.0" + "@pcd/rsa-image-pcd": "0.9.0", + "@pcd/passport-ui": "0.15.0", + "@pcd/pcd-types": "0.15.0" }, "devDependencies": { - "@pcd/eslint-config-custom": "0.14.0", - "@pcd/tsconfig": "0.14.0", + "@pcd/eslint-config-custom": "0.15.0", + "@pcd/tsconfig": "0.15.0", "@types/react": "^18.0.22", "@types/react-dom": "^18.0.7", "eslint": "^8.57.0", diff --git a/packages/ui/rsa-pcd-ui/CHANGELOG.md b/packages/ui/rsa-pcd-ui/CHANGELOG.md index 60b3e021bf..561b2e10df 100644 --- a/packages/ui/rsa-pcd-ui/CHANGELOG.md +++ b/packages/ui/rsa-pcd-ui/CHANGELOG.md @@ -1,5 +1,18 @@ # @pcd/rsa-pcd-ui +## 0.6.0 + +### Minor Changes + +- GPC v4 enhancements, PODValue types, more GPC configurations + +### Patch Changes + +- Updated dependencies + - @pcd/passport-ui@0.15.0 + - @pcd/pcd-types@0.15.0 + - @pcd/rsa-pcd@0.10.0 + ## 0.5.0 ### Minor Changes diff --git a/packages/ui/rsa-pcd-ui/package.json b/packages/ui/rsa-pcd-ui/package.json index 720cd61ffd..b3354b6631 100644 --- a/packages/ui/rsa-pcd-ui/package.json +++ b/packages/ui/rsa-pcd-ui/package.json @@ -1,6 +1,6 @@ { "name": "@pcd/rsa-pcd-ui", - "version": "0.5.0", + "version": "0.6.0", "license": "GPL-3.0-or-later", "main": "./dist/cjs/src/index.js", "module": "./dist/esm/src/index.js", @@ -26,13 +26,13 @@ "clean": "rm -rf dist node_modules *.tsbuildinfo" }, "dependencies": { - "@pcd/rsa-pcd": "0.9.0", - "@pcd/passport-ui": "0.14.0", - "@pcd/pcd-types": "0.14.0" + "@pcd/rsa-pcd": "0.10.0", + "@pcd/passport-ui": "0.15.0", + "@pcd/pcd-types": "0.15.0" }, "devDependencies": { - "@pcd/eslint-config-custom": "0.14.0", - "@pcd/tsconfig": "0.14.0", + "@pcd/eslint-config-custom": "0.15.0", + "@pcd/tsconfig": "0.15.0", "@types/react": "^18.0.22", "@types/react-dom": "^18.0.7", "eslint": "^8.57.0", diff --git a/packages/ui/rsa-ticket-pcd-ui/CHANGELOG.md b/packages/ui/rsa-ticket-pcd-ui/CHANGELOG.md index ebff635420..ed1a252402 100644 --- a/packages/ui/rsa-ticket-pcd-ui/CHANGELOG.md +++ b/packages/ui/rsa-ticket-pcd-ui/CHANGELOG.md @@ -1,5 +1,18 @@ # @pcd/rsa-ticket-pcd-ui +## 0.6.0 + +### Minor Changes + +- GPC v4 enhancements, PODValue types, more GPC configurations + +### Patch Changes + +- Updated dependencies + - @pcd/passport-ui@0.15.0 + - @pcd/pcd-types@0.15.0 + - @pcd/rsa-ticket-pcd@0.10.0 + ## 0.5.0 ### Minor Changes diff --git a/packages/ui/rsa-ticket-pcd-ui/package.json b/packages/ui/rsa-ticket-pcd-ui/package.json index 3dcb4de6d9..bc2888b276 100644 --- a/packages/ui/rsa-ticket-pcd-ui/package.json +++ b/packages/ui/rsa-ticket-pcd-ui/package.json @@ -1,6 +1,6 @@ { "name": "@pcd/rsa-ticket-pcd-ui", - "version": "0.5.0", + "version": "0.6.0", "license": "GPL-3.0-or-later", "main": "./dist/cjs/src/index.js", "module": "./dist/esm/src/index.js", @@ -26,13 +26,13 @@ "clean": "rm -rf dist node_modules *.tsbuildinfo" }, "dependencies": { - "@pcd/rsa-ticket-pcd": "0.9.0", - "@pcd/passport-ui": "0.14.0", - "@pcd/pcd-types": "0.14.0" + "@pcd/rsa-ticket-pcd": "0.10.0", + "@pcd/passport-ui": "0.15.0", + "@pcd/pcd-types": "0.15.0" }, "devDependencies": { - "@pcd/eslint-config-custom": "0.14.0", - "@pcd/tsconfig": "0.14.0", + "@pcd/eslint-config-custom": "0.15.0", + "@pcd/tsconfig": "0.15.0", "@types/react": "^18.0.22", "@types/react-dom": "^18.0.7", "eslint": "^8.57.0", diff --git a/packages/ui/semaphore-group-pcd-ui/CHANGELOG.md b/packages/ui/semaphore-group-pcd-ui/CHANGELOG.md index 9f8ca548ea..0995ef4476 100644 --- a/packages/ui/semaphore-group-pcd-ui/CHANGELOG.md +++ b/packages/ui/semaphore-group-pcd-ui/CHANGELOG.md @@ -1,5 +1,18 @@ # @pcd/semaphore-group-pcd-ui +## 0.6.0 + +### Minor Changes + +- GPC v4 enhancements, PODValue types, more GPC configurations + +### Patch Changes + +- Updated dependencies + - @pcd/passport-ui@0.15.0 + - @pcd/pcd-types@0.15.0 + - @pcd/semaphore-group-pcd@0.15.0 + ## 0.5.0 ### Minor Changes diff --git a/packages/ui/semaphore-group-pcd-ui/package.json b/packages/ui/semaphore-group-pcd-ui/package.json index 2044eae954..82d9e0a98e 100644 --- a/packages/ui/semaphore-group-pcd-ui/package.json +++ b/packages/ui/semaphore-group-pcd-ui/package.json @@ -1,6 +1,6 @@ { "name": "@pcd/semaphore-group-pcd-ui", - "version": "0.5.0", + "version": "0.6.0", "license": "GPL-3.0-or-later", "main": "./dist/cjs/src/index.js", "module": "./dist/esm/src/index.js", @@ -26,13 +26,13 @@ "clean": "rm -rf dist node_modules *.tsbuildinfo" }, "dependencies": { - "@pcd/semaphore-group-pcd": "0.14.0", - "@pcd/passport-ui": "0.14.0", - "@pcd/pcd-types": "0.14.0" + "@pcd/semaphore-group-pcd": "0.15.0", + "@pcd/passport-ui": "0.15.0", + "@pcd/pcd-types": "0.15.0" }, "devDependencies": { - "@pcd/eslint-config-custom": "0.14.0", - "@pcd/tsconfig": "0.14.0", + "@pcd/eslint-config-custom": "0.15.0", + "@pcd/tsconfig": "0.15.0", "@types/react": "^18.0.22", "@types/react-dom": "^18.0.7", "eslint": "^8.57.0", diff --git a/packages/ui/semaphore-identity-pcd-ui/CHANGELOG.md b/packages/ui/semaphore-identity-pcd-ui/CHANGELOG.md index 86643b1242..ba32d789ea 100644 --- a/packages/ui/semaphore-identity-pcd-ui/CHANGELOG.md +++ b/packages/ui/semaphore-identity-pcd-ui/CHANGELOG.md @@ -1,5 +1,18 @@ # @pcd/semaphore-identity-pcd-ui +## 0.6.0 + +### Minor Changes + +- GPC v4 enhancements, PODValue types, more GPC configurations + +### Patch Changes + +- Updated dependencies + - @pcd/passport-ui@0.15.0 + - @pcd/pcd-types@0.15.0 + - @pcd/semaphore-identity-pcd@0.15.0 + ## 0.5.0 ### Minor Changes diff --git a/packages/ui/semaphore-identity-pcd-ui/package.json b/packages/ui/semaphore-identity-pcd-ui/package.json index a4293f993b..2fe81cb21f 100644 --- a/packages/ui/semaphore-identity-pcd-ui/package.json +++ b/packages/ui/semaphore-identity-pcd-ui/package.json @@ -1,6 +1,6 @@ { "name": "@pcd/semaphore-identity-pcd-ui", - "version": "0.5.0", + "version": "0.6.0", "license": "GPL-3.0-or-later", "main": "./dist/cjs/src/index.js", "module": "./dist/esm/src/index.js", @@ -27,13 +27,13 @@ "clean": "rm -rf dist node_modules *.tsbuildinfo" }, "dependencies": { - "@pcd/semaphore-identity-pcd": "0.14.0", - "@pcd/passport-ui": "0.14.0", - "@pcd/pcd-types": "0.14.0" + "@pcd/semaphore-identity-pcd": "0.15.0", + "@pcd/passport-ui": "0.15.0", + "@pcd/pcd-types": "0.15.0" }, "devDependencies": { - "@pcd/eslint-config-custom": "0.14.0", - "@pcd/tsconfig": "0.14.0", + "@pcd/eslint-config-custom": "0.15.0", + "@pcd/tsconfig": "0.15.0", "@types/react": "^18.0.22", "@types/react-dom": "^18.0.7", "eslint": "^8.57.0", diff --git a/packages/ui/semaphore-signature-pcd-ui/CHANGELOG.md b/packages/ui/semaphore-signature-pcd-ui/CHANGELOG.md index 773eee8c55..b0db5ee502 100644 --- a/packages/ui/semaphore-signature-pcd-ui/CHANGELOG.md +++ b/packages/ui/semaphore-signature-pcd-ui/CHANGELOG.md @@ -1,5 +1,18 @@ # @pcd/semaphore-signature-pcd-ui +## 0.6.0 + +### Minor Changes + +- GPC v4 enhancements, PODValue types, more GPC configurations + +### Patch Changes + +- Updated dependencies + - @pcd/passport-ui@0.15.0 + - @pcd/pcd-types@0.15.0 + - @pcd/semaphore-signature-pcd@0.15.0 + ## 0.5.0 ### Minor Changes diff --git a/packages/ui/semaphore-signature-pcd-ui/package.json b/packages/ui/semaphore-signature-pcd-ui/package.json index d654778a10..267218bcaf 100644 --- a/packages/ui/semaphore-signature-pcd-ui/package.json +++ b/packages/ui/semaphore-signature-pcd-ui/package.json @@ -1,6 +1,6 @@ { "name": "@pcd/semaphore-signature-pcd-ui", - "version": "0.5.0", + "version": "0.6.0", "license": "GPL-3.0-or-later", "main": "./dist/cjs/src/index.js", "module": "./dist/esm/src/index.js", @@ -26,13 +26,13 @@ "clean": "rm -rf dist node_modules *.tsbuildinfo" }, "dependencies": { - "@pcd/semaphore-signature-pcd": "0.14.0", - "@pcd/passport-ui": "0.14.0", - "@pcd/pcd-types": "0.14.0" + "@pcd/semaphore-signature-pcd": "0.15.0", + "@pcd/passport-ui": "0.15.0", + "@pcd/pcd-types": "0.15.0" }, "devDependencies": { - "@pcd/eslint-config-custom": "0.14.0", - "@pcd/tsconfig": "0.14.0", + "@pcd/eslint-config-custom": "0.15.0", + "@pcd/tsconfig": "0.15.0", "@types/react": "^18.0.22", "@types/react-dom": "^18.0.7", "eslint": "^8.57.0", diff --git a/packages/ui/unknown-pcd-ui/CHANGELOG.md b/packages/ui/unknown-pcd-ui/CHANGELOG.md index a6bb7ce1d0..b7ab09d9a4 100644 --- a/packages/ui/unknown-pcd-ui/CHANGELOG.md +++ b/packages/ui/unknown-pcd-ui/CHANGELOG.md @@ -1,5 +1,19 @@ # @pcd/unknown-pcd-ui +## 0.4.0 + +### Minor Changes + +- GPC v4 enhancements, PODValue types, more GPC configurations + +### Patch Changes + +- Updated dependencies + - @pcd/passport-ui@0.15.0 + - @pcd/pcd-types@0.15.0 + - @pcd/util@0.9.0 + - @pcd/unknown-pcd@0.4.0 + ## 0.3.0 ### Minor Changes diff --git a/packages/ui/unknown-pcd-ui/package.json b/packages/ui/unknown-pcd-ui/package.json index 81bacf0766..f401a139e3 100644 --- a/packages/ui/unknown-pcd-ui/package.json +++ b/packages/ui/unknown-pcd-ui/package.json @@ -1,7 +1,7 @@ { "name": "@pcd/unknown-pcd-ui", "private": true, - "version": "0.3.0", + "version": "0.4.0", "license": "MIT", "main": "./dist/cjs/src/index.js", "module": "./dist/esm/src/index.js", @@ -26,15 +26,15 @@ "clean": "rm -rf dist node_modules *.tsbuildinfo" }, "dependencies": { - "@pcd/passport-ui": "0.14.0", - "@pcd/pcd-types": "0.14.0", - "@pcd/unknown-pcd": "0.3.0", - "@pcd/util": "0.8.0", + "@pcd/passport-ui": "0.15.0", + "@pcd/pcd-types": "0.15.0", + "@pcd/unknown-pcd": "0.4.0", + "@pcd/util": "0.9.0", "react": "^18.2.0" }, "devDependencies": { - "@pcd/eslint-config-custom": "0.14.0", - "@pcd/tsconfig": "0.14.0", + "@pcd/eslint-config-custom": "0.15.0", + "@pcd/tsconfig": "0.15.0", "@types/chai": "^4.3.5", "@types/mocha": "^10.0.1", "eslint": "^8.57.0", diff --git a/packages/ui/webauthn-pcd-ui/CHANGELOG.md b/packages/ui/webauthn-pcd-ui/CHANGELOG.md index c7ee21cef9..5a20de4fac 100644 --- a/packages/ui/webauthn-pcd-ui/CHANGELOG.md +++ b/packages/ui/webauthn-pcd-ui/CHANGELOG.md @@ -1,5 +1,18 @@ # @pcd/webauthn-pcd-ui +## 0.6.0 + +### Minor Changes + +- GPC v4 enhancements, PODValue types, more GPC configurations + +### Patch Changes + +- Updated dependencies + - @pcd/passport-ui@0.15.0 + - @pcd/pcd-types@0.15.0 + - @pcd/webauthn-pcd@0.15.0 + ## 0.5.0 ### Minor Changes diff --git a/packages/ui/webauthn-pcd-ui/package.json b/packages/ui/webauthn-pcd-ui/package.json index 510f92e81d..74e667dc43 100644 --- a/packages/ui/webauthn-pcd-ui/package.json +++ b/packages/ui/webauthn-pcd-ui/package.json @@ -1,6 +1,6 @@ { "name": "@pcd/webauthn-pcd-ui", - "version": "0.5.0", + "version": "0.6.0", "license": "GPL-3.0-or-later", "main": "./dist/cjs/src/index.js", "module": "./dist/esm/src/index.js", @@ -26,13 +26,13 @@ "clean": "rm -rf dist node_modules *.tsbuildinfo" }, "dependencies": { - "@pcd/webauthn-pcd": "0.14.0", - "@pcd/passport-ui": "0.14.0", - "@pcd/pcd-types": "0.14.0" + "@pcd/webauthn-pcd": "0.15.0", + "@pcd/passport-ui": "0.15.0", + "@pcd/pcd-types": "0.15.0" }, "devDependencies": { - "@pcd/eslint-config-custom": "0.14.0", - "@pcd/tsconfig": "0.14.0", + "@pcd/eslint-config-custom": "0.15.0", + "@pcd/tsconfig": "0.15.0", "@types/react": "^18.0.22", "@types/react-dom": "^18.0.7", "eslint": "^8.57.0", diff --git a/packages/ui/zk-eddsa-event-ticket-pcd-ui/CHANGELOG.md b/packages/ui/zk-eddsa-event-ticket-pcd-ui/CHANGELOG.md index 21559870ce..1240a3b2f8 100644 --- a/packages/ui/zk-eddsa-event-ticket-pcd-ui/CHANGELOG.md +++ b/packages/ui/zk-eddsa-event-ticket-pcd-ui/CHANGELOG.md @@ -1,5 +1,18 @@ # @pcd/zk-eddsa-event-ticket-pcd-ui +## 0.6.0 + +### Minor Changes + +- GPC v4 enhancements, PODValue types, more GPC configurations + +### Patch Changes + +- Updated dependencies + - @pcd/passport-ui@0.15.0 + - @pcd/pcd-types@0.15.0 + - @pcd/zk-eddsa-event-ticket-pcd@0.10.0 + ## 0.5.0 ### Minor Changes diff --git a/packages/ui/zk-eddsa-event-ticket-pcd-ui/package.json b/packages/ui/zk-eddsa-event-ticket-pcd-ui/package.json index f3ee9d1481..2fa81ca644 100644 --- a/packages/ui/zk-eddsa-event-ticket-pcd-ui/package.json +++ b/packages/ui/zk-eddsa-event-ticket-pcd-ui/package.json @@ -1,6 +1,6 @@ { "name": "@pcd/zk-eddsa-event-ticket-pcd-ui", - "version": "0.5.0", + "version": "0.6.0", "license": "GPL-3.0-or-later", "main": "./dist/cjs/src/index.js", "module": "./dist/esm/src/index.js", @@ -26,13 +26,13 @@ "clean": "rm -rf dist node_modules *.tsbuildinfo" }, "dependencies": { - "@pcd/zk-eddsa-event-ticket-pcd": "0.9.0", - "@pcd/passport-ui": "0.14.0", - "@pcd/pcd-types": "0.14.0" + "@pcd/zk-eddsa-event-ticket-pcd": "0.10.0", + "@pcd/passport-ui": "0.15.0", + "@pcd/pcd-types": "0.15.0" }, "devDependencies": { - "@pcd/eslint-config-custom": "0.14.0", - "@pcd/tsconfig": "0.14.0", + "@pcd/eslint-config-custom": "0.15.0", + "@pcd/tsconfig": "0.15.0", "@types/react": "^18.0.22", "@types/react-dom": "^18.0.7", "eslint": "^8.57.0", diff --git a/packages/ui/zk-eddsa-frog-pcd-ui/CHANGELOG.md b/packages/ui/zk-eddsa-frog-pcd-ui/CHANGELOG.md index 8ae6068ae5..e41a46e601 100644 --- a/packages/ui/zk-eddsa-frog-pcd-ui/CHANGELOG.md +++ b/packages/ui/zk-eddsa-frog-pcd-ui/CHANGELOG.md @@ -1,5 +1,18 @@ # @pcd/zk-eddsa-frog-pcd-ui +## 0.6.0 + +### Minor Changes + +- GPC v4 enhancements, PODValue types, more GPC configurations + +### Patch Changes + +- Updated dependencies + - @pcd/passport-ui@0.15.0 + - @pcd/pcd-types@0.15.0 + - @pcd/zk-eddsa-frog-pcd@0.7.0 + ## 0.5.0 ### Minor Changes diff --git a/packages/ui/zk-eddsa-frog-pcd-ui/package.json b/packages/ui/zk-eddsa-frog-pcd-ui/package.json index 3ca2d5d7ba..c9e5338416 100644 --- a/packages/ui/zk-eddsa-frog-pcd-ui/package.json +++ b/packages/ui/zk-eddsa-frog-pcd-ui/package.json @@ -1,6 +1,6 @@ { "name": "@pcd/zk-eddsa-frog-pcd-ui", - "version": "0.5.0", + "version": "0.6.0", "license": "GPL-3.0-or-later", "main": "./dist/cjs/src/index.js", "module": "./dist/esm/src/index.js", @@ -26,13 +26,13 @@ "clean": "rm -rf dist node_modules *.tsbuildinfo" }, "dependencies": { - "@pcd/zk-eddsa-frog-pcd": "0.6.0", - "@pcd/passport-ui": "0.14.0", - "@pcd/pcd-types": "0.14.0" + "@pcd/zk-eddsa-frog-pcd": "0.7.0", + "@pcd/passport-ui": "0.15.0", + "@pcd/pcd-types": "0.15.0" }, "devDependencies": { - "@pcd/eslint-config-custom": "0.14.0", - "@pcd/tsconfig": "0.14.0", + "@pcd/eslint-config-custom": "0.15.0", + "@pcd/tsconfig": "0.15.0", "@types/react": "^18.0.22", "@types/react-dom": "^18.0.7", "eslint": "^8.57.0", diff --git a/scripts/new-version-release.sh b/scripts/new-version-release.sh old mode 100644 new mode 100755 diff --git a/turbo.json b/turbo.json index 8ebe174b2e..5fafbc8b38 100644 --- a/turbo.json +++ b/turbo.json @@ -119,6 +119,9 @@ "EMBEDDED_ZAPPS", "DEVCON_TICKET_QUERY_ORIGINS", "GENERATED_CHUNKS", + "TELEGRAM_CHAT_TO_PRODUCT_IDS", + "IGNORE_NON_PRIORITY_FEEDS", + "PRIORITY_FEED_PROVIDER_URLS", "//// add env vars above this line ////" ], "globalEnv": [ @@ -241,6 +244,8 @@ "LOCAL_FILE_SERVICE_ENABLED", "SELF_HOSTED_PODBOX_MODE", "GENERIC_ISSUANCE_TEST_MODE", + "PRETIX_BATCH_ENABLED_FOR", + "DB_POOL_SIZE", "//// add env vars above this line ////" ] } diff --git a/yarn.lock b/yarn.lock index b00f0349e0..c3c98d8fbd 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7,6 +7,16 @@ resolved "https://registry.yarnpkg.com/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz#bd9154aec9983f77b3a034ecaa015c2e4201f6cf" integrity sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA== +"@adraffy/ens-normalize@1.10.0": + version "1.10.0" + resolved "https://registry.yarnpkg.com/@adraffy/ens-normalize/-/ens-normalize-1.10.0.tgz#d2a39395c587e092d77cbbc80acf956a54f38bf7" + integrity sha512-nA9XHtlAkYfJxY7bce8DcN7eKxWWCWkU+1GR9d+U6MbNpfwQp8TI7vqOsBsMcHoT4mBu2kypKoSKnghEzOOq5Q== + +"@adraffy/ens-normalize@1.10.1": + version "1.10.1" + resolved "https://registry.yarnpkg.com/@adraffy/ens-normalize/-/ens-normalize-1.10.1.tgz#63430d04bd8c5e74f8d7d049338f1cd9d4f02069" + integrity sha512-96Z2IP3mYmF1Xg2cDm8f1gWGf/HUVedQ3FMifV4kG/PQ4yEP51xDtRAEfhVNt5f/uzpNkZHwWQuUcu6D6K+Ekw== + "@alloc/quick-lru@^5.2.0": version "5.2.0" resolved "https://registry.yarnpkg.com/@alloc/quick-lru/-/quick-lru-5.2.0.tgz#7bf68b20c0a350f936915fcae06f58e32007ce30" @@ -4332,12 +4342,19 @@ dependencies: "@noble/hashes" "1.3.1" +"@noble/curves@1.2.0": + version "1.2.0" + resolved "https://registry.yarnpkg.com/@noble/curves/-/curves-1.2.0.tgz#92d7e12e4e49b23105a2555c6984d41733d65c35" + integrity sha512-oYclrNgRaM9SsBUBVbb8M6DTV7ZHRTKugureoYEncY5c65HOmRzvSiTE3y5CYaPYJA/GVkrhXEoF0M3Ya9PMnw== + dependencies: + "@noble/hashes" "1.3.2" + "@noble/hashes@1.3.1": version "1.3.1" resolved "https://registry.yarnpkg.com/@noble/hashes/-/hashes-1.3.1.tgz#8831ef002114670c603c458ab8b11328406953a9" integrity sha512-EbqwksQwz9xDRGfDST86whPBgM65E0OH/pCgqW0GBVzO22bNE+NuIbeTb714+IfSjU3aRk47EUvXIb5bTsenKA== -"@noble/hashes@~1.3.0", "@noble/hashes@~1.3.1": +"@noble/hashes@1.3.2", "@noble/hashes@~1.3.0", "@noble/hashes@~1.3.1": version "1.3.2" resolved "https://registry.yarnpkg.com/@noble/hashes/-/hashes-1.3.2.tgz#6f26dbc8fbc7205873ce3cee2f690eba0d421b39" integrity sha512-MVC8EAQp7MvEcm30KWENFjgR+Mkmf+D189XJTkFIlwohU5hcBbn1ZkKq7KVTi2Hme3PMGF390DaL52beVrIihQ== @@ -5196,12 +5213,12 @@ nanoevents "^9.0.0" valibot "^0.42.0" -"@parcnet-js/client-helpers@^1.0.7": - version "1.0.7" - resolved "https://registry.yarnpkg.com/@parcnet-js/client-helpers/-/client-helpers-1.0.7.tgz#64f83b3f6a164a2fc903033fefcea30d5ddf4971" - integrity sha512-lzXJs+aQNiMecrOfFS/4MblmPuNvwN5K2navXyGeZ9yrgZRAupz/W+SLjcDA9Swa0vHAms22KFLy3o616Zhwxw== +"@parcnet-js/client-helpers@^1.0.8": + version "1.0.8" + resolved "https://registry.yarnpkg.com/@parcnet-js/client-helpers/-/client-helpers-1.0.8.tgz#b0a865630e92b4b2574c15fdbea3947616c87b2e" + integrity sha512-xD/jrmDjwZtbSOE2oHdV1ejYiiDrhoTh0Ysyg97RYl+mYhgy4/24jw3Ueq2iuu2XGwjZiISOcPnjO1mESNWjgQ== dependencies: - "@parcnet-js/client-rpc" "1.1.6" + "@parcnet-js/client-rpc" "1.2.0" valibot "^0.42.0" "@parcnet-js/client-rpc@1.1.6", "@parcnet-js/client-rpc@^1.1.6": @@ -5214,6 +5231,16 @@ "@pcd/pod" "^0.4.0" valibot "^0.42.0" +"@parcnet-js/client-rpc@1.2.0", "@parcnet-js/client-rpc@^1.2.0": + version "1.2.0" + resolved "https://registry.yarnpkg.com/@parcnet-js/client-rpc/-/client-rpc-1.2.0.tgz#b6b12442456296ee4897c32606183a5309b0f618" + integrity sha512-Mmv+inaoWu13buhCQJHKUrSqIJbBWFDcHFDQh7R+qTWjgPX3iB8nF8tSvujv6OsKNLj0mj8k0sTj+bKZG4Lfag== + dependencies: + "@parcnet-js/podspec" "1.2.0" + "@pcd/gpc" "^0.4.0" + "@pcd/pod" "^0.5.0" + valibot "^0.42.0" + "@parcnet-js/podspec@1.1.3", "@parcnet-js/podspec@^1.1.3": version "1.1.3" resolved "https://registry.yarnpkg.com/@parcnet-js/podspec/-/podspec-1.1.3.tgz#ab3ff3e1ad62d1ad488b6fb72d12ce32c31b8b30" @@ -5222,6 +5249,14 @@ "@pcd/gpc" "^0.3.0" "@pcd/pod" "^0.4.0" +"@parcnet-js/podspec@1.2.0", "@parcnet-js/podspec@^1.2.0": + version "1.2.0" + resolved "https://registry.yarnpkg.com/@parcnet-js/podspec/-/podspec-1.2.0.tgz#b584ccb48c41de43f245ce2848f1132ab34d0189" + integrity sha512-VOksMRk9POo+mECc3VS7+YGDIv+yQ9Tu+bf8C9jZRnn9sKL8p8FE4fKdINZFimEeTe7xdR3dm47LwRcghFcWLQ== + dependencies: + "@pcd/gpc" "^0.4.0" + "@pcd/pod" "^0.5.0" + "@parcnet-js/ticket-spec@^1.1.8": version "1.1.8" resolved "https://registry.yarnpkg.com/@parcnet-js/ticket-spec/-/ticket-spec-1.1.8.tgz#4c26a17401af0fd37d5e46576b654ba4ce16e5df" @@ -5230,10 +5265,31 @@ "@parcnet-js/client-rpc" "1.1.6" "@parcnet-js/podspec" "1.1.3" -"@pcd/eslint-config-custom@0.13.0": - version "0.13.0" - resolved "https://registry.yarnpkg.com/@pcd/eslint-config-custom/-/eslint-config-custom-0.13.0.tgz#cb62252d7073406c43e93b56522637b786fe3826" - integrity sha512-+JbOjiPObh+cwGVyY6++RVuMZR+S98p3xK0Xc9tIfZqvg2AuhmbX4rvuxiZ3NA4ZREYGj//7kH4InzbFr2mQpA== +"@pcd/gpc@^0.3.0": + version "0.3.0" + resolved "https://registry.yarnpkg.com/@pcd/gpc/-/gpc-0.3.0.tgz#d046b7aa472b02a808c343b2a16825d14618fb68" + integrity sha512-gaDwb76PYYm+qJUZu+gYWbpJKjbEAI+UPO+yaPYCURLPK+8iUMB3xIv6F3CCJNICQdpcwOVMpnWOu+5wzzwqhA== + dependencies: + "@pcd/gpcircuits" "0.4.0" + "@pcd/pod" "0.4.0" + "@pcd/util" "0.8.0" + "@semaphore-protocol/identity" "^3.15.2" + json-bigint "^1.0.0" + lodash "^4.17.21" + semaphore-identity-v4 "npm:@semaphore-protocol/identity@^4.0.3" + snarkjs "^0.7.4" + url-join "^4.0.1" + valibot "^0.42.1" + +"@pcd/gpcircuits@0.4.0": + version "0.4.0" + resolved "https://registry.yarnpkg.com/@pcd/gpcircuits/-/gpcircuits-0.4.0.tgz#189bf3806c214034e94b0cac0c0b2784f6f90915" + integrity sha512-rn1pkRTQit/maD80bqB2fb84yN22iTWvZWIjgOV6Y84jAZ1uyU4hfbEUJ4q6pdgb4vENiFu9g3pHGge7My9ZTQ== + dependencies: + "@pcd/pod" "0.4.0" + fastfile "0.0.20" + snarkjs "^0.7.4" + url-join "4.0.1" "@pcd/libsodium-sumo@^0.7.15": version "0.7.15" @@ -5247,15 +5303,33 @@ dependencies: "@pcd/libsodium-sumo" "^0.7.15" +"@pcd/pod@0.4.0", "@pcd/pod@^0.4.0": + version "0.4.0" + resolved "https://registry.yarnpkg.com/@pcd/pod/-/pod-0.4.0.tgz#4a7ea942fbcdb63ad9d0ea5198670781d4e669a2" + integrity sha512-A90GK1cv/t3pxB9YiiLIXDsJldp3YcmCJchRSbVvFfA9Q2pleumNRpFadwmweLqGf5Er9n1C7AWtiEt07K3rIw== + dependencies: + "@pcd/util" "0.8.0" + "@zk-kit/eddsa-poseidon" "1.0.3" + "@zk-kit/lean-imt" "2.2.1" + "@zk-kit/utils" "1.2.1" + js-sha256 "^0.10.1" + poseidon-lite "^0.3.0" + "@pcd/proto-pod-gpc-artifacts@0.13.0": version "0.13.0" resolved "https://registry.yarnpkg.com/@pcd/proto-pod-gpc-artifacts/-/proto-pod-gpc-artifacts-0.13.0.tgz#ce15130bd275dc38ad83df6fccd7ef0131a5bffd" integrity sha512-SFKV8gmFCyZ6WIOcJPXCdx4I1gNavIw+5u7TFU8L6/DqtUPWZ1/SubyAChb7aTetfwNgJTyid/VL9fEkJYSThA== -"@pcd/tsconfig@0.13.0": - version "0.13.0" - resolved "https://registry.yarnpkg.com/@pcd/tsconfig/-/tsconfig-0.13.0.tgz#4c726a9c474ee50f083bef6b3b81b922256416c0" - integrity sha512-OSK7SgGnJOClpGXJJlGoua+2ScBySHOSGxASq/ulC6p3ijERnJCLMzxPLUnxVRNpSGaHcqXBZgAp5XKbVZZm1A== +"@pcd/util@0.8.0": + version "0.8.0" + resolved "https://registry.yarnpkg.com/@pcd/util/-/util-0.8.0.tgz#acae365322ee23952ee69bf888ccca93228cd0b8" + integrity sha512-KG1V8O+o8Awr9iHH9I1eVeqHGlm3F6zqzvOJzXKe/bViE8A31DuiZoeHCVPFRA5+03d+qY4tWQJKOxYGQL6Kww== + dependencies: + buffer "^6.0.3" + email-validator "^2.0.4" + js-sha256 "^0.10.1" + secure-random "^1.1.2" + uuid "^9.0.0" "@peculiar/asn1-android@^2.3.3": version "2.3.6" @@ -5909,6 +5983,24 @@ "@noble/hashes" "~1.3.0" "@scure/base" "~1.1.0" +"@semaphore-protocol/core@^4.0.3", "@semaphore-protocol/core@^4.5.0": + version "4.7.2" + resolved "https://registry.yarnpkg.com/@semaphore-protocol/core/-/core-4.7.2.tgz#93fe7f8fc4ed60a2e01a5576c13527d7db45b93b" + integrity sha512-bWec8FK/Z94gYqIj0Elmcizbz9VTfKGG7EHkloi3dXPcAsdcjXO0eRPWru2lpC7XhebpUb6k4Kcq+eWYbJvpLQ== + dependencies: + "@semaphore-protocol/group" "4.7.2" + "@semaphore-protocol/identity" "4.7.2" + "@semaphore-protocol/proof" "4.7.2" + +"@semaphore-protocol/group@4.7.2": + version "4.7.2" + resolved "https://registry.yarnpkg.com/@semaphore-protocol/group/-/group-4.7.2.tgz#c04aecf0e8d132707941e6d4593c94828c163d1f" + integrity sha512-J5dRhAabh1PlsI2w7HyKGOqpwCyXCAYS0jVAvkP6EGbbTsIaTXny9swQU2SmVtowlI71nzBCcH9IPAgt7huoGQ== + dependencies: + "@zk-kit/lean-imt" "2.2.2" + "@zk-kit/utils" "1.2.1" + poseidon-lite "0.3.0" + "@semaphore-protocol/group@^3.15.2": version "3.15.2" resolved "https://registry.yarnpkg.com/@semaphore-protocol/group/-/group-3.15.2.tgz#31d24b302982fd51760548cdfc0a7df6e3523a75" @@ -5919,6 +6011,16 @@ "@ethersproject/keccak256" "^5.7.0" "@zk-kit/incremental-merkle-tree" "1.1.0" +"@semaphore-protocol/identity@4.7.2": + version "4.7.2" + resolved "https://registry.yarnpkg.com/@semaphore-protocol/identity/-/identity-4.7.2.tgz#9935a743eb0c2c913514d829e22a2aebea74de75" + integrity sha512-chNxrmlhTQ2peJTYnN4UaFFBYefmo0PUSeo0Wa8GcKC+CfG+uAlPlgZyOU/Pz4sV35UnfRfgqEvcq6tnaN5uFw== + dependencies: + "@zk-kit/baby-jubjub" "1.0.3" + "@zk-kit/eddsa-poseidon" "1.0.4" + "@zk-kit/utils" "1.2.1" + poseidon-lite "0.3.0" + "@semaphore-protocol/identity@^2.6.1": version "2.6.1" resolved "https://registry.yarnpkg.com/@semaphore-protocol/identity/-/identity-2.6.1.tgz#49385c1004261ca2e192c43aa04005ce6ef82d83" @@ -5941,15 +6043,16 @@ "@ethersproject/strings" "^5.6.1" js-sha512 "^0.8.0" -"@semaphore-protocol/identity@^4.0.3", "@semaphore-protocol/identity@^4.5.0": - version "4.5.0" - resolved "https://registry.yarnpkg.com/@semaphore-protocol/identity/-/identity-4.5.0.tgz#d5c412eb609df2686b7216825ec88670ef73461b" - integrity sha512-TIKxF2Lir1LppDQDJU6Z/aJUkocHT03BLpzv5vFEdCo/IT4g/4BhbFp2UQui7HyDE+JgMfUASXfScbFfo/5ULA== +"@semaphore-protocol/proof@4.7.2": + version "4.7.2" + resolved "https://registry.yarnpkg.com/@semaphore-protocol/proof/-/proof-4.7.2.tgz#89e371eeaf17e1a5a90de5c32645c8f75e519d6b" + integrity sha512-a/7Ad53QS9Z9lHkGrVtK7EHrqglzGXi1kaBn8XE4qCxiYR2CsoLr1tZW2s1UwYCobHFZn5HnNMKTEhR0fTHIew== dependencies: - "@zk-kit/baby-jubjub" "1.0.3" - "@zk-kit/eddsa-poseidon" "1.0.4" + "@semaphore-protocol/utils" "4.7.2" + "@zk-kit/artifacts" "1.8.0" "@zk-kit/utils" "1.2.1" - poseidon-lite "0.3.0" + ethers "6.10.0" + snarkjs "0.7.4" "@semaphore-protocol/proof@npm:@pcd/semaphore-proof-v3@^3.15.2": version "3.15.2" @@ -5964,6 +6067,13 @@ "@zk-kit/incremental-merkle-tree" "0.4.3" poseidon-lite "^0.2.0" +"@semaphore-protocol/utils@4.7.2": + version "4.7.2" + resolved "https://registry.yarnpkg.com/@semaphore-protocol/utils/-/utils-4.7.2.tgz#89f0201423544c94428d8bfcb225593297842635" + integrity sha512-S7t5aU2qCsyXC3vlDdDEC71RO/udEeTOrD0Sp5FqISvccA89LFkVNZuttVZar8uyKEs+E3FyAhcQs9YlzNoPhQ== + dependencies: + ethers "^6.11.1" + "@sendgrid/client@^7.7.0": version "7.7.0" resolved "https://registry.yarnpkg.com/@sendgrid/client/-/client-7.7.0.tgz#f8f67abd604205a0d0b1af091b61517ef465fdbf" @@ -7345,11 +7455,23 @@ resolved "https://registry.yarnpkg.com/@types/node/-/node-20.6.0.tgz#9d7daa855d33d4efec8aea88cd66db1c2f0ebe16" integrity sha512-najjVq5KN2vsH2U/xyh2opaSEz6cZMR2SetLIlxlj08nOcmPOemJmUK2o4kUzfLqfrWE0PIrNeE16XhYDd3nqg== +"@types/node@18.15.13": + version "18.15.13" + resolved "https://registry.yarnpkg.com/@types/node/-/node-18.15.13.tgz#f64277c341150c979e42b00e4ac289290c9df469" + integrity sha512-N+0kuo9KgrUQ1Sn/ifDXsvg0TTleP7rIy4zOBGECxAljqvqfqpTfzx0Q1NUedOixRMBfe2Whhb056a42cWs26Q== + "@types/node@20.4.10": version "20.4.10" resolved "https://registry.yarnpkg.com/@types/node/-/node-20.4.10.tgz#73c9480791e3ddeb4887a660fc93a7f59353ad45" integrity sha512-vwzFiiy8Rn6E0MtA13/Cxxgpan/N6UeNYR9oUu6kuJWxu6zCk98trcDp8CBhbtaeuq9SykCmXkFr2lWLoPcvLg== +"@types/node@22.7.5": + version "22.7.5" + resolved "https://registry.yarnpkg.com/@types/node/-/node-22.7.5.tgz#cfde981727a7ab3611a481510b473ae54442b92b" + integrity sha512-jML7s2NAzMWc//QSJ1a3prpk78cOPchGvXJsC3C6R6PSMoooztvRVQEz89gmBTBY1SPMaqo5teB4uNHPdetShQ== + dependencies: + undici-types "~6.19.2" + "@types/node@>=8.0.0 <15": version "14.18.59" resolved "https://registry.yarnpkg.com/@types/node/-/node-14.18.59.tgz#2b61a51d875e2a4deb0c6b498ff21a78e691edc6" @@ -8270,6 +8392,11 @@ dependencies: "@zag-js/dom-query" "0.16.0" +"@zk-kit/artifacts@1.8.0": + version "1.8.0" + resolved "https://registry.yarnpkg.com/@zk-kit/artifacts/-/artifacts-1.8.0.tgz#afeab93754da7429d67f0c13d6935749d454bc56" + integrity sha512-G2rQ1BxYt9CuVyU4Egc4ceSLLWx9BRrtFGZWS0RWwHhAMfSV/Fq9Qz6OX02leFzTbi7Tr3bTP6DgDSqr28OQnw== + "@zk-kit/baby-jubjub@1.0.3", "@zk-kit/baby-jubjub@^1.0.3": version "1.0.3" resolved "https://registry.yarnpkg.com/@zk-kit/baby-jubjub/-/baby-jubjub-1.0.3.tgz#8d2eccd20d729f1dbd39203dbff9a245a61dea76" @@ -8284,6 +8411,15 @@ dependencies: circomlib "^2.0.5" +"@zk-kit/eddsa-poseidon@1.0.3": + version "1.0.3" + resolved "https://registry.yarnpkg.com/@zk-kit/eddsa-poseidon/-/eddsa-poseidon-1.0.3.tgz#0da41ca6a6888072db7639d8499edf2eb0650d79" + integrity sha512-VyTu5jXHDqno3MBDWhoIwGz0vO/HB1X/2wqwope4JRvS4V8S9sYTwH3paf7ynImrJV7L/zK61RHxpGKbNemYRQ== + dependencies: + "@zk-kit/baby-jubjub" "1.0.3" + "@zk-kit/utils" "1.2.1" + buffer "6.0.3" + "@zk-kit/eddsa-poseidon@1.0.4": version "1.0.4" resolved "https://registry.yarnpkg.com/@zk-kit/eddsa-poseidon/-/eddsa-poseidon-1.0.4.tgz#80e20fd94eca610002e58a5dc8c1716458f0cb60" @@ -8323,13 +8459,20 @@ resolved "https://registry.yarnpkg.com/@zk-kit/incremental-merkle-tree/-/incremental-merkle-tree-1.1.0.tgz#6b0ccce56f9e05ccf73f7ea4fa746d5ef7d24b1d" integrity sha512-WnNR/GQse3lX8zOHMU8zwhgX8u3qPoul8w4GjJ0WDHq+VGJimo7EGheRZ/ILeBQabnlzAerdv3vBqYBehBeoKA== -"@zk-kit/lean-imt@^2.2.1": +"@zk-kit/lean-imt@2.2.1", "@zk-kit/lean-imt@^2.2.1": version "2.2.1" resolved "https://registry.yarnpkg.com/@zk-kit/lean-imt/-/lean-imt-2.2.1.tgz#aa24ed3d281cff270013c3654fa1eec6f785ccef" integrity sha512-Zq5yunUYu+ztp9RR5nuqiG1GpK1wjUoAjC0+x/MB95sI/Ns7zCxpzxo/Om9E0gme74Y3jO9KM5UUh3f9tqU++w== dependencies: "@zk-kit/utils" "1.2.1" +"@zk-kit/lean-imt@2.2.2": + version "2.2.2" + resolved "https://registry.yarnpkg.com/@zk-kit/lean-imt/-/lean-imt-2.2.2.tgz#79c8bd70fc0d444638328cb4781479b14c69a9dd" + integrity sha512-rscIPEgBBcu9vP/DJ3J+3187G/ObKETl343G5enPawNT81oeQSdHx3e2ZapTC+GfrZ/AS2AHHUOpRS1FfdSwjg== + dependencies: + "@zk-kit/utils" "1.2.1" + "@zk-kit/utils@1.2.1", "@zk-kit/utils@^1.2.1": version "1.2.1" resolved "https://registry.yarnpkg.com/@zk-kit/utils/-/utils-1.2.1.tgz#6cb38120535c73ab68cd0f09684882af148f256d" @@ -8410,6 +8553,11 @@ aes-js@3.0.0: resolved "https://registry.yarnpkg.com/aes-js/-/aes-js-3.0.0.tgz#e21df10ad6c2053295bcbb8dab40b09dbea87e4d" integrity sha512-H7wUZRn8WpTq9jocdxQ2c8x2sKo9ZVmzfRE13GiNJXfp7NcKYEdvl3vspKjXox6RIG2VtaRe4JFvxG4rqp2Zuw== +aes-js@4.0.0-beta.5: + version "4.0.0-beta.5" + resolved "https://registry.yarnpkg.com/aes-js/-/aes-js-4.0.0-beta.5.tgz#8d2452c52adedebc3a3e28465d858c11ca315873" + integrity sha512-G965FqalsNyrPqgEGON7nIx1e/OVENSgiEIzyC63haUMuvNnwIgIjMs52hlTCKhkBny7A2ORNlfY9Zu+jmGk1Q== + agent-base@6: version "6.0.2" resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77" @@ -12397,6 +12545,19 @@ ethereumjs-util@^7.1.1, ethereumjs-util@^7.1.2, ethereumjs-util@^7.1.5: ethereum-cryptography "^0.1.3" rlp "^2.2.4" +ethers@6.10.0: + version "6.10.0" + resolved "https://registry.yarnpkg.com/ethers/-/ethers-6.10.0.tgz#20f3c63c60d59a993f8090ad423d8a3854b3b1cd" + integrity sha512-nMNwYHzs6V1FR3Y4cdfxSQmNgZsRj1RiTU25JwvnJLmyzw9z3SKxNc2XKDuiXXo/v9ds5Mp9m6HBabgYQQ26tA== + dependencies: + "@adraffy/ens-normalize" "1.10.0" + "@noble/curves" "1.2.0" + "@noble/hashes" "1.3.2" + "@types/node" "18.15.13" + aes-js "4.0.0-beta.5" + tslib "2.4.0" + ws "8.5.0" + ethers@^5.5.1, ethers@^5.7.2: version "5.7.2" resolved "https://registry.yarnpkg.com/ethers/-/ethers-5.7.2.tgz#3a7deeabbb8c030d4126b24f84e525466145872e" @@ -12433,6 +12594,19 @@ ethers@^5.5.1, ethers@^5.7.2: "@ethersproject/web" "5.7.1" "@ethersproject/wordlists" "5.7.0" +ethers@^6.11.1: + version "6.13.4" + resolved "https://registry.yarnpkg.com/ethers/-/ethers-6.13.4.tgz#bd3e1c3dc1e7dc8ce10f9ffb4ee40967a651b53c" + integrity sha512-21YtnZVg4/zKkCQPjrDj38B1r4nQvTZLopUGMLQ1ePU2zV/joCfDC3t3iKQjWRzjjjbzR+mdAIoikeBRNkdllA== + dependencies: + "@adraffy/ens-normalize" "1.10.1" + "@noble/curves" "1.2.0" + "@noble/hashes" "1.3.2" + "@types/node" "22.7.5" + aes-js "4.0.0-beta.5" + tslib "2.7.0" + ws "8.17.1" + ethjs-unit@0.1.6: version "0.1.6" resolved "https://registry.yarnpkg.com/ethjs-unit/-/ethjs-unit-0.1.6.tgz#c665921e476e87bce2a9d588a6fe0405b2c41699" @@ -13996,11 +14170,6 @@ html-escaper@^2.0.0: resolved "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.2.tgz#dfd60027da36a36dfcbe236262c00a5822681453" integrity sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg== -html-to-image@^1.11.11: - version "1.11.11" - resolved "https://registry.yarnpkg.com/html-to-image/-/html-to-image-1.11.11.tgz#c0f8a34dc9e4b97b93ff7ea286eb8562642ebbea" - integrity sha512-9gux8QhvjRO/erSnDPv28noDZcPZmYE7e1vFsBLKLlRlKDSqNJYebj6Qz1TGd5lsRV+X+xYyjCKjuZdABinWjA== - html-url-attributes@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/html-url-attributes/-/html-url-attributes-3.0.0.tgz#fc4abf0c3fb437e2329c678b80abb3c62cff6f08" @@ -14177,19 +14346,6 @@ ieee754@^1.1.13, ieee754@^1.2.1: resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352" integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA== -iframe-resizer-react@1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/iframe-resizer-react/-/iframe-resizer-react-1.1.0.tgz#5009e019b7a5c7f1c009bff5bcdf0dbf33557465" - integrity sha512-FrytSq91AIJaDgE+6uK/Vdd6IR8CrwLoZ6eGmL2qQMPTzF0xlSV2jaSzRRUh5V2fttD7vzl21jvBl97bV40eBw== - dependencies: - iframe-resizer "^4.3.0" - warning "^4.0.3" - -iframe-resizer@^4.3.0: - version "4.4.5" - resolved "https://registry.yarnpkg.com/iframe-resizer/-/iframe-resizer-4.4.5.tgz#f5048636e7f2fb5d9a09cc2ae78eb2da55ad555c" - integrity sha512-U8bCywf/Gh07O69RXo6dXAzTtODQrxaHGHRI7Nt4ipXsuq6EMxVsOP/jjaP43YtXz/ibESS0uSVDN3sOGCzSmw== - ignore-by-default@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/ignore-by-default/-/ignore-by-default-1.0.1.tgz#48ca6d72f6c6a3af00a9ad4ae6876be3889e2b09" @@ -17915,6 +18071,11 @@ parse-ms@^3.0.0: resolved "https://registry.yarnpkg.com/parse-ms/-/parse-ms-3.0.0.tgz#3ea24a934913345fcc3656deda72df921da3a70e" integrity sha512-Tpb8Z7r7XbbtBTrM9UhpkzzaMrqA2VXMT3YChzYltwV3P3pM6t8wl7TvpMnSTosz1aQAdVib7kdoys7vYOPerw== +parse-ms@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/parse-ms/-/parse-ms-4.0.0.tgz#c0c058edd47c2a590151a718990533fd62803df4" + integrity sha512-TXfryirbmq34y8QBwgqCVLi+8oA3oWx2eAnSn62ITyEhEYaWRlVZ2DvMM9eZbMs/RfxPu/PK/aBLyGj4IrqMHw== + parse-passwd@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6" @@ -18569,6 +18730,13 @@ pretty-ms@^8.0.0: dependencies: parse-ms "^3.0.0" +pretty-ms@^9.1.0: + version "9.2.0" + resolved "https://registry.yarnpkg.com/pretty-ms/-/pretty-ms-9.2.0.tgz#e14c0aad6493b69ed63114442a84133d7e560ef0" + integrity sha512-4yf0QO/sllf/1zbZWYnvWw3NxCQwLXKzIj0G849LSufP15BXKM0rbD2Z3wVnkMfjdn/CB0Dpp444gYAACdsplg== + dependencies: + parse-ms "^4.0.0" + prisma@^4.12.0: version "4.16.2" resolved "https://registry.yarnpkg.com/prisma/-/prisma-4.16.2.tgz#469e0a0991c6ae5bcde289401726bb012253339e" @@ -18770,11 +18938,6 @@ pvutils@^1.1.3: resolved "https://registry.yarnpkg.com/pvutils/-/pvutils-1.1.3.tgz#f35fc1d27e7cd3dfbd39c0826d173e806a03f5a3" integrity sha512-pMpnA0qRdFp32b1sJl1wOJNxZLQ2cbQx+k6tjNtZ8CpvVhNqEPRgivZ2WOUev2YMajecdH7ctUPDvEe87nariQ== -qr-image@^3.2.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/qr-image/-/qr-image-3.2.0.tgz#9fa8295beae50c4a149cf9f909a1db464a8672e8" - integrity sha512-rXKDS5Sx3YipVsqmlMJsJsk6jXylEpiHRC2+nJy66fxA5ExYyGa4PqwteW69SaVmAb2OQ18HbYriT7cGQMbduw== - qrcode@^1.5.4: version "1.5.4" resolved "https://registry.yarnpkg.com/qrcode/-/qrcode-1.5.4.tgz#5cb81d86eb57c675febb08cf007fff963405da88" @@ -19919,6 +20082,16 @@ seek-bzip@^1.0.5: dependencies: commander "^2.8.1" +"semaphore-identity-v4@npm:@semaphore-protocol/identity@^4.0.3": + version "4.7.2" + resolved "https://registry.yarnpkg.com/@semaphore-protocol/identity/-/identity-4.7.2.tgz#9935a743eb0c2c913514d829e22a2aebea74de75" + integrity sha512-chNxrmlhTQ2peJTYnN4UaFFBYefmo0PUSeo0Wa8GcKC+CfG+uAlPlgZyOU/Pz4sV35UnfRfgqEvcq6tnaN5uFw== + dependencies: + "@zk-kit/baby-jubjub" "1.0.3" + "@zk-kit/eddsa-poseidon" "1.0.4" + "@zk-kit/utils" "1.2.1" + poseidon-lite "0.3.0" + semver-match@0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/semver-match/-/semver-match-0.1.1.tgz#e7ccb31f83fd4a0e377d66387afd8ca3a329b5fc" @@ -20271,6 +20444,22 @@ snarkjs@0.5.0, snarkjs@^0.5.0: logplease "^1.2.15" r1csfile "0.0.41" +snarkjs@0.7.4, snarkjs@^0.7.4: + version "0.7.4" + resolved "https://registry.yarnpkg.com/snarkjs/-/snarkjs-0.7.4.tgz#b9ad5813f055ab84d33f1831a6f1f34a71b6cd46" + integrity sha512-x4cOCR4YXSyBlLtfnUUwfbZrw8wFd/Y0lk83eexJzKwZB8ELdpH+10ts8YtDsm2/a3WK7c7p514bbE8NpqxW8w== + dependencies: + "@iden3/binfileutils" "0.0.12" + bfj "^7.0.2" + blake2b-wasm "^2.4.0" + circom_runtime "0.1.25" + ejs "^3.1.6" + fastfile "0.0.20" + ffjavascript "0.3.0" + js-sha3 "^0.8.0" + logplease "^1.2.15" + r1csfile "0.0.48" + snarkjs@^0.4.22: version "0.4.27" resolved "https://registry.yarnpkg.com/snarkjs/-/snarkjs-0.4.27.tgz#6f00e17e2b0b197dd69029a65ee570085b49a5f0" @@ -20303,22 +20492,6 @@ snarkjs@^0.7.0: logplease "^1.2.15" r1csfile "0.0.47" -snarkjs@^0.7.4: - version "0.7.4" - resolved "https://registry.yarnpkg.com/snarkjs/-/snarkjs-0.7.4.tgz#b9ad5813f055ab84d33f1831a6f1f34a71b6cd46" - integrity sha512-x4cOCR4YXSyBlLtfnUUwfbZrw8wFd/Y0lk83eexJzKwZB8ELdpH+10ts8YtDsm2/a3WK7c7p514bbE8NpqxW8w== - dependencies: - "@iden3/binfileutils" "0.0.12" - bfj "^7.0.2" - blake2b-wasm "^2.4.0" - circom_runtime "0.1.25" - ejs "^3.1.6" - fastfile "0.0.20" - ffjavascript "0.3.0" - js-sha3 "^0.8.0" - logplease "^1.2.15" - r1csfile "0.0.48" - socks-proxy-agent@^8.0.2: version "8.0.2" resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-8.0.2.tgz#5acbd7be7baf18c46a3f293a840109a430a640ad" @@ -21566,6 +21739,11 @@ tslib@2.4.0: resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.4.0.tgz#7cecaa7f073ce680a05847aa77be941098f36dc3" integrity sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ== +tslib@2.7.0: + version "2.7.0" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.7.0.tgz#d9b40c5c40ab59e8738f297df3087bf1a2690c01" + integrity sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA== + tslib@^1.11.1: version "1.14.1" resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00" @@ -22262,6 +22440,11 @@ undici-types@~5.26.4: resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.26.5.tgz#bcd539893d00b56e964fd2657a4866b221a65617" integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA== +undici-types@~6.19.2: + version "6.19.8" + resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-6.19.8.tgz#35111c9d1437ab83a7cdc0abae2f26d88eda0a02" + integrity sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw== + undici@^5.22.0: version "5.24.0" resolved "https://registry.yarnpkg.com/undici/-/undici-5.24.0.tgz#6133630372894cfeb3c3dab13b4c23866bd344b5" @@ -22797,7 +22980,7 @@ walker@^1.0.8: dependencies: makeerror "1.0.12" -warning@^4.0.1, warning@^4.0.3: +warning@^4.0.1: version "4.0.3" resolved "https://registry.yarnpkg.com/warning/-/warning-4.0.3.tgz#16e9e077eb8a86d6af7d64aa1e05fd85b4678ca3" integrity sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w== @@ -23381,6 +23564,16 @@ ws@7.4.6: resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.6.tgz#5654ca8ecdeee47c33a9a4bf6d28e2be2980377c" integrity sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A== +ws@8.17.1: + version "8.17.1" + resolved "https://registry.yarnpkg.com/ws/-/ws-8.17.1.tgz#9293da530bb548febc95371d90f9c878727d919b" + integrity sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ== + +ws@8.5.0: + version "8.5.0" + resolved "https://registry.yarnpkg.com/ws/-/ws-8.5.0.tgz#bfb4be96600757fe5382de12c670dab984a1ed4f" + integrity sha512-BWX0SWVgLPzYwF8lTzEy1egjhS4S4OEAHfsO8o65WOVsrnSRGaSiUaa9e0ggGlkMTtBlmOpEXiie9RUcBO86qg== + ws@^3.0.0: version "3.3.3" resolved "https://registry.yarnpkg.com/ws/-/ws-3.3.3.tgz#f1cf84fe2d5e901ebce94efaece785f187a228f2"