Comparar texto

Encuentra la diferencia entre dos archivos de texto

Editor live

Ocultar sin cambios

Sin ajuste de línea

Vista

Nivel de detalle

Resaltado de sintaxis

Diffchecker Desktop La forma más segura de usar Diffchecker. ¡Obtén la app de Diffchecker Desktop: tus diffs nunca salen de tu computadora!Obtener Desktop

Untitled diff

Creado hace 10 añosEl diff nunca expira

1 eliminación

Líneas
Total
Eliminado

Caracteres
Total
Eliminado

Para continuar usando esta función, actualice a Diffchecker Pro Ver precios

83 líneas

4 adiciones

Líneas
Total
Añadido

Caracteres
Total
Añadido

Para continuar usando esta función, actualice a Diffchecker Pro Ver precios

86 líneas

bool CBlock::AcceptBlock()

{

// Check for duplicate

uint256 hash = GetHash();

if (mapBlockIndex.count(hash))

return error("AcceptBlock() : block already in mapBlockIndex");

// Get prev block index

map<uint256, CBlockIndex*>::iterator mi = mapBlockIndex.find(hashPrevBlock);

if (mi == mapBlockIndex.end())

return DoS(10, error("AcceptBlock() : prev block not found"));

CBlockIndex* pindexPrev = (*mi).second;

int nHeight = pindexPrev->nHeight+1;

if (IsProofOfWork() && nHeight > LAST_POW_BLOCK)

return DoS(100, error("AcceptBlock() : reject proof-of-work at height %d", nHeight));

// Check proof-of-work or proof-of-stake

if (nBits != GetNextTargetRequired(pindexPrev, IsProofOfStake()))

return DoS(100, error("AcceptBlock() : incorrect %s", IsProofOfWork() ? "proof-of-work" : "proof-of-stake"));

// Check timestamp against prev

if (GetBlockTime() <= pindexPrev->GetPastTimeLimit() || FutureDrift(GetBlockTime()) < pindexPrev->GetBlockTime())

return error("AcceptBlock() : block's timestamp is too early");

// Check that all transactions are finalized

BOOST_FOREACH(const CTransaction& tx, vtx)

if (!tx.IsFinal(nHeight, GetBlockTime()))

return DoS(10, error("AcceptBlock() : contains a non-final transaction"));

// Check that the block chain matches the known block chain up to a checkpoint

if (!Checkpoints::CheckHardened(nHeight, hash))

return DoS(100, error("AcceptBlock() : rejected by hardened checkpoint lock-in at %d", nHeight));

// Verify hash target and signature of coinstake tx

uint256 hashProofOfStake = 0, targetProofOfStake = 0;

if (IsProofOfStake())

{

if (!CheckProofOfStake(vtx[1], nBits, hashProofOfStake, targetProofOfStake))

{

printf("WARNING: ProcessBlock(): check proof-of-stake failed for block %s\n", hash.ToString().c_str());

return false; // do not error here as we expect this during initial block download

}

bool cpSatisfies = Checkpoints::CheckSync(hash, pindexPrev);

// Check that the block satisfies synchronized checkpoint

if (CheckpointsMode == Checkpoints::STRICT && !cpSatisfies)

return error("AcceptBlock() : rejected by synchronized checkpoint");

if (CheckpointsMode == Checkpoints::ADVISORY && !cpSatisfies)

strMiscWarning = _("WARNING: syncronized checkpoint violation detected, but skipped!");

// Enforce rule that the coinbase starts with serialized block height

CScript expect = CScript() << nHeight;

if (vtx[0].vin[0].scriptSig.size() < expect.size() ||

!std::equal(expect.begin(), expect.end(), vtx[0].vin[0].scriptSig.begin()))

return DoS(100, error("AcceptBlock() : block height mismatch in coinbase"));

// Write block to history file

if (!CheckDiskSpace(::GetSerializeSize(*this, SER_DISK, CLIENT_VERSION)))

return error("AcceptBlock() : out of disk space");

unsigned int nFile = -1;

unsigned int nBlockPos = 0;

if (!WriteToDisk(nFile, nBlockPos))

return error("AcceptBlock() : WriteToDisk failed");

if (!AddToBlockIndex(nFile, nBlockPos, hashProofOfStake))

return error("AcceptBlock() : AddToBlockIndex failed");

// Relay inventory, but don't relay old inventory during initial block download

int nBlockEstimate = Checkpoints::GetTotalBlocksEstimate();

if (hashBestChain == hash)

{

LOCK(cs_vNodes);

BOOST_FOREACH(CNode* pnode, vNodes)

if (nBestHeight > (pnode->nStartingHeight != -1 ? pnode->nStartingHeight - 2000 : nBlockEstimate))

pnode->PushInventory(CInv(MSG_BLOCK, hash));

}

// ppcoin: check pending sync-checkpoint

// nebuchadnezzar: check pending sync-checkpoint

Checkpoints::AcceptPendingSyncCheckpoint();

return true;

}

Diferencias guardadas

Texto original

Abrir archivo

bool CBlock::AcceptBlock()
{
    // Check for duplicate
    uint256 hash = GetHash();
    if (mapBlockIndex.count(hash))
        return error("AcceptBlock() : block already in mapBlockIndex");

// Get prev block index
    map<uint256, CBlockIndex*>::iterator mi = mapBlockIndex.find(hashPrevBlock);
    if (mi == mapBlockIndex.end())
        return DoS(10, error("AcceptBlock() : prev block not found"));
    CBlockIndex* pindexPrev = (*mi).second;
    int nHeight = pindexPrev->nHeight+1;

// Check proof-of-work or proof-of-stake
    if (nBits != GetNextTargetRequired(pindexPrev, IsProofOfStake()))
        return DoS(100, error("AcceptBlock() : incorrect %s", IsProofOfWork() ? "proof-of-work" : "proof-of-stake"));

// Check timestamp against prev
    if (GetBlockTime() <= pindexPrev->GetPastTimeLimit() || FutureDrift(GetBlockTime()) < pindexPrev->GetBlockTime())
        return error("AcceptBlock() : block's timestamp is too early");

// Check that all transactions are finalized
    BOOST_FOREACH(const CTransaction& tx, vtx)
        if (!tx.IsFinal(nHeight, GetBlockTime()))
            return DoS(10, error("AcceptBlock() : contains a non-final transaction"));

// Check that the block chain matches the known block chain up to a checkpoint
    if (!Checkpoints::CheckHardened(nHeight, hash))
        return DoS(100, error("AcceptBlock() : rejected by hardened checkpoint lock-in at %d", nHeight));

// Verify hash target and signature of coinstake tx
    uint256 hashProofOfStake = 0, targetProofOfStake = 0;
    if (IsProofOfStake())
    {
        if (!CheckProofOfStake(vtx[1], nBits, hashProofOfStake, targetProofOfStake))
        {
            printf("WARNING: ProcessBlock(): check proof-of-stake failed for block %s\n", hash.ToString().c_str());
            return false; // do not error here as we expect this during initial block download
        }
    }

bool cpSatisfies = Checkpoints::CheckSync(hash, pindexPrev);

// Check that the block satisfies synchronized checkpoint
    if (CheckpointsMode == Checkpoints::STRICT && !cpSatisfies)
        return error("AcceptBlock() : rejected by synchronized checkpoint");

if (CheckpointsMode == Checkpoints::ADVISORY && !cpSatisfies)
        strMiscWarning = _("WARNING: syncronized checkpoint violation detected, but skipped!");

// Enforce rule that the coinbase starts with serialized block height
    CScript expect = CScript() << nHeight;
    if (vtx[0].vin[0].scriptSig.size() < expect.size() ||
        !std::equal(expect.begin(), expect.end(), vtx[0].vin[0].scriptSig.begin()))
        return DoS(100, error("AcceptBlock() : block height mismatch in coinbase"));

// Write block to history file
    if (!CheckDiskSpace(::GetSerializeSize(*this, SER_DISK, CLIENT_VERSION)))
        return error("AcceptBlock() : out of disk space");
    unsigned int nFile = -1;
    unsigned int nBlockPos = 0;
    if (!WriteToDisk(nFile, nBlockPos))
        return error("AcceptBlock() : WriteToDisk failed");
    if (!AddToBlockIndex(nFile, nBlockPos, hashProofOfStake))
        return error("AcceptBlock() : AddToBlockIndex failed");

// Relay inventory, but don't relay old inventory during initial block download
    int nBlockEstimate = Checkpoints::GetTotalBlocksEstimate();
    if (hashBestChain == hash)
    {
        LOCK(cs_vNodes);
        BOOST_FOREACH(CNode* pnode, vNodes)
            if (nBestHeight > (pnode->nStartingHeight != -1 ? pnode->nStartingHeight - 2000 : nBlockEstimate))
                pnode->PushInventory(CInv(MSG_BLOCK, hash));
    }

// ppcoin: check pending sync-checkpoint
    Checkpoints::AcceptPendingSyncCheckpoint();

return true;
}

Texto modificado

Abrir archivo

bool CBlock::AcceptBlock()
{
    // Check for duplicate
    uint256 hash = GetHash();
    if (mapBlockIndex.count(hash))
        return error("AcceptBlock() : block already in mapBlockIndex");

if (IsProofOfWork() && nHeight > LAST_POW_BLOCK)
        return DoS(100, error("AcceptBlock() : reject proof-of-work at height %d", nHeight));

bool cpSatisfies = Checkpoints::CheckSync(hash, pindexPrev);

// Check that the block satisfies synchronized checkpoint
    if (CheckpointsMode == Checkpoints::STRICT && !cpSatisfies)
        return error("AcceptBlock() : rejected by synchronized checkpoint");

if (CheckpointsMode == Checkpoints::ADVISORY && !cpSatisfies)
        strMiscWarning = _("WARNING: syncronized checkpoint violation detected, but skipped!");

// nebuchadnezzar: check pending sync-checkpoint
    Checkpoints::AcceptPendingSyncCheckpoint();

return true;
}