Merge remote-tracking branch 'origin/master' into android

# Conflicts:
#	src/integration-test/java/org/web3j/generated/Greeter.java
#	src/integration-test/java/org/web3j/protocol/scenarios/FunctionWrappersIT.java
#	src/main/java/org/web3j/abi/Contract.java
#	src/main/java/org/web3j/abi/Transfer.java
#	src/test/java/org/web3j/utils/StringsTest.java

Author: conor10

README.rst

@@ -24,10 +24,10 @@ web3j: Web3 Java Ethereum Ðapp API
    :target: https://gitter.im/web3j/web3j?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge
    :alt: Join the chat at https://gitter.im/web3j/web3j
 
-web3j is a lightweight, type safe Java library for integrating with clients (nodes) on the
-Ethereum network:
+web3j is a lightweight, type safe Java and Android library for integrating with clients (nodes) on
+the Ethereum network:
 
-.. image:: https://raw.githubusercontent.com/web3j/web3j/master/docs/source/images/web3j-network.png
+.. image:: https://raw.githubusercontent.com/web3j/web3j/master/docs/source/images/web3j_network.png
 
 This allows you to work with the `Ethereum <https://www.ethereum.org/>`_ blockchain, without the
 additional overhead of having to write your own integration code for the platform.
@@ -153,13 +153,20 @@ To send synchronous requests:
    Web3j web3 = Web3jFactory.build(new HttpService());  // defaults to http://localhost:8545/
    ...
 
-Sending transactions
---------------------
+Transactions
+------------
+
+web3j provides support for both working with Ethereum wallet files (recommended) and Ethereum
+client admin commands for sending transactions.
+
+To send Ether to another party using your Ethereum wallet file::
 
-web3j provides support for both working with Ethereum wallet files and Ethereum client admin
-commands for sending transactions.
+   Web3j web3 = Web3j.build(new HttpService());  // defaults to http://localhost:8545/
+   Credentials credentials = WalletUtils.loadCredentials("password", "/path/to/walletfile");
+   TransactionReceipt transactionReceipt = Transfer.sendFunds(
+           web3, credentials, "0x...", BigDecimal.valueOf(1.0), Convert.Unit.ETHER);
 
-Using an Ethereum wallet file::
+Or if you wish to create your own custom transaction::
 
    Web3j web3 = Web3j.build(new HttpService());  // defaults to http://localhost:8545/
    Credentials credentials = WalletUtils.loadCredentials("password", "/path/to/walletfile");
@@ -182,7 +189,6 @@ Using an Ethereum wallet file::
 Although it's far simpler using web3j's
 `Java smart contract wrappers`_.
 
-
 Using an Ethereum client's admin commands (make sure you have your wallet in the client's
 keystore)::
 
@@ -224,13 +230,15 @@ Now you can create and deploy your smart contract::
    Credentials credentials = WalletUtils.loadCredentials("password", "/path/to/walletfile");
 
    YourSmartContract contract = YourSmartContract.deploy(
-           <web3j>, <credentials>, <initialEtherValue>,
+           <web3j>, <credentials>,
+           GAS_PRICE, GAS_LIMIT,
+           <initialEtherValue>,
            <param1>, ..., <paramN>).get();  // constructor params
 
 Or use an existing::
 
    YourSmartContract contract = YourSmartContract.load(
-           "0x<address>", <web3j>, <credentials>);
+           "0x<address>", <web3j>, <credentials>, GAS_PRICE, GAS_LIMIT);
 
 To Transact with a smart contract::
 
@@ -343,4 +351,4 @@ Thanks and credits
 - And of course the users of the library, who've provided valuable input & feedback -
   `@ice09 <https://github.com/ice09>`_, `@adridadou <https://github.com/adridadou>`_,
   `@nickmelis <https://github.com/nickmelis>`_, `@basavk <https://github.com/basavk>`_,
-  `@kabl <https://github.com/kabl>`_
+  `@kabl <https://github.com/kabl>`_, `@MaxBinnewies <https://github.com/MaxBinnewies>`_

build.gradle

@@ -26,7 +26,7 @@ apply plugin: 'com.github.johnrengelman.shadow'
 apply plugin: 'application'
 
 group 'org.web3j'
-version '1.0.5'
+version '1.0.6'
 
 sourceCompatibility = 1.6
 targetCompatibility = 1.6

docs/Makefile

