diff --git a/core b/core index d778be41..8912ca46 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit d778be41297b964c21f76b04c54a1d4da13a6db7 +Subproject commit 8912ca469a355b0933a2c5143b2dec687c6488be 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/bftsmart/bftsmart.config b/deploy/deploy-peer/src/main/resources/config/init/bftsmart/bftsmart.config index dd9c20c2..9af92bca 100644 --- a/deploy/deploy-peer/src/main/resources/config/init/bftsmart/bftsmart.config +++ b/deploy/deploy-peer/src/main/resources/config/init/bftsmart/bftsmart.config @@ -162,4 +162,6 @@ system.bft = true #Custom View Storage; #view.storage.handler=bftsmart.reconfiguration.views.DefaultViewStorage +#block delay; +system.epoch.delay=50 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 67cc3063..224f7393 160000 --- a/framework +++ b/framework @@ -1 +1 @@ -Subproject commit 67cc30631c38ad59597dcd743bbcab4f8d12dbab +Subproject commit 224f7393cad00fb43f541d111c0d9bf719c2b47c diff --git a/libs/utils b/libs/utils index f296f7a0..bc223c96 160000 --- a/libs/utils +++ b/libs/utils @@ -1 +1 @@ -Subproject commit f296f7a03f9ed9041ccd675bd400f5fc29c1cadc +Subproject commit bc223c96a259de1cf334e30ce33e286521d1e710 diff --git a/test b/test index 98f45e5e..31210850 160000 --- a/test +++ b/test @@ -1 +1 @@ -Subproject commit 98f45e5e1da754e710da6cd7395a6f9cb1586d14 +Subproject commit 3121085043348d960166b5ceda83edd94e4572f9