From 0ed16690982fa98688098a392137347e39206b06 Mon Sep 17 00:00:00 2001 From: imuge Date: Tue, 19 Jan 2021 14:53:23 +0800 Subject: [PATCH] unified public key format --- core | 2 +- .../main/resources/docs/design_contract-dev-manual.md | 8 ++++---- .../src/main/resources/config/init/mq/ledger.init | 6 +++--- .../main/java/com/jd/blockchain/SDKDemo_Constant.java | 2 +- deploy/docker/readme.md | 2 +- framework | 2 +- samples/contract-samples/pom.xml | 2 +- .../src/main/java/com/jdchain/samples/sdk/TestNet.java | 10 +++++----- .../sdk-samples/src/main/resources/config.properties | 2 +- .../sdk-samples/src/main/resources/testnet/ledger.init | 8 ++++---- test | 2 +- 11 files changed, 23 insertions(+), 23 deletions(-) diff --git a/core b/core index 4bb64f5c..b9108714 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 4bb64f5c92a6a6f358562480533ce93555247f20 +Subproject commit b91087142c22264bb15a9da2c8e96bbf74eadfda diff --git a/deploy/deploy-gateway/src/main/resources/docs/design_contract-dev-manual.md b/deploy/deploy-gateway/src/main/resources/docs/design_contract-dev-manual.md index 619159b7..676e1e77 100644 --- a/deploy/deploy-gateway/src/main/resources/docs/design_contract-dev-manual.md +++ b/deploy/deploy-gateway/src/main/resources/docs/design_contract-dev-manual.md @@ -280,7 +280,7 @@ V1.0|2020-04-17|huanghaiquan - 3snPdw7i7PjVKiTH2VnXZu5H8QmNaSXpnk4ei533jFpuifyjS5zzH9 + 7VeRLdGtSz1Y91gjLTqEdnkotzUfaAqdap3xw6fQ1yKHkvVq 177gjzHTznYdPgWqZrH43W3yp37onm74wYXT4v9FukpCHBrhRysBBZh7Pzdo5AMRyQGJD7x DYu3G8aGTMBW1WrTw76zxQJQU4DHLw9MLyy7peG4LKkY @@ -334,9 +334,9 @@ V1.0|2020-04-17|huanghaiquan -Dledger=j5tW5HUvMjEtm2yB7E6MHoSByoH1DXvMwvF2HurEgMSaLW \ -DgatewayHost=127.0.0.1 \ -DgatewayPort=11000 \ - -DcontractPubKey= 3snPdw7i7PajLB35tEau1kmixc6ZrjLXgxwKbkv5bHhP7nT5dhD9eX \ + -DcontractPubKey= 7VeRBsHM2nsGwP8b2ufRxz36hhNtSqjKTquzoa4WVKWty5sD \ -DcontractAddress= LdeNt7sEmTirh9PmE7axKvA2txTrbB9kxz6KB \ - -DsignerPubKey=3snPdw7i7PjVKiTH2VnXZu5H8QmNaSXpnk4ei533jFpuifyjS5zzH9 \ + -DsignerPubKey=7VeRLdGtSz1Y91gjLTqEdnkotzUfaAqdap3xw6fQ1yKHkvVq \ -DsignerPrivKey=177gjzHTznYdPgWqZrH43W3yp37onm74wYXT4v9FukpCHBrhRysBBZh7Pzdo5AMRyQGJD7x \ -DsignerPrivKeyPwd=DYu3G8aGTMBW1WrTw76zxQJQU4DHLw9MLyy7peG4LKkY ``` @@ -426,7 +426,7 @@ V1.0|2020-04-17|huanghaiquan - 3snPdw7i7PjVKiTH2VnXZu5H8QmNaSXpnk4ei533jFpuifyjS5zzH9 + 7VeRLdGtSz1Y91gjLTqEdnkotzUfaAqdap3xw6fQ1yKHkvVq 177gjzHTznYdPgWqZrH43W3yp37onm74wYXT4v9FukpCHBrhRysBBZh7Pzdo5AMRyQGJD7x DYu3G8aGTMBW1WrTw76zxQJQU4DHLw9MLyy7peG4LKkY diff --git a/deploy/deploy-peer/src/main/resources/config/init/mq/ledger.init b/deploy/deploy-peer/src/main/resources/config/init/mq/ledger.init index 1abf98e9..405df32e 100644 --- a/deploy/deploy-peer/src/main/resources/config/init/mq/ledger.init +++ b/deploy/deploy-peer/src/main/resources/config/init/mq/ledger.init @@ -26,7 +26,7 @@ cons_parti.0.name=jd.com #第0个参与方的公钥文件路径； cons_parti.0.pubkey-path=keys/jd-com.pub #第0个参与方的公钥内容（由keygen工具生成）；此参数优先于 pubkey-path 参数； -cons_parti.0.pubkey=3snPdw7i7PjVKiTH2VnXZu5H8QmNaSXpnk4ei533jFpuifyjS5zzH9 +cons_parti.0.pubkey=7VeRLdGtSz1Y91gjLTqEdnkotzUfaAqdap3xw6fQ1yKHkvVq #第0个参与方的账本初始服务的主机； cons_parti.0.initializer.host=127.0.0.1 #第0个参与方的账本初始服务的端口； @@ -39,7 +39,7 @@ cons_parti.1.name=at.com #第1个参与方的公钥文件路径； cons_parti.1.pubkey-path=keys/at-com.pub #第1个参与方的公钥内容（由keygen工具生成）；此参数优先于 pubkey-path 参数； -cons_parti.1.pubkey=3snPdw7i7PajLB35tEau1kmixc6ZrjLXgxwKbkv5bHhP7nT5dhD9eX +cons_parti.1.pubkey=7VeRBsHM2nsGwP8b2ufRxz36hhNtSqjKTquzoa4WVKWty5sD #第1个参与方的账本初始服务的主机； cons_parti.1.initializer.host=127.0.0.1 #第1个参与方的账本初始服务的端口； @@ -65,7 +65,7 @@ cons_parti.3.name=xt.com #第3个参与方的公钥文件路径； cons_parti.3.pubkey-path=keys/xt-com.pub #第3个参与方的公钥内容（由keygen工具生成）；此参数优先于 pubkey-path 参数； -cons_parti.3.pubkey=3snPdw7i7PifPuRX7fu3jBjsb3rJRfDe9GtbDfvFJaJ4V4hHXQfhwk +cons_parti.3.pubkey=7VeRKoM5RE6iFXr214Hsiic2aoqCQ7MEU1dHQFRnjXQcReAS #第3个参与方的账本初始服务的主机； cons_parti.3.initializer.host=127.0.0.1 #第3个参与方的账本初始服务的端口； diff --git a/deploy/docker/docker-sdk/src/main/java/com/jd/blockchain/SDKDemo_Constant.java b/deploy/docker/docker-sdk/src/main/java/com/jd/blockchain/SDKDemo_Constant.java index ec7ec7c2..cfdd0140 100644 --- a/deploy/docker/docker-sdk/src/main/java/com/jd/blockchain/SDKDemo_Constant.java +++ b/deploy/docker/docker-sdk/src/main/java/com/jd/blockchain/SDKDemo_Constant.java @@ -14,7 +14,7 @@ public class SDKDemo_Constant { public static String GW_IPADDR = "localhost"; public static int GW_PORT = 8080; - public static String GW_PUB_KEY = "3snPdw7i7PisoLpqqtETdqzQeKVjQReP2Eid9wYK67q9z6trvByGZs"; + public static String GW_PUB_KEY = "7VeRL1kWpYpvawkgFbM9N9ao1YiAE9HW65QpwLvpw6oPjCnZ"; public static String GW_PRIV_KEY = "177gk2PbxhHeEdfAAqGfShJQyeV4XvGsJ9CvJFUbToBqwW1YJd5obicySE1St6SvPPaRrUP"; public static String GW_PASSWORD = "8EjkXVSTxMFjCvNNsTo8RBMDEVQmk7gYkW4SCDuvdsBG"; diff --git a/deploy/docker/readme.md b/deploy/docker/readme.md index a83be9d4..72f9c804 100644 --- a/deploy/docker/readme.md +++ b/deploy/docker/readme.md @@ -33,7 +33,7 @@ docker-compose -f docker-compose-all.yaml down ip=localhost port=8080 #默认公钥的内容（Base58编码数据）； -keys.default.pubkey=3snPdw7i7PisoLpqqtETdqzQeKVjQReP2Eid9wYK67q9z6trvByGZs +keys.default.pubkey=7VeRL1kWpYpvawkgFbM9N9ao1YiAE9HW65QpwLvpw6oPjCnZ #默认私钥的内容（加密的Base58编码数据）；在 pk-path 和 pk 之间必须设置其一； keys.default.privkey=177gk2PbxhHeEdfAAqGfShJQyeV4XvGsJ9CvJFUbToBqwW1YJd5obicySE1St6SvPPaRrUP #默认私钥的解码密码； diff --git a/framework b/framework index 7b13b87c..8aed9250 160000 --- a/framework +++ b/framework @@ -1 +1 @@ -Subproject commit 7b13b87c28e1f8dc26e703722e1200df5a02571d +Subproject commit 8aed92500fbb39a6dd0e70534d50ede8d9a77aed diff --git a/samples/contract-samples/pom.xml b/samples/contract-samples/pom.xml index 550df7c7..1728c797 100644 --- a/samples/contract-samples/pom.xml +++ b/samples/contract-samples/pom.xml @@ -69,7 +69,7 @@ - 3snPdw7i7PjVKiTH2VnXZu5H8QmNaSXpnk4ei533jFpuifyjS5zzH9 + 7VeRLdGtSz1Y91gjLTqEdnkotzUfaAqdap3xw6fQ1yKHkvVq 177gjzHTznYdPgWqZrH43W3yp37onm74wYXT4v9FukpCHBrhRysBBZh7Pzdo5AMRyQGJD7x DYu3G8aGTMBW1WrTw76zxQJQU4DHLw9MLyy7peG4LKkY diff --git a/samples/sdk-samples/src/main/java/com/jdchain/samples/sdk/TestNet.java b/samples/sdk-samples/src/main/java/com/jdchain/samples/sdk/TestNet.java index a431b209..40dc0343 100644 --- a/samples/sdk-samples/src/main/java/com/jdchain/samples/sdk/TestNet.java +++ b/samples/sdk-samples/src/main/java/com/jdchain/samples/sdk/TestNet.java @@ -52,10 +52,10 @@ public class TestNet { // 测试网络公私钥及私钥密码信息 private static final String[] PUB_KEYS = { - "3snPdw7i7PjVKiTH2VnXZu5H8QmNaSXpnk4ei533jFpuifyjS5zzH9", - "3snPdw7i7PajLB35tEau1kmixc6ZrjLXgxwKbkv5bHhP7nT5dhD9eX", - "3snPdw7i7PZi6TStiyc6mzjprnNhgs2atSGNS8wPYzhbKaUWGFJt7x", - "3snPdw7i7PifPuRX7fu3jBjsb3rJRfDe9GtbDfvFJaJ4V4hHXQfhwk"}; + "7VeRLdGtSz1Y91gjLTqEdnkotzUfaAqdap3xw6fQ1yKHkvVq", + "7VeRBsHM2nsGwP8b2ufRxz36hhNtSqjKTquzoa4WVKWty5sD", + "7VeRAr3dSbi1xatq11ZcF7sEPkaMmtZhV9shonGJWk9T4pLe", + "7VeRKoM5RE6iFXr214Hsiic2aoqCQ7MEU1dHQFRnjXQcReAS"}; private static final String[] PRIV_KEYS = { "177gjzHTznYdPgWqZrH43W3yp37onm74wYXT4v9FukpCHBrhRysBBZh7Pzdo5AMRyQGJD7x", "177gju9p5zrNdHJVEQnEEKF4ZjDDYmAXyfG84V5RPGVc5xFfmtwnHA7j51nyNLUFffzz5UT", @@ -261,7 +261,7 @@ public class TestNet { private static void initSampleData(HashDigest ledgerHash) throws IOException { BlockchainKeypair admin = new BlockchainKeypair(KeyGenUtils.decodePubKey(PUB_KEYS[0]), KeyGenUtils.decodePrivKeyWithRawPassword(PRIV_KEYS[0], PASSWORD)); BlockchainKeypair user = new BlockchainKeypair( - KeyGenUtils.decodePubKey("3snPdw7i7PbXVQoUX1Ywo6Cenm9gDB6DFztVazXWrq2qbbmzcAMUVC"), + KeyGenUtils.decodePubKey("7VeRCfSaoBW3uRuvTqVb26PYTNwvQ1iZ5HBY92YKpEVN7Qht"), KeyGenUtils.decodePrivKey("177gjuGapUVdLnEDAkqjQWhZxHh5jL5W6Hg1q8kbdsbk1BKht4QkmuB6dKvyJrgKTRmXSgK", "8EjkXVSTxMFjCvNNsTo8RBMDEVQmk7gYkW4SCDuvdsBG")); BlockchainService blockchainService = GatewayServiceFactory.connect( diff --git a/samples/sdk-samples/src/main/resources/config.properties b/samples/sdk-samples/src/main/resources/config.properties index a763fb68..36e17e93 100644 --- a/samples/sdk-samples/src/main/resources/config.properties +++ b/samples/sdk-samples/src/main/resources/config.properties @@ -2,7 +2,7 @@ # 签名用户配置 # 公钥 -pubkey=3snPdw7i7PjVKiTH2VnXZu5H8QmNaSXpnk4ei533jFpuifyjS5zzH9 +pubkey=7VeRLdGtSz1Y91gjLTqEdnkotzUfaAqdap3xw6fQ1yKHkvVq # 私钥 privkey=177gjzHTznYdPgWqZrH43W3yp37onm74wYXT4v9FukpCHBrhRysBBZh7Pzdo5AMRyQGJD7x # Base58编码的私钥密码 diff --git a/samples/sdk-samples/src/main/resources/testnet/ledger.init b/samples/sdk-samples/src/main/resources/testnet/ledger.init index 727a84c4..9fe5a4e8 100644 --- a/samples/sdk-samples/src/main/resources/testnet/ledger.init +++ b/samples/sdk-samples/src/main/resources/testnet/ledger.init @@ -26,7 +26,7 @@ cons_parti.0.name=a.com #第0个参与方的公钥文件路径； cons_parti.0.pubkey-path= #第0个参与方的公钥内容（由keygen工具生成）；此参数优先于 pubkey-path 参数； -cons_parti.0.pubkey=3snPdw7i7PjVKiTH2VnXZu5H8QmNaSXpnk4ei533jFpuifyjS5zzH9 +cons_parti.0.pubkey=7VeRLdGtSz1Y91gjLTqEdnkotzUfaAqdap3xw6fQ1yKHkvVq #第0个参与方的账本初始服务的主机； cons_parti.0.initializer.host=127.0.0.1 #第0个参与方的账本初始服务的端口； @@ -39,7 +39,7 @@ cons_parti.1.name=b.com #第1个参与方的公钥文件路径； cons_parti.1.pubkey-path= #第1个参与方的公钥内容（由keygen工具生成）；此参数优先于 pubkey-path 参数； -cons_parti.1.pubkey=3snPdw7i7PajLB35tEau1kmixc6ZrjLXgxwKbkv5bHhP7nT5dhD9eX +cons_parti.1.pubkey=7VeRBsHM2nsGwP8b2ufRxz36hhNtSqjKTquzoa4WVKWty5sD #第1个参与方的账本初始服务的主机； cons_parti.1.initializer.host=127.0.0.1 #第1个参与方的账本初始服务的端口； @@ -52,7 +52,7 @@ cons_parti.2.name=c.com #第2个参与方的公钥文件路径； cons_parti.2.pubkey-path= #第2个参与方的公钥内容（由keygen工具生成）；此参数优先于 pubkey-path 参数； -cons_parti.2.pubkey=3snPdw7i7PZi6TStiyc6mzjprnNhgs2atSGNS8wPYzhbKaUWGFJt7x +cons_parti.2.pubkey=7VeRAr3dSbi1xatq11ZcF7sEPkaMmtZhV9shonGJWk9T4pLe #第2个参与方的账本初始服务的主机； cons_parti.2.initializer.host=127.0.0.1 #第2个参与方的账本初始服务的端口； @@ -65,7 +65,7 @@ cons_parti.3.name=c.com #第3个参与方的公钥文件路径； cons_parti.3.pubkey-path= #第3个参与方的公钥内容（由keygen工具生成）；此参数优先于 pubkey-path 参数； -cons_parti.3.pubkey=3snPdw7i7PifPuRX7fu3jBjsb3rJRfDe9GtbDfvFJaJ4V4hHXQfhwk +cons_parti.3.pubkey=7VeRKoM5RE6iFXr214Hsiic2aoqCQ7MEU1dHQFRnjXQcReAS #第3个参与方的账本初始服务的主机； cons_parti.3.initializer.host=127.0.0.1 #第3个参与方的账本初始服务的端口； diff --git a/test b/test index 2a9c01be..60653fb8 160000 --- a/test +++ b/test @@ -1 +1 @@ -Subproject commit 2a9c01beb31040b86456b3b6d761dd74f5b480dc +Subproject commit 60653fb8bc114cb8a688217bb0e4e2bd17e7aaa8