Add support for querying a system transaction with txID (#2077)

Author: jribbink

go.mod

@@ -22,8 +22,8 @@ require (
 	github.com/onflow/flow-emulator v1.7.2
 	github.com/onflow/flow-evm-gateway v1.3.2
 	github.com/onflow/flow-go v0.43.0
-	github.com/onflow/flow-go-sdk v1.8.2
-	github.com/onflow/flowkit/v2 v2.5.2
+	github.com/onflow/flow-go-sdk v1.8.3
+	github.com/onflow/flowkit/v2 v2.6.0
 	github.com/onflowser/flowser/v3 v3.2.1-0.20240131200229-7d4d22715f48
 	github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c
 	github.com/pkg/errors v0.9.1
@@ -205,7 +205,7 @@ require (
 	github.com/onflow/flow-ft/lib/go/templates v1.0.1 // indirect
 	github.com/onflow/flow-nft/lib/go/contracts v1.3.0 // indirect
 	github.com/onflow/flow-nft/lib/go/templates v1.3.0 // indirect
-	github.com/onflow/flow/protobuf/go/flow v0.4.15 // indirect
+	github.com/onflow/flow/protobuf/go/flow v0.4.16 // indirect
 	github.com/onflow/go-ethereum v1.15.10 // indirect
 	github.com/onflow/nft-storefront/lib/go/contracts v1.0.0 // indirect
 	github.com/onflow/sdks v0.6.0-preview.1 // indirect

go.sum

@@ -801,16 +801,16 @@ github.com/onflow/flow-ft/lib/go/templates v1.0.1 h1:FDYKAiGowABtoMNusLuRCILIZDt
 github.com/onflow/flow-ft/lib/go/templates v1.0.1/go.mod h1:uQ8XFqmMK2jxyBSVrmyuwdWjTEb+6zGjRYotfDJ5pAE=
 github.com/onflow/flow-go v0.43.0 h1:wEXSEQir6A1vT3Mu0g5gEMPYFbyOhzfXpJ9gNHuCJUk=
 github.com/onflow/flow-go v0.43.0/go.mod h1:AEgLUD7wvil8c1a1b5Gav20qe/IsS0H/jPG+wOYgmB4=
-github.com/onflow/flow-go-sdk v1.8.2 h1:Jkoh0LdH4kIADFdHoHK31qHcH0QnCkAL+ybjAkBEbqc=
-github.com/onflow/flow-go-sdk v1.8.2/go.mod h1:/5g1t+xgk1nFXz8ifk8O3aT4DqLwq5p3k2BhiW4ZX+U=
+github.com/onflow/flow-go-sdk v1.8.3 h1:Fa80rLp0BFIalsdCP1zDYNdAKAQVPAhfMHvoq9J0DCU=
+github.com/onflow/flow-go-sdk v1.8.3/go.mod h1:Q3QKEekOLbU2zW6BRYVYxg6gU/dXas+xXwbSkDscNNE=
 github.com/onflow/flow-nft/lib/go/contracts v1.3.0 h1:DmNop+O0EMyicZvhgdWboFG57xz5t9Qp81FKlfKyqJc=
 github.com/onflow/flow-nft/lib/go/contracts v1.3.0/go.mod h1:eZ9VMMNfCq0ho6kV25xJn1kXeCfxnkhj3MwF3ed08gY=
 github.com/onflow/flow-nft/lib/go/templates v1.3.0 h1:uGIBy4GEY6Z9hKP7sm5nA5kwvbvLWW4nWx5NN9Wg0II=
 github.com/onflow/flow-nft/lib/go/templates v1.3.0/go.mod h1:gVbb5fElaOwKhV5UEUjM+JQTjlsguHg2jwRupfM/nng=
-github.com/onflow/flow/protobuf/go/flow v0.4.15 h1:7Xt7kkqeeygWMw/S327uKu11FPJghNm1pvam2HXbC7g=
-github.com/onflow/flow/protobuf/go/flow v0.4.15/go.mod h1:NA2pX2nw8zuaxfKphhKsk00kWLwfd+tv8mS23YXO4Sk=
-github.com/onflow/flowkit/v2 v2.5.2 h1:/v9sRYZMFgaum116ArO1DmF3TaIYRhNTP2c1KbWABCM=
-github.com/onflow/flowkit/v2 v2.5.2/go.mod h1:WpvlXvkbT0Mph7ana8b80ynN+54Hq4a4Kgo88biS2i8=
+github.com/onflow/flow/protobuf/go/flow v0.4.16 h1:UADQeq/mpuqFk+EkwqDNoF70743raWQKmB/Dm/eKt2Q=
+github.com/onflow/flow/protobuf/go/flow v0.4.16/go.mod h1:NA2pX2nw8zuaxfKphhKsk00kWLwfd+tv8mS23YXO4Sk=
+github.com/onflow/flowkit/v2 v2.6.0 h1:BfCdeQhBOWfAI2bB667MI+EG2Xl5jdteX2fYPBxu6vU=
+github.com/onflow/flowkit/v2 v2.6.0/go.mod h1:JJEFOHQtVQXOvsGiSgib5FnlIMBAGY1YjxCt2S6+LLU=
 github.com/onflow/go-ethereum v1.15.10 h1:blZBeOLJDOVWqKuhkkMh6S2PKQAJvdgbvOL9ZNggFcU=
 github.com/onflow/go-ethereum v1.15.10/go.mod h1:t2nZJtwruVjA5u5yEK8InFzjImFLHrF7ak2bw3E4LDM=
 github.com/onflow/nft-storefront/lib/go/contracts v1.0.0 h1:sxyWLqGm/p4EKT6DUlQESDG1ZNMN9GjPCm1gTq7NGfc=

internal/transactions/get-system.go

@@ -20,7 +20,9 @@ package transactions
 
 import (
 	"context"
+	"strings"
 
+	flowsdk "github.com/onflow/flow-go-sdk"
 	"github.com/spf13/cobra"
 
 	"github.com/onflow/flowkit/v2"
@@ -38,10 +40,10 @@ var getSystemFlags = flagsGetSystem{}
 
 var getSystemCommand = &command.Command{
 	Cmd: &cobra.Command{
-		Use:     "get-system <block_id|latest|block_height>",
-		Short:   "Get the system transaction by block info",
-		Example: "flow transactions get-system a1b2c3...",
-		Args:    cobra.ExactArgs(1),
+		Use:     "get-system <block_id|latest|block_height> [tx_id]",
+		Short:   "Get the system transaction by block and optional ID",
+		Example: "flow transactions get-system latest\nflow transactions get-system latest 07a8...b433",
+		Args:    cobra.RangeArgs(1, 2),
 	},
 	Flags: &getSystemFlags,
 	Run:   getSystemTransaction,
@@ -66,7 +68,14 @@ func getSystemTransaction(
 		return nil, err
 	}
 
-	tx, result, err := flow.GetSystemTransaction(context.Background(), block.ID)
+	var id flowsdk.Identifier
+	if len(args) == 2 {
+		id = flowsdk.HexToID(strings.TrimPrefix(args[1], "0x"))
+	} else {
+		id = flowsdk.Identifier{}
+	}
+
+	tx, result, err := flow.GetSystemTransactionWithID(context.Background(), block.ID, id)
 	if err != nil {
 		return nil, err
 	}

internal/transactions/transactions_test.go

@@ -151,7 +151,7 @@ func Test_GetSystem(t *testing.T) {
 			assert.Equal(t, uint64(100), args.Get(1).(flowkit.BlockQuery).Height)
 		}).Return(returnBlock, nil)
 
-		srv.GetSystemTransaction.Return(nil, nil, nil)
+		srv.GetSystemTransactionWithID.Return(tests.NewTransaction(), tests.NewTransactionResult(nil), nil)
 
 		res, err := getSystemTransaction(inArgs, command.GlobalFlags{}, util.NoLogger, rw, srv.Mock)
 		assert.NoError(t, err)
@@ -168,7 +168,7 @@ func Test_GetSystem(t *testing.T) {
 			assert.Equal(t, uint64(100), args.Get(1).(flowkit.BlockQuery).Height)
 		}).Return(returnBlock, nil)
 
-		srv.GetSystemTransaction.Return(nil, nil, fmt.Errorf("block not found"))
+		srv.GetSystemTransactionWithID.Return(nil, nil, fmt.Errorf("block not found"))
 
 		res, err := getSystemTransaction(inArgs, command.GlobalFlags{}, util.NoLogger, rw, srv.Mock)
 		assert.Error(t, err)