From 29ff5d64ef9621684aed18a53c5166991da5ac37 Mon Sep 17 00:00:00 2001
From: liuyuanmu <liuyuanmu@jd.com>
Date: Wed, 27 Apr 2022 14:06:37 +0800
Subject: [PATCH] support Wasm and Rust contract

---
 core                                               | 2 +-
 deploy/deploy-peer/src/main/resources/assembly.xml | 4 ++++
 framework                                          | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/core b/core
index 884bfb65..971cddeb 160000
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit 884bfb65ab1c776acb6dfad4b61207bab288f298
+Subproject commit 971cddebb47f27a6f8e2760e0a60c29534c49bee
diff --git a/deploy/deploy-peer/src/main/resources/assembly.xml b/deploy/deploy-peer/src/main/resources/assembly.xml
index 2f7548ff..d451b69b 100644
--- a/deploy/deploy-peer/src/main/resources/assembly.xml
+++ b/deploy/deploy-peer/src/main/resources/assembly.xml
@@ -32,6 +32,10 @@
             <directory>${basedir}/../../core/consensus/consensus-raft/lib</directory>
             <outputDirectory>libs</outputDirectory>
         </fileSet>
+        <fileSet>
+            <directory>${basedir}/../../core/contract/contract-jvm/lib</directory>
+            <outputDirectory>libs</outputDirectory>
+        </fileSet>
     </fileSets>
     <dependencySets>
         <dependencySet>
diff --git a/framework b/framework
index a7d029fa..2e9d5047 160000
--- a/framework
+++ b/framework
@@ -1 +1 @@
-Subproject commit a7d029faba042769dea0a07a1bdf8ca92466556a
+Subproject commit 2e9d504721ece7d2a8e26d68e19eed458e102fca