[wallet] Initial (partial, test) changes to fix include guards from Zcash for Bitcoin's lint script

.vscode/settings.json

@@ -0,0 +1,57 @@
+{
+    "files.associations": {
+        "cctype": "cpp",
+        "cmath": "cpp",
+        "csignal": "cpp",
+        "cstdarg": "cpp",
+        "cstddef": "cpp",
+        "cstdio": "cpp",
+        "cstdlib": "cpp",
+        "cstring": "cpp",
+        "ctime": "cpp",
+        "cwchar": "cpp",
+        "cwctype": "cpp",
+        "array": "cpp",
+        "atomic": "cpp",
+        "strstream": "cpp",
+        "*.tcc": "cpp",
+        "bitset": "cpp",
+        "chrono": "cpp",
+        "clocale": "cpp",
+        "complex": "cpp",
+        "condition_variable": "cpp",
+        "cstdint": "cpp",
+        "deque": "cpp",
+        "list": "cpp",
+        "unordered_map": "cpp",
+        "unordered_set": "cpp",
+        "vector": "cpp",
+        "exception": "cpp",
+        "fstream": "cpp",
+        "functional": "cpp",
+        "future": "cpp",
+        "initializer_list": "cpp",
+        "iomanip": "cpp",
+        "iosfwd": "cpp",
+        "iostream": "cpp",
+        "istream": "cpp",
+        "limits": "cpp",
+        "memory": "cpp",
+        "mutex": "cpp",
+        "new": "cpp",
+        "ostream": "cpp",
+        "numeric": "cpp",
+        "ratio": "cpp",
+        "sstream": "cpp",
+        "stdexcept": "cpp",
+        "streambuf": "cpp",
+        "system_error": "cpp",
+        "thread": "cpp",
+        "cinttypes": "cpp",
+        "type_traits": "cpp",
+        "tuple": "cpp",
+        "typeindex": "cpp",
+        "typeinfo": "cpp",
+        "utility": "cpp"
+    }
+}

src/asyncrpcoperation.h

@@ -1,10 +1,11 @@
+// Copyright (c) 2016 The Bitcoin Private developers
 // Copyright (c) 2016 The Zcash developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 
-#ifndef ASYNCRPCOPERATION_H
+#ifndef BITCOIN_ASYNCRPCOPERATION_H
-#define ASYNCRPCOPERATION_H
+#define BITCOIN_ASYNCRPCOPERATION_H
 
 #include <string>
 #include <atomic>

src/asyncrpcqueue.h

@@ -1,9 +1,10 @@
+// Copyright (c) 2018 The Bitcoin Private developers
 // Copyright (c) 2016 The Zcash developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#ifndef ASYNCRPCQUEUE_H
+#ifndef BITCOIN_ASYNCRPCQUEUE_H
-#define ASYNCRPCQUEUE_H
+#define BITCOIN_ASYNCRPCQUEUE_H
 
 #include <asyncrpcoperation.h>
 

src/consensus/joinsplit.h

@@ -1,9 +1,9 @@
-// Copyright (c) 2018      The Bitcoin Private developers
+// Copyright (c) 2018 The Bitcoin Private developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#ifndef BTCP_CONSENSUS_JOINSPLIT_H
+#ifndef BITCOIN_CONSENSUS_JOINSPLIT_H
-#define BTCP_CONSENSUS_JOINSPLIT_H
+#define BITCOIN_CONSENSUS_JOINSPLIT_H
 
 bool CheckTransactionJoinsplits(const CTransaction& tx, CValidationState &state);
 

src/fork.h

@@ -1,9 +1,9 @@
-// Copyright (c) 2018      The Bitcoin Private developers
+// Copyright (c) 2018 The Bitcoin Private developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#ifndef BTCP_FORK_H
+#ifndef BITCOIN_FORK_H
-#define BTCP_FORK_H
+#define BITCOIN_FORK_H
 
 #include <consensus/validation.h>
 #include <primitives/block.h>

src/primitives/joinsplit.h

@@ -4,8 +4,8 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#ifndef BTCP_PRIMITIVES_JOINSPLIT_H
+#ifndef BITCOIN_PRIMITIVES_JOINSPLIT_H
-#define BTCP_PRIMITIVES_JOINSPLIT_H
+#define BITCOIN_PRIMITIVES_JOINSPLIT_H
 
 #include <amount.h>
 #include <random.h>

src/zcash/Address.cpp

@@ -1,3 +1,7 @@
+// Copyright (c) 2016 The Zcash developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
 #include "Address.hpp"
 #include "NoteEncryption.hpp"
 #include "hash.h"

src/zcash/Address.hpp

