Set protocolId in all transaction receipts

Signed-off-by: Matthew Whitehead <matthew.whitehead@kaleido.io>

internal/ethereum/get_receipt.go

@@ -19,6 +19,7 @@ package ethereum
 import (
 	"context"
 	"encoding/json"
+	"fmt"
 
 	"github.com/hyperledger/firefly-common/pkg/fftypes"
 	"github.com/hyperledger/firefly-common/pkg/i18n"
@@ -82,6 +83,13 @@ func (c *ethConnector) getTransactionInfo(ctx context.Context, hash ethtypes.Hex
 	return txInfo, err
 }
 
+func ProtocolIDForReceipt(blockNumber, transactionIndex *fftypes.FFBigInt) string {
+	if blockNumber != nil && transactionIndex != nil {
+		return fmt.Sprintf("%.12d/%.6d", blockNumber.Int(), transactionIndex.Int())
+	}
+	return ""
+}
+
 func (c *ethConnector) TransactionReceipt(ctx context.Context, req *ffcapi.TransactionReceiptRequest) (*ffcapi.TransactionReceiptResponse, ffcapi.ErrorReason, error) {
 
 	// Get the receipt in the back-end JSON/RPC format
@@ -114,6 +122,7 @@ func (c *ethConnector) TransactionReceipt(ctx context.Context, req *ffcapi.Trans
 		TransactionIndex: fftypes.NewFFBigInt(txIndex),
 		BlockHash:        ethReceipt.BlockHash.String(),
 		Success:          isSuccess,
+		ProtocolID:       ProtocolIDForReceipt((*fftypes.FFBigInt)(ethReceipt.BlockNumber), fftypes.NewFFBigInt(txIndex)),
 		ExtraInfo:        fftypes.JSONAnyPtrBytes(fullReceipt),
 	}, "", nil
 

internal/ethereum/get_receipt_test.go

@@ -20,6 +20,7 @@ import (
 	"encoding/json"
 	"testing"
 
+	"github.com/hyperledger/firefly-common/pkg/fftypes"
 	"github.com/hyperledger/firefly-signer/pkg/rpcbackend"
 	"github.com/hyperledger/firefly-transaction-manager/pkg/ffcapi"
 	"github.com/stretchr/testify/assert"
@@ -134,3 +135,8 @@ func TestGetReceiptError(t *testing.T) {
 	assert.Nil(t, res)
 
 }
+
+func TestProtocolIDForReceipt(t *testing.T) {
+	assert.Equal(t, "000000012345/000042", ProtocolIDForReceipt(fftypes.NewFFBigInt(12345), fftypes.NewFFBigInt(42)))
+	assert.Equal(t, "", ProtocolIDForReceipt(nil, nil))
+}