From 31d66b0bebc74f36a9b3e2ee3fe6b79c9ecc8f91 Mon Sep 17 00:00:00 2001 From: lateminer <9951982+lateminer@users.noreply.github.com> Date: Wed, 4 Dec 2024 00:44:17 +0100 Subject: [PATCH 1/2] doc: Update README.md with the link to Blackcoin More's Transifex page --- README.md | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index a286e1fdff..6829626135 100644 --- a/README.md +++ b/README.md @@ -69,14 +69,11 @@ Translations ------------ Changes to translations as well as new translations can be submitted to -[Bitcoin Core's Transifex page](https://www.transifex.com/bitcoin/bitcoin/). +[Blackcoin More's Transifex page](https://www.transifex.com/BlackcoinQT/BlackcoinMore/). -Translations are periodically pulled from Transifex and merged into the git repository. See the +Translations might be periodically pulled from Transifex and merged into the git repository. See the [translation process](doc/translation_process.md) for details on how this works. -**Important**: We do not accept translation changes as GitHub pull requests because the next -pull from Transifex would automatically overwrite them again. - Branches ------- From 68474f5eb5a05885e51d514c59769a6e536fee3b Mon Sep 17 00:00:00 2001 From: lateminer <9951982+lateminer@users.noreply.github.com> Date: Thu, 5 Dec 2024 19:52:53 +0100 Subject: [PATCH 2/2] consensus: Activate SegWit on June 20, 2025 --- src/kernel/chainparams.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/kernel/chainparams.cpp b/src/kernel/chainparams.cpp index 5ffbfbd73b..950bdf29d9 100644 --- a/src/kernel/chainparams.cpp +++ b/src/kernel/chainparams.cpp @@ -108,7 +108,7 @@ class CMainParams : public CChainParams { // Deployment of SegWit (BIP141, BIP143, and BIP147) consensus.vDeployments[Consensus::DEPLOYMENT_SEGWIT].bit = 1; - consensus.vDeployments[Consensus::DEPLOYMENT_SEGWIT].nStartTime = Consensus::BIP9Deployment::NEVER_ACTIVE; + consensus.vDeployments[Consensus::DEPLOYMENT_SEGWIT].nStartTime = 1750377600; // Friday, June 20, 2025 12:00:00 AM consensus.vDeployments[Consensus::DEPLOYMENT_SEGWIT].nTimeout = Consensus::BIP9Deployment::NO_TIMEOUT; consensus.vDeployments[Consensus::DEPLOYMENT_SEGWIT].min_activation_height = 0; // No activation delay