Undoing the effect of PR#711

Author: snazha-blkio

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

@@ -55,7 +55,6 @@
 import org.web3j.protocol.core.methods.response.TransactionReceipt;
 import org.web3j.tx.Contract;
 import org.web3j.tx.TransactionManager;
-import org.web3j.tx.gas.ContractGasProvider;
 import org.web3j.utils.Collection;
 import org.web3j.utils.Strings;
 import org.web3j.utils.Version;
@@ -68,7 +67,6 @@ public class SolidityFunctionWrapper extends Generator {
     private static final String BINARY = "BINARY";
     private static final String WEB3J = "web3j";
     private static final String CREDENTIALS = "credentials";
-    private static final String CONTRACT_GAS_PROVIDER = "contractGasProvider";
     private static final String TRANSACTION_MANAGER = "transactionManager";
     private static final String INITIAL_VALUE = "initialWeiValue";
     private static final String CONTRACT_ADDRESS = "contractAddress";
@@ -124,13 +122,16 @@ void generateJavaFiles(
 
         TypeSpec.Builder classBuilder = createClassBuilder(className, bin);
 
+        classBuilder.addMethod(buildConstructor(Credentials.class, CREDENTIALS));
         classBuilder.addMethod(buildConstructor(TransactionManager.class,
                 TRANSACTION_MANAGER));
         classBuilder.addFields(buildFuncNameConstants(abi));
         classBuilder.addMethods(
                 buildFunctionDefinitions(className, classBuilder, abi));
-        classBuilder.addMethod(buildLoad(className));
-        
+        classBuilder.addMethod(buildLoad(className, Credentials.class, CREDENTIALS));
+        classBuilder.addMethod(buildLoad(className, TransactionManager.class,
+                TRANSACTION_MANAGER));
+
         addAddressesSupport(classBuilder, addresses);
 
         write(basePackageName, classBuilder.build(), destinationDir);
@@ -309,9 +310,10 @@ private static MethodSpec buildConstructor(Class authType, String authName) {
                 .addParameter(String.class, CONTRACT_ADDRESS)
                 .addParameter(Web3j.class, WEB3J)
                 .addParameter(authType, authName)
-                .addParameter(ContractGasProvider.class, CONTRACT_GAS_PROVIDER)
-                .addStatement("super($N, $N, $N, $N, $N)",
-                        BINARY, CONTRACT_ADDRESS, WEB3J, authName, CONTRACT_GAS_PROVIDER)
+                .addParameter(BigInteger.class, GAS_PRICE)
+                .addParameter(BigInteger.class, GAS_LIMIT)
+                .addStatement("super($N, $N, $N, $N, $N, $N)",
+                        BINARY, CONTRACT_ADDRESS, WEB3J, authName, GAS_PRICE, GAS_LIMIT)
                 .build();
     }
 
@@ -389,16 +391,17 @@ private static MethodSpec.Builder getDeployMethodSpec(
     }
 
     private static MethodSpec buildLoad(
-            String className) {
+            String className, Class authType, String authName) {
         return MethodSpec.methodBuilder("load")
                 .addModifiers(Modifier.PUBLIC, Modifier.STATIC)
                 .returns(TypeVariableName.get(className, Type.class))
                 .addParameter(String.class, CONTRACT_ADDRESS)
                 .addParameter(Web3j.class, WEB3J)
-                .addParameter(TransactionManager.class, TRANSACTION_MANAGER)
-                .addParameter(ContractGasProvider.class, CONTRACT_GAS_PROVIDER)
-                .addStatement("return new $L($L, $L, $L, $L)", className,
-                        CONTRACT_ADDRESS, WEB3J, TRANSACTION_MANAGER, CONTRACT_GAS_PROVIDER)
+                .addParameter(authType, authName)
+                .addParameter(BigInteger.class, GAS_PRICE)
+                .addParameter(BigInteger.class, GAS_LIMIT)
+                .addStatement("return new $L($L, $L, $L, $L, $L)", className,
+                        CONTRACT_ADDRESS, WEB3J, authName, GAS_PRICE, GAS_LIMIT)
                 .build();
     }
 
@@ -641,7 +644,7 @@ Function.class, Function.class, funcNameToConst(functionName),
                     CodeBlock.Builder callCode = CodeBlock.builder();
                     callCode.addStatement(
                             "$T result = "
-                            + "($T) executeCallSingleValueReturn(function, $T.class)",
+                                    + "($T) executeCallSingleValueReturn(function, $T.class)",
                             listType, listType, nativeReturnTypeName);
                     callCode.addStatement("return convertToNative(result)");
 
@@ -845,7 +848,7 @@ MethodSpec buildEventTransactionReceiptFunction(
         transactionMethodBuilder.addStatement("$T valueList = extractEventParametersWithLog("
                 + buildEventDefinitionName(functionName) + ", "
                 + "transactionReceipt)", ParameterizedTypeName.get(List.class,
-                        Contract.EventValuesWithLog.class))
+                Contract.EventValuesWithLog.class))
                 .addStatement("$1T responses = new $1T(valueList.size())",
                         ParameterizedTypeName.get(ClassName.get(ArrayList.class),
                                 ClassName.get("", responseClassName)))
@@ -876,10 +879,10 @@ List<MethodSpec> buildEventFunctions(
 
         for (AbiDefinition.NamedType namedType : inputs) {
             NamedTypeName parameter = new NamedTypeName(
-                                namedType.getName(),
-                                buildTypeName(namedType.getType()),
-                                namedType.isIndexed()
-                    );
+                    namedType.getName(),
+                    buildTypeName(namedType.getType()),
+                    namedType.isIndexed()
+            );
             if (namedType.isIndexed()) {
                 indexedParameters.add(parameter);
             } else {
@@ -1078,7 +1081,7 @@ private void buildTupleResultContainer(
             }
 
             tupleConstructor
-                .add(resultString, convertTo, i);
+                    .add(resultString, convertTo, i);
             tupleConstructor.add(i < size - 1 ? ", " : ");\n");
         }
         tupleConstructor.add("$<$<");