@@ -1,5 +1,10 @@
-#ifndef ZC_ADDRESS_H_
+// Copyright (c) 2018 The Bitcoin Private developers
-#define ZC_ADDRESS_H_
+// Copyright (c) 2016 The Zcash developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#ifndef BITCOIN_ZCASH_ADDRESS_H
+#define BITCOIN_ZCASH_ADDRESS_H
 
 #include "uint256.h"
 #include "uint252.h"
@@ -88,4 +93,4 @@ public:
 
 }
 
-#endif // ZC_ADDRESS_H_
+#endif // BITCOIN_ZCASH_ADDRESS_H

src/zcash/GenerateParams.cpp

@@ -1,3 +1,7 @@
+// Copyright (c) 2016 The Zcash developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
 #include "zcash/JoinSplit.hpp"
 
 #include <iostream>

src/zcash/IncrementalMerkleTree.cpp

@@ -1,3 +1,8 @@
+// Copyright (c) 2018 The Bitcoin Private developers
+// Copyright (c) 2016 The Zcash developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
 #include <stdexcept>
 
 #include <boost/foreach.hpp>

src/zcash/IncrementalMerkleTree.hpp

@@ -1,5 +1,10 @@
-#ifndef ZC_INCREMENTALMERKLETREE_H_
+// Copyright (c) 2018 The Bitcoin Private developers
-#define ZC_INCREMENTALMERKLETREE_H_
+// Copyright (c) 2016 The Zcash developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#ifndef BITCOIN_ZCASH_INCREMENTALMERKLETREE_H
+#define BITCOIN_ZCASH_INCREMENTALMERKLETREE_H
 
 #include <array>
 #include <deque>
@@ -203,4 +208,4 @@ typedef libzcash::IncrementalMerkleTree<INCREMENTAL_MERKLE_TREE_DEPTH_TESTING, l
 typedef libzcash::IncrementalWitness<INCREMENTAL_MERKLE_TREE_DEPTH, libzcash::SHA256Compress> ZCIncrementalWitness;
 typedef libzcash::IncrementalWitness<INCREMENTAL_MERKLE_TREE_DEPTH_TESTING, libzcash::SHA256Compress> ZCTestingIncrementalWitness;
 
-#endif /* ZC_INCREMENTALMERKLETREE_H_ */
+#endif // BITCOIN_ZCASH_INCREMENTALMERKLETREE_H

src/zcash/JoinSplit.cpp

@@ -1,3 +1,8 @@
+// Copyright (c) 2018 The Bitcoin Private developers
+// Copyright (c) 2016 The Zcash developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
 #include "JoinSplit.hpp"
 #include "prf.h"
 #include "sodium.h"

src/zcash/JoinSplit.hpp

@@ -1,5 +1,10 @@
-#ifndef ZC_JOINSPLIT_H_
+// Copyright (c) 2018 The Bitcoin Private developers
-#define ZC_JOINSPLIT_H_
+// Copyright (c) 2016 The Zcash developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#ifndef BITCOIN_ZCASH_JOINSPLIT_H
+#define BITCOIN_ZCASH_JOINSPLIT_H
 
 #include "Zcash.h"
 #include "Proof.hpp"
@@ -102,4 +107,4 @@ protected:
 typedef libzcash::JoinSplit<ZC_NUM_JS_INPUTS,
                             ZC_NUM_JS_OUTPUTS> ZCJoinSplit;
 
-#endif // ZC_JOINSPLIT_H_
+#endif // BITCOIN_ZCASH_JOINSPLIT_H

src/zcash/Note.cpp

@@ -1,3 +1,7 @@
+// Copyright (c) 2016 The Zcash developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
 #include "Note.hpp"
 #include "prf.h"
 #include "crypto/sha256.h"

src/zcash/Note.hpp

@@ -1,5 +1,10 @@
-#ifndef ZC_NOTE_H_
+// Copyright (c) 2018 The Bitcoin Private developers
-#define ZC_NOTE_H_
+// Copyright (c) 2016 The Zcash developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#ifndef BITCOIN_ZCASH_NOTE_H
+#define BITCOIN_ZCASH_NOTE_H
 
 #include "uint256.h"
 #include "Zcash.h"
@@ -69,4 +74,4 @@ public:
 
 }
 
-#endif // ZC_NOTE_H_
+#endif // BITCOIN_ZCASH_NOTE_H

src/zcash/NoteEncryption.cpp

@@ -1,3 +1,7 @@
+// Copyright (c) 2016 The Zcash developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
 #include "NoteEncryption.hpp"
 #include <stdexcept>
 #include "sodium.h"

src/zcash/NoteEncryption.hpp

