agorise/graphenej
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Memo

Browse source
This commit is contained in:
Henry Varona 2016-12-09 23:22:46 -04:00
parent d594a9b2c2
commit 91c5d7d181
1 changed files with 14 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/main/java/com/luminiasoft/bitshares/Memo.java
View file

@ -17,6 +17,7 @@ import org.bitcoinj.core.ECKey;
* Created by nelson on 11/9/16. * Created by nelson on 11/9/16.
*/ */
public class Memo implements ByteSerializable, JsonSerializable { public class Memo implements ByteSerializable, JsonSerializable {
public static final String KEY_FROM = "from"; public static final String KEY_FROM = "from";
public static final String KEY_TO = "to"; public static final String KEY_TO = "to";
public static final String KEY_NONCE = "nonce"; public static final String KEY_NONCE = "nonce";
@ -38,6 +39,7 @@ public class Memo implements ByteSerializable, JsonSerializable {
this.from = from; this.from = from;
this.to = to; this.to = to;
this.message = message.getBytes(); this.message = message.getBytes();
this.encodeMessage(from.getKey(), to.getKey(), this.message, 0);
} }
@Override @Override
@ -79,7 +81,7 @@ public class Memo implements ByteSerializable, JsonSerializable {
} }
} }
byte[] secret = fromKey.getPubKeyPoint().multiply(toKey.getPrivKey()).normalize().getXCoord().getEncoded(); byte[] secret = toKey.getPubKeyPoint().multiply(fromKey.getPrivKey()).normalize().getXCoord().getEncoded();
byte[] finalKey = new byte[secret.length + this.nonce.length]; byte[] finalKey = new byte[secret.length + this.nonce.length];
System.arraycopy(secret, 0, finalKey, 0, secret.length); System.arraycopy(secret, 0, finalKey, 0, secret.length);
System.arraycopy(this.nonce, 0, finalKey, secret.length, this.nonce.length); System.arraycopy(this.nonce, 0, finalKey, secret.length, this.nonce.length);
@ -102,7 +104,7 @@ public class Memo implements ByteSerializable, JsonSerializable {
this.from = new PublicKey(fromKey); this.from = new PublicKey(fromKey);
this.nonce = nonce; this.nonce = nonce;
byte[] secret = toKey.getPubKeyPoint().multiply(fromKey.getPrivKey()).normalize().getXCoord().getEncoded(); byte[] secret = fromKey.getPubKeyPoint().multiply(toKey.getPrivKey()).normalize().getXCoord().getEncoded();
byte[] finalKey = new byte[secret.length + this.nonce.length]; byte[] finalKey = new byte[secret.length + this.nonce.length];
System.arraycopy(secret, 0, finalKey, 0, secret.length); System.arraycopy(secret, 0, finalKey, 0, secret.length);
System.arraycopy(this.nonce, 0, finalKey, secret.length, this.nonce.length); System.arraycopy(this.nonce, 0, finalKey, secret.length, this.nonce.length);
@ -126,10 +128,9 @@ public class Memo implements ByteSerializable, JsonSerializable {
} }
JsonObject memoObject = new JsonObject(); JsonObject memoObject = new JsonObject();
memoObject.addProperty(KEY_FROM, new Address(this.from.getKey()).toString()); memoObject.addProperty(KEY_FROM, new Address(this.from.getKey()).toString());
memoObject.addProperty(KEY_TO, new Address(this.to.getKey()).toString());
//memoObject.addProperty(KEY_NONCE, new BigInteger(1,this.nonce).toString(10));
memoObject.addProperty(KEY_NONCE, new BigInteger(1,this.nonce).toString(10));
memoObject.addProperty(KEY_MESSAGE, new BigInteger(1, this.message).toString(16)); memoObject.addProperty(KEY_MESSAGE, new BigInteger(1, this.message).toString(16));
memoObject.addProperty(KEY_NONCE, new BigInteger(1, this.nonce).toString(10));
memoObject.addProperty(KEY_TO, new Address(this.to.getKey()).toString());
return memoObject; return memoObject;
} }