@gvnrdao/dh-sdk 0.0.96 → 0.0.98

package/dist/index.d.mts

@@ -1,4 +1,4 @@
-import { ethers, DeferredTopicFilter, EventFragment, EventLog as EventLog$1, ContractTransactionResponse, FunctionFragment, ContractTransaction, LogDescription, Typed, TransactionRequest, BaseContract, ContractRunner, Listener, BigNumberish, BytesLike, AddressLike, ContractMethod, Interface, Result as Result$2, Wallet } from 'ethers';
+import { ethers, DeferredTopicFilter, EventFragment, EventLog as EventLog$1, ContractTransactionResponse, FunctionFragment, ContractTransaction, LogDescription, Typed, TransactionRequest, BaseContract, ContractRunner, Listener, BigNumberish, BytesLike, AddressLike, ContractMethod, Interface, Result as Result$2, Wallet, providers } from 'ethers';
 import { LitNetwork, LitOps } from '@gvnrdao/dh-lit-ops';
 
 /**
@@ -6279,6 +6279,11 @@ declare class DiamondHandsGraph {
     private client;
     private defaultPageSize;
     constructor(config: DiamondHandsGraphConfig);
+    /**
+     * Transform graph position data to LoanData interface
+     * Converts flat graph structure to nested LoanData structure
+     */
+    private transformGraphPositionToLoanData;
     /**
      * Helper: Get total count by paginating through all results
      * The Graph has a hard limit of 1000 items per query, so we need to paginate
@@ -6456,6 +6461,8 @@ interface LoanQueryConfig {
     graphClient: DiamondHandsGraphClient;
     /** Bitcoin operations for balance enrichment */
     bitcoinOperations: BitcoinOperations;
+    /** Ethereum provider for PKP public key retrieval */
+    provider?: providers.Provider;
     /** Cache for loan query results */
     cache?: LRUCache<string, LoanData>;
     /** Enable debug logging */
@@ -6496,6 +6503,13 @@ declare class LoanQuery {
      * @returns Paginated loans response
      */
     getLoans(filters?: LoanQueryFilters, pagination?: PaginationParams): Promise<Result$1<PaginatedLoansResponse, SDKError>>;
+    /**
+     * Enrich loans with vault addresses derived from PKP public keys
+     *
+     * @param loans - Array of loans to enrich
+     * @returns Enriched loans with vault addresses for all networks
+     */
+    private enrichLoansWithVaultAddresses;
     /**
      * Map numeric status to string for subgraph queries
      */

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { ethers, DeferredTopicFilter, EventFragment, EventLog as EventLog$1, ContractTransactionResponse, FunctionFragment, ContractTransaction, LogDescription, Typed, TransactionRequest, BaseContract, ContractRunner, Listener, BigNumberish, BytesLike, AddressLike, ContractMethod, Interface, Result as Result$2, Wallet } from 'ethers';
+import { ethers, DeferredTopicFilter, EventFragment, EventLog as EventLog$1, ContractTransactionResponse, FunctionFragment, ContractTransaction, LogDescription, Typed, TransactionRequest, BaseContract, ContractRunner, Listener, BigNumberish, BytesLike, AddressLike, ContractMethod, Interface, Result as Result$2, Wallet, providers } from 'ethers';
 import { LitNetwork, LitOps } from '@gvnrdao/dh-lit-ops';
 
 /**
@@ -6279,6 +6279,11 @@ declare class DiamondHandsGraph {
     private client;
     private defaultPageSize;
     constructor(config: DiamondHandsGraphConfig);
+    /**
+     * Transform graph position data to LoanData interface
+     * Converts flat graph structure to nested LoanData structure
+     */
+    private transformGraphPositionToLoanData;
     /**
      * Helper: Get total count by paginating through all results
      * The Graph has a hard limit of 1000 items per query, so we need to paginate
@@ -6456,6 +6461,8 @@ interface LoanQueryConfig {
     graphClient: DiamondHandsGraphClient;
     /** Bitcoin operations for balance enrichment */
     bitcoinOperations: BitcoinOperations;
+    /** Ethereum provider for PKP public key retrieval */
+    provider?: providers.Provider;
     /** Cache for loan query results */
     cache?: LRUCache<string, LoanData>;
     /** Enable debug logging */
@@ -6496,6 +6503,13 @@ declare class LoanQuery {
      * @returns Paginated loans response
      */
     getLoans(filters?: LoanQueryFilters, pagination?: PaginationParams): Promise<Result$1<PaginatedLoansResponse, SDKError>>;
+    /**
+     * Enrich loans with vault addresses derived from PKP public keys
+     *
+     * @param loans - Array of loans to enrich
+     * @returns Enriched loans with vault addresses for all networks
+     */
+    private enrichLoansWithVaultAddresses;
     /**
      * Map numeric status to string for subgraph queries
      */

package/dist/index.js

@@ -44413,6 +44413,7 @@ function createLoanCreator(config) {
 }
 
 // src/modules/loan/loan-query.module.ts
+init_mint_authorization_utils();
 var LoanQuery = class {
   config;
   defaultPageSize;
@@ -44540,8 +44541,9 @@ var LoanQuery = class {
             skip
           );
         }
+        const enrichedLoans = await this.enrichLoansWithVaultAddresses(result.positions);
         return {
-          loans: result.positions,
+          loans: enrichedLoans,
           page,
           maxRows: pageSize,
           totalLoans: result.total
@@ -44556,6 +44558,63 @@ var LoanQuery = class {
       })
     );
   }
