wip

Author: nikgraf

apps/connect/src/routes/authenticate.tsx

@@ -364,6 +364,7 @@ function AuthenticateComponent() {
         appIdentity: {
           address: newAppIdentity.address,
           addressPrivateKey: newAppIdentity.addressPrivateKey,
+          accountAddress,
           encryptionPrivateKey: keys.encryptionPrivateKey,
           signaturePrivateKey: keys.signaturePrivateKey,
           encryptionPublicKey: newAppIdentity.encryptionPublicKey,
@@ -420,6 +421,7 @@ function AuthenticateComponent() {
       appIdentity: {
         address: decryptedIdentity.address,
         addressPrivateKey: decryptedIdentity.addressPrivateKey,
+        accountAddress: decryptedIdentity.accountAddress,
         encryptionPrivateKey: decryptedIdentity.encryptionPrivateKey,
         signaturePrivateKey: decryptedIdentity.signaturePrivateKey,
         encryptionPublicKey: decryptedIdentity.encryptionPublicKey,

apps/events/src/routes/authenticate-success.tsx

@@ -44,6 +44,7 @@ function RouteComponent() {
       setIdentity({
         address: parsedAuthParams.appIdentityAddress,
         addressPrivateKey: parsedAuthParams.appIdentityAddressPrivateKey,
+        accountAddress: parsedAuthParams.accountAddress,
         signaturePublicKey: parsedAuthParams.signaturePublicKey,
         signaturePrivateKey: parsedAuthParams.signaturePrivateKey,
         encryptionPublicKey: parsedAuthParams.encryptionPublicKey,

packages/hypergraph-react/src/hooks/use-spaces.ts

@@ -1,4 +1,6 @@
+import { store } from '@graphprotocol/hypergraph/store';
 import { useQuery } from '@tanstack/react-query';
+import { useSelector } from '@xstate/store/react';
 import { gql, request } from 'graphql-request';
 import { GEO_API_TESTNET_ENDPOINT } from '../internal/constants.js';
 
@@ -27,11 +29,13 @@ type PublicSpacesQueryResult = {
 };
 
 export const useSpaces = (params: { mode: 'public' }) => {
+  const accountAddress = useSelector(store, (state) => state.context.identity?.accountAddress);
+  console.log('useSpaces accountAddress', accountAddress);
   return useQuery({
     queryKey: ['hypergraph-spaces', params.mode],
     queryFn: async () => {
       const result = await request<PublicSpacesQueryResult>(GEO_API_TESTNET_ENDPOINT, publicSpacesQueryDocument, {
-        accountAddress: '0xBE0298aF8D440bEFA78E7e8A538D8ecBFF06bfC7',
+        accountAddress,
       });
       return result?.spaces
         ? result.spaces.map((space) => ({

packages/hypergraph/src/connect/identity-encryption.ts

@@ -228,5 +228,6 @@ export const decryptAppIdentity = async (
     signaturePrivateKey,
     address: appIdentityAddress,
     addressPrivateKey: appIdentityAddressPrivateKey,
+    accountAddress,
   };
 };

packages/hypergraph/src/connect/parse-callback-params.ts

@@ -52,6 +52,7 @@ export const parseCallbackParams = ({
     return Effect.succeed({
       appIdentityAddress: data.appIdentityAddress,
       appIdentityAddressPrivateKey: data.appIdentityAddressPrivateKey,
+      accountAddress: data.accountAddress,
       signaturePublicKey: data.signaturePublicKey,
       signaturePrivateKey: data.signaturePrivateKey,
       encryptionPublicKey: data.encryptionPublicKey,

packages/hypergraph/src/connect/types.ts

@@ -60,6 +60,7 @@ export type PrivateAppIdentity = IdentityKeys & {
   addressPrivateKey: string;
   sessionToken: string;
   sessionTokenExpires: Date;
+  accountAddress: string;
 };
 
 export class InvalidIdentityError {

packages/hypergraph/src/identity/auth-storage.ts

@@ -4,6 +4,7 @@ import type { Storage } from './types.js';
 export const storeIdentity = (storage: Storage, identity: PrivateAppIdentity) => {
   storage.setItem('hypergraph:app-identity-address', identity.address);
   storage.setItem('hypergraph:app-identity-address-private-key', identity.addressPrivateKey);
+  storage.setItem('hypergraph:app-identity-account-address', identity.accountAddress);
   storage.setItem('hypergraph:signature-public-key', identity.signaturePublicKey);
   storage.setItem('hypergraph:signature-private-key', identity.signaturePrivateKey);
   storage.setItem('hypergraph:encryption-public-key', identity.encryptionPublicKey);
@@ -15,6 +16,7 @@ export const storeIdentity = (storage: Storage, identity: PrivateAppIdentity) =>
 export const loadIdentity = (storage: Storage): PrivateAppIdentity | null => {
   const address = storage.getItem('hypergraph:app-identity-address');
   const addressPrivateKey = storage.getItem('hypergraph:app-identity-address-private-key');
+  const accountAddress = storage.getItem('hypergraph:app-identity-account-address');
   const signaturePublicKey = storage.getItem('hypergraph:signature-public-key');
   const signaturePrivateKey = storage.getItem('hypergraph:signature-private-key');
   const encryptionPublicKey = storage.getItem('hypergraph:encryption-public-key');
@@ -24,6 +26,7 @@ export const loadIdentity = (storage: Storage): PrivateAppIdentity | null => {
   if (
     !address ||
     !addressPrivateKey ||
+    !accountAddress ||
     !signaturePublicKey ||
     !signaturePrivateKey ||
     !encryptionPublicKey ||
@@ -36,6 +39,7 @@ export const loadIdentity = (storage: Storage): PrivateAppIdentity | null => {
   return {
     address,
     addressPrivateKey,
+    accountAddress,
     signaturePublicKey,
     signaturePrivateKey,
     encryptionPublicKey,
@@ -48,6 +52,7 @@ export const loadIdentity = (storage: Storage): PrivateAppIdentity | null => {
 export const wipeIdentity = (storage: Storage) => {
   storage.removeItem('hypergraph:app-identity-address');
   storage.removeItem('hypergraph:app-identity-address-private-key');
+  storage.removeItem('hypergraph:app-identity-account-address');
   storage.removeItem('hypergraph:signature-public-key');
   storage.removeItem('hypergraph:signature-private-key');
   storage.removeItem('hypergraph:encryption-public-key');

packages/hypergraph/src/types.ts

@@ -20,6 +20,7 @@ export type ConnectAuthPayload = Schema.Schema.Type<typeof ConnectAuthPayload>;
 export const ConnectCallbackResult = Schema.Struct({
   appIdentityAddress: Schema.String,
   appIdentityAddressPrivateKey: Schema.String,
+  accountAddress: Schema.String,
   signaturePublicKey: Schema.String,
   signaturePrivateKey: Schema.String,
   encryptionPublicKey: Schema.String,