Prune EthereumSignatures and EthereumEventVoteRecords

module/x/gravity/abci.go

@@ -27,7 +27,6 @@ func BeginBlocker(ctx sdk.Context, k keeper.Keeper) {
 // EndBlocker is called at the end of every block
 func EndBlocker(ctx sdk.Context, k keeper.Keeper) {
 	outgoingTxSlashing(ctx, k)
-	// Do we need to concern ourselves with future slashing windows for this pruning?
 	pruneEventVoteRecords(ctx, k)
 	eventVoteRecordTally(ctx, k)
 	updateObservedEthereumHeight(ctx, k)
@@ -102,7 +101,6 @@ func pruneSignerSetTxs(ctx sdk.Context, k keeper.Keeper) {
 		earliestToPrune := currentBlock - params.SignedSignerSetTxsWindow
 		for _, set := range k.GetSignerSetTxs(ctx) {
 			if set.Nonce < lastObserved.Nonce && set.Height < earliestToPrune {
-				k.DeleteEthereumSignatures(ctx, set.GetStoreIndex())
 				k.DeleteOutgoingTx(ctx, set.GetStoreIndex())
 			}
 		}
@@ -287,7 +285,6 @@ func cleanupTimedOutContractCallTxs(ctx sdk.Context, k keeper.Keeper) {
 	k.IterateOutgoingTxsByType(ctx, types.ContractCallTxPrefixByte, func(_ []byte, otx types.OutgoingTx) bool {
 		cctx, _ := otx.(*types.ContractCallTx)
 		if cctx.Timeout < ethereumHeight {
-			k.DeleteEthereumSignatures(ctx, cctx.GetStoreIndex())
 			k.DeleteOutgoingTx(ctx, cctx.GetStoreIndex())
 		}
 		return true

module/x/gravity/keeper/batch.go

@@ -81,7 +81,6 @@ func (k Keeper) batchTxExecuted(ctx sdk.Context, tokenContract common.Address, n
 		}
 		return false
 	})
-	k.DeleteEthereumSignatures(ctx, batchTx.GetStoreIndex())
 	k.DeleteOutgoingTx(ctx, batchTx.GetStoreIndex())
 }
 
@@ -124,7 +123,6 @@ func (k Keeper) CancelBatchTx(ctx sdk.Context, batch *types.BatchTx) {
 	}
 
 	// Delete batch since it is finished
-	k.DeleteEthereumSignatures(ctx, batch.GetStoreIndex())
 	k.DeleteOutgoingTx(ctx, batch.GetStoreIndex())
 
 	ctx.EventManager().EmitEvent(

module/x/gravity/keeper/contract_call.go

@@ -23,12 +23,10 @@ func (k Keeper) contractCallExecuted(ctx sdk.Context, invalidationScope []byte,
 		cctx, _ := otx.(*types.ContractCallTx)
 		if (cctx.InvalidationNonce < completedCallTx.InvalidationNonce) &&
 			bytes.Equal(cctx.InvalidationScope, completedCallTx.InvalidationScope) {
-			k.DeleteEthereumSignatures(ctx, cctx.GetStoreIndex())
 			k.DeleteOutgoingTx(ctx, cctx.GetStoreIndex())
 		}
 		return false
 	})
 
-	k.DeleteEthereumSignatures(ctx, completedCallTx.GetStoreIndex())
 	k.DeleteOutgoingTx(ctx, completedCallTx.GetStoreIndex())
 }

module/x/gravity/keeper/keeper.go

@@ -464,6 +464,7 @@ func (k Keeper) SetOutgoingTx(ctx sdk.Context, outgoing types.OutgoingTx) {
 // DeleteOutgoingTx deletes a given outgoingtx
 func (k Keeper) DeleteOutgoingTx(ctx sdk.Context, storeIndex []byte) {
 	ctx.KVStore(k.storeKey).Delete(types.MakeOutgoingTxKey(storeIndex))
+	k.DeleteEthereumSignatures(ctx, storeIndex)
 }
 
 func (k Keeper) PaginateOutgoingTxsByType(ctx sdk.Context, pageReq *query.PageRequest, prefixByte byte, cb func(key []byte, outgoing types.OutgoingTx) bool) (*query.PageResponse, error) {