@mojaloop/central-ledger 16.2.0 → 16.3.1-snapshot.0

package/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [16.3.0](https://github.com/mojaloop/central-ledger/compare/v16.2.0...v16.3.0) (2022-09-08)
+
+
+### Features
+
+* **mojaloop/#2880:** simplify liquidity cover check and fix issue with validation (for master) ([#918](https://github.com/mojaloop/central-ledger/issues/918)) ([825faf7](https://github.com/mojaloop/central-ledger/commit/825faf7c1c918b12eddedeb97eea0a2d563457e4))
+
 ## [16.2.0](https://github.com/mojaloop/central-ledger/compare/v16.1.0...v16.2.0) (2022-08-15)
 
 

package/audit-ci.jsonc

@@ -12,13 +12,13 @@
     "GHSA-282f-qqgm-c34q",
     "GHSA-6vfc-qv3f-vr6c",
     "GHSA-wc69-rhjr-hc9g",
+    "GHSA-f825-f98c-gj3g",
     "GHSA-g954-5hwp-pp24",
-    "GHSA-mjxr-4v3x-q3m4",
     "GHSA-rjqq-98f6-6j3r",
+    "GHSA-mjxr-4v3x-q3m4",
     "GHSA-g64q-3vg8-8f93",
     "GHSA-5854-jvxx-2cg9",
     "GHSA-w5p7-h5w8-2hfq",
-    "GHSA-p9pc-299p-vxgp",
-    "GHSA-f825-f98c-gj3g"
+    "GHSA-p9pc-299p-vxgp"
   ]
-}
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mojaloop/central-ledger",
-  "version": "16.2.0",
+  "version": "16.3.1-snapshot.0",
   "description": "Central ledger hosted by a scheme to record and settle transfers",
   "license": "Apache-2.0",
   "author": "ModusBox",
