diff --git a/core b/core
index 89f3f28f..056ff084 160000
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit 89f3f28f8ac2d3f5bc3a85f3bf5d142e7fb281f8
+Subproject commit 056ff08490a9a83b4fcde02862aac23bbed569ca
diff --git a/deploy/deploy-peer/src/main/resources/config/init/ledger.init b/deploy/deploy-peer/src/main/resources/config/init/ledger.init
index 327e652f..2bd6ac88 100644
--- 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=MERKLE_TREE
 
+#合约运行超时时间，单位：毫秒，默认1分钟
+contract.timeout=60000
+
 #-----------------------------------------------
 # 初始的角色名称列表；可选项；
 # 角色名称不区分大小写，最长不超过20个字符；多个角色名称之间用半角的逗点“,”分隔；
diff --git a/framework b/framework
index da4ad9d8..c3e2b201 160000
--- a/framework
+++ b/framework
@@ -1 +1 @@
-Subproject commit da4ad9d8916e7286cd81617685b11589add19136
+Subproject commit c3e2b201b571dda6bf5c104725350602bcaf813a