Merge upstream develop

Author: github-actions[bot]

.prettierignore

@@ -16,4 +16,6 @@ packages/react-native/lib
 packages/rs-core
 packages/rs-core-wasm-browser
 packages/rs-core-wasm-node
+packages/js-core/src/proto/polycentric.ts
+packages/js-core/src/proto/polycentric/v2
 legacy

apps/polycentric/.env.example

@@ -1,2 +1,2 @@
-EXPO_PUBLIC_POLYCENTRIC_SERVER=http://localhost:8787
+EXPO_PUBLIC_POLYCENTRIC_SERVER=http://localhost:50051
 REACT_NATIVE_PACKAGER_HOSTNAME=localhost

apps/polycentric/src/common/components/layout/Layout.tsx

@@ -1,34 +1,31 @@
 import { Atoms, Breakpoints, typography, useTheme } from '@/src/common/theme';
 import { isWeb } from '@/src/common/util/platform';
+import { Image } from 'expo-image';
 import { ExternalPathString, Link } from 'expo-router';
 import {
   ComponentProps,
   memo,
   ReactElement,
   ReactNode,
   useCallback,
-  useMemo,
   useState,
 } from 'react';
 import {
   KeyboardAvoidingView,
-  Linking,
   Platform,
   Pressable,
-  Text,
   useWindowDimensions,
   View,
 } from 'react-native';
-import { Image } from 'expo-image';
 import { useSafeAreaInsets } from 'react-native-safe-area-context';
 
-import WEB_LOGO from '../../assets/images/WebLogo.png';
 import { VerticalNav } from './nav/VerticalNav';
+import { Button } from '../primitives';
+import { IdentityFooter } from '@/src/features/core/identity/IdentityFooter';
 import { Ionicons } from '@expo/vector-icons';
+import WEB_LOGO from '../../assets/images/WebLogo.png';
 import { FUTO_URL, openCompose } from '../../constants';
-import { Button } from '../primitives';
 import { useCurrentIdentity } from '../../lib/polycentric-hooks';
-import { IdentityFooter } from '@/src/features/core/identity/IdentityFooter';
 
 type MainProps = {
   children: ReactElement | ReactElement[];
@@ -63,7 +60,7 @@ function Main({ children, style }: MainProps) {
       <View
         style={[
           Atoms.flex_1,
-          Atoms.flex_row,
+          showRightSidebar && Atoms.flex_row,
           Atoms.justify_between,
           { width: innerWidth },
         ]}
@@ -257,7 +254,7 @@ export const RightSidebar = memo(function RightSidebar({
     setActiveThemeName(next);
   }, [setActiveThemeName, theme.name]);
 
-  const LINKS: { text: ReactNode; href: ExternalPathString }[] = [
+  const LINKS: { text: string; href: ExternalPathString }[] = [
     {
       text: 'Privacy Policy',
       href: 'https://docs.polycentric.io/privacy-policy/',
@@ -266,7 +263,7 @@ export const RightSidebar = memo(function RightSidebar({
       text: 'Source Code',
       href: 'https://gitlab.futo.org/polycentric/polycentric',
     },
-    { text: <Text>FUTO &copy; 2026.</Text>, href: FUTO_URL },
+    { text: 'FUTO © 2026.', href: FUTO_URL },
   ];
 
   return (

apps/polycentric/src/common/lib/polycentric-hooks/PolycentricProvider.tsx

@@ -41,7 +41,7 @@ const DEFAULT_HOST = Platform.OS === 'android' ? '10.0.2.2' : 'localhost';
 
 export const DEFAULT_SERVER =
   (process.env.EXPO_PUBLIC_POLYCENTRIC_SERVER ?? '').trim() ||
-  `http://${DEFAULT_HOST}:8787`;
+  `http://${DEFAULT_HOST}:50051`;
 
 interface PolycentricProviderProps {
   children: ReactNode;
@@ -122,6 +122,8 @@ export function PolycentricProvider({
 
         if (cancelled) return;
 
+        c.servers = [DEFAULT_SERVER];
+
         const s = createPolycentricStore(c);
         await s.getState().refreshIdentities();
 

packages/js-browser/src/storage/indexeddb/storage-driver.ts

@@ -40,4 +40,38 @@ export class IndexedDBStorageDriver implements IStorageDriver {
   createEventAckRepository() {
     return new IndexedDBEventAckRepository(this.database);
   }
+
+  saveActiveIdentityKey(
+    publicKey: Uint8Array,
+    identityKey: string | null,
+  ): void {
+    try {
+      const key = IndexedDBStorageDriver.activeIdentityKey(publicKey);
+      if (identityKey) {
+        localStorage.setItem(key, identityKey);
+      } else {
+        localStorage.removeItem(key);
+      }
+    } catch {}
+  }
+
+  loadActiveIdentityKey(publicKey: Uint8Array): string | null {
+    try {
+      return localStorage.getItem(
+        IndexedDBStorageDriver.activeIdentityKey(publicKey),
+      );
+    } catch {
+      return null;
+    }
+  }
+
+  private static activeIdentityKey(publicKey: Uint8Array): string {
+    return `polycentric:activeIdentity:${IndexedDBStorageDriver.toHex(publicKey, 32)}`;
+  }
+
+  private static toHex(bytes: Uint8Array, len = 8): string {
+    return Array.from(bytes.slice(0, len))
+      .map((b) => b.toString(16).padStart(2, '0'))
+      .join('');
+  }
 }

packages/js-browser/test/opfs-sqlite-database.test.ts

@@ -109,9 +109,8 @@ export class IdentityManager {
 
     await this.client.storage.content.save(digest, content);
     const signedEvent = await this.client.signEvent(event);
-    await this.client.commitEvent(signedEvent, content);
-
     this.client.setActiveIdentityKey(identityKey);
+    await this.client.commitEvent(signedEvent, content);
 
     return { identityKey, signedEvent };
   }

packages/js-core/src/client-internal/identity-manager.ts

@@ -27,9 +27,6 @@ export type * from './platform-interfaces';
 export { StorageHandle } from './storage';
 export type { Repositories } from './storage';
 
-export type { DatabaseSchema } from './schemas/v1';
-export { schemaV1 as polycentricSchema } from './schemas/v1';
-
 export { PolycentricClient } from './polycentric-client';
 export type {
   PolycentricClientConfig,

packages/js-core/src/index.ts

@@ -8,4 +8,10 @@ export interface IStorageDriver {
   createContentRepository: () => IContentRepository;
   createKeysRepository: () => IKeysRepository;
   createEventAckRepository: () => IEventAckRepository;
+  /** Persist which v2 identity is active for this signing public key (Ed25519: 32 bytes). */
+  saveActiveIdentityKey: (
+    publicKey: Uint8Array,
+    identityKey: string | null,
+  ) => void;
+  loadActiveIdentityKey: (publicKey: Uint8Array) => string | null;
 }