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

Updated to latest develop #1133

Merged
merged 53 commits into from
Jun 4, 2018
Merged

Updated to latest develop #1133

merged 53 commits into from
Jun 4, 2018

Conversation

adrianbrink
Copy link
Contributor

Updated to latest develop

ValarDragon and others added 30 commits May 28, 2018 11:26
@ValarDragon
Change to go-wire UnmarshalJSON for bank transactions
2d87563 
The bank module now uses it's own codec to encode and decode Bank Msgs
into JSON.
@ValarDragon
Switch the default modules to use wire.codec's MarshalJSON instead of…
e9545d6 
… json.Marshal
@ValarDragon
Register crypto on amino codecs, update changelog
0371109
@cwgoes
Match UnmarshalBinaryBare/MarshalBinaryBare
27ae1a1
@rigelrozanski
Merge pull request #1100 from cosmos/cwgoes/lcd-test-fix
3550033 
Match UnmarshalBinaryBare/MarshalBinaryBare
@cwgoes
Merge pull request #1072 from ValarDragon/dev/tx_encoding
12a7c03 
Change to go-wire UnmarshalJSON for bank transactions
@jaekwon @rigelrozanski
Make Execute and GoExecute log better
8715748
@rigelrozanski
cech32 fixes for TestGaiaCLISend
94e78e0
@rigelrozanski
working through cli
afc2bbf
@rigelrozanski
get rid of candidacy references
952aedc
@rigelrozanski
key utils output with cdc
17a861d
@rigelrozanski
cli test bugs
1f1097c
@rigelrozanski
add test_cli to ci
0b6aa3c
@rigelrozanski
fix tests/process.go lint
6f7cabf
@rigelrozanski
update changelog
4150fe5
@rigelrozanski
...
89df36e
@rigelrozanski
cwgoes comments
a4e1e49
@rigelrozanski
better tooling for cli, couple lsd fixes
5515b60
@rigelrozanski
rm debug output
ba44bf7
@cwgoes
Fix minor typo
7de7461
@cwgoes
Merge pull request #1101 from cosmos/rigel/gobash2
9f8c5ad 
fix go-bash, add to ci
@cwgoes
gaiacli unrevoke
cde91bd
@cwgoes
Add 'gaiacli signing_info'
9fa4a55
@cwgoes
Use valpk.Address()
c7a9b53
@cwgoes
Fix command documentation
7ff6eeb
@UnitylChaos
Refactored gaiacli and gaiad commands into subcommands
083ca82
@UnitylChaos
Added comments to newly exported functions
a032386
@UnitylChaos
small fixes
744f785
@UnitylChaos
renamed state subcommand to tendermint
aa41cef
@UnitylChaos
changed commands in cli_test to match refactor
a03638d
rigelrozanski and others added 21 commits June 1, 2018 01:35
@rigelrozanski
unsafe_reset_all back to root
34686e8
@rigelrozanski
fix cli test
823814d
@rigelrozanski
...
e1d9f00
@rigelrozanski
Merge pull request #1073 from cosmos/jeremiah/subcommands
5e39d05 
Refactored gaiacli and gaiad commands into subcommands
@zmanian
Switch from bech32cosmos to bech32
ce850dc
@ebuchman
Merge pull request #1109 from zmanian/bech32cosmostobech32
19bef17 
Switch from bech32cosmos to bech32
@cwgoes
Merge pull request #1105 from cosmos/cwgoes/slashing-v1.1
537ce91 
Fix minor slashing issues
@UnitylChaos
fix for slashing with bech32 change
ad48f1b
@rigelrozanski
Merge pull request #1110 from cosmos/jlandrews/bech32fix
7faa452 
fix for slashing with bech32 change
@rigelrozanski
revised use of EndBlock/BeginBlock, basecoin updated for staking/slas…
0ef3259 
…hing
@cwgoes
Remove commented-out testcode
f2cf0be
@cwgoes
Merge pull request #1113 from cosmos/rigel/end_blockers
8240e9b 
Revised use of EndBlock/BeginBlock + Basecoin Update
@cwgoes
Swap x/slashing to sdk.ValidatorSet
024eaf6
@rigelrozanski
Merge pull request #1116 from cosmos/cwgoes/slashing-staking-separation
af1ab47 
Swap x/slashing to sdk.ValidatorSet
Correct graphviz command in Makefile
17ab868
@jaekwon
Run CLI tests
5d2e7e9
@jaekwon
Revert "Run CLI tests"
b0c58c0 
This reverts commit 5d2e7e9.
@cwgoes
Merge pull request #1121 from cosmos/adrian/graphviz
d55c86b 
Correct graphviz command in Makefile
@cwgoes
Update PR checkboxes
b9888d6
@rigelrozanski
Merge pull request #1132 from cosmos/cwgoes/squash-merge-required
1a01394 
Update PR checkboxes
Merge remote-tracking branch 'origin/develop' into adrian/ledger
8beed8e
@adrianbrink adrianbrink requested a review from cwgoes June 4, 2018 19:50
@adrianbrink adrianbrink requested a review from ebuchman as a code owner June 4, 2018 19:50
@codecov
Copy link

codecov bot commented Jun 4, 2018 •
edited
Loading

Codecov Report

❗ No coverage uploaded for pull request base (cwgoes/ledger-integration@1ff1aa5). Click here to learn what that means.
The diff coverage is 48.36%.

@@                     Coverage Diff                     @@
##             cwgoes/ledger-integration   #1133   +/-   ##
===========================================================
  Coverage                             ?   60.4%           
===========================================================
  Files                                ?      89           
  Lines                                ?    4372           
  Branches                             ?       0           
===========================================================
  Hits                                 ?    2641           
  Misses                               ?    1561           
  Partials                             ?     170

@cwgoes
Copy link
Contributor

cwgoes commented Jun 4, 2018

Looks fine - were there any merge conflicts?

@adrianbrink
Copy link
Contributor Author

There were a couple with Gopk.toml and Gopk.lock.

@cwgoes
Copy link
Contributor

cwgoes commented Jun 4, 2018

There were a couple with Gopk.toml and Gopk.lock.

We should release a tmlibs version before merging the Ledger PR itself, but this is fine for now.

@cwgoes cwgoes merged commit c0ddda5 into cwgoes/ledger-integration Jun 4, 2018
@cwgoes cwgoes deleted the adrian/ledger branch June 4, 2018 22:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@cwgoes cwgoes Awaiting requested review from cwgoes

@ebuchman ebuchman Awaiting requested review from ebuchman

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@adrianbrink @cwgoes @ValarDragon @rigelrozanski @jaekwon @UnitylChaos @zmanian @ebuchman