Attempt to merge 1.5.0.0 into 1.6.0.0 #1169
Open
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
…0-upgrade Merge .NET6 WIP to Feature branch
upgrade to .net 6
.NET6 Unit test fixes
* Fix FailsFV testcase * Don't dispose already disposed runners * Improve error logging in FullNodeFeatureExecutor * Simplify AsyncLock * Fix * Increase timeout * Disable failing Ubuntu and OSX test case temporarily * Stabilize test * Improve test-case
…anage Make WalletSyncManager more robust
…oject#1124) * Don't process deposits prior to already processed deposits * Fix MaturedBlocksSyncManagerTests * Update src/Stratis.Features.FederatedPeg/TargetChain/MaturedBlocksSyncManager.cs Co-authored-by: zeptin <[email protected]> * Fix BlocksAreRequestedIfThereIsSomethingToRequestAsync --------- Co-authored-by: zeptin <[email protected]>
* Limit how often the wallet is saved * Tweak * Force wallet save in stop
…ratisproject#1126) * Limit how often the wallet is saved * Tweak * Force wallet save in stop * Throw error on duplicate withdrawal detected in federation wallet * Stop application * Fix * Just display an error for now * Can only explicitly remove transient transactions
* Add maturity height to logging * Restore removed code section * Send potentially suspended tx's to CCTS * Fix * Logging and code improvements * Fix null and enforce sync * Resolve some error scenarios * Cleanup
* Use deposit blocktime for conversions * Fix build errors in tests
* Bump version to 1.5.0.0 (stratisproject#1077) * Add Stratis.SCL with ECRecover (stratisproject#1104) * Add Stratis.SCL with ECRecover * Add ValidateAndParse * Refactor versions * Fix CLR Validation (stratisproject#1154) * Update ECRecover and SSAS to support new contracts (stratisproject#1157) * Fix ValidateAndParse * Refactor * Changes based on feedback * Allow optional arguments * Bump collateral and fedpeg versions * Bump Stratis.SCL version * Bump CLR version * Fix unit test * Bump Strats.SmartContracts.CLR.Validation * Fix versions
* Update packages to beta version * Fix versions
zeptin
commented
Sep 27, 2023
| @@ -7,11 +7,11 @@ | |||
| </PropertyGroup> | |||
|
|
|||
| <PropertyGroup> | |||
| <Version>4.0.1.0</Version> | |||
| <Version>4.0.0.88</Version> | |||
There was a problem hiding this comment.
Possibly need to decide which version number should be assigned next
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.
Not ready for review yet