Some adjustments

src/cryptonote_core/cryptonote_basic.h

@@ -547,6 +547,21 @@ namespace cryptonote
     END_KV_SERIALIZE_MAP()
   };
 
+  struct integrated_address {
+      account_public_address adr;
+      crypto::hash8 payment_id;
+
+      BEGIN_SERIALIZE_OBJECT()
+      FIELD(adr)
+      FIELD(payment_id)
+      END_SERIALIZE()
+
+      BEGIN_KV_SERIALIZE_MAP()
+      KV_SERIALIZE(adr)
+      KV_SERIALIZE(payment_id)
+      END_KV_SERIALIZE_MAP()
+  };
+
   struct keypair
   {
     crypto::public_key pub;