status-im
/
ethereumj-personal
mirror of https://github.com/status-im/ethereumj-personal.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/romanman/ethereumj 

Conflicts:
	src/main/java/org/ethereum/gui/PayOutDialog.java
This commit is contained in:
romanman 2014-05-21 01:16:03 +03:00
parent 7e7ec683df 36e0bc5397
commit 2fcb00d3b5
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ethereumj-core/src/main/java/org/ethereum/core/Transaction.java
View File

@ -8,6 +8,7 @@ import org.ethereum.util.RLPItem;
import org.ethereum.util.RLPList; import org.ethereum.util.RLPList;
import org.ethereum.util.Utils; import org.ethereum.util.Utils;
import org.spongycastle.util.BigIntegers; import org.spongycastle.util.BigIntegers;
import org.spongycastle.util.encoders.Hex;
import java.util.Arrays; import java.util.Arrays;
@ -256,8 +257,12 @@ public class Transaction {
byte[] data = RLP.encodeElement(this.data); byte[] data = RLP.encodeElement(this.data);
byte[] v = RLP.encodeByte( signature.v ); byte[] v = RLP.encodeByte( signature.v );
byte[] r = RLP.encodeElement(BigIntegers.asUnsignedByteArray(signature.r)); byte[] rBytes = BigIntegers.asUnsignedByteArray(signature.r);
byte[] s = RLP.encodeElement(BigIntegers.asUnsignedByteArray(signature.s)); System.out.println(Hex.toHexString(rBytes));
byte[] r = RLP.encodeElement(rBytes);
byte[] sBytes = BigIntegers.asUnsignedByteArray(signature.s);
System.out.println(Hex.toHexString(sBytes));
byte[] s = RLP.encodeElement(sBytes);
if(Arrays.equals(this.receiveAddress, new byte[0])) { if(Arrays.equals(this.receiveAddress, new byte[0])) {
byte[] init = RLP.encodeElement(this.init); byte[] init = RLP.encodeElement(this.init);

5
ethereumj-core/src/main/java/org/ethereum/gui/PayOutDialog.java
View File

@ -5,6 +5,7 @@ import org.ethereum.core.Transaction;
import org.ethereum.crypto.HashUtil; import org.ethereum.crypto.HashUtil;
import org.ethereum.manager.MainData; import org.ethereum.manager.MainData;
import org.ethereum.net.client.ClientPeer; import org.ethereum.net.client.ClientPeer;
import org.spongycastle.util.BigIntegers;
import org.spongycastle.util.encoders.Hex; import org.spongycastle.util.encoders.Hex;
import java.awt.*; import java.awt.*;
@ -70,8 +71,8 @@ class PayOutDialog extends JDialog {
byte[] gasPrice= Hex.decode("09184e72a000"); byte[] gasPrice= Hex.decode("09184e72a000");
byte[] gas = Hex.decode("4255"); byte[] gas = Hex.decode("4255");
Transaction tx = new Transaction(null, value.toByteArray(), Transaction tx = new Transaction(null, gasPrice, gas,
gasPrice, gas, receiveAddress.getAddress(), null); receiveAddress.getAddress(), BigIntegers.asUnsignedByteArray(value), null);
try { try {
tx.sign(senderPrivKey); tx.sign(senderPrivKey);