From 2d24648ff37b2d00a665f4f0a44ac72983383cd4 Mon Sep 17 00:00:00 2001 From: Collin Brittain Date: Thu, 8 Feb 2024 12:04:28 -0600 Subject: [PATCH] Remove CompletedOutgoingTxs from unsigned batch and contract calls lookups --- module/x/gravity/keeper/batch.go | 11 ----------- module/x/gravity/keeper/contract_call.go | 12 ------------ 2 files changed, 23 deletions(-) diff --git a/module/x/gravity/keeper/batch.go b/module/x/gravity/keeper/batch.go index 454e125ce..dbcb027ac 100644 --- a/module/x/gravity/keeper/batch.go +++ b/module/x/gravity/keeper/batch.go @@ -163,17 +163,6 @@ func (k Keeper) getLastOutgoingBatchByTokenType(ctx sdk.Context, token common.Ad // GetUnsignedBatchTxs returns all batches for which the specified validator has not submitted confirmations in ascending nonce order func (k Keeper) GetUnsignedBatchTxs(ctx sdk.Context, val sdk.ValAddress) []*types.BatchTx { var unconfirmed []*types.BatchTx - k.IterateCompletedOutgoingTxsByType(ctx, types.BatchTxPrefixByte, func(_ []byte, cotx types.OutgoingTx) bool { - sig := k.getEthereumSignature(ctx, cotx.GetStoreIndex(), val) - if len(sig) == 0 { - batch, ok := cotx.(*types.BatchTx) - if !ok { - panic(sdkerrors.Wrapf(types.ErrInvalid, "couldn't cast to batch tx for completed tx %s", cotx)) - } - unconfirmed = append(unconfirmed, batch) - } - return false - }) k.IterateOutgoingTxsByType(ctx, types.BatchTxPrefixByte, func(_ []byte, otx types.OutgoingTx) bool { sig := k.getEthereumSignature(ctx, otx.GetStoreIndex(), val) if len(sig) == 0 { diff --git a/module/x/gravity/keeper/contract_call.go b/module/x/gravity/keeper/contract_call.go index 57618d394..92fad3033 100644 --- a/module/x/gravity/keeper/contract_call.go +++ b/module/x/gravity/keeper/contract_call.go @@ -12,18 +12,6 @@ import ( func (k Keeper) GetUnsignedContractCallTxs(ctx sdk.Context, val sdk.ValAddress) []*types.ContractCallTx { var unconfirmed []*types.ContractCallTx - k.IterateCompletedOutgoingTxsByType(ctx, types.ContractCallTxPrefixByte, func(_ []byte, cotx types.OutgoingTx) bool { - sig := k.getEthereumSignature(ctx, cotx.GetStoreIndex(), val) - if len(sig) == 0 { - call, ok := cotx.(*types.ContractCallTx) - if !ok { - panic(sdkerrors.Wrapf(types.ErrInvalid, "couldn't cast to contract call for completed tx %s", cotx)) - } - unconfirmed = append(unconfirmed, call) - } - return false - }) - k.IterateOutgoingTxsByType(ctx, types.ContractCallTxPrefixByte, func(_ []byte, otx types.OutgoingTx) bool { sig := k.getEthereumSignature(ctx, otx.GetStoreIndex(), val) if len(sig) == 0 {