Update pisp/master

.circleci/config.yml

@@ -55,7 +55,6 @@ executors:
   default-machine:
     machine:
       image: ubuntu-1604:201903-01
-
 ##
 # Jobs
 #
@@ -242,6 +241,16 @@ jobs:
           name: Install docker dependencies for anchore
           command: |
             apk add --update python3 py3-pip docker python3-dev libffi-dev openssl-dev gcc libc-dev make jq npm
+      - run:
+          name: Install general dependencies
+          command: |
+            apk --no-cache add git
+            apk --no-cache add ca-certificates
+            apk --no-cache add curl
+            apk --no-cache add openssh-client
+            apk add --no-cache -t build-dependencies make gcc g++ python3 libtool autoconf automake
+            npm config set unsafe-perm true
+            npm install -g node-gyp
       - run:
           name: Install AWS CLI dependencies
           command: *defaults_awsCliDependencies

.ncurc.json

@@ -1,5 +1,6 @@
 {
   "reject": [
-    "tape"
+    "tape",
+    "ilp-packet"
   ]
 }

audit-resolve.json

@@ -1,144 +1,164 @@
 {
   "decisions": {
-    "1179|@mojaloop/central-services-database>knex>mkdirp>minimist": {
-      "decision": "fix",
-      "madeAt": 1587002695126
+    "1523|@mojaloop/central-object-store>@mojaloop/central-services-logger>winston>async>lodash": {
+      "decision": "ignore",
+      "madeAt": 1594103543707,
+      "expiresAt": 1596695532690
+    },
+    "1523|@mojaloop/central-services-health>@mojaloop/central-services-logger>winston>async>lodash": {
+      "decision": "ignore",
+      "madeAt": 1594103543707,
+      "expiresAt": 1596695532690
     },
-    "1179|knex>mkdirp>minimist": {
-      "decision": "fix",
-      "madeAt": 1587002695126
+    "1523|@mojaloop/central-services-health>@mojaloop/central-services-shared>@mojaloop/central-services-logger>winston>async>lodash": {
+      "decision": "ignore",
+      "madeAt": 1594103543707,
+      "expiresAt": 1596695532690
     },
-    "1179|npm-check-updates>pacote>cacache>move-concurrently>copy-concurrently>mkdirp>minimist": {
-      "decision": "fix",
-      "madeAt": 1587002695126
+    "1523|@mojaloop/central-services-health>@mojaloop/central-services-shared>@mojaloop/event-sdk>@mojaloop/central-services-logger>winston>async>lodash": {
+      "decision": "ignore",
+      "madeAt": 1594103543707,
+      "expiresAt": 1596695532690
+    },
+    "1523|@mojaloop/central-services-shared>@mojaloop/event-sdk>@mojaloop/central-services-logger>winston>async>lodash": {
+      "decision": "ignore",
+      "madeAt": 1594103543707,
+      "expiresAt": 1596695532690
     },
-    "1179|npm-check-updates>pacote>npm-registry-fetch>make-fetch-happen>cacache>move-concurrently>copy-concurrently>mkdirp>minimist": {
-      "decision": "fix",
-      "madeAt": 1587002695126
+    "1523|@mojaloop/event-sdk>@mojaloop/central-services-logger>winston>async>lodash": {
+      "decision": "ignore",
+      "madeAt": 1594103543707,
+      "expiresAt": 1596695532690
     },
-    "1179|npm-check-updates>pacote>cacache>move-concurrently>mkdirp>minimist": {
-      "decision": "fix",
-      "madeAt": 1587002695126
+    "1523|@mojaloop/central-services-logger>winston>async>lodash": {
+      "decision": "ignore",
+      "madeAt": 1594103543707,
+      "expiresAt": 1596695532690
     },
-    "1179|npm-check-updates>pacote>npm-registry-fetch>make-fetch-happen>cacache>move-concurrently>mkdirp>minimist": {
-      "decision": "fix",
-      "madeAt": 1587002695126
+    "1523|@mojaloop/central-services-shared>@mojaloop/central-services-logger>winston>async>lodash": {
+      "decision": "ignore",
+      "madeAt": 1594103543707,
+      "expiresAt": 1596695532690
     },
-    "1179|standard>eslint>file-entry-cache>flat-cache>write>mkdirp>minimist": {
-      "decision": "fix",
-      "madeAt": 1587002695126
+    "1523|@mojaloop/central-services-health>@mojaloop/central-services-shared>@mojaloop/event-sdk>winston>async>lodash": {
+      "decision": "ignore",
+      "madeAt": 1594103543708,
+      "expiresAt": 1596695532690
     },
-    "1179|standard>eslint>mkdirp>minimist": {
-      "decision": "fix",
-      "madeAt": 1587002695126
+    "1523|@mojaloop/central-services-shared>@mojaloop/event-sdk>winston>async>lodash": {
+      "decision": "ignore",
+      "madeAt": 1594103543708,
+      "expiresAt": 1596695532690
     },
-    "1179|@mojaloop/central-services-health>@mojaloop/central-services-shared>@mojaloop/event-sdk>grpc>node-pre-gyp>mkdirp>minimist": {
+    "1523|@mojaloop/event-sdk>winston>async>lodash": {
       "decision": "ignore",
-      "madeAt": 1591288720901,
-      "expiresAt": 1593880704884
+      "madeAt": 1594103543708,
+      "expiresAt": 1596695532690
     },
-    "1179|@mojaloop/central-services-shared>@mojaloop/event-sdk>grpc>node-pre-gyp>mkdirp>minimist": {
+    "1523|@mojaloop/central-services-stream>@mojaloop/central-services-logger>winston>async>lodash": {
       "decision": "ignore",
-      "madeAt": 1591288720901,
-      "expiresAt": 1593880704884
+      "madeAt": 1594103543708,
+      "expiresAt": 1596695532690
     },
-    "1179|@mojaloop/event-sdk>grpc>node-pre-gyp>mkdirp>minimist": {
+    "1523|@mojaloop/forensic-logging-client>@mojaloop/central-services-logger>winston>async>lodash": {
       "decision": "ignore",
-      "madeAt": 1591288720901,
-      "expiresAt": 1593880704884
+      "madeAt": 1594103543708,
+      "expiresAt": 1596695532690
     },
-    "1179|@mojaloop/central-services-health>@mojaloop/central-services-shared>@mojaloop/event-sdk>grpc>node-pre-gyp>tar>mkdirp>minimist": {
+    "1523|@mojaloop/central-services-database>knex>lodash": {
       "decision": "ignore",
-      "madeAt": 1591288720901,
-      "expiresAt": 1593880704884
+      "madeAt": 1594103543708,
+      "expiresAt": 1596695532690
     },
-    "1179|@mojaloop/central-services-shared>@mojaloop/event-sdk>grpc>node-pre-gyp>tar>mkdirp>minimist": {
+    "1523|@mojaloop/central-services-database>lodash": {
       "decision": "ignore",
-      "madeAt": 1591288720901,
-      "expiresAt": 1593880704884
+      "madeAt": 1594103543708,
+      "expiresAt": 1596695532690
     },
-    "1179|@mojaloop/event-sdk>grpc>node-pre-gyp>tar>mkdirp>minimist": {
+    "1523|@mojaloop/central-services-error-handling>lodash": {
       "decision": "ignore",
-      "madeAt": 1591288720901,
-      "expiresAt": 1593880704884
+      "madeAt": 1594103543708,
+      "expiresAt": 1596695532690
     },
-    "1179|@mojaloop/central-services-health>@mojaloop/central-services-shared>@mojaloop/event-sdk>grpc>node-pre-gyp>rc>minimist": {
+    "1523|@mojaloop/central-services-health>@mojaloop/central-services-error-handling>lodash": {
       "decision": "ignore",
-      "madeAt": 1591288727289,
-      "expiresAt": 1593880704884
+      "madeAt": 1594103543708,
+      "expiresAt": 1596695532690
     },
-    "1179|@mojaloop/central-services-shared>@mojaloop/event-sdk>grpc>node-pre-gyp>rc>minimist": {
+    "1523|@mojaloop/central-services-health>@mojaloop/central-services-shared>@mojaloop/central-services-error-handling>lodash": {
       "decision": "ignore",
-      "madeAt": 1591288727289,
-      "expiresAt": 1593880704884
+      "madeAt": 1594103543708,
+      "expiresAt": 1596695532690
     },
-    "1179|@mojaloop/event-sdk>grpc>node-pre-gyp>rc>minimist": {
+    "1523|@mojaloop/central-services-shared>@mojaloop/central-services-error-handling>lodash": {
       "decision": "ignore",
-      "madeAt": 1591288727290,
-      "expiresAt": 1593880704884
+      "madeAt": 1594103543708,
+      "expiresAt": 1596695532690
     },
-    "1179|faucet>minimist": {
+    "1523|@mojaloop/central-services-health>@mojaloop/central-services-shared>@mojaloop/event-sdk>lodash": {
       "decision": "ignore",
-      "madeAt": 1591288732116,
-      "expiresAt": 1593880704884
+      "madeAt": 1594103543708,
+      "expiresAt": 1596695532690
     },
-    "1500|npm-audit-resolver>yargs-parser": {
-      "decision": "fix",
-      "madeAt": 1588329357868
+    "1523|@mojaloop/central-services-shared>@mojaloop/event-sdk>lodash": {
+      "decision": "ignore",
+      "madeAt": 1594103543708,
+      "expiresAt": 1596695532690
     },
-    "1500|npm-audit-resolver>yargs-unparser>yargs>yargs-parser": {
-      "decision": "postpone",
-      "madeAt": 1590583574245
+    "1523|@mojaloop/event-sdk>lodash": {
+      "decision": "ignore",
+      "madeAt": 1594103543708,
+      "expiresAt": 1596695532690
     },
-    "1500|npm-audit-resolver>audit-resolve-core>yargs-parser": {
+    "1523|@mojaloop/central-services-health>@mojaloop/central-services-shared>lodash": {
       "decision": "ignore",
-      "madeAt": 1590151976078,
-      "expiresAt": 1592743898520
+      "madeAt": 1594103543708,
+      "expiresAt": 1596695532690
     },
-    "1179|00unidentified>00unidentified>00unidentified>grpc>node-pre-gyp>mkdirp>minimist": {
+    "1523|@mojaloop/central-services-health>@mojaloop/central-services-shared>openapi-backend>lodash": {
       "decision": "ignore",
-      "madeAt": 1590151972658,
-      "expiresAt": 1592743898520
+      "madeAt": 1594103543708,
+      "expiresAt": 1596695532690
     },
-    "1179|00unidentified>00unidentified>grpc>node-pre-gyp>mkdirp>minimist": {
+    "1523|@mojaloop/central-services-health>@mojaloop/central-services-shared>openapi-backend>mock-json-schema>lodash": {
       "decision": "ignore",
-      "madeAt": 1590151972658,
-      "expiresAt": 1592743898520
+      "madeAt": 1594103543708,
+      "expiresAt": 1596695532690
     },
-    "1179|00unidentified>grpc>node-pre-gyp>mkdirp>minimist": {
+    "1523|@mojaloop/central-services-shared>openapi-backend>mock-json-schema>lodash": {
       "decision": "ignore",
-      "madeAt": 1590151972658,
-      "expiresAt": 1592743898520
+      "madeAt": 1594103543708,
+      "expiresAt": 1596695532690
     },
-    "1179|00unidentified>00unidentified>00unidentified>grpc>node-pre-gyp>tar>mkdirp>minimist": {
+    "1523|@mojaloop/central-services-shared>lodash": {
       "decision": "ignore",
-      "madeAt": 1590151972658,
-      "expiresAt": 1592743898520
+      "madeAt": 1594103543708,
+      "expiresAt": 1596695532690
     },
-    "1179|00unidentified>00unidentified>grpc>node-pre-gyp>tar>mkdirp>minimist": {
+    "1523|@mojaloop/central-services-shared>openapi-backend>lodash": {
       "decision": "ignore",
-      "madeAt": 1590151972658,
-      "expiresAt": 1592743898520
+      "madeAt": 1594103543708,
+      "expiresAt": 1596695532690
     },
-    "1179|00unidentified>grpc>node-pre-gyp>tar>mkdirp>minimist": {
+    "1523|@mojaloop/central-services-stream>@mojaloop/central-services-error-handling>@mojaloop/sdk-standard-components>request-promise-native>request-promise-core>lodash": {
       "decision": "ignore",
-      "madeAt": 1590151972658,
-      "expiresAt": 1592743898520
+      "madeAt": 1594103543708,
+      "expiresAt": 1596695532690
     },
-    "1179|00unidentified>00unidentified>00unidentified>grpc>node-pre-gyp>rc>minimist": {
+    "1523|@mojaloop/central-services-stream>@mojaloop/central-services-error-handling>lodash": {
       "decision": "ignore",
-      "madeAt": 1590151972658,
-      "expiresAt": 1592743898520
+      "madeAt": 1594103543708,
+      "expiresAt": 1596695532690
     },
-    "1179|00unidentified>00unidentified>grpc>node-pre-gyp>rc>minimist": {
+    "1523|knex>lodash": {
       "decision": "ignore",
-      "madeAt": 1590151972658,
-      "expiresAt": 1592743898520
+      "madeAt": 1594103543708,
+      "expiresAt": 1596695532690
     },
-    "1179|00unidentified>grpc>node-pre-gyp>rc>minimist": {
+    "1523|lodash": {
       "decision": "ignore",
-      "madeAt": 1590151972658,
-      "expiresAt": 1592743898520
+      "madeAt": 1594103543708,
+      "expiresAt": 1596695532690
     }
   },
   "rules": {},

config/default.json

@@ -83,6 +83,7 @@
     ]
   },
   "INTERNAL_TRANSFER_VALIDITY_SECONDS": "432000",
+  "ENABLE_ON_US_TRANSFERS": false,
   "CACHE": {
     "CACHE_ENABLED": false,
     "MAX_BYTE_SIZE": 10000000,

docker/central-ledger/default.json

@@ -83,6 +83,7 @@
     ]
   },
   "INTERNAL_TRANSFER_VALIDITY_SECONDS": "432000",
+  "ENABLE_ON_US_TRANSFERS": false,
   "CACHE": {
     "CACHE_ENABLED": false,
     "MAX_BYTE_SIZE": 10000000,

migrations/310503_participantLimit-indexes-composite.js

@@ -0,0 +1,38 @@
+/*****
+ License
+ --------------
+ Copyright © 2017 Bill & Melinda Gates Foundation
+ The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at
+ http://www.apache.org/licenses/LICENSE-2.0
+ Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
+ Contributors
+ --------------
+ This is the official list of the Mojaloop project contributors for this file.
+ Names of the original copyright holders (individuals or organizations)
+ should be listed with a '*' in the first column. People who have
+ contributed from an organization can be listed under the organization
+ that actually holds the copyright for their contributions (see the
+ Gates Foundation organization for an example). Those individuals should have
+ their names indented and be marked with a '-'. Email address can be added
+ optionally within square brackets <email>.
+ * Gates Foundation
+ - Name Surname <name.surname@gatesfoundation.com>
+
+ * ModusBox
+ - Shashikant Hirugade <shashikant.hirugade@modusbox.com>
+ --------------
+ ******/
+
+'use strict'
+
+exports.up = function (knex) {
+  return knex.schema.table('participantLimit', (t) => {
+    t.unique(['participantCurrencyId', 'participantLimitTypeId', 'isActive', 'participantLimitId'], 'participantLimit_unique_idx')
+  })
+}
+
+exports.down = function (knex) {
+  return knex.schema.table('participantLimit', (t) => {
+    t.dropUnique(['participantCurrencyId', 'participantLimitTypeId', 'isActive', 'participantLimitId'], 'participantLimit_unique_idx')
+  })
+}