@notabene/javascript-sdk 2.14.1-next.1 → 2.14.1-next.2

package/package.json

@@ -10,7 +10,7 @@
   "author": "Notabene <developers@notabene.id>",
   "license": "MIT",
   "packageManager": "yarn@4.5.1",
-  "version": "2.14.1-next.1",
+  "version": "2.14.1-next.2",
   "source": "src/notabene.ts",
   "main": "dist/cjs/notabene.cjs",
   "module": "dist/esm/notabene.js",

package/src/responseTransformer/__tests__/transformer.test.ts

@@ -102,6 +102,7 @@ const depositResponse = {
     transactionId: DEPOSIT_TX_ID,
     customer: { type: 'natural', name: 'Jane Doe' },
     agent: walletAgent,
+    account: testAccount,
     counterparty: {
       type: 'natural',
       name: 'Jane Doe',
@@ -339,6 +340,46 @@ describe('componentResponseToTxRequests', () => {
     });
   });
 
+  it('should transform a deposit response with source array and settlementAddress', () => {
+    const depositWithSourceArray = {
+      ...depositResponse,
+      value: {
+        ...depositResponse.value,
+        source: [TEST_ADDRESS_DID, 'did:pkh:eip155:1:0xsecondaddress'],
+      },
+    } as unknown as TransactionResponse<Deposit>;
+
+    const settlementAddress = '0xsettlementaddress123';
+
+    const result = componentResponseToTxRequests(
+      depositWithSourceArray,
+      TEST_DELEGATE_TOKEN,
+      {
+        originatorId: TEST_ORIGINATOR_ID,
+        beneficiaryId: TEST_BENEFICIARY_ID,
+        settlementAddress,
+      },
+    );
+
+    expect(result.createTx.agents).toEqual([
+      {
+        '@id': BENEFICIARY_VASP_DID,
+        for: TEST_BENEFICIARY_ID,
+        role: 'VASP',
+      },
+      {
+        '@id': TEST_ADDRESS_DID,
+        for: TEST_ORIGINATOR_ID,
+        role: 'SourceAddress',
+      },
+      {
+        '@id': `did:pkh:eip155:1:${settlementAddress}`,
+        for: BENEFICIARY_VASP_DID,
+        role: 'SettlementAddress',
+      },
+    ]);
+  });
+
   it('should transform a withdrawal response using txCreate', () => {
     const result = componentResponseToTxRequests(
       withdrawalResponse,

package/src/responseTransformer/__tests__/utils.test.ts

@@ -0,0 +1,35 @@
+import { describe, expect, it } from 'vitest';
+import { getCaip10ChainPrefix } from '../utils';
+
+describe('getCaip10ChainPrefix', () => {
+  it('should extract chain prefix from EIP155 CAIP-10 address', () => {
+    const caip10 = 'eip155:1:0xd7914021b50a5090d3a13bb4ecae2abf014fafbd';
+    const result = getCaip10ChainPrefix(caip10);
+    expect(result).toBe('eip155:1');
+  });
+
+  it('should extract chain prefix from Solana CAIP-10 address', () => {
+    const caip10 =
+      'solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp:7kfAoE5opxrCN7rHjBNWvZQ1Fxm7vvhqZz9ZQWF8XGTo';
+    const result = getCaip10ChainPrefix(caip10);
+    expect(result).toBe('solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp');
+  });
+
+  it('should extract chain prefix from Polygon CAIP-10 address', () => {
+    const caip10 = 'eip155:137:0xd7914021b50a5090d3a13bb4ecae2abf014fafbd';
+    const result = getCaip10ChainPrefix(caip10);
+    expect(result).toBe('eip155:137');
+  });
+
+  it('should throw error for invalid CAIP-10 format', () => {
+    expect(() => getCaip10ChainPrefix('invalid')).toThrow(
+      'Invalid CAIP-10 format: "invalid". Expected format: {namespace}:{chainId}:{address}',
+    );
+  });
+
+  it('should throw error for CAIP-10 with missing address', () => {
+    expect(() => getCaip10ChainPrefix('eip155:1')).toThrow(
+      'Invalid CAIP-10 format',
+    );
+  });
+});

package/src/responseTransformer/mappers.ts

@@ -22,6 +22,7 @@ import type {
 } from './types';
 import {
   convertPersonToV2,
+  getCaip10ChainPrefix,
   getPartyId,
   isDeposit,
   isWithdrawal,
@@ -274,11 +275,7 @@ export function mapToTransactCreateRequest(
     });
   }
 
-  if (
-    isWithdrawal(transaction) &&
-    transaction.destination &&
-    transaction?.account?.did
-  ) {
+  if (isWithdrawal(transaction) && transaction?.account?.did) {
     agents.push({
       '@id': transaction.account.did,
       for: payload.beneficiaryVASPdid || beneficiaryId,
@@ -286,12 +283,23 @@ export function mapToTransactCreateRequest(
     });
   }
 
-  if (isDeposit(transaction) && transaction.source && transaction.agent?.did) {
-    agents.push({
-      '@id': transaction.agent.did,
-      for: payload.originatorVASPdid || originatorId,
-      role: 'SourceAddress',
-    });
+  if (isDeposit(transaction) && transaction?.account) {
+    if (transaction.account.did) {
+      agents.push({
+        '@id': transaction.account.did,
+        for: payload.originatorVASPdid || originatorId,
+        role: 'SourceAddress',
+      });
+    }
+
+    if (config.settlementAddress && transaction.account.caip10) {
+      const chainPrefix = getCaip10ChainPrefix(transaction.account.caip10);
+      agents.push({
+        '@id': `did:pkh:${chainPrefix}:${config.settlementAddress}`,
+        for: payload.beneficiaryVASPdid || beneficiaryId,
+        role: 'SettlementAddress',
+      });
+    }
   }
 
   return {

package/src/responseTransformer/types.ts

@@ -21,6 +21,7 @@ interface BaseRequestConfig {
 
 export interface ResponseToTxCreateRequestConfig extends BaseRequestConfig {
   referenceId?: string;
+  settlementAddress?: string;
 }
 
 export interface ResponseToIVMS101RequestConfig extends BaseRequestConfig {

package/src/responseTransformer/utils.ts

@@ -2,7 +2,7 @@ import type {
   NaturalPersonName,
   Person,
 } from '@notabene/javascript-sdk/src/ivms/types';
-import type { DID } from '@taprsvp/types';
+import { CAIP10Schema, type DID } from '@taprsvp/types';
 import type { NaturalPersonNameV2, PersonV2 } from '../ivms';
 import { Deposit, Withdrawal } from '../types';
 
@@ -72,3 +72,26 @@ export function convertPersonToV2(
     accountNumber: [accountNumber],
   };
 }
+
+/**
+ * Extracts the chain prefix ({namespace}:{chainId}) from a CAIP-10 address
+ * @param caip10Address - An address in the format {namespace}:{chainId}:{address}
+ * @returns The chain prefix (e.g., eip155:1)
+ * @throws Error if the address is not in valid CAIP-10 format
+ *
+ * @example
+ * getCaip10ChainPrefix('eip155:1:0x123...') // returns 'eip155:1'
+ * getCaip10ChainPrefix('solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp:7kfAoE5o...') // returns 'solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp'
+ */
+export function getCaip10ChainPrefix(caip10Address: string): string {
+  const result = CAIP10Schema.safeParse(caip10Address);
+  if (!result.success) {
+    throw new Error(
+      `Invalid CAIP-10 format: "${caip10Address}". Expected format: {namespace}:{chainId}:{address}`,
+    );
+  }
+
+  // Extract chain (namespace:chainId) by removing the last segment (address)
+  const lastColonIndex = caip10Address.lastIndexOf(':');
+  return caip10Address.slice(0, lastColonIndex);
+}