Merge PR cosmos#1942: Gblue1223/basecoin fix

diop · Aug 8, 2018 · 7ba479e · 7ba479e
1 parent 1da1115
commit 7ba479e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/PENDING.md b/PENDING.md
@@ -85,3 +85,4 @@ 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
+* [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)
diff --git a/examples/basecoin/app/app.go b/examples/basecoin/app/app.go
@@ -63,7 +63,9 @@ func NewBasecoinApp(logger log.Logger, db dbm.DB, baseAppOptions ...func(*bam.Ba
 	app.accountMapper = auth.NewAccountMapper(
 		cdc,
 		app.keyAccount,        // target store
-		auth.ProtoBaseAccount, // prototype
+		func () auth.Account {
+			return &types.AppAccount{}
+		},
 	)
 	app.coinKeeper = bank.NewKeeper(app.accountMapper)
 	app.ibcMapper = ibc.NewMapper(app.cdc, app.keyIBC, app.RegisterCodespace(ibc.DefaultCodespace))
@@ -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()