chore: sync pisp/master to v11.3.0

.circleci/config.yml

@@ -3,6 +3,8 @@ version: 2.1
 orbs:
   anchore: anchore/anchore-engine@1.6.0
 
+# TODO: Further evaluate what changes need to be pulled from master.
+#       File has not been updated to v11.3.0
 ##
 # defaults
 #

.dockerignore

@@ -45,6 +45,9 @@ typings/
 # Optional eslint cache
 .eslintcache
 
+# ESlint config
+.eslintrc.json
+
 # Optional REPL history
 .node_repl_history
 

.gitignore

@@ -65,4 +65,9 @@ simulator.log
 # environments
 docker-compose.local.yml
 goldenpayerfsp
-goldenpayeefsp
+goldenpayeefsp
+
+#vscode configs
+.vscode/
+/init/.DS_Store
+/.DS_Store

LICENSE.md

@@ -1,10 +1,10 @@
 # LICENSE
 
-Copyright © 2017 Bill & Melinda Gates Foundation
+Copyright © 2020 Mojaloop 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](http://www.apache.org/licenses/LICENSE-2.0). You may obtain a copy of the License at
+The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0
+(the "License") and you may not use these files except in compliance with the [License](http://www.apache.org/licenses/LICENSE-2.0). 
 
-[http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0)
+You may obtain a copy of the License at [http://www.apache.org/licenses/LICENSE-2.0](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](http://www.apache.org/licenses/LICENSE-2.0).

README.md

@@ -15,6 +15,14 @@ A diagram showing the logical architecture of the simulator in a test scenario c
 
 # Use
 
+## Deploy with Helm and init containers (optional)
+Three init containers,
+- [onboard-hub-accounts](https://github.com/mojaloop/mojaloop-simulator/tree/master/init/onboard-hub-accounts)
+- [onboard-central-ledger](https://github.com/mojaloop/mojaloop-simulator/tree/master/init/onboard-central-ledger)
+- [onboard-msisdn-oracle](https://github.com/mojaloop/mojaloop-simulator/tree/master/init/onboard-msisdn-oracle)
+
+are provided for optional use and may make an automated deployment via Helm chart easier than otherwise. Please see the [example](docs/values-sims.example.yaml) config.
+
 ## Pre-requisites
   1. docker
   2. docker-compose

docs/values-sims.example.yaml

@@ -0,0 +1,139 @@
+prefix: ""
+
+# As per:
+# https://github.com/mojaloop/helm/blob/4afd91b4d4c976e1f8d60495c677f1ba48b30192/mojaloop-simulator/values.yaml#L130-L134
+ingress:
+  ingressPathRewriteRegex: /
+  annotations:
+    nginx.ingress.kubernetes.io/rewrite-target: /
+
+defaults:
+  config:
+    backend:
+      env:
+        FEE_MULTIPLIER: "0.00"
+    schemeAdapter:
+      image:
+        tag: v10.6.3
+      env:
+        VALIDATE_INBOUND_JWS: "true"
+        PEER_ENDPOINT: "interop-switch.huboperator.live"
+        JWS_SIGN: "true"
+        AUTO_ACCEPT_QUOTES: "true"
+        AUTO_ACCEPT_PARTY: "true"
+        EXPIRY_SECONDS: 30
+        REQUEST_PROCESSING_TIMEOUT_SECONDS: 20
+        USE_QUOTE_SOURCE_FSP_AS_TRANSFER_PAYEE_FSP: "true"
+        REJECT_TRANSFERS_ON_EXPIRED_QUOTES: "true"
+        ILP_SECRET: "Use2DwOwCea6VobuFScu3IcoEviS3Oth"
+  ingress:
+    enabled: true
+    hosts:
+      - "interop-switch.huboperator.live"
+
+simulators:
+  payerfsp:
+    config:
+      backend:    # These are optional keys covering
+        rules: [] # rules-engine configured rules
+      schemeAdapter:
+        initContainers:
+          - name: onboard-hub-accounts
+            image: &hub_account_onboard_image mojaloop/onboard-hub-accounts:v11.0.3
+            env:
+              - name: AUTH_BEARER_TOKEN
+                value: "6e35ccb3-ec22-51c9-b768-d12c3d289442"
+              - name: HOST_CENTRAL_LEDGER
+                value: "http://centralledger-service.ext-svcs.svc.cluster.local"
+              - name: HUB_OPERATOR_NAME
+                value: "hub_operator"
+              - name: ACCOUNTS
+                value: '[{ "type": "HUB_MULTILATERAL_SETTLEMENT", "currency": "USD" },{ "type": "HUB_RECONCILIATION", "currency": "USD" }]'
+          - name: onboard-central-ledger
+            image: &central_ledger_onboard_image mojaloop/onboard-central-ledger:v11.0.3
+            env:
+              - name: AUTH_BEARER_TOKEN
+                value: "6e35ccb3-ec22-51c9-b768-d12c3d289442"
+              - name: DFSP_CALLBACK_URL
+                value: "https://dfsp.huboperator.live:9999/payerfsp"
+              - name: DFSP_CURRENCY
+                value: "USD"
+              - name: DFSP_NAME
+                value: "payerfsp"
+              - name: FUNDS_IN_PREPARE_AMOUNT
+                value: "10000"
+              - name: HOST_CENTRAL_LEDGER
+                value: "http://centralledger-service.ext-svcs.svc.cluster.local"
+              - name: HUB_OPERATOR_NAME
+                value: "hub_operator"
+              - name: INITIAL_POSITION
+                value: "0"
+              - name: NET_DEBIT_CAP
+                value: "10000"
+              - name: NDC_ADJUSTMENT_EMAIL
+                value: "hub.operator@domain.com"
+              - name: NDC_THRESHOLD_BREACH_EMAIL
+                value: "hub.operator@domain.com"
+              - name: SETTLEMENT_TRANSFER_POSITION_CHANGE_EMAIL
+                value: "hub.operator@domain.com"
+          - name: onboard-msisdn-oracle
+            image: &msisdn_onboard_image mojaloop/onboard-msisdn-oracle:v11.0.3
+            env:
+              - name: HOST_PATHFINDER_ORACLE
+                value: pathfinder-oracle.ext-svcs.svc.cluster.local
+              - name: MSISDN_LIST
+                value: '[{"MSISDN":"12345678901","currency":"USD"}]'
+              - name: DFSP_NAME
+                value: payerfsp
+
+  payeefsp:
+    config:
+      schemeAdapter:
+        initContainers:
+          - name: onboard-hub-accounts
+            image: *hub_account_onboard_image
+            env:
+              - name: AUTH_BEARER_TOKEN
+                value: "6e35ccb3-ec22-51c9-b768-d12c3d289442"
+              - name: HOST_CENTRAL_LEDGER
+                value: "http://centralledger-service.ext-svcs.svc.cluster.local"
+              - name: HUB_OPERATOR_NAME
+                value: "hub_operator"
+              - name: ACCOUNTS
+                value: '[{ "type": "HUB_MULTILATERAL_SETTLEMENT", "currency": "XOF" },{ "type": "HUB_RECONCILIATION", "currency": "XOF" }]'
+          - name: onboard-central-ledger
+            image: *central_ledger_onboard_image
+            env:
+              - name: AUTH_BEARER_TOKEN
+                value: "6e35ccb3-ec22-51c9-b768-d12c3d289442"
+              - name: DFSP_CALLBACK_URL
+                value: "https://dfsp.huboperator.live:9999/payeefsp"
+              - name: DFSP_CURRENCY
+                value: "XOF"
+              - name: DFSP_NAME
+                value: "payeefsp"
+              - name: FUNDS_IN_PREPARE_AMOUNT
+                value: "10000"
+              - name: HOST_CENTRAL_LEDGER
+                value: "http://centralledger-service.ext-svcs.svc.cluster.local"
+              - name: HUB_OPERATOR_NAME
+                value: "hub_operator"
+              - name: INITIAL_POSITION
+                value: "0"
+              - name: NET_DEBIT_CAP
+                value: "10000"
+              - name: NDC_ADJUSTMENT_EMAIL
+                value: "hub.operator@domain.com"
+              - name: NDC_THRESHOLD_BREACH_EMAIL
+                value: "hub.operator@domain.com"
+              - name: SETTLEMENT_TRANSFER_POSITION_CHANGE_EMAIL
+                value: "hub.operator@domain.com"
+          - name: onboard-msisdn-oracle
+            image: *msisdn_onboard_image
+            env:
+              - name: HOST_PATHFINDER_ORACLE
+                value: pathfinder-oracle.ext-svcs.svc.cluster.local
+              - name: MSISDN_LIST
+                value: '[{"MSISDN":"23456789012","currency":"USD"}]'
+              - name: DFSP_NAME
+                value: payeefsp