Skip to content
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

Revert "V0.12.0.x fix budget submission" #877

Merged
merged 4 commits into from
Jun 9, 2016

Conversation

eduffield222
Copy link

Reverts #820

nTime was actually being queried from the verified blockchain, so that a user could not lie about when they first submitted the proposal. This value starts at 0, then is assigned via this undocumented feature.

int conf = GetIXConfirmations(nTxCollateralHash);
if (nBlockHash != uint256(0)) {
    BlockMap::iterator mi = mapBlockIndex.find(nBlockHash);
    if (mi != mapBlockIndex.end() && (*mi).second) {
        CBlockIndex* pindex = (*mi).second;
        if (chainActive.Contains(pindex)) {
            conf += chainActive.Height() - pindex->nHeight + 1;
            nTime = pindex->nTime;
        }
    }
}

@UdjinM6
Copy link

UdjinM6 commented Jun 9, 2016

ACK 0b2e2a4

@schinzelh
Copy link

ACK 0b2e2a4

As soon as Travis confirms i will squash and merge and build the release 0.12.0.58

@schinzelh schinzelh merged commit 88f3370 into v0.12.0.x Jun 9, 2016
@schinzelh schinzelh deleted the revert-820-v0.12.0.x-budget-submission branch June 9, 2016 17:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants