File tree Expand file tree Collapse file tree 4 files changed +17
-2
lines changed
src/main/java/org/fisco/bcos/sdk/v3
contract/precompiled/sysconfig Expand file tree Collapse file tree 4 files changed +17
-2
lines changed Original file line number Diff line number Diff line change 35
35
// integrationTest.mustRunAfter test
36
36
allprojects {
37
37
group = ' org.fisco-bcos.java-sdk'
38
- version = ' 3.2.0 '
38
+ version = ' 3.3.0-SNAPSHOT '
39
39
40
40
apply plugin : ' maven-publish'
41
41
apply plugin : ' idea'
Original file line number Diff line number Diff line change 55
55
import org .fisco .bcos .sdk .v3 .config .ConfigOption ;
56
56
import org .fisco .bcos .sdk .v3 .crypto .CryptoSuite ;
57
57
import org .fisco .bcos .sdk .v3 .model .CryptoType ;
58
+ import org .fisco .bcos .sdk .v3 .model .EnumNodeVersion ;
58
59
import org .fisco .bcos .sdk .v3 .model .JsonRpcResponse ;
59
60
import org .fisco .bcos .sdk .v3 .model .Response ;
60
61
import org .fisco .bcos .sdk .v3 .model .callback .ResponseCallback ;
@@ -111,12 +112,20 @@ protected void initGroupInfo() {
111
112
112
113
BcosGroupNodeInfo .GroupNodeInfo groupNodeInfo = groupInfo .getNodeList ().get (0 );
113
114
GroupNodeIniInfo nodeIniConfig = groupNodeInfo .getIniConfig ();
115
+ long compatibilityVersion = groupNodeInfo .getProtocol ().getCompatibilityVersion ();
114
116
115
117
this .groupNodeIniConfig = GroupNodeIniConfig .newIniConfig (nodeIniConfig );
116
118
this .chainID = groupNodeIniConfig .getChain ().getChainID ();
117
119
this .wasm = groupNodeIniConfig .getExecutor ().isWasm ();
118
120
this .serialExecute = groupNodeIniConfig .getExecutor ().isSerialExecute ();
121
+
119
122
this .authCheck = groupNodeIniConfig .getExecutor ().isAuthCheck ();
123
+ if (EnumNodeVersion .valueOf ((int ) compatibilityVersion )
124
+ .toVersionObj ()
125
+ .compareTo (EnumNodeVersion .BCOS_3_3_0 .toVersionObj ())
126
+ >= 0 ) {
127
+ this .authCheck = true ;
128
+ }
120
129
this .smCrypto = groupNodeIniConfig .getChain ().isSmCrypto ();
121
130
this .blockNumber = this .getBlockNumber ().getBlockNumber ().longValue ();
122
131
Original file line number Diff line number Diff line change @@ -31,12 +31,14 @@ public class SystemConfigService {
31
31
public static final String TX_COUNT_LIMIT = "tx_count_limit" ;
32
32
public static final String TX_GAS_LIMIT = "tx_gas_limit" ;
33
33
public static final String CONSENSUS_PERIOD = "consensus_leader_period" ;
34
+ public static final String AUTH_STATUS = "auth_status" ;
34
35
public static final int TX_GAS_LIMIT_MIN = 100000 ;
35
36
private static final Map <String , Predicate <BigInteger >> predicateMap = new HashMap <>();
36
37
37
38
static {
38
39
predicateMap .put (TX_COUNT_LIMIT , value -> value .compareTo (BigInteger .ONE ) >= 0 );
39
40
predicateMap .put (CONSENSUS_PERIOD , value -> value .compareTo (BigInteger .ONE ) >= 0 );
41
+ predicateMap .put (AUTH_STATUS , value -> value .compareTo (BigInteger .ONE ) >= 0 );
40
42
predicateMap .put (
41
43
TX_GAS_LIMIT , value -> value .compareTo (BigInteger .valueOf (TX_GAS_LIMIT_MIN )) >= 0 );
42
44
}
Original file line number Diff line number Diff line change @@ -8,7 +8,8 @@ public enum EnumNodeVersion {
8
8
BCOS_3_0_0_RC4 (4 ),
9
9
BCOS_3_0_0 (0x03000000 ),
10
10
BCOS_3_1_0 (0x03010000 ),
11
- BCOS_3_2_0 (0x03020000 );
11
+ BCOS_3_2_0 (0x03020000 ),
12
+ BCOS_3_3_0 (0x03030000 );
12
13
13
14
private final Integer version ;
14
15
private static final Map <Integer , EnumNodeVersion > versionLookupMap = new HashMap <>();
@@ -18,6 +19,7 @@ public enum EnumNodeVersion {
18
19
versionLookupMap .put (0x03000000 , BCOS_3_0_0 );
19
20
versionLookupMap .put (0x03010000 , BCOS_3_1_0 );
20
21
versionLookupMap .put (0x03020000 , BCOS_3_2_0 );
22
+ versionLookupMap .put (0x03030000 , BCOS_3_3_0 );
21
23
}
22
24
23
25
EnumNodeVersion (Integer version ) {
@@ -38,6 +40,8 @@ public String getVersionString() {
38
40
return "3.1.0" ;
39
41
case BCOS_3_2_0 :
40
42
return "3.2.0" ;
43
+ case BCOS_3_3_0 :
44
+ return "3.3.0" ;
41
45
case UNKNOWN :
42
46
default :
43
47
return "0.0.0" ;
You can’t perform that action at this time.
0 commit comments