Rebases Campfire staging branch Stack Wallet, Add Support for New ElectrumX Protocol#19
Open
navidR wants to merge 25 commits into
Open
Rebases Campfire staging branch Stack Wallet, Add Support for New ElectrumX Protocol#19navidR wants to merge 25 commits into
navidR wants to merge 25 commits into
Conversation
Ci integration
fix for macos ci build update flutter version for macos build ci update macos ci Add build workflow for Windows update CMakeLists for build update workflow Add build workflow for Linux update workflow for linux update ci for linux remove docker credential requirement from test workflow fix Test action fix Test action add Android and iOS builds fix for android build fix for android build generate mobile app icons/assets before Android and iOS builds fix for android build fix for android build
|
User rahimi.nv@gmail.com does not have a PR Review subscription. Go to Team management and add this email to the PR Review subscription. |
navidR
force-pushed
the
dev/navidr/rebase-to-stackwallet
branch
2 times, most recently
from
31d27f6 to
61a872d
Compare
|
User levoncrypto1994@gmail.com does not have a PR Review subscription. Go to Team management and add this email to the PR Review subscription. |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Rebases the Campfire staging branch onto the latest upstream Stack Wallet staging (cypherstack), integrating ~158 upstream commits including MWC wallet refactoring, Spark mint fee optimizations, PayNym P2TR taproot support, masternode collateral improvements, Exolix exchange integration, and numerous build/CI fixes. Campfire's CI pipeline additions (macOS, Windows, Linux, Android, iOS build workflows) are preserved as a single squashed commit on top, along with the Campfire README branding. Resolve merge conflicts, prefer upstream changes, and update the CI test workflow to use the public Docker Hub image instead of GHCR.
Add support for rebase: firo onto upstream electrumx master, resolve merge conflict electrumx-firo#11
Update: ElectrumX support has been removed from this PR, and new PR created for it in stack_wallet repo: cypherstack#1347