Agent & entanglement rust implementation

bootstrap-languages/agent-language/adapter.ts

@@ -31,7 +31,7 @@ class Sharing implements PublicSharing {
 
   constructor(context: LanguageContext) {
     this.#DNA = context.Holochain as HolochainLanguageDelegate;
-    this.#agent = context.agent; 
+    this.#agent = context.agent;
   }
 
   async createPublic(content: Agent): Promise<Address> {
@@ -49,9 +49,11 @@ class Sharing implements PublicSharing {
     agent.perspective!.links.forEach(link => {
       delete link.proof.valid
       delete link.proof.invalid
+      delete link.status
     })
 
     const expression = this.#agent.createSignedExpression(agent);
+
     await this.#DNA.call(
       DNA_NICK,
       "agent_store",

executor/src/agent_extension.d.ts

@@ -1,3 +1,5 @@
+import { AgentStatus } from "@coasys/ad4m";
+
 export interface VerificationMethod {
     id: string;
     type: string;
@@ -50,6 +52,13 @@ declare global {
         createSignedExpression: (data: any) => Expression;
         sign: (payload: Uint8Array) => Uint8Array;
         signStringHex: (payload: string) => string;
+        load: () => AgentStatus;
+        agent: () => Agent;
+        isInitialized: () => boolean;
+        isUnlocked: () => boolean;
+        unlock: (password: string) => boolean;
+        lock: () => void;
+        save_agent_profile: (agent: Agent) => void;
     }
 
     const AGENT: RustAgent;

executor/src/core/Ad4mCore.ts

@@ -10,7 +10,6 @@ import LanguageController from './LanguageController'
 import * as DIDs from './agent/DIDs'
 import type { DIDResolver } from './agent/DIDs'
 import * as PubSubDefinitions from './graphQL-interface/SubscriptionDefinitions'
-import EntanglementProofController from './EntanglementProof'
 import fs from 'node:fs'
 import { AgentInfoResponse } from '@holochain/client'
 import { v4 as uuidv4 } from 'uuid';
@@ -56,7 +55,6 @@ export default class Ad4mCore {
 
     #languageController?: LanguageController
 
-    #entanglementProofController?: EntanglementProofController
     #languagesReady: Promise<void>
     #resolveLanguagesReady: (value: void) => void
 
@@ -66,7 +64,7 @@ export default class Ad4mCore {
         this.#config = Config.init(config);
 
         this.#agentService = new AgentService(this.#config.rootConfigPath, this.#config.adminCredential)
-        this.#agentService.load()
+        const agent = AGENT.load();
         this.#db = Db.init(this.#config.dataPath)
         this.#didResolver = DIDs.init(this.#config.dataPath)
         const that = this
@@ -122,13 +120,6 @@ export default class Ad4mCore {
         return this.#languageController!
     }
 
-    get entanglementProofController(): EntanglementProofController {
-        if (!this.#entanglementProofController) {
-            this.#entanglementProofController = new EntanglementProofController(this.#config.rootConfigPath, this.#agentService);
-        }
-        return this.#entanglementProofController
-    }
-
     async exit() {
         console.log("Exiting gracefully...")
         console.log("Stopping Holochain conductor")
@@ -161,17 +152,13 @@ export default class Ad4mCore {
             hcBootstrapUrl: params.hcBootstrapUrl,
         }
 
-        this.#holochain = new HolochainService(holochainConfig, this.#agentService, this.entanglementProofController)
+        this.#holochain = new HolochainService(holochainConfig)
         await this.#holochain.run({
             ...holochainConfig,
             passphrase: params.passphrase!
         });
     }
 
-    async waitForAgent(): Promise<void> {
-        return this.#agentService.ready
-    }
-
     async waitForLanguages(): Promise<void> {
         return this.#languagesReady
     }
@@ -191,8 +178,6 @@ export default class Ad4mCore {
             ad4mSignal: this.languageSignal,
             config: this.#config,
         }, { holochainService: this.#holochain!, db: this.#db } )
-
-        this.entanglementProofController
     }
 
     async initLanguages() {
@@ -256,14 +241,14 @@ export default class Ad4mCore {
         console.log("wait for languages");
         await this.waitForLanguages()
         console.log("finished wait");
-        const agent = this.#agentService.agent!
+        const agent = AGENT.agent();
         if(agent.directMessageLanguage) return
         console.log("Agent doesn't have direct message language set yet. Creating from template...")
 
         console.log("Cloning direct message language from template...");
         const templateParams = {
             uid: uuidv4(),
-            recipient_did: this.#agentService.agent?.did,
+            recipient_did: agent?.did,
             recipient_hc_agent_pubkey: Buffer.from(await HOLOCHAIN_SERVICE.getAgentKey()).toString('hex')
         }
         console.debug("Now creating clone with parameters:", templateParams)
@@ -292,7 +277,8 @@ export default class Ad4mCore {
     }
 
     async myDirectMessageLanguage(): Promise<Language> {
-        const dmLang = this.#agentService.agent!.directMessageLanguage!
+        const agent = AGENT.agent();
+        const dmLang = agent!.directMessageLanguage!
         return await this.#languageController!.languageByRef(new LanguageRef(dmLang))
     }
 }

executor/src/core/LanguageController.ts

@@ -132,7 +132,7 @@ export default class LanguageController {
             }
             const agentLanguage = await this.installLanguage(this.#config.languageAliases[Config.agentLanguageAlias], null);
             this.#agentLanguage = agentLanguage!;
-            ((this.#context as LanguageContext).agent as AgentService).setAgentLanguage(agentLanguage!)
+            ((this.#context as LanguageContext).agent as unknown as AgentService).setAgentLanguage(agentLanguage!)
 
             //Install the neighbourhood language and set
             if (this.#config.neighbourhoodLanguageSettings) {
@@ -517,7 +517,7 @@ export default class LanguageController {
             const trustedAgents: string[] = await RUNTIME_SERVICE.getTrustedAgents();
             const agentService = (this.#context as LanguageContext).agent as AgentService;
             //Check if the author of the language is in the trusted agent list the current agent holds, if so then go ahead and install
-            if (trustedAgents.find((agent) => agent === languageAuthor) || agentService.agent! === languageAuthor) {
+            if (trustedAgents.find((agent) => agent === languageAuthor) || AGENT.did() === languageAuthor) {
                 //Get the language source so we can generate a hash and check against the hash given in the language meta information
                 const languageSource = await this.getLanguageSource(address);
                 if (!languageSource) {