Skip to content

Commit

Permalink
refactor: update pisp/master (#781)
Browse files Browse the repository at this point in the history
* fix for python error in CI (#733)

Co-authored-by: Shashi <shashikant.hirugade@modusbox.com>

* Ensure 'timeout-reserved' notification action passes through and not converted to 'abort' action (#736)

* Update CS shared (#737)

* Feature/1332 enable on-us transfers (#738)

* Added ENABLE_ON_US_TRANSFERS

* Bumped up the version

* Feature/otc 525 implement get transaction object by transfer (#735)

* OTC-525 Implement GET transaction Object by transferId
Changes:

Updated swagger def to include new endpoints for:
- Get transaction by transfer id
- Post ledger entry

Added new method for:
- Get transaction by transfer id

Added unit tests for Get transaction by transfer id

* OTC-525 Implement GET transaction Object by transferId
Bumput up versions

* OTC-525 Implement GET transaction Object by transferId
Resolved dependency updates

* OTC-525 Implement GET transaction Object by transferId

* OTC-525 Implement GET transaction Object by transferId

Changes:

Updated swagger def to include new endpoints for:
- Get transaction by transfer id

Added new method for:
- Get transaction by transfer id

Added unit tests for Get transaction by transfer id

* changed docker dependency in circle CI image scan from python-dev to python3-dev (#741)

* Updated python in some other places in circle CI (#742)

* Fix the image scan step in circle CI

* Resolved audit checks

* Feature/#1335 aborted on put (#740)

* added error log if action REJECT comes into fulfil handler

Co-authored-by: Valentin <valentin.genev@modusbox.com>

* Bugfix/deadlock on adjust limits (#745)

* added unique index on participantLimit and logging

* added unique index on participantLimit and logging

* resolve audit issues

* fixed coverage tests

Co-authored-by: Shashi <shashikant.hirugade@modusbox.com>

* Updated dependencies and product version for issue: mojaloop/project#1378 (#747)

* Update error message  (#749)

* Update error message when Payer FSP and Payee FSP are the same and on-us is not enabled.. (Added text "FSP" to specify)

* Updated unit test

* #1423: Bulk transfers error processing in Central Ledger (#743)

* Updates for bulk error processing

* Bump version

* Updates for bulk transfer error processing

* Updates for bulk transfer error processing

* More updates for bulk error processing

* changes to cater for bulk_abort

* updated central-services-shared

* Updates for bulk error processing

* Add unit test for BULK_ABORT branch in transfer fulfil handler

* Add unit test for BULK_ABORT branch in transfer facade

* Small fix for position handler test for BULK_ABORT branch

Co-authored-by: Rajiv Mothilal <rajivmothilal@gmail.com>

* Bump version for release (#750)

* Feature/#1334 patch request notif (#751)

* added handling of request for notification by payee functionality
* improved coverage and added missing action letter

Co-authored-by: Valentin <valentin.genev@modusbox.com>

* Feature/1468 bulk quotes endpoints (#761)

* version change

* Added  FSPIOP_CALLBACK_URL_BULK_QUOTES endpoint to seeds and updated population scripts and created one for local legacy simulator
updated dependencies

* updated dependencies to resolve audit issues

* Feature/#1375: GET bulk transfer implementation (#760)

* Add bulk get topic and handler

* Implement GET bulk transfer logic

* Restore default config

* Add unit tests

* Bump version

* More bug fixes

* Fix unit test

* ensure error code is returned as string and not number for bulk get

* Add bulk get to handlers list for cli startup (#765)

* Reset package-lock.json to fix bug with version update for AJV (#766)

* SemVar fix (#767)

* Fix error callback for bulk transfers REJECTED scenario (#768)

* Correct FSPIOP API version for admin API (#769)

* #1547: Ignore "RESERVED" transferState from v1.0 clients on fulfill callback (#770)

* Ignore RESERVE transferState from v1.0 clients on fulfil callback

* Update package.json

Co-authored-by: Sam <10507686+elnyry-sam-k@users.noreply.github.com>

Co-authored-by: Sam <10507686+elnyry-sam-k@users.noreply.github.com>

* Bump version to v111.1.2 to fix broken release (#771)

* #1547: Fail transfer fulfill with "RESERVED" state and v1.0 content-type (#773)

* Update dependencies

* Bump version

* Fix integration tests

* #1547: Update dependencies (central-object-store etc.) (#774)

* Update dependencies

* Bump version

* fix: package.json & package-lock.json to reduce vulnerabilities (#775)

The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-JS-LODASH-590103

* Fix bug in volumes of temp_curl service (#778)

* Edited CI to build PISP docker image. (#734)

* Edited CI to build PISP docker image.

* Addressed comments.

* Updated ci to python 3. (#744)

* Update pisp/master (#755)

* fix for python error in CI (#733)

Co-authored-by: Shashi <shashikant.hirugade@modusbox.com>

* Ensure 'timeout-reserved' notification action passes through and not converted to 'abort' action (#736)

* Update CS shared (#737)

* Feature/1332 enable on-us transfers (#738)

* Added ENABLE_ON_US_TRANSFERS

* Bumped up the version

* Feature/otc 525 implement get transaction object by transfer (#735)

* OTC-525 Implement GET transaction Object by transferId
Changes:

Updated swagger def to include new endpoints for:
- Get transaction by transfer id
- Post ledger entry

Added new method for:
- Get transaction by transfer id

Added unit tests for Get transaction by transfer id

* OTC-525 Implement GET transaction Object by transferId
Bumput up versions

* OTC-525 Implement GET transaction Object by transferId
Resolved dependency updates

* OTC-525 Implement GET transaction Object by transferId

* OTC-525 Implement GET transaction Object by transferId

Changes:

Updated swagger def to include new endpoints for:
- Get transaction by transfer id

Added new method for:
- Get transaction by transfer id

Added unit tests for Get transaction by transfer id

* changed docker dependency in circle CI image scan from python-dev to python3-dev (#741)

* Updated python in some other places in circle CI (#742)

* Fix the image scan step in circle CI

* Resolved audit checks

* Feature/#1335 aborted on put (#740)

* added error log if action REJECT comes into fulfil handler

Co-authored-by: Valentin <valentin.genev@modusbox.com>

* Bugfix/deadlock on adjust limits (#745)

* added unique index on participantLimit and logging

* added unique index on participantLimit and logging

* resolve audit issues

* fixed coverage tests

Co-authored-by: Shashi <shashikant.hirugade@modusbox.com>

* Updated dependencies and product version for issue: mojaloop/project#1378 (#747)

* Update error message  (#749)

* Update error message when Payer FSP and Payee FSP are the same and on-us is not enabled.. (Added text "FSP" to specify)

* Updated unit test

* #1423: Bulk transfers error processing in Central Ledger (#743)

* Updates for bulk error processing

* Bump version

* Updates for bulk transfer error processing

* Updates for bulk transfer error processing

* More updates for bulk error processing

* changes to cater for bulk_abort

* updated central-services-shared

* Updates for bulk error processing

* Add unit test for BULK_ABORT branch in transfer fulfil handler

* Add unit test for BULK_ABORT branch in transfer facade

* Small fix for position handler test for BULK_ABORT branch

Co-authored-by: Rajiv Mothilal <rajivmothilal@gmail.com>

* Bump version for release (#750)

* Feature/#1334 patch request notif (#751)

* added handling of request for notification by payee functionality
* improved coverage and added missing action letter

Co-authored-by: Valentin <valentin.genev@modusbox.com>

* chore(package): update contributors list & deps

* chore: audit & deps update

Co-authored-by: shashi165 <33355509+shashi165@users.noreply.github.com>
Co-authored-by: Shashi <shashikant.hirugade@modusbox.com>
Co-authored-by: Steven Oderayi <oderayi@gmail.com>
Co-authored-by: vijayg10 <33152110+vijayg10@users.noreply.github.com>
Co-authored-by: lazolalucas <lazolalucas@users.noreply.github.com>
Co-authored-by: Valentin Genev <vgenev@gmail.com>
Co-authored-by: Valentin <valentin.genev@modusbox.com>
Co-authored-by: Adrian Enns <ennsak@gmail.com>
Co-authored-by: Sam <10507686+elnyry-sam-k@users.noreply.github.com>
Co-authored-by: Rajiv Mothilal <rajivmothilal@gmail.com>

* chore: add thirdparty endpoints to database seeds (#779)

* chore: add thirdparty endpoints to database seeds

* chore: update dependencies for vulnerabilities

* refactor: change name length to accomodate new endpoints

* chore: sync package-lock

* chore: remove migrations and shorten endpoint names

* chore: fix find and replace error

* chore: fix spelling

* chore: update packages

* chore: sync package-lock

Co-authored-by: shashi165 <33355509+shashi165@users.noreply.github.com>
Co-authored-by: Shashi <shashikant.hirugade@modusbox.com>
Co-authored-by: Steven Oderayi <oderayi@gmail.com>
Co-authored-by: vijayg10 <33152110+vijayg10@users.noreply.github.com>
Co-authored-by: lazolalucas <lazolalucas@users.noreply.github.com>
Co-authored-by: Valentin Genev <vgenev@gmail.com>
Co-authored-by: Valentin <valentin.genev@modusbox.com>
Co-authored-by: Adrian Enns <ennsak@gmail.com>
Co-authored-by: Sam <10507686+elnyry-sam-k@users.noreply.github.com>
Co-authored-by: Rajiv Mothilal <rajivmothilal@gmail.com>
Co-authored-by: Snyk bot <github+bot@snyk.io>
Co-authored-by: Ali Behnamfard <abehnamfard@users.noreply.github.com>
Co-authored-by: eoln <2881004+eoln@users.noreply.github.com>
  • Loading branch information
14 people authored Sep 4, 2020
1 parent 343942c commit 3935290
Show file tree
Hide file tree
Showing 23 changed files with 1,115 additions and 291 deletions.
1 change: 1 addition & 0 deletions .ncurc.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"reject": [
"hapi-swagger",
"tape",
"ilp-packet"
]
Expand Down
166 changes: 0 additions & 166 deletions audit-resolve.json
Original file line number Diff line number Diff line change
@@ -1,166 +0,0 @@
{
"decisions": {
"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
},
"1523|@mojaloop/central-services-health>@mojaloop/central-services-shared>@mojaloop/central-services-logger>winston>async>lodash": {
"decision": "ignore",
"madeAt": 1594103543707,
"expiresAt": 1596695532690
},
"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
},
"1523|@mojaloop/event-sdk>@mojaloop/central-services-logger>winston>async>lodash": {
"decision": "ignore",
"madeAt": 1594103543707,
"expiresAt": 1596695532690
},
"1523|@mojaloop/central-services-logger>winston>async>lodash": {
"decision": "ignore",
"madeAt": 1594103543707,
"expiresAt": 1596695532690
},
"1523|@mojaloop/central-services-shared>@mojaloop/central-services-logger>winston>async>lodash": {
"decision": "ignore",
"madeAt": 1594103543707,
"expiresAt": 1596695532690
},
"1523|@mojaloop/central-services-health>@mojaloop/central-services-shared>@mojaloop/event-sdk>winston>async>lodash": {
"decision": "ignore",
"madeAt": 1594103543708,
"expiresAt": 1596695532690
},
"1523|@mojaloop/central-services-shared>@mojaloop/event-sdk>winston>async>lodash": {
"decision": "ignore",
"madeAt": 1594103543708,
"expiresAt": 1596695532690
},
"1523|@mojaloop/event-sdk>winston>async>lodash": {
"decision": "ignore",
"madeAt": 1594103543708,
"expiresAt": 1596695532690
},
"1523|@mojaloop/central-services-stream>@mojaloop/central-services-logger>winston>async>lodash": {
"decision": "ignore",
"madeAt": 1594103543708,
"expiresAt": 1596695532690
},
"1523|@mojaloop/forensic-logging-client>@mojaloop/central-services-logger>winston>async>lodash": {
"decision": "ignore",
"madeAt": 1594103543708,
"expiresAt": 1596695532690
},
"1523|@mojaloop/central-services-database>knex>lodash": {
"decision": "ignore",
"madeAt": 1594103543708,
"expiresAt": 1596695532690
},
"1523|@mojaloop/central-services-database>lodash": {
"decision": "ignore",
"madeAt": 1594103543708,
"expiresAt": 1596695532690
},
"1523|@mojaloop/central-services-error-handling>lodash": {
"decision": "ignore",
"madeAt": 1594103543708,
"expiresAt": 1596695532690
},
"1523|@mojaloop/central-services-health>@mojaloop/central-services-error-handling>lodash": {
"decision": "ignore",
"madeAt": 1594103543708,
"expiresAt": 1596695532690
},
"1523|@mojaloop/central-services-health>@mojaloop/central-services-shared>@mojaloop/central-services-error-handling>lodash": {
"decision": "ignore",
"madeAt": 1594103543708,
"expiresAt": 1596695532690
},
"1523|@mojaloop/central-services-shared>@mojaloop/central-services-error-handling>lodash": {
"decision": "ignore",
"madeAt": 1594103543708,
"expiresAt": 1596695532690
},
"1523|@mojaloop/central-services-health>@mojaloop/central-services-shared>@mojaloop/event-sdk>lodash": {
"decision": "ignore",
"madeAt": 1594103543708,
"expiresAt": 1596695532690
},
"1523|@mojaloop/central-services-shared>@mojaloop/event-sdk>lodash": {
"decision": "ignore",
"madeAt": 1594103543708,
"expiresAt": 1596695532690
},
"1523|@mojaloop/event-sdk>lodash": {
"decision": "ignore",
"madeAt": 1594103543708,
"expiresAt": 1596695532690
},
"1523|@mojaloop/central-services-health>@mojaloop/central-services-shared>lodash": {
"decision": "ignore",
"madeAt": 1594103543708,
"expiresAt": 1596695532690
},
"1523|@mojaloop/central-services-health>@mojaloop/central-services-shared>openapi-backend>lodash": {
"decision": "ignore",
"madeAt": 1594103543708,
"expiresAt": 1596695532690
},
"1523|@mojaloop/central-services-health>@mojaloop/central-services-shared>openapi-backend>mock-json-schema>lodash": {
"decision": "ignore",
"madeAt": 1594103543708,
"expiresAt": 1596695532690
},
"1523|@mojaloop/central-services-shared>openapi-backend>mock-json-schema>lodash": {
"decision": "ignore",
"madeAt": 1594103543708,
"expiresAt": 1596695532690
},
"1523|@mojaloop/central-services-shared>lodash": {
"decision": "ignore",
"madeAt": 1594103543708,
"expiresAt": 1596695532690
},
"1523|@mojaloop/central-services-shared>openapi-backend>lodash": {
"decision": "ignore",
"madeAt": 1594103543708,
"expiresAt": 1596695532690
},
"1523|@mojaloop/central-services-stream>@mojaloop/central-services-error-handling>@mojaloop/sdk-standard-components>request-promise-native>request-promise-core>lodash": {
"decision": "ignore",
"madeAt": 1594103543708,
"expiresAt": 1596695532690
},
"1523|@mojaloop/central-services-stream>@mojaloop/central-services-error-handling>lodash": {
"decision": "ignore",
"madeAt": 1594103543708,
"expiresAt": 1596695532690
},
"1523|knex>lodash": {
"decision": "ignore",
"madeAt": 1594103543708,
"expiresAt": 1596695532690
},
"1523|lodash": {
"decision": "ignore",
"madeAt": 1594103543708,
"expiresAt": 1596695532690
}
},
"rules": {},
"version": 1
}
23 changes: 23 additions & 0 deletions config/default.json
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,29 @@
"auto.offset.reset": "earliest"
}
}
},
"GET": {
"config": {
"options": {
"mode": 2,
"batchSize": 1,
"pollFrequency": 10,
"recursiveTimeout": 100,
"messageCharset": "utf8",
"messageAsJSON": true,
"sync": true,
"consumeTimeout": 1000
},
"rdkafkaConf": {
"client.id": "cl-con-bulk-get",
"group.id": "cl-group-bulk-get",
"metadata.broker.list": "localhost:9092",
"socket.keepalive.enable": true
},
"topicConf": {
"auto.offset.reset": "earliest"
}
}
}
},
"TRANSFER": {
Expand Down
4 changes: 2 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -101,10 +101,10 @@ services:
links:
- mockserver
volumes:
- ./docker/wait-for/wait-for-mockserver.sh:/opt/wait-for/wait-for-mockserver.sh
- ./docker/wait-for:/opt/wait-for
entrypoint: [ "sh", "-c" ]
command:
- /opt/wait-for-mockserver.sh
- /opt/wait-for/wait-for-mockserver.sh
environment: []
networks:
- cl-mojaloop-net
Expand Down
23 changes: 23 additions & 0 deletions docker/central-ledger/default.json
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,29 @@
"auto.offset.reset": "earliest"
}
}
},
"GET": {
"config": {
"options": {
"mode": 2,
"batchSize": 1,
"pollFrequency": 10,
"recursiveTimeout": 100,
"messageCharset": "utf8",
"messageAsJSON": true,
"sync": true,
"consumeTimeout": 1000
},
"rdkafkaConf": {
"client.id": "cl-con-bulk-get",
"group.id": "cl-group-bulk-get",
"metadata.broker.list": "localhost:29092",
"socket.keepalive.enable": true
},
"topicConf": {
"auto.offset.reset": "earliest"
}
}
}
},
"TRANSFER": {
Expand Down
Loading

0 comments on commit 3935290

Please sign in to comment.