@mojaloop/central-ledger 19.13.0 → 19.14.0

package/src/cryptoConditions/index.js

@@ -1,11 +1,32 @@
 'use strict'
 
-const FiveBellsCondition = require('five-bells-condition')
 const ErrorHandler = require('@mojaloop/central-services-error-handling')
 
-const validateCondition = (conditionUri) => {
+/**
+ * @function validateCondition
+ * @description Validate that the condition is a valid 32-byte base64 encoded string.
+ *
+ * Reference: https://docs.mojaloop.io/api/fspiop/v1.1/api-definition.html#conditional-transfers
+ *
+ * ILP supports a variety of conditions for performing a conditional payment, but implementers of
+ * the API should use the SHA-256 hash of a 32-byte pre-image. The condition attached to the transfer
+ * is the SHA-256 hash and the fulfilment of that condition is the pre-image. Therefore, if the
+ * condition attached to a transfer is a SHA-256 hash, then when a fulfilment is submitted for
+ * that transaction, the ledger will validate it by calculating the SHA-256 hash of the fulfilment
+ * and ensuring that the hash is equal to the condition.
+ */
+const validateCondition = (condition) => {
   try {
-    return FiveBellsCondition.validateCondition(conditionUri)
+    if (!condition) {
+      throw new Error('Condition not defined.')
+    }
+
+    const conditionBuffer = Buffer.from(condition, 'base64')
+    if (conditionBuffer.length !== 32) {
+      throw new Error(`Expected condition to have length of 32, found: ${conditionBuffer.length}.`)
+    }
+
+    return true
   } catch (err) {
     throw ErrorHandler.Factory.reformatFSPIOPError(err)
   }

package/src/handlers/transfers/handler.js

@@ -413,7 +413,23 @@ const processFulfilMessage = async (message, functionality, span) => {
   }
 
   Util.breadcrumb(location, { path: 'validationCheck' })
-  if (payload.fulfilment && !Validator.validateFulfilCondition(payload.fulfilment, transfer.condition)) {
+  // Skip fulfilment validation for actions that use errorInformation instead of fulfilment
+  const actionsSkippingFulfilmentValidation = [
+    TransferEventAction.ABORT,
+    TransferEventAction.BULK_ABORT,
+    TransferEventAction.REJECT
+  ]
+  const skipValidation = actionsSkippingFulfilmentValidation.includes(action)
+
+  if (skipValidation) {
+    Logger.isInfoEnabled && Logger.info(Util.breadcrumb(location, `Skipping fulfilment validation for action--${actionLetter}9`))
+  }
+  const isInvalid =
+    !skipValidation &&
+    (!payload.fulfilment ||
+      !Validator.validateFulfilCondition(payload.fulfilment, transfer.condition))
+
+  if (isInvalid) {
     Logger.isInfoEnabled && Logger.info(Util.breadcrumb(location, `callbackErrorInvalidFulfilment--${actionLetter}9`))
     const fspiopError = ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.VALIDATION_ERROR, 'invalid fulfilment')
     const apiFSPIOPError = fspiopError.toApiErrorObject(Config.ERROR_HANDLING)

package/src/handlers/transfers/validator.js

@@ -165,8 +165,7 @@ const validateConditionAndExpiration = async (payload) => {
     return false
   }
   try {
-    const condition = 'ni:///sha-256;' + payload.condition + '?fpt=preimage-sha-256&cost=0'
-    await CryptoConditions.validateCondition(condition)
+    CryptoConditions.validateCondition(payload.condition)
   } catch (err) {
     Logger.isErrorEnabled && Logger.error(`${err.message}`)
     reasons.push('Condition validation failed')