Merge pull request #301 from WeBankBlockchain/lab-dev

3.1.1

deploy/comm/build.py

@@ -156,6 +156,10 @@ def installNode(docker_mode=False):
         use_liquid = int(getCommProperties("fisco.wasm"))
         enable_auth = int(getCommProperties("fisco.auth"))
 
+        # fisco版本号转为数字，方便比较
+        fisco_version_int = int(re.findall("\d+", fisco_version)[0]) * 100 + int(re.findall("\d+", fisco_version)[1]) * 10 + int(re.findall("\d+", fisco_version)[2]) * 1
+        log.info("fisco_version_int: " + str(fisco_version_int))
+
         node_nums = 2
         if node_counts != "nodeCounts":
             node_nums = int(node_counts)
@@ -193,7 +197,9 @@ def installNode(docker_mode=False):
             # use wasm 
             if use_liquid == 1:
                 buildComm = buildComm + " -w"
-            if enable_auth == 1:
+            # fisco version >= 3.3.0, no need enable auth, default enable_auth=1
+            # < 3.3.0, need
+            if fisco_version_int < 330 and enable_auth == 1:
                 buildComm = buildComm + " -A"
             os.system(buildComm)
         else:
@@ -212,7 +218,7 @@ def installNode(docker_mode=False):
                 # use wasm 
                 if use_liquid == 1:
                     buildComm = buildComm + " -w"
-                if enable_auth == 1:
+                if fisco_version_int < 330 and enable_auth == 1:
                     buildComm = buildComm + " -A"
                 os.system(buildComm)
         log.info(buildComm)

deploy/common.properties

@@ -1,9 +1,9 @@
 [common]
 # Webase Subsystem Version (v3.0)
-webase.web.version=v3.1.0
-webase.mgr.version=v3.1.0
-webase.sign.version=v3.0.2
-webase.front.version=v3.1.0
+webase.web.version=v3.1.1
+webase.mgr.version=v3.1.1
+webase.sign.version=v3.1.1
+webase.front.version=v3.1.1
 
 # Mysql database configuration of WeBASE-Node-Manager
 mysql.ip=localhost
@@ -50,17 +50,19 @@ node.rpcPort=20200
 # Node p2p service port
 node.p2pPort=30300
 # Fisco-bcos version(v3.0.0 or above)
-fisco.version=v3.4.0
+fisco.version=v3.5.0
 # Number of building nodes (default value: 2)
 node.counts=nodeCounts
 # whether air version fisco bcos use liquid(wasm), default solidity
 # if use liquid, require configure liquid in the host of webase-front
 # [0: solidity, 1: liquid]
 fisco.wasm=0
+# fisco version >= 3.3.0, no need of fisco.auth config, default auth=1
 # whether enable permission control, default disabled
 # if enable, default generate one random admin private key in 'webase-deploy/nodes/ca' directory
-# [0: disabled, 1: enable]
-fisco.auth=0
+# [0: disabled, 1: enable] 
+# fisco version >= 3.3.0, no need of fisco.auth config, default auth=1
+fisco.auth=1
 
 ### if using existing chain, [if.exist.fisco=yes]
 # Configuration required when using existing chain

release_note.txt

@@ -1 +1 @@
-v3.1.0
+v3.1.1