Commits · fddd06f883bda54ad00c7bfbc926ba7c362dd1ae · link33 / plugin

14 Dec, 2018 6 commits
- hello · fddd06f8
  vipwzw authored Dec 14, 2018
  
  fddd06f8
- auto ci · de416732
  vipwzw authored Dec 14, 2018
  
  de416732
- pokerbull由统一接口创建交易 · c40dba14
  pengjun authored Dec 14, 2018
  
  c40dba14
- fix linter error · b4efbed2
  pengjun authored Dec 14, 2018
  
  b4efbed2
- auto ci · 14a2af66
  vipwzw authored Dec 14, 2018
  
  14a2af66
- Merge remote-tracking branch 'remotes/origin/master' into pokerbull · 9e3a8968
  pengjun authored Dec 14, 2018
  
  9e3a8968
12 Dec, 2018 7 commits
- Merge pull request #131 from linj-disanbo/fix-trade-check-token-exist · 5e735848
  vipwzw authored Dec 12, 2018
```
WIP: trade 回滚 判断token资产是否存在的步骤
```
  5e735848
- Merge pull request #132 from vipwzw/update_chain33_1212 · 72b5f5c4
  vipwzw authored Dec 12, 2018
```
update_chain33_1212
```
  72b5f5c4
- update config file · 7e84baf0
  kingwang authored Dec 12, 2018
  
  7e84baf0
- update chain33 · 34a91a59
  vipwzw authored Dec 12, 2018
  
  34a91a59
- change chain33 config file · ebd5ec20
  vipwzw authored Dec 12, 2018
  
  ebd5ec20
- fix linter · a2ebe0bb
  vipwzw authored Dec 12, 2018
  
  a2ebe0bb
- update_chain33_1212 · e2d4fe05
  vipwzw authored Dec 12, 2018
  
  e2d4fe05
11 Dec, 2018 4 commits
- trade 为了支持更广义的资产，不仅限于tokne 资产，去掉了对token 合约的依赖. · 0c67134a
  linj authored Dec 11, 2018
```
删除了判断token资产是否存在的步骤， 导致了新老版本执行结果不 一致， 现在回滚代码
```
  0c67134a
- add by hyb for add test · cc8b634f
  heyubin authored Dec 11, 2018
  
  cc8b634f
- add by hyb for ticket test · 477c6b5d
  heyubin authored Dec 10, 2018
  
  477c6b5d
- add by hyb for setTicket input param check · 1a9b0d06
  heyubin authored Dec 10, 2018
  
  1a9b0d06
10 Dec, 2018 13 commits
- fix pokerbull player check · 74531d56
  pengjun authored Dec 10, 2018
  
  74531d56
- fix merge error · e6b843b4
  pengjun authored Dec 10, 2018
  
  e6b843b4
- Merge branch 'master' into pokerbull · d65c7bdb
  pengjun authored Dec 10, 2018
```
# Conflicts:
#	plugin/dapp/pokerbull/executor/pokerbulldb.go
```
  d65c7bdb
- auto ci · 6e169f63
  vipwzw authored Dec 10, 2018
  
  6e169f63
- Update ticket.go · 231fa131
  33cn authored Dec 10, 2018
  
  231fa131
- remove dup register policy · 42fb7dc4
  Litian authored Dec 10, 2018
  
  42fb7dc4
- auto ci · 6d785aec
  vipwzw authored Dec 10, 2018
  
  6d785aec
- 只在自动挖矿的地方控制ticket共识挖矿 · c44d3754
  Litian authored Dec 10, 2018
  
  c44d3754
- rebuild · 277ec707
  Litian authored Dec 07, 2018
  
  277ec707
- rebuild · cf9ad675
  Litian authored Dec 07, 2018
  
  cf9ad675
- 非ticket共识下，不启用ticket钱包插件 · 125139b4
  Litian authored Dec 07, 2018
  
  125139b4
- auto ci · a4ea20fb
  vipwzw authored Dec 07, 2018
  
  a4ea20fb
- 非ticket共识下，不启用ticket钱包插件 · b9131d64
  Litian authored Dec 07, 2018
  
  b9131d64
07 Dec, 2018 10 commits
- auto ci · c9d15bc5
  vipwzw authored Dec 07, 2018
  
  c9d15bc5
- Update statedb.go · 05f6dd0b
  33cn authored Dec 07, 2018
  
  05f6dd0b
- 将evm合约接收到的金额直接存在合约自己的账户上，不和任何外部账户绑定 · 2ad5fc1c
  Litian authored Dec 07, 2018
  
  2ad5fc1c
- add evm frozen · 96aa0725
  Litian authored Dec 06, 2018
  
  96aa0725
- auto ci · 7a083f93
  vipwzw authored Dec 07, 2018
  
  7a083f93
- Update ticket.go · 4c286126
  33cn authored Dec 07, 2018
  
  4c286126
- add by hyb for issues109 · 9ae1ddb3
  heyubin authored Dec 07, 2018
  
  9ae1ddb3
- add by hyb for issues109 · 1bc1534a
  heyubin authored Dec 07, 2018
  
  1bc1534a
- add by hyb for issues109 · 7029765a
  heyubin authored Dec 07, 2018
  
  7029765a
- auto ci · 96f56d71
  vipwzw authored Dec 07, 2018
  
  96f56d71