Update licensing information.

COPYING

@@ -1,23 +1,4 @@
-The MIT License (MIT)
+For licensing of all portions of code coming from upstream, please review COPYING_upstream which is an unmodified copy of the upstream license.
+For licensing of all portions of the code coming from the Gulden project, please review COPYING_gulden which is an unmodified copy of the Gulden license.
 
-Copyright (c) 2009-2016 The Bitcoin Core developers
-
-Copyright (c) 2011-2016 Gulden Developers
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+All code in this repository falls under one or both of the above two licenses unless stated otherwise.

COPYING_gulden

@@ -0,0 +1,78 @@
+The Gulden License
+
+Copyright (c) 2012-2016 Gulden Developers
+
+TERMS AND CONDITIONS
+
+1. Usage
+
+You are free to download, copy, compile, study, and
+refer to the source code for any personal use of yours.
+
+Usage by you of any work covered by this license should
+not, directly or indirectly, enable its usage by any
+other individual or organisation.
+
+2. Modifications
+
+You are free to make any modifications to the source
+covered by this license. You are also free to compile
+the source after modifying it and using the compiled
+product obtained thereafter in compliance with this
+License.
+
+3. Redistribution
+
+You may NOT under any circumstance copy, redistribute
+and/or republish the source or a work based on it (which
+includes binary or object code compiled from it - or parts of code extracted from it) in part
+or whole. Without the prior written consent of the copyright holders.
+An exception is granted to all package managers such as those found on Linux distributions or other operating systems
+so long as the modifications are limited to those necessary to make the program work on the desired system, do not make any changes to branding,
+and do not otherwise alter behaviour in a way that may negatively impact users in any form whatsoever.
+The copyright holders reserve the right to revoke licensing permission in any case where they feel the above is violated, at any
+time, with immediate effect, based on their own discretion.
+UNDER NO CIRCUMSTANCES MAY THE SOFTWARE BE ALTERED IN SUCH A WAY AS TO MAKE IT WORK ON A NETWORK OTHER THAN "The Gulden network"
+OR TO USE A BLOCKCHAIN OTHER THAN "The Gulden blockchain"
+
+
+4. Non-compliance
+
+You may not copy, modify, sublicense, or distribute the
+Program except as expressly provided under this License.
+Any attempt otherwise to copy, modify, sublicense or
+distribute the Program is void, and will automatically
+terminate your rights under this License.
+
+5. Acceptance of License
+
+You are not required to accept this License, since you have
+not signed it. However, nothing else grants you permission
+to modify or use the source. These actions are prohibited
+by law if you do not accept this License. Therefore, by
+modifying or using the source (or any work based on the
+source), you indicate your acceptance of this License to do
+so, and all its terms and conditions for copying,
+redistributing or modifying the source or works based on it.
+
+6. Permissions
+
+If you intend to incorporate the source code, in part or whole,
+into any free or proprietary program, you need to explicitly
+write to the original author(s) to ask for permission.
+
+7. No Warranty
+
+The source code licensed under this license is shared "as is".
+Since it is intended for sharing as reference, there is no
+warranty, of either the source code, or the program compiled
+from it. The entire risk of quality or performance of the 
+program is with you.
+
+THE ORIGINAL AUTHOR OF THE PROGRAM IS NOT LIABLE TO YOU FOR
+DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO
+USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR
+DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR
+THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY
+OTHER PROGRAMS)

COPYING_upstream

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2009-2016 The Bitcoin Core developers
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

src/Gulden/auto_checkpoints.cpp

@@ -1,6 +1,11 @@
-// Copyright (c) 2011-2013 The PPCoin developers
-// Copyright (c) 2015 The Gulden core developers
-// Distributed under the MIT/X11 software license, see the accompanying
+// Copyright (c) 2015-2016 The Gulden developers
+// Authored by: Malcolm MacLeod (mmacleod@webmail.co.za)
+// Distributed under the GULDEN software license, see the accompanying
+// file COPYING
+
+// Portions of this code have been copied from PPCoin
+// These portions are Copyright (c) 2011-2013 The PPCoin developers
+// and are Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include "checkpoints.h"

src/Gulden/auto_checkpoints.h

@@ -1,7 +1,13 @@
-// Copyright (c) 2009-2012 The Gulden developers
-// Copyright (c) 2011-2013 The PPCoin developers
-// Distributed under the MIT/X11 software license, see the accompanying
+// Copyright (c) 2015-2016 The Gulden developers
+// Authored by: Malcolm MacLeod (mmacleod@webmail.co.za)
+// Distributed under the GULDEN software license, see the accompanying
+// file COPYING
+
+// Portions of this code have been copied from PPCoin
+// These portions are Copyright (c) 2011-2013 The PPCoin developers
+// and are Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
 #ifndef GULDEN_AUTO_CHECKPOINT_H
 #define  GULDEN_AUTO_CHECKPOINT_H
 

src/Gulden/guldenapplication.cpp

@@ -1,5 +1,9 @@
-#include "guldenapplication.h"
+// Copyright (c) 2016 The Gulden developers
+// Authored by: Malcolm MacLeod (mmacleod@webmail.co.za)
+// Distributed under the GULDEN software license, see the accompanying
+// file COPYING
 
+#include "guldenapplication.h"
 
 GuldenApplication* GuldenApplication::gApp = new GuldenApplication();
 

src/Gulden/guldenapplication.h

@@ -1,7 +1,7 @@
-// Copyright (c) 2015 The Gulden developers
+// Copyright (c) 2016 The Gulden developers
 // Authored by: Malcolm MacLeod (mmacleod@webmail.co.za)
-// Distributed under the MIT software license, see the accompanying
-// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+// Distributed under the GULDEN software license, see the accompanying
+// file COPYING
 
 #ifndef GULDEN_QT_GULDENAPPLICATION_H
 #define GULDEN_QT_GULDENAPPLICATION_H

src/Gulden/mnemonic.cpp

@@ -1,3 +1,8 @@
+// Copyright (c) 2016 The Gulden developers
+// Authored by: Malcolm MacLeod (mmacleod@webmail.co.za)
+// Distributed under the GULDEN software license, see the accompanying
+// file COPYING
+
 #include "mnemonic.h"
 #include "arith_uint256.h"
 

src/Gulden/mnemonic.h

@@ -1,9 +1,7 @@
-#ifndef GULDEN_MNEMONIC_H
-#define GULDEN_MNEMONIC_H
-// Copyright (c) 2016  The Gulden developers
+// Copyright (c) 2016 The Gulden developers
 // Authored by: Malcolm MacLeod (mmacleod@webmail.co.za)
-// Distributed under the MIT software license, see the accompanying
-// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+// Distributed under the GULDEN software license, see the accompanying
+// file COPYING
 
 // The below file implements the various Mnemonic/Seed/Entropy relations required to create a BIP39 compliant HD wallet.
 // It is likely that none of these functions are implemented in the most elegant (or efficient) way possible
@@ -12,6 +10,9 @@
 
 // Note this has not been tested on big endian machines and likely requires further work for them.
 
+#ifndef GULDEN_MNEMONIC_H
+#define GULDEN_MNEMONIC_H
+
 #include <string>
 #include <vector>
 #include "support/allocators/secure.h"

src/Gulden/rpcgulden.cpp

@@ -1,3 +1,8 @@
+// Copyright (c) 2015-2016 The Gulden developers
+// Authored by: Malcolm MacLeod (mmacleod@webmail.co.za)
+// Distributed under the GULDEN software license, see the accompanying
+// file COPYING
+
 #include "rpcgulden.h"
 #include "../miner.h"
 #include <rpc/server.h>

src/Gulden/rpcgulden.h

@@ -1,3 +1,8 @@
+// Copyright (c) 2015-2016 The Gulden developers
+// Authored by: Malcolm MacLeod (mmacleod@webmail.co.za)
+// Distributed under the GULDEN software license, see the accompanying
+// file COPYING
+
 #ifndef GULDEN_RPC_H
 #define GULDEN_RPC_H
 

src/Gulden/translate.h

@@ -1,7 +1,7 @@
-// Copyright (c) 2015 The Gulden developers
+// Copyright (c) 2015-2016 The Gulden developers
 // Authored by: Malcolm MacLeod (mmacleod@webmail.co.za)
-// Distributed under the MIT software license, see the accompanying
-// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+// Distributed under the GULDEN software license, see the accompanying
+// file COPYING
 
 #ifndef GULDEN_TRANS_H
 #define GULDEN_TRANS_H

src/account.cpp

@@ -1,3 +1,8 @@
+// Copyright (c) 2016 The Gulden developers
+// Authored by: Malcolm MacLeod (mmacleod@webmail.co.za)
+// Distributed under the GULDEN software license, see the accompanying
+// file COPYING
+
 #include "account.h"
 #include "wallet/wallet.h"
 #include <Gulden/mnemonic.h>

src/account.h

@@ -1,3 +1,8 @@
+// Copyright (c) 2016 The Gulden developers
+// Authored by: Malcolm MacLeod (mmacleod@webmail.co.za)
+// Distributed under the GULDEN software license, see the accompanying
+// file COPYING
+
 #ifndef GULDEN_ACCOUNT_H
 #define GULDEN_ACCOUNT_H
 

src/alert.cpp

@@ -2,6 +2,13 @@
 // Copyright (c) 2009-2015 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
+//
+// File contains modifications by: The Gulden developers
+// All modifications:
+// Copyright (c) 2016 The Gulden developers
+// Authored by: Malcolm MacLeod (mmacleod@webmail.co.za)
+// Distributed under the GULDEN software license, see the accompanying
+// file COPYING
 
 #include "alert.h"
 

src/alert.h

@@ -2,6 +2,13 @@
 // Copyright (c) 2009-2015 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
+//
+// File contains modifications by: The Gulden developers
+// All modifications:
+// Copyright (c) 2016 The Gulden developers
+// Authored by: Malcolm MacLeod (mmacleod@webmail.co.za)
+// Distributed under the GULDEN software license, see the accompanying
+// file COPYING
 
 #ifndef BITCOIN_ALERT_H
 #define BITCOIN_ALERT_H

src/amount.h

@@ -2,6 +2,13 @@
 // Copyright (c) 2009-2015 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
+//
+// File contains modifications by: The Gulden developers
+// All modifications:
+// Copyright (c) 2016 The Gulden developers
+// Authored by: Malcolm MacLeod (mmacleod@webmail.co.za)
+// Distributed under the GULDEN software license, see the accompanying
+// file COPYING
 
 #ifndef BITCOIN_AMOUNT_H
 #define BITCOIN_AMOUNT_H

src/base58.cpp

@@ -1,6 +1,13 @@
 // Copyright (c) 2014-2015 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
+//
+// File contains modifications by: The Gulden developers
+// All modifications:
+// Copyright (c) 2016 The Gulden developers
+// Authored by: Malcolm MacLeod (mmacleod@webmail.co.za)
+// Distributed under the GULDEN software license, see the accompanying
+// file COPYING
 
 #include "base58.h"
 

src/base58.h

@@ -2,6 +2,13 @@
 // Copyright (c) 2009-2015 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
+//
+// File contains modifications by: The Gulden developers
+// All modifications:
+// Copyright (c) 2016 The Gulden developers
+// Authored by: Malcolm MacLeod (mmacleod@webmail.co.za)
+// Distributed under the GULDEN software license, see the accompanying
+// file COPYING
 
 /**
  * Why base-58 instead of standard base-64 encoding?

src/bitcoin-cli.cpp

@@ -2,6 +2,13 @@
 // Copyright (c) 2009-2015 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
+//
+// File contains modifications by: The Gulden developers
+// All modifications:
+// Copyright (c) 2016 The Gulden developers
+// Authored by: Malcolm MacLeod (mmacleod@webmail.co.za)
+// Distributed under the GULDEN software license, see the accompanying
+// file COPYING
 
 #if defined(HAVE_CONFIG_H)
 #include "config/bitcoin-config.h"

src/bitcoin-tx.cpp

@@ -1,6 +1,13 @@
 // Copyright (c) 2009-2015 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
+//
+// File contains modifications by: The Gulden developers
+// All modifications:
+// Copyright (c) 2016 The Gulden developers
+// Authored by: Malcolm MacLeod (mmacleod@webmail.co.za)
+// Distributed under the GULDEN software license, see the accompanying
+// file COPYING
 
 #if defined(HAVE_CONFIG_H)
 #include "config/bitcoin-config.h"

src/bitcoind.cpp

@@ -2,6 +2,13 @@
 // Copyright (c) 2009-2015 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
+//
+// File contains modifications by: The Gulden developers
+// All modifications:
+// Copyright (c) 2016 The Gulden developers
+// Authored by: Malcolm MacLeod (mmacleod@webmail.co.za)
+// Distributed under the GULDEN software license, see the accompanying
+// file COPYING
 
 #if defined(HAVE_CONFIG_H)
 #include "config/bitcoin-config.h"

src/chain.h

@@ -2,6 +2,13 @@
 // Copyright (c) 2009-2015 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
+//
+// File contains modifications by: The Gulden developers
+// All modifications:
+// Copyright (c) 2016 The Gulden developers
+// Authored by: Malcolm MacLeod (mmacleod@webmail.co.za)
+// Distributed under the GULDEN software license, see the accompanying
+// file COPYING
 
 #ifndef BITCOIN_CHAIN_H
 #define BITCOIN_CHAIN_H