Store supply as Int bytes rather than string bytes

x/bank/keeper/keeper.go

@@ -184,8 +184,9 @@ func (k BaseKeeper) GetSupply(ctx sdk.Context, denom string) sdk.Coin {
 		}
 	}
 
-	amount, ok := sdk.NewIntFromString(string(bz))
-	if !ok {
+	var amount sdk.Int
+	err := amount.Unmarshal(bz)
+	if err != nil {
 		panic("unexpected supply")
 	}
 
@@ -413,7 +414,11 @@ func (k BaseKeeper) setSupply(ctx sdk.Context, coin sdk.Coin) {
 	store := ctx.KVStore(k.storeKey)
 	supplyStore := prefix.NewStore(store, types.SupplyKey)
 
-	supplyStore.Set([]byte(coin.GetDenom()), []byte(coin.Amount.String()))
+	intBytes, err := coin.Amount.Marshal()
+	if err != nil {
+		panic("unexpected supply amount")
+	}
+	supplyStore.Set([]byte(coin.GetDenom()), intBytes)
 }
 
 func (k BaseKeeper) trackDelegation(ctx sdk.Context, addr sdk.AccAddress, balance, amt sdk.Coins) error {
@@ -454,8 +459,9 @@ func (k BaseViewKeeper) IterateTotalSupply(ctx sdk.Context, cb func(sdk.Coin) bo
 	defer iterator.Close()
 
 	for ; iterator.Valid(); iterator.Next() {
-		amount, ok := sdk.NewIntFromString(string(iterator.Value()))
-		if !ok {
+		var amount sdk.Int
+		err := amount.Unmarshal(iterator.Value())
+		if err != nil {
 			panic("unexpected supply")
 		}
 

x/bank/legacy/v043/store.go

@@ -35,7 +35,7 @@ func migrateSupply(store sdk.KVStore, cdc codec.BinaryMarshaler) error {
 	oldSupply := oldSupplyI.(*types.Supply)
 	for i := range oldSupply.Total {
 		coin := oldSupply.Total[i]
-		coinBz, err := cdc.MarshalBinaryBare(&coin)
+		coinBz, err := coin.Amount.Marshal()
 		if err != nil {
 			return err
 		}

x/bank/legacy/v043/store_test.go

@@ -36,12 +36,26 @@ func TestSupplyMigration(t *testing.T) {
 	require.NoError(t, err)
 
 	// New supply is indexed by denom.
-	var newFooCoin, newBarCoin sdk.Coin
 	supplyStore := prefix.NewStore(store, types.SupplyKey)
-	encCfg.Marshaler.MustUnmarshalBinaryBare(supplyStore.Get([]byte("foo")), &newFooCoin)
-	encCfg.Marshaler.MustUnmarshalBinaryBare(supplyStore.Get([]byte("bar")), &newBarCoin)
+	bz := supplyStore.Get([]byte("foo"))
+	var amount sdk.Int
+	err = amount.Unmarshal(bz)
+	require.NoError(t, err)
 
+	newFooCoin := sdk.Coin{
+		Denom:  "foo",
+		Amount: amount,
+	}
 	require.Equal(t, oldFooCoin, newFooCoin)
+
+	bz = supplyStore.Get([]byte("bar"))
+	err = amount.Unmarshal(bz)
+	require.NoError(t, err)
+
+	newBarCoin := sdk.Coin{
+		Denom:  "bar",
+		Amount: amount,
+	}
 	require.Equal(t, oldBarCoin, newBarCoin)
 }