diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-05-09 16:57:06 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-05-09 17:03:51 +0200 |
| commit | 8bcfccbc2de25e3b40d1c222d7c5d9991345a0aa (patch) | |
| tree | ec29908109f159efce4c7ccb6bba68125b1d04e8 /src/chainparams.h | |
| parent | 82564e21e79092a7e28aa5d31d8fdbdb3fd970ca (diff) | |
| parent | 397668ea63e148a92f68e9fae578595585616770 (diff) | |
| download | bitcoin-8bcfccbc2de25e3b40d1c222d7c5d9991345a0aa.tar.xz | |
Merge pull request #4076
397668e Deduplicate uint* comparison operator logic (Pieter Wuille)
df9eb5e Move {Get,Set}Compact from bignum to uint256 (Pieter Wuille)
a703150 Add multiplication and division to uint160/uint256 (Pieter Wuille)
4d480c8 Exception instead of assigning 0 in case of wrong vector length (Pieter Wuille)
eb2cbd7 Deduplicate shared code between uint160 and uint256 (Pieter Wuille)
Diffstat (limited to 'src/chainparams.h')
| -rw-r--r-- | src/chainparams.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/chainparams.h b/src/chainparams.h index 542afeaf92..f3f24efd99 100644 --- a/src/chainparams.h +++ b/src/chainparams.h @@ -56,7 +56,7 @@ public: const MessageStartChars& MessageStart() const { return pchMessageStart; } const vector<unsigned char>& AlertKey() const { return vAlertPubKey; } int GetDefaultPort() const { return nDefaultPort; } - const CBigNum& ProofOfWorkLimit() const { return bnProofOfWorkLimit; } + const uint256& ProofOfWorkLimit() const { return bnProofOfWorkLimit; } int SubsidyHalvingInterval() const { return nSubsidyHalvingInterval; } virtual const CBlock& GenesisBlock() const = 0; virtual bool RequireRPCPassword() const { return true; } @@ -75,7 +75,7 @@ protected: vector<unsigned char> vAlertPubKey; int nDefaultPort; int nRPCPort; - CBigNum bnProofOfWorkLimit; + uint256 bnProofOfWorkLimit; int nSubsidyHalvingInterval; string strDataDir; vector<CDNSSeedData> vSeeds; |