From 99005b613fe0735935406c0cdca7063a3e021fa4 Mon Sep 17 00:00:00 2001
From: Andrea V <1577639+karimodm@users.noreply.github.com>
Date: Fri, 29 Sep 2023 15:16:16 +0200
Subject: [PATCH 1/2] Pending if not Accepted nor Rejected

---
 pkg/protocol/engine/mempool/v1/inclusion_flags.go      | 2 +-
 pkg/protocol/engine/mempool/v1/transaction_metadata.go | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkg/protocol/engine/mempool/v1/inclusion_flags.go b/pkg/protocol/engine/mempool/v1/inclusion_flags.go
index 9aa77e34c..6e8473373 100644
--- a/pkg/protocol/engine/mempool/v1/inclusion_flags.go
+++ b/pkg/protocol/engine/mempool/v1/inclusion_flags.go
@@ -31,7 +31,7 @@ func newInclusionFlags() *inclusionFlags {
 }
 
 func (s *inclusionFlags) IsPending() bool {
-	return !s.accepted.Get()
+	return !s.IsAccepted() && !s.IsRejected()
 }
 
 // IsAccepted returns true if the entity was accepted.
diff --git a/pkg/protocol/engine/mempool/v1/transaction_metadata.go b/pkg/protocol/engine/mempool/v1/transaction_metadata.go
index 9c98fdad9..6802b5079 100644
--- a/pkg/protocol/engine/mempool/v1/transaction_metadata.go
+++ b/pkg/protocol/engine/mempool/v1/transaction_metadata.go
@@ -295,7 +295,7 @@ func (t *TransactionMetadata) setupInput(input *OutputStateMetadata) {
 	})
 
 	input.OnAcceptedSpenderUpdated(func(spender mempool.TransactionMetadata) {
-		if spender != t {
+		if spender.(*TransactionMetadata) != nil && spender != t {
 			t.setRejected()
 		}
 	})

From 1d72e4643b8632104e9bc0c2dd3811b8e5c0d19d Mon Sep 17 00:00:00 2001
From: Andrea V <1577639+karimodm@users.noreply.github.com>
Date: Mon, 2 Oct 2023 17:25:55 +0200
Subject: [PATCH 2/2] Do not enforce type assertion check

---
 pkg/protocol/engine/mempool/v1/transaction_metadata.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkg/protocol/engine/mempool/v1/transaction_metadata.go b/pkg/protocol/engine/mempool/v1/transaction_metadata.go
index 6802b5079..0aec48dfe 100644
--- a/pkg/protocol/engine/mempool/v1/transaction_metadata.go
+++ b/pkg/protocol/engine/mempool/v1/transaction_metadata.go
@@ -295,6 +295,7 @@ func (t *TransactionMetadata) setupInput(input *OutputStateMetadata) {
 	})
 
 	input.OnAcceptedSpenderUpdated(func(spender mempool.TransactionMetadata) {
+		//nolint:forcetypeassert
 		if spender.(*TransactionMetadata) != nil && spender != t {
 			t.setRejected()
 		}