@hashgraphonline/standards-sdk 0.0.114 → 0.0.116

package/dist/es/standards-sdk.es7.js

@@ -1,13 +1,18 @@
 import { Client, PrivateKey, AccountCreateTransaction, Hbar, CustomFixedFee, AccountId, TokenId, KeyList, TopicCreateTransaction, PublicKey, TopicMessageSubmitTransaction, TopicId, Transaction, ScheduleCreateTransaction, Timestamp } from "@hashgraph/sdk";
 import { AccountCreationError, TopicCreationError, ConnectionConfirmationError, PayloadSizeError } from "./standards-sdk.es6.js";
-import { I as InscriptionSDK } from "./standards-sdk.es24.js";
+import { I as InscriptionSDK } from "./standards-sdk.es25.js";
 import { Logger } from "./standards-sdk.es15.js";
+import { accountIdsToExemptKeys } from "./standards-sdk.es16.js";
+import "axios";
+import "@hashgraph/proto";
+import "buffer";
+import "ethers";
+import { detectKeyTypeFromString } from "./standards-sdk.es20.js";
 import { HCS10BaseClient, Hcs10MemoType } from "./standards-sdk.es5.js";
 import * as mime from "mime-types";
 import { InboundTopicType } from "./standards-sdk.es14.js";
 import { HCS11Client } from "./standards-sdk.es13.js";
-import { accountIdsToExemptKeys } from "./standards-sdk.es16.js";
-import { inscribe } from "./standards-sdk.es20.js";
+import { inscribe } from "./standards-sdk.es21.js";
 import { addSeconds } from "date-fns";
 class HCS10Client extends HCS10BaseClient {
   constructor(config) {
@@ -17,15 +22,28 @@ class HCS10Client extends HCS10BaseClient {
       prettyPrint: config.prettyPrint,
       feeAmount: config.feeAmount,
       mirrorNode: config.mirrorNode,
-      silent: config.silent
+      silent: config.silent,
+      keyType: config.keyType
     });
     this.client = config.network === "mainnet" ? Client.forMainnet() : Client.forTestnet();
-    this.operatorPrivateKey = PrivateKey.fromString(config.operatorPrivateKey);
+    this.operatorPrivateKey = config.operatorPrivateKey;
+    this.operatorId = config.operatorId;
+    if (config.keyType) {
+      this.keyType = config.keyType;
+      const PK = this.keyType === "ecdsa" ? PrivateKey.fromStringECDSA(this.operatorPrivateKey) : PrivateKey.fromStringED25519(this.operatorPrivateKey);
+      this.client.setOperator(config.operatorId, PK);
+    } else {
+      try {
+        const keyDetection = detectKeyTypeFromString(this.operatorPrivateKey);
+        this.client.setOperator(config.operatorId, keyDetection.privateKey);
+        this.keyType = keyDetection.detectedType;
+      } catch (error) {
+        this.logger.warn("Failed to detect key type from private key format, will query mirror node");
+        this.keyType = "ed25519";
+      }
+      this.initializeOperator();
+    }
     this.network = config.network;
-    this.client.setOperator(
-      config.operatorId,
-      this.operatorPrivateKey.toString()
-    );
     this.logger = Logger.getInstance({
       level: config.logLevel || "info",
       module: "HCS-SDK",
@@ -39,9 +57,32 @@ class HCS10Client extends HCS10BaseClient {
         privateKey: config.operatorPrivateKey
       },
       logLevel: config.logLevel,
-      silent: config.silent
+      silent: config.silent,
+      keyType: config.keyType
     });
   }
+  async initializeOperator() {
+    const account = await this.requestAccount(this.operatorId);
+    const keyType = account?.key?._type;
+    if (keyType.includes("ECDSA")) {
+      this.keyType = "ecdsa";
+    } else if (keyType.includes("ED25519")) {
+      this.keyType = "ed25519";
+    } else {
+      this.keyType = "ed25519";
+    }
+    const PK = this.keyType === "ecdsa" ? PrivateKey.fromStringECDSA(this.operatorPrivateKey) : PrivateKey.fromStringED25519(this.operatorPrivateKey);
+    this.logger.debug(
+      `Setting operator: ${this.operatorId} with key type: ${this.keyType}`
+    );
+    this.client.setOperator(this.operatorId, PK);
+    return {
+      accountId: this.operatorId,
+      privateKey: this.operatorPrivateKey,
+      keyType: this.keyType,
+      client: this.client
+    };
+  }
   getClient() {
     return this.client;
   }
