fix(vbank): be sure to persist nonce state in the KVStore

Author: michaelfig

golang/cosmos/proto/agoric/vbank/genesis.proto

@@ -11,4 +11,7 @@ message GenesisState {
 
     // parms defines all the parameters of the module.
     Params params = 1 [(gogoproto.nullable) = false];
+
+    // state is the current operation state.
+    State state = 2 [(gogoproto.nullable) = false];
 }

golang/cosmos/proto/agoric/vbank/vbank.proto

@@ -22,10 +22,14 @@ message State {
     // NOTE: Tracking manually since there is no bank call for getting a
     // module account balance by name.
     repeated cosmos.base.v1beta1.Coin rewardPool = 1
-        [(gogoproto.nullable) = false, (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins"];
+        [(gogoproto.nullable) = false, (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins"
+        ];
 
     // rewardRate is the amount of reward, if available, to send to the
     // fee collector module on every block.
     repeated cosmos.base.v1beta1.Coin rewardRate = 2
         [(gogoproto.nullable) = false, (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins"];
+        
+    // lastNonce is a sequence number for communicating with the VM.
+    uint64 lastNonce = 3;
 }

golang/cosmos/x/vbank/genesis.go

@@ -27,11 +27,14 @@ func DefaultGenesisState() *types.GenesisState {
 }
 
 func InitGenesis(ctx sdk.Context, keeper Keeper, data *types.GenesisState) []abci.ValidatorUpdate {
-	keeper.SetGenesis(ctx, *data)
+	keeper.SetParams(ctx, data.GetParams())
+	keeper.SetState(ctx, data.GetState())
 	return []abci.ValidatorUpdate{}
 }
 
 func ExportGenesis(ctx sdk.Context, k Keeper) *types.GenesisState {
-	gs := k.GetGenesis(ctx)
+	var gs types.GenesisState
+	gs.Params = k.GetParams(ctx)
+	gs.State = k.GetState(ctx)
 	return &gs
 }

golang/cosmos/x/vbank/keeper/keeper.go

@@ -7,7 +7,6 @@ import (
 	"github.com/Agoric/agoric-sdk/golang/cosmos/x/vbank/types"
 )
 
-const genesisKey string = "genesis"
 const paramsKey string = "params"
 const stateKey string = "state"
 
@@ -39,23 +38,6 @@ func NewKeeper(
 	}
 }
 
-func (k Keeper) GetGenesis(ctx sdk.Context) types.GenesisState {
-	store := ctx.KVStore(k.storeKey)
-	bz := store.Get([]byte(genesisKey))
-	var gs types.GenesisState
-	k.cdc.MustUnmarshalLengthPrefixed(bz, &gs)
-	return gs
-}
-
-func (k Keeper) SetGenesis(ctx sdk.Context, data types.GenesisState) {
-	store := ctx.KVStore(k.storeKey)
-	store.Set([]byte(genesisKey), k.cdc.MustMarshalLengthPrefixed(&data))
-	params := types.Params{
-		FeeEpochDurationBlocks: data.GetParams().FeeEpochDurationBlocks,
-	}
-	k.SetParams(ctx, params)
-}
-
 func (k Keeper) GetBalance(ctx sdk.Context, addr sdk.AccAddress, denom string) sdk.Coin {
 	return k.bankKeeper.GetBalance(ctx, addr, denom)
 }
@@ -113,3 +95,10 @@ func (k Keeper) SetState(ctx sdk.Context, state types.State) {
 	bz := k.cdc.MustMarshal(&state)
 	store.Set([]byte(stateKey), bz)
 }
+
+func (k Keeper) GetNextNonce(ctx sdk.Context) uint64 {
+	state := k.GetState(ctx)
+	state.LastNonce = state.GetLastNonce() + 1
+	k.SetState(ctx, state)
+	return state.LastNonce
+}

golang/cosmos/x/vbank/module.go

@@ -183,7 +183,7 @@ func (am AppModule) EndBlock(ctx sdk.Context, req abci.RequestEndBlock) []abci.V
 	}
 
 	// Dump all the addressToBalances entries to SwingSet.
-	bz, err := marshalBalanceUpdate(addressToBalance)
+	bz, err := marshalBalanceUpdate(ctx, am.keeper, addressToBalance)
 	if err != nil {
 		panic(err)
 	}

golang/cosmos/x/vbank/types/genesis.pb.go

@@ -1,3 +1,15 @@
 package types
 
 const RouterKey = ModuleName // this was defined in your key.go file
+
+type VbankSingleBalanceUpdate struct {
+	Address string `json:"address"`
+	Denom   string `json:"denom"`
+	Amount  string `json:"amount"`
+}
+
+type VbankBalanceUpdate struct {
+	Nonce   uint64                     `json:"nonce"`
+	Type    string                     `json:"type"`
+	Updated []VbankSingleBalanceUpdate `json:"updated"`
+}