Make XOnlyPubKey act like byte container

sipa · sanket1729 · commit c3945cb39f7d · 2021-08-27T19:24:07.000Z
bitcoin/bitcoin#22051 (1/9)
diff --git a/src/pubkey.h b/src/pubkey.h
@@ -217,6 +217,12 @@ class XOnlyPubKey
     uint256 m_keydata;
 
 public:
+    /** Construct an empty x-only pubkey. */
+    XOnlyPubKey() = default;
+
+    XOnlyPubKey(const XOnlyPubKey&) = default;
+    XOnlyPubKey& operator=(const XOnlyPubKey&) = default;
+
     /** Construct an x-only pubkey from exactly 32 bytes. */
     XOnlyPubKey(Span<const unsigned char> bytes);
 
@@ -229,7 +235,14 @@ class XOnlyPubKey
 
     const unsigned char& operator[](int pos) const { return *(m_keydata.begin() + pos); }
     const unsigned char* data() const { return m_keydata.begin(); }
-    size_t size() const { return m_keydata.size(); }
+    static constexpr size_t size() { return decltype(m_keydata)::size(); }
+    const unsigned char* begin() const { return m_keydata.begin(); }
+    const unsigned char* end() const { return m_keydata.end(); }
+    unsigned char* begin() { return m_keydata.begin(); }
+    unsigned char* end() { return m_keydata.end(); }
+    bool operator==(const XOnlyPubKey& other) const { return m_keydata == other.m_keydata; }
+    bool operator!=(const XOnlyPubKey& other) const { return m_keydata != other.m_keydata; }
+    bool operator<(const XOnlyPubKey& other) const { return m_keydata < other.m_keydata; }
 };
 
 struct CExtPubKey {
diff --git a/src/uint256.h b/src/uint256.h
@@ -76,7 +76,7 @@ class base_blob
         return &m_data[WIDTH];
     }
 
-    unsigned int size() const
+    static constexpr unsigned int size()
     {
         return sizeof(m_data);
     }

Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ class base_blob`
`76`	`76`	`return &m_data[WIDTH];`
`77`	`77`	`}`
`78`	`78`
`79`		`- unsigned int size() const`
	`79`	`+ static constexpr unsigned int size()`
`80`	`80`	`{`
`81`	`81`	`return sizeof(m_data);`
`82`	`82`	`}`