diff --git a/pom.xml b/pom.xml index 7e13a7d..b2eca8e 100644 --- a/pom.xml +++ b/pom.xml @@ -54,7 +54,7 @@ com.github.TIHBS blockchain-access-layer-api - 1.0.7 + 2.0.7 org.web3j diff --git a/src/main/java/blockchains/iaas/uni/stuttgart/de/plugin/ethereum/EthereumAdapter.java b/src/main/java/blockchains/iaas/uni/stuttgart/de/plugin/ethereum/EthereumAdapter.java index 323dd0f..1f1075f 100644 --- a/src/main/java/blockchains/iaas/uni/stuttgart/de/plugin/ethereum/EthereumAdapter.java +++ b/src/main/java/blockchains/iaas/uni/stuttgart/de/plugin/ethereum/EthereumAdapter.java @@ -45,6 +45,7 @@ import io.reactivex.disposables.Disposable; import io.reactivex.subjects.PublishSubject; import okhttp3.OkHttpClient; +import org.apache.commons.lang3.tuple.ImmutablePair; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.web3j.abi.EventEncoder; @@ -306,13 +307,18 @@ public CompletableFuture detectOrphanedTransaction(String tran } @Override - public CompletableFuture invokeSmartContract( - String smartContractPath, - String functionIdentifier, - List inputs, - List outputs, - double requiredConfidence, - long timeoutMillis + public CompletableFuture invokeSmartContract(String smartContractPath, + String functionIdentifier, + List typeArguments, + List inputs, + List outputs, + double requiredConfidence, + long timeoutMillis, + String signature, + String signer, + List signers, + List> signatures, + long minimumNumberOfSignatures ) throws NotSupportedException, ParameterException { if (credentials == null) { log.error("Credentials are not set for the Ethereum user"); @@ -399,7 +405,7 @@ public Observable subscribeToEvent(String smartContractAddress, Stri } @Override - public CompletableFuture queryEvents(String smartContractAddress, String eventIdentifier, + public CompletableFuture queryEvents(String smartContractAddress, String eventIdentifier, List typeArguments, List outputParameters, String filter, TimeFrame timeFrame) throws BalException { List> types = this.convertTypes(outputParameters); final Event event = new Event(eventIdentifier, types); @@ -715,4 +721,29 @@ private static HttpService createWeb3HttpService(String url) { .build(); return new HttpService(url, client, false); } + + @Override + public CompletableFuture tryReplaceInvocation(String s, String s1, String s2, List list, List list1, List list2, double v, String s3, String s4, List list3, long l) { + return null; + } + + @Override + public boolean tryCancelInvocation(String s) { + return false; + } + + @Override + public boolean canHandleDelegatedSubscription() { + return false; + } + + @Override + public boolean delegatedSubscribe(String s, String s1, List list, double v, String s2, String s3, String s4) { + return false; + } + + @Override + public boolean delegatedUnsubscribe(String s, String s1, String s2, List list, List list1, String s3) { + return false; + } }