Merge branch 'main' into pcv/connect-owner-key

Author: nikgraf

.github/workflows/fly-deploy.yml

@@ -0,0 +1,18 @@
+# See https://fly.io/docs/app-guides/continuous-deployment-with-github-actions/
+
+name: Fly Deploy (Paused)
+on:
+  push:
+    branches:
+      - main
+jobs:
+  deploy:
+    name: Deploy app
+    runs-on: ubuntu-latest
+    concurrency: deploy-group # optional: ensure only one action runs at a time
+    steps:
+      - uses: actions/checkout@v4
+      # - uses: superfly/flyctl-actions/setup-flyctl@master
+      # - run: flyctl deploy --remote-only
+      #   env:
+      #     FLY_API_TOKEN: ${{ secrets.FLY_API_TOKEN }}

Dockerfile

@@ -24,10 +24,10 @@ RUN --mount=type=cache,id=workspace,target=/root/.local/share/pnpm/store pnpm in
 # Build stage for the server.
 FROM base AS build
 # TODO: Remove this when we switch to an actual database.
-ENV DATABASE_URL="file:./dev.db"
+# ENV DATABASE_URL="file:./dev.db"
 RUN \
   # TODO: This initalizes the database. But we should probably remove this later.
-  pnpm --filter server prisma migrate reset --force && \
+  # pnpm --filter server prisma migrate reset --force && \
   # Build the monorepo packages
   pnpm build && \
   # Generate the prisma client
@@ -40,13 +40,15 @@ RUN \
   mkdir -p deployment/out && mv deployment/dist deployment/node_modules deployment/package.json deployment/out && \
   # Add prisma client in dist
   mv deployment/prisma/generated/client/libquery_engine-linux-musl-arm64-openssl-3.0.x.so.node deployment/out/dist/libquery_engine-linux-musl-arm64-openssl-3.0.x.so.node && \
-  mv deployment/prisma/generated/client/libquery_engine-linux-musl-openssl-3.0.x.so.node deployment/out/dist/libquery_engine-linux-musl-openssl-3.0.x.so.node
+  mv deployment/prisma/generated/client/libquery_engine-linux-musl-openssl-3.0.x.so.node deployment/out/dist/libquery_engine-linux-musl-openssl-3.0.x.so.node && \
+  mv deployment/prisma deployment/out
 
 # Slim runtime image.
 FROM node:22-alpine AS server
 WORKDIR /app
 COPY --from=build /workspace/deployment/out .
 # TODO: Remove this when we switch to an actual database.
-ENV DATABASE_URL="file:./dev.db"
+ENV DATABASE_URL="file:/mnt/hypergraph_data/production.sqlite"
+RUN npm run prisma migrate deploy --skip-generate
 EXPOSE 3030
-CMD ["node", "dist/index.js"]
+CMD ["sh", "-c", "npm run prisma migrate deploy && node dist/index.js"]

README.md

@@ -1,4 +1,4 @@
-# Graph Framework
+# Hypergraph Framework
 
 ## Development
 
@@ -22,16 +22,22 @@ pnpm dev
 # in another tab
 cd apps/server
 pnpm dev
+# in another tab
+cd apps/typesync
+pnpm build
+# then, from anywhere in the repo, start Typesync
+hypergraph typesync
 ```
 
+
 Any time you make changes to the schema, you will need to run the following commands:
 
 ```sh
 cd apps/server
 pnpm prisma migrate dev # this will also generate the Prisma client
 ```
 
-You can run the next example app with:
+You can run the Typesync Next example app with:
 
 ```sh
 # Notes:
@@ -40,6 +46,7 @@ cd apps/next-example
 pnpm dev
 ```
 
+
 ## Upgrading Dependencies
 
 ```sh

apps/connect/.env.development

@@ -2,6 +2,8 @@ VITE_HYPERGRAPH_SYNC_SERVER_ORIGIN="http://localhost:3030"
 VITE_HYPERGRAPH_CHAIN="geo-testnet"
 VITE_HYPERGRAPH_API_URL="https://hypergraph-v2-testnet.up.railway.app/graphql"
 VITE_HYPERGRAPH_RPC_URL="https://rpc-geo-test-zc16z3tcvf.t.conduit.xyz"
+VITE_PRIVY_APP_ID="cmbhnmo1x000bla0mxudtd8z9"
+VITE_PRIVY_PROVIDERS="development"
 # VITE_HYPERGRAPH_CHAIN="geogenesis"
 # VITE_HYPERGRAPH_API_URL="https://hypergraph-v2.up.railway.app/graphql"
 # VITE_HYPERGRAPH_RPC_URL="https://rpc-geo-genesis-h0q2s21xx8.t.conduit.xyz"

apps/connect/.env.production

