Merge code from master branch to android branch

README.rst

@@ -121,7 +121,7 @@ Java 8:
    <dependency>
      <groupId>org.web3j</groupId>
      <artifactId>core</artifactId>
-     <version>3.2.0</version>
+     <version>3.4.0</version>
    </dependency>
 
 Android:
@@ -131,7 +131,7 @@ Android:
    <dependency>
      <groupId>org.web3j</groupId>
      <artifactId>core</artifactId>
-     <version>3.1.1-android</version>
+     <version>3.3.1-android</version>
    </dependency>
 
 Gradle
@@ -141,13 +141,13 @@ Java 8:
 
 .. code-block:: groovy
 
-   compile ('org.web3j:core:3.2.0')
+   compile ('org.web3j:core:3.4.0')
 
 Android:
 
 .. code-block:: groovy
 
-   compile ('org.web3j:core:3.1.1-android')
+   compile ('org.web3j:core:3.3.1-android')
 
 
 Start a client
@@ -305,6 +305,14 @@ To call a smart contract:
 
    Type result = contract.someMethod(<param1>, ...).send();
 
+To fine control your gas price:
+
+.. code-block:: java
+
+    contract.setGasProvider(new DefaultGasProvider() {
+            ...
+            });
+
 For more information refer to `Smart Contracts <http://docs.web3j.io/smart_contracts.html#solidity-smart-contract-wrappers>`_.
 
 
@@ -517,6 +525,9 @@ Please submit a pull request if you wish to include your project on the list:
 - `Trust Ethereum Wallet <https://github.com/TrustWallet/trust-wallet-android>`_
 - `Presto Ethereum <https://github.com/xiaoyao1991/presto-ethereum>`_
 - `Kundera-Ethereum data importer and sync utility <https://github.com/impetus-opensource/Kundera/tree/trunk/src/kundera-ethereum>`_ by `@impetus-opensource <https://github.com/impetus-opensource>`_
+- `Ethereum JDBC Connector <https://github.com/Impetus/eth-jdbc-connector/>`_ by `@impetus-opensource <https://github.com/impetus-opensource>`_
+- `Ethereum Tool <https://github.com/e-Contract/ethereum-tool>`_ for secure offline key management.
+- `Ethereum Java EE JCA Resource Adapter <https://github.com/e-Contract/ethereum-resource-adapter>`_ provides integration of Ethereum within Java EE 6+.
 
 
 Companies using web3j
@@ -533,6 +544,7 @@ Please submit a pull request if you wish to include your company on the list:
 - `Pactum <https://pactum.io/>`_
 - `TrustWallet <http://trustwalletapp.com>`_
 - `Impetus <http://www.impetus.com/>`_
+- `Argent Labs <http://www.argent.im/>`_
 
 
 Build instructions

abi/src/main/java/org/web3j/abi/EventEncoder.java

@@ -1,6 +1,5 @@
 package org.web3j.abi;
 
-import java.util.ArrayList;
 import java.util.List;
 
 import org.web3j.abi.datatypes.Event;
