-
Notifications
You must be signed in to change notification settings - Fork 4
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 branch 'master' of https://github.com/mempool/mempool #1
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
utACK
60091e4
to
f2a0844
Compare
d547fe3
to
0a627f9
Compare
@ripcurlx we’re going to drop bisq support from the mempool open source project, so now would be a good time to merge this PR since you’ll need to maintain the bisq fork of mempool from now on |
@cbeams can you merge this? we are about to remove bisq support from mempool so this needs to be the fork point, see mempool#4786 |
Hey @wiz, thanks for the heads up. As for me merging this PR, I don't have rights and I'm not quite sure what the implications of doing so would be. I'll try to flesh that out below. I see, per your comment at bisq-network/roles#9 (comment) that @Emzy has agreed to take over the bisq.markets domain. @Emzy is that right, and has this already been done? Will that instance at bisq.markets need to be migrated elsewhere? And is the idea that it would be stood up against this repository at the "fork point" of this PR being merged? As for actually merging the PR, @gabernard should be able to do it. @Emzy, if you do indeed plan to take over the domain and run the instance at bisq.markets based on this fork, perhaps you could verify everything works as expected against this PR and raise any questions you have here if not? Thanks, all. Perhaps with a few more comments here, we can get a plan together and then make this change step by step. |
I don't want to take over the domain. |
@Emzy would it be ok for you if we (a) 302 bisq.markets to bisq.mempool.emzy.de or (b) set up a reverse proxy to it as near-term solutions? Also, @Emzy, would you be planning to run your instance off of this fork going forward? @wiz, I'll get back here regarding the merge and will follow up with you regarding taking over the domain. |
I'm OK with the redirect and reverse proxy. Let me try set up a new server with this fork. I'm planing to upgrade the hardware anyway soon. For now the old version is still running on bisq.mempool.emzy.de |
Okay I think we've given more than fair warning - if you don't want to merge this PR then Bisq will be on its own. |
Fix bech32 regex and adapt tests
…d/cypress-13.13.0 Bump cypress from 13.12.0 to 13.13.0 in /frontend
[auth] catch auth error and return null
fix pizza status
[btcpay] handle new http code 204 when calling /payments/bitcoin/check
retry firstseen on error
Bumps [@fortawesome/fontawesome-svg-core](https://github.com/FortAwesome/Font-Awesome) from 6.5.1 to 6.6.0. - [Release notes](https://github.com/FortAwesome/Font-Awesome/releases) - [Changelog](https://github.com/FortAwesome/Font-Awesome/blob/6.x/CHANGELOG.md) - [Commits](FortAwesome/Font-Awesome@6.5.1...6.6.0) --- updated-dependencies: - dependency-name: "@fortawesome/fontawesome-svg-core" dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]>
…d/fortawesome/fontawesome-svg-core-6.6.0 Bump @fortawesome/fontawesome-svg-core from 6.5.1 to 6.6.0 in /frontend
Bumps [@fortawesome/free-solid-svg-icons](https://github.com/FortAwesome/Font-Awesome) from 6.5.1 to 6.6.0. - [Release notes](https://github.com/FortAwesome/Font-Awesome/releases) - [Changelog](https://github.com/FortAwesome/Font-Awesome/blob/6.x/CHANGELOG.md) - [Commits](FortAwesome/Font-Awesome@6.5.1...6.6.0) --- updated-dependencies: - dependency-name: "@fortawesome/free-solid-svg-icons" dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]>
…d/fortawesome/free-solid-svg-icons-6.6.0 Bump @fortawesome/free-solid-svg-icons from 6.5.1 to 6.6.0 in /frontend
Bumps [@fortawesome/fontawesome-common-types](https://github.com/FortAwesome/Font-Awesome) from 6.5.1 to 6.6.0. - [Release notes](https://github.com/FortAwesome/Font-Awesome/releases) - [Changelog](https://github.com/FortAwesome/Font-Awesome/blob/6.x/CHANGELOG.md) - [Commits](FortAwesome/Font-Awesome@6.5.1...6.6.0) --- updated-dependencies: - dependency-name: "@fortawesome/fontawesome-common-types" dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]>
…d/fortawesome/fontawesome-common-types-6.6.0 Bump @fortawesome/fontawesome-common-types from 6.5.1 to 6.6.0 in /frontend
Maintaining an old MSRV is not a priority for this project. If you would like to keep an old MSRV active, please maintain your own patch/fork.
Bump Rust version to 1.79
Mini miner cpfp
Add fee to Cpfp API
No description provided.