Skip to content

Commit f062a9c

Browse files
authored
Merge pull request #1178 from kaleido-io/contract-location
Add contractLocation field to deploy transaction output
2 parents 6255f75 + b2b24e4 commit f062a9c

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

internal/blockchain/common/common.go

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright © 2022 Kaleido, Inc.
1+
// Copyright © 2023 Kaleido, Inc.
22
//
33
// SPDX-License-Identifier: Apache-2.0
44
//
@@ -78,10 +78,11 @@ type BlockchainReceiptHeaders struct {
7878
}
7979

8080
type BlockchainReceiptNotification struct {
81-
Headers BlockchainReceiptHeaders
82-
TxHash string `json:"transactionHash,omitempty"`
83-
Message string `json:"errorMessage,omitempty"`
84-
ProtocolID string `json:"protocolId,omitempty"`
81+
Headers BlockchainReceiptHeaders `json:"headers,omitempty"`
82+
TxHash string `json:"transactionHash,omitempty"`
83+
Message string `json:"errorMessage,omitempty"`
84+
ProtocolID string `json:"protocolId,omitempty"`
85+
ContractLocation *fftypes.JSONAny `json:"contractLocation,omitempty"`
8586
}
8687

8788
func NewBlockchainCallbacks() BlockchainCallbacks {
@@ -297,6 +298,7 @@ func HandleReceipt(ctx context.Context, plugin core.Named, reply *BlockchainRece
297298
if reply.Headers.ReceiptID == "" || reply.Headers.ReplyType == "" {
298299
return fmt.Errorf("reply cannot be processed - missing fields: %+v", reply)
299300
}
301+
300302
var updateType core.OpStatus
301303
switch reply.Headers.ReplyType {
302304
case "TransactionSuccess":

manifest.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
},
77
"evmconnect": {
88
"image": "ghcr.io/hyperledger/firefly-evmconnect",
9-
"tag": "v1.2.1",
10-
"sha": "5f5ada5da90e7e49ba60f82737f7613d6759134248faa363210b74d89996d9b8"
9+
"tag": "v1.2.2",
10+
"sha": "9032e45ea9cee7d881ce88eaea720f450d2ed176e96137feb495c5e7850fab45"
1111
},
1212
"fabconnect": {
1313
"image": "ghcr.io/hyperledger/firefly-fabconnect",

0 commit comments

Comments
 (0)