Add Blockchain Transaction IDs to FireFly Transaction objects and add blockchain IDs to events #448
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Also move the query helpers from Contract Manager to Orchestrator, as this has become a generic construct that spans more than one manager/plugin. Signed-off-by: Andrew Richardson <[email protected]>
Signed-off-by: Peter Broadhurst <[email protected]>
Signed-off-by: Peter Broadhurst <[email protected]>
Codecov Report
@@ Coverage Diff @@
## main #448 +/- ##
=========================================
Coverage 100.00% 100.00%
=========================================
Files 279 279
Lines 14995 15074 +79
=========================================
+ Hits 14995 15074 +79
Continue to review full report at Codecov.
|
awrichar
reviewed
Jan 26, 2022
awrichar
reviewed
Jan 26, 2022
awrichar
reviewed
Jan 26, 2022
awrichar
reviewed
Jan 26, 2022
awrichar
reviewed
Jan 26, 2022
awrichar
reviewed
Jan 26, 2022
Signed-off-by: Peter Broadhurst <[email protected]>
Signed-off-by: Peter Broadhurst <[email protected]>
awrichar
reviewed
Jan 26, 2022
|
|
||
| if existing { | ||
| var existingBlockchainIDs fftypes.FFStringArray | ||
| _ = transactionRows.Scan(&existingBlockchainIDs) |
There was a problem hiding this comment.
Should we check for error?
There was a problem hiding this comment.
... I took the approach that a problem here would be detected below, but it might have been lazy
awrichar
reviewed
Jan 26, 2022
| } | ||
| } | ||
|
|
||
| func (em *eventManager) confirmPool(ctx context.Context, pool *fftypes.TokenPool, ev *blockchain.Event) error { | ||
| func (em *eventManager) confirmPool(ctx context.Context, pool *fftypes.TokenPool, ev *blockchain.Event, blockchainTXID string) error { |
There was a problem hiding this comment.
I think the blockchain ID is now inside the blockchain.Event, right? so no need to pass it separately also
There was a problem hiding this comment.
Sorry I missed this one
awrichar
reviewed
Jan 26, 2022
pkg/tokens/plugin.go
Outdated
| @@ -101,6 +101,9 @@ type TokenPool struct { | |||
| // Not guaranteed to be set for pool creation events triggered outside of FireFly | |||
| TransactionID *fftypes.UUID | |||
|
|
|||
| // BlockchainTXID is the blockchain transaction hash that resulted in the event that created the pool | |||
| BlockchainTXID string | |||
There was a problem hiding this comment.
This should not be needed (here or on TokenTransfer below) since it's been included in blockchain.Event
awrichar
approved these changes
Jan 26, 2022
Signed-off-by: Andrew Richardson <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
blockchainIdson thetransactionobjectUpsertTransactionwith lower-case only text, and no duplicatesblockNumber/transactionIndex/eventIndex/subEventNumberconvention to all event IDs000000654321/000010/00002would be:654321102subEventNumberis reserved for protocols that batch logical events (such as transfers) in an data array emitted by a single eventTransaction example from E2E:
To which the following Blockchain event is associated:
{ "id": "8b85311c-b51f-4b69-bbbf-083ac4728db4", "sequence": 22, "source": "ethereum", "namespace": "default", "name": "BatchPin", "protocolId": "000000000031/000000/000000", "output": { "author": "0xce1fde1c97d3db88dbb83af16ac3b0efefeba80d", "batchHash": "0xb605c7d5238dd01fa594cab74db229a997e2c7c5150eeb43288ecdac30b62b97", "contexts": [ "0x2a30597d4aca075c164bfb02c44de63802d66f1422295aa6b7ce8b0daa12c470" ], "namespace": "default", "payloadRef": "QmWC6JQnpoYAsWj6junfwaiq8DvQgoLBMQt2nkoaYmxzaZ", "timestamp": "1643148068", "uuids": "0x264200de188a4aae92e71e5345604345af60568cd62c48e69cadce0d498d0584" }, "info": { "address": "0x3A4e59b55979d0D196aB39471DfA706b0a0CEce9", "blockNumber": "31", "logIndex": "0", "signature": "BatchPin(address,uint256,string,bytes32,bytes32,string,bytes32[])", "subId": "sb-51267be5-775c-4d22-6d72-b8a85675187b", "timestamp": "1643148068", "transactionHash": "0xb819561e2149c6a77a1de8a971895e486e064f45da26e1c48d2b4263eccffc43", "transactionIndex": "0x0" }, "timestamp": "2022-01-25T22:01:08Z", "tx": { "type": "batch_pin", "id": "264200de-188a-4aae-92e7-1e5345604345" } }Event example from E2E: