cleanup: fix header includes sorting and copy

Github-Pull: #2642
Rebased-From: 525c2e7

src/sapling/address.cpp

@@ -1,9 +1,14 @@
+// Copyright (c) 2016-2020 The ZCash developers
+// Copyright (c) 2021 The PIVX developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or https://www.opensource.org/licenses/mit-license.php.
+
 #include "sapling/address.h"
+
+#include "hash.h"
 #include "sapling/noteencryption.h"
 #include "sapling/prf.h"
 #include "sapling/sapling_util.h"
-
-#include "hash.h"
 #include "streams.h"
 
 #include <librustzcash.h>

src/sapling/address.h

@@ -1,12 +1,17 @@
+// Copyright (c) 2016-2020 The ZCash developers
+// Copyright (c) 2021 The PIVX developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or https://www.opensource.org/licenses/mit-license.php.
+
 #ifndef ZC_ADDRESS_H_
 #define ZC_ADDRESS_H_
 
-#include "uint256.h"
-#include "serialize.h"
+#include "optional.h"
 #include "sapling/sapling.h"
+#include "serialize.h"
+#include "uint256.h"
 
 #include <array>
-#include "optional.h"
 #include <boost/variant.hpp>
 
 namespace libzcash {

src/sapling/incrementalmerkletree.cpp

@@ -1,12 +1,13 @@
-// Copyright (c) 2016-2018 The Zcash developers
-// Copyright (c) 2020 The PIVX developers
+// Copyright (c) 2016-2020 The ZCash developers
+// Copyright (c) 2021 The PIVX developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or https://www.opensource.org/licenses/mit-license.php.
 
 #include <stdexcept>
 
 #include "crypto/sha256.h"
 #include "sapling/incrementalmerkletree.h"
+
 #include <librustzcash.h>
 
 namespace libzcash {

src/sapling/note.cpp

@@ -1,12 +1,16 @@
+// Copyright (c) 2016-2020 The ZCash developers
+// Copyright (c) 2021 The PIVX developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or https://www.opensource.org/licenses/mit-license.php.
+
 #include "sapling/note.h"
 
-#include "sapling/prf.h"
-#include "sapling/sapling_util.h"
 #include "crypto/sha256.h"
-
 #include "random.h"
-#include "version.h"
+#include "sapling/prf.h"
+#include "sapling/sapling_util.h"
 #include "streams.h"
+#include "version.h"
 
 #include <librustzcash.h>
 

src/sapling/note.h

@@ -1,13 +1,18 @@
+// Copyright (c) 2016-2020 The ZCash developers
+// Copyright (c) 2021 The PIVX developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or https://www.opensource.org/licenses/mit-license.php.
+
 #ifndef ZC_NOTE_H_
 #define ZC_NOTE_H_
 
+#include "optional.h"
 #include "sapling/address.h"
 #include "sapling/noteencryption.h"
 #include "sapling/sapling.h"
 #include "uint256.h"
 
 #include <array>
-#include "optional.h"
 
 namespace libzcash {
 

src/sapling/noteencryption.cpp

@@ -1,7 +1,7 @@
 // Copyright (c) 2016-2020 The ZCash developers
-// Copyright (c) 2020 The PIVX developers
+// Copyright (c) 2021 The PIVX developers
 // Distributed under the MIT software license, see the accompanying
-// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+// file COPYING or https://www.opensource.org/licenses/mit-license.php.
 
 #include "sapling/noteencryption.h"
 

src/sapling/noteencryption.h

@@ -1,7 +1,7 @@
 // Copyright (c) 2016-2020 The ZCash developers
-// Copyright (c) 2020 The PIVX developers
+// Copyright (c) 2021 The PIVX developers
 // Distributed under the MIT software license, see the accompanying
-// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+// file COPYING or https://www.opensource.org/licenses/mit-license.php.
 
 /*
 See the Zcash protocol specification for more information.
@@ -11,12 +11,11 @@ See the Zcash protocol specification for more information.
 #ifndef ZC_NOTE_ENCRYPTION_H_
 #define ZC_NOTE_ENCRYPTION_H_
 
-#include "uint256.h"
-
+#include "optional.h"
 #include "sapling/sapling.h"
+#include "uint256.h"
 
 #include <array>
-#include "optional.h"
 
 namespace libzcash {
 

src/sapling/sapling_operation.cpp

@@ -1,4 +1,4 @@
-// Copyright (c) 2020 The PIVX developers
+// Copyright (c) 2021 The PIVX developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or https://www.opensource.org/licenses/mit-license.php.
 

src/sapling/saplingscriptpubkeyman.cpp

@@ -1,9 +1,10 @@
 // Copyright (c) 2016-2020 The ZCash developers
-// Copyright (c) 2020 The PIVX developers
+// Copyright (c) 2021 The PIVX developers
 // Distributed under the MIT software license, see the accompanying
-// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+// file COPYING or https://www.opensource.org/licenses/mit-license.php.
 
 #include "sapling/saplingscriptpubkeyman.h"
+
 #include "chain.h" // for CBlockIndex
 #include "validation.h" // for ReadBlockFromDisk()
 

src/sapling/zip32.cpp

@@ -1,14 +1,15 @@
-// Copyright (c) 2018 The Zcash developers
+// Copyright (c) 2018-2020 The ZCash developers
+// Copyright (c) 2021 The PIVX developers
 // Distributed under the MIT software license, see the accompanying
-// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+// file COPYING or https://www.opensource.org/licenses/mit-license.php.
 
 #include "sapling/zip32.h"
 
 #include "hash.h"
 #include "random.h"
+#include "sapling/prf.h"
 #include "streams.h"
 #include "version.h"
-#include "sapling/prf.h"
 
 #include <librustzcash.h>
 #include <sodium.h>

src/sapling/zip32.h

@@ -1,19 +1,18 @@
-// Copyright (c) 2018 The Zcash developers
+// Copyright (c) 2018-2020 The ZCash developers
+// Copyright (c) 2021 The PIVX developers
 // Distributed under the MIT software license, see the accompanying
-// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+// file COPYING or https://www.opensource.org/licenses/mit-license.php.
 
 #ifndef PIVX_ZIP32_H
 #define PIVX_ZIP32_H
 
-#include "uint256.h"
 #include "key.h"
+#include "optional.h"
 #include "sapling/address.h"
 #include "serialize.h"
 #include "support/allocators/zeroafterfree.h"
 #include "uint256.h"
 
-#include "optional.h"
-
 const uint32_t ZIP32_HARDENED_KEY_LIMIT = 0x80000000;
 const size_t ZIP32_XFVK_SIZE = 169;
 const size_t ZIP32_XSK_SIZE = 169;

src/util/system.h

@@ -1,9 +1,9 @@
 // Copyright (c) 2009-2010 Satoshi Nakamoto
 // Copyright (c) 2009-2014 The Bitcoin developers
 // Copyright (c) 2014-2015 The Dash developers
-// Copyright (c) 2015-2020 The PIVX developers
+// Copyright (c) 2015-2021 The PIVX developers
 // Distributed under the MIT software license, see the accompanying
-// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+// file COPYING or https://www.opensource.org/licenses/mit-license.php.
 
 /**
  * Server/client environment: argument handling, config file parsing,
@@ -19,6 +19,7 @@
 #include "fs.h"
 #include "logging.h"
 #include "compat.h"
+#include "optional.h"
 #include "sync.h"
 #include "tinyformat.h"
 #include "utiltime.h"

src/wallet/test/wallet_shielded_balances_tests.cpp

@@ -1,4 +1,4 @@
-// Copyright (c) 2020 The PIVX developers
+// Copyright (c) 2021 The PIVX developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or https://www.opensource.org/licenses/mit-license.php.
 
@@ -14,7 +14,6 @@
 #include "wallet/wallet.h"
 
 #include <boost/filesystem.hpp>
-
 #include <boost/test/unit_test.hpp>
 
 CAmount fee = COIN; // Hardcoded fee