Issue #1032 Use null safe method for bytes to hex string conversion

ethereumj-core/src/main/java/org/ethereum/config/blockchain/ByzantiumConfig.java

@@ -23,7 +23,6 @@
 import org.ethereum.core.Block;
 import org.ethereum.core.BlockHeader;
 import org.ethereum.core.Repository;
-import org.spongycastle.util.encoders.Hex;
 
 import java.math.BigInteger;
 

ethereumj-core/src/main/java/org/ethereum/net/eth/message/NodeDataMessage.java

@@ -20,7 +20,6 @@
 import org.ethereum.util.RLP;
 import org.ethereum.util.RLPList;
 import org.ethereum.util.Value;
-import org.spongycastle.util.encoders.Hex;
 
 import java.util.ArrayList;
 import java.util.List;

ethereumj-core/src/main/java/org/ethereum/net/rlpx/NeighborsMessage.java

@@ -22,7 +22,6 @@
 import org.ethereum.util.RLP;
 import org.ethereum.util.RLPItem;
 import org.ethereum.util.RLPList;
-import org.spongycastle.util.encoders.Hex;
 
 import java.util.ArrayList;
 import java.util.List;

ethereumj-core/src/main/java/org/ethereum/net/rlpx/RlpxConnection.java

@@ -24,6 +24,8 @@
 
 import java.io.*;
 
+import static org.ethereum.util.ByteUtil.toHexString;
+
 /**
  * Created by devrandom on 2015-04-12.
  */
@@ -57,14 +59,14 @@ public void handleNextMessage() throws IOException {
             // TODO handle disconnect
             byte[] wire = new byte[frame.size];
             frame.payload.read(wire);
-            System.out.println("packet " + Hex.toHexString(wire));
+            System.out.println("packet " + toHexString(wire));
             handshakeMessage = HandshakeMessage.parse(wire);
             logger.info(" ===> " + handshakeMessage);
         } else {
             System.out.println("packet type " + frame.type);
             byte[] wire = new byte[frame.size];
             frame.payload.read(wire);
-            System.out.println("packet " + Hex.toHexString(wire));
+            System.out.println("packet " + toHexString(wire));
         }
     }
 

ethereumj-core/src/main/java/org/ethereum/net/shh/Whisper.java

@@ -18,7 +18,6 @@
 package org.ethereum.net.shh;
 
 import org.ethereum.crypto.ECKey;
-import org.spongycastle.util.encoders.Hex;
 import org.springframework.stereotype.Component;
 
 /**

ethereumj-core/src/main/java/org/ethereum/net/swarm/Manifest.java

@@ -1,28 +1,27 @@
-/*
- * Copyright (c) [2016] [ <ether.camp> ]
- * This file is part of the ethereumJ library.
- *
- * The ethereumJ library is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * The ethereumJ library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with the ethereumJ library. If not, see <http://www.gnu.org/licenses/>.
- */
+/*
+ * Copyright (c) [2016] [ <ether.camp> ]
+ * This file is part of the ethereumJ library.
+ *
+ * The ethereumJ library is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * The ethereumJ library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with the ethereumJ library. If not, see <http://www.gnu.org/licenses/>.
+ */
 package org.ethereum.net.swarm;
 
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
-import org.spongycastle.util.encoders.Hex;
 
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;

ethereumj-core/src/main/java/org/ethereum/net/swarm/bzz/BzzStatusMessage.java

@@ -19,11 +19,9 @@
 
 import org.ethereum.net.client.Capability;
 import org.ethereum.net.swarm.Util;
-import org.ethereum.util.ByteUtil;
 import org.ethereum.util.RLP;
 import org.ethereum.util.RLPElement;
 import org.ethereum.util.RLPList;
-import org.spongycastle.util.encoders.Hex;
 
 import java.util.ArrayList;
 import java.util.Arrays;

ethereumj-core/src/main/java/org/ethereum/samples/EventListenerSample.java

