signing and creating smart sessions work

Author: pcarranzav

apps/connect/.env.development

@@ -1 +1,4 @@
-VITE_HYPERGRAPH_SYNC_SERVER_ORIGIN="http://localhost:3030"
+VITE_HYPERGRAPH_SYNC_SERVER_ORIGIN="http://localhost:3030"
+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 +1,4 @@
-VITE_HYPERGRAPH_SYNC_SERVER_ORIGIN="https://syncserver.hypergraph.thegraph.com"
+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"

apps/connect/src/routes/authenticate.tsx

@@ -2,8 +2,8 @@ import { CreateSpace } from '@/components/create-space';
 import { Button } from '@/components/ui/button';
 import { usePrivateSpaces } from '@/hooks/use-private-spaces';
 import { type PublicSpaceData, usePublicSpaces } from '@/hooks/use-public-spaces';
-import { Connect, type Identity, Key, type Messages, StoreConnect, Utils } from '@graphprotocol/hypergraph';
-import { GEOGENESIS, GEO_TESTNET } from '@graphprotocol/hypergraph/connect/smart-account';
+import { Connect, Identity, Key, type Messages, StoreConnect, Utils } from '@graphprotocol/hypergraph';
+import { GEOGENESIS, GEO_TESTNET, getSmartAccountWalletClient } from '@graphprotocol/hypergraph/connect/smart-account';
 import { useIdentityToken, usePrivy, useWallets } from '@privy-io/react-auth';
 import { createFileRoute } from '@tanstack/react-router';
 import { createStore } from '@xstate/store';
