LBRYCommunity/lbrycrd
1
0
Fork 0
Code Issues 29 Pull requests 1 Projects Releases 32 Packages Wiki Activity

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

Closed
lbrynaut wants to merge 14 commits from updated-rebase-0.17 into bitcoin-0.17
pull from: updated-rebase-0.17
merge into: LBRYCommunity:bitcoin-0.17
Conversation 1 Commits 14 Files changed 89 +11331 -2147
lbrynaut commented 2019-02-20 20:10:34 +01:00 (Migrated from github.com)
Copy link

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
BrannonKing (Migrated from github.com) commented 2019-02-20 21:50:54 +01:00
Copy link

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

We're using program options and upstream isn't?
src/Makefile.am
BrannonKing (Migrated from github.com) commented 2019-02-20 21:51:55 +01:00
Copy link

Absent in upstream?

Absent in upstream?
src/chainparams.cpp
@ -117,3 +174,1 @@
pchMessageStart[2] = 0xb4;
pchMessageStart[3] = 0xd9;
nDefaultPort = 8333;
pchMessageStart[0] = 0xfa;
BrannonKing (Migrated from github.com) commented 2019-02-20 21:53:40 +01:00
Copy link

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

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; */
BrannonKing (Migrated from github.com) commented 2019-02-20 21:56:13 +01:00
Copy link

why remove this line?

why remove this line?
src/net_processing.cpp
BrannonKing (Migrated from github.com) commented 2019-02-20 21:58:40 +01:00
Copy link

why does this one differ from upstream?

why does this one differ from upstream?
src/pow.cpp
@ -36,3 +30,3 @@
return nProofOfWorkLimit;
}
return pindexLast->nBits;
}
BrannonKing (Migrated from github.com) commented 2019-02-20 21:59:05 +01:00
Copy link

differs from current master

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
BrannonKing (Migrated from github.com) commented 2019-02-20 22:00:23 +01:00
Copy link

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

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);
}
BrannonKing (Migrated from github.com) commented 2019-02-20 22:01:58 +01:00
Copy link

looks like we don't need this file.

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;
lbrynaut (Migrated from github.com) commented 2019-02-21 00:44:38 +01:00
Copy link

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

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;
}
lbrynaut (Migrated from github.com) commented 2019-02-21 00:45:24 +01:00
Copy link

The changes from master are not in ...

The changes from master are not in ...
BrannonKing commented 2019-03-05 18:59:09 +01:00 (Migrated from github.com)
Copy link

review is over. thanks.

review is over. thanks.

Pull request closed

This pull request cannot be reopened because the branch was deleted.
Sign in to join this conversation.
Reviewers
No reviewers
bvbfan
BrannonKing
Labels
Clear labels   
area: devops

   
area: discovery

   
area: docs

   
area: livestream

   
area: proposal

Work is part of a proposal

  
consider soon

Discuss this issue at the next planning meeting, then remove this label

  
Epic

   
good first issue

   
hacktoberfest

Welcome to Hacktoberfest

  
hard fork

   
help wanted

   
icebox

Long-term storage

  
Invalid

   
level: 0

   
level: 1

No knowledge of the existing code required

  
level: 2

Some knowledge of the existing code is recommended

  
level: 3

Significant knowledge of the existing code is recommended

  
level: 4

Intimate knowledge of the existing code is recommended

  
needs: exploration

Solution unclear, needs research

  
needs: grooming

Issue needs to be groomed before work can start

  
needs: priority

Priority level needs to be defined

  
needs: repro

Issue needs step-by-step instructions on how to reproduce in latest code

  
needs: tech design

Needs technical design signoff before implementation can begin

  
on hold

Temporarily paused

  
priority: blocker

Issue is blocking release, do ASAP

  
priority: high

Work needs to be moved into sprint ASAP

  
priority: low

Work should be done but can stay in the backlog for now

  
priority: medium

Work needs to be done within 2-3 sprints

  
resilience

   
soft fork

   
Tom's Wishlist

   
type: bug

Existing functionality is wrong or broken

  
type: discussion

A conversation. No specific changes requested

  
type: improvement

Existing (or partially existing) functionality needs to be changed

  
type: new feature

New functionality that does not exist yet

  
type: refactor

Minimal user-visible changes, but significant internal work

  
type: task

Either work that's not related to the code, or a small chore that does not fit into other categories

  
type: testing

Solution needs additional user testing

  
unplanned

Work that was not planned into the spirnt, took priority over planned work

  
work in progress

The proposed solution is still incomplete.

No labels
area: devops
area: discovery
area: docs
area: livestream
area: proposal
consider soon
Epic
good first issue
hacktoberfest
hard fork
help wanted
icebox
Invalid
level: 0
level: 1
level: 2
level: 3
level: 4
needs: exploration
needs: grooming
needs: priority
needs: repro
needs: tech design
on hold
priority: blocker
priority: high
priority: low
priority: medium
resilience
soft fork
Tom's Wishlist
type: bug
type: discussion
type: improvement
type: new feature
type: refactor
type: task
type: testing
unplanned
work in progress
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
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
No description provided.
Delete branch "updated-rebase-0.17"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?