+  /**
+   * Enrich loans with vault addresses derived from PKP public keys
+   *
+   * @param loans - Array of loans to enrich
+   * @returns Enriched loans with vault addresses for all networks
+   */
+  async enrichLoansWithVaultAddresses(loans) {
+    if (!loans || loans.length === 0) {
+      return loans;
+    }
+    if (this.config.debug) {
+      log.info(`\u{1F511} Enriching ${loans.length} loans with vault addresses...`);
+    }
+    const BATCH_SIZE = 15;
+    for (let i = 0; i < loans.length; i += BATCH_SIZE) {
+      const batch = loans.slice(i, i + BATCH_SIZE);
+      await Promise.all(
+        batch.map(async (loan) => {
+          try {
+            const pkpPublicKey = await getPKPPublicKeyFromTokenId(
+              loan.pkpId,
+              this.config.provider
+            );
+            const addressesResult = await this.config.bitcoinOperations.deriveAddresses(
+              pkpPublicKey
+            );
+            if (addressesResult.success) {
+              loan.collateral.vaultAddress = addressesResult.value;
+              if (this.config.debug) {
+                log.info(`\u2705 Derived vault addresses for loan ${loan.id}`, {
+                  mainnet: addressesResult.value.mainnet,
+                  testnet: addressesResult.value.testnet,
+                  regtest: addressesResult.value.regtest
+                });
+              }
+            } else {
+              if (this.config.debug) {
+                log.warn(`\u26A0\uFE0F  Failed to derive vault addresses for loan ${loan.id}`, {
+                  error: addressesResult.error.message
+                });
+              }
+            }
+          } catch (error) {
+            if (this.config.debug) {
+              log.warn(`\u26A0\uFE0F  Vault address derivation error for loan ${loan.id}`, {
+                error: error instanceof Error ? error.message : String(error)
+              });
+            }
+          }
+        })
+      );
+    }
+    if (this.config.debug) {
+      log.info(`\u2705 Completed vault address enrichment for ${loans.length} loans`);
+    }
+    return loans;
+  }
   /**
    * Map numeric status to string for subgraph queries
    */
@@ -46539,6 +46598,32 @@ var DiamondHandsGraph = class {
     });
     this.defaultPageSize = config.defaultPageSize ?? 100;
   }
