Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: fx implementation #412

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

feat: fx implementation #412

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6dd60c6
feat(mojaloop/#3984): parameterize switch id (#406)
oderayi Jun 26, 2024
ff38978
fix: fix for database insert failures (#410)
oderayi Sep 24, 2024
d3210f2
chore: dependencies
kalinkrustev Nov 14, 2024
1e9a19b
chore: fix dependencies
kalinkrustev Jan 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ defaults_docker_Dependencies: &defaults_docker_Dependencies |
apk --no-cache add ca-certificates
apk --no-cache add curl
apk --no-cache add openssh-client
apk --no-cache add -t build-dependencies make gcc g++ python3 libtool autoconf automake jq
apk --no-cache add -t build-dependencies make gcc g++ python3 py-setuptools libtool autoconf automake jq
apk --no-cache add -t openssl ncurses coreutils libgcc linux-headers grep util-linux binutils findutils
apk --no-cache add librdkafka-dev

Expand Down Expand Up @@ -801,7 +801,9 @@ workflows:
- build-local
filters:
tags:
only: /.*/
# only: /.*/
# disabling integration tests for snapshots until tests are fixed for fx compatibility
ignore: /v[0-9]+(\.[0-9]+)*(\-snapshot(\.[0-9]+)?)?/
branches:
ignore:
- /feature*/
Expand Down
4 changes: 4 additions & 0 deletions .ncurc.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,11 @@ reject: [
"@mojaloop/central-ledger",
"@mojaloop/central-services-shared",
"@mojaloop/central-services-stream",
# upgrading @mojaloop/central-services-error-handling beyond v12.0.7 causes peer dependencies conflict.
# can be upgraded when @mojaloop/central-services-health and @mojaloop/sdk-standard-components are upgraded.
"@mojaloop/central-services-error-handling",
"@mojaloop/event-sdk",
"@mojaloop/sdk-standard-components",
# prevents CI from running package install in v6.1.1
"sinon"
]
2 changes: 1 addition & 1 deletion .nycrc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@ reporter: [
exclude: [
"**/node_modules/**",
'**/migrations/**',
'**/docs/**',
'**/docs/**'
]
58 changes: 34 additions & 24 deletions audit-ci.jsonc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,29 +5,39 @@
"moderate": true,
"allowlist": [ // NOTE: Please add as much information as possible to any items added to the allowList
// Currently no fixes available for the following
"GHSA-v88g-cgmw-v5xw",
"GHSA-mg85-8mv5-ffjr",
"GHSA-phwq-j96m-2c2q",
"GHSA-7hx8-2rxv-66xv",
"GHSA-282f-qqgm-c34q",
"GHSA-8cf7-32gw-wr33",
"GHSA-hjrf-2m68-5959",
"GHSA-qwph-4952-7xr6",
"GHSA-4jv9-3563-23j3",
"GHSA-6vfc-qv3f-vr6c",
"GHSA-mjxr-4v3x-q3m4",
"GHSA-rjqq-98f6-6j3r",
"GHSA-g64q-3vg8-8f93",
"GHSA-5854-jvxx-2cg9",
"GHSA-2mvq-xp48-4c77",
"GHSA-w5p7-h5w8-2hfq",
"GHSA-qgmg-gppg-76g5",
"GHSA-p9pc-299p-vxgp",
"GHSA-7fh5-64p2-3v2j",
"GHSA-67hx-6x53-jw92",
"GHSA-wc69-rhjr-hc9g",
"GHSA-g954-5hwp-pp24",
"GHSA-h755-8qp9-cq85",
"GHSA-f9xv-q969-pqx4"
"GHSA-282f-qqgm-c34q", // https://github.com/advisories/GHSA-282f-qqgm-c34q
"GHSA-2mvq-xp48-4c77", // https://github.com/advisories/GHSA-2mvq-xp48-4c77
"GHSA-2p57-rm9w-gvfp", // https://github.com/advisories/GHSA-2p57-rm9w-gvfp
"GHSA-4jv9-3563-23j3", // https://github.com/advisories/GHSA-4jv9-3563-23j3
"GHSA-5854-jvxx-2cg9", // https://github.com/advisories/GHSA-5854-jvxx-2cg9
"GHSA-6vfc-qv3f-vr6c", // https://github.com/advisories/GHSA-6vfc-qv3f-vr6c
"GHSA-7fh5-64p2-3v2j", // https://github.com/advisories/GHSA-7fh5-64p2-3v2j
"GHSA-7hx8-2rxv-66xv", // https://github.com/advisories/GHSA-7hx8-2rxv-66xv
"GHSA-7v5v-9h63-cj86", // https://github.com/advisories/GHSA-7v5v-9h63-cj86
"GHSA-8cf7-32gw-wr33", // https://github.com/advisories/GHSA-8cf7-32gw-wr33
"GHSA-8hc4-vh64-cxmj", // https://github.com/advisories/GHSA-8hc4-vh64-cxmj
"GHSA-952p-6rrq-rcjv", // https://github.com/advisories/GHSA-952p-6rrq-rcjv
"GHSA-9wv6-86v2-598j", // https://github.com/advisories/GHSA-9wv6-86v2-598j
"GHSA-c429-5p7v-vgjp", // https://github.com/advisories/GHSA-c429-5p7v-vgjp
"GHSA-cgfm-xwp7-2cvr", // https://github.com/advisories/GHSA-cgfm-xwp7-2cvr
"GHSA-cm22-4g7w-348p", // https://github.com/advisories/GHSA-cm22-4g7w-348p
"GHSA-g64q-3vg8-8f93", // https://github.com/advisories/GHSA-g64q-3vg8-8f93
"GHSA-ghr5-ch3p-vcr6", // https://github.com/advisories/GHSA-ghr5-ch3p-vcr6
"GHSA-grv7-fg5c-xmjg", // https://github.com/advisories/GHSA-grv7-fg5c-xmjg
"GHSA-hjrf-2m68-5959", // https://github.com/advisories/GHSA-hjrf-2m68-5959
"GHSA-m6fv-jmcg-4jfg", // https://github.com/advisories/GHSA-m6fv-jmcg-4jfg
"GHSA-mg85-8mv5-ffjr", // https://github.com/advisories/GHSA-mg85-8mv5-ffjr
"GHSA-mjxr-4v3x-q3m4", // https://github.com/advisories/GHSA-mjxr-4v3x-q3m4
"GHSA-p9pc-299p-vxgp", // https://github.com/advisories/GHSA-p9pc-299p-vxgp
"GHSA-phwq-j96m-2c2q", // https://github.com/advisories/GHSA-phwq-j96m-2c2q
"GHSA-qgmg-gppg-76g5", // https://github.com/advisories/GHSA-qgmg-gppg-76g5
"GHSA-qw6h-vgh9-j6wx", // https://github.com/advisories/GHSA-qw6h-vgh9-j6wx
"GHSA-qwcr-r2fm-qrc7", // https://github.com/advisories/GHSA-qwcr-r2fm-qrc7
"GHSA-qwph-4952-7xr6", // https://github.com/advisories/GHSA-qwph-4952-7xr6
"GHSA-rjqq-98f6-6j3r", // https://github.com/advisories/GHSA-rjqq-98f6-6j3r
"GHSA-rm97-x556-q36h", // https://github.com/advisories/GHSA-rm97-x556-q36h
"GHSA-v88g-cgmw-v5xw", // https://github.com/advisories/GHSA-v88g-cgmw-v5xw
"GHSA-3xgq-45jj-v275", // https://github.com/advisories/GHSA-3xgq-45jj-v275
"GHSA-w5p7-h5w8-2hfq" // https://github.com/advisories/GHSA-w5p7-h5w8-2hfq
]
}
11 changes: 6 additions & 5 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: "3.7"

networks:
cs-mojaloop-net:
name: cs-mojaloop-net
Expand Down Expand Up @@ -36,7 +34,9 @@ services:
interval: 30s

central-ledger:
image: mojaloop/central-ledger:latest
# image: mojaloop/central-ledger:v17.7.0-snapshot.16
# image: mojaloop/central-ledger:v17.8.0-snapshot.27
image: mojaloop/central-ledger:v17.8.0-snapshot.30
container_name: cs_central-ledger
command:
- "sh"
Expand All @@ -60,7 +60,8 @@ services:
interval: 30s

ml-api-adapter:
image: mojaloop/ml-api-adapter:latest
# image: mojaloop/ml-api-adapter:v14.1.0-snapshot.13
image: mojaloop/ml-api-adapter:v14.1.0.643-snapshot.0
container_name: cs_ml-api-adapter
command:
- "sh"
Expand Down Expand Up @@ -106,7 +107,7 @@ services:
interval: 30s

simulator:
image: mojaloop/simulator:latest
image: mojaloop/simulator:v12.3.0-snapshot.3
container_name: cs_simulator
depends_on:
- ml-api-adapter
Expand Down
9 changes: 9 additions & 0 deletions docker/central-ledger/default.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,15 @@
"MAX_BYTE_SIZE": 10000000,
"EXPIRES_IN_MS": 1000
},
"PROXY_CACHE": {
"enabled": false,
"type": "redis-cluster",
"proxyConfig": {
"cluster": [
{ "host": "localhost", "port": 6379 }
]
}
},
"KAFKA": {
"TOPIC_TEMPLATES": {
"PARTICIPANT_TOPIC_TEMPLATE": {
Expand Down
5 changes: 4 additions & 1 deletion docker/ml-api-adapter/default.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
{
"HUB_PARTICIPANT": {
"ID": 1,
"NAME": "Hub"
},
"PORT": 3000,
"HOSTNAME": "http://ml-api-adapter",
"ENDPOINT_SOURCE_URL": "http://central-ledger:3001",
Expand All @@ -13,7 +17,6 @@
},
"JWS": {
"JWS_SIGN": false,
"FSPIOP_SOURCE_TO_SIGN": "switch",
"JWS_SIGNING_KEY_PATH": "secrets/jwsSigningKey.key"
}
},
Expand Down
Loading