Skip to content

Fix ArrayIndexOutOfBoundsException when multiple threads use FunctionEncoder #1826

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Mar 9, 2023
Merged

Fix ArrayIndexOutOfBoundsException when multiple threads use FunctionEncoder #1826

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1f04d26
Fix ArrayIndexOutOfBoundsException when multiple threads use Function…
ajsutton Dec 6, 2022
63ff8d7
Merge branch 'master' into pr/1826
gtebrean Mar 9, 2023
c8930a5
naming refactor
gtebrean Mar 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 15 additions & 21 deletions abi/src/main/java/org/web3j/abi/FunctionEncoder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,30 +37,36 @@
*/
public abstract class FunctionEncoder {

private static FunctionEncoder DEFAULT_ENCODER;
private static final FunctionEncoder FUNCTION_ENCODER;

private static final ServiceLoader<FunctionEncoderProvider> loader =
ServiceLoader.load(FunctionEncoderProvider.class);
static {
ServiceLoader<FunctionEncoderProvider> loader =
ServiceLoader.load(FunctionEncoderProvider.class);
final Iterator<FunctionEncoderProvider> iterator = loader.iterator();

FUNCTION_ENCODER =
iterator.hasNext() ? iterator.next().get() : new DefaultFunctionEncoder();
}

public static String encode(final Function function) {
return encoder().encodeFunction(function);
return FUNCTION_ENCODER.encodeFunction(function);
}

/** Encode function when we know function method Id / Selector. */
public static String encode(final String methodId, final List<Type> parameters) {
return encoder().encodeWithSelector(methodId, parameters);
return FUNCTION_ENCODER.encodeWithSelector(methodId, parameters);
}

public static String encodeConstructor(final List<Type> parameters) {
return encoder().encodeParameters(parameters);
return FUNCTION_ENCODER.encodeParameters(parameters);
}

public static String encodeConstructorPacked(final List<Type> parameters) {
return encoder().encodePackedParameters(parameters);
return FUNCTION_ENCODER.encodePackedParameters(parameters);
}

public static Function makeFunction(
String fnname,
String fnName,
List<String> solidityInputTypes,
List<Object> arguments,
List<String> solidityOutputTypes)
Expand All @@ -75,7 +81,7 @@ public static Function makeFunction(
for (String st : solidityOutputTypes) {
encodedOutput.add(makeTypeReference(st));
}
return new Function(fnname, encodedInput, encodedOutput);
return new Function(fnName, encodedInput, encodedOutput);
}

protected abstract String encodeFunction(Function function);
Expand Down Expand Up @@ -106,16 +112,4 @@ protected static String buildMethodId(final String methodSignature) {
final byte[] hash = Hash.sha3(input);
return Numeric.toHexString(hash).substring(0, 10);
}

private static FunctionEncoder encoder() {
final Iterator<FunctionEncoderProvider> iterator = loader.iterator();
return iterator.hasNext() ? iterator.next().get() : defaultEncoder();
}

private static FunctionEncoder defaultEncoder() {
if (DEFAULT_ENCODER == null) {
DEFAULT_ENCODER = new DefaultFunctionEncoder();
}
return DEFAULT_ENCODER;
}
}