Update Fee Event Filter Implementation to Remove 4 Fees and Add Defensive Checks

Author: jribbink

internal/transactions/build.go

@@ -133,9 +133,10 @@ func build(
 	}
 
 	return &transactionResult{
+		result:  nil,
 		tx:      tx.FlowTransaction(),
+		chainID: "",
 		include: []string{"code", "payload", "signatures"},
-		network: flow.Network().Name,
 	}, nil
 }
 

internal/transactions/decode.go

@@ -67,8 +67,9 @@ func decode(
 	}
 
 	return &transactionResult{
+		result:  nil,
 		tx:      tx.FlowTransaction(),
+		chainID: "",
 		include: decodeFlags.Include,
-		network: "", // decode doesn't have network context
 	}, nil
 }

internal/transactions/get-system.go

@@ -29,6 +29,7 @@ import (
 	"github.com/onflow/flowkit/v2/output"
 
 	"github.com/onflow/flow-cli/internal/command"
+	"github.com/onflow/flow-cli/internal/util"
 )
 
 type flagsGetSystem struct {
@@ -80,11 +81,16 @@ func getSystemTransaction(
 		return nil, err
 	}
 
+	chainID, err := util.GetChainIDFromHost(flow.Network().Host)
+	if err != nil {
+		return nil, err
+	}
+
 	return &transactionResult{
 		result:  result,
 		tx:      tx,
+		chainID: chainID,
 		include: getSystemFlags.Include,
 		exclude: getSystemFlags.Exclude,
-		network: flow.Network().Name,
 	}, nil
 }

internal/transactions/get.go

@@ -29,6 +29,7 @@ import (
 	"github.com/onflow/flowkit/v2/output"
 
 	"github.com/onflow/flow-cli/internal/command"
+	"github.com/onflow/flow-cli/internal/util"
 )
 
 type flagsGet struct {
@@ -65,11 +66,16 @@ func get(
 		return nil, err
 	}
 
+	chainID, err := util.GetChainIDFromHost(flow.Network().Host)
+	if err != nil {
+		return nil, err
+	}
+
 	return &transactionResult{
 		result:  result,
 		tx:      tx,
+		chainID: chainID,
 		include: getFlags.Include,
 		exclude: getFlags.Exclude,
-		network: flow.Network().Name,
 	}, nil
 }

internal/transactions/send-signed.go

@@ -32,6 +32,7 @@ import (
 	"github.com/onflow/flowkit/v2/output"
 
 	"github.com/onflow/flow-cli/internal/command"
+	"github.com/onflow/flow-cli/internal/util"
 )
 
 type flagsSendSigned struct {
@@ -83,11 +84,16 @@ func sendSigned(
 		return nil, err
 	}
 
+	chainID, err := util.GetChainIDFromHost(flow.Network().Host)
+	if err != nil {
+		return nil, err
+	}
+
 	return &transactionResult{
 		result:  result,
 		tx:      sentTx,
+		chainID: chainID,
 		include: sendSignedFlags.Include,
 		exclude: sendSignedFlags.Exclude,
-		network: flow.Network().Name,
 	}, nil
 }

internal/transactions/send.go

@@ -32,6 +32,7 @@ import (
 	"github.com/onflow/flowkit/v2/transactions"
 
 	"github.com/onflow/flow-cli/internal/command"
+	"github.com/onflow/flow-cli/internal/util"
 )
 
 type Flags struct {
@@ -160,11 +161,16 @@ func SendTransaction(code []byte, args []string, location string, flow flowkit.S
 		return nil, err
 	}
 
+	chainID, err := util.GetChainIDFromHost(flow.Network().Host)
+	if err != nil {
+		return nil, err
+	}
+
 	return &transactionResult{
 		result:  txResult,
 		tx:      tx,
+		chainID: chainID,
 		include: sendFlags.Include,
 		exclude: sendFlags.Exclude,
-		network: flow.Network().Name,
 	}, nil
 }

internal/transactions/sign.go

@@ -28,6 +28,7 @@ import (
 	"sort"
 
 	"github.com/onflow/flow-cli/internal/prompt"
+	"github.com/onflow/flow-cli/internal/util"
 
 	"github.com/onflow/flowkit/v2/transactions"
 
@@ -138,10 +139,16 @@ func sign(
 		fmt.Printf("%s Signed RLP Posted successfully\n", output.SuccessEmoji())
 	}
 
+	chainID, err := util.GetChainIDFromHost(flow.Network().Host)
+	if err != nil {
+		return nil, err
+	}
+
 	return &transactionResult{
+		result:  nil,
 		tx:      signed.FlowTransaction(),
+		chainID: chainID,
 		include: signFlags.Include,
-		network: flow.Network().Name,
 	}, nil
 }
 

internal/transactions/transactions.go

