Skip to content
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

Jump to bottom

Stub out support for OpenOffer's triggerPrice in api #5076

Merged
merged 10 commits into from Jan 14, 2021
Merged

Stub out support for OpenOffer's triggerPrice in api #5076

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
9180ca6
Fix two CLI option parsing bugs
ghubstan Jan 8, 2021
cc08554
Add @Singleton annotation
ghubstan Jan 8, 2021
9ae1a29
Integrate new protection tools into api's offer & trade services
ghubstan Jan 8, 2021
0293196
Merge branch 'master' into 03-support-trigger-price
ghubstan Jan 11, 2021
0c6005e
Stub out support for OpenOffer's triggerPrice in api
ghubstan Jan 11, 2021
f1a6783
Display fiat ccy code in upper case
ghubstan Jan 11, 2021
eaf41eb
Merge branch 'master' into 03-support-trigger-price
ghubstan Jan 12, 2021
9a4e311
Fix file conflict
ghubstan Jan 13, 2021
0e779a4
Inject CoreContext into server, then set isApiUser=true
ghubstan Jan 13, 2021
a8d15d0
Merge branch 'offer-protection-tools-api-integration' into 03-support…
ghubstan Jan 13, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 7 additions & 8 deletions core/src/main/java/bisq/core/api/CoreContext.java
View file
Open in desktop
Expand Up @@ -20,20 +20,19 @@
import javax.inject.Inject;
import javax.inject.Singleton;

import lombok.Getter;
import lombok.Setter;
import lombok.extern.slf4j.Slf4j;

import static java.lang.Thread.currentThread;

@Singleton
@Slf4j
class CoreContext {
public class CoreContext {

@Getter
@Setter
private boolean isApiUser;

@Inject
public CoreContext() {
}

public boolean isApiUser() {
String threadName = currentThread().getName();
return threadName.equals("BisqDaemonMain") || threadName.contains("grpc");
}
}
6 changes: 5 additions & 1 deletion daemon/src/main/java/bisq/daemon/grpc/GrpcServer.java
View file
Open in desktop
Expand Up @@ -17,6 +17,8 @@

package bisq.daemon.grpc;

import bisq.core.api.CoreContext;

import bisq.common.UserThread;
import bisq.common.config.Config;

Expand Down Expand Up @@ -44,7 +46,8 @@ public class GrpcServer {
private final Server server;

@Inject
public GrpcServer(Config config,
public GrpcServer(CoreContext coreContext,
Config config,
PasswordAuthInterceptor passwordAuthInterceptor,
GrpcDisputeAgentsService disputeAgentsService,
GrpcOffersService offersService,
Expand All @@ -66,6 +69,7 @@ public GrpcServer(Config config,
.addService(walletsService)
.intercept(passwordAuthInterceptor)
.build();
coreContext.setApiUser(true);
}

public void start() {
Expand Down