Skip to content

Commit

Permalink
Port changes from #1919
Browse files Browse the repository at this point in the history
  • Loading branch information
cwgoes committed Aug 8, 2018
1 parent 1da1115 commit 7eaac45
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 9 deletions.
9 changes: 4 additions & 5 deletions PENDING.md
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,7 @@ BUG FIXES
structure `TxContext` in `x/auth/client/context`
* Cleaned up documentation and API of what used to be `CoreContext`
* Implemented `KeyType` enum for key info

BUG FIXES
* \#1666 Add intra-tx counter to the genesis validators
* [tests] \#1551: Fixed invalid LCD test JSON payload in `doIBCTransfer`
* \#1787 Fixed bug where Tally fails due to revoked/unbonding validator
* \#1666 Add intra-tx counter to the genesis validators
* [tests] \#1551: Fixed invalid LCD test JSON payload in `doIBCTransfer`
* \#1787 Fixed bug where Tally fails due to revoked/unbonding validator
* [basecoin] Fixes coin transaction failure and account query [discussion](https://forum.cosmos.network/t/unmarshalbinarybare-expected-to-read-prefix-bytes-75fbfab8-since-it-is-registered-concrete-but-got-0a141dfa/664/6)
10 changes: 6 additions & 4 deletions examples/basecoin/app/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,10 @@ func NewBasecoinApp(logger log.Logger, db dbm.DB, baseAppOptions ...func(*bam.Ba
// define and attach the mappers and keepers
app.accountMapper = auth.NewAccountMapper(
cdc,
app.keyAccount, // target store
auth.ProtoBaseAccount, // prototype
app.keyAccount, // target store
func() auth.Account {
return &types.AppAccount{}
},
)
app.coinKeeper = bank.NewKeeper(app.accountMapper)
app.ibcMapper = ibc.NewMapper(app.cdc, app.keyIBC, app.RegisterCodespace(ibc.DefaultCodespace))
Expand Down Expand Up @@ -100,9 +102,9 @@ func MakeCodec() *wire.Codec {
sdk.RegisterWire(cdc)
bank.RegisterWire(cdc)
ibc.RegisterWire(cdc)
auth.RegisterWire(cdc)

// register custom types
cdc.RegisterInterface((*auth.Account)(nil), nil)
// register custom type
cdc.RegisterConcrete(&types.AppAccount{}, "basecoin/Account", nil)

cdc.Seal()
Expand Down

0 comments on commit 7eaac45

Please sign in to comment.