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

package/.circleci/config.yml

@@ -1,12 +1,12 @@
 version: 2.1
 setup: true
 orbs:
-  build: mojaloop/build@1.0.53
+  build: mojaloop/build@1.0.37
 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,31 +1,4 @@
 # 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)
-
-
-### Bug Fixes
-
-* **csi-1159:** post /quoterequest payload's extensionlist internal form fix ([#539](https://github.com/mojaloop/sdk-scheme-adapter/issues/539)) ([4877f9f](https://github.com/mojaloop/sdk-scheme-adapter/commit/4877f9fbbf4d263525a78f5fc7262126e7fb5c37))
-
-
-### Chore
-
-* **release:** 25.0.0 [skip ci] ([4b79333](https://github.com/mojaloop/sdk-scheme-adapter/commit/4b793337c01fc1ae8afd8c34c57c1a227fa12b66))
-* revert version ([#540](https://github.com/mojaloop/sdk-scheme-adapter/issues/540)) ([99da6b4](https://github.com/mojaloop/sdk-scheme-adapter/commit/99da6b495673c9ef9e00c4befc532a716c25ed1c))
-
-## [25.0.0](https://github.com/mojaloop/sdk-scheme-adapter/compare/v24.0.4...v25.0.0) (2025-02-03)
-
-
-### Bug Fixes
-
-* **csi-1159:** post /quoterequest payload's extensionlist internal form fix ([#539](https://github.com/mojaloop/sdk-scheme-adapter/issues/539)) ([4877f9f](https://github.com/mojaloop/sdk-scheme-adapter/commit/4877f9fbbf4d263525a78f5fc7262126e7fb5c37))
-
 ### [24.0.4](https://github.com/mojaloop/sdk-scheme-adapter/compare/v24.0.3...v24.0.4) (2025-01-30)
 
 

package/docker-compose.pm4ml.yml

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

package/docker-compose.yml

@@ -1,3 +1,4 @@
+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.17",
+  "version": "21.0.0-snapshot.0",
   "description": "An adapter for connecting to Mojaloop API enabled switches.",
   "main": "src/index.js",
   "types": "src/index.d.ts",
@@ -64,8 +64,8 @@
   },
   "dependencies": {
     "@koa/cors": "^5.0.0",
-    "@mojaloop/api-snippets": "17.7.11",
-    "@mojaloop/central-services-error-handling": "^13.0.5",
+    "@mojaloop/api-snippets": "18.0.0-snapshot.0",
+    "@mojaloop/central-services-error-handling": "^13.0.4",
     "@mojaloop/central-services-logger": "^11.5.4",
     "@mojaloop/central-services-metrics": "^12.4.4",
     "@mojaloop/central-services-shared": "^18.17.0",
@@ -114,7 +114,7 @@
     "jest-junit": "^16.0.0",
     "npm-check-updates": "^16.7.10",
     "openapi-response-validator": "^12.1.3",
-    "openapi-typescript": "^7.6.1",
+    "openapi-typescript": "^7.6.0",
     "redis-mock": "^0.56.3",
     "replace": "^1.2.2",
     "standard-version": "^9.5.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, AmountTypes } = require('./model/common');
+const { Directions, SDKStateEnum} = require('./model/common');
 
 const quoteRequestStateDto = (request) => ({
     // transferId: this follows the slightly dodgy assumption that transferId will be same as this transactionId.
@@ -56,41 +56,24 @@ const fxQuoteRequestStateDto = (request) => ({
  * @param data {object} - "state" of inbound transaction request
  * Supports only single FXP and currency for now
  */
-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 = {
+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: {
             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,7 +70,6 @@ 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');
@@ -392,20 +391,14 @@ 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 = this._isFxNeeded(this._supportedCurrencies, payee.supportedCurrencies, this.data.currency, this.data.amountType);
+                        this.data.needFx = !payee.supportedCurrencies.includes(this.data.currency);
                         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({
@@ -1217,34 +1210,6 @@ 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/src/lib/model/lib/shared.js

@@ -184,7 +184,7 @@ const mojaloopQuoteRequestToInternal = (external) => {
     }
 
     if(external.extensionList) {
-        internal.extensionList = external.extensionList.extension;
+        internal.extensionList = external.extensionList;
     }
 
     return internal;
@@ -245,7 +245,7 @@ const internalQuoteResponseToMojaloop = (internal) => {
     }
 
     if(internal.extensionList) {
-        external.extensionList = { extension: internal.extensionList };
+        external.extensionList = internal.extensionList;
     }
 
     return external;
@@ -299,8 +299,8 @@ const mojaloopPrepareToInternalTransfer = (external, quote, ilp, checkILP) => {
             subScenario: quote.request.transactionType.subScenario,
             note: quote.request.note
         };
-        if (quote.internalRequest && quote.internalRequest.extensionList) {
-            internal.quoteRequestExtensions = [ ...quote.internalRequest.extensionList ];
+        if (quote.internalRequest && quote.internalRequest.extensionList && quote.internalRequest.extensionList.extension) {
+            internal.quoteRequestExtensions = [ ...quote.internalRequest.extensionList.extension ];
         }
         if (checkILP) {
             internal.ilpPacket = { data: ilp.getTransactionObject(external.ilpPacket) };

package/modules/api-svc/test/unit/lib/model/InboundTransfersModel.test.js

@@ -132,7 +132,7 @@ describe('inboundModel', () => {
 
             // check the extension list gets translated correctly to the mojaloop form
             expect(MojaloopRequests.__putQuotes.mock.calls[0][1].extensionList)
-                .toStrictEqual({ extension: [ ...mockArgs.internalQuoteResponse.extensionList ] });
+                .toStrictEqual(mockArgs.internalQuoteResponse.extensionList);
         });
 
         test('adds a custom `expiration` property in case it is not defined.', async() => {

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

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

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

@@ -49,16 +49,13 @@
         "subScenario": "SUBSCENARIO"
       },
       "extensionList": {
-        "extension": [
-          {
-            "key": "qkey1",
-            "value": "qvalue1"
-          },
-          {
-            "key": "qkey2",
-            "value": "qvalue2"
-          }
-        ]
+        "extension": [{
+          "key": "qkey1",
+          "value": "qvalue1"
+        }, {
+          "key": "qkey2",
+          "value": "qvalue2"
+        }]
       }
     }
   },
@@ -66,23 +63,23 @@
     "quoteId": "fake-quote-id",
     "transactionId": "fake-transaction-id",
     "to": {
-      "idType": "PERSONAL_ID",
-      "idValue": "123456789",
-      "idSubValue": "PASSPORT",
-      "fspId": "goldenpayeefsp",
-      "displayName": "Sridevi Miriyala",
-      "dateOfBirth": "2010-10-10",
-      "firstName": "Sridevi",
-      "lastName": "Miriyala"
+        "idType": "PERSONAL_ID",
+        "idValue": "123456789",
+        "idSubValue": "PASSPORT",
+        "fspId": "goldenpayeefsp",
+        "displayName": "Sridevi Miriyala",
+        "dateOfBirth": "2010-10-10",
+        "firstName": "Sridevi",
+        "lastName": "Miriyala"
     },
     "from": {
-      "idType": "MSISDN",
-      "idValue": "17855501914",
-      "fspId": "mojaloop-sdk",
-      "displayName": "Murthy Kakarlamudi",
-      "dateOfBirth": "2010-10-10",
-      "firstName": "Murthy",
-      "lastName": "Kakarlamudi"
+        "idType": "MSISDN",
+        "idValue": "17855501914",
+        "fspId": "mojaloop-sdk",
+        "displayName": "Murthy Kakarlamudi",
+        "dateOfBirth": "2010-10-10",
+        "firstName": "Murthy",
+        "lastName": "Kakarlamudi"
     },
     "amountType": "SEND",
     "amount": 10,
@@ -92,16 +89,15 @@
     "initiator": "PAYER",
     "initiatorType": "CONSUMER",
     "expiration": "2019-06-04T04:02:10.378Z",
-    "extensionList": [
-      {
-        "key": "qkey1",
-        "value": "qvalue1"
-      },
-      {
-        "key": "qkey2",
-        "value": "qvalue2"
-      }
-    ]
+    "extensionList": {
+      "extension": [{
+          "key": "qkey1",
+          "value": "qvalue1"
+      }, {
+          "key": "qkey2",
+          "value": "qvalue2"
+      }]
+    }
   },
   "internalQuoteResponse": {
     "transferAmount": 500,
@@ -112,18 +108,15 @@
     "condition": "fH9pAYDQbmoZLPbvv3CSW2RfjU4jvM4ApG_fqGnR7Xs",
     "expiration": "2019-11-12T09:02:10.378Z",
     "isValid": 1,
-    "extensionList": [
-      {
+    "extensionList": [{
         "key": "qkey1",
         "value": "qvalue1"
-      },
-      {
+    }, {
         "key": "qkey2",
         "value": "qvalue2"
-      }
-    ]
+    }]
   },
-  "internalGetOTPResponse": {
+  "internalGetOTPResponse" : {
     "value": "123456"
   },
   "fspId": "fake-fsp-id",
@@ -195,4 +188,4 @@
       }
     ]
   }
-}
+}

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.16",
+  "version": "0.3.0-snapshot.0",
   "description": "Mojaloop sdk scheme adapter command event handler",
   "license": "Apache-2.0",
   "homepage": "https://github.com/mojaloop/sdk-scheme-adapter/",
@@ -41,7 +41,7 @@
     "snapshot": "standard-version --no-verify --skip.changelog --prerelease snapshot --releaseCommitMessageFormat 'chore(snapshot): {{currentTag}}'"
   },
   "dependencies": {
-    "@mojaloop/api-snippets": "17.7.11",
+    "@mojaloop/api-snippets": "18.0.0-snapshot.0",
     "@mojaloop/central-services-shared": "^18.17.0",
     "@mojaloop/logging-bc-client-lib": "^0.5.8",
     "@mojaloop/logging-bc-public-types-lib": "^0.5.4",
@@ -55,17 +55,17 @@
     "yamljs": "^0.3.0"
   },
   "devDependencies": {
-    "@eslint/compat": "^1.2.6",
+    "@eslint/compat": "^1.2.5",
     "@types/convict": "^6.1.6",
     "@types/express": "^5.0.0",
     "@types/jest": "^29.5.14",
-    "@types/node": "^22.13.1",
+    "@types/node": "^22.12.0",
     "@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.23.0",
-    "@typescript-eslint/parser": "^8.23.0",
+    "@typescript-eslint/eslint-plugin": "^8.22.0",
+    "@typescript-eslint/parser": "^8.22.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.16",
+    "version": "0.3.0-snapshot.0",
     "description": "mojaloop sdk scheme adapter outbound domain event handler",
     "license": "Apache-2.0",
     "homepage": "https://github.com/mojaloop/sdk-scheme-adapter/",
@@ -41,7 +41,7 @@
         "snapshot": "standard-version --no-verify --skip.changelog --prerelease snapshot --releaseCommitMessageFormat 'chore(snapshot): {{currentTag}}'"
     },
     "dependencies": {
-        "@mojaloop/api-snippets": "17.7.11",
+        "@mojaloop/api-snippets": "18.0.0-snapshot.0",
         "@mojaloop/logging-bc-client-lib": "^0.5.8",
         "@mojaloop/logging-bc-public-types-lib": "^0.5.4",
         "@mojaloop/sdk-scheme-adapter-private-shared-lib": "workspace:^",
@@ -56,13 +56,13 @@
         "@types/convict": "^6.1.6",
         "@types/express": "^5.0.0",
         "@types/jest": "^29.5.14",
-        "@types/node": "^22.13.1",
+        "@types/node": "^22.12.0",
         "@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.23.0",
-        "@typescript-eslint/parser": "^8.23.0",
+        "@typescript-eslint/eslint-plugin": "^8.22.0",
+        "@typescript-eslint/parser": "^8.22.0",
         "copyfiles": "^2.4.1",
         "eslint": "^9.15.0",
         "jest": "^29.7.0",

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

@@ -1,15 +1,15 @@
 {
   "name": "@mojaloop/sdk-scheme-adapter-private-shared-lib",
-  "version": "0.4.0-snapshot.15",
+  "version": "0.3.20-snapshot.52",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@mojaloop/sdk-scheme-adapter-private-shared-lib",
-      "version": "0.4.0-snapshot.15",
+      "version": "0.3.20-snapshot.52",
       "license": "Apache-2.0",
       "dependencies": {
-        "@mojaloop/api-snippets": "17.7.9",
+        "@mojaloop/api-snippets": "18.0.0-snapshot.0",
         "@mojaloop/central-services-shared": "^18.17.0",
         "@mojaloop/logging-bc-public-types-lib": "^0.5.4",
         "@mojaloop/platform-shared-lib-messaging-types-lib": "^0.7.1",

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

@@ -1,6 +1,6 @@
 {
   "name": "@mojaloop/sdk-scheme-adapter-private-shared-lib",
-  "version": "0.4.0-snapshot.16",
+  "version": "0.4.0-snapshot.0",
   "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",
@@ -29,7 +29,7 @@
     "snapshot": "standard-version --no-verify --skip.changelog --prerelease snapshot --releaseCommitMessageFormat 'chore(snapshot): {{currentTag}}'"
   },
   "dependencies": {
-    "@mojaloop/api-snippets": "17.7.11",
+    "@mojaloop/api-snippets": "18.0.0-snapshot.0",
     "@mojaloop/central-services-shared": "^18.17.0",
     "@mojaloop/logging-bc-public-types-lib": "^0.5.4",
     "@mojaloop/platform-shared-lib-messaging-types-lib": "^0.7.1",
@@ -39,11 +39,11 @@
     "uuid": "^11.0.5"
   },
   "devDependencies": {
-    "@eslint/compat": "^1.2.6",
-    "@types/node": "^22.13.1",
+    "@eslint/compat": "^1.2.5",
+    "@types/node": "^22.12.0",
     "@types/uuid": "^10.0.0",
-    "@typescript-eslint/eslint-plugin": "^8.23.0",
-    "@typescript-eslint/parser": "^8.23.0",
+    "@typescript-eslint/eslint-plugin": "^8.22.0",
+    "@typescript-eslint/parser": "^8.22.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.7-snapshot.7",
+  "version": "25.0.0-snapshot.0",
   "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.1",
+    "@types/node": "^22.12.0",
     "@types/node-cache": "^4.2.5",
-    "@typescript-eslint/eslint-plugin": "^8.23.0",
-    "@typescript-eslint/parser": "^8.23.0",
+    "@typescript-eslint/eslint-plugin": "^8.22.0",
+    "@typescript-eslint/parser": "^8.22.0",
     "audit-ci": "^7.1.0",
     "eslint": "^9.15.0",
     "eslint-config-airbnb-typescript": "^18.0.0",