Browse Source

add contract runtime timeout

tags/1.6.3
liuyuanmu 2 years ago
parent
commit
3829e2e78f
3 changed files with 5 additions and 2 deletions
  1. +1
    -1
      core
  2. +3
    -0
      deploy/deploy-peer/src/main/resources/config/init/ledger.init
  3. +1
    -1
      framework

+ 1
- 1
core

@@ -1 +1 @@
Subproject commit 89f3f28f8ac2d3f5bc3a85f3bf5d142e7fb281f8
Subproject commit 056ff08490a9a83b4fcde02862aac23bbed569ca

+ 3
- 0
deploy/deploy-peer/src/main/resources/config/init/ledger.init View File

@@ -16,6 +16,9 @@ created-time=2019-08-01 14:26:58.069+0800
#账本数据底层结构,分为:MERKLE_TREE, KV两种,默认MERKLE_TREE #账本数据底层结构,分为:MERKLE_TREE, KV两种,默认MERKLE_TREE
ledger.data.structure=MERKLE_TREE ledger.data.structure=MERKLE_TREE


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

#----------------------------------------------- #-----------------------------------------------
# 初始的角色名称列表;可选项; # 初始的角色名称列表;可选项;
# 角色名称不区分大小写,最长不超过20个字符;多个角色名称之间用半角的逗点“,”分隔; # 角色名称不区分大小写,最长不超过20个字符;多个角色名称之间用半角的逗点“,”分隔;


+ 1
- 1
framework

@@ -1 +1 @@
Subproject commit da4ad9d8916e7286cd81617685b11589add19136
Subproject commit c3e2b201b571dda6bf5c104725350602bcaf813a

Loading…
Cancel
Save