Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
package com.openelements.hiero.base.data;

public record Bytes(byte[] bytes) {
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,12 @@
import com.hedera.hashgraph.sdk.ContractId;
import com.openelements.hiero.base.implementation.data.BigIntegerBasedNumericDatatypes;
import com.openelements.hiero.base.implementation.data.BooleanDatatype;
import com.openelements.hiero.base.implementation.data.BytesBasedDatatype;
import com.openelements.hiero.base.implementation.data.LongBasedNumericDatatypes;
import com.openelements.hiero.base.implementation.data.ParamSupplier;
import com.openelements.hiero.base.implementation.data.StringBasedDatatype;
import java.math.BigInteger;
import java.nio.charset.StandardCharsets;
import java.util.Objects;
import org.jspecify.annotations.NonNull;

Expand Down Expand Up @@ -57,6 +59,26 @@ public static ContractParam<String> string(String value) {
return of(value, StringBasedDatatype.STRING);
}

@NonNull
public static ContractParam<Bytes> bytes(String value) {
return bytes(value.getBytes(StandardCharsets.UTF_8));
}

@NonNull
public static ContractParam<Bytes> bytes32(String value) {
return bytes32(value.getBytes(StandardCharsets.UTF_8));
}

@NonNull
public static ContractParam<Bytes> bytes(byte[] value) {
return of(new Bytes(value), BytesBasedDatatype.BYTES);
}

@NonNull
public static ContractParam<Bytes> bytes32(byte[] value) {
return of(new Bytes(value), BytesBasedDatatype.BYTES32);
}

/**
* Creates a new contract parameter with the given value and native type {@code address}. The input must be address
* in solidty format.
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
package com.openelements.hiero.base.implementation.data;

import com.hedera.hashgraph.sdk.ContractFunctionParameters;
import com.openelements.hiero.base.data.Bytes;
import java.util.Objects;
import java.util.function.BiConsumer;

public enum BytesBasedDatatype implements ParamSupplier<Bytes> {

BYTES("bytes", (v, params) -> params.addBytes(v.bytes())),
BYTES32("bytes32", (v, params) -> params.addBytes32(v.bytes()));

private final String nativeType;

private final BiConsumer<Bytes, ContractFunctionParameters> addParam;

BytesBasedDatatype(final String nativeType, final BiConsumer<Bytes, ContractFunctionParameters> addParam) {
this.nativeType = nativeType;
this.addParam = addParam;
}

@Override
public void addParamToFunctionParameters(Bytes value, ContractFunctionParameters params) {
Objects.requireNonNull(value, "value must not be null");
Objects.requireNonNull(params, "params must not be null");
addParam.accept(value, params);
}

@Override
public boolean isValidParam(Bytes value) {
if (value == null) {
return false;
}
if (value.bytes().length > 32 && this.equals(BYTES32)) {
return false;
}
return true;
}

@Override
public String getNativeType() {
return nativeType;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,16 @@

import com.hedera.hashgraph.sdk.AccountId;
import com.hedera.hashgraph.sdk.ContractFunctionParameters;
import java.nio.charset.StandardCharsets;
import java.util.Objects;
import java.util.function.BiConsumer;
import org.jspecify.annotations.NonNull;

public enum StringBasedDatatype implements ParamSupplier<String> {

STRING("string", (v, params) -> params.addString(v)),
BYTES("bytes", (v, params) -> addBytes(v, params)),
BYTES32("bytes32", (v, params) -> addBytes32(v, params)),
ADDRESS("address", (v, params) -> params.addAddress(v));

private final String nativeType;
Expand Down Expand Up @@ -43,4 +46,22 @@ public String getNativeType() {
return nativeType;
}

private static void addBytes32(final String value, final ContractFunctionParameters params) {
if (value == null) {
throw new IllegalArgumentException("bytes32 value must not be null");
}
final byte[] bytes = value.getBytes(StandardCharsets.UTF_8);
if (bytes.length > 32) {
throw new IllegalArgumentException("bytes32 value must be 32 bytes or less");
}
params.addBytes32(bytes);
}

private static void addBytes(final String value, final ContractFunctionParameters params) {
if (value == null) {
throw new IllegalArgumentException("bytes32 value must not be null");
}
final byte[] bytes = value.getBytes(StandardCharsets.UTF_8);
params.addBytes(bytes);
}
}
Loading