@graphprotocol/hypergraph 0.0.14 → 0.1.0

package/src/inboxes/index.ts

@@ -1,10 +1,10 @@
 export * from './create-inbox.js';
 export * from './get-list-inboxes.js';
+export * from './merge-messages.js';
 export * from './message-encryption.js';
 export * from './message-validation.js';
 export * from './prepare-message.js';
 export * from './recover-inbox-creator.js';
 export * from './recover-inbox-message-signer.js';
 export * from './send-message.js';
-export * from './merge-messages.js';
 export * from './types.js';

package/src/inboxes/message-validation.ts

@@ -24,6 +24,8 @@ export const validateSpaceInboxMessage = async (
     const signer = recoverSpaceInboxMessageSigner(message, spaceId, inbox.inboxId);
     const verifiedIdentity = await Identity.getVerifiedIdentity(
       message.authorAccountAddress,
+      signer,
+      null,
       syncServerUri,
       chain,
       rpcUrl,
@@ -62,6 +64,8 @@ export const validateAccountInboxMessage = async (
     const signer = recoverAccountInboxMessageSigner(message, accountAddress, inbox.inboxId);
     const verifiedIdentity = await Identity.getVerifiedIdentity(
       message.authorAccountAddress,
+      signer,
+      null,
       syncServerUri,
       chain,
       rpcUrl,

package/src/index.ts

@@ -6,8 +6,8 @@ export * as Key from './key/index.js';
 export * as Messages from './messages/index.js';
 export * as SpaceEvents from './space-events/index.js';
 export * as SpaceInfo from './space-info/index.js';
-export * as StoreConnect from './store-connect.js';
 export * from './store.js';
+export * as StoreConnect from './store-connect.js';
 export * as Type from './type/type.js';
 export * from './types.js';
 export * as Utils from './utils/index.js';

package/src/messages/types.ts

@@ -245,7 +245,6 @@ export const RequestConnectCreateAppIdentity = Schema.Struct({
   address: Schema.String,
   accountAddress: Schema.String,
   ciphertext: Schema.String,
-  nonce: Schema.String,
   signaturePublicKey: Schema.String,
   encryptionPublicKey: Schema.String,
   accountProof: Schema.String,
@@ -450,6 +449,7 @@ export const ResponseIdentity = Schema.Struct({
   encryptionPublicKey: Schema.String,
   accountProof: Schema.String,
   keyProof: Schema.String,
+  appId: Schema.optional(Schema.String),
 });
 
 export type ResponseIdentity = Schema.Schema.Type<typeof ResponseIdentity>;

package/src/space-events/apply-event.ts

@@ -18,7 +18,10 @@ import {
 type Params = {
   state: SpaceState | undefined;
   event: SpaceEvent;
-  getVerifiedIdentity: (accountAddress: string) => Effect.Effect<PublicIdentity, InvalidIdentityError>;
+  getVerifiedIdentity: (
+    accountAddress: string,
+    publicKey: string,
+  ) => Effect.Effect<PublicIdentity, InvalidIdentityError>;
 };
 
 const decodeSpaceEvent = Schema.decodeUnknownEither(SpaceEvent);
@@ -50,7 +53,7 @@ export const applyEvent = ({
   const authorPublicKey = `0x${signatureInstance.recoverPublicKey(sha256(encodedTransaction)).toHex()}`;
 
   return Effect.gen(function* () {
-    const identity = yield* getVerifiedIdentity(event.author.accountAddress);
+    const identity = yield* getVerifiedIdentity(event.author.accountAddress, authorPublicKey);
     if (authorPublicKey !== identity.signaturePublicKey) {
       yield* Effect.fail(new VerifySignatureError());
     }

package/src/space-info/decrypt-space-info.ts

@@ -6,13 +6,7 @@ import { SpaceInfoContent } from './types.js';
 
 const decodeSpaceInfoContent = Schema.decodeSync(SpaceInfoContent);
 
-export const decryptSpaceInfo = ({
-  spaceInfo,
-  secretKey,
-}: {
-  spaceInfo: Uint8Array;
-  secretKey: string;
-}) => {
+export const decryptSpaceInfo = ({ spaceInfo, secretKey }: { spaceInfo: Uint8Array; secretKey: string }) => {
   const decrypted = decryptMessage({
     nonceAndCiphertext: spaceInfo,
     secretKey: hexToBytes(secretKey),

package/src/store-connect.ts

@@ -1,5 +1,5 @@
 import type { AnyDocumentId, DocHandle, Repo } from '@automerge/automerge-repo';
-import { type Store, createStore } from '@xstate/store';
+import { createStore, type Store } from '@xstate/store';
 import type { Address } from 'viem';
 import { mergeMessages } from './inboxes/merge-messages.js';
 import type { InboxSenderAuthPolicy } from './inboxes/types.js';

package/src/store.ts

@@ -1,12 +1,12 @@
 import type { AnyDocumentId, DocHandle, Repo } from '@automerge/automerge-repo';
-import { type Store, createStore } from '@xstate/store';
+import type { Mapping } from '@graphprotocol/typesync/Mapping';
+import { createStore, type Store } from '@xstate/store';
 import type { PrivateAppIdentity } from './connect/types.js';
 import type { DocumentContent } from './entity/types.js';
 import { mergeMessages } from './inboxes/merge-messages.js';
 import type { InboxSenderAuthPolicy } from './inboxes/types.js';
 import type { Invitation, Updates } from './messages/index.js';
 import type { SpaceEvent, SpaceState } from './space-events/index.js';
-import type { Mapping } from './types.js';
 import { idToAutomergeId } from './utils/automergeId.js';
 
 export type InboxMessageStorageEntry = {
@@ -64,7 +64,8 @@ interface StoreContext {
       signaturePublicKey: string;
       accountProof: string;
       keyProof: string;
-    };
+      appId: string | null;
+    }[];
   };
   authenticated: boolean;
   identity: PrivateAppIdentity | null;
@@ -104,6 +105,7 @@ type StoreEvent =
       signaturePublicKey: string;
       accountProof: string;
       keyProof: string;
+      appId: string | null;
     }
   | {
       type: 'setSpaceInbox';
@@ -291,18 +293,46 @@ export const store: Store<StoreContext, StoreEvent, GenericEventObject> = create
         signaturePublicKey: string;
         accountProof: string;
         keyProof: string;
+        appId: string | null;
       },
     ) => {
+      const existingIdentity = context.identities[event.accountAddress]?.find(
+        (identity) => identity.signaturePublicKey === event.signaturePublicKey,
+      );
+      if (existingIdentity) {
+        return context;
+      }
+      if (context.identities[event.accountAddress]) {
+        return {
+          ...context,
+          identities: {
+            ...context.identities,
+            [event.accountAddress]: [
+              ...context.identities[event.accountAddress],
+              {
+                encryptionPublicKey: event.encryptionPublicKey,
+                signaturePublicKey: event.signaturePublicKey,
+                accountProof: event.accountProof,
+                keyProof: event.keyProof,
+                appId: event.appId,
+              },
+            ],
+          },
+        };
+      }
       return {
         ...context,
         identities: {
           ...context.identities,
-          [event.accountAddress]: {
-            encryptionPublicKey: event.encryptionPublicKey,
-            signaturePublicKey: event.signaturePublicKey,
-            accountProof: event.accountProof,
-            keyProof: event.keyProof,
-          },
+          [event.accountAddress]: [
+            {
+              encryptionPublicKey: event.encryptionPublicKey,
+              signaturePublicKey: event.signaturePublicKey,
+              accountProof: event.accountProof,
+              keyProof: event.keyProof,
+              appId: event.appId,
+            },
+          ],
         },
       };
     },

package/src/type/type.ts

@@ -8,7 +8,6 @@ export const Number = Schema.Number;
 export const Checkbox = Schema.Boolean;
 // biome-ignore lint/suspicious/noShadowRestrictedNames: is part of a namespaces module and therefor ok
 export const Date = Schema.Date;
-export const Url = Schema.URL;
 export const Point = Schema.transform(Schema.String, Schema.Array(Number), {
   strict: true,
   decode: (str: string) => {

package/src/types.ts

@@ -1,4 +1,3 @@
-import type { Id as Grc20Id } from '@graphprotocol/grc-20';
 import * as Data from 'effect/Data';
 import * as Schema from 'effect/Schema';
 
@@ -49,17 +48,3 @@ export class FailedToParseConnectAuthUrl extends Data.TaggedError('FailedToParse
 export class FailedToParseAuthCallbackUrl extends Data.TaggedError('FailedToParseAuthCallbackUrl')<{
   message: string;
 }> {}
-
-export type MappingEntry = {
-  typeIds: Grc20Id.Id[];
-  properties?: {
-    [key: string]: Grc20Id.Id;
-  };
-  relations?: {
-    [key: string]: Grc20Id.Id;
-  };
-};
-
-export type Mapping = {
-  [key: string]: MappingEntry;
-};