Merge pull request #78 from holochain-open-dev/main

chore: gen zome fn bindings (#75)
holochain-open-dev · Aug 7, 2024 · 1d50aa8 · 1d50aa8
2 parents 7017b66 + 4688f45
commit 1d50aa8
Show file tree

Hide file tree

Showing 53 changed files with 1,053 additions and 282 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/authority/src/evm-bytes-signer/evm-bytes-signer-client.ts b/packages/authority/src/evm-bytes-signer/evm-bytes-signer-client.ts
@@ -1,9 +1,5 @@
-import type { AppWebsocket, AppSignal } from "@holochain/client";
-import {
-  LocalHoloomSignal,
-  ResolveEvmSignatureOverRecipeExecutionRequestPayload,
-  RejectEvmSignatureOverRecipeExecutionRequestPayload,
-} from "@holoom/types";
+import type { AppSignal, AppClient } from "@holochain/client";
+import { LocalHoloomSignal, UsernameRegistryCoordinator } from "@holoom/types";
 import { BytesSigner } from "./bytes-signer.js";
 
 export type PickByType<T, K> = T extends { type: K } ? T : never;
@@ -13,35 +9,15 @@ type EvmSignatureRequested = PickByType<
 >;
 
 export class EvmBytesSignerClient {
+  private usernameRegistryCoordinator: UsernameRegistryCoordinator;
   constructor(
-    readonly appAgent: AppWebsocket,
+    appClient: AppClient,
     readonly bytesSigner: BytesSigner
   ) {
-    appAgent.on("signal", (signal) => this.handleAppSignal(signal));
-  }
-
-  async confirmRequest(
-    payload: ResolveEvmSignatureOverRecipeExecutionRequestPayload
-  ): Promise<void> {
-    console.log("confirmRequest", payload);
-    await this.appAgent.callZome({
-      role_name: "holoom",
-      zome_name: "username_registry",
-      fn_name: "resolve_evm_signature_over_recipe_execution_request",
-      payload,
-    });
-  }
-
-  async rejectRequest(
-    payload: RejectEvmSignatureOverRecipeExecutionRequestPayload
-  ): Promise<void> {
-    console.log("rejectRequest", payload);
-    await this.appAgent.callZome({
-      role_name: "holoom",
-      zome_name: "username_registry",
-      fn_name: "reject_evm_signature_over_recipe_execution_request",
-      payload,
-    });
+    this.usernameRegistryCoordinator = new UsernameRegistryCoordinator(
+      appClient
+    );
+    appClient.on("signal", (signal) => this.handleAppSignal(signal));
   }
 
   handleAppSignal(signal: AppSignal) {
@@ -60,23 +36,28 @@ export class EvmBytesSignerClient {
         signal.u256_array
       );
       // Will node complain about this orphaned promise?
-      this.confirmRequest({
-        request_id: signal.request_id,
-        requestor: signal.requestor_pubkey,
-        signed_u256_array: {
-          signature,
-          signer: this.bytesSigner.address,
-          raw: signal.u256_array,
-        },
-      });
+      console.log(`Signed request ${signal.request_id}`);
+      this.usernameRegistryCoordinator.resolveEvmSignatureOverRecipeExecutionRequest(
+        {
+          request_id: signal.request_id,
+          requestor: signal.requestor_pubkey,
+          signed_u256_array: {
+            signature,
+            signer: this.bytesSigner.address,
+            raw: signal.u256_array,
+          },
+        }
+      );
     } catch (err) {
-      console.error(err);
+      console.error(`Rejected request ${signal.request_id}`, err);
       // Will node complain about this orphaned promise?
-      this.rejectRequest({
-        request_id: signal.request_id,
-        requestor: signal.requestor_pubkey,
-        reason: unknownErrToString(err),
-      });
+      this.usernameRegistryCoordinator.rejectEvmSignatureOverRecipeExecutionRequest(
+        {
+          request_id: signal.request_id,
+          requestor: signal.requestor_pubkey,
+          reason: unknownErrToString(err),
+        }
+      );
     }
   }
 }