@@ -51,11 +92,14 @@ class HCS10Client extends HCS10BaseClient {
    * @returns Object with account ID and private key
    */
   async createAccount(initialBalance = 50) {
+    if (!this.keyType) {
+      await this.initializeOperator();
+    }
     this.logger.info(
       `Creating new account with ${initialBalance} HBAR initial balance`
     );
-    const newKey = PrivateKey.generate();
-    const accountTransaction = new AccountCreateTransaction().setKey(newKey.publicKey).setInitialBalance(new Hbar(initialBalance));
+    const newKey = PrivateKey.generateED25519();
+    const accountTransaction = new AccountCreateTransaction().setKeyWithoutAlias(newKey.publicKey).setInitialBalance(new Hbar(initialBalance));
     this.logger.debug("Executing account creation transaction");
     const accountResponse = await accountTransaction.execute(this.client);
     const accountReceipt = await accountResponse.getReceipt(this.client);
@@ -83,6 +127,9 @@ class HCS10Client extends HCS10BaseClient {
    * @returns The topic ID of the created inbound topic
    */
   async createInboundTopic(accountId, topicType, ttl = 60, feeConfigBuilder) {
+    if (!this.keyType) {
+      await this.initializeOperator();
+    }
     const memo = this._generateHcs10Memo(Hcs10MemoType.INBOUND, {
       accountId,
       ttl
@@ -123,26 +170,42 @@ class HCS10Client extends HCS10BaseClient {
    * Creates a new agent with inbound and outbound topics
    * @param builder The agent builder object
    * @param ttl Optional Time-To-Live for the topic memos, defaults to 60
+   * @param existingState Optional existing state to resume from
    * @returns Object with topic IDs
    */
-  async createAgent(builder, ttl = 60) {
+  async createAgent(builder, ttl = 60, existingState) {
+    if (!this.keyType) {
+      await this.initializeOperator();
+    }
     const config = builder.build();
-    const outboundMemo = this._generateHcs10Memo(Hcs10MemoType.OUTBOUND, {
-      ttl
-    });
-    const outboundTopicId = await this.createTopic(outboundMemo, true, true);
-    this.logger.info(`Created new outbound topic ID: ${outboundTopicId}`);
+    let outboundTopicId = existingState?.outboundTopicId || "";
+    let inboundTopicId = existingState?.inboundTopicId || "";
+    let pfpTopicId = existingState?.pfpTopicId || config.existingPfpTopicId || "";
+    let profileTopicId = existingState?.profileTopicId || "";
     const accountId = this.client.operatorAccountId?.toString();
     if (!accountId) {
       throw new Error("Failed to retrieve operator account ID");
     }
-    const inboundTopicId = await this.createInboundTopic(
-      accountId,
-      config.inboundTopicType,
-      ttl,
-      config.inboundTopicType === InboundTopicType.FEE_BASED ? config.feeConfig : void 0
-    );
-    let pfpTopicId = config.existingPfpTopicId || "";
+    if (!outboundTopicId) {
+      const outboundMemo = this._generateHcs10Memo(Hcs10MemoType.OUTBOUND, {
+        ttl
+      });
+      outboundTopicId = await this.createTopic(outboundMemo, true, true);
+      this.logger.info(`Created new outbound topic ID: ${outboundTopicId}`);
+    } else {
+      this.logger.info(`Using existing outbound topic ID: ${outboundTopicId}`);
+    }
+    if (!inboundTopicId) {
+      inboundTopicId = await this.createInboundTopic(
+        accountId,
+        config.inboundTopicType,
+        ttl,
+        config.inboundTopicType === InboundTopicType.FEE_BASED ? config.feeConfig : void 0
+      );
+      this.logger.info(`Created new inbound topic ID: ${inboundTopicId}`);
+    } else {
+      this.logger.info(`Using existing inbound topic ID: ${inboundTopicId}`);
+    }
     if (!pfpTopicId && config.pfpBuffer && config.pfpBuffer.length > 0) {
       this.logger.info("Inscribing new profile picture");
       const pfpResult = await this.inscribePfp(
@@ -153,24 +216,28 @@ class HCS10Client extends HCS10BaseClient {
       this.logger.info(
         `Profile picture inscribed with topic ID: ${pfpTopicId}`
       );
-    } else if (config.existingPfpTopicId) {
+    } else if (pfpTopicId) {
       this.logger.info(
-        `Using existing profile picture with topic ID: ${config.existingPfpTopicId}`
+        `Using existing profile picture with topic ID: ${pfpTopicId}`
       );
     }
-    const profileResult = await this.storeHCS11Profile(
-      config.name,
-      config.bio,
-      inboundTopicId,
-      outboundTopicId,
-      config.capabilities,
-      config.metadata,
-      config.pfpBuffer && config.pfpBuffer.length > 0 ? config.pfpBuffer : void 0,
-      config.pfpFileName,
-      config.existingPfpTopicId
-    );
-    const profileTopicId = profileResult.profileTopicId;
-    this.logger.info(`Profile stored with topic ID: ${profileTopicId}`);
+    if (!profileTopicId) {
+      const profileResult = await this.storeHCS11Profile(
+        config.name,
+        config.bio,
+        inboundTopicId,
+        outboundTopicId,
+        config.capabilities,
+        config.metadata,
+        config.pfpBuffer && config.pfpBuffer.length > 0 && !pfpTopicId ? config.pfpBuffer : void 0,
+        config.pfpFileName,
+        pfpTopicId
+      );
+      profileTopicId = profileResult.profileTopicId;
+      this.logger.info(`Profile stored with topic ID: ${profileTopicId}`);
+    } else {
+      this.logger.info(`Using existing profile topic ID: ${profileTopicId}`);
+    }
     return {
       inboundTopicId,
       outboundTopicId,
@@ -735,9 +802,10 @@ class HCS10Client extends HCS10BaseClient {
     );
   }
   getAccountAndSigner() {
+    const PK = this.keyType === "ecdsa" ? PrivateKey.fromStringECDSA(this.operatorPrivateKey) : PrivateKey.fromStringED25519(this.operatorPrivateKey);
     return {
       accountId: this.client.operatorAccountId.toString(),
-      signer: this.operatorPrivateKey
+      signer: PK
     };
   }
   /**
@@ -758,86 +826,185 @@ class HCS10Client extends HCS10BaseClient {
       const config = builder.build();
       const progressCallback = options?.progressCallback;
       const baseUrl = options?.baseUrl || this.guardedRegistryBaseUrl;
-      let state = options?.existingState || void 0;
+      let state = options?.existingState || {
+        currentStage: "init",
+        completedPercentage: 0,
+        createdResources: []
+      };
+      state.agentMetadata = config.metadata;
       if (progressCallback) {
         progressCallback({
           stage: "preparing",
-          message: "Preparing agent registration",
-          progressPercent: 10,
+          message: "Starting agent creation process",
+          progressPercent: 0,
           details: { state }
         });
       }
-      const account = config.existingAccount || await this.createAccount(options?.initialBalance);
-      if (progressCallback) {
-        progressCallback({
-          stage: "preparing",
-          message: "Created account or using existing account",
-          progressPercent: 20,
-          details: { state, account }
-        });
-      }
-      const agentClient = new HCS10Client({
-        network: config.network,
-        operatorId: account.accountId,
-        operatorPrivateKey: account.privateKey,
-        operatorPublicKey: PrivateKey.fromString(
-          account.privateKey
-        ).publicKey.toString(),
-        logLevel: "info",
-        guardedRegistryBaseUrl: baseUrl
-      });
-      if (progressCallback) {
-        progressCallback({
-          stage: "preparing",
-          message: "Initialized agent client",
-          progressPercent: 30,
-          details: { state }
+      let account = config.existingAccount;
+      let agentClient;
+      if (!state.inboundTopicId || !state.outboundTopicId || !state.profileTopicId) {
+        if (!account) {
+          if (state.createdResources && state.createdResources.some((r) => r.startsWith("account:"))) {
+            const accountResource = state.createdResources.find(
+              (r) => r.startsWith("account:")
+            );
+            const existingAccountId = accountResource?.split(":")[1];
+            if (existingAccountId && config.existingAccount) {
+              account = config.existingAccount;
+              this.logger.info(
+                `Resuming with existing account: ${existingAccountId}`
+              );
+            } else {
+              account = await this.createAccount(options?.initialBalance);
+              state.createdResources = state.createdResources || [];
+              state.createdResources.push(`account:${account.accountId}`);
+            }
+          } else {
+            account = await this.createAccount(options?.initialBalance);
+            state.createdResources = state.createdResources || [];
+            state.createdResources.push(`account:${account.accountId}`);
+          }
+        }
+        if (progressCallback) {
+          progressCallback({
+            stage: "preparing",
+            message: "Created account or using existing account",
+            progressPercent: 20,
+            details: { state, account }
+          });
+        }
+        agentClient = new HCS10Client({
+          network: config.network,
+          operatorId: account.accountId,
+          operatorPrivateKey: account.privateKey,
+          operatorPublicKey: PrivateKey.fromString(
+            account.privateKey
+          ).publicKey.toString(),
+          logLevel: "info",
+          guardedRegistryBaseUrl: baseUrl
         });
-      }
-      const { outboundTopicId, inboundTopicId, pfpTopicId, profileTopicId } = await agentClient.createAgent(builder);
-      if (progressCallback) {
-        progressCallback({
-          stage: "submitting",
-          message: "Created agent with topics and profile",
-          progressPercent: 60,
-          details: {
-            state,
-            outboundTopicId,
-            inboundTopicId,
-            pfpTopicId,
-            profileTopicId
+        if (progressCallback) {
+          progressCallback({
+            stage: "preparing",
+            message: "Initialized agent client",
+            progressPercent: 25,
+            details: { state }
+          });
+        }
+        let outboundTopicId = state.outboundTopicId;
+        let inboundTopicId = state.inboundTopicId;
+        let pfpTopicId = state.pfpTopicId;
+        let profileTopicId = state.profileTopicId;
+        if (!outboundTopicId || !inboundTopicId || !profileTopicId) {
+          if (pfpTopicId) {
+            builder.setExistingProfilePicture(pfpTopicId);
+          }
+          const createResult = await agentClient.createAgent(
+            builder,
+            60,
+            state
+          );
+          outboundTopicId = createResult.outboundTopicId;
+          inboundTopicId = createResult.inboundTopicId;
+          pfpTopicId = createResult.pfpTopicId;
+          profileTopicId = createResult.profileTopicId;
+          state.outboundTopicId = outboundTopicId;
+          state.inboundTopicId = inboundTopicId;
+          state.pfpTopicId = pfpTopicId;
+          state.profileTopicId = profileTopicId;
+          if (!state.createdResources) {
+            state.createdResources = [];
+          }
+          if (pfpTopicId && !state.createdResources.includes(`pfp:${pfpTopicId}`)) {
+            state.createdResources.push(`pfp:${pfpTopicId}`);
+          }
+          if (!state.createdResources.includes(`inbound:${inboundTopicId}`)) {
+            state.createdResources.push(`inbound:${inboundTopicId}`);
+          }
+          if (!state.createdResources.includes(`outbound:${outboundTopicId}`)) {
+            state.createdResources.push(`outbound:${outboundTopicId}`);
+          }
+          if (!state.createdResources.includes(`profile:${profileTopicId}`)) {
+            state.createdResources.push(`profile:${profileTopicId}`);
           }
+        }
+        state.currentStage = "profile";
+        state.completedPercentage = 60;
+        if (progressCallback) {
+          progressCallback({
+            stage: "submitting",
+            message: "Created agent with topics and profile",
+            progressPercent: 60,
+            details: {
+              state,
+              outboundTopicId,
+              inboundTopicId,
+              pfpTopicId,
+              profileTopicId
+            }
+          });
+        }
+      } else {
+        account = account || config.existingAccount;
+        if (!account) {
+          throw new Error(
+            "Cannot resume registration without account information"
+          );
+        }
+        agentClient = new HCS10Client({
+          network: config.network,
+          operatorId: account.accountId,
+          operatorPrivateKey: account.privateKey,
+          operatorPublicKey: PrivateKey.fromString(
+            account.privateKey
+          ).publicKey.toString(),
+          logLevel: "info",
+          guardedRegistryBaseUrl: baseUrl
+        });
+        this.logger.info("Resuming registration with existing state", {
+          inboundTopicId: state.inboundTopicId,
+          outboundTopicId: state.outboundTopicId,
+          profileTopicId: state.profileTopicId,
+          pfpTopicId: state.pfpTopicId
         });
       }
-      const operatorId = `${inboundTopicId}@${account.accountId}`;
-      const registrationResult = await agentClient.registerAgentWithGuardedRegistry(
-        account.accountId,
-        config.network,
-        {
-          progressCallback: (data) => {
-            const adjustedPercent = 60 + (data.progressPercent || 0) * 0.4;
-            if (progressCallback) {
-              progressCallback({
-                stage: data.stage,
-                message: data.message,
-                progressPercent: adjustedPercent,
-                details: {
-                  ...data.details,
-                  outboundTopicId,
-                  inboundTopicId,
-                  pfpTopicId,
-                  profileTopicId,
-                  operatorId,
-                  state: data.details?.state || state
-                }
-              });
-            }
-          },
-          existingState: state
+      const operatorId = `${state.inboundTopicId}@${account.accountId}`;
+      if (state.currentStage !== "complete" || !state.createdResources?.includes(
+        `registration:${state.inboundTopicId}`
+      )) {
+        const registrationResult = await agentClient.registerAgentWithGuardedRegistry(
+          account.accountId,
+          config.network,
+          {
+            progressCallback: (data) => {
+              const adjustedPercent = 60 + (data.progressPercent || 0) * 0.4;
+              if (progressCallback) {
+                progressCallback({
+                  stage: data.stage,
+                  message: data.message,
+                  progressPercent: adjustedPercent,
+                  details: {
+                    ...data.details,
+                    outboundTopicId: state.outboundTopicId,
+                    inboundTopicId: state.inboundTopicId,
+                    pfpTopicId: state.pfpTopicId,
+                    profileTopicId: state.profileTopicId,
+                    operatorId,
+                    state: data.details?.state || state
+                  }
+                });
+              }
+            },
+            existingState: state
+          }
+        );
+        if (!registrationResult.success) {
+          return {
+            ...registrationResult,
+            state
+          };
         }
-      );
-      if (!registrationResult.success) {
-        return registrationResult;
+        state = registrationResult.state || state;
       }
       if (progressCallback) {
         progressCallback({
@@ -845,25 +1012,26 @@ class HCS10Client extends HCS10BaseClient {
           message: "Agent creation and registration complete",
           progressPercent: 100,
           details: {
-            outboundTopicId,
-            inboundTopicId,
-            pfpTopicId,
-            profileTopicId,
+            outboundTopicId: state.outboundTopicId,
+            inboundTopicId: state.inboundTopicId,
+            pfpTopicId: state.pfpTopicId,
+            profileTopicId: state.profileTopicId,
             operatorId,
-            state: registrationResult.state
+            state
           }
         });
       }
       return {
-        ...registrationResult,
+        success: true,
+        state,
         metadata: {
           accountId: account.accountId,
           privateKey: account.privateKey,
           operatorId,
-          inboundTopicId,
-          outboundTopicId,
-          profileTopicId,
-          pfpTopicId
+          inboundTopicId: state.inboundTopicId,
+          outboundTopicId: state.outboundTopicId,
+          profileTopicId: state.profileTopicId,
+          pfpTopicId: state.pfpTopicId
         }
       };
     } catch (e) {
@@ -872,7 +1040,12 @@ class HCS10Client extends HCS10BaseClient {
       this.logger.error(logMessage);
       return {
         error: error.message,
-        success: false
+        success: false,
+        state: options?.existingState || {
+          currentStage: "init",
+          completedPercentage: 0,
+          error: error.message
+        }
       };
     }
   }