@@ -25,6 +25,8 @@ import (
 	"strings"
 
 	"github.com/onflow/flow-go-sdk"
+	"github.com/onflow/flow-go/fvm/systemcontracts"
+	flowGo "github.com/onflow/flow-go/model/flow"
 	"github.com/spf13/cobra"
 
 	"github.com/onflow/flowkit/v2/output"
@@ -60,37 +62,26 @@ type transactionResult struct {
 	tx      *flow.Transaction
 	include []string
 	exclude []string
-	network string
-}
-
-func NewTransactionResult(tx *flow.Transaction, result *flow.TransactionResult) *transactionResult {
-	return &transactionResult{
-		result:  result,
-		tx:      tx,
-		network: "", // Default to empty, should be set by caller
-	}
+	chainID flowGo.ChainID
 }
 
 // getBlockExplorerLink returns the block explorer link for the transaction if it's on mainnet or testnet
 func (r *transactionResult) getBlockExplorerLink() string {
-	if r.network == "" {
-		return ""
-	}
-
-	// Only show block explorer links for mainnet and testnet
-	if r.network != "mainnet" && r.network != "testnet" {
+	if r.chainID == "" {
 		return ""
 	}
 
 	txID := r.tx.ID().String()
 
-	if r.network == "mainnet" {
+	// Only show block explorer links for mainnet and testnet
+	switch r.chainID {
+	case flowGo.Mainnet:
 		return fmt.Sprintf("https://www.flowscan.io/tx/%s", txID)
-	} else if r.network == "testnet" {
+	case flowGo.Testnet:
 		return fmt.Sprintf("https://testnet.flowscan.io/tx/%s", txID)
+	default:
+		return ""
 	}
-
-	return ""
 }
 
 func (r *transactionResult) JSON() any {
@@ -109,8 +100,9 @@ func (r *transactionResult) JSON() any {
 		result["block_height"] = r.result.BlockHeight
 		result["status"] = r.result.Status.String()
 
-		txEvents := make([]any, 0, len(r.result.Events))
-		for _, event := range r.result.Events {
+		events := r.getDisplayEvents()
+		txEvents := make([]any, 0, len(events))
+		for _, event := range events {
 			txEvents = append(txEvents, map[string]any{
 				"index": event.EventIndex,
 				"type":  event.Type,
@@ -129,11 +121,48 @@ func (r *transactionResult) JSON() any {
 	return result
 }
 
+func (r *transactionResult) getDisplayEvents() []flow.Event {
+	if r.result == nil || command.ContainsFlag(r.exclude, "events") {
+		return nil
+	}
+
+	events := r.result.Events
+	if !command.ContainsFlag(r.include, "fee-events") {
+		events = filterFeeEvents(events, r.chainID)
+	}
+	return events
+}
+
+func filterFeeEvents(events []flow.Event, chainID flowGo.ChainID) []flow.Event {
+	const feeEventsCountAppended = 4
+
+	if len(events) == 0 || chainID == "" {
+		return events
+	}
+
+	// Get the FlowFees system contract address for this chain
+	systemContracts := systemcontracts.SystemContractsForChain(chainID)
+	flowFeesAddress := systemContracts.FlowFees.Address
+
+	// Build the expected event type: A.<address>.FlowFees.FeesDeducted
+	expectedEventType := fmt.Sprintf("A.%s.FlowFees.FeesDeducted", flowFeesAddress.Hex())
+
+	// Fee events are always at the end, so just check the last event
+	lastEvent := events[len(events)-1]
+	if strings.HasPrefix(lastEvent.Type, expectedEventType) {
+		cutIndex := len(events) - feeEventsCountAppended
+		if cutIndex < 0 {
+			cutIndex = 0
+		}
+		return events[:cutIndex]
+	}
+
+	return events
+}
+
 func (r *transactionResult) String() string {
 	var b bytes.Buffer
 	writer := util.CreateTabWriter(&b)
-	const feeEventsCountAppended = 5
-	const feeDeductedEvent = "FeesDeducted"
 
 	if r.result != nil {
 		_, _ = fmt.Fprintf(writer, "%s\t%s\n", branding.GrayStyle.Render("Block ID"), branding.PurpleStyle.Render(r.result.BlockID.String()))
@@ -199,19 +228,10 @@ func (r *transactionResult) String() string {
 		_, _ = fmt.Fprintf(writer, "\n%s", branding.GrayStyle.Render("Signatures (minimized, use --include signatures)"))
 	}
 
-	if r.result != nil && !command.ContainsFlag(r.exclude, "events") {
+	displayEvents := r.getDisplayEvents()
+	if displayEvents != nil {
 		e := events.EventResult{
-			Events: r.result.Events,
-		}
-
-		if r.result != nil && e.Events != nil && !command.ContainsFlag(r.include, "fee-events") {
-			for _, event := range e.Events {
-				if strings.Contains(event.Type, feeDeductedEvent) {
-					// if fee event are present remove them
-					e.Events = e.Events[:len(e.Events)-feeEventsCountAppended]
-					break
-				}
-			}
+			Events: displayEvents,
 		}
 
 		eventsOutput := e.String()
@@ -263,7 +283,8 @@ func (r *transactionResult) Oneliner() string {
 		r.tx.ID(), r.tx.Payer, r.tx.Authorizers)
 
 	if r.result != nil {
-		result += fmt.Sprintf(", Status: %s, Events: %s", r.result.Status, r.result.Events)
+		displayEvents := r.getDisplayEvents()
+		result += fmt.Sprintf(", Status: %s, Events: %s", r.result.Status, displayEvents)
 	}
 
 	return result