hummingbird
/
jdchain
Not watched
2
0
Fork 0
Code
Releases 31 Wiki Activity
Issues 0 Pull Requests 0 Datasets Model Cloudbrain
Browse Source

Merge branch 'master' into develop 

* master:
  upgraded submodules;
  upgraded versions of modules;
  upgraded submodules;
  unified public key format
  upgraded framework, core and utils;

# Conflicts:
#	core
#	deploy/pom.xml
#	samples/pom.xml
#	test
tags/1.5.0
huanghaiquan 3 years ago
parent
c2ff5a594e 5350b24f42
commit
42aee6acf5
16 changed files with 31 additions and 31 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +1
    -1
      deploy/deploy-gateway/pom.xml
  2. +4
    -4
      deploy/deploy-gateway/src/main/resources/docs/design_contract-dev-manual.md
  3. +1
    -1
      deploy/deploy-peer/pom.xml
  4. +3
    -3
      deploy/deploy-peer/src/main/resources/config/init/mq/ledger.init
  5. +1
    -1
      deploy/docker/docker-demo/pom.xml
  6. +1
    -1
      deploy/docker/docker-sdk/pom.xml
  7. +1
    -1
      deploy/docker/docker-sdk/src/main/java/com/jd/blockchain/SDKDemo_Constant.java
  8. +2
    -2
      deploy/docker/pom.xml
  9. +1
    -1
      deploy/docker/readme.md
  10. +1
    -1
      deploy/pom.xml
  11. +2
    -2
      samples/contract-samples/pom.xml
  12. +2
    -2
      samples/pom.xml
  13. +1
    -1
      samples/sdk-samples/pom.xml
  14. +5
    -5
      samples/sdk-samples/src/main/java/com/jdchain/samples/sdk/TestNet.java
  15. +1
    -1
      samples/sdk-samples/src/main/resources/config.properties
  16. +4
    -4
      samples/sdk-samples/src/main/resources/testnet/ledger.init

+ 1
- 1
deploy/deploy-gateway/pom.xml View File

@@ -5,7 +5,7 @@
<parent>
<groupId>com.jd.blockchain</groupId>
<artifactId>deploy-root</artifactId>
<version>1.4.1.RELEASE</version>
<version>1.4.2.RELEASE</version>
</parent>
<artifactId>deploy-gateway</artifactId>



+ 4
- 4
deploy/deploy-gateway/src/main/resources/docs/design_contract-dev-manual.md View File

@@ -280,7 +280,7 @@ V1.0|2020-04-17|huanghaiquan

<!-- 合约部署交易的签名账户；该账户必须具备合约部署的权限； -->
<signer>
<pubKey>3snPdw7i7PjVKiTH2VnXZu5H8QmNaSXpnk4ei533jFpuifyjS5zzH9</pubKey>
<pubKey>7VeRLdGtSz1Y91gjLTqEdnkotzUfaAqdap3xw6fQ1yKHkvVq</pubKey>
<privKey>177gjzHTznYdPgWqZrH43W3yp37onm74wYXT4v9FukpCHBrhRysBBZh7Pzdo5AMRyQGJD7x</privKey>
<privKeyPwd>DYu3G8aGTMBW1WrTw76zxQJQU4DHLw9MLyy7peG4LKkY</privKeyPwd>
</signer>
@@ -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

<!-- 合约部署交易的签名账户；该账户必须具备合约部署的权限； -->
<signer>
<pubKey>3snPdw7i7PjVKiTH2VnXZu5H8QmNaSXpnk4ei533jFpuifyjS5zzH9</pubKey>
<pubKey>7VeRLdGtSz1Y91gjLTqEdnkotzUfaAqdap3xw6fQ1yKHkvVq</pubKey>
<privKey>177gjzHTznYdPgWqZrH43W3yp37onm74wYXT4v9FukpCHBrhRysBBZh7Pzdo5AMRyQGJD7x</privKey>
<privKeyPwd>DYu3G8aGTMBW1WrTw76zxQJQU4DHLw9MLyy7peG4LKkY</privKeyPwd>
</signer>


+ 1
- 1
deploy/deploy-peer/pom.xml View File

@@ -5,7 +5,7 @@
<parent>
<groupId>com.jd.blockchain</groupId>
<artifactId>deploy-root</artifactId>
<version>1.4.1.RELEASE</version>
<version>1.4.2.RELEASE</version>
</parent>
<artifactId>deploy-peer</artifactId>



+ 3
- 3
deploy/deploy-peer/src/main/resources/config/init/mq/ledger.init View File

@@ -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个参与方的账本初始服务的端口；


+ 1
- 1
deploy/docker/docker-demo/pom.xml View File

