crowetic/qortal
1
0
Fork 0
forked from Qortal/qortal
Code Pull Requests Activity

Fix JAXB marshalling error (duplicate tradeAddress) in TradePresenceWebSocket. No need to send signature. Make sure publicKey is sent in Base58, not Base64.

Browse Source
This commit is contained in:
catbref 2022-02-24 17:30:27 +00:00
parent e2ef5b2ef3
commit 3b477ef637
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/org/qortal/data/network/TradePresenceData.java
View File

@ -5,6 +5,8 @@ import org.qortal.crypto.Crypto;
import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import java.util.Arrays; import java.util.Arrays;
// All properties to be converted to JSON via JAXB // All properties to be converted to JSON via JAXB
@ -12,9 +14,21 @@ import java.util.Arrays;
public class TradePresenceData { public class TradePresenceData {
protected long timestamp; protected long timestamp;
@XmlJavaTypeAdapter(
type = byte[].class,
value = org.qortal.api.Base58TypeAdapter.class
)
protected byte[] publicKey; // Could be BOB's or ALICE's protected byte[] publicKey; // Could be BOB's or ALICE's
// No need to send this via websocket / API
@XmlTransient
protected byte[] signature; // Not always present protected byte[] signature; // Not always present
protected String atAddress; // Not always present protected String atAddress; // Not always present
// Have JAXB use getter instead
@XmlTransient
protected String tradeAddress; // Lazily instantiated protected String tradeAddress; // Lazily instantiated
// Constructors // Constructors