+  /**
+   * Transform graph position data to LoanData interface
+   * Converts flat graph structure to nested LoanData structure
+   */
+  transformGraphPositionToLoanData(graphPosition) {
+    return {
+      id: graphPosition.id,
+      pkpId: graphPosition.pkpId,
+      borrower: {
+        createdAt: graphPosition.borrower?.createdAt ? Number(graphPosition.borrower.createdAt) : 0,
+        id: graphPosition.borrower?.id || graphPosition.borrower
+      },
+      createdAt: graphPosition.createdAt ? Number(graphPosition.createdAt) : 0,
+      lastUpdatedAt: graphPosition.lastUpdated ? Number(graphPosition.lastUpdated) : 0,
+      loan: {
+        ucdMinted: graphPosition.ucdMinted ? Number(graphPosition.ucdMinted) : 0,
+        ucdDebt: graphPosition.ucdDebt ? Number(graphPosition.ucdDebt) : 0,
+        selectedTerm: graphPosition.selectedTerm ? Number(graphPosition.selectedTerm) : 0,
+        status: graphPosition.status,
+        expiryAt: graphPosition.expiryAt ? Number(graphPosition.expiryAt) : 0
+      },
+      collateral: {
+        vaultAddress: graphPosition.vaultAddress || ""
+      }
+    };
+  }
   /**
    * Helper: Get total count by paginating through all results
    * The Graph has a hard limit of 1000 items per query, so we need to paginate
@@ -46607,6 +46692,7 @@ var DiamondHandsGraph = class {
               id
             }
             # btcAmount removed - balance is now queried on-chain via lit-actions with signature validation
+            ucdMinted
             ucdDebt
             collateralRatio
             requestedCollateralRatio
@@ -46615,8 +46701,9 @@ var DiamondHandsGraph = class {
             createdAt
             createdAtBlock
             lastUpdated
-              originalTerm
+            originalTerm
             remainingDebt
+            expiryAt
           }
         }
       }
@@ -46638,7 +46725,7 @@ var DiamondHandsGraph = class {
     );
     let positions = [];
     if (result && result.user && Array.isArray(result.user.positions)) {
-      positions = result.user.positions.filter((p) => p != null);
+      positions = result.user.positions.filter((p) => p != null).map((p) => this.transformGraphPositionToLoanData(p));
     }
     return {
       positions,
@@ -46874,17 +46961,19 @@ var DiamondHandsGraph = class {
             createdAt
             id
           }
+          ucdMinted
+          ucdDebt
           collateralRatio
           requestedCollateralRatio
+          selectedTerm
+          status
           createdAt
           createdAtBlock
           lastUpdated
           lastUpdatedAtBlock
           originalTerm
           remainingDebt
-          selectedTerm
-          status
-          ucdDebt
+          expiryAt
           totalPaid
           totalExtensions
           extensionFeesPaid
@@ -46897,8 +46986,11 @@ var DiamondHandsGraph = class {
       { first, skip, orderBy, orderDirection }
     );
     const total = await this.getTotalCountPaginated();
+    const transformedPositions = (result.positions || []).map(
+      (p) => this.transformGraphPositionToLoanData(p)
+    );
     return {
-      positions: result.positions || [],
+      positions: transformedPositions,
       total
     };
   }
@@ -46918,15 +47010,17 @@ var DiamondHandsGraph = class {
           id
           pkpId
           borrower { createdAt id }
+          ucdMinted
+          ucdDebt
           collateralRatio
+          selectedTerm
+          status
           createdAt
           createdAtBlock
           lastUpdated
           originalTerm
           remainingDebt
-          selectedTerm
-          status
-          ucdDebt
+          expiryAt
         }
       }
     `;
@@ -46938,8 +47032,11 @@ var DiamondHandsGraph = class {
       "{ status_in: $statuses }",
       { statuses }
     );
+    const transformedPositions = (result.positions || []).map(
+      (p) => this.transformGraphPositionToLoanData(p)
+    );
     return {
-      positions: result.positions || [],
+      positions: transformedPositions,
       total
     };
   }
@@ -47815,6 +47912,7 @@ var DiamondHandsSDK = class _DiamondHandsSDK {
     const loanQueryResult = createLoanQuery({
       graphClient: this.graphClient,
       bitcoinOperations: this.bitcoinOperations,
+      provider: config.provider,
       cache: this.cacheManager.getCache("loan-data", {
         maxSize: 200,
         ttlMs: 3e4

package/dist/index.mjs

@@ -44319,6 +44319,7 @@ function createLoanCreator(config) {
 }
 
 // src/modules/loan/loan-query.module.ts
+init_mint_authorization_utils();
 var LoanQuery = class {
   config;
   defaultPageSize;
@@ -44446,8 +44447,9 @@ var LoanQuery = class {
             skip
           );
         }
+        const enrichedLoans = await this.enrichLoansWithVaultAddresses(result.positions);
         return {
-          loans: result.positions,
+          loans: enrichedLoans,
           page,
           maxRows: pageSize,
           totalLoans: result.total
@@ -44462,6 +44464,63 @@ var LoanQuery = class {
       })
     );
   }
+  /**
+   * Enrich loans with vault addresses derived from PKP public keys
+   *
+   * @param loans - Array of loans to enrich
+   * @returns Enriched loans with vault addresses for all networks
+   */
+  async enrichLoansWithVaultAddresses(loans) {
+    if (!loans || loans.length === 0) {
+      return loans;
+    }
+    if (this.config.debug) {
+      log.info(`\u{1F511} Enriching ${loans.length} loans with vault addresses...`);
+    }
+    const BATCH_SIZE = 15;
+    for (let i = 0; i < loans.length; i += BATCH_SIZE) {
+      const batch = loans.slice(i, i + BATCH_SIZE);
+      await Promise.all(
+        batch.map(async (loan) => {
+          try {
+            const pkpPublicKey = await getPKPPublicKeyFromTokenId(
+              loan.pkpId,
+              this.config.provider
+            );
+            const addressesResult = await this.config.bitcoinOperations.deriveAddresses(
+              pkpPublicKey
+            );
+            if (addressesResult.success) {
+              loan.collateral.vaultAddress = addressesResult.value;
+              if (this.config.debug) {
+                log.info(`\u2705 Derived vault addresses for loan ${loan.id}`, {
+                  mainnet: addressesResult.value.mainnet,
+                  testnet: addressesResult.value.testnet,
+                  regtest: addressesResult.value.regtest
+                });
+              }
+            } else {
+              if (this.config.debug) {
+                log.warn(`\u26A0\uFE0F  Failed to derive vault addresses for loan ${loan.id}`, {
+                  error: addressesResult.error.message
+                });
+              }
+            }
+          } catch (error) {
+            if (this.config.debug) {
+              log.warn(`\u26A0\uFE0F  Vault address derivation error for loan ${loan.id}`, {
+                error: error instanceof Error ? error.message : String(error)
+              });
+            }
+          }
+        })
+      );
+    }
+    if (this.config.debug) {
+      log.info(`\u2705 Completed vault address enrichment for ${loans.length} loans`);
+    }
+    return loans;
+  }
   /**
    * Map numeric status to string for subgraph queries
    */
