- - - - - - - - - - - - - {#each Object.entries(socialLinkValues ?? {}) as [network, value]} - {#if value} - - {/if} - {/each} - - {#if description}{description}{/if} + + + + + + + + + + + + + + + {#each Object.entries(socialLinkValues ?? {}) as [network, value]} + {#if value} + + {/if} + {/each} + + {#if description}{description}{/if} + - - - - - - v === null ? undefined : v, - ).length === 0} - projects={mapFilterUndefined( - filterCurrentChainData(data.profileData.chainData).projects, - (v) => (v === null ? undefined : v), - )} - /> - + + + + + + (v === null ? undefined : v)) + .length === 0} + projects={mapFilterUndefined(profileChainData.projects, (v) => + v === null ? undefined : v, + )} + withClaimProjectButton={true} + /> + (v === null ? undefined : v)), + ].length === 0} + votingRounds={data.profileData.votingRounds} + dripLists={mapFilterUndefined(profileChainData.dripLists, (v) => v === null ? undefined : v, - ), - ].length === 0} - votingRounds={data.profileData.votingRounds} - dripLists={mapFilterUndefined( - filterCurrentChainData(data.profileData.chainData).dripLists, - (v) => (v === null ? undefined : v), - )} - /> - - - + )} + withCreateButton={true} + /> + + + + + {/if} diff --git a/src/routes/(pages)/app/(app)/[accountId]/components/linked-identities-card.svelte b/src/routes/(pages)/app/(app)/[accountId]/components/linked-identities-card.svelte new file mode 100644 index 000000000..f3d7a6310 --- /dev/null +++ b/src/routes/(pages)/app/(app)/[accountId]/components/linked-identities-card.svelte @@ -0,0 +1,84 @@ + + + + + + {#if linkedIdentities.length} + Linked Identities + + {#each linkedIdentities as linkedIdentity} + + {#if linkedIdentity.__typename === 'OrcidLinkedIdentity'} + + {/if} + + {/each} + + {:else} + Identities can be used to find and support you. + Learn more + {/if} + {#if canLinkIdentity} + + Link identity + + {/if} + + + diff --git a/src/routes/(pages)/app/(app)/orcids/+layout.server.ts b/src/routes/(pages)/app/(app)/orcids/+layout.server.ts new file mode 100644 index 000000000..c4fdf9169 --- /dev/null +++ b/src/routes/(pages)/app/(app)/orcids/+layout.server.ts @@ -0,0 +1,11 @@ +import network from '$lib/stores/wallet/network'; +import { error } from '@sveltejs/kit'; + +export const load = async () => { + // Only allow ORCID routes on networks where the feature is enabled + if (!network.orcids) { + return error(404); + } + + return {}; +}; diff --git a/src/routes/(pages)/app/(app)/orcids/[orcidId]/+page.server.ts b/src/routes/(pages)/app/(app)/orcids/[orcidId]/+page.server.ts new file mode 100644 index 000000000..1300bded4 --- /dev/null +++ b/src/routes/(pages)/app/(app)/orcids/[orcidId]/+page.server.ts @@ -0,0 +1,48 @@ +import { error } from '@sveltejs/kit'; +import type { PageServerLoad } from './$types'; +import { fetchOrcid, fetchOrcidAccount } from '../../../../../../lib/utils/orcids/fetch-orcid'; +import Orcid from '$lib/utils/orcids/entities'; +import isValidOrcidId from '$lib/utils/orcids/is-valid-orcid-id'; + +export const load = (async ({ params, fetch }) => { + if (!isValidOrcidId(params.orcidId)) { + return error(400, 'Invalid ORCID iD'); + } + + const orcidGqlResponse = await fetchOrcidAccount(params.orcidId, fetch); + const orcidAccount = orcidGqlResponse.orcidLinkedIdentityByOrcid; + // If the backend can't get the ORCID info, then something is deeply wrong + // and we cannot proceed + if (!orcidAccount) { + return error(404); + } + + // If the frontend can't the ORCID info, then there might be a rate + // limiting issue or an API authroization issue. Fake it till you make it. + let orcid = await fetchOrcid(params.orcidId, fetch); + if (!orcid) { + orcid = new Orcid({ + 'orcid-identifier': { + uri: `https://orcid.org/${params.orcidId}`, + path: params.orcidId, + host: 'orcid.org', + }, + person: { + 'last-modified-date': null, + name: { + 'given-names': null, + 'family-name': null, + 'credit-name': null, + }, + biography: null, + 'researcher-urls': null, + 'other-names': null, + }, + }); + } + + return { + orcid: orcid.toJSON(), + orcidAccount, + }; +}) satisfies PageServerLoad; diff --git a/src/routes/(pages)/app/(app)/orcids/[orcidId]/+page.svelte b/src/routes/(pages)/app/(app)/orcids/[orcidId]/+page.svelte new file mode 100644 index 000000000..8bcabe6b8 --- /dev/null +++ b/src/routes/(pages)/app/(app)/orcids/[orcidId]/+page.svelte @@ -0,0 +1,13 @@ + + + diff --git a/src/routes/(pages)/app/(app)/orcids/[orcidId]/components/orcid-avatar.svelte b/src/routes/(pages)/app/(app)/orcids/[orcidId]/components/orcid-avatar.svelte new file mode 100644 index 000000000..68fa5bdf6 --- /dev/null +++ b/src/routes/(pages)/app/(app)/orcids/[orcidId]/components/orcid-avatar.svelte @@ -0,0 +1,55 @@ + + + + + + + diff --git a/src/routes/(pages)/app/(app)/orcids/[orcidId]/components/orcid-badge.svelte b/src/routes/(pages)/app/(app)/orcids/[orcidId]/components/orcid-badge.svelte new file mode 100644 index 000000000..318b1c18a --- /dev/null +++ b/src/routes/(pages)/app/(app)/orcids/[orcidId]/components/orcid-badge.svelte @@ -0,0 +1,165 @@ + + + + + + + + {#if !hideAvatar} + + + + {/if} + {#if !hideType} + ORCID + {/if} + + + + {#if copyable} + + + {#if copySuccess} + + + + {:else} + + + + {/if} + + + {/if} + + + + + + + + diff --git a/src/routes/(pages)/app/(app)/orcids/[orcidId]/components/orcid-name.svelte b/src/routes/(pages)/app/(app)/orcids/[orcidId]/components/orcid-name.svelte new file mode 100644 index 000000000..aa29c078b --- /dev/null +++ b/src/routes/(pages)/app/(app)/orcids/[orcidId]/components/orcid-name.svelte @@ -0,0 +1,32 @@ + + + + +{displayName} diff --git a/src/routes/(pages)/app/(app)/orcids/[orcidId]/components/orcid-profile-fragments.ts b/src/routes/(pages)/app/(app)/orcids/[orcidId]/components/orcid-profile-fragments.ts new file mode 100644 index 000000000..d8cc3acec --- /dev/null +++ b/src/routes/(pages)/app/(app)/orcids/[orcidId]/components/orcid-profile-fragments.ts @@ -0,0 +1,38 @@ +import { gql } from 'graphql-request'; +import { SUPPORTER_PILE_FRAGMENT } from '$lib/components/drip-list-card/methods/get-supporters-pile'; +import { SUPPORTERS_SECTION_SUPPORT_ITEM_FRAGMENT } from '$lib/components/supporters-section/supporters.section.svelte'; +import { MERGE_WITHDRAWABLE_BALANCES_FRAGMENT } from '$lib/utils/merge-withdrawable-balances'; +import { ORCID_PROFILE_HEADER_FRAGMENT } from './orcid-profile-header.svelte'; + +export const ORCID_PROFILE_FRAGMENT = gql` + ${ORCID_PROFILE_HEADER_FRAGMENT} + ${SUPPORTERS_SECTION_SUPPORT_ITEM_FRAGMENT} + ${SUPPORTER_PILE_FRAGMENT} + ${MERGE_WITHDRAWABLE_BALANCES_FRAGMENT} + fragment OrcidProfile on OrcidLinkedIdentity { + ...OrcidProfileHeader + account { + accountId + driver + } + chain + owner { + accountId + } + withdrawableBalances { + ...MergeWithdrawableBalances + } + support { + ...SupportersSectionSupportItem + ...SupporterPile + } + totalEarned { + tokenAddress + amount + } + orcidMetadata { + givenName + familyName + } + } +`; diff --git a/src/routes/(pages)/app/(app)/orcids/[orcidId]/components/orcid-profile-header.svelte b/src/routes/(pages)/app/(app)/orcids/[orcidId]/components/orcid-profile-header.svelte new file mode 100644 index 000000000..7c83a49fd --- /dev/null +++ b/src/routes/(pages)/app/(app)/orcids/[orcidId]/components/orcid-profile-header.svelte @@ -0,0 +1,83 @@ + + + + + + + + + + + {orcidName} + {#if orcid.bio} + {@html twemoji(orcid.bio)} + + {/if} + + {#if orcidAccount.owner} + + {/if} + + {#if shareButton} + + {/if} + + + + + + diff --git a/src/routes/(pages)/app/(app)/orcids/[orcidId]/components/orcid-profile.svelte b/src/routes/(pages)/app/(app)/orcids/[orcidId]/components/orcid-profile.svelte new file mode 100644 index 000000000..1f1cf4323 --- /dev/null +++ b/src/routes/(pages)/app/(app)/orcids/[orcidId]/components/orcid-profile.svelte @@ -0,0 +1,278 @@ + + + + + + + + + + {#if !orcidAccount.isClaimed} + + + {#if withdrawableBalances.length > 0}This ORCID iD has in claimable funds. The owner can collect by claiming their ORCID iD.{:else}This ORCID + iD is unclaimed on {network.label}, but can still receive funds that the owner can collect + later.{/if} + + + + Claim ORCID iD + + + + + {/if} + + + + + + + + + {#if orcidAccount.isClaimed} + + + + + + {:else if withdrawableBalances.length > 0} + + + + + + {/if} + {#if [support].flat().length > 0} + + + supportersSectionSkeleton?.highlightSection()}> + + + + + + {/if} + + + + + + + {#if !orcidAccount.isClaimed && withdrawableBalances.length > 0} + + + + + 0} + showClaimButton={!orcidAccount.isClaimed} + on:claimButtonClick={() => + goto(buildUrl('/app/claim-orcid', { orcidToClaim: orcidAccount.orcid }))} + /> + + + + {/if} + + + + + + + + + + + diff --git a/src/routes/(pages)/app/(app)/orcids/[orcidId]/components/orcid-tooltip.svelte b/src/routes/(pages)/app/(app)/orcids/[orcidId]/components/orcid-tooltip.svelte new file mode 100644 index 000000000..f59e88051 --- /dev/null +++ b/src/routes/(pages)/app/(app)/orcids/[orcidId]/components/orcid-tooltip.svelte @@ -0,0 +1,102 @@ + + + + + + + + + + {#if orcid.owner} + + Owned by + + + {/if} + + View ORCID + + + diff --git a/src/routes/(pages)/app/(app)/orcids/[orcidId]/components/unclaimed-orcid-card.svelte b/src/routes/(pages)/app/(app)/orcids/[orcidId]/components/unclaimed-orcid-card.svelte new file mode 100644 index 000000000..9bdeae88e --- /dev/null +++ b/src/routes/(pages)/app/(app)/orcids/[orcidId]/components/unclaimed-orcid-card.svelte @@ -0,0 +1,202 @@ + + + + + + {#if orcidAccount} + + + + {/if} + + + + {#if unclaimedTokenPile} + + {#if hasClaimableFunds} + + {#if unclaimedTokensExpandable} + (unclaimedTokensExpanded = !unclaimedTokensExpanded)} + style:transform="rotate({unclaimedTokensExpanded ? 180 : 0}deg)" + > + + + {/if} + {:else} + None + {/if} + + {/if} + {#if hasClaimableFunds} + + + + {/if} + + + {#if hasClaimableFunds && showClaimButton} + + dispatch('claimButtonClick')} + >Claim funds + + {/if} + + + {#if detailedTokenBreakdown} + + {#if collectableFunds.length > 0} + + + Collectable + + These claimable funds will be collected directly to your connected wallet. + + + + + + + {/if} + + {#if splittableFunds.length > 0} + + + Splittable + These claimable funds will be split to the owner. + + + + + + {/if} + + {:else} + + + + {/if} + + + + + diff --git a/src/routes/(pages)/app/(app)/projects/(forges)/components/project-profile/project-profile.svelte b/src/routes/(pages)/app/(app)/projects/(forges)/components/project-profile/project-profile.svelte index fcc76f3cc..7589607c8 100644 --- a/src/routes/(pages)/app/(app)/projects/(forges)/components/project-profile/project-profile.svelte +++ b/src/routes/(pages)/app/(app)/projects/(forges)/components/project-profile/project-profile.svelte @@ -12,7 +12,7 @@ EDIT_PROJECT_SPLITS_FLOW_ECOSYSTEM_RECEIVER_FRAGMENT, EDIT_PROJECT_SPLITS_FLOW_PROJECT_RECEIVER_FRAGMENT, EDIT_PROJECT_SPLITS_FLOW_SUB_LIST_RECEIVER_FRAGMENT, - EDIT_PROJECT_SPLITS_FLOW_LINKED_IDENTITY_RECEIVER_FRAGMENT, + EDIT_PROJECT_SPLITS_FLOW_ORCID_RECEIVER_FRAGMENT, } from '$lib/flows/edit-project-splits/edit-project-splits-steps'; export const PROJECT_PROFILE_FRAGMENT = gql` @@ -25,7 +25,7 @@ ${EDIT_PROJECT_SPLITS_FLOW_PROJECT_RECEIVER_FRAGMENT} ${EDIT_PROJECT_SPLITS_FLOW_ECOSYSTEM_RECEIVER_FRAGMENT} ${EDIT_PROJECT_SPLITS_FLOW_SUB_LIST_RECEIVER_FRAGMENT} - ${EDIT_PROJECT_SPLITS_FLOW_LINKED_IDENTITY_RECEIVER_FRAGMENT} + ${EDIT_PROJECT_SPLITS_FLOW_ORCID_RECEIVER_FRAGMENT} ${UNCLAIMED_PROJECT_CARD_FRAGMENT} ${SPLITS_COMPONENT_PROJECT_SPLITS_FRAGMENT} ${SUPPORTERS_SECTION_SUPPORT_ITEM_FRAGMENT} @@ -89,7 +89,7 @@ ...EditProjectSplitsFlowSubListReceiver } ... on LinkedIdentityReceiver { - ...EditProjectSplitsFlowLinkedIdentityReceiver + ...EditProjectSplitsFlowOrcidReceiver } } maintainers { diff --git a/src/routes/(pages)/app/(app)/projects/(forges)/github/[githubUsername]/[githubRepoName]/+page.server.ts b/src/routes/(pages)/app/(app)/projects/(forges)/github/[githubUsername]/[githubRepoName]/+page.server.ts index a016281ab..bc386cbda 100644 --- a/src/routes/(pages)/app/(app)/projects/(forges)/github/[githubUsername]/[githubRepoName]/+page.server.ts +++ b/src/routes/(pages)/app/(app)/projects/(forges)/github/[githubUsername]/[githubRepoName]/+page.server.ts @@ -10,6 +10,7 @@ import { redis } from '../../../../../../../../api/redis'; import cached from '$lib/utils/cache/remote/cached'; import queryCacheKey from '$lib/utils/cache/remote/query-cache-key'; import { executeRepoDriverReadMethod } from '$lib/utils/sdk/repo-driver/repo-driver'; +import { executeRepoSubAccountDriverReadMethod } from '$lib/utils/sdk/repo-sub-account-driver/repo-sub-account-driver'; import { hexlify, toUtf8Bytes } from 'ethers'; import { Forge, type OxString } from '$lib/utils/sdk/sdk-types'; import filterCurrentChainData from '$lib/utils/filter-current-chain-data'; @@ -33,8 +34,21 @@ async function fetchDripsProject(repoUrl: string) { args: [Forge.gitHub, hexlify(toUtf8Bytes(`${owner}/${repo}`)) as OxString], }); - const cacheKey = queryCacheKey(getProjectsQuery, [repoUrl], `project-page:${accountId}`); + let subAccountId = 0n; + if (network.contracts.SUB_ACCOUNT_REPO_DRIVER) { + subAccountId = await executeRepoSubAccountDriverReadMethod({ + functionName: 'calcAccountId', + args: [accountId], + }); + } + // Projects may be referenced with their repo sub account id or their "main" repo account id, + // so we add both to their cache key to ensure we remove the cache with the invalidate-account-ids endpoint. + const cacheKey = queryCacheKey( + getProjectsQuery, + [repoUrl], + `project-page:${accountId}:${subAccountId}`, + ); return await cached(redis, cacheKey, 172800, () => query( getProjectsQuery, diff --git a/src/routes/(pages)/app/(flows)/claim-orcid/+layout.server.ts b/src/routes/(pages)/app/(flows)/claim-orcid/+layout.server.ts new file mode 100644 index 000000000..0db4d4aca --- /dev/null +++ b/src/routes/(pages)/app/(flows)/claim-orcid/+layout.server.ts @@ -0,0 +1,11 @@ +import network from '$lib/stores/wallet/network'; +import { error } from '@sveltejs/kit'; + +export const load = async () => { + // Only allow ORCID claiming on networks where the feature is enabled + if (!network.orcids) { + return error(404); + } + + return {}; +}; diff --git a/src/routes/(pages)/app/(flows)/claim-orcid/+page.svelte b/src/routes/(pages)/app/(flows)/claim-orcid/+page.svelte new file mode 100644 index 000000000..a0475632b --- /dev/null +++ b/src/routes/(pages)/app/(flows)/claim-orcid/+page.svelte @@ -0,0 +1,13 @@ + + + + + diff --git a/src/routes/(pages)/app/(flows)/claim-orcid/+page.ts b/src/routes/(pages)/app/(flows)/claim-orcid/+page.ts new file mode 100644 index 000000000..19145194b --- /dev/null +++ b/src/routes/(pages)/app/(flows)/claim-orcid/+page.ts @@ -0,0 +1,3 @@ +export const load = () => ({ + preservePathOnNetworkChange: true, +}); diff --git a/src/routes/(pages)/app/(flows)/claim/TODO.md b/src/routes/(pages)/app/(flows)/claim/TODO.md new file mode 100644 index 000000000..6e3ba24ec --- /dev/null +++ b/src/routes/(pages)/app/(flows)/claim/TODO.md @@ -0,0 +1 @@ +# Claim a thing genericallly \ No newline at end of file diff --git a/src/routes/api/cache/invalidate-account-ids/+server.ts b/src/routes/api/cache/invalidate-account-ids/+server.ts index 0f7d1e601..85736d419 100644 --- a/src/routes/api/cache/invalidate-account-ids/+server.ts +++ b/src/routes/api/cache/invalidate-account-ids/+server.ts @@ -125,18 +125,40 @@ async function invalidateNftDriverCache(nftDriverAccountId: string, client: Redi ); const { ecosystemMainAccount } = associatedEcosystemAccountIds; if (ecosystemMainAccount) { + // Separate ProjectReceiver splits from other splits + const projectSplits = ecosystemMainAccount.splits.filter( + (split) => split.__typename === 'ProjectReceiver', + ); + const nonProjectSplits = ecosystemMainAccount.splits.filter( + (split) => split.__typename !== 'ProjectReceiver', + ); + + // Invalidate the standard accounts (excluding ProjectReceiver splits) const accountIdsToClear = [ nftDriverAccountId, ecosystemMainAccount.owner.accountId, ...ecosystemMainAccount.support.map((support) => support.account.accountId), - ...ecosystemMainAccount.splits - .filter((split) => 'account' in split) - .map((split) => split.account.accountId), + ...nonProjectSplits.map((split) => split.account.accountId), ]; - return Promise.all( + log('ECOSYSTEM cache invalidation', { + ecosystem: nftDriverAccountId, + nonProjectSplitAccountIds: nonProjectSplits.map((s) => s.account.accountId), + projectSplitAccountIds: projectSplits.map((s) => s.account.accountId), + }); + + await Promise.all( accountIdsToClear.map((accountId) => invalidateAccountCache(accountId, client)), ); + + // For ProjectReceiver splits, invalidate using invalidateProjectCache + if (projectSplits.length > 0) { + await Promise.all( + projectSplits.map((split) => invalidateProjectCache(split.account.accountId, client)), + ); + } + + return; } return invalidateAccountCache(nftDriverAccountId, client); diff --git a/src/routes/api/cache/invalidate-account-ids/queries/associated-account-ids-queries.ts b/src/routes/api/cache/invalidate-account-ids/queries/associated-account-ids-queries.ts index 15d006027..8666354a9 100644 --- a/src/routes/api/cache/invalidate-account-ids/queries/associated-account-ids-queries.ts +++ b/src/routes/api/cache/invalidate-account-ids/queries/associated-account-ids-queries.ts @@ -63,6 +63,11 @@ export const projectAssociatedAccountIdsQuery = gql` accountId } } + ... on LinkedIdentityReceiver { + account { + accountId + } + } } maintainers { account { @@ -94,7 +99,6 @@ export const projectAssociatedAccountIdsQuery = gql` accountId } } - ... on EcosystemSupport { account { accountId @@ -166,6 +170,11 @@ export const dripListAssociatedAccountIdsQuery = gql` accountId } } + ... on LinkedIdentityReceiver { + account { + accountId + } + } } } } @@ -215,6 +224,11 @@ export const ecosystemAssociatedAccountIdsQuery = gql` accountId } } + ... on LinkedIdentityReceiver { + account { + accountId + } + } } } } diff --git a/src/routes/api/custom-avatars/[cid]/+server.ts b/src/routes/api/custom-avatars/[cid]/+server.ts index 6b5ebd1b5..31aad57af 100644 --- a/src/routes/api/custom-avatars/[cid]/+server.ts +++ b/src/routes/api/custom-avatars/[cid]/+server.ts @@ -29,7 +29,7 @@ export const GET = async ({ params, fetch, url }) => { const resized = image.cover(size, size); - return new Response(await resized.getBufferAsync(Jimp.MIME_PNG), { + return new Response((await resized.getBufferAsync(Jimp.MIME_PNG)) as BodyInit, { headers: { 'content-type': 'image/png', 'cache-control': 'public, max-age=31536000', diff --git a/src/routes/api/embed/project/[projectUrl]/support.png/+server.ts b/src/routes/api/embed/project/[projectUrl]/support.png/+server.ts index 7cc7a13c4..f85620179 100644 --- a/src/routes/api/embed/project/[projectUrl]/support.png/+server.ts +++ b/src/routes/api/embed/project/[projectUrl]/support.png/+server.ts @@ -132,7 +132,7 @@ export const GET: RequestHandler = async ({ url, params }) => { // Cache the result cacheImageBuffer(cacheKey, imageBuffer); - return new Response(imageBuffer, { + return new Response(imageBuffer as BodyInit, { status: 200, headers: new Headers({ 'Content-Type': 'image/png' }), }); diff --git a/src/routes/api/gasless/call/build-txs.ts b/src/routes/api/gasless/call/build-txs.ts new file mode 100644 index 000000000..76f38b6e0 --- /dev/null +++ b/src/routes/api/gasless/call/build-txs.ts @@ -0,0 +1,45 @@ +import network from '$lib/stores/wallet/network'; +import type { Forge } from '$lib/utils/sdk/sdk-types'; +import { ethers, JsonRpcProvider } from 'ethers'; + +const REPO_DRIVER_ABI = `[ + { + "inputs": [ + { "internalType": "enum Forge", "name": "forge", "type": "uint8" }, + { "internalType": "bytes", "name": "name", "type": "bytes" } + ], + "name": "requestUpdateOwner", + "outputs": [{ "internalType": "uint256", "name": "accountId", "type": "uint256" }], + "stateMutability": "nonpayable", + "type": "function" + } +]`; + +/** + * Builds an unsigned transaction to request an owner update for a project on the Drips RepoDriver contract. + * + * This function creates a populated transaction that calls the `requestUpdateOwner` function on the + * RepoDriver smart contract. This is typically used as part of a gasless transaction flow where users + * can claim ownership of projects (GitHub/GitLab repositories or ORCID profiles) without needing to + * pay for gas fees themselves. + * + * @param forge - The forge type identifier: + * - `0` for GitHub repositories (Forge.gitHub) + * - `1` for GitLab repositories (Forge.gitLab) + * - `2` for ORCID profiles (Forge.orcidId) + * + * @param name - The project identifier as a string: + * - For GitHub/GitLab: The full repository name (e.g., "owner/repo-name") + * - For ORCID: The ORCID identifier (e.g., "0000-0002-1234-5678") + * + * @returns A Promise that resolves to a populated transaction object that can be signed and submitted + * to the blockchain. + */ +export const buildRequestOwnerUpdateTx = (forge: Forge, name: string) => { + const provider = new JsonRpcProvider(network.rpcUrl); + const contract = new ethers.Contract(network.contracts.REPO_DRIVER, REPO_DRIVER_ABI, provider); + return contract.requestUpdateOwner.populateTransaction( + forge, + ethers.hexlify(ethers.toUtf8Bytes(name)), + ); +}; diff --git a/src/routes/api/gasless/call/orcid-owner-update/+server.ts b/src/routes/api/gasless/call/orcid-owner-update/+server.ts new file mode 100644 index 000000000..3ca2f1cc5 --- /dev/null +++ b/src/routes/api/gasless/call/orcid-owner-update/+server.ts @@ -0,0 +1,165 @@ +import { z } from 'zod'; +import type { RequestHandler } from './$types'; +import { error } from '@sveltejs/kit'; +import unreachable from '$lib/utils/unreachable'; +import { GelatoRelay, type SponsoredCallRequest } from '@gelatonetwork/relay-sdk'; +import assert from '$lib/utils/assert'; +import network from '$lib/stores/wallet/network'; +import { gql } from 'graphql-request'; +import query from '$lib/graphql/dripsQL'; +import type { + IsOrcidUnclaimedQuery, + IsOrcidUnclaimedQueryVariables, +} from './__generated__/gql.generated'; +import { redis } from '../../../redis'; +import getOptionalEnvVar from '$lib/utils/get-optional-env-var/private'; +import isClaimed from '$lib/utils/orcids/is-claimed'; +import { fetchOrcid, orcidIdToSandoxOrcidId } from '$lib/utils/orcids/fetch-orcid'; +import { getClaimingUrlAddress } from '$lib/utils/orcids/verify-orcid'; +import { Forge } from '$lib/utils/sdk/sdk-types'; +import { buildRequestOwnerUpdateTx } from '../build-txs'; + +const GELATO_API_KEY = getOptionalEnvVar( + 'GELATO_API_KEY', + true, + "Gasless transactions won't work. " + + "This means that claiming a project won't and collecting funds (on networks supporting gasless TXs and with gasless TXs enabled in settings) won't work.", +); + +const payloadSchema = z.object({ + orcid: z.string(), + chainId: z.number(), +}); + +const orcidUnclaimedQuery = gql` + query isOrcidUnclaimed($orcid: String!, $chain: SupportedChain!) { + orcidLinkedIdentityByOrcid(orcid: $orcid, chain: $chain) { + chain + isClaimed + areSplitsValid + owner { + address + } + } + } +`; + +export const POST: RequestHandler = async ({ request, fetch }) => { + // Only allow ORCID claiming on networks where the feature is enabled + if (!network.orcids) { + return error(404, 'ORCID functionality is not enabled on this network'); + } + + assert( + GELATO_API_KEY, + 'GELATO_API_KEY is required. Gasless transactions will not work without it.', + ); + + assert( + redis, + 'This endpoint requires a connected Redis instance. Ensure CACHE_REDIS_CONNECTION_STRING is set in env', + ); + + let payload: z.infer; + + try { + const body = await request.text(); + payload = payloadSchema.parse(JSON.parse(body)); + } catch { + error(400, 'Invalid payload'); + } + + // eslint-disable-next-line no-console + console.log('REPO_OWNER_UPDATE', payload); + + const { orcid, chainId } = payload; + + assert(network.chainId === chainId, 'Unsupported chain id'); + + const isOrcidUnclaimedQueryResponse = await query< + IsOrcidUnclaimedQuery, + IsOrcidUnclaimedQueryVariables + >( + orcidUnclaimedQuery, + { + orcid: orcid, + chain: network.gqlName, + }, + fetch, + ); + + const orcidAccount = isOrcidUnclaimedQueryResponse.orcidLinkedIdentityByOrcid; + if (!orcidAccount) { + return error(404, 'ORCID account not found'); + } + + if (isClaimed(orcidAccount)) { + return error(400, 'ORCID iD already claimed'); + } + + const orcidProfile = await fetchOrcid(orcid, fetch); + if (!orcidProfile) { + return error(500, 'Cannot fetch ORCID profile to validate claiming URL.'); + } + + const urlAddress = getClaimingUrlAddress(orcidProfile.claimingUrl); + if ( + orcidAccount.owner?.address && + orcidAccount.owner.address.toLowerCase() === urlAddress?.toLowerCase() + ) { + return new Response('{ "taskId": null }'); + } + + const blockKey = `${network.name}-ownerUpdateRequest-${orcid}`; + const blockRecordTaskId = await redis.get(blockKey); + + if (blockRecordTaskId) { + const taskStatusRes = await fetch(`/api/gasless/track/${blockRecordTaskId}`); + if (!taskStatusRes.ok) + throw new Error(`Failed to fetch task status: ${await taskStatusRes.text()}`); + + const { task } = await taskStatusRes.json(); + assert(typeof task === 'object', 'Invalid task'); + const { taskState } = task; + assert(typeof taskState === 'string', 'Invalid task state'); + + if (['CheckPending', 'ExecPending', 'WaitingForConfirmation'].includes(taskState)) { + // A request is already in-flight + return new Response(JSON.stringify({ taskId: blockRecordTaskId })); + } else { + await redis.del(blockKey); + } + } + + const claimOrcidTx = await buildRequestOwnerUpdateTx( + Forge.orcidId, + orcidIdToSandoxOrcidId(orcid), + ); + + const relayRequest: SponsoredCallRequest = { + chainId: BigInt(chainId), + target: claimOrcidTx.to ?? unreachable(), + data: claimOrcidTx.data ?? unreachable(), + }; + + const relay = new GelatoRelay(); + + try { + const relayResponse = await relay.sponsoredCall(relayRequest, GELATO_API_KEY); + const { taskId } = relayResponse; + + // eslint-disable-next-line no-console + console.log('RELAY_RESPONSE', payload, relayResponse); + + redis.set(blockKey, taskId, { + // 4 hours + EX: 4 * 60 * 60, + }); + + return new Response(JSON.stringify(relayResponse)); + } catch (e) { + // eslint-disable-next-line no-console + console.error(e); + return error(500, e instanceof Error ? e : 'Unknown error'); + } +}; diff --git a/src/routes/api/gasless/call/repo-owner-update/+server.ts b/src/routes/api/gasless/call/repo-owner-update/+server.ts index fa5f25365..8fd69cae6 100644 --- a/src/routes/api/gasless/call/repo-owner-update/+server.ts +++ b/src/routes/api/gasless/call/repo-owner-update/+server.ts @@ -1,7 +1,6 @@ import { z } from 'zod'; import type { RequestHandler } from './$types'; import { error } from '@sveltejs/kit'; -import { ethers, toUtf8Bytes } from 'ethers'; import unreachable from '$lib/utils/unreachable'; import { GelatoRelay, type SponsoredCallRequest } from '@gelatonetwork/relay-sdk'; import assert from '$lib/utils/assert'; @@ -17,7 +16,7 @@ import { Octokit } from '@octokit/rest'; import GitHub from '$lib/utils/github/GitHub'; import { redis } from '../../../redis'; import getOptionalEnvVar from '$lib/utils/get-optional-env-var/private'; -import { JsonRpcProvider } from 'ethers'; +import { buildRequestOwnerUpdateTx } from '../build-txs'; const GELATO_API_KEY = getOptionalEnvVar( 'GELATO_API_KEY', @@ -41,19 +40,6 @@ const payloadSchema = z.object({ chainId: z.number(), }); -const REPO_DRIVER_ABI = `[ - { - "inputs": [ - { "internalType": "enum Forge", "name": "forge", "type": "uint8" }, - { "internalType": "bytes", "name": "name", "type": "bytes" } - ], - "name": "requestUpdateOwner", - "outputs": [{ "internalType": "uint256", "name": "accountId", "type": "uint256" }], - "stateMutability": "nonpayable", - "type": "function" - } -]`; - const projectUnclaimedQuery = gql` query isProjectUnclaimed($projectUrl: String!, $chains: [SupportedChain!]!) { projectByUrl(url: $projectUrl, chains: $chains) { @@ -152,13 +138,7 @@ export const POST: RequestHandler = async ({ request, fetch }) => { } } - const provider = new JsonRpcProvider(network.rpcUrl); - const contract = new ethers.Contract(network.contracts.REPO_DRIVER, REPO_DRIVER_ABI, provider); - - const tx = await contract.requestUpdateOwner.populateTransaction( - forge, - ethers.hexlify(toUtf8Bytes(projectName)), - ); + const tx = await buildRequestOwnerUpdateTx(forge, projectName); const relayRequest: SponsoredCallRequest = { chainId: BigInt(chainId), diff --git a/src/routes/api/share-images/blog-post/[target]/[slug].png/+server.ts b/src/routes/api/share-images/blog-post/[target]/[slug].png/+server.ts index a1382c88e..1a4cd59e4 100644 --- a/src/routes/api/share-images/blog-post/[target]/[slug].png/+server.ts +++ b/src/routes/api/share-images/blog-post/[target]/[slug].png/+server.ts @@ -36,7 +36,7 @@ export const GET = async ({ params }) => { const jimp = (await Jimp.read(`static${metadata.coverImage}`)).cover(1200, height); - return new Response(await jimp.getBufferAsync(Jimp.MIME_PNG), { + return new Response((await jimp.getBufferAsync(Jimp.MIME_PNG)) as BodyInit, { headers: { 'content-type': 'image/png', }, diff --git a/src/routes/api/share-images/drip-list/[listId].png/+server.ts b/src/routes/api/share-images/drip-list/[listId].png/+server.ts index 1b06a1bfa..2a9300b34 100644 --- a/src/routes/api/share-images/drip-list/[listId].png/+server.ts +++ b/src/routes/api/share-images/drip-list/[listId].png/+server.ts @@ -88,7 +88,7 @@ export const GET: RequestHandler = async ({ url, fetch, params }) => { }
+ + + + + + + + + + + + + + {#each Object.entries(socialLinkValues ?? {}) as [network, value]} + {#if value} + + {/if} + {/each} + + {#if description}{description}{/if} + - - - - - - v === null ? undefined : v, - ).length === 0} - projects={mapFilterUndefined( - filterCurrentChainData(data.profileData.chainData).projects, - (v) => (v === null ? undefined : v), - )} - /> - + + +
+ + + + + + + {#if orcidAccount.isClaimed} + + + + + + {:else if withdrawableBalances.length > 0} + + + + + + {/if} + {#if [support].flat().length > 0} + + + supportersSectionSkeleton?.highlightSection()}> + + + + + + {/if} + + + + + + + {#if !orcidAccount.isClaimed && withdrawableBalances.length > 0} + + + + + 0} + showClaimButton={!orcidAccount.isClaimed} + on:claimButtonClick={() => + goto(buildUrl('/app/claim-orcid', { orcidToClaim: orcidAccount.orcid }))} + /> + + + + {/if} + + + + + + + +
