Skip to content

Commit

Permalink
Update for nested struct
Browse files Browse the repository at this point in the history
Signed-off-by: Peter Broadhurst <[email protected]>
  • Loading branch information
peterbroadhurst committed Jun 10, 2024
1 parent 76a1f48 commit 14d4442
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 13 deletions.
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ require (
github.com/hashicorp/golang-lru v1.0.2
github.com/hyperledger/firefly-common v1.4.8
github.com/hyperledger/firefly-signer v1.1.13
github.com/hyperledger/firefly-transaction-manager v1.3.15-0.20240610194955-fba493eac23c
github.com/hyperledger/firefly-transaction-manager v1.3.15-0.20240610222246-001555528484
github.com/sirupsen/logrus v1.9.3
github.com/spf13/cobra v1.8.0
github.com/stretchr/testify v1.8.4
Expand Down
8 changes: 2 additions & 6 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -104,12 +104,8 @@ github.com/hyperledger/firefly-common v1.4.8 h1:0o1Qp1c5YzQo8nbnX+gAo9SVd2tR4Z9U
github.com/hyperledger/firefly-common v1.4.8/go.mod h1:dXewcVMFNON2SvQ1UPvu64OWUt77+M3p8qy61lT1kE4=
github.com/hyperledger/firefly-signer v1.1.13 h1:eiHjc6HPRG8AzXUCUgm51qqX1I9BokiuiiqJ89XwK4M=
github.com/hyperledger/firefly-signer v1.1.13/go.mod h1:pK6kivzBFSue3zpJSQpH67VasnLLbwBJOBUNv0zHbRA=
github.com/hyperledger/firefly-transaction-manager v1.3.14 h1:qK5wFQhEkZosPd/rvlcVHiSc+5ZCl+LEgpKk2a+9wKw=
github.com/hyperledger/firefly-transaction-manager v1.3.14/go.mod h1:N3BoHh8+dWG710oQKuNiXmJNEOBBeLTsQ8GpZ41vhog=
github.com/hyperledger/firefly-transaction-manager v1.3.15-0.20240610172723-339185c42b55 h1:2u0dJWpVNtofqSRJeNYzit7ynCRp5CHJOpPARlxOs4g=
github.com/hyperledger/firefly-transaction-manager v1.3.15-0.20240610172723-339185c42b55/go.mod h1:N3BoHh8+dWG710oQKuNiXmJNEOBBeLTsQ8GpZ41vhog=
github.com/hyperledger/firefly-transaction-manager v1.3.15-0.20240610194955-fba493eac23c h1:fKPA66T1ucYl0dniSSwbHiMQqFIOm/OD4rhZOuI+NLI=
github.com/hyperledger/firefly-transaction-manager v1.3.15-0.20240610194955-fba493eac23c/go.mod h1:N3BoHh8+dWG710oQKuNiXmJNEOBBeLTsQ8GpZ41vhog=
github.com/hyperledger/firefly-transaction-manager v1.3.15-0.20240610222246-001555528484 h1:HEhw5XoN0NSqfADwUTImWvJjAgkPiRwyHCJpGSgR9EM=
github.com/hyperledger/firefly-transaction-manager v1.3.15-0.20240610222246-001555528484/go.mod h1:N3BoHh8+dWG710oQKuNiXmJNEOBBeLTsQ8GpZ41vhog=
github.com/imdario/mergo v0.3.11/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
github.com/imdario/mergo v0.3.16 h1:wwQJbIsHYGMUyLSPrEq1CT16AhnhNJQ51+4fdHUnCl4=
github.com/imdario/mergo v0.3.16/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+hD27ysY=
Expand Down
15 changes: 9 additions & 6 deletions internal/ethereum/get_receipt.go
Original file line number Diff line number Diff line change
Expand Up @@ -239,12 +239,15 @@ func (c *ethConnector) TransactionReceipt(ctx context.Context, req *ffcapi.Trans
txIndex = ethReceipt.TransactionIndex.BigInt().Int64()
}
receiptResponse := &ffcapi.TransactionReceiptResponse{
BlockNumber: (*fftypes.FFBigInt)(ethReceipt.BlockNumber),
TransactionIndex: fftypes.NewFFBigInt(txIndex),
BlockHash: ethReceipt.BlockHash.String(),
Success: isSuccess,
ProtocolID: ProtocolIDForReceipt((*fftypes.FFBigInt)(ethReceipt.BlockNumber), fftypes.NewFFBigInt(txIndex)),
ExtraInfo: fftypes.JSONAnyPtrBytes(fullReceipt),
TransactionReceiptResponseBase: ffcapi.TransactionReceiptResponseBase{

BlockNumber: (*fftypes.FFBigInt)(ethReceipt.BlockNumber),
TransactionIndex: fftypes.NewFFBigInt(txIndex),
BlockHash: ethReceipt.BlockHash.String(),
Success: isSuccess,
ProtocolID: ProtocolIDForReceipt((*fftypes.FFBigInt)(ethReceipt.BlockNumber), fftypes.NewFFBigInt(txIndex)),
ExtraInfo: fftypes.JSONAnyPtrBytes(fullReceipt),
},
}
if req.IncludeLogs {
receiptResponse.Logs = make([]fftypes.JSONAny, len(ethReceipt.Logs))
Expand Down

0 comments on commit 14d4442

Please sign in to comment.