324 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
brightestboy	6ab754bb04	Merge remote-tracking branch 'origin/dev_jby_preview' into yf_preview	2019-03-27 09:04:31 +08:00
wuwei1972	65f2ec833b	Merge remote-tracking branch 'origin/c4w_preview' into dev_jby_preview	2019-03-27 08:18:48 +08:00
brightestboy	699bcefb55	Merge remote-tracking branch 'origin/c4w_preview' into yf_preview	2019-03-26 11:50:41 +08:00
c4w	95b77dea57	保持目前的proto定义和合约接口不变 ... 在合约逻辑中实现法律文本提醒	2019-03-26 11:48:29 +08:00
brightestboy	0d5dc15378	Merge remote-tracking branch 'origin/c4w_preview' into yf_preview	2019-03-26 09:27:38 +08:00
c4w	f9a925153d	rename package	2019-03-26 08:44:40 +08:00
c4w	f96b3dc1cc	同合约串行执行测试	2019-03-26 08:22:32 +08:00
brightestboy	e284593235	Merge remote-tracking branch 'origin/dev_jby_preview' into yf_preview	2019-03-25 21:20:30 +08:00
c4w	26934114db	合约升级测试用例: ... v1不支持share分账 v2支持share分账	2019-03-25 16:56:39 +08:00
wuwei1972	27e0abf537	添加启动验证，验证leveldb和区块文件的完整性	2019-03-25 14:16:41 +08:00
c4w	1980a40503	非debug状态下不允许调用节点密钥对对交易签名以响应API请求	2019-03-23 08:27:53 +08:00
brightestboy	18c079d78b	补充setState测试用例	2019-03-22 18:00:22 +08:00
c4w	6c19c8d3d3	key as value bug	2019-03-22 17:42:53 +08:00
c4w	b8a8b78fed	Merge remote-tracking branch 'origin/dev_jby_preview' into c4w_preview	2019-03-22 17:37:06 +08:00
wuwei1972	11fde52006	修改创世块中的部署者身份	2019-03-22 17:31:51 +08:00
c4w	0f1322538b	deserialise(coder_bytes) again	2019-03-22 17:21:23 +08:00
c4w	461df14efd	deserialise(coder_bytes)	2019-03-22 17:19:43 +08:00
c4w	33f4c2d040	Merge remote-tracking branch 'origin/yf_preview' into c4w_preview	2019-03-22 16:24:02 +08:00
brightestboy	4c3640040d	添加部分接口测试xml文件，具体介绍在/scripts/api_req/README.md	2019-03-22 16:09:20 +08:00
c4w	1edb4da67e	git忽略target	2019-03-22 15:46:39 +08:00
c4w	d69ab39c19	remove json4s	2019-03-22 15:42:28 +08:00
c4w	b495a15695	remove old remarks codes	2019-03-22 15:25:11 +08:00
brightestboy	e9b4106af6	Merge remote-tracking branch 'origin/dev_jby_preview' into yf_preview	2019-03-22 15:12:59 +08:00
wuwei1972	8397b02dba	修改单机启动端口冲突问题	2019-03-22 15:09:43 +08:00
wuwei1972	767b1b30ca	Merge remote-tracking branch 'origin/yf_preview' into dev_jby_preview	2019-03-22 15:01:58 +08:00
brightestboy	32fa0410d1	Merge remote-tracking branch 'origin/yf_preview' into yf_preview	2019-03-22 15:01:39 +08:00
brightestboy	eca794e047	Merge remote-tracking branch 'origin/dev_jby_preview' into yf_preview	2019-03-22 14:58:26 +08:00
c4w	febd0e51d6	CHAINCODE_SET_STATE类型的交易紧跟deploy交易	2019-03-22 14:58:13 +08:00
wuwei1972	f48d6f3fb9	重新生成json文件	2019-03-22 14:32:25 +08:00
brightestboy	3b7ff99e26	Merge remote-tracking branch 'origin/dev_jby_preview' into yf_preview ... # Conflicts: # src/main/scala/rep/utils/GenesisBuilder.scala	2019-03-22 13:50:27 +08:00
wuwei1972	0cdecb589b	Merge remote-tracking branch 'origin/c4w_preview' into dev_jby_preview	2019-03-22 13:09:41 +08:00
wuwei1972	7e174ef4e4	合并冲突	2019-03-22 13:08:58 +08:00
c4w	064aede5f6	SerializeUtils取代ByteString	2019-03-22 12:27:06 +08:00
c4w	76be6cad98	SandboxSpec增加invoke紧接deploy之后的测试	2019-03-22 12:17:54 +08:00
c4w	77af8e20aa	checkTransaction让invoke正在deploy的合约通过	2019-03-22 12:11:37 +08:00
brightestboy	f19ca32464	Merge remote-tracking branch 'origin/dev_jby_preview' into yf_preview ... # Conflicts: # src/main/scala/rep/utils/GenesisBuilder.scala	2019-03-22 11:19:37 +08:00
brightestboy	ec3695704c	Merge remote-tracking branch 'origin/c4w_preview' into yf_preview	2019-03-22 11:18:16 +08:00
wuwei1972	1b48b8a13d	修改创世块及交易创建	2019-03-22 11:15:51 +08:00
c4w	e155757f64	remove json encode	2019-03-22 11:09:48 +08:00
c4w	ff192092c4	Merge remote-tracking branch 'origin/dev_jby_preview' into c4w_preview	2019-03-22 11:08:04 +08:00
brightestboy	4a84019cbe	Merge remote-tracking branch 'origin/c4w_preview' into yf_preview	2019-03-22 09:35:12 +08:00
brightestboy	782654166e	Merge remote-tracking branch 'origin/dev_jby_preview' into yf_preview	2019-03-22 09:34:48 +08:00
c4w	76f3627fe6	采用kryo序列化,与原来的json相比,体积持平，性能提升了将近3倍	2019-03-22 01:28:58 +08:00
wuwei1972	a2ee4acab3	修改证书缓存	2019-03-21 21:36:19 +08:00
wuwei1972	efdb300868	Merge remote-tracking branch 'origin/yf_preview' into dev_jby_preview	2019-03-21 20:47:21 +08:00
brightestboy	bc671f3a97	Merge remote-tracking branch 'origin/c4w_preview' into yf_preview	2019-03-21 18:15:25 +08:00
brightestboy	cfbb08a6e9	1、优化swaggerDocService；2、ContractCert（账户合约）中将原来存x509Certificate改为存proto中定义的Certificate，增加updateSigner方法，用来更新Signer账户信息；3、ContractCertSpec：ContractCert的测试。	2019-03-21 18:14:47 +08:00
c4w	2f36569322	StateSpec test ok.	2019-03-21 12:07:17 +08:00
brightestboy	9616657d4d	SwaggerUi：补充一些其他信息（Scheme、externalDoc、securityDefinition）	2019-03-21 10:51:25 +08:00
brightestboy	6574236d32	Merge remote-tracking branch 'origin/c4w_preview' into yf_preview	2019-03-21 10:35:45 +08:00