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

OriginTrail Devnet Prerelease v6.5.1 Hotfix 2 #3252

Merged
merged 11 commits into from
Jul 19, 2024
Merged

OriginTrail Devnet Prerelease v6.5.1 Hotfix 2 #3252

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
f3e2a00
OriginTrail Devnet prerelease v6.5.0 (#3217)
Mihajlo-Pavlovic Jun 21, 2024
2cbb353
Merge pull request #3222 from OriginTrail/v6/development-network
NZT48 Jun 25, 2024
e6fdbc0
Fix merge conflicts
NZT48 Jun 25, 2024
3e78f31
Merge pull request #3220 from OriginTrail/v6/develop
NZT48 Jun 25, 2024
cad728e
OriginTrail Devnet Preelease v6.5.0 (#3230)
Mihajlo-Pavlovic Jul 4, 2024
cafd0dc
OriginTrail Devnet Preelease v6.5.1 (#3242)
Mihajlo-Pavlovic Jul 17, 2024
076aea3
Merge branch 'v6/development-network' into v6/prerelease/devnet
Mihajlo-Pavlovic Jul 17, 2024
8e59fba
OriginTrail Devnet prerelease v6.5.1 Hotfix 1 (#3246)
Mihajlo-Pavlovic Jul 18, 2024
1fc9711
Merge branch 'v6/development-network' into v6/prerelease/devnet
Mihajlo-Pavlovic Jul 18, 2024
9d3d9a4
OriginTrail Devnet Prerelease v6.5.1 Hotfix 2 (#3251)
Mihajlo-Pavlovic Jul 19, 2024
9e211d2
Merge branch 'v6/development-network' into v6/prerelease/devnet
Mihajlo-Pavlovic Jul 19, 2024
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
4 changes: 2 additions & 2 deletions package-lock.json
View file
Open in desktop

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
View file
Open in desktop
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
3 changes: 2 additions & 1 deletion src/modules/repository/implementation/sequelize/repositories/service-agreement-repository.js
View file
Open in desktop
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
Loading