Merge pull request #83 from AnduroProject/AN-483-include-p2tsh-support

An 483 include p2tsh support

Author: sucildossj

doc/p2tsh.md

@@ -0,0 +1,106 @@
+# Coordinate BIP-360 Post-Quantum Wallet Guide
+
+Guide for using Coordinate's BIP-360 post-quantum cryptographic wallets.
+
+## Overview
+
+BIP-360 adds quantum-resistant signatures to Coordinate with three signature schemes:
+
+- **Hybrid**: Traditional + Quantum-resistant (Recommended)
+- **Schnorr**: Traditional signatures only
+- **SLHDSA**: Fully quantum-resistant
+
+## Prerequisites
+
+```conf
+# bitcoin.conf
+regtest=1
+rpcuser=marachain
+rpcpassword=marachain
+rpcport=18443
+```
+
+## 1. Create Wallets
+
+**Hybrid Wallet:**
+```bash
+./build/bin/bitcoin-cli -rpcuser=marachain -rpcpassword=marachain \
+  -rpcport=18443 -regtest=1 \
+  createwallet "test_p2tsh" false false "" false true false false true "hybrid"
+```
+
+**Schnorr Wallet:**
+```bash
+./build/bin/bitcoin-cli -rpcuser=marachain -rpcpassword=marachain \
+  -rpcport=18443 -regtest=1 \
+  createwallet "schnorr_wallet" false false "" false true false false true "schnorr"
+```
+
+**SLHDSA Wallet:**
+```bash
+./build/bin/bitcoin-cli -rpcuser=marachain -rpcpassword=marachain \
+  -rpcport=18443 -regtest=1 \
+  createwallet "slhdsa_wallet" false false "" false true false false true "slhdsa"
+```
+
+## 2. Generate Addresses
+
+**Hybrid Address:**
+```bash
+./build/bin/bitcoin-cli -rpcuser=marachain -rpcpassword=marachain \
+  -rpcport=18443 -regtest=1 \
+  -rpcwallet=test_p2tsh getnewaddress "" "p2tsh_hybrid"
+```
+
+**Schnorr Address:**
+```bash
+./build/bin/bitcoin-cli -rpcuser=marachain -rpcpassword=marachain \
+  -rpcport=18443 -regtest=1 \
+  -rpcwallet=schnorr_wallet getnewaddress "" "p2tsh_schnorr"
+```
+
+**SLHDSA Address:**
+```bash
+./build/bin/bitcoin-cli -rpcuser=marachain -rpcpassword=marachain \
+  -rpcport=18443 -regtest=1 \
+  -rpcwallet=slhdsa_wallet getnewaddress "" "p2tsh_slhdsa"
+```
+
+## 3. Address Operations
+
+**List Received Addresses:**
+```bash
+./build/bin/bitcoin-cli -rpcuser=marachain -rpcpassword=marachain \
+  -rpcport=18443 -regtest=1 \
+  -rpcwallet=test_p2tsh listreceivedbyaddress 0 true | jq -r '.[].address'
+```
+
+**Get Address Info:**
+```bash
+./build/bin/bitcoin-cli -rpcuser=marachain -rpcpassword=marachain \
+  -rpcport=18443 -regtest=1 \
+  getaddressinfo ccrt1zgrunzrm9jg2uf9ge2ydrshap7v43z060tmh6sg2u4t4m83ugsa6sgrdv85
+```
+
+**Validate Address:**
+```bash
+./build/bin/bitcoin-cli -rpcuser=marachain -rpcpassword=marachain \
+  -rpcport=18443 -regtest=1 \
+  validateaddress ccrt1zgrunzrm9jg2uf9ge2ydrshap7v43z060tmh6sg2u4t4m83ugsa6sgrdv85
+```
+
+## 4. Mining & Transactions
+
+**Generate Blocks:**
+```bash
+./build/bin/bitcoin-cli -rpcuser=marachain -rpcpassword=marachain \
+  -rpcport=18443 -regtest=1 \
+  generatetoaddress 1000 ccrt1zqrgy7n48gw5vhhdpfph3m2y6jgnl6auvwjcdvsvychx769zk0g5q2wy994
+```
+
+**Send Transaction:**
+```bash
+./build/bin/bitcoin-cli -rpcuser=marachain -rpcpassword=marachain \
+  -rpcport=18443 -regtest=1 \
+  sendtoaddress ccrt1zwr6kkcwe2nqrt60rnpyzgs25wus3wynngjzl4sj6x6jq0cnm0q6sm434fg 0.1
+```

src/outputtype.cpp

@@ -30,7 +30,7 @@ std::optional<OutputType> ParseOutputType(const std::string& type)
         return OutputType::BECH32;
     } else if (type == OUTPUT_TYPE_STRING_BECH32M) {
         return OutputType::BECH32M;
-    }
+    } 
     return std::nullopt;
 }
 

src/outputtype.h

@@ -27,6 +27,7 @@ static constexpr auto OUTPUT_TYPES = std::array{
     OutputType::P2SH_SEGWIT,
     OutputType::BECH32,
     OutputType::BECH32M,
+
 };
 
 std::optional<OutputType> ParseOutputType(const std::string& str);

src/policy/policy.cpp

