Merge remote-tracking branch 'origin/feature/contract-safe' into develop

2 years ago · 4d4ee1fe58
--- a/+ 1
+++ b/+ 1
@@ -1 +1 @@
 Subproject commit 1b54a39bbb7ef415f094e64cf34a62eb0c1a7fc3
 Subproject commit 88b38387c9f701366f06c9914258d378eb0870f5
--- a/deploy/deploy-peer/src/main/resources/config/init/ledger.init
+++ b/deploy/deploy-peer/src/main/resources/config/init/ledger.init
@@ -16,6 +16,9 @@ created-time=2019-08-01 14:26:58.069+0800
 #账本数据底层结构，分为：MERKLE_TREE, KV两种，默认MERKLE_TREE
 ledger.data.structure=KV

 #合约运行超时时间，单位：毫秒，默认1分钟
 contract.timeout=60000

 #-----------------------------------------------
 # 初始的角色名称列表；可选项；
 # 角色名称不区分大小写，最长不超过20个字符；多个角色名称之间用半角的逗点“,”分隔；
--- a/+ 1
+++ b/+ 1
@@ -1 +1 @@
 Subproject commit 28950a4980e34dfe08f64098653b17a84741c011
 Subproject commit e0fd40ad0d5347dd34005fd7aa88179c8c5e1274