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

Contract address calc & field on the dialog

This commit is contained in:
romanman 2014-05-26 20:17:35 +03:00
parent 6f75a25379
commit 28086ce09e
2 changed files with 33 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -111,7 +111,7 @@ public class Transaction {
this.value = ((RLPItem) transaction.get(4)).getRLPData();
if (Arrays.equals(this.receiveAddress, ZERO_ADDRESS)){ // Simple transaction
if (isContract()){ // Simple transaction
this.init = ((RLPItem) transaction.get(5)).getRLPData();
// only parse signature in case tx is signed
@ -190,8 +190,19 @@ public class Transaction {
return signature;
}
public byte[] getContractAddress(){
if (!isContract()) return null;
byte[] val1 = RLP.encodeElement(getSender());
byte[] val2 = RLP.encodeElement(nonce);
byte[] val = HashUtil.sha3omit12(RLP.encodeList(val1, val2));
return val;
}
public boolean isContract() {
return this.receiveAddress.length == 0;
return Arrays.equals(this.receiveAddress, ZERO_ADDRESS);
}
/*********
@ -253,7 +264,7 @@ public class Transaction {
byte[] value = RLP.encodeElement(this.value);
byte[] data = RLP.encodeElement(this.data);
if(Arrays.equals(this.receiveAddress, ZERO_ADDRESS)) {
if(isContract()) {
byte[] init = RLP.encodeElement(this.init);
this.rlpRaw = RLP.encodeList(nonce, gasPrice, gasLimit, receiveAddress, value,
init);
@ -287,7 +298,7 @@ public class Transaction {
s = RLP.encodeElement(new byte[0]);
}
if(Arrays.equals(ZERO_ADDRESS, this.receiveAddress)) {
if(isContract()) {
byte[] init = RLP.encodeElement(this.init);
this.rlpEncoded = RLP.encodeList(nonce, gasPrice, gasLimit, receiveAddress, value,
init, v, r, s);

35
ethereumj-core/src/main/java/org/ethereum/gui/ContractSubmitDialog.java
View File

@ -6,6 +6,7 @@ import org.ethereum.net.client.ClientPeer;
import org.ethereum.util.Utils;
import org.ethereum.wallet.AddressState;
import org.spongycastle.util.BigIntegers;
import org.spongycastle.util.encoders.Hex;
import javax.swing.*;
import javax.swing.border.Border;
@ -33,6 +34,7 @@ class ContractSubmitDialog extends JDialog implements MessageAwareDialog{
ContractSubmitDialog dialog;
JComboBox<AddressStateWraper> creatorAddressCombo;
final JTextField gasInput;
final JTextField contractAddrInput;
private byte[] initByteCode;
@ -44,20 +46,20 @@ class ContractSubmitDialog extends JDialog implements MessageAwareDialog{
dialog = this;
this.initByteCode = byteCode;
contractAddrInput = new JTextField(5);
GUIUtils.addStyle(contractAddrInput, "Contract Address: ");
contractAddrInput.setBounds(70, 30, 350, 45);
this.getContentPane().add(contractAddrInput);
gasInput = new JTextField(5);
GUIUtils.addStyle(gasInput, "Gas: ");
JTextArea contractInitTA = new JTextArea();
contractInitTA.setLineWrap(true);
JScrollPane contractInitInput = new JScrollPane(contractInitTA);
GUIUtils.addStyle(contractInitTA, null, false);
GUIUtils.addStyle(contractInitInput, "Init:");
JTextArea contractDataTA = new JTextArea();
contractDataTA.setLineWrap(true);
JScrollPane contractDataInput = new JScrollPane(contractDataTA);
GUIUtils.addStyle(contractDataTA, null, false);
GUIUtils.addStyle(contractDataInput, "Body:");
GUIUtils.addStyle(contractDataInput, "Code:");
String byteCodeText = GUIUtils.getHexStyledText(byteCode);
contractDataTA.setText(byteCodeText);
@ -67,13 +69,11 @@ class ContractSubmitDialog extends JDialog implements MessageAwareDialog{
this.getContentPane().setBackground(Color.WHITE);
this.getContentPane().setLayout(null);
contractInitInput.setBounds(70, 30, 350, 165);
this.getContentPane().add(contractInitInput);
contractDataInput.setBounds(70, 200, 350, 165);
contractDataInput.setBounds(70, 80, 350, 165);
this.getContentPane().add(contractDataInput);
gasInput.setBounds(330, 380, 90, 45);
gasInput.setBounds(330, 260, 90, 45);
this.getContentPane().add(gasInput);
URL rejectIconURL = ClassLoader.getSystemResource("buttons/reject.png");
@ -83,12 +83,12 @@ class ContractSubmitDialog extends JDialog implements MessageAwareDialog{
rejectLabel.setCursor(new Cursor(Cursor.HAND_CURSOR));
JLabel statusMessage = new JLabel("");
statusMessage.setBounds(50, 480, 400, 50);
statusMessage.setBounds(50, 360, 400, 50);
statusMessage.setHorizontalAlignment(SwingConstants.CENTER);
this.statusMsg = statusMessage;
this.getContentPane().add(statusMessage);
rejectLabel.setBounds(260, 445, 45, 45);
rejectLabel.setBounds(260, 325, 45, 45);
this.getContentPane().add(rejectLabel);
rejectLabel.setVisible(true);
rejectLabel.addMouseListener(
@ -106,7 +106,7 @@ class ContractSubmitDialog extends JDialog implements MessageAwareDialog{
approveLabel.setToolTipText("Submit the transaction");
approveLabel.setCursor(new Cursor(Cursor.HAND_CURSOR));
approveLabel.setBounds(200, 445, 45, 45);
approveLabel.setBounds(200, 325, 45, 45);
this.getContentPane().add(approveLabel);
approveLabel.setVisible(true);
@ -119,7 +119,6 @@ class ContractSubmitDialog extends JDialog implements MessageAwareDialog{
}
);
gasInput.setText("1000");
JComboBox<AddressStateWraper> creatorAddressCombo = new JComboBox<AddressStateWraper>(){
@ -184,7 +183,7 @@ class ContractSubmitDialog extends JDialog implements MessageAwareDialog{
((AbstractButton) creatorAddressCombo.getComponent(i)).setBorder(line);
}
}
creatorAddressCombo.setBounds(73, 387, 230, 36);
creatorAddressCombo.setBounds(73, 267, 230, 36);
this.getContentPane().add(creatorAddressCombo);
@ -214,7 +213,7 @@ class ContractSubmitDialog extends JDialog implements MessageAwareDialog{
inputMap.put(stroke, "ESCAPE");
rootPane.getActionMap().put("ESCAPE", actionListener);
this.setSize(500, 550);
this.setSize(500, 430);
this.setVisible(true);
@ -263,6 +262,8 @@ class ContractSubmitDialog extends JDialog implements MessageAwareDialog{
return;
}
contractAddrInput.setText(Hex.toHexString(tx.getContractAddress()));
// SwingWorker
DialogWorker worker = new DialogWorker(tx, this);
worker.execute();