@@ -76,38 +76,38 @@
   },
   "dependencies": {
     "@hapi/good": "9.0.1",
-    "@hapi/hapi": "20.2.2",
+    "@hapi/hapi": "21.0.0",
     "@hapi/inert": "7.0.0",
     "@hapi/joi": "17.1.1",
     "@hapi/vision": "7.0.0",
     "@mojaloop/central-services-database": "10.7.0",
-    "@mojaloop/central-services-error-handling": "12.0.4",
+    "@mojaloop/central-services-error-handling": "12.0.5",
     "@mojaloop/central-services-health": "14.0.1",
-    "@mojaloop/central-services-logger": "11.0.1",
+    "@mojaloop/central-services-logger": "11.1.0",
     "@mojaloop/central-services-metrics": "12.0.5",
-    "@mojaloop/central-services-shared": "17.3.0",
+    "@mojaloop/central-services-shared": "17.3.1",
     "@mojaloop/central-services-stream": "11.0.0",
     "@mojaloop/event-sdk": "11.0.2",
     "@mojaloop/ml-number": "11.2.1",
     "@mojaloop/object-store-lib": "12.0.0",
     "@now-ims/hapi-now-auth": "2.1.0",
-    "ajv": "8.11.0",
+    "ajv": "8.11.2",
     "ajv-keywords": "5.1.0",
     "base64url": "3.0.1",
     "blipp": "4.0.2",
     "catbox-memory": "4.0.1",
-    "commander": "9.4.0",
+    "commander": "9.4.1",
     "cron": "2.1.0",
-    "decimal.js": "10.4.0",
-    "docdash": "1.2.0",
+    "decimal.js": "10.4.2",
+    "docdash": "2.0.0",
     "event-stream": "4.0.1",
     "five-bells-condition": "5.0.1",
     "glob": "8.0.3",
     "hapi-auth-basic": "5.0.0",
     "hapi-auth-bearer-token": "8.0.0",
-    "hapi-swagger": "14.5.5",
+    "hapi-swagger": "15.0.0",
     "ilp-packet": "2.2.0",
-    "knex": "2.2.0",
+    "knex": "2.3.0",
     "lodash": "4.17.21",
     "moment": "2.29.4",
     "rc": "1.2.8",
@@ -121,15 +121,15 @@
     "async-retry": "1.3.3",
     "audit-ci": "^6.3.0",
     "get-port": "5.1.1",
-    "jsdoc": "3.6.11",
+    "jsdoc": "4.0.0",
     "jsonpath": "1.1.1",
-    "nodemon": "2.0.19",
-    "npm-check-updates": "16.0.5",
+    "nodemon": "2.0.20",
+    "npm-check-updates": "16.4.1",
     "nyc": "15.1.0",
     "pre-commit": "1.2.2",
     "proxyquire": "2.1.3",
-    "replace": "^1.2.1",
-    "sinon": "14.0.0",
+    "replace": "^1.2.2",
+    "sinon": "14.0.2",
     "standard": "17.0.0",
     "standard-version": "^9.5.0",
     "tap-spec": "^5.0.0",

package/src/handlers/bulk/shared/validator.js

@@ -86,7 +86,19 @@ const validateFspiopSourceMatchesPayer = (payload, headers) => {
 const validateFspiopSourceAndDestination = async (payload, headers) => {
   const participant = await BulkTransferService.getParticipantsById(payload.bulkTransferId)
   const matchedPayee = (headers && headers[Enum.Http.Headers.FSPIOP.SOURCE] === participant.payeeFsp)
-  const matchedPayer = (headers && headers[Enum.Http.Headers.FSPIOP.DESTINATION] === participant.payerFsp)
+  const matchedPayer = (
+    headers &&
+    (
+      (headers[Enum.Http.Headers.FSPIOP.DESTINATION] === participant.payerFsp) ||
+      // The following was added for fix(mojaloop/##3024): [core bulk] POST /bulkTransfers from Switch --> PayeeFSP to use Switch as fspiop-source - https://github.com/mojaloop/project/issues/3024
+      // Notes:
+      //  Due to the Bulk [Design Considerations](https://docs.mojaloop.io/technical/central-bulk-transfers/#_2-design-considerations),
+      //  it is possible that the Switch may send a POST Request to the Payer with the Destination Header containing "Switch",
+      //  and the Payee thus responding with a PUT Callback Destination containing the same value.
+      (headers[Enum.Http.Headers.FSPIOP.DESTINATION] === Enum.Http.Headers.FSPIOP.SWITCH.value)
+    )
+  )
+
   if (!matchedPayee) {
     reasons.push(
       ErrorHandler.Factory.createFSPIOPError(

package/src/handlers/transfers/handler.js

@@ -324,6 +324,14 @@ const fulfil = async (error, messages) => {
     const transfer = await TransferService.getById(transferId)
     const transferStateEnum = transfer && transfer.transferStateEnumeration
 
+    // List of valid actions that Source & Destination headers should be checked
+    const validActionsForRouteValidations = [
+      TransferEventAction.COMMIT,
+      TransferEventAction.RESERVE,
+      TransferEventAction.REJECT,
+      TransferEventAction.ABORT
+    ]
+
     if (!transfer) {
       Logger.isErrorEnabled && Logger.error(Util.breadcrumb(location, `callbackInternalServerErrorNotFound--${actionLetter}1`))
       const fspiopError = ErrorHandler.Factory.createInternalServerFSPIOPError('transfer not found')
@@ -337,7 +345,13 @@ const fulfil = async (error, messages) => {
       throw fspiopError
 
       // Lets validate FSPIOP Source & Destination Headers
-    } else if ((headers[Enum.Http.Headers.FSPIOP.SOURCE] && (headers[Enum.Http.Headers.FSPIOP.SOURCE].toLowerCase() !== transfer.payeeFsp.toLowerCase())) || (headers[Enum.Http.Headers.FSPIOP.DESTINATION] && (headers[Enum.Http.Headers.FSPIOP.DESTINATION].toLowerCase() !== transfer.payerFsp.toLowerCase()))) {
+    } else if (
+      validActionsForRouteValidations.includes(action) && // Lets only check headers for specific actions that need checking (i.e. bulk should not since its already done elsewhere)
+      (
+        (headers[Enum.Http.Headers.FSPIOP.SOURCE] && (headers[Enum.Http.Headers.FSPIOP.SOURCE].toLowerCase() !== transfer.payeeFsp.toLowerCase())) ||
+        (headers[Enum.Http.Headers.FSPIOP.DESTINATION] && (headers[Enum.Http.Headers.FSPIOP.DESTINATION].toLowerCase() !== transfer.payerFsp.toLowerCase()))
+      )
+    ) {
       /**
        * If fulfilment request is coming from a source not matching transfer payee fsp or destination not matching transfer payer fsp,
        */

package/src/models/position/facade.js

@@ -160,18 +160,11 @@ const prepareChangeParticipantPositionTransaction = async (transferList) => {
           ['success', 'queryName']
         ).startTimer()
         const participantLimit = await participantFacade.getParticipantLimitByParticipantCurrencyLimit(participantCurrency.participantId, participantCurrency.currencyId, Enum.Accounts.LedgerAccountType.POSITION, Enum.Accounts.ParticipantLimitType.NET_DEBIT_CAP)
-        // Calculate liquidity cover as per story OTC-651
-        let liquidityCover
-        let payerLimit
-        if (settlementModel.settlementDelayId === Enum.Settlements.SettlementDelay.IMMEDIATE) {
-          liquidityCover = new MLNumber(settlementParticipantPosition.value).add(new MLNumber(participantLimit.value))
-          payerLimit = new MLNumber(participantLimit.value)
-        } else {
-          liquidityCover = new MLNumber(settlementParticipantPosition.value).multiply(-1)
-          payerLimit = new MLNumber(participantLimit.value)
-        }
-        let availablePositionBasedOnLiquidityCover = liquidityCover.subtract(effectivePosition).toFixed(Config.AMOUNT.SCALE)
-        let availablePositionBasedOnPayerLimit = payerLimit.subtract(effectivePosition).toFixed(Config.AMOUNT.SCALE)
+
+        const liquidityCover = new MLNumber(settlementParticipantPosition.value).multiply(-1)
+        const payerLimit = new MLNumber(participantLimit.value)
+        const availablePositionBasedOnLiquidityCover = liquidityCover.subtract(effectivePosition).toFixed(Config.AMOUNT.SCALE)
+        const availablePositionBasedOnPayerLimit = payerLimit.subtract(effectivePosition).toFixed(Config.AMOUNT.SCALE)
         /* Validate entire batch if availablePosition >= sumTransfersInBatch - the impact is that applying per transfer rules would require to be handled differently
            since further rules are expected we do not do this at this point
            As we enter this next step the order in which the transfer is processed against the Position is critical.
@@ -192,8 +185,6 @@ const prepareChangeParticipantPositionTransaction = async (transferList) => {
             reservedTransfers[transferId].fspiopError = ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.PAYER_LIMIT_ERROR, null, null, null, rawMessage.value.content.payload.extensionList)
             rawMessage.value.content.payload = reservedTransfers[transferId].fspiopError.toApiErrorObject(Config.ERROR_HANDLING)
           } else {
-            availablePositionBasedOnLiquidityCover = new MLNumber(availablePositionBasedOnLiquidityCover).subtract(transferAmount).toFixed(Config.AMOUNT.SCALE)
-            availablePositionBasedOnPayerLimit = new MLNumber(availablePositionBasedOnPayerLimit).subtract(transferAmount).toFixed(Config.AMOUNT.SCALE)
             transferState.transferStateId = Enum.Transfers.TransferState.RESERVED
             sumReserved = new MLNumber(sumReserved).add(transferAmount).toFixed(Config.AMOUNT.SCALE) /* actually used */
           }
@@ -212,7 +203,7 @@ const prepareChangeParticipantPositionTransaction = async (transferList) => {
           So the position moves forward by the sum of the transfers actually reserved (sumReserved)
           and the reserved amount is cleared of the we reserved in the first instance (sumTransfersInBatch)
         */
-        const processedPositionValue = new MLNumber(initialParticipantPosition.value).add(sumReserved)
+        const processedPositionValue = currentPosition.add(sumReserved)
         await knex('participantPosition').transacting(trx).where({ participantPositionId: initialParticipantPosition.participantPositionId }).update({
           value: processedPositionValue.toFixed(Config.AMOUNT.SCALE),
           reservedValue: new MLNumber(initialParticipantPosition.reservedValue).subtract(sumTransfersInBatch).toFixed(Config.AMOUNT.SCALE),