DO NOT MERGE: Updated rebase 0.17 for early review only #257

2019-02-20T20:10:34+01:00

lbrynaut commented

2019-02-20 20:10:34 +01:00

(Migrated from github.com)

LBRY master updates incoming.

LBRY branding/renaming incoming.

LBRY master updates incoming. LBRY branding/renaming incoming.

bvbfan (Migrated from github.com) reviewed

2019-02-20 20:10:34 +01:00

BrannonKing (Migrated from github.com) approved these changes

2019-02-20 22:05:49 +01:00

configure.ac

We're using program options and upstream isn't?

src/Makefile.am

Absent in upstream?

src/chainparams.cpp

					
				@ -117,3 +174,1 @@

				        pchMessageStart[2] = 0xb4;

				        pchMessageStart[3] = 0xd9;

				        nDefaultPort = 8333;

				        pchMessageStart[0] = 0xfa;

don't change it now, but we should have come up with something creative for this

src/dbwrapper.h

					
				@ -227,3 +227,3 @@

				    CDBWrapper(const CDBWrapper&) = delete;

				    CDBWrapper& operator=(const CDBWrapper&) = delete;

				    /* CDBWrapper& operator=(const CDBWrapper&) = delete; */

why remove this line?

src/net_processing.cpp

why does this one differ from upstream?

src/pow.cpp

					
				@ -36,3 +30,3 @@

				            return nProofOfWorkLimit;

				        }

				        return pindexLast->nBits;

				    }

differs from current master

src/protocol.cpp

					
				@ -128,12 +128,20 @@ bool CMessageHeader::IsValid(const MessageStartChars& pchMessageStartIn) const

				    return true;

				}

				// NOTE: After we fork, we can require these service bits

we just need to pick a fork height for this? (or we could tie it in with the upcoming hash computation fork -- PR #209 ).

src/test/Checkpoints_tests.cpp

					
				@ -0,0 +22,4 @@

				{

				    //const CCheckpointData& checkpoints = Params(CBaseChainParams::MAIN).Checkpoints();

				    //BOOST_CHECK(Checkpoints::GetTotalBlocksEstimate(checkpoints) >= 134444);

				}

looks like we don't need this file.

lbrynaut (Migrated from github.com) reviewed

2019-02-21 00:44:38 +01:00

src/chainparams.cpp

					
				@ -117,3 +174,1 @@

				        pchMessageStart[2] = 0xb4;

				        pchMessageStart[3] = 0xd9;

				        nDefaultPort = 8333;

				        pchMessageStart[0] = 0xfa;

This was before either of our times ... and it can't be changed now without a re-org down to genesis, destroying the entire ecosystem in the process :-P

lbrynaut (Migrated from github.com) reviewed

2019-02-21 00:45:24 +01:00

src/pow.cpp

					
				@ -36,3 +30,3 @@

				            return nProofOfWorkLimit;

				        }

				        return pindexLast->nBits;

				    }

The changes from master are not in ...

BrannonKing commented

2019-03-05 18:59:09 +01:00

(Migrated from github.com)

review is over. thanks.

Pull request closed

This pull request cannot be reopened because the branch was deleted.

Sign in to join this conversation.

No reviewers

bvbfan

BrannonKing

No milestone

No project

No assignees

1 participant

Notifications

Due date

The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference

LBRYCommunity/lbrycrd!257

Rows
Columns