Skip to content

Merge of Dash v0.12.1.0 generel information #2

@Mrs-X

Description

@Mrs-X

  • I have created a dedicated issue (see Merge of Dash v0.12.1.0 Tasks #3) where everyone MUST write down which code he's working to avoid having 2 people working on the same code.

  • If in doubt both codelines Dash and PIVX were added, so their might be duplicate lines which need fixing by hand, especially when the signatures of methods have changed. We will use the newer (Dash) signatures and add the PIVX-specific parameters on top of that. Don't delete exisitng code, comment it out. We might need this info later. Comment should have the unique tag XX42

Example before (first line is Dash, second line is PIVX:

CBlockTemplate* CreateNewBlock(const CChainParams& chainparams, const CScript& scriptPubKeyIn)
CBlockTemplate* CreateNewBlock(const CScript& scriptPubKeyIn, CWallet* pwallet, bool fProofOfStake)

After (target):

// XX42 CBlockTemplate* CreateNewBlock(const CChainParams& chainparams, const CScript& scriptPubKeyIn)
// XX42 CBlockTemplate* CreateNewBlock(const CScript& scriptPubKeyIn, CWallet* pwallet, bool fProofOfStake)

CBlockTemplate* CreateNewBlock(const CChainParams& chainparams, const CScript& scriptPubKeyIn, bool fProofOfStake)

  • Unfortunately main.cpp wasn't mergeable, so it must completely be done by hand.

  • Lots of minor issues I''ll add later

Metadata

Metadata

Assignees

No one assigned

    Labels

    No labels
    No labels

    Projects

    No projects

    Milestone

    No milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions