Sjors
diff --git a/‎src/script/descriptor.cpp‎
Lines changed: 15 additions & 0 deletions b/‎src/script/descriptor.cpp‎
Lines changed: 15 additions & 0 deletions
diff --git a/‎src/script/descriptor.h‎
Lines changed: 7 additions & 0 deletions b/‎src/script/descriptor.h‎
Lines changed: 7 additions & 0 deletions
@@ -209,6 +209,8 @@ struct PubkeyProvider
 
     /** Derive a private key, if private data is available in arg. */
     virtual bool GetPrivKey(int pos, const SigningProvider& arg, CKey& key) const = 0;
+
+    virtual uint256 GetID() const = 0;
 };
 
 class OriginPubkeyProvider final : public PubkeyProvider
@@ -260,6 +262,7 @@ class OriginPubkeyProvider final : public PubkeyProvider
     {
         return m_provider->GetPrivKey(pos, arg, key);
     }
+    uint256 GetID() const override { return uint256(); }
 };
 
 /** An object representing a parsed constant public key in a descriptor. */
@@ -305,6 +308,7 @@ class ConstPubkeyProvider final : public PubkeyProvider
     {
         return arg.GetKey(m_pubkey.GetID(), key);
     }
+    uint256 GetID() const override { return uint256(); }
 };
 
 enum class DeriveType {
@@ -520,6 +524,8 @@ class BIP32PubkeyProvider final : public PubkeyProvider
         key = extkey.key;
         return true;
     }
+
+    uint256 GetID() const override { return uint256(); }
 };
 
 /** Base class for all Descriptor implementations. */
@@ -702,6 +708,15 @@ class DescriptorImpl : public Descriptor
     }
 
     std::optional<OutputType> GetOutputType() const override { return std::nullopt; }
+
+    virtual uint256 GetID() const override {
+        // Always use the apostrophe for spkm ID
+        std::string desc_str = ToString(/*compat_format=*/true);
+        uint256 id;
+        CSHA256().Write((unsigned char*)desc_str.data(), desc_str.size()).Finalize(id.begin());
+        return id;
+    }
+
 };
 
 /** A parsed addr(A) descriptor. */
 
@@ -146,6 +146,13 @@ struct Descriptor {
 
     /** @return The OutputType of the scriptPubKey(s) produced by this descriptor. Or nullopt if indeterminate (multiple or none) */
     virtual std::optional<OutputType> GetOutputType() const = 0;
+
+
+    /* Unique identifier that may not change over time, unless explictly marked as not backwards compatible.
+       This is not part of BIP 380, not guaranteed to be interoperable and should not be exposed to the user.
+    */
+    virtual uint256 GetID() const = 0;
+
 };
 
 /** Parse a `descriptor` string. Included private keys are put in `out`.