From 7a35c6bc21e629e90e5e51eb94ad36a57078afa1 Mon Sep 17 00:00:00 2001 From: liuyuanmu Date: Thu, 28 Apr 2022 17:41:55 +0800 Subject: [PATCH 1/5] remove async sign checking and add system.epoch.delay in testnt config tool --- core | 2 +- .../deploy-peer/src/main/resources/config/init/bftsmart/bftsmart.config | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/core b/core index e9c17f5a..17feba35 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit e9c17f5a2e960ca09f7575016f750abb63b8e52f +Subproject commit 17feba35ba1735a82a44a2b332575dc8fb2f23a7 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 From 3c44d87ff2826a0703bab05f7ae9cf25edddc00d Mon Sep 17 00:00:00 2001 From: liuyuanmu Date: Thu, 28 Apr 2022 20:13:06 +0800 Subject: [PATCH 2/5] fix tls bugs --- core | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core b/core index 17feba35..5613a27e 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 17feba35ba1735a82a44a2b332575dc8fb2f23a7 +Subproject commit 5613a27e1e2a1e7b387b730548814575638dfb44 From 1db0e8fb55b9f8a126d5b79cdcd4378b964a6bf1 Mon Sep 17 00:00:00 2001 From: liuyuanmu Date: Fri, 6 May 2022 00:34:23 +0800 Subject: [PATCH 3/5] 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 From c22184ff9585d7a5ee0fd6e936090d81d4ceb2d8 Mon Sep 17 00:00:00 2001 From: liuyuanmu Date: Sat, 7 May 2022 10:38:50 +0800 Subject: [PATCH 4/5] add BulletProofLib --- framework | 2 +- libs/utils | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/framework b/framework index fb1b270a..130c35b1 160000 --- a/framework +++ b/framework @@ -1 +1 @@ -Subproject commit fb1b270a0652808908d4b632572219d52d78802e +Subproject commit 130c35b1fc4e34c6832cae6e11a5502206830af2 diff --git a/libs/utils b/libs/utils index 20515932..46bf8614 160000 --- a/libs/utils +++ b/libs/utils @@ -1 +1 @@ -Subproject commit 205159327ec0edd1019d31f7a978c093ca9f4a91 +Subproject commit 46bf8614db8074634725143598b1251d77d1a756 From 90a6732b1990d8a11244b367da4f984be4c7088e Mon Sep 17 00:00:00 2001 From: liuyuanmu Date: Sun, 8 May 2022 23:37:27 +0800 Subject: [PATCH 5/5] submodules merge develop --- core | 2 +- framework | 2 +- libs/bft-smart | 2 +- libs/utils | 2 +- test | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/core b/core index 634bb2d0..8912ca46 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 634bb2d0af7133587ad236b7c3c39f86439443e1 +Subproject commit 8912ca469a355b0933a2c5143b2dec687c6488be diff --git a/framework b/framework index 130c35b1..224f7393 160000 --- a/framework +++ b/framework @@ -1 +1 @@ -Subproject commit 130c35b1fc4e34c6832cae6e11a5502206830af2 +Subproject commit 224f7393cad00fb43f541d111c0d9bf719c2b47c diff --git a/libs/bft-smart b/libs/bft-smart index ec606ef3..0ac02744 160000 --- a/libs/bft-smart +++ b/libs/bft-smart @@ -1 +1 @@ -Subproject commit ec606ef38bb07973b252d669bc2387688a8134c3 +Subproject commit 0ac0274410811e5db337b52204f86a03271ce305 diff --git a/libs/utils b/libs/utils index 46bf8614..bc223c96 160000 --- a/libs/utils +++ b/libs/utils @@ -1 +1 @@ -Subproject commit 46bf8614db8074634725143598b1251d77d1a756 +Subproject commit bc223c96a259de1cf334e30ce33e286521d1e710 diff --git a/test b/test index 66a33437..31210850 160000 --- a/test +++ b/test @@ -1 +1 @@ -Subproject commit 66a33437f76b8024bf7dee332df335096c288611 +Subproject commit 3121085043348d960166b5ceda83edd94e4572f9