@@ -1,4 +1,7 @@
-VITE_HYPERGRAPH_SYNC_SERVER_ORIGIN="https://syncserver.hypergraph.thegraph.com"
-VITE_HYPERGRAPH_CHAIN="geogenesis"
-VITE_HYPERGRAPH_API_URL="https://hypergraph-v2.up.railway.app/graphql"
-VITE_HYPERGRAPH_RPC_URL="https://rpc-geo-genesis-h0q2s21xx8.t.conduit.xyz"
+# VITE_HYPERGRAPH_SYNC_SERVER_ORIGIN="https://syncserver.hypergraph.thegraph.com"
+VITE_HYPERGRAPH_SYNC_SERVER_ORIGIN="https://hypergraph.fly.dev"
+VITE_HYPERGRAPH_CHAIN="geo-testnet"
+VITE_HYPERGRAPH_API_URL="https://hypergraph-v2-testnet.up.railway.app/graphql"
+VITE_HYPERGRAPH_RPC_URL="https://rpc-geo-test-zc16z3tcvf.t.conduit.xyz"
+VITE_PRIVY_APP_ID="cmcccikza007bjy0niawgutl0"
+VITE_PRIVY_PROVIDERS="production"

apps/connect/package.json

@@ -23,7 +23,7 @@
     "@tanstack/react-router": "^1.120.2",
     "@xstate/store": "^3.5.1",
     "clsx": "^2.1.1",
-    "effect": "^3.16.3",
+    "effect": "^3.16.10",
     "graphql-request": "^7.2.0",
     "lucide-react": "^0.508.0",
     "react": "^19.1.0",
@@ -44,6 +44,7 @@
     "prettier-plugin-tailwindcss": "^0.6.13",
     "tailwindcss": "^4.1.10",
     "unplugin-fonts": "^1.3.1",
+    "vite-plugin-node-polyfills": "^0.23.0",
     "vite-plugin-svgr": "^4.3.0"
   }
 }

apps/connect/src/Boot.tsx

@@ -45,12 +45,17 @@ export function Boot() {
     }
   }, []);
 
+  // @ts-expect-error - window is not typed
+  window.APP_VERSION = 'v1';
+  // @ts-expect-error - window is not typed
+  window.VITE_PRIVY_APP_ID = import.meta.env.VITE_PRIVY_APP_ID;
+
   return (
     <QueryClientProvider client={queryClient}>
       <PrivyProvider
-        appId="cmbhnmo1x000bla0mxudtd8z9"
+        appId={import.meta.env.VITE_PRIVY_APP_ID}
         config={{
-          loginMethods: ['email', 'google'],
+          loginMethods: import.meta.env.VITE_PRIVY_PROVIDERS === 'development' ? ['email', 'google'] : ['email'],
           appearance: {
             theme: 'light',
             accentColor: '#6833ff',

apps/connect/src/routes/authenticate.tsx

@@ -4,7 +4,6 @@ import { Loading } from '@/components/ui/Loading';
 import { usePrivateSpaces } from '@/hooks/use-private-spaces';
 import { usePublicSpaces } from '@/hooks/use-public-spaces';
 import { Connect, Identity, Key, type Messages, StoreConnect, Utils } from '@graphprotocol/hypergraph';
-
 import { useIdentityToken, usePrivy, useWallets } from '@privy-io/react-auth';
 import { createFileRoute } from '@tanstack/react-router';
 import { createStore } from '@xstate/store';
@@ -247,7 +246,7 @@ function AuthenticateComponent() {
 
     const privateSpacesInput = privateSpacesData
       ? privateSpacesData
-          .filter((space) => selectedPrivateSpaces.has(space.id))
+          // .filter((space) => selectedPrivateSpaces.has(space.id))
           .map((space) => {
             // TODO: currently without checking we assume all keyboxes exists and we don't create any - we should check if the keyboxes exist and create them if they don't
             if (space.appIdentities.some((spaceAppIdentity) => spaceAppIdentity.address === appIdentity.address))
@@ -373,8 +372,8 @@ function AuthenticateComponent() {
       console.log('public spaces data', publicSpacesData);
       const spaces =
         publicSpacesData
-          ?.filter((space) => selectedPublicSpaces.has(space.id))
-          .map((space) => ({
+          // .filter((space) => selectedPublicSpaces.has(space.id))
+          ?.map((space) => ({
             address:
               space.type === 'personal'
                 ? (space.personalAddress as `0x${string}`)

apps/connect/src/routes/login.lazy.tsx

@@ -1,13 +1,12 @@
 import GeoLogo from '@/assets/images/geo-logo-branded.svg?react';
 import { AppTitle } from '@/components/ui/AppTitle';
 import { Connect, type Identity } from '@graphprotocol/hypergraph';
-import { GEOGENESIS, GEO_TESTNET } from '@graphprotocol/hypergraph/connect/smart-account';
 import { type ConnectedWallet, useIdentityToken, usePrivy, useWallets } from '@privy-io/react-auth';
 import { createLazyFileRoute, useRouter } from '@tanstack/react-router';
 import { useCallback, useEffect, useState } from 'react';
 import { type WalletClient, createWalletClient, custom } from 'viem';
 
-const CHAIN = import.meta.env.VITE_HYPERGRAPH_CHAIN === 'geogenesis' ? GEOGENESIS : GEO_TESTNET;
+const CHAIN = import.meta.env.VITE_HYPERGRAPH_CHAIN === 'geogenesis' ? Connect.GEOGENESIS : Connect.GEO_TESTNET;
 const syncServerUri = import.meta.env.VITE_HYPERGRAPH_SYNC_SERVER_ORIGIN;
 const addressStorage = localStorage;
 const keysStorage = sessionStorage;

apps/connect/vercel.json

@@ -0,0 +1,3 @@
+{
+  "rewrites": [{ "source": "/(.*)", "destination": "/" }]
+}