status-im/ethereumj-personal
2
0
Fork 0
mirror of https://github.com/status-im/ethereumj-personal.git synced 2025-01-24 10:49:43 +00:00
Code Issues Projects Releases Wiki Activity

Improve validation in ContractCallDialog #45

Browse Source
This commit is contained in:
nicksavers 2014-09-20 11:10:56 +02:00
parent 028cfe5ca3
commit a1f44371db
2 changed files with 29 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ethereumj-core/src/main/java/org/ethereum/util/Utils.java
View File

@ -64,7 +64,7 @@ public class Utils {
}
public static boolean isValidAddress(byte[] addr) {
return addr != null && addr.length == 20;
return addr != null && addr.length == 20;
}
/**

42
ethereumj-studio/src/main/java/org/ethereum/gui/ContractCallDialog.java
View File

@ -7,6 +7,7 @@ import org.ethereum.core.Wallet;
import org.ethereum.db.ContractDetails;
import org.ethereum.util.ByteUtil;
import org.ethereum.util.Utils;
import org.ethereum.vm.DataWord;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.spongycastle.util.BigIntegers;
@ -18,6 +19,7 @@ import javax.swing.border.EtchedBorder;
import javax.swing.plaf.ComboBoxUI;
import javax.swing.plaf.basic.BasicComboPopup;
import javax.swing.table.DefaultTableModel;
import java.awt.*;
import java.awt.event.*;
import java.math.BigInteger;
@ -221,16 +223,28 @@ class ContractCallDialog extends JDialog implements MessageAwareDialog {
private void populateContractDetails() {
String contractAddr = contractAddrInput.getText();
if (contractAddr == null || contractAddr.length() == 0) {
alertStatusMsg("");
return;
}
if (!Pattern.matches("[0-9a-fA-F]+", contractAddr) || (contractAddr.length() != 40)) {
alertStatusMsg("Not a valid contract address");
return;
}
ContractDetails contractDetails = UIEthereumManager.ethereum
.getRepository().getContractDetails(Hex.decode(contractAddr));
if (contractDetails == null) {
alertStatusMsg("No contract for that address");
return;
}
byte[] contractAddress = Hex.decode( contractAddr );
ContractDetails contractDetails =
UIEthereumManager.ethereum.getRepository().getContractDetails(contractAddress);
final byte[] programCode = contractDetails.getCode();
if (programCode == null || programCode.length == 0) {
alertStatusMsg("Such account exist but no code in the db");
return;
}
final Map storageMap = contractDetails.getStorage();
contractDataInput.setBounds(70, 80, 350, 145);
@ -301,22 +315,22 @@ class ContractCallDialog extends JDialog implements MessageAwareDialog {
});
this.repaint();
}
private void playContractCall() {
byte[] contractAddress = Hex.decode(contractAddrInput.getText());
if (!Utils.isValidAddress(contractAddress)) {
alertStatusMsg("Not a valid contract address");
return;
}
ContractDetails contractDetails = UIEthereumManager.ethereum.getRepository().getContractDetails(contractAddress);
String contractAddr = contractAddrInput.getText();
if (!Pattern.matches("[0-9a-fA-F]+", contractAddr) || (contractAddr.length() != 40)) {
alertStatusMsg("Not a valid contract address");
return;
}
ContractDetails contractDetails = UIEthereumManager.ethereum
.getRepository().getContractDetails(Hex.decode(contractAddr));
if (contractDetails == null) {
alertStatusMsg("No contract for that address");
return;
}
byte[] programCode = contractDetails.getCode();
final byte[] programCode = contractDetails.getCode();
if (programCode == null || programCode.length == 0) {
alertStatusMsg("Such account exist but no code in the db");
return;