@@ -46445,6 +46504,32 @@ var DiamondHandsGraph = class {
     });
     this.defaultPageSize = config.defaultPageSize ?? 100;
   }
+  /**
+   * Transform graph position data to LoanData interface
+   * Converts flat graph structure to nested LoanData structure
+   */
+  transformGraphPositionToLoanData(graphPosition) {
+    return {
+      id: graphPosition.id,
+      pkpId: graphPosition.pkpId,
+      borrower: {
+        createdAt: graphPosition.borrower?.createdAt ? Number(graphPosition.borrower.createdAt) : 0,
+        id: graphPosition.borrower?.id || graphPosition.borrower
+      },
+      createdAt: graphPosition.createdAt ? Number(graphPosition.createdAt) : 0,
+      lastUpdatedAt: graphPosition.lastUpdated ? Number(graphPosition.lastUpdated) : 0,
+      loan: {
+        ucdMinted: graphPosition.ucdMinted ? Number(graphPosition.ucdMinted) : 0,
+        ucdDebt: graphPosition.ucdDebt ? Number(graphPosition.ucdDebt) : 0,
+        selectedTerm: graphPosition.selectedTerm ? Number(graphPosition.selectedTerm) : 0,
+        status: graphPosition.status,
+        expiryAt: graphPosition.expiryAt ? Number(graphPosition.expiryAt) : 0
+      },
+      collateral: {
+        vaultAddress: graphPosition.vaultAddress || ""
+      }
+    };
+  }
   /**
    * Helper: Get total count by paginating through all results
    * The Graph has a hard limit of 1000 items per query, so we need to paginate
@@ -46513,6 +46598,7 @@ var DiamondHandsGraph = class {
               id
             }
             # btcAmount removed - balance is now queried on-chain via lit-actions with signature validation
+            ucdMinted
             ucdDebt
             collateralRatio
             requestedCollateralRatio
@@ -46521,8 +46607,9 @@ var DiamondHandsGraph = class {
             createdAt
             createdAtBlock
             lastUpdated
-              originalTerm
+            originalTerm
             remainingDebt
+            expiryAt
           }
         }
       }
@@ -46544,7 +46631,7 @@ var DiamondHandsGraph = class {
     );
     let positions = [];
     if (result && result.user && Array.isArray(result.user.positions)) {
-      positions = result.user.positions.filter((p) => p != null);
+      positions = result.user.positions.filter((p) => p != null).map((p) => this.transformGraphPositionToLoanData(p));
     }
     return {
       positions,
@@ -46780,17 +46867,19 @@ var DiamondHandsGraph = class {
             createdAt
             id
           }
+          ucdMinted
+          ucdDebt
           collateralRatio
           requestedCollateralRatio
+          selectedTerm
+          status
           createdAt
           createdAtBlock
           lastUpdated
           lastUpdatedAtBlock
           originalTerm
           remainingDebt
-          selectedTerm
-          status
-          ucdDebt
+          expiryAt
           totalPaid
           totalExtensions
           extensionFeesPaid
@@ -46803,8 +46892,11 @@ var DiamondHandsGraph = class {
       { first, skip, orderBy, orderDirection }
     );
     const total = await this.getTotalCountPaginated();
+    const transformedPositions = (result.positions || []).map(
+      (p) => this.transformGraphPositionToLoanData(p)
+    );
     return {
-      positions: result.positions || [],
+      positions: transformedPositions,
       total
     };
   }
@@ -46824,15 +46916,17 @@ var DiamondHandsGraph = class {
           id
           pkpId
           borrower { createdAt id }
+          ucdMinted
+          ucdDebt
           collateralRatio
+          selectedTerm
+          status
           createdAt
           createdAtBlock
           lastUpdated
           originalTerm
           remainingDebt
-          selectedTerm
-          status
-          ucdDebt
+          expiryAt
         }
       }
     `;
@@ -46844,8 +46938,11 @@ var DiamondHandsGraph = class {
       "{ status_in: $statuses }",
       { statuses }
     );
+    const transformedPositions = (result.positions || []).map(
+      (p) => this.transformGraphPositionToLoanData(p)
+    );
     return {
-      positions: result.positions || [],
+      positions: transformedPositions,
       total
     };
   }
@@ -47721,6 +47818,7 @@ var DiamondHandsSDK = class _DiamondHandsSDK {
     const loanQueryResult = createLoanQuery({
       graphClient: this.graphClient,
       bitcoinOperations: this.bitcoinOperations,
+      provider: config.provider,
       cache: this.cacheManager.getCache("loan-data", {
         maxSize: 200,
         ttlMs: 3e4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gvnrdao/dh-sdk",
-  "version": "0.0.96",
+  "version": "0.0.98",
   "description": "TypeScript SDK for Diamond Hands Protocol - Bitcoin-backed lending with LIT Protocol PKPs",
   "main": "dist/index.cjs",
   "types": "dist/index.d.ts",