@@ -113,7 +113,7 @@ devhelp:
 	@echo
 	@echo "Build finished."
 	@echo "To view the help file:"
-	@echo "# mkdir -prf $$HOME/.local/share/devhelp/web3j"
+	@echo "# mkdir -p $$HOME/.local/share/devhelp/web3j"
 	@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/web3j"
 	@echo "# devhelp"
 

docs/source/getting_started.rst

@@ -86,13 +86,20 @@ To send synchronous requests::
    ...
 
 
-Sending transactions
---------------------
+Transactions
+------------
 
-web3j provides support for both working with Ethereum wallet files and Ethereum client admin
-commands for sending transactions.
+web3j provides support for both working with Ethereum wallet files (recommended) and Ethereum
+client admin commands for sending transactions.
 
-Using an Ethereum wallet file::
+To send Ether to another party using your Ethereum wallet file::
+
+   Web3j web3 = Web3j.build(new HttpService());  // defaults to http://localhost:8545/
+   Credentials credentials = WalletUtils.loadCredentials("password", "/path/to/walletfile");
+   TransactionReceipt transactionReceipt = Transfer.sendFunds(
+           web3, credentials, "0x...", BigDecimal.valueOf(1.0), Convert.Unit.ETHER);
+
+Or if you wish to create your own custom transaction::
 
    Web3j web3 = Web3j.build(new HttpService());  // defaults to http://localhost:8545/
    Credentials credentials = WalletUtils.loadCredentials("password", "/path/to/walletfile");
@@ -106,7 +113,7 @@ Using an Ethereum wallet file::
    RawTransaction rawTransaction  = RawTransaction.createEtherTransaction(
                 nonce, <gas price>, <gas limit>, <toAddress>, <value>);
 
-   // sign & sendn our transaction
+   // sign & send our transaction
    byte[] signedMessage = TransactionEncoder.signMessage(rawTransaction, credentials);
    String hexValue = Hex.toHexString(signedMessage);
    EthSendTransaction ethSendTransaction = web3j.ethSendRawTransaction(hexValue).sendAsync().get();
@@ -115,7 +122,6 @@ Using an Ethereum wallet file::
 Although it's far simpler using web3j's
 :ref:`smart contract wrappers <smart-contract-wrappers-summary>`.
 
-
 Using an Ethereum client's admin commands (make sure you have your wallet in the client's
 keystore)::
 
@@ -139,7 +145,7 @@ To generate the wrapper code, compile your smart contract:
 
    $ solc <contract>.sol --bin --abi --optimize -o <output-dir>/
 
-Then generate the wrapper code using web3j's :ref:`command_line`:
+Then generate the wrapper code using web3j's :doc:`command_line`:
 
 .. code-block:: bash
 
@@ -151,13 +157,15 @@ Now you can create and deploy your smart contract::
    Credentials credentials = WalletUtils.loadCredentials("password", "/path/to/walletfile");
 
    YourSmartContract contract = YourSmartContract.deploy(
-           <web3j>, <credentials>, <initialEtherValue>,
+           <web3j>, <credentials>,
+           GAS_PRICE, GAS_LIMIT,
+           <initialEtherValue>,
            <param1>, ..., <paramN>).get();  // constructor params
 
 Or use an existing::
 
    YourSmartContract contract = YourSmartContract.load(
-           "0x<address>", <web3j>, <credentials>);
+           "0x<address>", <web3j>, <credentials>, GAS_PRICE, GAS_LIMIT);
 
 To transact with a smart contract::
 

docs/source/images/web3j-network.png renamed to docs/source/images/web3j_network.png

@@ -3,12 +3,10 @@
 web3j
 =====
 
-web3j is a lightweight, type safe Java library for integrating with clients (nodes) on the
-Ethereum network:
+web3j is a lightweight, type safe Java and Android library for integrating with clients (nodes) on
+the Ethereum network:
 
-.. code-block:: bash
-
-   [ JVM application ] + [ web3j ] <---> [ Ethereum node ]
+.. image:: /images/web3j_network.png
 
 This allows you to work with the `Ethereum <https://www.ethereum.org/>`_ blockchain, without the
 additional overhead of having to write your own integration code for the platform.

docs/source/index.rst

@@ -182,7 +182,8 @@ Construction and deployment
 Construction and deployment of smart contracts happens with the *deploy* method::
 
    YourSmartContract contract = YourSmartContract.deploy(
-           <web3j>, <credentials>, <initialValue>,
+           <web3j>, <credentials>, GAS_PRICE, GAS_LIMIT,
+           <initialValue>,
            <param1>, ..., <paramN>);
 
 This will create a new instance of the smart contract on the Ethereum blockchain using the
