@agether/sdk 1.5.3 → 1.5.5

package/dist/cli.js

@@ -256,6 +256,25 @@ var init_MorphoClient = __esm({
       getWalletAddress() {
         return this.wallet.address;
       }
+      /** Mint a new ERC-8004 identity and return the agentId. */
+      async _mintNewIdentity() {
+        const regTx = await this.identityRegistry.register();
+        const regReceipt = await regTx.wait();
+        let agentId = 0n;
+        for (const log of regReceipt.logs) {
+          try {
+            const parsed = this.identityRegistry.interface.parseLog({ topics: log.topics, data: log.data });
+            if (parsed?.name === "Transfer") {
+              agentId = parsed.args[2];
+              break;
+            }
+          } catch {
+            continue;
+          }
+        }
+        if (agentId === 0n) throw new AgetherError("Failed to parse agentId from registration", "PARSE_ERROR");
+        return agentId;
+      }
       /**
        * Register: create ERC-8004 identity + AgentAccount in one flow.
        * If already registered, returns existing state.
@@ -270,31 +289,16 @@ var init_MorphoClient = __esm({
             return { agentId: this.agentId, address: eoaAddr, agentAccount: acct, alreadyRegistered: true };
           }
         }
-        const balance = await this.identityRegistry.balanceOf(eoaAddr);
         let agentId;
-        if (balance > 0n && this.agentId) {
-          agentId = BigInt(this.agentId);
-        } else if (balance > 0n) {
-          throw new AgetherError(
-            "Wallet already has an ERC-8004 identity but agentId is unknown. Pass agentId in config.",
-            "AGENT_ID_UNKNOWN"
-          );
-        } else {
-          const regTx = await this.identityRegistry.register();
-          const regReceipt = await regTx.wait();
-          agentId = 0n;
-          for (const log of regReceipt.logs) {
-            try {
-              const parsed = this.identityRegistry.interface.parseLog({ topics: log.topics, data: log.data });
-              if (parsed?.name === "Transfer") {
-                agentId = parsed.args[2];
-                break;
-              }
-            } catch {
-              continue;
-            }
+        if (this.agentId) {
+          const balance = await this.identityRegistry.balanceOf(eoaAddr);
+          if (balance > 0n) {
+            agentId = BigInt(this.agentId);
+          } else {
+            agentId = await this._mintNewIdentity();
           }
-          if (agentId === 0n) throw new AgetherError("Failed to parse agentId from registration", "PARSE_ERROR");
+        } else {
+          agentId = await this._mintNewIdentity();
         }
         this.agentId = agentId.toString();
         const acctExists = await this.accountFactory.accountExists(agentId);
@@ -314,26 +318,48 @@ var init_MorphoClient = __esm({
           tx: txHash
         };
       }
-      /** Get ETH / USDC balances for EOA and AgentAccount. */
+      /** Get ETH / USDC / collateral balances for EOA and AgentAccount. */
       async getBalances() {
         const eoaAddr = this.wallet.address;
         const usdc = new import_ethers.Contract(this.config.contracts.usdc, ERC20_ABI, this.provider);
         const ethBal = await this.provider.getBalance(eoaAddr);
         const usdcBal = await usdc.balanceOf(eoaAddr);
+        const eoaCollateral = {};
+        for (const [symbol, info] of Object.entries(BASE_COLLATERALS)) {
+          try {
+            const token = new import_ethers.Contract(info.address, ERC20_ABI, this.provider);
+            const bal = await token.balanceOf(eoaAddr);
+            eoaCollateral[symbol] = import_ethers.ethers.formatUnits(bal, info.decimals);
+          } catch {
+            eoaCollateral[symbol] = "0";
+          }
+        }
         const result = {
           agentId: this.agentId || "?",
           address: eoaAddr,
           eth: import_ethers.ethers.formatEther(ethBal),
-          usdc: import_ethers.ethers.formatUnits(usdcBal, 6)
+          usdc: import_ethers.ethers.formatUnits(usdcBal, 6),
+          collateral: eoaCollateral
         };
         try {
           const acctAddr = await this.getAccountAddress();
           const acctEth = await this.provider.getBalance(acctAddr);
           const acctUsdc = await usdc.balanceOf(acctAddr);
+          const acctCollateral = {};
+          for (const [symbol, info] of Object.entries(BASE_COLLATERALS)) {
+            try {
+              const token = new import_ethers.Contract(info.address, ERC20_ABI, this.provider);
+              const bal = await token.balanceOf(acctAddr);
+              acctCollateral[symbol] = import_ethers.ethers.formatUnits(bal, info.decimals);
+            } catch {
+              acctCollateral[symbol] = "0";
+            }
+          }
           result.agentAccount = {
             address: acctAddr,
             eth: import_ethers.ethers.formatEther(acctEth),
-            usdc: import_ethers.ethers.formatUnits(acctUsdc, 6)
+            usdc: import_ethers.ethers.formatUnits(acctUsdc, 6),
+            collateral: acctCollateral
           };
         } catch {
         }

package/dist/index.d.mts

@@ -206,10 +206,12 @@ interface BalancesResult {
     address: string;
     eth: string;
     usdc: string;
+    collateral: Record<string, string>;
     agentAccount?: {
         address: string;
         eth: string;
         usdc: string;
+        collateral: Record<string, string>;
     };
 }
 interface RegisterResult {
@@ -287,12 +289,14 @@ declare class MorphoClient {
     getAccountAddress(): Promise<string>;
     getAgentId(): string;
     getWalletAddress(): string;
+    /** Mint a new ERC-8004 identity and return the agentId. */
+    private _mintNewIdentity;
     /**
      * Register: create ERC-8004 identity + AgentAccount in one flow.
      * If already registered, returns existing state.
      */
     register(_name?: string): Promise<RegisterResult>;
-    /** Get ETH / USDC balances for EOA and AgentAccount. */
+    /** Get ETH / USDC / collateral balances for EOA and AgentAccount. */
     getBalances(): Promise<BalancesResult>;
     /** Transfer USDC from EOA to AgentAccount. */
     fundAccount(usdcAmount: string): Promise<FundResult>;

package/dist/index.d.ts

@@ -206,10 +206,12 @@ interface BalancesResult {
     address: string;
     eth: string;
     usdc: string;
+    collateral: Record<string, string>;
     agentAccount?: {
         address: string;
         eth: string;
         usdc: string;
+        collateral: Record<string, string>;
     };
 }
 interface RegisterResult {
@@ -287,12 +289,14 @@ declare class MorphoClient {
     getAccountAddress(): Promise<string>;
     getAgentId(): string;
     getWalletAddress(): string;
+    /** Mint a new ERC-8004 identity and return the agentId. */
+    private _mintNewIdentity;
     /**
      * Register: create ERC-8004 identity + AgentAccount in one flow.
      * If already registered, returns existing state.
      */
     register(_name?: string): Promise<RegisterResult>;
-    /** Get ETH / USDC balances for EOA and AgentAccount. */
+    /** Get ETH / USDC / collateral balances for EOA and AgentAccount. */
     getBalances(): Promise<BalancesResult>;
     /** Transfer USDC from EOA to AgentAccount. */
     fundAccount(usdcAmount: string): Promise<FundResult>;

package/dist/index.js

@@ -491,6 +491,25 @@ var MorphoClient = class {
   getWalletAddress() {
     return this.wallet.address;
   }
+  /** Mint a new ERC-8004 identity and return the agentId. */
+  async _mintNewIdentity() {
+    const regTx = await this.identityRegistry.register();
+    const regReceipt = await regTx.wait();
+    let agentId = 0n;
+    for (const log of regReceipt.logs) {
+      try {
+        const parsed = this.identityRegistry.interface.parseLog({ topics: log.topics, data: log.data });
+        if (parsed?.name === "Transfer") {
+          agentId = parsed.args[2];
+          break;
+        }
+      } catch {
+        continue;
+      }
+    }
+    if (agentId === 0n) throw new AgetherError("Failed to parse agentId from registration", "PARSE_ERROR");
+    return agentId;
+  }
   /**
    * Register: create ERC-8004 identity + AgentAccount in one flow.
    * If already registered, returns existing state.
@@ -505,31 +524,16 @@ var MorphoClient = class {
         return { agentId: this.agentId, address: eoaAddr, agentAccount: acct, alreadyRegistered: true };
       }
     }
-    const balance = await this.identityRegistry.balanceOf(eoaAddr);
     let agentId;
-    if (balance > 0n && this.agentId) {
-      agentId = BigInt(this.agentId);
-    } else if (balance > 0n) {
-      throw new AgetherError(
-        "Wallet already has an ERC-8004 identity but agentId is unknown. Pass agentId in config.",
-        "AGENT_ID_UNKNOWN"
-      );
-    } else {
-      const regTx = await this.identityRegistry.register();
-      const regReceipt = await regTx.wait();
-      agentId = 0n;
-      for (const log of regReceipt.logs) {
-        try {
-          const parsed = this.identityRegistry.interface.parseLog({ topics: log.topics, data: log.data });
-          if (parsed?.name === "Transfer") {
-            agentId = parsed.args[2];
-            break;
-          }
-        } catch {
-          continue;
-        }
+    if (this.agentId) {
+      const balance = await this.identityRegistry.balanceOf(eoaAddr);
+      if (balance > 0n) {
+        agentId = BigInt(this.agentId);
+      } else {
+        agentId = await this._mintNewIdentity();
       }
-      if (agentId === 0n) throw new AgetherError("Failed to parse agentId from registration", "PARSE_ERROR");
+    } else {
+      agentId = await this._mintNewIdentity();
     }
     this.agentId = agentId.toString();
     const acctExists = await this.accountFactory.accountExists(agentId);
@@ -549,26 +553,48 @@ var MorphoClient = class {
       tx: txHash
     };
   }
-  /** Get ETH / USDC balances for EOA and AgentAccount. */
+  /** Get ETH / USDC / collateral balances for EOA and AgentAccount. */
   async getBalances() {
     const eoaAddr = this.wallet.address;
     const usdc = new import_ethers2.Contract(this.config.contracts.usdc, ERC20_ABI, this.provider);
     const ethBal = await this.provider.getBalance(eoaAddr);
     const usdcBal = await usdc.balanceOf(eoaAddr);
+    const eoaCollateral = {};
+    for (const [symbol, info] of Object.entries(BASE_COLLATERALS)) {
+      try {
+        const token = new import_ethers2.Contract(info.address, ERC20_ABI, this.provider);
+        const bal = await token.balanceOf(eoaAddr);
+        eoaCollateral[symbol] = import_ethers2.ethers.formatUnits(bal, info.decimals);
+      } catch {
+        eoaCollateral[symbol] = "0";
+      }
+    }
     const result = {
       agentId: this.agentId || "?",
       address: eoaAddr,
       eth: import_ethers2.ethers.formatEther(ethBal),
-      usdc: import_ethers2.ethers.formatUnits(usdcBal, 6)
+      usdc: import_ethers2.ethers.formatUnits(usdcBal, 6),
+      collateral: eoaCollateral
     };
     try {
       const acctAddr = await this.getAccountAddress();
       const acctEth = await this.provider.getBalance(acctAddr);
       const acctUsdc = await usdc.balanceOf(acctAddr);
+      const acctCollateral = {};
+      for (const [symbol, info] of Object.entries(BASE_COLLATERALS)) {
+        try {
+          const token = new import_ethers2.Contract(info.address, ERC20_ABI, this.provider);
+          const bal = await token.balanceOf(acctAddr);
+          acctCollateral[symbol] = import_ethers2.ethers.formatUnits(bal, info.decimals);
+        } catch {
+          acctCollateral[symbol] = "0";
+        }
+      }
       result.agentAccount = {
         address: acctAddr,
         eth: import_ethers2.ethers.formatEther(acctEth),
-        usdc: import_ethers2.ethers.formatUnits(acctUsdc, 6)
+        usdc: import_ethers2.ethers.formatUnits(acctUsdc, 6),
+        collateral: acctCollateral
       };
     } catch {
     }