@@ -1,10 +1,10 @@
-/*
+// Copyright (c) 2018 The Bitcoin Private developers
-See the Zcash protocol specification for more information.
+// Copyright (c) 2016 The Zcash developers
-https://github.com/zcash/zips/blob/master/protocol/protocol.pdf
+// Distributed under the MIT software license, see the accompanying
-*/
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#ifndef ZC_NOTE_ENCRYPTION_H_
+#ifndef BITCOIN_ZCASH_NOTEENCRYPTION_H
-#define ZC_NOTE_ENCRYPTION_H_
+#define BITCOIN_ZCASH_NOTEENCRYPTION_H
 
 #include <array>
 #include "uint256.h"
@@ -122,4 +122,4 @@ typedef libzcash::NoteDecryption<ZC_NOTEPLAINTEXT_SIZE> ZCNoteDecryption;
 
 typedef libzcash::PaymentDisclosureNoteDecryption<ZC_NOTEPLAINTEXT_SIZE> ZCPaymentDisclosureNoteDecryption;
 
-#endif /* ZC_NOTE_ENCRYPTION_H_ */
+#endif // BITCOIN_ZCASH_NOTEENCRYPTION_H

src/zcash/Proof.cpp

@@ -1,3 +1,7 @@
+// Copyright (c) 2016 The Zcash developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
 #include "Proof.hpp"
 
 #include "crypto/common.h"

src/zcash/Proof.hpp

@@ -1,5 +1,10 @@
-#ifndef ZC_PROOF_H_
+// Copyright (c) 2018 The Bitcoin Private developers
-#define ZC_PROOF_H_
+// Copyright (c) 2016 The Zcash developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#ifndef BITCOIN_ZCASH_PROOF_H
+#define BITCOIN_ZCASH_PROOF_H
 
 #include "serialize.h"
 #include "uint256.h"
@@ -274,4 +279,4 @@ public:
 
 }
 
-#endif // ZC_PROOF_H_
+#endif // BITCOIN_ZCASH_PROOF_H

src/zcash/Zcash.h

@@ -1,5 +1,10 @@
-#ifndef ZC_ZCASH_H_
+// Copyright (c) 2018 The Bitcoin Private developers
-#define ZC_ZCASH_H_
+// Copyright (c) 2016 The Zcash developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#ifndef BITCOIN_ZCASH_ZCASH_H
+#define BITCOIN_ZCASH_ZCASH_H
 
 #define ZC_NUM_JS_INPUTS 2
 #define ZC_NUM_JS_OUTPUTS 2
@@ -14,4 +19,4 @@
 
 #define ZC_NOTEPLAINTEXT_SIZE (ZC_NOTEPLAINTEXT_LEADING + ZC_V_SIZE + ZC_RHO_SIZE + ZC_R_SIZE + ZC_MEMO_SIZE)
 
-#endif // ZC_ZCASH_H_
+#endif // BITCOIN_ZCASH_ZCASH_H

src/zcash/prf.cpp

@@ -1,3 +1,7 @@
+// Copyright (c) 2016 The Zcash developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
 #include "prf.h"
 #include "crypto/sha256.h"
 

src/zcash/prf.h

@@ -1,10 +1,15 @@
+// Copyright (c) 2018 The Bitcoin Private developers
+// Copyright (c) 2016 The Zcash developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
 /*
 Zcash uses SHA256Compress as a PRF for various components
 within the zkSNARK circuit.
 */
 
-#ifndef ZC_PRF_H_
+#ifndef BITCOIN_ZCASH_PRF_H
-#define ZC_PRF_H_
+#define BITCOIN_ZCASH_PRF_H
 
 #include "uint256.h"
 #include "uint252.h"
@@ -15,4 +20,4 @@ uint256 PRF_nf(const uint252& a_sk, const uint256& rho);
 uint256 PRF_pk(const uint252& a_sk, size_t i0, const uint256& h_sig);
 uint256 PRF_rho(const uint252& phi, size_t i0, const uint256& h_sig);
 
-#endif // ZC_PRF_H_
+#endif // BITCOIN_ZCASH_PRF_H

src/zcash/util.cpp

@@ -1,3 +1,7 @@
+// Copyright (c) 2016 The Zcash developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
 #include "zcash/util.h"
 #include <algorithm>
 #include <stdexcept>

src/zcash/util.h

@@ -1,5 +1,10 @@
-#ifndef ZC_UTIL_H_
+// Copyright (c) 2018 The Bitcoin Private developers
-#define ZC_UTIL_H_
+// Copyright (c) 2016 The Zcash developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#ifndef BITCOIN_ZCASH_UTIL_H
+#define BITCOIN_ZCASH_UTIL_H
 
 #include <vector>
 #include <cstdint>
@@ -8,4 +13,4 @@ std::vector<unsigned char> convertIntToVectorLE(const uint64_t val_int);
 std::vector<bool> convertBytesVectorToVector(const std::vector<unsigned char>& bytes);
 uint64_t convertVectorToInt(const std::vector<bool>& v);
 
-#endif // ZC_UTIL_H_
+#endif // BITCOIN_ZCASH_UTIL_H