Support payable functions in wrapper generator

jorpic · Jul 19, 2017 · f1dca13 · f1dca13
1 parent adab270
commit f1dca13
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 2 deletions.
diff --git a/src/main/java/org/web3j/codegen/SolidityFunctionWrapper.java b/src/main/java/org/web3j/codegen/SolidityFunctionWrapper.java
@@ -63,6 +63,7 @@ public class SolidityFunctionWrapper {
     private static final String GAS_LIMIT = "gasLimit";
     private static final String START_BLOCK = "startBlock";
     private static final String END_BLOCK = "endBlock";
+    private static final String WEI_VALUE = "weiValue";
 
     private static final String CODEGEN_WARNING = "Auto generated code.<br>\n"
             + "<strong>Do not modify!</strong><br>\n"
@@ -355,6 +356,10 @@ private static void buildTransactionFunction(
             MethodSpec.Builder methodBuilder,
             String inputParams) throws ClassNotFoundException {
 
+        if (functionDefinition.isPayable()) {
+            methodBuilder.addParameter(BigInteger.class, WEI_VALUE);
+        }
+
         String functionName = functionDefinition.getName();
 
         methodBuilder.returns(ParameterizedTypeName.get(Future.class, TransactionReceipt.class));
@@ -364,7 +369,11 @@ private static void buildTransactionFunction(
                 Function.class, Function.class, functionName,
                 Arrays.class, Type.class, inputParams, Collections.class,
                 TypeReference.class);
-        methodBuilder.addStatement("return executeTransactionAsync(function)");
+        if (functionDefinition.isPayable()) {
+            methodBuilder.addStatement("return executeTransactionAsync(function, $N)", WEI_VALUE);
+        } else {
+            methodBuilder.addStatement("return executeTransactionAsync(function)");
+        }
     }
 
     static TypeSpec buildEventResponseObject(String className,

diff --git a/src/main/java/org/web3j/protocol/core/methods/response/AbiDefinition.java b/src/main/java/org/web3j/protocol/core/methods/response/AbiDefinition.java
@@ -26,7 +26,7 @@ public AbiDefinition(boolean constant, List<NamedType> inputs, String name,
         this.name = name;
         this.outputs = outputs;
         this.type = type;
-        this.payable = false;
+        this.payable = payable;
     }
 
     public boolean isConstant() {

diff --git a/src/main/java/org/web3j/tx/Contract.java b/src/main/java/org/web3j/tx/Contract.java
@@ -217,6 +217,18 @@ protected CompletableFuture<TransactionReceipt> executeTransactionAsync(Function
         return Async.run(() -> executeTransaction(function));
     }
 
+    /**
+     * Execute the provided payable function as a transaction asynchronously.
+     *
+     * @param function to transact with
+     * @param weiValue in Wei to send in transaction
+     * @return {@link Future} containing executing transaction
+     */
+    protected CompletableFuture<TransactionReceipt> executeTransactionAsync(
+            Function function, BigInteger weiValue) {
+        return Async.run(() -> executeTransaction(FunctionEncoder.encode(function), weiValue));
+    }
+
     protected EventValues extractEventParameters(
             Event event, Log log) {
 

diff --git a/src/test/java/org/web3j/codegen/SolidityFunctionWrapperTest.java b/src/test/java/org/web3j/codegen/SolidityFunctionWrapperTest.java
@@ -88,6 +88,32 @@ public void testBuildFunctionTransaction() throws Exception {
         assertThat(methodSpec.toString(), is(expected));
     }
 
+    @Test
+    public void testBuildPayabelFunctionTransaction() throws Exception {
+        AbiDefinition functionDefinition = new AbiDefinition(
+                false,
+                Arrays.asList(
+                        new AbiDefinition.NamedType("param", "uint8")),
+                "functionName",
+                Collections.emptyList(),
+                "type",
+                true);
+
+        MethodSpec methodSpec = buildFunction(functionDefinition);
+
+        String expected = "public java.util.concurrent.Future<org.web3j.protocol.core.methods"
+                + ".response.TransactionReceipt> functionName(org.web3j.abi.datatypes.generated"
+                + ".Uint8 param, java.math.BigInteger weiValue) {\n"
+                + "  org.web3j.abi.datatypes.Function function = new org.web3j.abi.datatypes"
+                + ".Function(\"functionName\", java.util.Arrays.<org.web3j.abi.datatypes"
+                + ".Type>asList(param), java.util.Collections.<org.web3j.abi"
+                + ".TypeReference<?>>emptyList());\n"
+                + "  return executeTransactionAsync(function, weiValue);\n"
+                + "}\n";
+
+        assertThat(methodSpec.toString(), is(expected));
+    }
+
     @Test
     public void testBuildFunctionConstantSingleValueReturn() throws Exception {
         AbiDefinition functionDefinition = new AbiDefinition(