From a4b177d925556c85415794a70f0b98ba4c671d9c Mon Sep 17 00:00:00 2001 From: Jannis Froese Date: Sat, 22 Mar 2014 22:02:56 +0100 Subject: [PATCH] credit where credit is due (cherry picked from commit 5cdcfa9a2b445dd8f8009f6ff3a8ded4ee6515e6) --- src/chainparams.cpp | 2 ++ src/checkpoints.cpp | 2 ++ src/core.h | 3 +++ src/init.cpp | 2 ++ src/main.cpp | 4 ++++ src/main.h | 3 +++ src/miner.cpp | 3 +++ src/protocol.h | 3 +++ src/rpcserver.cpp | 1 + src/util.cpp | 2 ++ src/util.h | 2 ++ src/version.cpp | 1 + src/version.h | 1 + 13 files changed, 29 insertions(+) diff --git a/src/chainparams.cpp b/src/chainparams.cpp index 2b09ac706..9f65acad2 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -1,5 +1,7 @@ // Copyright (c) 2010 Satoshi Nakamoto // Copyright (c) 2009-2014 The Bitcoin developers +// Copyright (c) 2013-2014 The Dogecoin developers +// Copyright (c) 2014 The Inutoshi developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/checkpoints.cpp b/src/checkpoints.cpp index 047a70ce3..712b173df 100644 --- a/src/checkpoints.cpp +++ b/src/checkpoints.cpp @@ -1,4 +1,6 @@ // Copyright (c) 2009-2014 The Bitcoin developers +// Copyright (c) 2013-2014 The Dogecoin developers +// Copyright (c) 2014 The Inutoshi developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/core.h b/src/core.h index 889c8ad2b..5703a9bfe 100644 --- a/src/core.h +++ b/src/core.h @@ -1,5 +1,8 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2013 The Bitcoin developers +// Copyright (c) 2011-2013 The Litecoin developers +// Copyright (c) 2013-2014 The Dogecoin developers +// Copyright (c) 2014 The Inutoshi developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/init.cpp b/src/init.cpp index 72acdb8b4..39039ac0e 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -1,5 +1,7 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2014 The Bitcoin developers +// Copyright (c) 2011-2013 The Litecoin developers +// Copyright (c) 2014 The Inutoshi developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/main.cpp b/src/main.cpp index f90e87e32..536e67ab9 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,5 +1,8 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2014 The Bitcoin developers +// Copyright (c) 2011-2013 The Litecoin developers +// Copyright (c) 2013-2014 The Dogecoin developers +// Copyright (c) 2014 The Inutoshi developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -1183,6 +1186,7 @@ int64_t GetBlockValue(int nHeight, int64_t nFees, uint256 prevHash) return nSubsidy + nFees; } +// New Difficulty adjustement and reward scheme by /u/lleti, rog1121, and DigiByte (DigiShield Developers). static const int64_t nTargetTimespan = 4 * 60 * 60; // DogeCoin: every 4 hours static const int64_t nTargetTimespanNEW = 60 ; // DogeCoin: every 1 minute static const int64_t nTargetSpacing = 60; // DogeCoin: 1 minute diff --git a/src/main.h b/src/main.h index 96cd8733f..d83e5fc7e 100644 --- a/src/main.h +++ b/src/main.h @@ -1,5 +1,8 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2014 The Bitcoin developers +// Copyright (c) 2011-2013 The Litecoin developers +// Copyright (c) 2013-2014 The Dogecoin developers +// Copyright (c) 2014 The Inutoshi developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/miner.cpp b/src/miner.cpp index 1c4c5bf2f..2df6ff15d 100644 --- a/src/miner.cpp +++ b/src/miner.cpp @@ -1,5 +1,8 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2014 The Bitcoin developers +// Copyright (c) 2011-2013 The Litecoin developers +// Copyright (c) 2013-2014 The Dogecoin developers +// Copyright (c) 2014 The Inutoshi developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/protocol.h b/src/protocol.h index 76e120237..4ea0bcebb 100644 --- a/src/protocol.h +++ b/src/protocol.h @@ -1,5 +1,8 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2013 The Bitcoin developers +// Copyright (c) 2011-2013 The Litecoin developers +// Copyright (c) 2013-2014 The Dogecoin developers +// Copyright (c) 2014 The Inutoshi developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/rpcserver.cpp b/src/rpcserver.cpp index fa56d9774..2cb451cd5 100644 --- a/src/rpcserver.cpp +++ b/src/rpcserver.cpp @@ -1,5 +1,6 @@ // Copyright (c) 2010 Satoshi Nakamoto // Copyright (c) 2009-2014 The Bitcoin developers +// Copyright (c) 2014 The Inutoshi developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/util.cpp b/src/util.cpp index 96619f8db..17f4dc3d3 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -1,5 +1,7 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2014 The Bitcoin developers +// Copyright (c) 2011-2013 The Litecoin developers +// Copyright (c) 2014 The Inutoshi developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/util.h b/src/util.h index 4cfe15cbf..ef4098156 100644 --- a/src/util.h +++ b/src/util.h @@ -1,5 +1,7 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2014 The Bitcoin developers +// Copyright (c) 2011-2013 The Litecoin developers +// Copyright (c) 2014 The Inutoshi developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/version.cpp b/src/version.cpp index e725bded2..83cc18985 100644 --- a/src/version.cpp +++ b/src/version.cpp @@ -1,4 +1,5 @@ // Copyright (c) 2012 The Bitcoin developers +// Copyright (c) 2014 The Inutoshi developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/version.h b/src/version.h index 2612d458a..c0d104fba 100644 --- a/src/version.h +++ b/src/version.h @@ -1,4 +1,5 @@ // Copyright (c) 2012 The Bitcoin developers +// Copyright (c) 2014 The Inutoshi developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. #ifndef BITCOIN_VERSION_H