Commit Graph

23 Commits

Author SHA1 Message Date
wuwei1972
152ec0b786 共识调试完成 2019-03-19 10:58:05 +08:00
jiangbuyun@sina.com
93f5a428f6 共识调试代码修改 2019-03-17 20:04:30 +08:00
jiangbuyun@sina.com
2884d5b9fd 创世块生成,系统启动完成 2019-03-17 16:33:15 +08:00
brightestboy
5c6ae5e97e Merge remote-tracking branch 'origin/dev_jby_preview' into yf_preview
# Conflicts:
#	conf/system.conf
2019-03-17 10:48:45 +08:00
brightestboy
331d59ba3a 为账户管理合约添加版本 2019-03-17 10:45:31 +08:00
jiangbuyun@sina.com
0cd6bafe98 修改创世块json字符串输出类 2019-03-17 10:07:56 +08:00
jiangbuyun@sina.com
14f9b1bd89 修改交易建立与系统启动配置装载问题 2019-03-15 09:04:03 +08:00
jiangbuyun@sina.com
4d94453d42 修改日志,签名,存储方面的实用化代码。 2019-03-11 06:56:13 +08:00
jiangbuyun@sina.com
e5f7a9461c 提交自己的conf和system 2019-01-16 11:19:50 +08:00
brightestboy
89c3a81c02 Update Copyright 2018-11-28 18:50:13 +08:00
wuwei1972
23b3dd109d 整理代码 2018-11-28 15:58:49 +08:00
wuwei1972
ea19df8d91 在system.conf文件中增加配置项,
vote {
    //最低投票人数量
    vote_note_min = 4
    //参与共识的节点别名
    vote_node_list = ["1","2","3","4"]
  }
  vote_node_list这个项是必须的配置,配置内容是可以参与的共识节点的别名,没有配置的节点
  不是共识节点。
2018-10-31 16:37:56 +08:00
wuwei1972
98a0af7c3e 增加时间跟踪,增加验签时的证书缓存。 2018-10-23 21:38:20 +08:00
jiangbuyun@sina.com
b47825078a 1.恢复缓存,自动产生更多交易函数
2.采用背书采用单函数验签,并且从交易池中判断该交易是否存在,如果存在就不进行验签,因为进入交易池已经经过验签了。
2018-10-18 22:42:27 +08:00
wuwei1972
aa9e43a331 修改背书中的缓存问题导致产生不同的背书结果。 2018-10-08 21:53:53 +08:00
chen4w
37b910d60c 证书数量与单机节点数量相等避免抽签等待 2018-09-06 16:11:37 +08:00
c4w
953a704070 data 2018-08-26 21:57:03 +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
443b612e67 合并分支准备 2018-07-27 13:46:40 +08:00
wuwei1972
067b563b66 1.修改存储目录建立的问题
2.增加合约编译参数配置,contractOperationMode =
1//设置合约的运行方式,0=debug方式,1=deploy,默认为debug方式,如果发布部署,必须使用deploy方式。
2018-07-27 09:24:42 +08:00
wuwei1972
b4c586067c 1.增加证书期限的有效性校验
2.在系统配置文件中增加配置参数,checkCertValidate = 0//设置是否检查证书的有效性,默认为0  0=不校验,1=校验
2018-07-17 19:40:14 +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