Resolve conflicts #3205
Merged
Resolve conflicts #3205
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
OriginTrail Testnet Prerelease v6.3.0
OriginTrail Testnet Prerelease v6.3.0.Hotfix 1
OriginTrail Testnet Prerelease v6.3.0.Hotfix 2
Version updated - removed hotfix from version
OriginTrail Testnet Prerelease v6.4.0
* OriginTrail Devnet Prerelease v6.4.0 Hotfix 4 (#3185) * OriginTrail Mainnet Prerelease v6.1.1 (#2853) * Upp sharding table migration enabled * Update event insert in chunks * version bump * Add migration for makring staking events as processed * Updated migration executor added mark staking events as processed migration * Updated migration added await on get latest block * Updated migration for all contracts * Migration updated --------- Co-authored-by: NZT48 <nikolaztodorovic26@gmail.com> * Revert "OriginTrail Devnet Prerelease v6.2.0 Hotfix 10" * Revert "Merge pull request #2965 from OriginTrail/revert-2964-v6/develop" This reverts commit d7cd260, reversing changes made to 491baf8. * Fix * Fix/handle state finalized events (#3184) * Fix getKnowledgeAssetLocatorFromParanetId call in handleStateFinalizedEvents * Version bump * Correct version * Add more fixes * Fix contract call getKnowledgeAssetLocatorFromParanetId * Fix getKnowledgeAssetLocatorFromParanetId * Add check on state finalized to confirm that paranet repo exists * Fix getKALocator from Paranet ID in handling state finalized * Fix package lock --------- Co-authored-by: NZT48 <nikolaztodorovic26@gmail.com> --------- Co-authored-by: djordjekovac <djordje.kovacevic@origin-trail.com> Co-authored-by: NZT48 <nikolaztodorovic26@gmail.com> Co-authored-by: Branimir Rakic <33914812+branarakic@users.noreply.github.com> * OriginTrail Devnet Prerelease v6.4.0 Hotfix 5 (#3188) * OriginTrail Mainnet Prerelease v6.1.1 (#2853) * Upp sharding table migration enabled * Update event insert in chunks * version bump * Add migration for makring staking events as processed * Updated migration executor added mark staking events as processed migration * Updated migration added await on get latest block * Updated migration for all contracts * Migration updated --------- Co-authored-by: NZT48 <nikolaztodorovic26@gmail.com> * Revert "OriginTrail Devnet Prerelease v6.2.0 Hotfix 10" * Revert "Merge pull request #2965 from OriginTrail/revert-2964-v6/develop" This reverts commit d7cd260, reversing changes made to 491baf8. * Fix * Fix/handle state finalized events (#3184) * Fix getKnowledgeAssetLocatorFromParanetId call in handleStateFinalizedEvents * Version bump * Correct version * Add more fixes * Fix contract call getKnowledgeAssetLocatorFromParanetId * Fix getKnowledgeAssetLocatorFromParanetId * Add check on state finalized to confirm that paranet repo exists * Fix getKALocator from Paranet ID in handling state finalized * Fix package lock --------- Co-authored-by: NZT48 <nikolaztodorovic26@gmail.com> * Fix/add syncing paranets at blockchain check (#3187) * Add getParanetsBlockchains to repository module manager * Add check paranets synced at blockchain in event listener * Version bump --------- Co-authored-by: djordjekovac <djordje.kovacevic@origin-trail.com> Co-authored-by: NZT48 <nikolaztodorovic26@gmail.com> Co-authored-by: Branimir Rakic <33914812+branarakic@users.noreply.github.com> --------- Co-authored-by: djordjekovac <djordje.kovacevic@origin-trail.com> Co-authored-by: NZT48 <nikolaztodorovic26@gmail.com> Co-authored-by: Branimir Rakic <33914812+branarakic@users.noreply.github.com>
OriginTrail Devnet Release v6.4.0 Hotfix 6
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.