From 3829e2e78f8e8c6e9a9fdb7a85e1f34b69bedaf2 Mon Sep 17 00:00:00 2001
From: liuyuanmu <liuyuanmu@jd.com>
Date: Sun, 30 Jan 2022 12:28:21 +0800
Subject: [PATCH 1/2] add contract runtime timeout

---
 core                                                          | 2 +-
 deploy/deploy-peer/src/main/resources/config/init/ledger.init | 3 +++
 framework                                                     | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

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

From 5fea36bb5a03118405c0033ad6acf679ce7f5048 Mon Sep 17 00:00:00 2001
From: liuyuanmu <liuyuanmu@jd.com>
Date: Tue, 8 Feb 2022 10:54:31 +0800
Subject: [PATCH 2/2] contract runtime security manager

---
 core      | 2 +-
 framework | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/core b/core
index 056ff084..2ed547ca 160000
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit 056ff08490a9a83b4fcde02862aac23bbed569ca
+Subproject commit 2ed547ca0f82a0e49f86f618917bee7ee08bc504
diff --git a/framework b/framework
index c3e2b201..9b6c5b77 160000
--- a/framework
+++ b/framework
@@ -1 +1 @@
-Subproject commit c3e2b201b571dda6bf5c104725350602bcaf813a
+Subproject commit 9b6c5b77b1f20ba716b1a3d9cd4e91fc1571001b