@@ -5,7 +5,7 @@
<parent>
<artifactId>docker</artifactId>
<groupId>com.jd.blockchain</groupId>
<version>1.4.1.RELEASE</version>
<version>1.4.2.RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>docker-demo</artifactId>


+ 1
- 1
deploy/docker/docker-sdk/pom.xml View File

@@ -5,7 +5,7 @@
<parent>
<groupId>com.jd.blockchain</groupId>
<artifactId>docker</artifactId>
<version>1.4.1.RELEASE</version>
<version>1.4.2.RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>



+ 1
- 1
deploy/docker/docker-sdk/src/main/java/com/jd/blockchain/SDKDemo_Constant.java View File

@@ -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";



+ 2
- 2
deploy/docker/pom.xml View File

@@ -5,7 +5,7 @@
<parent>
<groupId>com.jd.blockchain</groupId>
<artifactId>deploy-root</artifactId>
<version>1.4.1.RELEASE</version>
<version>1.4.2.RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>
@@ -13,7 +13,7 @@
<artifactId>docker</artifactId>
<properties>
<framework.version>1.4.1.RELEASE</framework.version>
<framework.version>1.4.2.RELEASE</framework.version>
</properties>

<modules>


+ 1
- 1
deploy/docker/readme.md View File

@@ -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
#默认私钥的解码密码；


+ 1
- 1
deploy/pom.xml View File

@@ -9,7 +9,7 @@
<relativePath>../project/parent</relativePath>
</parent>
<artifactId>deploy-root</artifactId>
<version>1.4.1.RELEASE</version>
<version>1.4.2.RELEASE</version>
<packaging>pom</packaging>

<properties>


+ 2
- 2
samples/contract-samples/pom.xml View File

@@ -6,7 +6,7 @@
<parent>
<groupId>com.jd.blockchain</groupId>
<artifactId>jdchain-samples</artifactId>
<version>1.4.0.RELEASE</version>
<version>1.4.2.RELEASE</version>
</parent>

<!-- 声明为合约代码工程，编译输出扩展名为".car"合约代码 -->
@@ -68,7 +68,7 @@

<!-- 用户信息，必选项，任何一个合约发布都需要拥有者进行签名 -->
<signer>
<pubKey>3snPdw7i7PjVKiTH2VnXZu5H8QmNaSXpnk4ei533jFpuifyjS5zzH9</pubKey>
<pubKey>7VeRLdGtSz1Y91gjLTqEdnkotzUfaAqdap3xw6fQ1yKHkvVq</pubKey>
<privKey>177gjzHTznYdPgWqZrH43W3yp37onm74wYXT4v9FukpCHBrhRysBBZh7Pzdo5AMRyQGJD7x</privKey>
<privKeyPwd>DYu3G8aGTMBW1WrTw76zxQJQU4DHLw9MLyy7peG4LKkY</privKeyPwd>
</signer>


+ 2
- 2
samples/pom.xml View File

@@ -4,11 +4,11 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.jd.blockchain</groupId>
<artifactId>jdchain-samples</artifactId>
<version>1.4.0.RELEASE</version>
<version>1.4.2.RELEASE</version>
<packaging>pom</packaging>

<properties>
<framework.version>1.4.1.RELEASE</framework.version>
<framework.version>1.4.2.RELEASE</framework.version>
<core.version>1.5.0-SNAPSHOT</core.version>
</properties>



+ 1
- 1
samples/sdk-samples/pom.xml View File

@@ -5,7 +5,7 @@
<parent>
<groupId>com.jd.blockchain</groupId>
<artifactId>jdchain-samples</artifactId>
<version>1.4.0.RELEASE</version>
<version>1.4.2.RELEASE</version>
</parent>
<artifactId>sdk-samples</artifactId>


+ 5
- 5
samples/sdk-samples/src/main/java/com/jdchain/samples/sdk/TestNet.java View File

@@ -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(


+ 1
- 1
samples/sdk-samples/src/main/resources/config.properties View File

@@ -2,7 +2,7 @@

# 签名用户配置
# 公钥
pubkey=3snPdw7i7PjVKiTH2VnXZu5H8QmNaSXpnk4ei533jFpuifyjS5zzH9
pubkey=7VeRLdGtSz1Y91gjLTqEdnkotzUfaAqdap3xw6fQ1yKHkvVq
# 私钥
privkey=177gjzHTznYdPgWqZrH43W3yp37onm74wYXT4v9FukpCHBrhRysBBZh7Pzdo5AMRyQGJD7x
# Base58编码的私钥密码


+ 4
- 4
samples/sdk-samples/src/main/resources/testnet/ledger.init View File

@@ -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个参与方的账本初始服务的端口；


Write Preview
Loading…
Cancel
Save