Merge pull request #61 from hyperledger/contract-location

Add contractLocation field to transaction output
hyperledger · Feb 3, 2023 · b3f786f · b3f786f
2 parents 8f3be12 + 1f0341c
commit b3f786f
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 5 deletions.
diff --git a/pkg/apitypes/managed_tx.go b/pkg/apitypes/managed_tx.go
@@ -161,8 +161,9 @@ type ReplyHeaders struct {
 // latest status change. Full status for a transaction must be retrieved with
 // /transactions/{txid}
 type TransactionUpdateReply struct {
-	Headers         ReplyHeaders `json:"headers"`
-	Status          TxStatus     `json:"status"`
-	ProtocolID      string       `json:"protocolId"`
-	TransactionHash string       `json:"transactionHash,omitempty"`
+	Headers          ReplyHeaders     `json:"headers"`
+	Status           TxStatus         `json:"status"`
+	ProtocolID       string           `json:"protocolId"`
+	TransactionHash  string           `json:"transactionHash,omitempty"`
+	ContractLocation *fftypes.JSONAny `json:"contractLocation,omitempty"`
 }
diff --git a/pkg/ffcapi/transaction_receipt.go b/pkg/ffcapi/transaction_receipt.go
@@ -1,4 +1,4 @@
-// Copyright © 2022 Kaleido, Inc.
+// Copyright © 2023 Kaleido, Inc.
 //
 // SPDX-License-Identifier: Apache-2.0
 //
@@ -31,4 +31,5 @@ type TransactionReceiptResponse struct {
 	Success          bool              `json:"success"`
 	ProtocolID       string            `json:"protocolId"`
 	ExtraInfo        *fftypes.JSONAny  `json:"extraInfo"`
+	ContractLocation *fftypes.JSONAny  `json:"contractLocation"`
 }
diff --git a/pkg/fftm/policyloop.go b/pkg/fftm/policyloop.go
@@ -300,6 +300,10 @@ func (m *manager) sendWSReply(mtx *apitypes.ManagedTX) {
 		TransactionHash: mtx.TransactionHash,
 	}
 
+	if mtx.Receipt != nil && mtx.Receipt.ContractLocation != nil {
+		wsr.ContractLocation = mtx.Receipt.ContractLocation
+	}
+
 	if mtx.Receipt != nil {
 		wsr.ProtocolID = mtx.Receipt.ProtocolID
 	} else {

diff --git a/pkg/fftm/policyloop_test.go b/pkg/fftm/policyloop_test.go
@@ -92,6 +92,7 @@ func TestPolicyLoopE2EOk(t *testing.T) {
 			BlockHash:        fftypes.NewRandB32().String(),
 			ProtocolID:       fmt.Sprintf("%.12d/%.6d", fftypes.NewFFBigInt(12345).Int64(), fftypes.NewFFBigInt(10).Int64()),
 			Success:          true,
+			ContractLocation: fftypes.JSONAnyPtr(`{"address": "0x24746b95d118b2b4e8d07b06b1bad988fbf9415d"}`),
 		})
 		n.Transaction.Confirmed(context.Background(), []confirmations.BlockInfo{})
 	}).Return(nil)