@@ -344,6 +344,7 @@ function AuthenticateComponent() {
     try {
       const privyProvider = await embeddedWallet.getEthereumProvider();
       const walletClient = createWalletClient({
+        account: embeddedWallet.address as `0x${string}`,
         chain: CHAIN,
         transport: custom(privyProvider),
       });
@@ -365,6 +366,20 @@ function AuthenticateComponent() {
 
       const newAppIdentity = Connect.createAppIdentity();
 
+      console.log('creating smart session');
+      console.log('public spaces data', publicSpacesData);
+      const spaces =
+        publicSpacesData
+          ?.filter((space) => selectedPublicSpaces.has(space.id))
+          .map((space) => ({
+            address:
+              space.type === 'personal'
+                ? (space.personalAddress as `0x${string}`)
+                : (space.mainVotingAddress as `0x${string}`),
+            type: space.type as 'personal' | 'public',
+          })) ?? [];
+      console.log('spaces', spaces);
+
       // TODO: add additional actions (must be passed from the app)
       const permissionId = await Connect.createSmartSession(
         walletClient,
@@ -374,19 +389,16 @@ function AuthenticateComponent() {
         import.meta.env.VITE_HYPERGRAPH_RPC_URL,
         {
           allowCreateSpace: true,
-          spaces:
-            publicSpacesData
-              ?.filter((space) => selectedPublicSpaces.has(space.id))
-              .map((space) => ({
-                address:
-                  space.type === 'personal'
-                    ? (space.personalAddress as `0x${string}`)
-                    : (space.mainVotingAddress as `0x${string}`),
-                type: space.type as 'personal' | 'public',
-              })) ?? [],
+          spaces,
           additionalActions: [],
         },
       );
+      console.log('smart session created');
+      const smartAccountClient = await getSmartAccountWalletClient({
+        owner: walletClient,
+        chain: CHAIN,
+        rpcUrl: import.meta.env.VITE_HYPERGRAPH_RPC_URL,
+      });
 
       const { ciphertext, nonce } = await Connect.encryptAppIdentity(
         signer,
@@ -395,7 +407,12 @@ function AuthenticateComponent() {
         permissionId,
         keys,
       );
-      const { accountProof, keyProof } = await Connect.proveIdentityOwnership(signer, accountAddress, keys);
+      const { accountProof, keyProof } = await Identity.proveIdentityOwnership(
+        walletClient,
+        smartAccountClient,
+        accountAddress,
+        keys,
+      );
 
       const message: Messages.RequestConnectCreateAppIdentity = {
         appId: state.appInfo.appId,
@@ -451,6 +468,7 @@ function AuthenticateComponent() {
 
     const privyProvider = await embeddedWallet.getEthereumProvider();
     const walletClient = createWalletClient({
+      account: embeddedWallet.address as `0x${string}`,
       chain: CHAIN,
       transport: custom(privyProvider),
     });

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

@@ -48,6 +48,9 @@ function Login() {
 
       const rpcUrl = import.meta.env.VITE_HYPERGRAPH_RPC_URL;
 
+      console.log(walletClient);
+      console.log(rpcUrl);
+      console.log(CHAIN);
       await Connect.login({ walletClient, signer, syncServerUri, storage, identityToken, rpcUrl, chain: CHAIN });
     },
     [identityToken, signMessage],
@@ -66,6 +69,7 @@ function Login() {
           const embeddedWallet = wallets.find((wallet) => wallet.walletClientType === 'privy') || wallets[0];
           const privyProvider = await embeddedWallet.getEthereumProvider();
           const walletClient = createWalletClient({
+            account: embeddedWallet.address as `0x${string}`,
             chain: CHAIN,
             transport: custom(privyProvider),
           });
@@ -81,7 +85,7 @@ function Login() {
 
           navigate({ to: '/', replace: true });
         } catch (error) {
-          alert('Failed to login');
+          console.log('Failed to login');
           console.error(error);
         }
       })();

apps/server/src/index.ts

@@ -194,19 +194,20 @@ app.post('/connect/identity', async (req, res) => {
       return;
     }
     if (
-      !Identity.verifyIdentityOwnership(
+      !(await Identity.verifyIdentityOwnership(
         accountAddress,
         message.signaturePublicKey,
         message.accountProof,
         message.keyProof,
         CHAIN,
         RPC_URL,
-      )
+      ))
     ) {
       console.log('Ownership proof is invalid');
       res.status(401).send('Unauthorized');
       return;
     }
+    console.log('Ownership proof is valid');
 
     try {
       await createIdentity({
@@ -288,12 +289,14 @@ app.get('/connect/app-identity/:appId', async (req, res) => {
     const appId = req.params.appId;
     const appIdentity = await findAppIdentity({ accountAddress, appId });
     if (!appIdentity) {
+      console.log('App identity not found');
       res.status(404).json({ message: 'App identity not found' });
       return;
     }
+    console.log('App identity found');
     res.status(200).json({ appIdentity });
   } catch (error) {
-    console.error('Error creating space:', error);
+    console.error('Error getting app identity:', error);
     if (error instanceof Error && error.message === 'No Privy ID token provided') {
       res.status(401).json({ message: 'Unauthorized' });
     } else if (error instanceof Error && error.message === 'Missing Privy configuration') {
@@ -312,6 +315,7 @@ app.post('/connect/app-identity', async (req, res) => {
     const message = Schema.decodeUnknownSync(Messages.RequestConnectCreateAppIdentity)(req.body);
     const accountAddress = message.accountAddress;
     if (!(await isSignerForAccount(signerAddress, accountAddress))) {
+      console.log('Signer address is not the signer for the account');
       res.status(401).send('Unauthorized');
       return;
     }

packages/hypergraph/src/connect/index.ts

@@ -6,6 +6,5 @@ export * from './identity-encryption.js';
 export * from './login.js';
 export * from './parse-auth-params.js';
 export * from './parse-callback-params.js';
-export * from './prove-ownership.js';
 export * from './smart-account.js';
 export * from './types.js';

packages/hypergraph/src/connect/login.ts

@@ -1,12 +1,19 @@
 import * as Schema from 'effect/Schema';
+import type { SmartAccountClient } from 'permissionless';
 import type { Address, Chain, Hex, WalletClient } from 'viem';
+import { proveIdentityOwnership } from '../identity/prove-ownership.js';
 import * as Messages from '../messages/index.js';
 import { store } from '../store-connect.js';
 import { loadAccountAddress, storeAccountAddress, storeKeys } from './auth-storage.js';
 import { createIdentityKeys } from './create-identity-keys.js';
 import { decryptIdentity, encryptIdentity } from './identity-encryption.js';
-import { proveIdentityOwnership } from './prove-ownership.js';
-import { getSmartAccountWalletClient, smartAccountNeedsUpdate, updateLegacySmartAccount } from './smart-account.js';
+import {
+  type SmartAccountParams,
+  getSmartAccountWalletClient,
+  isSmartAccountDeployed,
+  smartAccountNeedsUpdate,
+  updateLegacySmartAccount,
+} from './smart-account.js';
 import type { IdentityKeys, Signer, Storage } from './types.js';
 
 export async function identityExists(accountAddress: string, syncServerUri: string) {
@@ -18,14 +25,21 @@ export async function identityExists(accountAddress: string, syncServerUri: stri
 
 export async function signup(
   signer: Signer,
+  walletClient: WalletClient,
+  smartAccountClient: SmartAccountClient,
   accountAddress: Address,
   syncServerUri: string,
   storage: Storage,
   identityToken: string,
 ) {
   const keys = createIdentityKeys();
   const { ciphertext, nonce } = await encryptIdentity(signer, keys);
-  const { accountProof, keyProof } = await proveIdentityOwnership(signer, accountAddress, keys);
+  const { accountProof, keyProof } = await proveIdentityOwnership(
+    walletClient,
+    smartAccountClient,
+    accountAddress,
+    keys,
+  );
 
   const req: Messages.RequestConnectCreateIdentity = {
     keyBox: { signer: await signer.getAddress(), accountAddress, ciphertext, nonce },
@@ -105,20 +119,42 @@ export async function login({
   rpcUrl: string;
   chain: Chain;
 }) {
-  const accountAddressFromStorage = (loadAccountAddress(storage) as Hex) ?? undefined;
-  const smartAccountWalletClient = await getSmartAccountWalletClient({
+  const accountAddressFromStorage = loadAccountAddress(storage) as Hex;
+  const smartAccountParams: SmartAccountParams = {
     owner: walletClient,
-    address: accountAddressFromStorage,
     rpcUrl,
     chain,
-  });
+  };
+  if (accountAddressFromStorage) {
+    smartAccountParams.address = accountAddressFromStorage;
+  }
+  const smartAccountWalletClient = await getSmartAccountWalletClient(smartAccountParams);
   if (!smartAccountWalletClient.account) {
     throw new Error('Smart account wallet client not found');
   }
+  console.log('smartAccountWalletClient', smartAccountWalletClient);
+  console.log('address', smartAccountWalletClient.account.address);
+  console.log('is deployed', await isSmartAccountDeployed(smartAccountWalletClient));
   // This will prompt the user to sign a user operation to update the smart account
   if (await smartAccountNeedsUpdate(smartAccountWalletClient, chain, rpcUrl)) {
     await updateLegacySmartAccount(smartAccountWalletClient, chain, rpcUrl);
   }
+
+  // TODO: remove this once we manage to get counterfactual signatures working
+  if (!(await isSmartAccountDeployed(smartAccountWalletClient))) {
+    console.log('sending dummy userOp to deploy smart account');
+    if (!walletClient.account) {
+      throw new Error('Wallet client account not found');
+    }
+    const tx = await smartAccountWalletClient.sendUserOperation({
+      calls: [{ to: walletClient.account.address, data: '0x' }],
+      account: smartAccountWalletClient.account,
+    });
+
+    console.log('tx', tx);
+    const receipt = await smartAccountWalletClient.waitForUserOperationReceipt({ hash: tx });
+    console.log('receipt', receipt);
+  }
   const accountAddress = smartAccountWalletClient.account.address;
   if (accountAddressFromStorage === undefined) {
     storeAccountAddress(storage, accountAddress);
@@ -130,7 +166,15 @@ export async function login({
   };
   const exists = await identityExists(accountAddress, syncServerUri);
   if (!exists) {
-    authData = await signup(signer, accountAddress, syncServerUri, storage, identityToken);
+    authData = await signup(
+      signer,
+      walletClient,
+      smartAccountWalletClient,
+      accountAddress,
+      syncServerUri,
+      storage,
+      identityToken,
+    );
   } else {
     authData = await restoreKeys(signer, accountAddress, syncServerUri, storage, identityToken);
   }