Skip to content

Commit 05d9427

Browse files
committed
<fix>(client): add enableCommittee option.
1 parent 58cc4e8 commit 05d9427

File tree

2 files changed

+28
-3
lines changed

2 files changed

+28
-3
lines changed

src/main/java/org/fisco/bcos/sdk/v3/client/Client.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,12 @@ static Client build(String groupId, ConfigOption configOption, long nativePointe
133133
*/
134134
Boolean isAuthCheck();
135135

136+
/**
137+
* Whether is committee enable in chain
138+
* @return true when chain can use committee
139+
*/
140+
Boolean isEnableCommittee();
141+
136142
Boolean isSerialExecute();
137143
/**
138144
* get groupId of the client

src/main/java/org/fisco/bcos/sdk/v3/client/ClientImpl.java

Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,15 @@
1515

1616
import com.fasterxml.jackson.core.JsonProcessingException;
1717
import com.fasterxml.jackson.databind.ObjectMapper;
18+
1819
import java.math.BigInteger;
1920
import java.util.Arrays;
2021
import java.util.Collections;
2122
import java.util.List;
2223
import java.util.Objects;
2324
import java.util.concurrent.CompletableFuture;
2425
import java.util.concurrent.ExecutionException;
26+
2527
import org.fisco.bcos.sdk.jni.BcosSDKJniObj;
2628
import org.fisco.bcos.sdk.jni.rpc.RpcJniObj;
2729
import org.fisco.bcos.sdk.v3.client.exceptions.ClientException;
@@ -53,6 +55,7 @@
5355
import org.fisco.bcos.sdk.v3.client.protocol.response.SystemConfig;
5456
import org.fisco.bcos.sdk.v3.client.protocol.response.TotalTransactionCount;
5557
import org.fisco.bcos.sdk.v3.config.ConfigOption;
58+
import org.fisco.bcos.sdk.v3.contract.precompiled.sysconfig.SystemConfigService;
5659
import org.fisco.bcos.sdk.v3.crypto.CryptoSuite;
5760
import org.fisco.bcos.sdk.v3.model.CryptoType;
5861
import org.fisco.bcos.sdk.v3.model.EnumNodeVersion;
@@ -75,6 +78,7 @@ public class ClientImpl implements Client {
7578
private String chainID;
7679
private Boolean wasm;
7780
private Boolean authCheck = false;
81+
private Boolean enableCommittee = false;
7882
private boolean serialExecute;
7983
private Boolean smCrypto;
8084
private String extraData = "";
@@ -121,11 +125,21 @@ protected void initGroupInfo() {
121125
this.serialExecute = groupNodeIniConfig.getExecutor().isSerialExecute();
122126

123127
this.authCheck = groupNodeIniConfig.getExecutor().isAuthCheck();
128+
this.enableCommittee = groupNodeIniConfig.getExecutor().isAuthCheck();
124129
if (EnumNodeVersion.valueOf((int) compatibilityVersion)
125-
.toVersionObj()
126-
.compareTo(EnumNodeVersion.BCOS_3_3_0.toVersionObj())
130+
.toVersionObj()
131+
.compareTo(EnumNodeVersion.BCOS_3_3_0.toVersionObj())
127132
>= 0) {
128-
this.authCheck = true;
133+
this.enableCommittee = true;
134+
try {
135+
SystemConfig systemConfig = getSystemConfigByKey(SystemConfigService.AUTH_STATUS);
136+
int value = Integer.parseInt(systemConfig.getSystemConfig().getValue());
137+
if (value != 0) {
138+
this.authCheck = true;
139+
}
140+
} catch (Exception ignored) {
141+
this.authCheck = false;
142+
}
129143
}
130144
this.smCrypto = groupNodeIniConfig.getChain().isSmCrypto();
131145
this.blockNumber = this.getBlockNumber().getBlockNumber().longValue();
@@ -230,6 +244,11 @@ public Boolean isAuthCheck() {
230244
return this.authCheck;
231245
}
232246

247+
@Override
248+
public Boolean isEnableCommittee() {
249+
return this.enableCommittee;
250+
}
251+
233252
@Override
234253
public Boolean isSerialExecute() {
235254
return this.serialExecute;

0 commit comments

Comments
 (0)