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.

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

Merge with develop #636

Merged
merged 375 commits into from
Nov 17, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
375 commits
Select commit Hold shift + click to select a range
053ccfb
format code
Nov 2, 2018
87bfb9a
remove mark fee as required
Nov 2, 2018
6d9d117
Fix bug in gentx
Nov 2, 2018
89379e9
Merge branch 'feature/deps' of https://github.com/irisnet/irishub int…
Nov 5, 2018
7c31b62
Add client config
Nov 5, 2018
1d8c10b
IRISHUB-638: Update Gopkg.lock
Nov 5, 2018
2c36cc2
IRISHUB-638: go fmt import
Nov 5, 2018
78956de
IRISHUB-638: Add fee to command line config
Nov 5, 2018
262dfe8
replace gaia with iris
Nov 5, 2018
d6f218e
Replace gaia with iris
Nov 5, 2018
865b992
Merge pull request #509 from HaoyangLiu/feature/deps
wukongcheng Nov 5, 2018
0d89dad
Merge with feature/deps
Nov 5, 2018
75c42af
Fix bugs in creating testnet
Nov 5, 2018
f338493
testnet use steak as staking token
Nov 5, 2018
e83cb38
Merge pull request #504 from HaoyangLiu/haoyang/deps
wukongcheng Nov 5, 2018
8eb371c
IRISHUB-622: ignore upgrade & stake test cases and open the cli test
wukongcheng Nov 5, 2018
a8f167e
Merge branch 'feature/deps' of https://github.com/irisnet/irishub int…
wukongcheng Nov 5, 2018
b8afed4
Merge pull request #511 from wukongcheng/silei/deps
wukongcheng Nov 5, 2018
ee3a944
Improve the getNativeFeeToken
MrXJC Nov 5, 2018
ac8c086
Merge pull request #512 from MrXJC/jiacheng/deps2
wukongcheng Nov 5, 2018
997bac4
IRISHUB-650: update software upgrade examples
wukongcheng Nov 5, 2018
b095110
Merge branch 'feature/deps' of https://github.com/irisnet/irishub int…
wukongcheng Nov 5, 2018
c17dd4d
IRISHUB-587: Add command line test for distribution
Nov 5, 2018
43722fc
Improve message for query withdraw address
Nov 5, 2018
add8052
Merge pull request #513 from HaoyangLiu/haoyang/cli-test-fix
wukongcheng Nov 5, 2018
17a74a6
add ip flag to gentx
MrXJC Nov 5, 2018
1c21fdd
update the Genesis-Generation-Process.md
MrXJC Nov 5, 2018
3d4f886
Update Genesis-Generation-Process.md
MrXJC Nov 5, 2018
abfc17c
Update Genesis-Generation-Process.md
MrXJC Nov 5, 2018
cd73a9c
IRISHUB-618: fix the 'iriscli upgrade info' cli cmd
wukongcheng Nov 5, 2018
b6fae17
Merge pull request #514 from MrXJC/jiacheng/deps2
wukongcheng Nov 5, 2018
1c64f13
Refactor fee refund
Nov 5, 2018
e395023
Fix a bug in setting gas in sending transaction
Nov 5, 2018
e70dff7
Merge branch 'feature/deps' of https://github.com/irisnet/irishub int…
Nov 5, 2018
ff197ea
Merge pull request #515 from HaoyangLiu/haoyang/refactor-fee-refund
wukongcheng Nov 5, 2018
0ccad1a
IRISHUB-618:fix bug of upgrade tally
wukongcheng Nov 5, 2018
5c00ce0
Merge branch 'feature/deps' of https://github.com/irisnet/irishub int…
wukongcheng Nov 5, 2018
c31f12c
Merge pull request #510 from irisnet/feature/deps
wukongcheng Nov 5, 2018
b3f7583
IRISHUB-618:fix upgrade cli test without replay
wukongcheng Nov 5, 2018
30d1600
Merge pull request #516 from wukongcheng/silei/deps
wukongcheng Nov 6, 2018
2a7dca9
fix the gov_params valid
MrXJC Nov 6, 2018
49a4dcd
Merge branch 'feature/deps' of https://github.com/irisnet/irishub int…
MrXJC Nov 6, 2018
2bfe7a1
Merge pull request #517 from MrXJC/jiacheng/deps2
wukongcheng Nov 6, 2018
0faf9b7
Merge pull request #518 from irisnet/feature/deps
wukongcheng Nov 6, 2018
6a49355
update the stake rest api
MrXJC Nov 6, 2018
cd7ba14
Fix distribution cli test
Nov 6, 2018
6679d58
Merge pull request #519 from HaoyangLiu/feature/deps
wukongcheng Nov 6, 2018
ff18259
skip irismon & upgrade test
wukongcheng Nov 6, 2018
5e44d04
Merge branch 'feature/deps' of https://github.com/irisnet/irishub int…
wukongcheng Nov 6, 2018
f949ac7
IRISHUB-575: bug fix and update example
chengwenxi Oct 30, 2018
d875679
IRISHUB-595: define refactor and init binding
chengwenxi Oct 31, 2018
c12652e
IRISHUB-595: define modify name to service-name
chengwenxi Oct 31, 2018
e31d50e
IRISHUB-595: add service binding handler and command client
chengwenxi Oct 31, 2018
340efda
IRISHUB-595: add bind update and refund deposit
chengwenxi Nov 1, 2018
f9475e0
IRISHUB-595: add tags params
chengwenxi Nov 1, 2018
cb65964
Merge pull request #520 from wukongcheng/silei/deps
wukongcheng Nov 6, 2018
f7fa802
IRISHUB-595: add cli test for service bind and update-binding
chengwenxi Nov 1, 2018
e448e7a
IRISHUB-595: fix msg check and example app
chengwenxi Nov 2, 2018
7ee168e
Merge pull request #521 from irisnet/feature/deps
wukongcheng Nov 6, 2018
dcf6ef3
IRISHUB-595: fix cli test
chengwenxi Nov 2, 2018
7f73c6c
IRISHUB-595: code check
chengwenxi Nov 2, 2018
a514771
IRISHUB-595: fix user doc
chengwenxi Nov 4, 2018
95188da
Modify the StakeQueryResponses to adapt toirishub
MrXJC Nov 6, 2018
40660dd
Fix slashing rest, add distribution rest and improve swagger docs
Nov 6, 2018
c3d15fb
IRISHUB-595: fix user doc
chengwenxi Nov 5, 2018
443162d
Update README.md
shirleypyj Nov 5, 2018
8de9aeb
Update README.md
shirleypyj Nov 5, 2018
354ad98
IRISHUB-576,IRISHUB-610: check duplicate messages and methods
chengwenxi Nov 5, 2018
9d188c0
IRISHUB-618: fix bug of the example and upgrade works now
wukongcheng Nov 6, 2018
7b3e48a
Calibrate swagger docs for gov
Nov 6, 2018
6606cab
Merge pull request #524 from wukongcheng/silei/deps
wukongcheng Nov 6, 2018
06bb80a
Merge pull request #525 from irisnet/feature/deps
wukongcheng Nov 6, 2018
e882a66
finish the stake sendtx rest api
MrXJC Nov 6, 2018
4d3250e
add swagger docs for distribution
Nov 6, 2018
704cbe0
fix error in simulation/bank and simulation/stake
Nov 6, 2018
210e0a0
Calibrate swagger docs
Nov 6, 2018
5b393a4
Move sendtx from tendermint to bank
Nov 6, 2018
0bd383e
IRISHUB-595: fix iservice for sdk0.25
chengwenxi Nov 6, 2018
e0b861c
Improve description about ICS20 restapis
Nov 7, 2018
9341a9f
Remove duplicated code
Nov 7, 2018
5669bc7
Add missed post body validation
Nov 7, 2018
1054e48
fix the commit
MrXJC Nov 7, 2018
287ca8a
Merge pull request #526 from HaoyangLiu/feature/deps
wukongcheng Nov 7, 2018
67e7e05
Merge branch 'feature/deps' of https://github.com/irisnet/irishub int…
MrXJC Nov 7, 2018
e58c6a5
fix error in simulation/slashing and simulation/gov
Nov 7, 2018
7ddc0de
Merge branch 'feature/deps' of https://github.com/irisnet/irishub int…
Nov 7, 2018
9f7d5ae
Add missing query parameter: async
Nov 7, 2018
58c6cf0
rename gaiaSimulation to irisSimulation
Nov 7, 2018
788135d
Merge pull request #3 from HaoyangLiu/feature/deps
MrXJC Nov 7, 2018
4bff5a5
Merge pull request #527 from irisnet/feature/docs
wukongcheng Nov 7, 2018
c7a3b39
Merge pull request #528 from irisnet/develop
wukongcheng Nov 7, 2018
616cab8
Finish the swagger-ui of stake
MrXJC Nov 7, 2018
c86023d
Merge branch 'jiacheng/deps2' of https://github.com/MrXJC/irishub int…
MrXJC Nov 7, 2018
8dbc5d2
IRISHUB-595: add iservice params
chengwenxi Nov 7, 2018
d80a0b1
Merge pull request #523 from MrXJC/jiacheng/deps2
wukongcheng Nov 7, 2018
402c703
Merge pull request #530 from irisnet/feature/deps
wukongcheng Nov 7, 2018
0af8896
Merge branch 'feature/deps' of https://github.com/irisnet/irishub int…
Nov 7, 2018
ba27a1f
make simulation_test run
Nov 7, 2018
50cf654
fix app/sim_test error
Nov 7, 2018
dc9048c
IRISHUB-636: fix simulation error
Nov 7, 2018
81f42dd
IRISHUB-636: add benchmem command
Nov 7, 2018
6ea0617
IRISHUB-636: add benchmem command
Nov 7, 2018
bea4607
IRISHUB-595: fix service client test
chengwenxi Nov 7, 2018
185a13c
Merge irisnet branch 'develop' into chengwenxi branch 'develop'
chengwenxi Nov 7, 2018
15154c9
IRISHUB-595: fix iservice keeper test and example app
chengwenxi Nov 7, 2018
6cd6b08
IRISHUB-636: rename benchmarkFullGaia*** to benchmarkFullIris***
Nov 8, 2018
b175260
Merge pull request #531 from kaifei-bianjie/feature/deps
wukongcheng Nov 8, 2018
40d825c
IRISHUB-637: fix monitor error
Nov 8, 2018
c900d88
Merge branch 'feature/deps' of https://github.com/irisnet/irishub int…
Nov 8, 2018
eb5a53c
IRISHUB-595: fix user guide
chengwenxi Nov 8, 2018
b6b8ac6
fix makefile error cause by 4 spaces
Nov 8, 2018
18a27c2
IRISHUB-595: Use Gov subspace for iservice params
chengwenxi Nov 9, 2018
dfea3b7
IRISHUB-554: fix msg verify error
chengwenxi Nov 9, 2018
27486d3
firstly try to update cosmos-v0.26.0
MrXJC Nov 9, 2018
06345ce
Merge pull request #543 from MrXJC/jiacheng/deps2
Nov 9, 2018
8839772
update monitor document
Nov 9, 2018
ffaa475
Merge pull request #536 from kaifei-bianjie/feature/deps
Nov 9, 2018
42319e1
Merge pull request #544 from irisnet/feature/deps
Nov 9, 2018
6a9110c
Merge irisnet branch 'develop' into chengwenxi branch 'develop'
chengwenxi Nov 9, 2018
e3952d3
Merge pull request #532 from chengwenxi/develop
Nov 9, 2018
58f6e88
fix build
chengwenxi Nov 9, 2018
104adb7
Merge pull request #545 from chengwenxi/develop
Nov 9, 2018
2032d75
fix sim mock app
chengwenxi Nov 9, 2018
4978db8
fix gov & stake sim test
chengwenxi Nov 9, 2018
d09519c
Merge pull request #547 from chengwenxi/develop
Nov 9, 2018
df1370b
Merge branch 'feature/deps-0.26.0' into develop
Nov 9, 2018
dc942a3
Merge pull request #546 from irisnet/develop
Nov 9, 2018
24af636
Finish app.go modules/gov modules/upgrade
MrXJC Nov 9, 2018
3eb8de0
Merge branch 'feature/deps-0.26.0' of https://github.com/irisnet/iris…
MrXJC Nov 9, 2018
896cbf5
Merge pull request #549 from MrXJC/jiacheng/deps2
Nov 9, 2018
3bf066e
finish gov cli
MrXJC Nov 9, 2018
45d1333
IRISHUB-687: iservice to service
chengwenxi Nov 9, 2018
76b9b1a
finish gov rest
MrXJC Nov 9, 2018
6958181
fix iservice for v0.26
chengwenxi Nov 9, 2018
6bae59d
Merge pull request #550 from chengwenxi/feature/deps-0.26.0
Nov 9, 2018
0a3f4c9
Pass compiler
Nov 9, 2018
efb3916
runable iris prototype
Nov 9, 2018
37423c9
Fix default genesis state for stake and slashing
Nov 9, 2018
e26f565
Update cosmos-sdk dependency
Nov 9, 2018
2e01b67
Merge pull request #552 from HaoyangLiu/feature/deps-0.26.0
Nov 9, 2018
09b8663
fix stake cli
MrXJC Nov 9, 2018
94c6dc9
Add prefix define for all binary
Nov 9, 2018
13ceb5b
Merge pull request #554 from HaoyangLiu/feature/deps-0.26.0
Nov 9, 2018
0f671b9
finish stake.go slashing.go distribution.go
MrXJC Nov 9, 2018
39e368b
Merge branch 'feature/deps-0.26.0' of https://github.com/irisnet/iris…
MrXJC Nov 9, 2018
4ae58bc
fix the upgrade and iservice cli
MrXJC Nov 9, 2018
cecfa18
Merge pull request #555 from MrXJC/jiacheng/deps2
Nov 9, 2018
eb05a9c
Fix all rest api
MrXJC Nov 9, 2018
3354164
Merge pull request #557 from MrXJC/jiacheng/deps2
Nov 9, 2018
a63890d
IRISHUB-693: Add key subcommand mnemonic and new
MrXJC Nov 9, 2018
6b364b4
IRISHUB-699: fix binding update check
chengwenxi Nov 9, 2018
8bd01e8
Merge pull request #561 from irisnet/feature/deps-0.26.0
Nov 11, 2018
b032474
IRISHUB-699: refactor service
chengwenxi Nov 12, 2018
8d511b4
Merge pull request #559 from MrXJC/jiacheng/deps2
Nov 12, 2018
2c74a3a
IRISHUB-702: fix testnet issue and refactor mnemonic.go and new.go
Nov 12, 2018
4b2a6e4
Change common.go to utils.go
Nov 12, 2018
9a9bc53
Merge pull request #572 from HaoyangLiu/feature/deps-0.26.0
Nov 12, 2018
f084186
IRISHUB-699: update user guide
chengwenxi Nov 12, 2018
5c27c0f
Refactor keys modules, add seed and recover rest api, keep consistent…
Nov 12, 2018
b094543
Refactor tendermint api, remove hard code http error code
Nov 12, 2018
9f45023
IRISHUB-699: Add service name check
chengwenxi Nov 12, 2018
e8b39ec
Refactor keys api and normalize rest response
Nov 12, 2018
fb3dd77
Add chain-id option for testnet
Nov 12, 2018
202ce1d
IRISHUB-688: fix simulation breaks when deps sdk v0.26.0
Nov 12, 2018
acdbca7
Merge pull request #574 from HaoyangLiu/feature/deps-0.26.0
Nov 12, 2018
be7e511
Merge pull request #575 from kaifei-bianjie/feature/deps-0.26.0
Nov 12, 2018
e9033a1
IRISHUB-689: fix monitor breaks when deps sdk v0.26.0
Nov 12, 2018
c9d97f2
IRISHUB-699: code clean
chengwenxi Nov 12, 2018
fd7fcb5
IRISHUB-689: build and install irismon
Nov 12, 2018
c3ac56f
fix the cli_test except for distribution and upgrade
MrXJC Nov 12, 2018
69643a3
Merge branch 'feature/deps-0.26.0' of https://github.com/irisnet/iris…
MrXJC Nov 12, 2018
4e3c9cc
Merge pull request #576 from kaifei-bianjie/feature/deps-0.26.0
Nov 13, 2018
6131f23
Merge pull request #578 from MrXJC/jiacheng/deps2
Nov 13, 2018
4f8059f
Fix distribution cli test
Nov 13, 2018
7542c1f
Fix the upgrade examples
MrXJC Nov 13, 2018
c5a25ad
IRISHUB-699: fix enable err msg
chengwenxi Nov 13, 2018
115a104
Merge pull request #579 from HaoyangLiu/feature/deps-0.26.0
Nov 13, 2018
f5c2843
Merge pull request #580 from irisnet/feature/deps-0.26.0
Nov 13, 2018
6bc1db7
IRISHUB-699: fix command service bind example
chengwenxi Nov 13, 2018
b3413c4
Add testnet_start and testnet_stop in makefile to help start multi-no…
Nov 13, 2018
1ba4301
Merge pull request #581 from HaoyangLiu/feature/deps-0.26.0
Nov 13, 2018
64dd0a6
Merge pull request #582 from irisnet/feature/deps-0.26.0
Nov 13, 2018
4f2c7d6
fix the upgrade cli_test
MrXJC Nov 13, 2018
911a933
Merge pull request #583 from MrXJC/jiacheng/deps2
Nov 13, 2018
99bb5b1
Merge pull request #584 from irisnet/feature/deps-0.26.0
Nov 13, 2018
c20d1c9
Set the maximum of the participation
MrXJC Nov 13, 2018
23728bc
update sdk to v0.26
chengwenxi Nov 13, 2018
9ca3d68
Fix bug in mac OS
Nov 13, 2018
047bc19
Merge pull request #586 from HaoyangLiu/feature/deps-0.26.0
Nov 13, 2018
170aeda
merge with branch `develop`
chengwenxi Nov 13, 2018
f89cf60
Merge pull request #587 from chengwenxi/feature/iservice
Nov 13, 2018
43af10f
make the participation can be changed
MrXJC Nov 13, 2018
e8a7f58
go fmt
MrXJC Nov 13, 2018
69ce8f5
Merge pull request #585 from MrXJC/jiacheng/deps2
Nov 13, 2018
2c9b040
Add Faucet account
Nov 13, 2018
a23349b
Merge pull request #590 from HaoyangLiu/feature/deps-0.26.0
Nov 13, 2018
e83dff5
Merge pull request #591 from irisnet/feature/deps-0.26.0
Nov 13, 2018
9d7788b
fix the upgrade unit_test
MrXJC Nov 13, 2018
ad55c23
Merge pull request #592 from MrXJC/jiacheng/deps2
Nov 13, 2018
97c9dae
IRISHUB-654:Change proposalID to proposal-id
MrXJC Nov 13, 2018
3bb5c28
Fix replay issue
Nov 13, 2018
6722440
Add replay log
Nov 14, 2018
80946d1
move irisapp.replay to Replay
MrXJC Nov 14, 2018
d36178e
Merge pull request #10 from MrXJC/jiacheng/develop
Nov 14, 2018
8321fe9
Go fmt file
Nov 14, 2018
eb92b33
Merge pull request #596 from HaoyangLiu/develop
Nov 14, 2018
ac8d239
Merge pull request #598 from MrXJC/jiacheng/deps2
Nov 14, 2018
2103293
IRISHUB-713: fix irisdebug for sdk0.26
chengwenxi Nov 14, 2018
326f26b
Merge pull request #600 from chengwenxi/develop
Nov 14, 2018
9219ff3
IRISHUB-697: return error when coin amount is invalid
Nov 14, 2018
ef4a5e5
Merge pull request #601 from HaoyangLiu/develop
Nov 14, 2018
ca8e408
IRISHUB-696: fix bugs in variable to string
Nov 14, 2018
cdd4465
Remove json in reponse http
Nov 14, 2018
69aa314
Change reponse to json pattern
Nov 14, 2018
fd8bda3
Change statue to syncing
Nov 14, 2018
3f5e916
Merge pull request #602 from HaoyangLiu/develop
Nov 14, 2018
f0af61f
move irisapp.replay to Replay
MrXJC Nov 14, 2018
5920db4
Merge branch 'develop' of https://github.com/irisnet/irishub into jia…
MrXJC Nov 14, 2018
887c8a1
Merge pull request #604 from MrXJC/jiacheng/develop
Nov 14, 2018
cfa71df
IRISHUB-601: print new line
Nov 14, 2018
a439330
IRISHUB-605: add example command
Nov 14, 2018
991cb04
correct spell error: depositer to depositor
Nov 14, 2018
8ff75d6
Merge pull request #606 from HaoyangLiu/develop
Nov 14, 2018
dfa4932
Separate the upgrade cli_test from cli_test
MrXJC Nov 15, 2018
ae8129e
Merge branch 'develop' of https://github.com/irisnet/irishub into jia…
MrXJC Nov 15, 2018
2f270c3
Merge pull request #610 from MrXJC/jiacheng/develop
Nov 15, 2018
0a02fcc
Fix missing clictx init for request
Nov 15, 2018
6ee29bb
Merge pull request #611 from HaoyangLiu/develop
Nov 15, 2018
cea77e6
fix service param write in genesis.json
chengwenxi Nov 15, 2018
e556cfe
fix swagger
chengwenxi Nov 15, 2018
e547ec0
Merge pull request #613 from chengwenxi/develop
Nov 15, 2018
881b04a
Fix the participation bug
MrXJC Nov 15, 2018
e72cff7
Merge pull request #618 from MrXJC/jiacheng/develop
Nov 15, 2018
eec8006
Add miss api broadcast and add page&size for tx search
Nov 15, 2018
ff13a21
Merge pull request #619 from HaoyangLiu/develop
Nov 15, 2018
d148031
Fix the system voting power bug
MrXJC Nov 16, 2018
fa66fd1
Merge branch 'develop' of https://github.com/irisnet/irishub into jia…
MrXJC Nov 16, 2018
c08b23a
Fix the tx_search bug
MrXJC Nov 16, 2018
f3cd48a
Fix the bank lcd bug
MrXJC Nov 16, 2018
be88800
Merge pull request #622 from MrXJC/jiacheng/develop
Nov 16, 2018
f5644bf
Fix bug in swagger.yaml, response schema doesn't match
Nov 16, 2018
ac85574
Fix bug in query gov params
Nov 16, 2018
e67fb31
add tag verification for tx search
Nov 16, 2018
0076674
delete the ibc module
MrXJC Nov 16, 2018
8b1f28b
fix the ibc.mapper
MrXJC Nov 16, 2018
1f54349
Merge pull request #629 from MrXJC/jiacheng/develop
Nov 16, 2018
4569500
Merge pull request #626 from HaoyangLiu/develop
Nov 16, 2018
311a960
Add new password length checking
Nov 16, 2018
637267b
Merge pull request #630 from HaoyangLiu/develop
Nov 16, 2018
fab31a2
Merge with develop
Nov 17, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ RUN cd $REPO_PATH && \
make build_linux && \
make install && \
make install_examples && \
make test_cli && \
make test_lcd && \
make test_sim
make test_cli
# make test_lcd && \
# make test_sim

FROM alpine:3.7

Expand Down
Loading