@mojaloop/sdk-scheme-adapter 16.0.0 → 17.0.2-snapshot.6

package/CHANGELOG.md

@@ -1,4 +1,28 @@
 # Changelog: [mojaloop/thirdparty-api-svc](https://github.com/mojaloop/thirdparty-api-svc)
+### [17.0.1](https://github.com/mojaloop/sdk-scheme-adapter/compare/v17.0.0...v17.0.1) (2022-07-04)
+
+
+### Bug Fixes
+
+* creating inbound server ([#329](https://github.com/mojaloop/sdk-scheme-adapter/issues/329)) ([962420f](https://github.com/mojaloop/sdk-scheme-adapter/commit/962420f6fed02722c5a9aeee6c108b6fbc9f021d))
+
+## [17.0.0](https://github.com/mojaloop/sdk-scheme-adapter/compare/v15.0.1...v17.0.0) (2022-07-04)
+
+
+### ⚠ BREAKING CHANGES
+
+* add dummy pr to major version bump due to unsquashed title (#327)
+
+### Features
+
+* suppress health check logs ([#328](https://github.com/mojaloop/sdk-scheme-adapter/issues/328)) ([64fadde](https://github.com/mojaloop/sdk-scheme-adapter/commit/64faddea8307aa0c19d56466d0afe8f8208c4d66))
+
+
+### Chore
+
+* add dummy pr to major version bump due to unsquashed title ([#327](https://github.com/mojaloop/sdk-scheme-adapter/issues/327)) ([ff0f29b](https://github.com/mojaloop/sdk-scheme-adapter/commit/ff0f29b7ce560565ee21cf6ae84118e1b391b5b5))
+* **release:** 16.0.0 [skip ci] ([0071c65](https://github.com/mojaloop/sdk-scheme-adapter/commit/0071c65c3665239d0a482e76498f9eec5c288043))
+
 ## [16.0.0](https://github.com/mojaloop/sdk-scheme-adapter/compare/v15.0.1...v16.0.0) (2022-07-01)
 
 

package/Dockerfile

@@ -28,6 +28,10 @@ LABEL org.label-schema.vcs-ref=$VCS_REF
 LABEL org.label-schema.url="https://mojaloop.io/"
 LABEL org.label-schema.version=$VERSION
 
+# Create a non-root user: ml-user
+RUN adduser -D ml-user 
+USER ml-user
+
 COPY --from=builder /src/ /src
 COPY ./src ./src
 COPY ./secrets /

package/audit-resolve.json

@@ -2,124 +2,58 @@
   "decisions": {
     "1075703|@mojaloop/central-services-shared>@mojaloop/event-sdk>grpc>protobufjs": {
       "decision": "ignore",
-      "madeAt": 1656678986448
+      "madeAt": 1657188195403,
+      "expiresAt": 1659780190646
     },
     "1075704|@mojaloop/central-services-shared>@mojaloop/event-sdk>grpc>protobufjs": {
       "decision": "ignore",
-      "madeAt": 1656678989848
+      "madeAt": 1657188196343,
+      "expiresAt": 1659780190646
     },
-    "1070412|@mojaloop/central-services-shared>@mojaloop/event-sdk>grpc>protobufjs>shins>ejs": {
+    "1080944|@mojaloop/central-services-shared>@mojaloop/event-sdk>grpc>protobufjs>moment": {
       "decision": "ignore",
-      "madeAt": 1656679958470
+      "madeAt": 1657188197274,
+      "expiresAt": 1659780190646
     },
-    "1070412|ejs": {
-      "decision": "ignore",
-      "madeAt": 1656679958471
-    },
-    "1070030|@mojaloop/central-services-shared>@mojaloop/event-sdk>grpc>protobufjs>shins>ejs>markdown-it": {
+    "1070030|@mojaloop/central-services-shared>@mojaloop/event-sdk>grpc>protobufjs>moment>shins>markdown-it": {
       "decision": "ignore",
-      "madeAt": 1656679961621
+      "madeAt": 1657188198190,
+      "expiresAt": 1659780190646
     },
     "1070030|widdershins>markdown-it": {
       "decision": "ignore",
-      "madeAt": 1656681873020
+      "madeAt": 1657188198190,
+      "expiresAt": 1659780190646
     },
-    "1068155|@mojaloop/central-services-shared>@mojaloop/event-sdk>grpc>protobufjs>shins>ejs>markdown-it>sanitize-html": {
+    "1068155|@mojaloop/central-services-shared>@mojaloop/event-sdk>grpc>protobufjs>moment>shins>markdown-it>sanitize-html": {
       "decision": "ignore",
-      "madeAt": 1656679964361
+      "madeAt": 1657188199040,
+      "expiresAt": 1659780190646
     },
-    "1070260|@mojaloop/central-services-shared>@mojaloop/event-sdk>grpc>protobufjs>shins>ejs>markdown-it>sanitize-html": {
+    "1070260|@mojaloop/central-services-shared>@mojaloop/event-sdk>grpc>protobufjs>moment>shins>markdown-it>sanitize-html": {
       "decision": "ignore",
-      "madeAt": 1656679966871
+      "madeAt": 1657188199954,
+      "expiresAt": 1659780190646
     },
-    "1067553|@mojaloop/central-services-shared>@mojaloop/event-sdk>grpc>protobufjs>shins>ejs>markdown-it>sanitize-html>widdershins>swagger2openapi>better-ajv-errors>jsonpointer": {
+    "1070412|ejs": {
       "decision": "ignore",
-      "madeAt": 1656679000803
+      "madeAt": 1657188200902,
+      "expiresAt": 1659780190646
     },
     "1067553|swagger2openapi>better-ajv-errors>jsonpointer": {
       "decision": "ignore",
-      "madeAt": 1656679000803
-    },
-    "1067553|widdershins>markdown-it>swagger2openapi>better-ajv-errors>jsonpointer": {
-      "decision": "ignore",
-      "madeAt": 1656679000804
-    },
-    "1067946|@mojaloop/central-services-shared>@mojaloop/event-sdk>grpc>protobufjs>shins>ejs>markdown-it>sanitize-html>widdershins>swagger2openapi>better-ajv-errors>jsonpointer>oas-validator>ajv": {
-      "decision": "ignore",
-      "madeAt": 1656679005322
+      "madeAt": 1657188201786,
+      "expiresAt": 1659780190646
     },
     "1067946|swagger2openapi>better-ajv-errors>jsonpointer>oas-validator>ajv": {
       "decision": "ignore",
-      "madeAt": 1656679005322
-    },
-    "1067946|widdershins>markdown-it>swagger2openapi>better-ajv-errors>jsonpointer>oas-validator>ajv": {
-      "decision": "ignore",
-      "madeAt": 1656679005322
-    },
-    "1068310|@mojaloop/central-services-shared>@mojaloop/event-sdk>grpc>protobufjs>shins>ejs>markdown-it>sanitize-html>widdershins>swagger2openapi>better-ajv-errors>jsonpointer>oas-validator>ajv>yargs>yargs-parser": {
-      "decision": "ignore",
-      "madeAt": 1656679007475
-    },
-    "1068310|widdershins>markdown-it>swagger2openapi>better-ajv-errors>jsonpointer>oas-validator>ajv>yargs>yargs-parser": {
-      "decision": "ignore",
-      "madeAt": 1656679007475
-    },
-    "1070412|shins>ejs": {
-      "decision": "ignore",
-      "madeAt": 1656679958471
-    },
-    "1070030|shins>ejs>markdown-it": {
-      "decision": "ignore",
-      "madeAt": 1656679961621
-    },
-    "1068155|shins>ejs>markdown-it>sanitize-html": {
-      "decision": "ignore",
-      "madeAt": 1656679964361
-    },
-    "1070260|shins>ejs>markdown-it>sanitize-html": {
-      "decision": "ignore",
-      "madeAt": 1656679966871
-    },
-    "1070030|@mojaloop/central-services-shared>@mojaloop/event-sdk>grpc>protobufjs>shins>markdown-it": {
-      "decision": "ignore",
-      "madeAt": 1656681873020
-    },
-    "1068155|@mojaloop/central-services-shared>@mojaloop/event-sdk>grpc>protobufjs>shins>markdown-it>sanitize-html": {
-      "decision": "ignore",
-      "madeAt": 1656681876693
-    },
-    "1070260|@mojaloop/central-services-shared>@mojaloop/event-sdk>grpc>protobufjs>shins>markdown-it>sanitize-html": {
-      "decision": "ignore",
-      "madeAt": 1656681880214
+      "madeAt": 1657188202661,
+      "expiresAt": 1659780190646
     },
     "1068310|widdershins>markdown-it>yargs>yargs-parser": {
       "decision": "ignore",
-      "madeAt": 1656681883038
-    },
-    "1070030|@mojaloop/central-services-shared>@mojaloop/event-sdk>grpc>protobufjs>widdershins>markdown-it": {
-      "decision": "ignore",
-      "madeAt": 1656691882275,
-      "expiresAt": 1659283873047
-    },
-    "1070030|shins>markdown-it": {
-      "decision": "ignore",
-      "madeAt": 1656691882275,
-      "expiresAt": 1659283873047
-    },
-    "1068310|@mojaloop/central-services-shared>@mojaloop/event-sdk>grpc>protobufjs>widdershins>markdown-it>yargs>yargs-parser": {
-      "decision": "ignore",
-      "madeAt": 1656691883964,
-      "expiresAt": 1659283873047
-    },
-    "1068155|shins>markdown-it>sanitize-html": {
-      "decision": "ignore",
-      "madeAt": 1656691885077,
-      "expiresAt": 1659283873047
-    },
-    "1070260|shins>markdown-it>sanitize-html": {
-      "decision": "ignore",
-      "madeAt": 1656691886045,
-      "expiresAt": 1659283873047
+      "madeAt": 1657188203603,
+      "expiresAt": 1659780190646
     }
   },
   "rules": {},

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mojaloop/sdk-scheme-adapter",
-  "version": "16.0.0",
+  "version": "17.0.2-snapshot.6",
   "description": "An adapter for connecting to Mojaloop API enabled switches.",
   "main": "src/index.js",
   "types": "src/index.d.ts",
@@ -11,8 +11,8 @@
     "~": "src"
   },
   "scripts": {
-    "audit:resolve": "SHELL=sh resolve-audit --production",
-    "audit:check": "SHELL=sh check-audit --production",
+    "audit:resolve": "npx resolve-audit --production",
+    "audit:check": "npx check-audit --production",
     "build": "npm run build:openapi; npm run build:dto:outbound",
     "build:openapi": "npm run build:openapi:inbound && npm run build:openapi:outbound",
     "build:openapi:inbound": "openapi bundle --output ./src/InboundServer/api.yaml --ext yaml ./src/InboundServer/api_template.yaml",
@@ -20,7 +20,8 @@
     "build:dto:outbound": "openapi-typescript ./src/OutboundServer/api.yaml --output ./src/OutboundServer/api_interfaces/openapi.d.ts",
     "lint": "eslint ./src/",
     "lint:fix": "eslint ./src/ --fix",
-    "test": "jest --ci --reporters=default --reporters=jest-junit --env=node test/unit/",
+    "test": "npm run test:unit",
+    "test:unit": "jest --runInBand --ci --reporters=default --reporters=jest-junit --env=node test/unit/",
     "test:int": "jest --ci --reporters=default --reporters=jest-junit --env=node test/integration",
     "validate:api": "npm run validate:api:in; npm run validate:api:out",
     "validate:api:in": "swagger-cli validate ./src/InboundServer/api.yaml",
@@ -55,20 +56,20 @@
     "url": "git@github.com:mojaloop/sdk-scheme-adapter.git"
   },
   "dependencies": {
-    "@koa/cors": "^3.1.0",
+    "@koa/cors": "^3.3.0",
     "@mojaloop/central-services-shared": "17.0.2",
-    "@mojaloop/sdk-standard-components": "^17.0.4",
+    "@mojaloop/sdk-standard-components": "^17.1.0",
     "ajv": "8.11.0",
     "axios": "^0.27.2",
     "co-body": "^6.1.0",
     "dotenv": "^16.0.1",
-    "env-var": "^7.0.1",
-    "express": "^4.17.2",
+    "env-var": "^7.1.1",
+    "express": "^4.18.1",
     "fast-json-patch": "^3.1.1",
     "javascript-state-machine": "^3.1.0",
     "js-yaml": "^4.1.0",
     "json-schema-ref-parser": "^9.0.9",
-    "koa": "^2.13.1",
+    "koa": "^2.13.4",
     "koa-body": "^5.0.0",
     "lodash": "^4.17.21",
     "module-alias": "^2.2.2",
@@ -77,31 +78,31 @@
     "prom-client": "^14.0.1",
     "promise-timeout": "^1.3.0",
     "random-word-slugs": "^0.1.6",
-    "redis": "^4.1.1",
-    "uuidv4": "^6.2.12",
+    "redis": "^4.2.0",
+    "uuidv4": "^6.2.13",
     "ws": "^8.8.0"
   },
   "devDependencies": {
     "@babel/core": "^7.18.6",
     "@babel/preset-env": "^7.18.6",
     "@mojaloop/api-snippets": "^14.0.0",
-    "@redocly/openapi-cli": "^1.0.0-beta.59",
+    "@redocly/openapi-cli": "^1.0.0-beta.94",
     "@types/jest": "^28.1.4",
     "babel-jest": "^28.1.2",
-    "eslint": "^8.18.0",
+    "eslint": "^8.19.0",
     "eslint-config-airbnb-base": "^15.0.0",
-    "eslint-plugin-import": "^2.24.2",
+    "eslint-plugin-import": "^2.26.0",
     "eslint-plugin-jest": "^26.5.3",
     "jest": "^28.1.2",
     "jest-junit": "^14.0.0",
     "nock": "^13.2.8",
-    "npm-audit-resolver": "^3.0.0-0",
-    "npm-check-updates": "^15.0.1",
+    "npm-audit-resolver": "^3.0.0-7",
+    "npm-check-updates": "^15.2.1",
     "openapi-response-validator": "^12.0.0",
-    "openapi-typescript": "^5.4.0",
+    "openapi-typescript": "^5.4.1",
     "redis-mock": "^0.56.3",
-    "standard-version": "^9.3.1",
-    "supertest": "^6.1.6",
+    "standard-version": "^9.5.0",
+    "supertest": "^6.2.4",
     "swagger-cli": "^4.0.4"
   }
 }

package/src/InboundServer/index.js

@@ -23,6 +23,8 @@ const router = require('../lib/router');
 const handlers = require('./handlers');
 const middlewares = require('./middlewares');
 
+const logExcludePaths = ['/'];
+
 class InboundApi extends EventEmitter {
     constructor(conf, logger, cache, validator, wso2) {
         super({ captureExceptions: true });
@@ -99,7 +101,7 @@ class InboundApi extends EventEmitter {
             api.use(middlewares.createJwsValidator(logger, jwsVerificationKeys, jwsExclusions));
         }
 
-        api.use(middlewares.applyState({ cache, wso2, conf }));
+        api.use(middlewares.applyState({ cache, wso2, conf, logExcludePaths }));
         api.use(middlewares.createLogger(logger));
         api.use(middlewares.createRequestValidator(validator));
         api.use(middlewares.assignFspiopIdentifier());
@@ -133,7 +135,7 @@ class InboundServer extends EventEmitter {
     constructor(conf, logger, cache, wso2) {
         super({ captureExceptions: true });
         this._conf = conf;
-        this._validator = new Validate();
+        this._validator = new Validate({ logExcludePaths });
         this._logger = logger;
         this._api = new InboundApi(
             conf,

package/src/InboundServer/middlewares.js

@@ -353,13 +353,17 @@ const createLogger = (logger) => async (ctx, next) => {
         path: ctx.path,
         method: ctx.method
     }});
-    ctx.state.logger.push({ body: ctx.request.body }).log('Request received');
+    if (!ctx.state.logExcludePaths.includes(ctx.path)) {
+        ctx.state.logger.push({body: ctx.request.body}).log('Request received');
+    }
     try {
         await next();
     } catch (err) {
         ctx.state.logger.push(err).log('Error');
     }
-    await ctx.state.logger.log('Request processed');
+    if (!ctx.state.logExcludePaths.includes(ctx.path)) {
+        await ctx.state.logger.log('Request processed');
+    }
 };
 
 
@@ -369,10 +373,14 @@ const createLogger = (logger) => async (ctx, next) => {
  * @return {Function}
  */
 const createRequestValidator = (validator) => async (ctx, next) => {
-    ctx.state.logger.log('Validating request');
+    if (!ctx.state.logExcludePaths.includes(ctx.path)) {
+        ctx.state.logger.log('Validating request');
+    }
     try {
         ctx.state.path = validator.validateRequest(ctx, ctx.state.logger);
-        ctx.state.logger.log('Request passed validation');
+        if (!ctx.state.logExcludePaths.includes(ctx.path)) {
+            ctx.state.logger.log('Request passed validation');
+        }
         await next();
     } catch (err) {
         ctx.state.logger.push({ err }).log('Request failed validation.');

package/src/OutboundServer/index.js

@@ -23,6 +23,7 @@ const handlers = require('./handlers');
 const middlewares = require('./middlewares');
 
 const endpointRegex = /\/.*/g;
+const logExcludePaths = ['/'];
 
 class OutboundApi extends EventEmitter {
     constructor(conf, logger, cache, validator, metricsClient, wso2) {
@@ -36,7 +37,7 @@ class OutboundApi extends EventEmitter {
         this._api.use(middlewares.createErrorHandler(this._logger));
         this._api.use(middlewares.createRequestIdGenerator());
         this._api.use(koaBody()); // outbound always expects application/json
-        this._api.use(middlewares.applyState({ cache, wso2, conf, metricsClient }));
+        this._api.use(middlewares.applyState({ cache, wso2, conf, metricsClient, logExcludePaths }));
         this._api.use(middlewares.createLogger(this._logger));
 
         //Note that we strip off any path on peerEndpoint config after the origin.
@@ -69,7 +70,7 @@ class OutboundApi extends EventEmitter {
 class OutboundServer extends EventEmitter {
     constructor(conf, logger, cache, metricsClient, wso2) {
         super({ captureExceptions: true });
-        this._validator = new Validate();
+        this._validator = new Validate({ logExcludePaths });
         this._conf = conf;
         this._logger = logger;
         this._server = null;

package/src/OutboundServer/middlewares.js

@@ -20,10 +20,14 @@ const { applyState, createErrorHandler, createLogger, createRequestIdGenerator }
  * @return {Function}
  */
 const createRequestValidator = (validator) => async (ctx, next) => {
-    ctx.state.logger.log('Validating request');
+    if (!ctx.state.logExcludePaths.includes(ctx.path)) {
+        ctx.state.logger.log('Validating request');
+    }
     try {
         ctx.state.path = validator.validateRequest(ctx, ctx.state.logger);
-        ctx.state.logger.log('Request passed validation');
+        if (!ctx.state.logExcludePaths.includes(ctx.path)) {
+            ctx.state.logger.log('Request passed validation');
+        }
         await next();
     } catch (err) {
         ctx.state.logger.push({ err }).log('Request failed validation.');

package/src/TestServer/index.js

@@ -21,6 +21,8 @@ const router = require('../lib/router');
 const handlers = require('./handlers');
 const middlewares = require('../InboundServer/middlewares');
 
+const logExcludePaths = ['/'];
+
 const getWsIp = (req) => [
     req.socket.remoteAddress,
     ...(
@@ -36,7 +38,7 @@ class TestApi {
 
         this._api.use(middlewares.createErrorHandler(logger));
         this._api.use(middlewares.createRequestIdGenerator());
-        this._api.use(middlewares.applyState({ cache }));
+        this._api.use(middlewares.applyState({ cache, logExcludePaths }));
         this._api.use(middlewares.createLogger(logger));
 
         this._api.use(middlewares.createRequestValidator(validator));
@@ -174,7 +176,7 @@ class TestServer {
     constructor({ port, logger, cache }) {
         this._port = port;
         this._logger = logger;
-        this._validator = new Validate();
+        this._validator = new Validate({ logExcludePaths });
         this._api = new TestApi(this._logger.push({ component: 'api' }), this._validator, cache);
         this._server = http.createServer(this._api.callback());
         // TODO: why does this appear to need to be called after creating this._server (try reorder

package/src/index.js

@@ -78,7 +78,6 @@ class Server extends EventEmitter {
             this.conf,
             this.logger.push(LOG_ID.INBOUND),
             this.cache,
-            this.metricsClient,
             this.wso2,
         );
         this.inboundServer.on('error', (...args) => {
@@ -195,7 +194,6 @@ class Server extends EventEmitter {
                 newConf,
                 this.logger.push(LOG_ID.INBOUND),
                 this.cache,
-                this.metricsClient,
                 this.wso2,
             );
             this.inboundServer.on('error', (...args) => {

package/src/lib/metrics.js

@@ -131,8 +131,6 @@ class MetricsServer {
 
         result.use(koaBody());
         result.use(async ctx => {
-            this._logger.log('Metrics request received');
-
             ctx.response.set('Content-Type', this._prometheusRegister.contentType);
             ctx.response.body = await this._prometheusRegister.metrics();
         });

package/src/lib/model/AccountsModel.js

@@ -16,10 +16,7 @@ const StateMachine = require('javascript-state-machine');
 const { MojaloopRequests, Errors } = require('@mojaloop/sdk-standard-components');
 const { BackendError } = require('./common');
 
-const stateEnum = {
-    'ERROR_OCCURRED': 'ERROR_OCCURRED',
-    'COMPLETED': 'COMPLETED',
-};
+const { SDKStateEnum } = require('./common');
 
 
 /**
@@ -283,11 +280,11 @@ class AccountsModel {
 
         switch(this._data.currentState) {
             case 'succeeded':
-                resp.currentState = stateEnum.COMPLETED;
+                resp.currentState = SDKStateEnum.COMPLETED;
                 break;
 
             case 'errored':
-                resp.currentState = stateEnum.ERROR_OCCURRED;
+                resp.currentState = SDKStateEnum.ERROR_OCCURRED;
                 break;
 
             default:
@@ -295,7 +292,7 @@ class AccountsModel {
                     `Account model response being returned from an unexpected state: ${this._data.currentState}. ` +
                     'Returning ERROR_OCCURRED state'
                 );
-                resp.currentState = stateEnum.ERROR_OCCURRED;
+                resp.currentState = SDKStateEnum.ERROR_OCCURRED;
                 break;
         }
         return resp;

package/src/lib/model/Async2SyncModel.js

@@ -12,6 +12,7 @@
 const util = require('util');
 
 const PSM = require('./common').PersistentStateMachine;
+const { SDKStateEnum } = require('./common');
 const MojaloopRequests = require('@mojaloop/sdk-standard-components').MojaloopRequests;
 const deferredJob = require('./lib').deferredJob;
 
@@ -123,9 +124,9 @@ function generate({
     }
 
     const mapCurrentState = {
-        start: 'WAITING_FOR_ACTION',
-        succeeded: 'COMPLETED',
-        errored: 'ERROR_OCCURRED'
+        start: SDKStateEnum.WAITING_FOR_ACTION,
+        succeeded: SDKStateEnum.COMPLETED,
+        errored: SDKStateEnum.ERROR_OCCURRED
     };
 
     /**

package/src/lib/model/InboundTransfersModel.js

@@ -22,7 +22,9 @@ const {
     Errors,
 } = require('@mojaloop/sdk-standard-components');
 const shared = require('./lib/shared');
-const { TransferStateEnum } = require('./common');
+const { SDKStateEnum } = require('./common');
+const FSPIOPTransferStateEnum = require('@mojaloop/central-services-shared').Enum.Transfers.TransferState;
+const FSPIOPBulkTransferStateEnum = require('@mojaloop/central-services-shared').Enum.Transfers.BulkTransferState;
 
 /**
  *  Models the operations required for performing inbound transfers
@@ -74,7 +76,7 @@ class InboundTransfersModel {
 
     updateStateWithError(err) {
         this.data.lastError = err;
-        this.data.currentState = TransferStateEnum.ERROR_OCCURRED;
+        this.data.currentState = SDKStateEnum.ERROR_OCCURRED;
         return this._save();
     }
 
@@ -188,7 +190,7 @@ class InboundTransfersModel {
                 headers: request.headers,
                 body: request.body
             },
-            currentState: TransferStateEnum.QUOTE_REQUEST_RECEIVED,
+            currentState: SDKStateEnum.QUOTE_REQUEST_RECEIVED,
             initiatedTimestamp: new Date().toISOString(),
         };
 
@@ -237,7 +239,7 @@ class InboundTransfersModel {
                 headers: res.originalRequest.headers,
                 body: res.originalRequest.body,
             };
-            this.data.currentState = TransferStateEnum.WAITING_FOR_QUOTE_ACCEPTANCE;
+            this.data.currentState = SDKStateEnum.WAITING_FOR_QUOTE_ACCEPTANCE;
             await this._save();
             return res;
         }
@@ -342,7 +344,7 @@ class InboundTransfersModel {
 
             // persist our state so we have a record if we crash during processing the prepare
             this.data.prepare = request;
-            this.data.currentState = TransferStateEnum.PREPARE_RECEIVED;
+            this.data.currentState = SDKStateEnum.PREPARE_RECEIVED;
             await this._save();
 
             // Calculate or retrieve fulfilment and condition
@@ -390,7 +392,7 @@ class InboundTransfersModel {
             // create a  mojaloop transfer fulfil response
             const mojaloopResponse = {
                 completedTimestamp: response.completedTimestamp || new Date(),
-                transferState: response.transferState || (this._reserveNotification ? TransferStateEnum.RESERVED : TransferStateEnum.COMPLETED),
+                transferState: response.transferState || (this._reserveNotification ? FSPIOPTransferStateEnum.RESERVED : FSPIOPTransferStateEnum.COMMITTED),
                 fulfilment: response.fulfilment || fulfilment,
                 ...response.extensionList && {
                     extensionList: {
@@ -406,7 +408,7 @@ class InboundTransfersModel {
                 headers: res.originalRequest.headers,
                 body: res.originalRequest.body,
             };
-            this.data.currentState = response.transferState || (this._reserveNotification ? TransferStateEnum.RESERVED : TransferStateEnum.COMPLETED);
+            this.data.currentState = response.transferState || (this._reserveNotification ? SDKStateEnum.RESERVED : SDKStateEnum.COMPLETED);
             await this._save();
             return res;
         } catch(err) {
@@ -679,7 +681,7 @@ class InboundTransfersModel {
             // create a  mojaloop transfer fulfil response
             const mojaloopResponse = {
                 completedTimestamp: new Date(),
-                bulkTransferState: 'COMMITTED',
+                bulkTransferState: FSPIOPBulkTransferStateEnum.COMMITTED,
             };
 
             if (response.individualTransferResults && response.individualTransferResults.length) {
@@ -784,18 +786,18 @@ class InboundTransfersModel {
             // tag the final notification body on to the state
             this.data.finalNotification = body;
 
-            if(body.transferState === 'COMMITTED') {
+            if(body.transferState === FSPIOPTransferStateEnum.COMMITTED) {
                 // if the transfer was successful in the switch, set the overall transfer state to COMPLETED
-                this.data.currentState = TransferStateEnum.COMPLETED;
+                this.data.currentState = SDKStateEnum.COMPLETED;
             }
-            else if(body.transferState === 'ABORTED') {
+            else if(body.transferState === FSPIOPTransferStateEnum.ABORTED) {
                 // if the transfer was ABORTED in the switch, set the overall transfer state to ABORTED
-                this.data.currentState = TransferStateEnum.ABORTED;
+                this.data.currentState = SDKStateEnum.ABORTED;
             }            
             else {
                 // if the final notification has anything other than COMMITTED as the final state, set an error
                 // in the transfer state.
-                this.data.currentState = TransferStateEnum.ERROR_OCCURED;
+                this.data.currentState = SDKStateEnum.ERROR_OCCURED;
                 this.data.lastError = 'Final notification state not COMMITTED';
             }
 
@@ -845,7 +847,7 @@ class InboundTransfersModel {
                 originalError: err.stack || util.inspect(err),
                 mojaloopError: mojaloopError,
             };
-            this.data.currentState = TransferStateEnum.ERROR_OCCURRED;
+            this.data.currentState = SDKStateEnum.ERROR_OCCURRED;
             await this._save();
         }
         return mojaloopError;

package/src/lib/model/OutboundBulkQuotesModel.js

@@ -17,10 +17,7 @@ const { MojaloopRequests } = require('@mojaloop/sdk-standard-components');
 const shared = require('./lib/shared');
 const { BackendError } = require('./common');
 
-const stateEnum = {
-    'ERROR_OCCURRED': 'ERROR_OCCURRED',
-    'COMPLETED': 'COMPLETED',
-};
+const { SDKStateEnum } = require('./common');
 
 
 /**
@@ -381,16 +378,16 @@ class OutboundBulkQuotesModel {
 
         switch(this.data.currentState) {
             case 'succeeded':
-                resp.currentState = stateEnum.COMPLETED;
+                resp.currentState = SDKStateEnum.COMPLETED;
                 break;
 
             case 'errored':
-                resp.currentState = stateEnum.ERROR_OCCURRED;
+                resp.currentState = SDKStateEnum.ERROR_OCCURRED;
                 break;
 
             default:
                 this._logger.log(`Bulk quote model response being returned from an unexpected state: ${this.data.currentState}. Returning ERROR_OCCURRED state`);
-                resp.currentState = stateEnum.ERROR_OCCURRED;
+                resp.currentState = SDKStateEnum.ERROR_OCCURRED;
                 break;
         }