feat: asset lock tx v2 with basic RPC support + tests

src/evo/assetlocktx.cpp

@@ -26,7 +26,7 @@ using node::BlockManager;
 /**
  * Asset Lock Transaction
  */
-bool CheckAssetLockTx(const CTransaction& tx, TxValidationState& state)
+bool CheckAssetLockTx(const CTransaction& tx, TxValidationState& state, bool is_v24_active)
 {
     if (tx.nType != TRANSACTION_ASSET_LOCK) {
         return state.Invalid(TxValidationResult::TX_BAD_SPECIAL, "bad-assetlocktx-type");
@@ -56,6 +56,9 @@ bool CheckAssetLockTx(const CTransaction& tx, TxValidationState& state)
     if (opt_assetLockTx->getVersion() == 0 || opt_assetLockTx->getVersion() > CAssetLockPayload::CURRENT_VERSION) {
         return state.Invalid(TxValidationResult::TX_BAD_SPECIAL, "bad-assetlocktx-version");
     }
+    if (!is_v24_active && opt_assetLockTx->getVersion() == CAssetLockPayload::CURRENT_VERSION) {
+        return state.Invalid(TxValidationResult::TX_BAD_SPECIAL, "bad-assetlocktx-version-2");
+    }
 
     if (opt_assetLockTx->getCreditOutputs().empty()) {
         return state.Invalid(TxValidationResult::TX_BAD_SPECIAL, "bad-assetlocktx-emptycreditoutputs");
@@ -68,8 +71,14 @@ bool CheckAssetLockTx(const CTransaction& tx, TxValidationState& state)
         }
 
         creditOutputsAmount += out.nValue;
-        if (!out.scriptPubKey.IsPayToPublicKeyHash()) {
-            return state.Invalid(TxValidationResult::TX_BAD_SPECIAL, "bad-assetlocktx-pubKeyHash");
+        if (opt_assetLockTx->getVersion() >= 2) {
+            if (!out.scriptPubKey.IsPayToPublicKeyHash() && !out.scriptPubKey.IsPayToScriptHash()) {
+                return state.Invalid(TxValidationResult::TX_BAD_SPECIAL, "bad-assetlocktx-script-pubkey");
+            }
+        } else {
+            if (!out.scriptPubKey.IsPayToPublicKeyHash()) {
+                return state.Invalid(TxValidationResult::TX_BAD_SPECIAL, "bad-assetlocktx-pubKeyHash");
+            }
         }
     }
     if (creditOutputsAmount != returnAmount) {

src/evo/assetlocktx.h

@@ -28,16 +28,17 @@ class BlockManager;
 class CAssetLockPayload
 {
 public:
-    static constexpr uint8_t CURRENT_VERSION = 1;
+    static constexpr uint8_t INITIAL_VERSION = 1;
+    static constexpr uint8_t CURRENT_VERSION = 2;
     static constexpr auto SPECIALTX_TYPE = TRANSACTION_ASSET_LOCK;
 
 private:
     uint8_t nVersion{CURRENT_VERSION};
     std::vector<CTxOut> creditOutputs;
 
 public:
-    explicit CAssetLockPayload(const std::vector<CTxOut>& creditOutputs) :
-        creditOutputs(creditOutputs)
+    explicit CAssetLockPayload(const std::vector<CTxOut>& creditOutputs, uint8_t nVersion = CURRENT_VERSION) :
+        nVersion(nVersion), creditOutputs(creditOutputs)
     {}
 
     CAssetLockPayload() = default;
@@ -154,7 +155,7 @@ class CAssetUnlockPayload
     }
 };
 
-bool CheckAssetLockTx(const CTransaction& tx, TxValidationState& state);
+bool CheckAssetLockTx(const CTransaction& tx, TxValidationState& state, bool is_v24_active = false);
 bool CheckAssetUnlockTx(const node::BlockManager& blockman, const llmq::CQuorumManager& qman, const CTransaction& tx, gsl::not_null<const CBlockIndex*> pindexPrev, const std::optional<CRangesSet>& indexes, TxValidationState& state);
 bool GetAssetUnlockFee(const CTransaction& tx, CAmount& txfee, TxValidationState& state);
 

src/evo/core_write.cpp

@@ -16,7 +16,9 @@
 #include <util/std23.h>
 
 #include <core_io.h>
+#include <key_io.h>
 #include <rpc/util.h>
+#include <script/standard.h>
 #include <util/check.h>
 
 #include <univalue.h>
@@ -114,7 +116,9 @@ RPCResult CAssetLockPayload::GetJsonHelp(const std::string& key, bool optional)
                     {RPCResult::Type::STR, "asm", "The asm"},
                     {RPCResult::Type::STR_HEX, "hex", "The hex"},
                     {RPCResult::Type::STR, "type", "The type, eg 'pubkeyhash'"},
-        }}}}}}
+                }},
+                {RPCResult::Type::STR, "address", /*optional=*/true, "DIP-18 Platform address (version >= 2 only)"},
+        }}}}
     }};
 }
 
@@ -128,6 +132,16 @@ UniValue CAssetLockPayload::ToJson() const
         UniValue spk(UniValue::VOBJ);
         ScriptToUniv(credit_output.scriptPubKey, spk, /*include_hex=*/true, /*include_address=*/false);
         out.pushKV("scriptPubKey", spk);
+        if (nVersion >= 2) {
+            CTxDestination dest;
+            if (ExtractDestination(credit_output.scriptPubKey, dest)) {
+                if (const auto* pkh = std::get_if<PKHash>(&dest)) {
+                    out.pushKV("address", EncodePlatformDestination(PlatformP2PKHDestination(uint160(*pkh))));
+                } else if (const auto* sh = std::get_if<ScriptHash>(&dest)) {
+                    out.pushKV("address", EncodePlatformDestination(PlatformP2SHDestination(uint160(*sh))));
+                }
+            }
+        }
         outputs.push_back(out);
     }
 

src/evo/netinfo.h

@@ -325,7 +325,7 @@ class MnNetInfo final : public NetInfoInterface
         }
     }
 
-    void Serialize(CSizeComputer& s) const
+    static void Serialize(CSizeComputer& s)
     {
         s.seek(::GetSerializeSize(CService{}, s.GetVersion()));
     }

src/evo/specialtxman.cpp

@@ -217,7 +217,7 @@ static bool CheckSpecialTxInner(CDeterministicMNManager& dmnman, llmq::CQuorumSn
         case TRANSACTION_MNHF_SIGNAL:
             return CheckMNHFTx(chainman, qman, tx, pindexPrev, state);
         case TRANSACTION_ASSET_LOCK:
-            return CheckAssetLockTx(tx, state);
+            return CheckAssetLockTx(tx, state, DeploymentActiveAfter(pindexPrev, chainman, Consensus::DEPLOYMENT_V24));
         case TRANSACTION_ASSET_UNLOCK:
             return CheckAssetUnlockTx(chainman.m_blockman, qman, tx, pindexPrev, indexes, state);
         }

src/interfaces/chain.h

@@ -262,6 +262,11 @@ class Chain
     //! Relay dust fee setting (-dustrelayfee), reflecting lowest rate it's economical to spend.
     virtual CFeeRate relayDustFee() = 0;
 
+    //! Whether the mempool would reject this special transaction as non-standard
+    //! under the current policy (-acceptnonstdtxn), and if so, the reject reason.
+    //! Always false when non-standard transactions are accepted.
+    virtual bool isNonStandardSpecialTx(const CTransactionRef& tx, std::string& reason) = 0;
+
     //! Check if any block has been pruned.
     virtual bool havePruned() = 0;
 

src/node/interfaces.cpp

@@ -15,6 +15,7 @@
 #include <evo/chainhelper.h>
 #include <evo/creditpool.h>
 #include <evo/deterministicmns.h>
+#include <evo/specialtxman.h>
 #include <external_signer.h>
 #include <governance/governance.h>
 #include <governance/object.h>
@@ -1439,6 +1440,10 @@ class ChainImpl : public Chain
     CFeeRate relayMinFee() override { return ::minRelayTxFee; }
     CFeeRate relayIncrementalFee() override { return ::incrementalRelayFee; }
     CFeeRate relayDustFee() override { return ::dustRelayFee; }
+    bool isNonStandardSpecialTx(const CTransactionRef& tx, std::string& reason) override
+    {
+        return ::fRequireStandard && !IsStandardSpecialTx(*tx, reason);
+    }
     bool havePruned() override
     {
         LOCK(::cs_main);

src/rpc/output_script.cpp

@@ -35,6 +35,7 @@ static RPCHelpMan validateaddress()
             RPCResult::Type::OBJ, "", "",
             {
                 {RPCResult::Type::BOOL, "isvalid", "If the address is valid or not"},
+                {RPCResult::Type::BOOL, "isplatform", /*optional=*/true, "If the address is a DIP-18 Dash Platform address"},
                 {RPCResult::Type::STR, "address", /*optional=*/true, "The Dash address validated"},
                 {RPCResult::Type::STR_HEX, "scriptPubKey", /*optional=*/true, "The hex-encoded scriptPubKey generated by the address"},
                 {RPCResult::Type::BOOL, "isscript", /*optional=*/true, "If the key is a script"},
@@ -51,28 +52,36 @@ static RPCHelpMan validateaddress()
         },
         [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
         {
+            const std::string address = request.params[0].get_str();
             std::string error_msg;
             std::vector<int> error_locations;
-            CTxDestination dest = DecodeDestination(request.params[0].get_str(), error_msg, &error_locations);
+            CTxDestination dest = DecodeDestination(address, error_msg, &error_locations);
             const bool isValid = IsValidDestination(dest);
-            CHECK_NONFATAL(isValid == error_msg.empty());
 
             UniValue ret(UniValue::VOBJ);
-            ret.pushKV("isvalid", isValid);
             if (isValid) {
-                std::string currentAddress = EncodeDestination(dest);
-                ret.pushKV("address", currentAddress);
+                ret.pushKV("isvalid", true);
+                ret.pushKV("address", EncodeDestination(dest));
 
                 CScript scriptPubKey = GetScriptForDestination(dest);
                 ret.pushKV("scriptPubKey", HexStr(scriptPubKey));
 
                 UniValue detail = DescribeAddress(dest);
                 ret.pushKVs(detail);
             } else {
-                UniValue error_indices(UniValue::VARR);
-                for (int i : error_locations) error_indices.push_back(i);
-                ret.pushKV("error_locations", error_indices);
-                ret.pushKV("error", error_msg);
+                std::string platform_error;
+                PlatformDestination platform_dest = DecodePlatformDestination(address, platform_error);
+                if (IsValidPlatformDestination(platform_dest)) {
+                    ret.pushKV("isvalid", true);
+                    ret.pushKV("isplatform", true);
+                    ret.pushKV("address", EncodePlatformDestination(platform_dest));
+                } else {
+                    ret.pushKV("isvalid", false);
+                    UniValue error_indices(UniValue::VARR);
+                    for (int i : error_locations) error_indices.push_back(i);
+                    ret.pushKV("error_locations", error_indices);
+                    ret.pushKV("error", error_msg);
+                }
             }
 
             return ret;