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.

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

Merge hardfork branch into release branch for 6.0 release #2478

Merged
merged 286 commits into from
Oct 24, 2021
Merged

Conversation

abitmore
Copy link
Member

@abitmore abitmore commented Jun 20, 2021

Ready.

Note: as per #2478 (comment), create a new pull request to update sonar.branch.target after merge.

Fix liquidity pool deposit statistics
Upgrade Docker to Ubuntu Focal Fossa (20.04 LTS)
- list_samet_funds( limit, start_id )
- get_samet_funds_by_owner( account_name_or_id, limit, start_id )
- get_samet_funds_by_asset( asset_symbol_or_id, limit, start_id )
Move samet_fund_object reflection into cpp file
To save disk space and network bandwidth.
so that the fund owner would get notified when a fund got used.
Clear operation_results when generating block
Return owner account for SameT Fund borrow, repay
@abitmore abitmore marked this pull request as ready for review October 8, 2021 21:25
@@ -26,4 +26,4 @@ sonar.cfamily.cache.path=sonar_cache

# Decide which tree the current build belongs to in SonarCloud.
# Managed by the `set_sonar_branch*` script(s) when building with CI.
sonar.branch.target=develop
sonar.branch.target=hardfork
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change should not be applied to the release branch.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note: create a new PR to update it after merge.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If it is updated in release, when merging release back into hardfork, need to update hardfork again, and again, ...
Actually, it is hard to keep different files among different branches in Git - Git is not designed to address this issue.

const auto target_dir = _data_dir / "object_database";

if( fc::exists( tmp_dir ) )
fc::remove_all( tmp_dir );
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This actually kills the purpose of a lock (below).

There were 2 issues:
- stop should not be included in result according to documentation
- unexpected data may be returned when stop is behind start
@sonarcloud
Copy link

sonarcloud bot commented Oct 20, 2021

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 94 Code Smells

91.4% 91.4% Coverage
0.2% 0.2% Duplication

@abitmore abitmore merged commit 2dad82f into release Oct 24, 2021
Protocol Upgrade Release (6.0.0) automation moved this from In Development to Done Oct 24, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
No open projects
Development

Successfully merging this pull request may close these issues.

None yet

1 participant