From 1db0e8fb55b9f8a126d5b79cdcd4378b964a6bf1 Mon Sep 17 00:00:00 2001
From: liuyuanmu <liuyuanmu@jd.com>
Date: Fri, 6 May 2022 00:34:23 +0800
Subject: [PATCH] move crypto-adv to utils and add elgamal, paillier to crypto
 framework

---
 core                                                          | 2 +-
 .../src/main/java/com/jd/blockchain/boot/peer/PeerBooter.java | 4 ++--
 deploy/deploy-peer/src/main/resources/config/init/ledger.init | 3 ++-
 framework                                                     | 2 +-
 libs/utils                                                    | 2 +-
 test                                                          | 2 +-
 6 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/core b/core
index 5613a27e..634bb2d0 160000
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit 5613a27e1e2a1e7b387b730548814575638dfb44
+Subproject commit 634bb2d0af7133587ad236b7c3c39f86439443e1
diff --git a/deploy/deploy-peer/src/main/java/com/jd/blockchain/boot/peer/PeerBooter.java b/deploy/deploy-peer/src/main/java/com/jd/blockchain/boot/peer/PeerBooter.java
index 4aba298e..5e38610e 100644
--- a/deploy/deploy-peer/src/main/java/com/jd/blockchain/boot/peer/PeerBooter.java
+++ b/deploy/deploy-peer/src/main/java/com/jd/blockchain/boot/peer/PeerBooter.java
@@ -27,7 +27,7 @@ public class PeerBooter {
 
 	public static final String MODULAR_FACTORY_METHOD = "startSystem";
 
-	public static final Class<?>[] MODULAR_FACTORY_METHOD_ARG_TYPES = { String.class, boolean.class, ClassLoader.class,
+	public static final Class<?>[] MODULAR_FACTORY_METHOD_ARG_TYPES = { String.class, String.class, boolean.class, ClassLoader.class,
 			String.class, ClassLoader.class, String[].class };
 
 	public static final String SYSTEM_MAIN_CLASS = "com.jd.blockchain.peer.PeerServerBooter";
@@ -49,7 +49,7 @@ public class PeerBooter {
 		Method modularFactoryMethod = modularFactoryClass.getMethod(MODULAR_FACTORY_METHOD,
 				MODULAR_FACTORY_METHOD_ARG_TYPES);
 
-		Object[] systemStartingArgs = { home.getRuntimeDir(), home.isProductMode(), home.getLibsClassLoader(),
+		Object[] systemStartingArgs = { home.getRuntimeDir(), home.getLibsDir(), home.isProductMode(), home.getLibsClassLoader(),
 				SYSTEM_MAIN_CLASS, home.getSystemClassLoader(), home.getStartingArgs() };
 		modularFactoryMethod.invoke(null, systemStartingArgs);
 	}
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 40369466..b45a09d8 100644
--- a/deploy/deploy-peer/src/main/resources/config/init/ledger.init
+++ b/deploy/deploy-peer/src/main/resources/config/init/ledger.init
@@ -80,7 +80,8 @@ consensus.conf=bftsmart/bftsmart.config
 
 #密码服务提供者列表，以英文逗点“,”分隔；必须；
 crypto.service-providers=com.jd.blockchain.crypto.service.classic.ClassicCryptoService, \
-com.jd.blockchain.crypto.service.sm.SMCryptoService
+com.jd.blockchain.crypto.service.sm.SMCryptoService, \
+com.jd.blockchain.crypto.service.adv.AdvCryptoService
 
 #从存储中加载账本数据时，是否校验哈希；可选；
 crypto.verify-hash=true
diff --git a/framework b/framework
index 2e9d5047..fb1b270a 160000
--- a/framework
+++ b/framework
@@ -1 +1 @@
-Subproject commit 2e9d504721ece7d2a8e26d68e19eed458e102fca
+Subproject commit fb1b270a0652808908d4b632572219d52d78802e
diff --git a/libs/utils b/libs/utils
index 69b5cbc6..20515932 160000
--- a/libs/utils
+++ b/libs/utils
@@ -1 +1 @@
-Subproject commit 69b5cbc663dd47c60a9914ae20ad07866a2656d5
+Subproject commit 205159327ec0edd1019d31f7a978c093ca9f4a91
diff --git a/test b/test
index 93691757..66a33437 160000
--- a/test
+++ b/test
@@ -1 +1 @@
-Subproject commit 936917573e9205f80f1d9a2d401f370623656742
+Subproject commit 66a33437f76b8024bf7dee332df335096c288611