@@ -190,8 +190,7 @@ bool AreCoordinateTransactionStandard(const CTransaction& tx, CCoinsViewCache& m
     if(tx.version == TRANSACTION_PEGIN_VERSION) {
         return true;
     }
-    LogPrintf("transaction version is %i \n", tx.version);
-
+    
     CAmount amountAssetInOut = CAmount(0);
     std::vector<unsigned char> currentAssetID = {};
     for (unsigned int i = 0; i < tx.vin.size(); i++) {

src/rpc/client.cpp

@@ -299,6 +299,7 @@ static const CRPCConvertParam vRPCConvertParams[] =
     { "createwallet", 5, "descriptors"},
     { "createwallet", 6, "load_on_startup"},
     { "createwallet", 7, "external_signer"},
+    { "createwallet", 8, "enable_p2tsh"},
     { "restorewallet", 2, "load_on_startup"},
     { "loadwallet", 1, "load_on_startup"},
     { "unloadwallet", 1, "load_on_startup"},

src/rpc/output_script.cpp

@@ -43,6 +43,7 @@ static RPCHelpMan validateaddress()
                 {RPCResult::Type::BOOL, "iswitness", /*optional=*/true, "If the address is a witness address"},
                 {RPCResult::Type::NUM, "witness_version", /*optional=*/true, "The version number of the witness program"},
                 {RPCResult::Type::STR_HEX, "witness_program", /*optional=*/true, "The hex value of the witness program"},
+                {RPCResult::Type::BOOL, "p2tsh", /*optional=*/true, "If the address is a P2TSH address (witness v2)"},
                 {RPCResult::Type::STR, "error", /*optional=*/true, "Error message, if any"},
                 {RPCResult::Type::ARR, "error_locations", /*optional=*/true, "Indices of likely error locations in address, if known (e.g. Bech32 errors)",
                     {
@@ -73,6 +74,11 @@ static RPCHelpMan validateaddress()
 
                 UniValue detail = DescribeAddress(dest);
                 ret.pushKVs(std::move(detail));
+
+                if (std::holds_alternative<WitnessV2P2TSH>(dest)) {
+                    ret.pushKV("p2tsh", true);
+                }
+                
             } else {
                 UniValue error_indices(UniValue::VARR);
                 for (int i : error_locations) error_indices.push_back(i);

src/script/descriptor.cpp

@@ -28,6 +28,7 @@
 #include <optional>
 #include <string>
 #include <vector>
+#include <logging.h>
 
 using util::Split;
 
@@ -1631,7 +1632,7 @@ class TSHDescriptor final : public DescriptorImpl
         uint256 merkle_root = builder.GetSpendData().merkle_root;
 
         CScript output_script;
-        output_script << OP_3 << ToByteVector(merkle_root);
+        output_script << OP_2 << ToByteVector(merkle_root);
 
         return {output_script};
     }
@@ -2470,7 +2471,6 @@ std::vector<std::unique_ptr<DescriptorImpl>> ParseScript(uint32_t& key_exp_index
             }
         }
         assert(TaprootBuilder::ValidDepths(depths));
-
         // Make sure all vecs are of the same length, or exactly length 1
         // For length 1 vectors, clone subdescs until vector is the same length
         for (auto& vec : subscripts) {
@@ -2483,7 +2483,6 @@ std::vector<std::unique_ptr<DescriptorImpl>> ParseScript(uint32_t& key_exp_index
                 return {};
             }
         }
-
         if (internal_keys.size() > 1 && internal_keys.size() != max_providers_len) {
             error = strprintf("tr(): Multipath internal key mismatches multipath subscripts lengths");
             return {};
@@ -2492,7 +2491,6 @@ std::vector<std::unique_ptr<DescriptorImpl>> ParseScript(uint32_t& key_exp_index
         while (internal_keys.size() < max_providers_len) {
             internal_keys.emplace_back(internal_keys.at(0)->Clone());
         }
-
         // Build the final descriptors vector
         for (size_t i = 0; i < max_providers_len; ++i) {
             // Build final subscripts vectors by retrieving the i'th subscript for each vector in subscripts
@@ -2515,7 +2513,6 @@ std::vector<std::unique_ptr<DescriptorImpl>> ParseScript(uint32_t& key_exp_index
         // P2TSH only supports script path, no internal key
         std::vector<std::vector<std::unique_ptr<DescriptorImpl>>> subscripts;
         std::vector<int> depths;
-
         if (expr.size()) {
             /** The path from the top of the tree to what we're currently processing.
              * branches[i] == false: left branch in the i'th step from the top; true: right branch.
@@ -2534,7 +2531,9 @@ std::vector<std::unique_ptr<DescriptorImpl>> ParseScript(uint32_t& key_exp_index
                 // Process the actual script expression.
                 auto sarg = Expr(expr);
                 subscripts.emplace_back(ParseScript(key_exp_index, sarg, ParseScriptContext::P2TSH, out, error));
-                if (subscripts.back().empty()) return {};
+                if (subscripts.back().empty()) {
+                    return {};
+                } 
                 depths.push_back(branches.size());
                 // Process closing braces; one is expected for every right branch we were in.
                 while (branches.size() && branches.back()) {
@@ -2559,7 +2558,6 @@ std::vector<std::unique_ptr<DescriptorImpl>> ParseScript(uint32_t& key_exp_index
                 return {};
             }
         }
-
         assert(TaprootBuilder::ValidDepths(depths));
 
         // Build the final descriptors vector