Fixed a number of issues with serialization of pricing_record entries.

src/oracle/pricing_record.cpp

@@ -85,12 +85,19 @@ namespace oracle
   
   pricing_record::pricing_record() noexcept
     : pr_version(0)
+    , height(0)
+    , supply()
     , assets()
     , timestamp(0)
     , signature()
   {
   }
 
+  pricing_record::~pricing_record() noexcept
+  {
+    pr_version = 99;
+  }
+  
   bool supply_data::_load(epee::serialization::portable_storage& src, epee::serialization::section* hparent)
   {
     supply_data_serialized in{};
@@ -145,10 +152,12 @@ namespace oracle
       timestamp = in.timestamp;
 
       // Signature arrives in HEX format, but needs to be used in BINARY format - convert it here
-      signature.resize(in.signature.length() >> 1);
-      for (unsigned int i = 0; i < in.signature.length(); i += 2) {
+      signature.resize(0);
+      assert(in.signature.size()%2 == 0);
+      signature.reserve(in.signature.size() >> 1);
+      for (unsigned int i = 0; i < in.signature.size(); i += 2) {
         std::string byteString = in.signature.substr(i, 2);
-        signature[i>>1] = (char) strtol(byteString.c_str(), NULL, 16);
+        signature.emplace_back((uint8_t)strtol(byteString.c_str(), NULL, 16));
       }
       return true;
     }
@@ -160,9 +169,9 @@ namespace oracle
   bool pricing_record::store(epee::serialization::portable_storage& dest, epee::serialization::section* hparent) const
   {
     std::string sig_hex;
-    for (unsigned int i=0; i<64; i++) {
+    for (size_t i=0; i<signature.size(); ++i) {
       std::stringstream ss;
-      ss << std::hex << std::setw(2) << std::setfill('0') << (0xff & signature[i]);
+      ss << std::hex << std::setw(2) << std::setfill('0') << (0xff & signature.at(i));
       sig_hex += ss.str();
     }
     const pr_serialized out{pr_version, height, supply, assets, timestamp, sig_hex};

src/oracle/pricing_record.h

@@ -74,6 +74,11 @@ namespace oracle
     bool _load(epee::serialization::portable_storage& src, epee::serialization::section* hparent);
     //! Store in epee p2p format
     bool store(epee::serialization::portable_storage& dest, epee::serialization::section* hparent) const;
+
+    BEGIN_SERIALIZE_OBJECT()
+      VARINT_FIELD(fulm)
+      VARINT_FIELD(fusd)
+    END_SERIALIZE()
   };
 
   inline bool operator==(const supply_data& a, const supply_data& b) noexcept
@@ -91,6 +96,12 @@ namespace oracle
     bool _load(epee::serialization::portable_storage& src, epee::serialization::section* hparent);
     //! Store in epee p2p format
     bool store(epee::serialization::portable_storage& dest, epee::serialization::section* hparent) const;
+
+    BEGIN_SERIALIZE_OBJECT()
+      FIELD(asset_type)
+      VARINT_FIELD(spot_price)
+      VARINT_FIELD(ma_price)
+    END_SERIALIZE()
   };
   
   inline bool operator==(const asset_data& a, const asset_data& b) noexcept
@@ -100,11 +111,8 @@ namespace oracle
             a.ma_price == b.ma_price);
   }
 
-  class pricing_record
+  struct pricing_record
   {
-
-  public:
-
     // Fields 
     uint64_t pr_version;
     uint64_t height;
@@ -120,7 +128,7 @@ namespace oracle
     //! Store in epee p2p format
     bool store(epee::serialization::portable_storage& dest, epee::serialization::section* hparent) const;
     pricing_record(const pricing_record& orig) noexcept;
-    ~pricing_record() = default;
+    ~pricing_record() noexcept;
     bool equal(const pricing_record& other) const noexcept;
     bool empty() const noexcept;
     bool verifySignature(const std::string& public_key) const;
@@ -128,6 +136,15 @@ namespace oracle
 
     pricing_record& operator=(const pricing_record& orig) noexcept;
     uint64_t operator[](const std::string& asset_type) const;
+
+    BEGIN_SERIALIZE_OBJECT()
+      VARINT_FIELD(pr_version)
+      VARINT_FIELD(height)
+      FIELD(supply)
+      FIELD(assets)
+      VARINT_FIELD(timestamp)
+      FIELD(signature)
+    END_SERIALIZE()
   };
 
   inline bool operator==(const pricing_record& a, const pricing_record& b) noexcept