Commit Graph

227 Commits

Author SHA1 Message Date
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
c4w
9b82de6507 Merge remote-tracking branch 'origin/dev_jby_preview' into c4w_preview 2019-03-21 10:32:14 +08:00
wuwei1972
6302995d0a 添加建立合约有效性交易设置函数 2019-03-21 10:30:50 +08:00
c4w
e77fdd7063 DeploySpec 2019-03-21 09:54:41 +08:00
wuwei1972
f413cf1edf 增加返回merkle值 2019-03-21 08:32:00 +08:00
c4w
128554481c for test 2019-03-21 07:27:06 +08:00
c4w
120184cc4b 测试用例未执行SystemProfile.initConfigSystem
导致无法获取配置参数
2019-03-21 00:06:46 +08:00
c4w
30a8acff6b 测试用例的用户注册合约命名必须从配置读取 2019-03-20 23:38:02 +08:00
c4w
bc8dfaba94 Merge branch 'yf_preview' of https://gitee.com/BTAJL/repchain.git into
yf_preview

Conflicts:
	src/main/scala/rep/sc/scalax/SandboxScala.scala
2019-03-20 22:56:23 +08:00
c4w
f2e3406f8f 增加合约禁用启用机制 2019-03-20 22:48:19 +08:00
brightestboy
2dcbbd2dfb 重写swaggerConfig,加上tag描述信息 2019-03-20 20:23:30 +08:00
brightestboy
547cfcd75f assets6.json对应与assets6.xml,同一个接口的测试 2019-03-20 15:29:02 +08:00
brightestboy
6994d489f8 Merge remote-tracking branch 'origin/dev_jby_preview' into yf_preview 2019-03-20 15:08:19 +08:00
brightestboy
588848d630 为API文档增加部分描述信息 2019-03-20 15:07:43 +08:00
wuwei1972
cce6ed7b0a 1.修改合约从api提交不成功等情况,编写合约时要,在合约中不要拼接key,在跨合约读时,只需要添加其合约等名称,key值不需要拼接。
2.修改了存储中对put对内容进行比较对程序,现在不在对value进行比较。
3.在合约部署代码中对,不是部署时不需要对合约的部署内容进行修改。
2019-03-20 14:55:08 +08:00
brightestboy
286a8b593a 整理接口,去掉无用的接口,并调整返回值,升级与http相关的部分包(swagger-akka-http,swagger-jaxrs,akka-http) 2019-03-19 20:29:12 +08:00
brightestboy
2775de79e1 Merge remote-tracking branch 'origin/c4w_preview' into yf_preview 2019-03-19 11:43:22 +08:00
c4w
83b43fc9be 实时图ok 2019-03-19 11:41:22 +08:00
c4w
8d2bae7f52 Merge remote-tracking branch 'origin/dev_jby_preview' into c4w_preview 2019-03-19 11:06:56 +08:00
brightestboy
c249392377 Merge remote-tracking branch 'origin/dev_jby_preview' into yf_preview 2019-03-19 11:02:38 +08:00
wuwei1972
152ec0b786 共识调试完成 2019-03-19 10:58:05 +08:00
brightestboy
bbff0ce9c6 Merge remote-tracking branch 'origin/c4w_preview' into yf_preview 2019-03-19 10:12:19 +08:00
brightestboy
99e9a844ba 2的20次方 2019-03-19 10:11:54 +08:00
c4w
1f41fbe78a debug状态强行覆盖动态生成的合约代码 2019-03-18 15:00:33 +08:00
c4w
3f285809a7 isForInvoke允许恢复已部署的合约 2019-03-18 14:27:32 +08:00
jiangbuyun@sina.com
421fad9aba 初始合约容器 2019-03-18 14:04:38 +08:00
jiangbuyun@sina.com
e9236823b9 修改预执行和合约部分代码。 2019-03-17 22:40:52 +08:00
jiangbuyun@sina.com
7375a24b49 Merge remote-tracking branch 'origin/c4w_preview' into dev_jby_preview 2019-03-17 20:05:20 +08:00
jiangbuyun@sina.com
93f5a428f6 共识调试代码修改 2019-03-17 20:04:30 +08:00
c4w
6b6136b312 TransferSpec test ok. 2019-03-17 19:56:49 +08:00
brightestboy
4ff57a6416 Merge remote-tracking branch 'origin/dev_jby_preview' into yf_preview 2019-03-17 18:24:49 +08:00
brightestboy
dbdf71973b 注册用户账户node2(Signer),然后进行转账测试121000005l35120456(node1) -> 12110107bi45jh675g(node2) 2019-03-17 18:22:12 +08:00
brightestboy
5363a71a84 转账合约测试 2019-03-17 16:49:20 +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
c4w
565090cb42 使用IdTool.getCId 2019-03-17 10:35:04 +08:00
c4w
4f383fa358 Merge remote-tracking branch 'origin/yf_preview' into c4w_preview 2019-03-17 10:29:41 +08:00
c4w
d44e8da3e2 Merge remote-tracking branch 'origin/dev_jby_preview' into c4w_preview 2019-03-17 10:18:26 +08:00
jiangbuyun@sina.com
0cd6bafe98 修改创世块json字符串输出类 2019-03-17 10:07:56 +08:00
c4w
9df8fcd8d8 增加转账条件检查 2019-03-16 08:22:40 +08:00
brightestboy
6cfc82c53f set值,***UnitTest得跟上*** 2019-03-15 18:03:33 +08:00
brightestboy
6abf7ba260 更新值后,重新存入 2019-03-15 17:56:59 +08:00
brightestboy
5316ef294a Merge remote-tracking branch 'origin/c4w_preview' into zyf_preview 2019-03-15 17:30:48 +08:00
brightestboy
b0d6c2e646 编译错误,fix 2019-03-15 17:29:48 +08:00
c4w
dd2a423df9 Merge branch 'c4w_preview' of https://gitee.com/BTAJL/repchain.git into c4w_preview 2019-03-15 17:24:11 +08:00
c4w
cec3c7918f getStateEx 2019-03-15 17:24:00 +08:00
brightestboy
9473996b4b Merge remote-tracking branch 'origin/c4w_preview' into zyf_preview 2019-03-15 17:21:03 +08:00