@@ -192,7 +193,8 @@ It returns a new smart contract wrapper instance which contains the underlying a
 smart contract. If you wish to construct an instance of a smart contract wrapper with an existing
 smart contract, simply pass in it's address::
 
-   YourSmartContract contract = new YourSmartContract("0x...", web3j, credentials);
+   YourSmartContract contract = new YourSmartContract(
+           "0x...", web3j, credentials, GAS_PRICE, GAS_LIMIT);
 
 
 .. _invoking-transactions:

docs/source/smart_contracts.rst

@@ -23,8 +23,8 @@
 public final class Arrays extends Contract {
     private static final String BINARY = "60606040526101f5806100126000396000f3606060405260e060020a6000350463b96f54d18114610029578063beda363b146100bc575b610002565b34610002576040805161014081810190925261018191600491610144918390600a90839083908082843750909550505050505061014060405190810160405280600a905b600081526020019060019003908161006d5750600a905060005b818110156101ee5783816001018303600a8110156100025760200201518382600a811015610002576020020152600101610087565b3461000257604080516020600480358082013583810280860185019096528085526101a49592946024949093928501928291850190849080828437509496505050505050506040805160208101825260008082528351925191929182908059106101235750595b90808252806020026020018201604052801561013a575b509250600090505b818110156101ee578381600101830381518110156100025790602001906020020151838281518110156100025760209081029091010152600101610142565b60405180826101408083818460006004602df15090500191505060405180910390f35b60405180806020018281038252838181518152602001915080519060200190602002808383829060006004602084601f0104600302600f01f1509050019250505060405180910390f35b505091905056";
 
-    private Arrays(String contractAddress, Web3j web3j, Credentials credentials) {
-        super(contractAddress, web3j, credentials);
+    private Arrays(String contractAddress, Web3j web3j, Credentials credentials, BigInteger gasPrice, BigInteger gasLimit) {
+        super(contractAddress, web3j, credentials, gasPrice, gasLimit);
     }
 
     public Future<TransactionReceipt> fixedReverse(StaticArray<Uint256> input) {
@@ -37,11 +37,11 @@ public Future<TransactionReceipt> dynamicReverse(DynamicArray<Uint256> input) {
         return executeTransactionAsync(function);
     }
 
-    public static Future<Arrays> deploy(Web3j web3j, Credentials credentials, BigInteger initialValue) {
-        return deployAsync(Arrays.class, web3j, credentials, BINARY, "", initialValue);
+    public static Future<Arrays> deploy(Web3j web3j, Credentials credentials, BigInteger gasPrice, BigInteger gasLimit, BigInteger initialValue) {
+        return deployAsync(Arrays.class, web3j, credentials, gasPrice, gasLimit, BINARY, "", initialValue);
     }
 
-    public static Arrays load(String contractAddress, Web3j web3j, Credentials credentials) {
-        return new Arrays(contractAddress, web3j, credentials);
+    public static Arrays load(String contractAddress, Web3j web3j, Credentials credentials, BigInteger gasPrice, BigInteger gasLimit) {
+        return new Arrays(contractAddress, web3j, credentials, gasPrice, gasLimit);
     }
 }

src/integration-test/java/org/web3j/generated/Arrays.java

@@ -24,8 +24,8 @@
 public final class Fibonacci extends Contract {
     private static final String BINARY = "606060405260d18060106000396000f3606060405260e060020a60003504633c7fdc708114602657806361047ff4146044575b6002565b34600257605160043560006063825b600081151560a75750600060a2565b3460025760516004356035565b60408051918252519081900360200190f35b604080518481526020810183905281519293507f71e71a8458267085d5ab16980fd5f114d2d37f232479c245d523ce8d23ca40ed929081900390910190a15b919050565b816001141560b65750600160a2565b60c0600283036035565b60ca600184036035565b01905060a256";
 
-    private Fibonacci(String contractAddress, Web3j web3j, Credentials credentials) {
-        super(contractAddress, web3j, credentials);
+    private Fibonacci(String contractAddress, Web3j web3j, Credentials credentials, BigInteger gasPrice, BigInteger gasLimit) {
+        super(contractAddress, web3j, credentials, gasPrice, gasLimit);
     }
 
     public Future<TransactionReceipt> fibonacciNotify(Uint256 number) {
@@ -47,11 +47,11 @@ public EventValues processNotifyEvent(TransactionReceipt transactionReceipt) {
         return extractEventParameters(event, transactionReceipt);
     }
 
-    public static Future<Fibonacci> deploy(Web3j web3j, Credentials credentials, BigInteger initialValue) {
-        return deployAsync(Fibonacci.class, web3j, credentials, BINARY, "", initialValue);
+    public static Future<Fibonacci> deploy(Web3j web3j, Credentials credentials, BigInteger gasPrice, BigInteger gasLimit, BigInteger initialValue) {
+        return deployAsync(Fibonacci.class, web3j, credentials, gasPrice, gasLimit, BINARY, "", initialValue);
     }
 
-    public static Fibonacci load(String contractAddress, Web3j web3j, Credentials credentials) {
-        return new Fibonacci(contractAddress, web3j, credentials);
+    public static Fibonacci load(String contractAddress, Web3j web3j, Credentials credentials, BigInteger gasPrice, BigInteger gasLimit) {
+        return new Fibonacci(contractAddress, web3j, credentials, gasPrice, gasLimit);
     }
 }

src/integration-test/java/org/web3j/generated/Fibonacci.java

@@ -23,8 +23,8 @@
 public final class Greeter extends Contract {
     private static final String BINARY = "606060405260405161026938038061026983398101604052805101600080546c0100000000000000000000000033810204600160a060020a03199091161790558060016000509080519060200190828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f1060b357805160ff19168380011785555b5060a29291505b8082111560e057600081556001016090565b505050610185806100e46000396000f35b828001600101855582156089579182015b82811115608957825182600050559160200191906001019060c4565b509056606060405260e060020a600035046341c0e1b58114610029578063cfae321714610070575b610002565b34610002576100de6000543373ffffffffffffffffffffffffffffffffffffffff9081169116141561014e5760005473ffffffffffffffffffffffffffffffffffffffff16ff5b3461000257604080516020808201835260008252600180548451600282841615610100026000190190921691909104601f81018490048402820184019095528481526100e094909283018282801561017b5780601f106101505761010080835404028352916020019161017b565b005b60405180806020018281038252838181518152602001915080519060200190808383829060006004602084601f0104600302600f01f150905090810190601f1680156101405780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b565b820191906000526020600020905b81548152906001019060200180831161015e57829003601f168201915b505050505090509056";
 
-    private Greeter(String contractAddress, Web3j web3j, Credentials credentials) {
-        super(contractAddress, web3j, credentials);
+    private Greeter(String contractAddress, Web3j web3j, Credentials credentials, BigInteger gasPrice, BigInteger gasLimit) {
+        super(contractAddress, web3j, credentials, gasPrice, gasLimit);
     }
 
     public Future<TransactionReceipt> kill() {
@@ -33,18 +33,18 @@ public Future<TransactionReceipt> kill() {
     }
 
     public Future<Utf8String> greet() {
-        Function function = new Function<Utf8String>("greet", 
-                Arrays.<Type>asList(), 
+        Function function = new Function<Utf8String>("greet",
+                Arrays.<Type>asList(),
                 Arrays.<TypeReference<Utf8String>>asList(new TypeReference<Utf8String>() {}));
         return executeCallSingleValueReturnAsync(function);
     }
 
-    public static Future<Greeter> deploy(Web3j web3j, Credentials credentials, BigInteger initialValue, Utf8String _greeting) {
+    public static Future<Greeter> deploy(Web3j web3j, Credentials credentials, BigInteger gasPrice, BigInteger gasLimit, BigInteger initialValue, Utf8String _greeting) {
         String encodedConstructor = FunctionEncoder.encodeConstructor(Arrays.<Type>asList(_greeting));
-        return deployAsync(Greeter.class, web3j, credentials, BINARY, encodedConstructor, initialValue);
+        return deployAsync(Greeter.class, web3j, credentials, gasPrice, gasLimit, BINARY, encodedConstructor, initialValue);
     }
 
-    public static Greeter load(String contractAddress, Web3j web3j, Credentials credentials) {
-        return new Greeter(contractAddress, web3j, credentials);
+    public static Greeter load(String contractAddress, Web3j web3j, Credentials credentials, BigInteger gasPrice, BigInteger gasLimit) {
+        return new Greeter(contractAddress, web3j, credentials, gasPrice, gasLimit);
     }
 }