Merge BlockCore @version 1.1.40 #34
Merged
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
- This was previously done to allow reload while running, but it causes issues running under docker. - Related to block-core#418
* Preparing to remove the Bech32Address field * Remove the IsSegwit flag and fixing all errors * fix build errors and enable legacy wallets to work side by side * Working coed plus UI * fix api error message * Make the wallet version an integer and backwards compatible * Fix build errors on tests * Fix incorrect script pubkey when creating an address * Fix some more wallet tests * All tests passing * use select instead of drop down * clean some comments * remove the IsSegwit flag from the rpc client * delete forgotten segwit flag * fix build
* first push * Solution compiles * delete blazor project * remove from solution * remove commented code * Fix rpc feature * Fix rpc tests * Bring back the disable logs on tests
… master-blockcore
* readme * added impleum network * build removed * build removed * Impleum network new settings prepared * Merged with blockcore. Fixing Impleum network params * Impleum update mamx supply * Impleum magic comment added * temporary remove workflows * Fix for impleum bad address * Update DNSSeedData * Updates static Nodes * Update ImpleumSetup.cs * Update ImpleumSetup.cs * Update ImpleumSetup.cs * Upate MinTxFee * Upate MinTxFee TestNet * Upate MinTxFee TestNet * Impleum: Fix for MaxTxFee * fix bip 9 deployments * Ass mainnet nodes * Add mainnet nodes * cd /Users/elenabulanova/IMPL/D/ddd/blockcore * Workflows add * Fix DefaultThreshold * Update ImpleumSetup.cs * Add IMPLX seed Nodes * Add checkpoints for City Chain network * Added Tech Molie network * fix MOL commandline arg * MOL checkpoints * Blockore merge * Add Molie network to Network folder * Update launchSettings.json * Impleum Logo and new IMPLX and MOL Seed Nodes * Add IMPL and MOL checkpoints Co-authored-by: Anton Yaroshenko <[email protected]> Co-authored-by: Elena Bulanova <[email protected]> Co-authored-by: Yurii Bulakh <[email protected]> Co-authored-by: yuriy.bulah <[email protected]> Co-authored-by: Milad <[email protected]>
- This is a "breaking change" and means test and regtest for impleumx will need resync.
* update bitcoin checkpoints and defaultAssumeValid * add hex prefix * Fix tests * one more test fix
* Delete icon.png * Updating MOL logo
|
@DennisAMenace Please can you test thoroughly, and review thoroughly. |
|
@dimsavva Please test as well |
* dotnet8 only upgrade * Update build.yml * Update build.yml remove the temp trigger for testing the build
* [email protected] [email protected] [email protected] [email protected] * [email protected] [email protected] [email protected] * [email protected] [email protected] [email protected] * Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers@0.4.421302 * [email protected] * [email protected] * [email protected] * [email protected] * [email protected] * [email protected] [email protected] [email protected] * [email protected] * [email protected] * [email protected] * [email protected] [email protected]
* [email protected] * [email protected] * [email protected] [email protected] Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson#8.0.3 [email protected]
- Must be verified to work on Linux container. - Verified to work on Windows 11.
* Upgrade [email protected] * Query LiteDb transform query to work in v5 * Upgrade [email protected]
Resolve conflicts. NOTE: Changes were made by merging all upstream. Any changes done via merging back to x42 should be disgarded as all these changes were done in the previous merges.
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.
This is a large merge bringing the latest features from BlockCore to x42.