diff --git a/packages/authority/src/evm-bytes-signer/offer-creator.ts b/packages/authority/src/evm-bytes-signer/offer-creator.ts
@@ -3,14 +3,23 @@ import {
   CreateEvmSigningOfferPayload,
   EvmSigningOffer,
   EvmU256Item,
+  RecordsCoordinator,
+  UsernameRegistryCoordinator,
 } from "@holoom/types";
 import { BytesSigner } from "./bytes-signer";
 
 export class OfferCreator {
+  private usernameRegistryCoordinator: UsernameRegistryCoordinator;
+  private recordsCoordinator: RecordsCoordinator;
   constructor(
-    readonly appClient: AppClient,
+    appClient: AppClient,
     readonly bytesSigner: BytesSigner
-  ) {}
+  ) {
+    this.usernameRegistryCoordinator = new UsernameRegistryCoordinator(
+      appClient
+    );
+    this.recordsCoordinator = new RecordsCoordinator(appClient);
+  }
 
   async createOffer(
     identifier: string,
@@ -26,20 +35,15 @@ export class OfferCreator {
     await this.untilRecipeGossiped(offer.recipe_ah);
 
     const signature = await this.bytesSigner.sign_offer(offer);
-    const payload: CreateEvmSigningOfferPayload = {
-      identifier,
-      signed_offer: {
-        signer: this.bytesSigner.address,
-        signature,
-        offer,
-      },
-    };
-    const record: Record = await this.appClient.callZome({
-      role_name: "holoom",
-      zome_name: "username_registry",
-      fn_name: "create_signed_evm_signing_offer",
-      payload,
-    });
+    const record: Record =
+      await this.usernameRegistryCoordinator.createSignedEvmSigningOffer({
+        identifier,
+        signed_offer: {
+          signer: this.bytesSigner.address,
+          signature,
+          offer,
+        },
+      });
     console.log("Created record", record);
     const actionHash = Array.from(record.signed_action.hashed.hash);
     return actionHash;
@@ -48,12 +52,7 @@ export class OfferCreator {
   private async untilRecipeGossiped(recipeAh: ActionHash) {
     const deadline = Date.now() + 10_000;
     while (Date.now() < deadline) {
-      const record: Record = await this.appClient.callZome({
-        role_name: "holoom",
-        zome_name: "records",
-        fn_name: "get_record",
-        payload: recipeAh,
-      });
+      const record = await this.recordsCoordinator.getRecord(recipeAh);
       if (record) return;
       await new Promise((r) => setTimeout(r, 500));
     }

diff --git a/packages/authority/src/external-id-attestor/external-id-attestor-client.ts b/packages/authority/src/external-id-attestor/external-id-attestor-client.ts
@@ -1,9 +1,5 @@
-import type { AppWebsocket, AppSignal } from "@holochain/client";
-import {
-  ConfirmExternalIdRequestPayload,
-  LocalHoloomSignal,
-  RejectExternalIdRequestPayload,
-} from "@holoom/types";
+import type { AppSignal, AppClient } from "@holochain/client";
+import { LocalHoloomSignal, UsernameRegistryCoordinator } from "@holoom/types";
 import { AccessTokenAssessor } from "./access-token-assessor.js";
 
 type PickByType<T, K> = T extends { type: K } ? T : never;
@@ -13,33 +9,15 @@ type ExternalIdAttestationRequested = PickByType<
 >;
 
 export class ExternalIdAttestorClient {
+  private usernameRegistryCoordinator: UsernameRegistryCoordinator;
   constructor(
-    readonly appAgent: AppWebsocket,
+    appClient: AppClient,
     readonly accessTokenAssessor: AccessTokenAssessor
   ) {
-    appAgent.on("signal", (signal) => this.handleAppSignal(signal));
-  }
-
-  async confirmRequest(
-    payload: ConfirmExternalIdRequestPayload
-  ): Promise<void> {
-    console.log("confirmRequest", payload);
-    await this.appAgent.callZome({
-      role_name: "holoom",
-      zome_name: "username_registry",
-      fn_name: "confirm_external_id_request",
-      payload,
-    });
-  }
-
-  async rejectRequest(payload: RejectExternalIdRequestPayload): Promise<void> {
-    console.log("rejectRequest", payload);
-    await this.appAgent.callZome({
-      role_name: "holoom",
-      zome_name: "username_registry",
-      fn_name: "reject_external_id_request",
-      payload,
-    });
+    this.usernameRegistryCoordinator = new UsernameRegistryCoordinator(
+      appClient
+    );
+    appClient.on("signal", (signal) => this.handleAppSignal(signal));
   }
 
   handleAppSignal(signal: AppSignal) {
@@ -63,16 +41,17 @@ export class ExternalIdAttestorClient {
       const { externalId, displayName } =
         await this.accessTokenAssessor.fetchUserInfo(accessToken);
       // Will node complain about this orphaned promise?
-      this.confirmRequest({
+      console.log(`Confirmed request ${signal.request_id}`);
+      this.usernameRegistryCoordinator.confirmExternalIdRequest({
         request_id: signal.request_id,
         requestor: signal.requestor_pubkey,
         external_id: externalId,
         display_name: displayName,
       });
     } catch (err) {
-      console.error(err);
+      console.error(`Rejected request ${signal.request_id}`, err);
       // Will node complain about this orphaned promise?
-      this.rejectRequest({
+      this.usernameRegistryCoordinator.rejectExternalIdRequest({
         request_id: signal.request_id,
         requestor: signal.requestor_pubkey,
         reason: unknownErrToString(err),