Merge branch 'develop'

README.md

@@ -1,6 +1,5 @@
 # Welcome to ethereumj
 
-[![Slack Status](http://harmony-slack-ether-camp.herokuapp.com/badge.svg)](http://ether.camp) 
 [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/ethereum/ethereumj?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 [![Build Status](https://travis-ci.org/ethereum/ethereumj.svg?branch=master)](https://travis-ci.org/ethereum/ethereumj)
 [![Coverage Status](https://coveralls.io/repos/ethereum/ethereumj/badge.png?branch=master)](https://coveralls.io/r/ethereum/ethereumj?branch=master)
@@ -19,7 +18,7 @@ We keep EthereumJ as thin as possible. For [JSON-RPC](https://github.com/ethereu
    <dependency>
      <groupId>org.ethereum</groupId>
      <artifactId>ethereumj-core</artifactId>
-     <version>1.6.3-RELEASE</version>
+     <version>1.8.1-RELEASE</version>
    </dependency>
 ```
 
@@ -31,7 +30,7 @@ We keep EthereumJ as thin as possible. For [JSON-RPC](https://github.com/ethereu
        jcenter()
        maven { url "https://dl.bintray.com/ethereum/maven/" }
    }
-   compile "org.ethereum:ethereumj-core:1.6.+"
+   compile "org.ethereum:ethereumj-core:1.8.+"
 ```
 
 As a starting point for your own project take a look at https://github.com/ether-camp/ethereumj.starter
@@ -64,6 +63,27 @@ java -jar ethereumj-core/build/libs/ethereumj-core-*-all.jar
 ./gradlew run -PmainClass=org.ethereum.samples.TransactionBomb
 ```
 
+##### For snapshot builds:
+Please, note, snapshots are not stable and are currently in development! If you still want to try it:
+
+ - Add https://oss.jfrog.org/libs-snapshot/ as a repository to your build script
+ - Add a dependency on `org.ethereum:ethereumj-core:${VERSION}`, where `${VERSION}` is of the form `1.9.0-SNAPSHOT`.
+
+Example:
+
+    <repository>
+        <id>jfrog-snapshots</id>
+        <name>oss.jfrog.org</name>
+        <url>https://oss.jfrog.org/libs-snapshot/</url>
+        <snapshots><enabled>true</enabled></snapshots>
+    </repository>
+    <!-- ... -->
+    <dependency>
+       <groupId>org.ethereum</groupId>
+       <artifactId>ethereumj-core</artifactId>
+       <version>1.9.0-SNAPSHOT</version>
+    </dependency>
+
 ##### Importing project to IntelliJ IDEA: 
 ```
 > git clone https://github.com/ethereum/ethereumj

ethereumj-core/src/main/java/org/ethereum/core/BlockchainImpl.java

@@ -741,6 +741,11 @@ private boolean isValid(Repository repo, Block block) {
 
                 for (Transaction tx : txs) {
                     byte[] txSender = tx.getSender();
+                    if (txSender == null) {
+                        logger.warn("Invalid transaction: sender in tx with rlp={} is null." +
+                                "Not valid until EIP-86", ByteUtil.toHexString(tx.getEncoded()));
+                        return false;
+                    }
                     ByteArrayWrapper key = new ByteArrayWrapper(txSender);
                     BigInteger expectedNonce = curNonce.get(key);
                     if (expectedNonce == null) {

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

@@ -24,6 +24,7 @@
 import org.ethereum.facade.EthereumFactory;
 import org.ethereum.listener.EthereumListenerAdapter;
 import org.ethereum.util.ByteUtil;
+import org.ethereum.util.blockchain.EtherUtil;
 import org.spongycastle.util.encoders.Hex;
 import org.springframework.context.annotation.Bean;
 
@@ -84,7 +85,7 @@ private TransactionReceipt sendTxAndWait(byte[] receiveAddress, byte[] data) thr
                 ByteUtil.longToBytesNoLeadZeroes(ethereum.getGasPrice()),
                 ByteUtil.longToBytesNoLeadZeroes(200000),
                 receiveAddress,
-                ByteUtil.bigIntegerToBytes(BigInteger.valueOf(1)),  // 1_000_000_000 gwei, 1_000_000_000_000L szabo, 1_000_000_000_000_000L finney, 1_000_000_000_000_000_000L ether
+                ByteUtil.bigIntegerToBytes(EtherUtil.convert(1, EtherUtil.Unit.WEI)),  // Use EtherUtil.convert for easy value unit conversion
                 data,
                 ethereum.getChainIdForNextBlock());
 

ethereumj-core/src/main/java/org/ethereum/sync/FastSyncManager.java

@@ -725,7 +725,7 @@ public void main() {
 
                         syncSecure();
 
-                        listener.onSyncDone(EthereumListener.SyncState.SECURE);
+                        fireSyncDone(SECURE);
                     case COMPLETE:
                         if (origSyncStage == COMPLETE) {
                             logger.info("FastSync: SECURE sync was completed prior to this run, proceeding with next stage...");
@@ -735,7 +735,7 @@ public void main() {
 
                         syncBlocksReceipts();
 
-                        listener.onSyncDone(EthereumListener.SyncState.COMPLETE);
+                        fireSyncDone(COMPLETE);
                 }
                 logger.info("FastSync: Full sync done.");
             } catch (InterruptedException ex) {
@@ -751,6 +751,14 @@ public void main() {
         }
     }
 
+    private void fireSyncDone(EthereumListener.SyncState state) {
+        // prevent early state notification when sync is not yet done
+        syncManager.setSyncDoneType(state);
+        if (syncManager.isSyncDone()) {
+            listener.onSyncDone(state);
+        }
+    }
+
     public boolean isFastSyncInProgress() {
         return fastSyncInProgress;
     }

ethereumj-core/src/main/java/org/ethereum/sync/SyncManager.java

@@ -186,10 +186,14 @@ void initRegularSync(EthereumListener.SyncState syncDoneType) {
                 } catch (Exception e) {
                     logger.error("Unexpected", e);
                 }
-            }, 0, 10, TimeUnit.SECONDS);
+            }, 0, 2, TimeUnit.SECONDS);
         }
     }
 
+    void setSyncDoneType(EthereumListener.SyncState syncDoneType) {
+        this.syncDoneType = syncDoneType;
+    }
+
     public SyncStatus getSyncStatus() {
         if (config.isFastSyncEnabled()) {
             SyncStatus syncStatus = fastSyncManager.getSyncState();

ethereumj-core/src/main/java/org/ethereum/vm/VM.java

@@ -109,7 +109,7 @@ private long calcMemGas(GasCost gasCosts, long oldMemSize, BigInteger newMemSize
         long gasCost = 0;
 
         // Avoid overflows
-        if (newMemSize.compareTo(MAX_MEM_SIZE) == 1) {
+        if (newMemSize.compareTo(MAX_MEM_SIZE) > 0) {
             throw Program.Exception.gasOverflow(newMemSize, MAX_MEM_SIZE);
         }
 
@@ -790,7 +790,7 @@ else if (oldValue != null && newValue.isZero()) {
                     if (logger.isInfoEnabled())
                         hint = "data: " + toHexString(msgData);
 
-                    program.memorySave(memOffsetData.intValueSafe(), msgData);
+                    program.memorySave(memOffsetData.intValueSafe(), lengthData.intValueSafe(), msgData);
                     program.step();
                 }
                 break;
@@ -818,7 +818,7 @@ else if (oldValue != null && newValue.isZero()) {
                     if (logger.isInfoEnabled())
                         hint = "data: " + toHexString(msgData);
 
-                    program.memorySave(memOffsetData.intValueSafe(), msgData);
+                    program.memorySave(memOffsetData.intValueSafe(), lengthData.intValueSafe(), msgData);
                     program.step();
                 }
                 break;
@@ -870,7 +870,7 @@ else if (oldValue != null && newValue.isZero()) {
                     if (logger.isInfoEnabled())
                         hint = "code: " + toHexString(codeCopy);
 
-                    program.memorySave(memOffset, codeCopy);
+                    program.memorySave(memOffset, lengthData, codeCopy);
                     program.step();
                 }
                 break;

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

@@ -72,6 +72,7 @@ public byte[] read(int address, int size) {
     }
 
     public void write(int address, byte[] data, int dataSize, boolean limited) {
+        if (dataSize <= 0) return;
 
         if (data.length < dataSize)
             dataSize = data.length;
@@ -107,7 +108,7 @@ public void write(int address, byte[] data, int dataSize, boolean limited) {
 
     public void extendAndWrite(int address, int allocSize, byte[] data) {
         extend(address, allocSize);
-        write(address, data, data.length, false);
+        write(address, data, allocSize, false);
     }
 
     public void extend(int address, int size) {

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

@@ -1200,7 +1200,7 @@ public void callToPrecompiledAddress(MessageCall msg, PrecompiledContract contra
                 track.rollback();
             }
 
-            this.memorySave(msg.getOutDataOffs().intValue(), out.getRight());
+            this.memorySave(msg.getOutDataOffs().intValue(), msg.getOutDataSize().intValueSafe(), out.getRight());
         }
     }
 

ethereumj-core/src/main/resources/version.properties

@@ -1,3 +1,3 @@
-versionNumber='1.8.0'
+versionNumber='1.9.0'
 // Remove org.ethereum.db.migrate.MigrateHeaderSourceTotalDiff with databaseVersion > 6
 databaseVersion=6

ethereumj-core/src/test/java/org/ethereum/vm/ProgramMemoryTest.java

@@ -341,15 +341,11 @@ public void testAllocateMemoryUnrounded7() {
         assertEquals(32, program.getMemSize());
     }
 
-    @Ignore
     @Test
-    public void testInitialInsert() {
-
-
-        // todo: fix the array out of bound here
+    public void testEmptyInsert() {
         int offset = 32;
-        int size = 00;
-        program.memorySave(32, 0, new byte[0]);
-        assertEquals(32, program.getMemSize());
+        int size = 0;
+        program.memorySave(offset, size, new byte[] {0x01});
+        assertEquals(0, program.getMemSize());
     }
 }