@@ -18,22 +17,17 @@ public class EventEncoder {
 
     private EventEncoder() { }
 
-    public static String encode(Event function) {
-        List<TypeReference<Type>> indexedParameters = function.getIndexedParameters();
-        List<TypeReference<Type>> nonIndexedParameters = function.getNonIndexedParameters();
+    public static String encode(Event event) {
 
-        String methodSignature = buildMethodSignature(function.getName(),
-                indexedParameters, nonIndexedParameters);
+        String methodSignature = buildMethodSignature(
+                event.getName(),
+                event.getParameters());
 
         return buildEventSignature(methodSignature);
     }
 
     static <T extends Type> String buildMethodSignature(
-            String methodName, List<TypeReference<T>> indexParameters,
-            List<TypeReference<T>> nonIndexedParameters) {
-
-        List<TypeReference<T>> parameters = new ArrayList<TypeReference<T>>(indexParameters);
-        parameters.addAll(nonIndexedParameters);
+            String methodName, List<TypeReference<T>> parameters) {
 
         StringBuilder result = new StringBuilder();
         result.append(methodName);

abi/src/main/java/org/web3j/abi/FunctionReturnDecoder.java

@@ -14,6 +14,7 @@
 import org.web3j.abi.datatypes.Utf8String;
 import org.web3j.abi.datatypes.generated.Bytes32;
 import org.web3j.utils.Numeric;
+import org.web3j.utils.Strings;
 
 import static org.web3j.abi.TypeDecoder.MAX_BYTE_LENGTH_FOR_HEX_STRING;
 
@@ -36,7 +37,7 @@ public static List<Type> decode(
             String rawInput, List<TypeReference<Type>> outputParameters) {
         String input = Numeric.cleanHexPrefix(rawInput);
 
-        if (input.isEmpty()) {
+        if (Strings.isEmpty(input)) {
             return Collections.emptyList();
         } else {
             return build(input, outputParameters);

abi/src/main/java/org/web3j/abi/TypeReference.java

@@ -18,13 +18,19 @@ public abstract class TypeReference<T extends org.web3j.abi.datatypes.Type>
         implements Comparable<TypeReference<T>> {
 
     private final Type type;
+    private final boolean indexed;
 
     protected TypeReference() {
+        this(false);
+    }
+
+    protected TypeReference(boolean indexed) {
         Type superclass = getClass().getGenericSuperclass();
         if (superclass instanceof Class) {
             throw new RuntimeException("Missing type parameter.");
         }
         this.type = ((ParameterizedType) superclass).getActualTypeArguments()[0];
+        this.indexed = indexed;
     }
 
     public int compareTo(TypeReference<T> o) {
@@ -37,6 +43,10 @@ public Type getType() {
         return type;
     }
 
+    public boolean isIndexed() {
+        return indexed;
+    }
+
     /**
      * Workaround to ensure type does not come back as T due to erasure, this enables you to
      * create a TypeReference via {@link Class Class&lt;T&gt;}.

abi/src/main/java/org/web3j/abi/Utils.java

@@ -100,6 +100,26 @@ public static List<TypeReference<Type>> convert(List<TypeReference<?>> input) {
         return result;
     }
 
+    public static <T, R extends Type<T>, E extends Type<T>> List<E> typeMap(
+            List<List<T>> input,
+            Class<E> outerDestType,
+            Class<R> innerType) {
+        List<E> result = new ArrayList<>();
+        try {
+            Constructor<E> constructor = outerDestType.getDeclaredConstructor(List.class);
+            for (List<T> ts : input) {
+                E e = constructor.newInstance(typeMap(ts, innerType));
+                result.add(e);
+            }
+        } catch (NoSuchMethodException
+                | IllegalAccessException
+                | InstantiationException
+                | InvocationTargetException e) {
+            throw new TypeMappingException(e);
+        }
+        return result;
+    }
+
     public static <T, R extends Type<T>> List<R> typeMap(List<T> input, Class<R> destType)
             throws TypeMappingException {
 
@@ -122,7 +142,6 @@ public static <T, R extends Type<T>> List<R> typeMap(List<T> input, Class<R> des
                 throw new TypeMappingException(e);
             }
         }
-
         return result;
     }
 }

abi/src/main/java/org/web3j/abi/datatypes/Bool.java

@@ -14,6 +14,10 @@ public Bool(boolean value) {
         this.value = value;
     }
 
+    public Bool(Boolean value) {
+        this.value = value;
+    }
+
     @Override
     public String getTypeAsString() {
         return TYPE_NAME;

abi/src/main/java/org/web3j/abi/datatypes/Event.java

@@ -1,6 +1,7 @@
 package org.web3j.abi.datatypes;
 
 import java.util.List;
+import java.util.stream.Collectors;
 
 import org.web3j.abi.TypeReference;
 
@@ -11,25 +12,30 @@
  */
 public class Event {
     private String name;
-    private List<TypeReference<Type>> indexedParameters;
-    private List<TypeReference<Type>> nonIndexedParameters;
+    private List<TypeReference<Type>> parameters;
 
-    public Event(String name, List<TypeReference<?>> indexedParameters,
-                 List<TypeReference<?>> nonIndexedParameters) {
+    public Event(String name, List<TypeReference<?>> parameters) {
         this.name = name;
-        this.indexedParameters = convert(indexedParameters);
-        this.nonIndexedParameters = convert(nonIndexedParameters);
+        this.parameters = convert(parameters);
     }
 
     public String getName() {
         return name;
     }
 
+    public List<TypeReference<Type>> getParameters() {
+        return parameters;
+    }
+
     public List<TypeReference<Type>> getIndexedParameters() {
-        return indexedParameters;
+        return parameters.stream()
+                .filter(TypeReference::isIndexed)
+                .collect(Collectors.toList());
     }
 
     public List<TypeReference<Type>> getNonIndexedParameters() {
-        return nonIndexedParameters;
+        return parameters.stream()
+                .filter(p -> !p.isIndexed())
+                .collect(Collectors.toList());
     }
 }

abi/src/test/java/org/web3j/abi/UtilsTest.java

@@ -18,6 +18,7 @@
 import org.web3j.abi.datatypes.Uint;
 import org.web3j.abi.datatypes.Utf8String;
 import org.web3j.abi.datatypes.generated.Int64;
+import org.web3j.abi.datatypes.generated.StaticArray2;
 import org.web3j.abi.datatypes.generated.Uint256;
 import org.web3j.abi.datatypes.generated.Uint64;
 
@@ -61,6 +62,19 @@ public void testTypeMap() throws Exception {
                         new Uint256(BigInteger.TEN))));
     }
 
+    @Test
+    public void testTypeMapNested() {
+        List<BigInteger> innerList1 = Arrays.asList(BigInteger.valueOf(1), BigInteger.valueOf(2));
+        List<BigInteger> innerList2 = Arrays.asList(BigInteger.valueOf(3), BigInteger.valueOf(4));
+        final List<List<BigInteger>> input = Arrays.asList(innerList1, innerList2);
+
+        StaticArray2<Uint256> staticArray1 = new StaticArray2<>(new Uint256(1), new Uint256(2));
+        StaticArray2<Uint256> staticArray2 = new StaticArray2<>(new Uint256(3), new Uint256(4));
+        List<StaticArray2<Uint256>> expectedList = Arrays.asList(staticArray1, staticArray2);
+        assertThat(typeMap(input, StaticArray2.class, Uint256.class),
+                equalTo(expectedList));
+    }
+
     @Test
     public void testTypeMapEmpty() {
         assertThat(typeMap(new ArrayList<BigInteger>(), Uint256.class),

build.gradle

@@ -7,6 +7,7 @@ buildscript {
     ext.okhttpVersion = '3.8.1'
     ext.rxjavaVersion = '1.2.4'
     ext.slf4jVersion = '1.7.25'
+    ext.javaWebSocketVersion = '1.3.8'
 
     // test dependencies
     ext.equalsverifierVersion = '2.1.7'
@@ -44,7 +45,7 @@ allprojects {
     targetCompatibility = 1.6
 
     group 'org.web3j'
-    version '3.3.1-android'
+    version '3.4.0-android'
 
     apply plugin: 'java'
     apply plugin: 'jacoco'
@@ -63,6 +64,10 @@ allprojects {
         options.compilerArgs << "-Xlint:unchecked" << "-Xlint:deprecation"
     }
 
+    javadoc {
+        options.encoding = 'UTF-8'
+    }
+
     jacoco {
         toolVersion = '0.7.7.201606060606' // See http://www.eclemma.org/jacoco/.
     }

codegen/build.gradle

@@ -4,4 +4,5 @@ description 'web3j project code generators'
 dependencies {
     compile project(':core'),
             "com.squareup:javapoet:$javapoetVersion"
+    testCompile project(path: ':core', configuration: 'testArtifacts')
 }

codegen/src/main/java/org/web3j/codegen/GenerationReporter.java

@@ -0,0 +1,8 @@
+package org.web3j.codegen;
+
+/**
+ * Can be used to provide report about a code generation process.
+ */
+interface GenerationReporter {
+    void report(String msg);
+}

codegen/src/main/java/org/web3j/codegen/LogGenerationReporter.java

@@ -0,0 +1,20 @@
+package org.web3j.codegen;
+
+import org.slf4j.Logger;
+
+/**
+ * A reporter generation that outputs messages using a logger instance.
+ */
+class LogGenerationReporter implements GenerationReporter {
+
+    private final Logger logger;
+
+    public LogGenerationReporter(Logger logger) {
+        this.logger = logger;
+    }
+
+    @Override
+    public void report(String msg) {
+        logger.warn(msg);
+    }
+}