Skip to content

V2 #3

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

V2 #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
<dependency>
<groupId>com.github.TIHBS</groupId>
<artifactId>blockchain-access-layer-api</artifactId>
<version>1.0.7</version>
<version>2.0.7</version>
</dependency>
<dependency>
<groupId>org.web3j</groupId>
Expand Down
47 changes: 39 additions & 8 deletions src/main/java/blockchains/iaas/uni/stuttgart/de/plugin/ethereum/EthereumAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -306,13 +307,18 @@ public CompletableFuture<TransactionState> detectOrphanedTransaction(String tran
}

@Override
public CompletableFuture<Transaction> invokeSmartContract(
String smartContractPath,
String functionIdentifier,
List<Parameter> inputs,
List<Parameter> outputs,
double requiredConfidence,
long timeoutMillis
public CompletableFuture<Transaction> invokeSmartContract(String smartContractPath,
String functionIdentifier,
List<String> typeArguments,
List<Parameter> inputs,
List<Parameter> outputs,
double requiredConfidence,
long timeoutMillis,
String signature,
String signer,
List<String> signers,
List<ImmutablePair<String, String>> signatures,
long minimumNumberOfSignatures
) throws NotSupportedException, ParameterException {
if (credentials == null) {
log.error("Credentials are not set for the Ethereum user");
Expand Down Expand Up @@ -399,7 +405,7 @@ public Observable<Occurrence> subscribeToEvent(String smartContractAddress, Stri
}

@Override
public CompletableFuture<QueryResult> queryEvents(String smartContractAddress, String eventIdentifier,
public CompletableFuture<QueryResult> queryEvents(String smartContractAddress, String eventIdentifier, List<String> typeArguments,
List<Parameter> outputParameters, String filter, TimeFrame timeFrame) throws BalException {
List<TypeReference<?>> types = this.convertTypes(outputParameters);
final Event event = new Event(eventIdentifier, types);
Expand Down Expand Up @@ -715,4 +721,29 @@ private static HttpService createWeb3HttpService(String url) {
.build();
return new HttpService(url, client, false);
}

@Override
public CompletableFuture<Transaction> tryReplaceInvocation(String s, String s1, String s2, List<String> list, List<Parameter> list1, List<Parameter> list2, double v, String s3, String s4, List<String> 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<Parameter> list, double v, String s2, String s3, String s4) {
return false;
}

@Override
public boolean delegatedUnsubscribe(String s, String s1, String s2, List<String> list, List<Parameter> list1, String s3) {
return false;
}
}