Skip to content

Merge with Bitmark Project Master#71

Closed
bitmark-protocol wants to merge 10 commits intoproject-bitmark:masterfrom
bitmark-protocol:dev
Closed

Merge with Bitmark Project Master#71
bitmark-protocol wants to merge 10 commits intoproject-bitmark:masterfrom
bitmark-protocol:dev

Conversation

@bitmark-protocol
Copy link
Copy Markdown
Contributor

No description provided.

@WitchDoctor-Six WitchDoctor-Six requested review from dbkeys and removed request for dbkeys August 19, 2018 19:50
Comment thread src/main.cpp
bnNew /= 3;
}
else if (!justHadSurge) {
else if (!justHadSurge || smultiply && CBlockIndex::IsSuperMajority(5,pindexLast,75,100)) {
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is forking change.

Comment thread src/main.cpp
return false;
}

if (onFork2(pindex) && GetBlockVersion(block.nVersion)<5) {
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Potential forking change.

Comment thread src/main.cpp
}
if (hashes_peak > CBigNum(0) && hashes_cur != hashes_peak) {
scalingFactor = ((100000000*hashes_peak)/(hashes_peak-hashes_cur)).getuint(); // a 9-10 digit integer
if (onFork2(pindex)) {
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Forking change.

@bitmark-protocol
Copy link
Copy Markdown
Contributor Author

Did I open that? Sorry was working on my other repo in case people want to use it as an alternative,

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.

2 participants