Skip to content

Commit

Permalink
v4.0.1
Browse files Browse the repository at this point in the history
  • Loading branch information
BLOCXTECH committed Sep 2, 2024
1 parent 75a4176 commit 07bcd59
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 19 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ BLOCX. is released under the terms of the MIT license.

# Documentation

https://docs.blocx.info/
https://docs.blocx.info/
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
AC_PREREQ([2.69])
define(_CLIENT_VERSION_MAJOR, 4)
define(_CLIENT_VERSION_MINOR, 0)
define(_CLIENT_VERSION_BUILD, 0)
define(_CLIENT_VERSION_BUILD, 1)
define(_CLIENT_VERSION_RC, 0)
define(_CLIENT_VERSION_IS_RELEASE, true)
define(_COPYRIGHT_YEAR, 2023)
Expand Down
10 changes: 5 additions & 5 deletions src/chainparams.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -283,11 +283,11 @@ class CMainParams : public CChainParams {
// This is fine at runtime as we'll fall back to using them as a oneshot if they don't support the
// service bits we want, but we should get them updated to support all service bits wanted by any
// release ASAP to avoid it where possible.
vSeeds.emplace_back("dnsseed.blocx.space");
vSeeds.emplace_back("node1.blocx.space");
vSeeds.emplace_back("node2.blocx.space");
vSeeds.emplace_back("node3.blocx.space");
vSeeds.emplace_back("node4.blocx.space");
vSeeds.emplace_back("dnsseed.blocx.live");
vSeeds.emplace_back("node1.blocx.live");
vSeeds.emplace_back("node2.blocx.live");
vSeeds.emplace_back("node3.blocx.live");
vSeeds.emplace_back("node4.blocx.live");


// BLOCX addresses start with 'X'
Expand Down
2 changes: 1 addition & 1 deletion src/rpc/mining.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1160,7 +1160,7 @@ static UniValue submitblock(const JSONRPCRequest& request)
}

bool new_block;
submitblock_StateCatcher sc(block.GetHash());
submitblock_StateCatcher sc(hash);
RegisterValidationInterface(&sc);
bool accepted = EnsureChainman(request.context).ProcessNewBlock(Params(), blockptr, /* fForceProcessing */ true, /* fNewBlock */ &new_block);
UnregisterValidationInterface(&sc);
Expand Down
9 changes: 2 additions & 7 deletions src/validation.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -531,15 +531,10 @@ static bool AcceptToMemoryPoolWorker(const CChainParams& chainparams, CTxMemPool
*pfMissingInputs = false;
}

if (::ChainActive().Height() > chainparams.GetConsensus().V3ForkHeight && tx.nType == TRANSACTION_PROVIDER_UPDATE_SERVICE) {
// this condition will be removed from next version
if (Params().NetworkIDString() == CBaseChainParams::MAIN && ::ChainActive().Height() < 106300) {
return false;
}
if (::ChainActive().Height() <= chainparams.GetConsensus().AutolykosForkHeight && (tx.nType == TRANSACTION_PROVIDER_UPDATE_SERVICE || tx.nType == TRANSACTION_PROVIDER_REGISTER)) {
CProUpServTx proTx;
if (GetTxPayload(tx, proTx)) {
auto dmn = deterministicMNManager->GetListAtChainTip().GetMN(proTx.proTxHash);
if (dmn->nType == MnType::Lite) {
if (proTx.addr.IsIPv6()) {
return false;
}
}
Expand Down
4 changes: 0 additions & 4 deletions src/wallet/walletdb.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -622,10 +622,6 @@ DBErrors WalletBatch::LoadWallet(CWallet* pwallet)
for (const uint256& hash : wss.vWalletUpgrade)
WriteTx(pwallet->mapWallet.at(hash));

// Rewrite encrypted wallets of versions 0.4.0 and 0.5.0rc:
if (wss.fIsEncrypted && (last_client == 40000 || last_client == 50000))
return DBErrors::NEED_REWRITE;

if (last_client < CLIENT_VERSION) // Update
m_batch->Write(DBKeys::VERSION, CLIENT_VERSION);

Expand Down

0 comments on commit 07bcd59

Please sign in to comment.