Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Silei/upgrade sync with develop #201

Merged
merged 72 commits into from
Sep 6, 2018
Merged

Silei/upgrade sync with develop #201

merged 72 commits into from
Sep 6, 2018

Conversation

wukongcheng
Copy link
Contributor

No description provided.

HaoyangLiu and others added 30 commits August 22, 2018 15:34
Switch dependency
2c6d232
@wukongcheng
Merge pull request irisnet#155 from HaoyangLiu/feature/refactor
9dda4f7 
Switch dependency
@wukongcheng
refactor: import baseapp & router
8328ec7
@wukongcheng
Merge pull request irisnet#156 from wukongcheng/silei/refactor
4fe436a 
refactor: import baseapp & router
@wukongcheng
Merge branch 'feature/software-upgrade' of https://github.com/irisnet…
49b5af9 
…/irishub into silei/refactor
move gov module from cosmos-sdk to irishub
56ea014
@wukongcheng
Merge pull request irisnet#158 from wukongcheng/silei/refactor
9c654eb 
Silei/refactor: merge the latest commits of the upgrade module
Merge branch 'feature/refactor' of https://github.com/irisnet/iris-hub …
a1bb37d 
…into zhiqiang/feature/refactor
@wukongcheng
Merge pull request irisnet#159 from zhiqiang-bianjie/feature/refactor
9ba01dc 
move gov module from cosmos-sdk to irishub
@wukongcheng
merge baseapp to v0.24.0 and sdk.types
8afad43
@wukongcheng
keep the common types in sdk
8d1be82
@wukongcheng
update sdk deps to irisnet/refactor
80014ec
@wukongcheng
fix errors
5c7a7a2
@wukongcheng
Merge pull request irisnet#161 from wukongcheng/silei/refactor
2ce6ac8 
Silei/refactor: merge baseapp to v0.24.0
add coin_type and global params store
e193f12
@wukongcheng
refactor the cli and rest client
30a7282
@wukongcheng
Merge pull request irisnet#162 from zhiqiang-bianjie/feature/refactor
01848d4 
add coin_type and global params store
@wukongcheng
Merge branch 'feature/refactor' of https://github.com/irisnet/irishub …
de132a7 
…into silei/refactor
Add fee token
36bf139
Add fee token config
c3e18d0
@wukongcheng
Merge pull request irisnet#163 from wukongcheng/silei/refactor
2bc5c0c 
Silei/refactor : refactor the cli and rest client
Merge with irisnet/feature/refactor
31086e5
Remove duplicated IAVL mount
344bc85
@wukongcheng
Merge pull request irisnet#164 from HaoyangLiu/feature/refactor
5c73287 
Add fee token
Modify compilation error
7dad205
@wukongcheng
Merge pull request irisnet#165 from zhiqiang-bianjie/feature/refactor
446ff82 
Modify compilation error
@wukongcheng
update gopkg.lock
99a6f39
@wukongcheng
Merge branch 'feature/refactor' of https://github.com/irisnet/irishub …
820a8c5 
…into silei/refactor
@wukongcheng
add params to kvstorekeylist and remove app.Seal()
30f62ae
Add slashing genesis init
fa5098d
zhangzhiqiang and others added 29 commits August 24, 2018 15:35
update denom to lower //app.GetCoinType
c648539
@wukongcheng
Merge pull request irisnet#173 from HaoyangLiu/feature/refactor
82868b3 
fee token spec
@wukongcheng
Merge pull request irisnet#172 from zhiqiang-bianjie/feature/refactor
9e217c6 
add coin_type and sendTx
missing return when encounter fee checking error
ef00f87
Merge branch 'feature/refactor' of https://github.com/irisnet/iris-hub …
58fe646 
…into zhiqiang/feature/refactor
add coin_type spec and spec
88765c5
Add token conversion error handling logic
60cfe24
@wukongcheng
Merge pull request irisnet#175 from zhiqiang-bianjie/feature/refactor
c855fdb 
 add coin_type spec
@wukongcheng
update Gopkg.lock
13cbe1e
@wukongcheng
Merge branch 'feature/refactor' of https://github.com/irisnet/irishub …
38e6b61 
…into silei/refactor
@wukongcheng
refactor the upgrade examples
1302a9e
@wukongcheng
refactor iparmas
6db845d
@wukongcheng
update .gitignore
01fdac5
@wukongcheng
Merge pull request irisnet#178 from wukongcheng/silei/refactor
b1cb4bd 
Silei/refactor
@wukongcheng
Merge pull request irisnet#179 from irisnet/hotfix/0.4.1
d1d2082 
Hotfix/0.4.1
@wukongcheng
Merge pull request irisnet#180 from irisnet/hotfix/0.4.1
11c727e 
Hotfix/0.4.1
@wukongcheng
Merge branch 'develop' of https://github.com/irisnet/irishub into sil…
5ecf9b5 
…ei/refactor
@wukongcheng
Merge pull request irisnet#181 from wukongcheng/silei/refactor
aa8ffa3 
Silei/refactor
@wukongcheng
Merge pull request irisnet#182 from irisnet/feature/refactor
3d6621e 
Feature/refactor
@wukongcheng
refactor iparams get/set
ded1cf1
@wukongcheng
Merge pull request irisnet#186 from wukongcheng/silei/refactor
be7fe9c 
refactor iparams get/set
@wukongcheng
IRISHUB-271：refactor client code structor
fa0b74a
@wukongcheng
Merge pull request irisnet#190 from wukongcheng/silei/refactor
1a8b5a0 
IRISHUB-271：refactor client code structor
@programokey
Merge branch 'develop' of https://github.com/irisnet/irishub into dev…
af97e62 
…elop
@programokey
IRISHUB-272: fix the bug that the monitor didn't correctly close open…
7dc6e49 
…ed processes.
IRISHUB-271: move lcd back to client/
2af0777
@wukongcheng
Merge pull request irisnet#193 from programokey/develop
d22ab3a 
Develop
@wukongcheng
Merge pull request irisnet#194 from HaoyangLiu/feature/refactor
62398e1 
IRISHUB-271: move lcd back to client/
@wukongcheng
Merge pull request irisnet#200 from irisnet/feature/refactor
3abf9ea 
Merge Feature/refactor to Develop
@wukongcheng wukongcheng merged commit 8a6f4e0 into irisnet:feature/software-upgrade Sep 6, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@wukongcheng @programokey