Commit Graph

350 Commits

Author SHA1 Message Date
brightestboy
67015e9b2c 修改BitcoinAddr计算函数的参数 2018-09-05 21:42:01 +08:00
wuwei1972
949391c3f3 采用多个actor进行签名校验,性能有所提高。 2018-09-04 23:12:17 +08:00
wuwei1972
163746dea9 endorse4blocker专门用于出块共识actor
blocktimestatis用于统计共识时间,该类还没有彻底完成
2018-09-04 15:38:12 +08:00
wuwei1972
95a99f690e 把背书共识从block actor中拆分出来,测试共识效率是否提升。 2018-09-04 15:35:02 +08:00
chen4w
6f66354eaa Merge branch 'dev_supply' of https://gitee.com/BTAJL/repchain.git into dev_supply 2018-09-03 13:57:32 +08:00
chen4w
236c6d169d 下载交易流上传需要清空metadata 2018-09-03 13:57:25 +08:00
wuwei1972
cbc75d3f2c Merge branch 'dev_wuwei1972' 2018-08-29 13:12:18 +08:00
wuwei1972
0427f60195 Merge branch 'dev_supply' into dev_wuwei1972 2018-08-29 13:10:46 +08:00
c4w
d021286127 异构平台签名测试、 2018-08-29 09:58:42 +08:00
c4w
953a704070 data 2018-08-26 21:57:03 +08:00
c4w
3a5f6b4654 增加下载和上传Transaction字节流的API 2018-08-24 11:33:21 +08:00
c4w
fc4f56af13 提交签名交易字节流 2018-08-24 01:07:04 +08:00
brightestboy
6efcf71696 somefix 2018-08-19 16:36:16 +08:00
brightestboy
e61a831d6d 供应链合约中加入SignUp函数 2018-08-19 15:42:51 +08:00
brightestboy
2dd7cbfa46 返回异常详细信息 2018-08-19 11:20:14 +08:00
wuwei1972
4439966960 Merge remote-tracking branch 'origin/dev_supply' into dev_wuwei1972 2018-08-19 10:54:56 +08:00
wuwei1972
a0b0503e1f 修改waggerui的通过端地址读取证书信息代码。 2018-08-19 10:53:31 +08:00
c4w
5f7023e958 增加获取block字节流API 2018-08-18 22:47:38 +08:00
brightestboy
0b5aecc612 返回异常信息给提交交易方,避免返回500 2018-08-17 09:38:42 +08:00
wuwei1972
c775c8d556 Merge remote-tracking branch 'origin/dev_supply' into dev_wuwei1972 2018-08-14 21:38:02 +08:00
wuwei1972
675f3ce479 修改#IM3LF问题,ECDSASign.getCertByBitcoinAddr方法的代码bug,增加了某些类的异常处理。 2018-08-14 21:31:32 +08:00
wuwei1972
a1609d71b3 Merge remote-tracking branch 'origin/dev_wuwei1972' 2018-08-14 16:19:26 +08:00
wuwei1972
95a694663e 解决#IM304问题 转账合约set功能用户名不能相同 2018-08-14 16:17:49 +08:00
wuwei1972
cf46c50188 Merge branch 'dev_supply' into dev_wuwei1972 2018-08-14 16:15:20 +08:00
c4w
1414ae9326 解决问题IM2ZS 2018-08-14 14:23:58 +08:00
unknown
f2deba529f Merge branch 'dev_wuwei1972' of https://gitee.com/BTAJL/repchain into dev_wuwei1972 2018-08-07 15:44:53 +08:00
unknown
ff2e566c03 CFRD共识算法减少一次排序 2018-08-07 15:25:18 +08:00
wuwei1972
5b1022cafc Merge branch 'dev_wuwei1972' 2018-07-27 15:56:47 +08:00
wuwei1972
0676df8f89 增加预执行模块中的资源释放 2018-07-27 15:53:59 +08:00
brightestboy
3235d348fc Merge branch 'dev_wuwei1972' into dev_supply
# Conflicts:
#	build.sbt
#	conf/system.conf
#	scripts/example_deploy.js
#	src/main/scala/ContractAssetsTPL.scala
#	src/main/scala/Contractback.txt
#	src/main/scala/NewContract.scala
#	src/main/scala/rep/api/SwaggerDocService.scala
#	src/main/scala/rep/api/rest/RestActor.scala
#	src/main/scala/rep/api/rest/RestService.scala
#	src/main/scala/rep/app/conf/SystemProfile.scala
#	src/main/scala/rep/crypto/ECDSASign.scala
#	src/main/scala/rep/crypto/Sha256.scala
#	src/main/scala/rep/crypto/SignFunc.scala
#	src/main/scala/rep/log/EventActor.scala
#	src/main/scala/rep/network/PeerHelper.scala
#	src/main/scala/rep/network/cache/TransactionPool.scala
#	src/main/scala/rep/network/consensus/block/BlockHelper.scala
#	src/main/scala/rep/network/consensus/block/BlockModule.scala
#	src/main/scala/rep/network/consensus/endorse/EndorsementModule.scala
#	src/main/scala/rep/network/consensus/vote/CRFDVoter.scala
#	src/main/scala/rep/network/consensus/vote/CRFDVoterModule.scala
#	src/main/scala/rep/network/consensus/vote/VoterBase.scala
#	src/main/scala/rep/network/tools/PeerExtension.scala
#	src/main/scala/rep/sc/Sandbox.scala
#	src/main/scala/rep/sc/Shim.scala
#	src/main/scala/rep/sc/contract/Compiler.scala
#	src/main/scala/rep/sc/scalax/SandboxScala.scala
#	src/main/scala/rep/storage/cfg/StoreConfig.java
#	src/main/scala/rep/storage/test/testmap.scala
#	src/main/scala/rep/storage/util/pathUtil.java
#	src/main/scala/rep/utils/SerializeUtils.scala
#	src/test/scala/rep/sc/SandboxSpec.scala
2018-07-27 14:58:41 +08:00
wuwei1972
28cbd90735 Merge branch 'dev_wuwei1972' of https://gitee.com/BTAJL/repchain.git into dev_wuwei1972 2018-07-27 13:47:46 +08:00
wuwei1972
443b612e67 合并分支准备 2018-07-27 13:46:40 +08:00
wuwei1972
96ac85bdc9 Merge branch 'dev_wuwei1972' 2018-07-27 13:24:38 +08:00
wuwei1972
980e2c83a4 Merge branch 'dev_wuwei1972' of https://gitee.com/BTAJL/repchain.git into dev_wuwei1972 2018-07-27 13:17:43 +08:00
wuwei1972
57e4f4fca1 准备合并master分支 2018-07-27 10:36:49 +08:00
wuwei1972
cfffa537a4 合并分支supply 2018-07-27 09:51:57 +08:00
wuwei1972
067b563b66 1.修改存储目录建立的问题
2.增加合约编译参数配置,contractOperationMode =
1//设置合约的运行方式,0=debug方式,1=deploy,默认为debug方式,如果发布部署,必须使用deploy方式。
2018-07-27 09:24:42 +08:00
wuwei1972
45aeb58100 修改前台交易提交后,获取账户余额没有更新的问题。问题原因是给定数据获取句柄的入参为空。 2018-07-26 21:55:44 +08:00
zhengls
8ac016a170 修改《开发者指南链接地址》,补充Java客户端链接RepChain 2018-07-25 10:09:36 +08:00
brightestboy
34bcd9b163 合约修改 2018-07-23 17:53:40 +08:00
wuwei1972
b4c586067c 1.增加证书期限的有效性校验
2.在系统配置文件中增加配置参数,checkCertValidate = 0//设置是否检查证书的有效性,默认为0  0=不校验,1=校验
2018-07-17 19:40:14 +08:00
wuwei1972
018c85c013 修改出块人在收集背书信息时,通过改变背书信息的位置来猜测下一个出块人的问题。
增加校验背书信息顺序代码,杜绝恶意节点猜测下一个出块人的问题。
2018-07-16 21:16:34 +08:00
zhengls
0b25b38a3d 修改《RepChain开发者指南》链接地址 2018-07-16 10:43:07 +08:00
wuwei1972
fda7f76f09 在背书中增加重复交易的判断,防止重放攻击。 2018-07-15 11:24:11 +08:00
wuwei1972
356a6713c2 修改抽签算法,通过伪随机数生成出块人随机序列。 2018-07-14 20:53:08 +08:00
brightestboy
7906af54b7 commit dev_supply 2018-07-12 10:30:24 +08:00
brightestboy
824cc58775 commit dev_supply 2018-07-11 22:26:36 +08:00
brightestboy
7e99ff7b83 commit dev_supply 2018-07-11 22:21:39 +08:00
wuwei1972
76c4199fc4 commit message 2018-07-11 17:36:52 +08:00
无为1972
c587db7808 Initial commit 2018-07-11 17:32:43 +08:00