@mojaloop/sdk-scheme-adapter 24.0.5 → 24.0.7-snapshot.7

package/.circleci/config.yml

@@ -1,12 +1,12 @@
 version: 2.1
 setup: true
 orbs:
-  build: mojaloop/build@1.0.37
+  build: mojaloop/build@1.0.53
 workflows:
   setup:
     jobs:
       - build/workflow:
+          context: org-global
           filters:
             tags:
               only: /v\d+(\.\d+){2}(-[a-zA-Z-][0-9a-zA-Z-]*\.\d+)?/
-

package/CHANGELOG.md

@@ -1,4 +1,11 @@
 # Changelog: [mojaloop/sdk-scheme-adapter](https://github.com/mojaloop/sdk-scheme-adapter)
+### [24.0.6](https://github.com/mojaloop/sdk-scheme-adapter/compare/v24.0.5...v24.0.6) (2025-02-04)
+
+
+### Chore
+
+* update build orb version to 1.0.50 ([#541](https://github.com/mojaloop/sdk-scheme-adapter/issues/541)) ([78a78c9](https://github.com/mojaloop/sdk-scheme-adapter/commit/78a78c98e392ba0dd932ab192c4b4a4f0e9fc1ae))
+
 ### [24.0.5](https://github.com/mojaloop/sdk-scheme-adapter/compare/v24.0.4...v24.0.5) (2025-02-03)
 
 

package/docker-compose.pm4ml.yml

@@ -1,5 +1,3 @@
-version: '3.7'
-
 services:
 
   sdk-scheme-adapter-api-svc:

package/docker-compose.yml

@@ -1,4 +1,3 @@
-version: '3.7'
 networks:
   mojaloop-net:
     name: mojaloop-net

package/modules/api-svc/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mojaloop/sdk-scheme-adapter-api-svc",
-  "version": "21.0.0-snapshot.1",
+  "version": "21.0.0-snapshot.17",
   "description": "An adapter for connecting to Mojaloop API enabled switches.",
   "main": "src/index.js",
   "types": "src/index.d.ts",
@@ -65,7 +65,7 @@
   "dependencies": {
     "@koa/cors": "^5.0.0",
     "@mojaloop/api-snippets": "17.7.11",
-    "@mojaloop/central-services-error-handling": "^13.0.4",
+    "@mojaloop/central-services-error-handling": "^13.0.5",
     "@mojaloop/central-services-logger": "^11.5.4",
     "@mojaloop/central-services-metrics": "^12.4.4",
     "@mojaloop/central-services-shared": "^18.17.0",

package/modules/api-svc/src/lib/dto.js

@@ -27,7 +27,7 @@
 /*eslint quote-props: ["error", "as-needed"]*/
 const config = require('../config');
 const randomUUID = require('@mojaloop/central-services-shared').Util.id(config.idGenerator);
-const { Directions, SDKStateEnum} = require('./model/common');
+const { Directions, SDKStateEnum, AmountTypes } = require('./model/common');
 
 const quoteRequestStateDto = (request) => ({
     // transferId: this follows the slightly dodgy assumption that transferId will be same as this transactionId.
@@ -56,24 +56,41 @@ const fxQuoteRequestStateDto = (request) => ({
  * @param data {object} - "state" of inbound transaction request
  * Supports only single FXP and currency for now
  */
-const outboundPostFxQuotePayloadDto = (data) => Object.freeze({
-    conversionRequestId: randomUUID(),
-    conversionTerms: {
-        conversionId: randomUUID(), // should be the same as commitRequestId from fxTransfer
-        initiatingFsp: data.from.fspId,
-        determiningTransferId: data.transferId,
-        counterPartyFsp: data.fxProviders[0],
-        amountType: data.amountType,
-        sourceAmount: {
+const outboundPostFxQuotePayloadDto = (data) => {
+    let sourceAmount, targetAmount;
+    
+    sourceAmount = {
+        currency: data.currency,
+        amount: data.amount
+    };
+    targetAmount = {
+        currency: data.supportedCurrencies[0],
+    };
+
+    if (data.amountType === AmountTypes.RECEIVE && !config.supportedCurrencies.includes(data.currency)) {
+        sourceAmount = {
+            currency: config.supportedCurrencies[0],
+        };
+        targetAmount = {
             currency: data.currency,
             amount: data.amount
-        },
-        targetAmount: {
-            currency: data.supportedCurrencies[0],
-        },
-        expiration: data.fxQuoteExpiration,
+        };
     }
-});
+
+    return Object.freeze({
+        conversionRequestId: randomUUID(),
+        conversionTerms: {
+            conversionId: randomUUID(), // should be the same as commitRequestId from fxTransfer
+            initiatingFsp: data.from.fspId,
+            determiningTransferId: data.transferId,
+            counterPartyFsp: data.fxProviders[0],
+            amountType: data.amountType,
+            sourceAmount,
+            targetAmount,
+            expiration: data.fxQuoteExpiration,
+        }
+    });
+};
 
 /**
  * @param data {object} - "state" of inbound transaction request

package/modules/api-svc/src/lib/model/OutboundTransfersModel.js

@@ -70,6 +70,7 @@ class OutboundTransfersModel {
         this._multiplePartiesResponseSeconds = config.multiplePartiesResponseSeconds;
         this._sendFinalNotificationIfRequested = config.sendFinalNotificationIfRequested;
         this._apiType = config.apiType;
+        this._supportedCurrencies = config.supportedCurrencies;
 
         if (this._autoAcceptParty && this._multiplePartiesResponse) {
             throw new Error('Conflicting config options provided: autoAcceptParty and multiplePartiesResponse');
@@ -391,14 +392,20 @@ class OutboundTransfersModel {
                         }
                         this.data.to.dateOfBirth = payee.personalInfo.dateOfBirth;
                     }
-
+                    
                     if (Array.isArray(payee.supportedCurrencies)) {
                         if (!payee.supportedCurrencies.length) {
                             throw new Error(ErrorMessages.noSupportedCurrencies);
                         }
 
-                        this.data.needFx = !payee.supportedCurrencies.includes(this.data.currency);
+                        this.data.needFx = this._isFxNeeded(this._supportedCurrencies, payee.supportedCurrencies, this.data.currency, this.data.amountType);
                         this.data.supportedCurrencies = payee.supportedCurrencies;
+                        
+                        // if (this.data.amountType == AmountTypes.RECEIVE) {
+                        //     if ( !this._supportedCurrencies.includes(this.data.currency) ) {
+                        //         this.data.supportedCurrencies = this._supportedCurrencies;
+                        //     }
+                        // }
                     }
 
                     this._logger.isVerboseEnabled && this._logger.push({
@@ -1210,6 +1217,34 @@ class OutboundTransfersModel {
         return modifiedData;
     }
 
+    /**
+     * Determines if FX is needed for the transfer
+     * 
+     * @param {Array} payerCurrencies - Array of supported currencies for the payer
+     * @param {Array} payeeCurrencies - Array of supported currencies for the payee
+     * @param {string} amountCurrency - Currency of the amount being transferred
+     * @param {string} amountType - Type of the amount being transferred (SEND/RECEIVE)
+     * @returns {boolean} - true if FX is needed, false if not
+     */
+    _isFxNeeded(payerCurrencies, payeeCurrencies, amountCurrency, amountType) {
+        if (payerCurrencies.includes(amountCurrency) && payeeCurrencies.includes(amountCurrency)) {
+            return false;
+        }
+        const intersection = payerCurrencies.filter(currency => payeeCurrencies.includes(currency));
+        if(intersection.length > 0 && !intersection.includes(amountCurrency)) {
+            return true;
+        }
+        if (amountType === AmountTypes.RECEIVE) {
+            if (!payerCurrencies.includes(amountCurrency)) {
+                return true;
+            }
+        }
+        if (!payeeCurrencies.includes(amountCurrency)) {
+            return true;
+        }
+
+        return false;
+    }
 
     /**
      * Loads a transfer model from cache for resumption of the transfer process

package/modules/api-svc/src/lib/model/common/Enums.js

@@ -112,7 +112,7 @@ const ErrorMessages = Object.freeze({
     noSupportedCurrencies: 'No payee supportedCurrencies received',
     responseMissedExpiryDeadline: 'Response missed expiry deadline',
     quoteRejectedByBackend: 'Quote rejected by backend',
-    fxQuoteRejectedByBackend: 'FX quote rejected by backend',
+    fxQuoteRejectedByBackend: 'FX quote rejected by backend'
 });
 
 const AmountTypes = Object.freeze({

package/modules/api-svc/test/unit/lib/model/data/defaultConfig.json

@@ -57,5 +57,6 @@
     "port": 4004
   },
   "getServicesFxpResponse": ["fxp_id"],
-  "apiType": "fspiop"
+  "apiType": "fspiop",
+  "supportedCurrencies": ["XXX"]
 }

package/modules/outbound-command-event-handler/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mojaloop/sdk-scheme-adapter-outbound-command-event-handler",
-  "version": "0.3.0-snapshot.1",
+  "version": "0.3.0-snapshot.16",
   "description": "Mojaloop sdk scheme adapter command event handler",
   "license": "Apache-2.0",
   "homepage": "https://github.com/mojaloop/sdk-scheme-adapter/",
@@ -59,13 +59,13 @@
     "@types/convict": "^6.1.6",
     "@types/express": "^5.0.0",
     "@types/jest": "^29.5.14",
-    "@types/node": "^22.13.0",
+    "@types/node": "^22.13.1",
     "@types/node-cache": "^4.2.5",
     "@types/supertest": "^6.0.2",
     "@types/swagger-ui-express": "4.1.7",
     "@types/yamljs": "^0.2.34",
-    "@typescript-eslint/eslint-plugin": "^8.22.0",
-    "@typescript-eslint/parser": "^8.22.0",
+    "@typescript-eslint/eslint-plugin": "^8.23.0",
+    "@typescript-eslint/parser": "^8.23.0",
     "copyfiles": "^2.4.1",
     "eslint": "^9.15.0",
     "jest": "^29.7.0",

package/modules/outbound-domain-event-handler/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@mojaloop/sdk-scheme-adapter-outbound-domain-event-handler",
-    "version": "0.3.0-snapshot.1",
+    "version": "0.3.0-snapshot.16",
     "description": "mojaloop sdk scheme adapter outbound domain event handler",
     "license": "Apache-2.0",
     "homepage": "https://github.com/mojaloop/sdk-scheme-adapter/",
@@ -56,13 +56,13 @@
         "@types/convict": "^6.1.6",
         "@types/express": "^5.0.0",
         "@types/jest": "^29.5.14",
-        "@types/node": "^22.13.0",
+        "@types/node": "^22.13.1",
         "@types/node-cache": "^4.2.5",
         "@types/supertest": "^6.0.2",
         "@types/swagger-ui-express": "^4.1.7",
         "@types/yamljs": "^0.2.34",
-        "@typescript-eslint/eslint-plugin": "^8.22.0",
-        "@typescript-eslint/parser": "^8.22.0",
+        "@typescript-eslint/eslint-plugin": "^8.23.0",
+        "@typescript-eslint/parser": "^8.23.0",
         "copyfiles": "^2.4.1",
         "eslint": "^9.15.0",
         "jest": "^29.7.0",

package/modules/private-shared-lib/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@mojaloop/sdk-scheme-adapter-private-shared-lib",
-  "version": "0.4.0-snapshot.1",
+  "version": "0.4.0-snapshot.15",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@mojaloop/sdk-scheme-adapter-private-shared-lib",
-      "version": "0.4.0-snapshot.1",
+      "version": "0.4.0-snapshot.15",
       "license": "Apache-2.0",
       "dependencies": {
         "@mojaloop/api-snippets": "17.7.9",

package/modules/private-shared-lib/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mojaloop/sdk-scheme-adapter-private-shared-lib",
-  "version": "0.4.0-snapshot.1",
+  "version": "0.4.0-snapshot.16",
   "description": "SDK Scheme Adapter private shared library.",
   "license": "Apache-2.0",
   "homepage": "https://github.com/mojaloop/accounts-and-balances-bc/tree/main/modules/private-types",
@@ -40,10 +40,10 @@
   },
   "devDependencies": {
     "@eslint/compat": "^1.2.6",
-    "@types/node": "^22.13.0",
+    "@types/node": "^22.13.1",
     "@types/uuid": "^10.0.0",
-    "@typescript-eslint/eslint-plugin": "^8.22.0",
-    "@typescript-eslint/parser": "^8.22.0",
+    "@typescript-eslint/eslint-plugin": "^8.23.0",
+    "@typescript-eslint/parser": "^8.23.0",
     "eslint": "^9.15.0",
     "jest": "^29.7.0",
     "npm-check-updates": "^16.7.10",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mojaloop/sdk-scheme-adapter",
-  "version": "24.0.5",
+  "version": "24.0.7-snapshot.7",
   "description": "mojaloop sdk-scheme-adapter",
   "license": "Apache-2.0",
   "homepage": "https://github.com/mojaloop/sdk-scheme-adapter",
@@ -82,10 +82,10 @@
   },
   "devDependencies": {
     "@types/jest": "^29.5.14",
-    "@types/node": "^22.13.0",
+    "@types/node": "^22.13.1",
     "@types/node-cache": "^4.2.5",
-    "@typescript-eslint/eslint-plugin": "^8.22.0",
-    "@typescript-eslint/parser": "^8.22.0",
+    "@typescript-eslint/eslint-plugin": "^8.23.0",
+    "@typescript-eslint/parser": "^8.23.0",
     "audit-ci": "^7.1.0",
     "eslint": "^9.15.0",
     "eslint-config-airbnb-typescript": "^18.0.0",