@@ -225,7 +225,7 @@ public void onPendingTransactionUpdate(TransactionReceipt txReceipt, PendingTran
     }
 
     public void requestFreeEther(byte[] addressBytes) {
-        String address = "0x" + Hex.toHexString(addressBytes);
+        String address = "0x" + toHexString(addressBytes);
         logger.info("Checking address {} for available ether.", address);
         BigInteger balance = ethereum.getRepository().getBalance(addressBytes);
         logger.info("Address {} balance: {} wei", address, balance);

ethereumj-core/src/main/java/org/ethereum/vm/program/InternalTransaction.java

@@ -17,11 +17,6 @@
  */
 package org.ethereum.vm.program;
 
-import static org.apache.commons.lang3.ArrayUtils.getLength;
-import static org.apache.commons.lang3.ArrayUtils.isEmpty;
-import static org.apache.commons.lang3.ArrayUtils.nullToEmpty;
-import static org.ethereum.util.ByteUtil.toHexString;
-
 import java.math.BigInteger;
 import java.nio.ByteBuffer;
 

ethereumj-core/src/main/java/org/ethereum/vm/program/Program.java

@@ -54,6 +54,7 @@
 import static org.apache.commons.lang3.ArrayUtils.*;
 import static org.ethereum.util.BIUtil.*;
 import static org.ethereum.util.ByteUtil.EMPTY_BYTE_ARRAY;
+import static org.ethereum.util.ByteUtil.toHexString;
 
 /**
  * @author Roman Mandeleil
@@ -375,7 +376,7 @@ public void suicide(DataWord obtainerAddress) {
 
         if (logger.isInfoEnabled())
             logger.info("Transfer to: [{}] heritage: [{}]",
-                    Hex.toHexString(obtainer),
+                    toHexString(obtainer),
                     balance);
 
         addInternalTx(null, null, owner, obtainer, balance, null, "suicide");
@@ -414,7 +415,7 @@ public void createContract(DataWord value, DataWord memStart, DataWord memSize)
         byte[] programCode = memoryChunk(memStart.intValue(), memSize.intValue());
 
         if (logger.isInfoEnabled())
-            logger.info("creating a new contract inside contract run: [{}]", Hex.toHexString(senderAddress));
+            logger.info("creating a new contract inside contract run: [{}]", toHexString(senderAddress));
 
         BlockchainConfig blockchainConfig = config.getBlockchainConfig().getConfigForBlock(getNumber().longValue());
         //  actual gas subtract
@@ -468,7 +469,7 @@ this, new DataWord(newAddress), getOwnerAddress(), value, gasLimit,
         ProgramResult result = ProgramResult.createEmpty();
 
         if (contractAlreadyExists) {
-            result.setException(new BytecodeExecutionException("Trying to create a contract with existing contract address: 0x" + Hex.toHexString(newAddress)));
+            result.setException(new BytecodeExecutionException("Trying to create a contract with existing contract address: 0x" + toHexString(newAddress)));
         } else if (isNotEmpty(programCode)) {
             VM vm = new VM(config);
             Program program = new Program(programCode, programInvoke, internalTx, config).withCommonConfig(commonConfig);
@@ -500,7 +501,7 @@ this, new DataWord(newAddress), getOwnerAddress(), value, gasLimit,
 
         if (result.getException() != null || result.isRevert()) {
             logger.debug("contract run halted by Exception: contract: [{}], exception: [{}]",
-                    Hex.toHexString(newAddress),
+                    toHexString(newAddress),
                     result.getException());
 
             internalTx.reject();
@@ -528,7 +529,7 @@ this, new DataWord(newAddress), getOwnerAddress(), value, gasLimit,
             refundGas(refundGas, "remain gas from the internal call");
             if (logger.isInfoEnabled()) {
                 logger.info("The remaining gas is refunded, account: [{}], gas: [{}] ",
-                        Hex.toHexString(getOwnerAddress().getLast20Bytes()),
+                        toHexString(getOwnerAddress().getLast20Bytes()),
                         refundGas);
             }
         }
@@ -560,7 +561,7 @@ public void callToAddress(MessageCall msg) {
 
         if (logger.isInfoEnabled())
             logger.info(msg.getType().name() + " for existing contract: address: [{}], outDataOffs: [{}], outDataSize: [{}]  ",
-                    Hex.toHexString(contextAddress), msg.getOutDataOffs().longValue(), msg.getOutDataSize().longValue());
+                    toHexString(contextAddress), msg.getOutDataOffs().longValue(), msg.getOutDataSize().longValue());
 
         Repository track = getStorage().startTracking();
 
@@ -611,7 +612,7 @@ this, new DataWord(contextAddress),
 
             if (result.getException() != null || result.isRevert()) {
                 logger.debug("contract run halted by Exception: contract: [{}], exception: [{}]",
-                        Hex.toHexString(contextAddress),
+                        toHexString(contextAddress),
                         result.getException());
 
                 internalTx.reject();
@@ -658,7 +659,7 @@ this, new DataWord(contextAddress),
                 refundGas(refundGas.longValue(), "remaining gas from the internal call");
                 if (logger.isInfoEnabled())
                     logger.info("The remaining gas refunded, account: [{}], gas: [{}] ",
-                            Hex.toHexString(senderAddress),
+                            toHexString(senderAddress),
                             refundGas.toString());
             }
         } else {
@@ -1183,7 +1184,7 @@ public void callToPrecompiledAddress(MessageCall msg, PrecompiledContract contra
         } else {
 
             if (logger.isDebugEnabled())
-                logger.debug("Call {}(data = {})", contract.getClass().getSimpleName(), Hex.toHexString(data));
+                logger.debug("Call {}(data = {})", contract.getClass().getSimpleName(), toHexString(data));
 
             Pair<Boolean, byte[]> out = contract.execute(data);