Skip to content

Commit

Permalink
OriginTrail Devnet Prerelease v6.5.1 Hotfix 2 (#3251)
Browse files Browse the repository at this point in the history
* Update installer.sh (#3224)

- Added base blockchain integration.

Co-authored-by: Mihajlo Pavlovic <mihajlo.pavlovic@origin-trail.com>

* Base mainnet integration (#3229)

* Add hub contract

* Update set scripts

* Remove hotfix

* Update package-lock

* Fixed removal of the AbortSignal event listener (#3227)

* Increasing number of service agreements considered in command and command executor  (#3241)

* Increase number of service agreements for commits fetched from DB

* Increase number of service agreements for commits fetched from DB

* Increse limit and command queue pararelism

* Add dynamic scaling factor when scheduling commits and proofs

* Migration to remove duplicate service agreements (#3240)

* Add findDuplicateServiceAgreement function

* Expand query in findDuplicateServiceAgreement function

* Add RemoveDuplicateServiceAgreementMigration

* Fix migration queries

* Migration tested and working

* version bump

* Add default connection pool to node (#3238)

* Prune corrupted service agreement (#3237)

* Add removeServiceAgreementsByBlockchainAndContract function

* Change removeServiceAgreementsByBlockchainAndContract to remove all service agreements except ones with  given contract

* Add service agreement pruning migration

* Fix epoch check scaling factor

* Migration fixes

* Fix/service agreement prunning migration fix (#3250)

* Fix missing return in getCountOfServiceAgreementsByBlockchainAndContract

* Add commnet for removeServiceAgreementsByBlockchainAndContract

* Version bump

---------

Co-authored-by: Samuel Wamala <35219064+swamala@users.noreply.github.com>
Co-authored-by: Uladzislau Hubar <71610423+u-hubar@users.noreply.github.com>
  • Loading branch information
3 people authored Jul 19, 2024
1 parent 1fc9711 commit 9d3d9a4
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "origintrail_node",
"version": "6.5.1+hotfix.1",
"version": "6.5.1+hotfix.2",
"description": "OTNode V6",
"main": "index.js",
"type": "module",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,7 @@ class ServiceAgreementRepository {
}

async getCountOfServiceAgreementsByBlockchainAndContract(blockchainId, contract) {
await this.model.count({
return this.model.count({
where: {
blockchainId,
assetStorageContractAddress: {
Expand All @@ -298,6 +298,7 @@ class ServiceAgreementRepository {
});
}

// Sequelize destroy method doesn't support limit
async removeServiceAgreementsByBlockchainAndContract(blockchainId, contract) {
const query = `
DELETE FROM service_agreement
Expand Down

0 comments on commit 9d3d9a4

Please sign in to comment.