-
Notifications
You must be signed in to change notification settings - Fork 26
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fix deserialization of events with entitlements and add better error logging #67
Merged
Merged
Changes from 7 commits
Commits
Show all changes
19 commits
Select commit
Hold shift + click to select a range
3a49202
Debugging events decoding
lealobanov 3a5433d
Clean up logs
lealobanov 402e0f9
Clean up
lealobanov a6df9dd
Clean up logging
lealobanov 7e67d9b
Delete myenv directory
lealobanov 51edd23
Lint
lealobanov 8f8b88d
Merge branch 'bug-66' of https://github.com/janezpodhostnik/flow-py-s…
lealobanov f9f4dc6
Raise exception instead of skipping decoding event when failure
lealobanov a68d9cb
fix
janezpodhostnik cdfb195
Update logging and exception handling
lealobanov 35d1697
Merge branch 'bug-66-test' of https://github.com/janezpodhostnik/flow…
lealobanov 7a3a90f
Lint
lealobanov 4409382
Re-enable test
lealobanov 774d359
Clean up
lealobanov 67c91f8
Clean up
lealobanov c5be946
Clean up
lealobanov f9b0220
Update logging messages
lealobanov 0b1c487
Update logging messages
lealobanov d8c9f6a
Lint
lealobanov File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -139,6 +139,7 @@ ENV/ | |
env.bak/ | ||
venv.bak/ | ||
pythonenv* | ||
myenv | ||
|
||
# Spyder project settings | ||
.spyderproject | ||
|
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
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This is an output of the failing event payloads for reference, will remove before merging changes |
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,291 @@ | ||
[ | ||
{ | ||
"value": { | ||
"id": "flow.AccountCapabilityControllerIssued", | ||
"fields": [ | ||
{ | ||
"name": "id", | ||
"value": { | ||
"value": "3", | ||
"type": "UInt64" | ||
} | ||
}, | ||
{ | ||
"name": "address", | ||
"value": { | ||
"value": "0x646997908e65fb70", | ||
"type": "Address" | ||
} | ||
}, | ||
{ | ||
"name": "type", | ||
"value": { | ||
"value": { | ||
"staticType": { | ||
"type": { | ||
"kind": "Account" | ||
}, | ||
"kind": "Reference", | ||
"authorization": { | ||
"kind": "EntitlementConjunctionSet", | ||
"entitlements": [ | ||
{ "kind": "Entitlement", "typeID": "Storage" }, | ||
{ "kind": "Entitlement", "typeID": "Contracts" }, | ||
{ "kind": "Entitlement", "typeID": "Keys" }, | ||
{ "kind": "Entitlement", "typeID": "Inbox" }, | ||
{ "kind": "Entitlement", "typeID": "Capabilities" } | ||
] | ||
} | ||
} | ||
}, | ||
"type": "Type" | ||
} | ||
} | ||
] | ||
}, | ||
"type": "Event" | ||
}, | ||
{ | ||
"value": { | ||
"id": "flow.StorageCapabilityControllerIssued", | ||
"fields": [ | ||
{ | ||
"name": "id", | ||
"value": { | ||
"value": "148", | ||
"type": "UInt64" | ||
} | ||
}, | ||
{ | ||
"name": "address", | ||
"value": { | ||
"value": "0x0342200ce19810f6", | ||
"type": "Address" | ||
} | ||
}, | ||
{ | ||
"name": "type", | ||
"value": { | ||
"value": { | ||
"staticType": { | ||
"type": { | ||
"type": "", | ||
"kind": "Resource", | ||
"typeID": "A.befbaccb5032a457.ContractManager.Manager", | ||
"fields": [ | ||
{ "type": { "kind": "UInt64" }, "id": "uuid" }, | ||
{ | ||
"type": { | ||
"type": { | ||
"kind": "Account" | ||
}, | ||
"kind": "Reference", | ||
"authorization": { | ||
"kind": "EntitlementConjunctionSet", | ||
"entitlements": [ | ||
{ "kind": "Entitlement", "typeID": "Storage" }, | ||
{ "kind": "Entitlement", "typeID": "Contracts" }, | ||
{ "kind": "Entitlement", "typeID": "Keys" }, | ||
{ "kind": "Entitlement", "typeID": "Inbox" }, | ||
{ "kind": "Entitlement", "typeID": "Capabilities" } | ||
] | ||
} | ||
}, | ||
"kind": "Capability", | ||
"id": "acct" | ||
}, | ||
{ | ||
"type": { | ||
"type": { | ||
"type": "", | ||
"kind": "Resource", | ||
"typeID": "A.707c0b39a8d689cb.FungibleTokenRouter.Router", | ||
"fields": [ | ||
{ "type": { "kind": "UInt64" }, "id": "uuid" }, | ||
{ "type": { "kind": "Address" }, "id": "defaultAddress" }, | ||
{ | ||
"type": { | ||
"key": { "kind": "String" }, | ||
"value": { "kind": "Address" }, | ||
"kind": "Dictionary" | ||
}, | ||
"id": "addressOverrides" | ||
} | ||
] | ||
}, | ||
"kind": "Reference", | ||
"authorization": { | ||
"kind": "EntitlementConjunctionSet", | ||
"entitlements": [ | ||
{ | ||
"kind": "Entitlement", | ||
"typeID": "A.707c0b39a8d689cb.FungibleTokenRouter.Owner" | ||
} | ||
] | ||
} | ||
}, | ||
"kind": "Capability", | ||
"id": "routerCap" | ||
}, | ||
{ | ||
"type": { | ||
"key": { "kind": "String" }, | ||
"value": { "kind": "AnyStruct" }, | ||
"kind": "Dictionary" | ||
}, | ||
"id": "data" | ||
}, | ||
{ | ||
"type": { | ||
"key": { "kind": "String" }, | ||
"value": { "kind": "AnyResource" }, | ||
"kind": "Dictionary" | ||
}, | ||
"id": "resources" | ||
} | ||
] | ||
}, | ||
"kind": "Reference", | ||
"authorization": { | ||
"kind": "Unauthorized", | ||
"entitlements": null | ||
} | ||
} | ||
}, | ||
"type": "Type" | ||
} | ||
}, | ||
{ | ||
"name": "path", | ||
"value": { | ||
"value": { | ||
"domain": "storage", | ||
"identifier": "ContractManager_0xbefbaccb5032a457" | ||
}, | ||
"type": "Path" | ||
} | ||
} | ||
] | ||
}, | ||
"type": "Event" | ||
}, | ||
{ | ||
"value": { | ||
"id": "flow.CapabilityPublished", | ||
"fields": [ | ||
{ | ||
"name": "address", | ||
"value": { | ||
"value": "0x0342200ce19810f6", | ||
"type": "Address" | ||
} | ||
}, | ||
{ | ||
"name": "path", | ||
"value": { | ||
"value": { | ||
"domain": "public", | ||
"identifier": "ContractManager_0xbefbaccb5032a457" | ||
}, | ||
"type": "Path" | ||
} | ||
}, | ||
{ | ||
"name": "capability", | ||
"value": { | ||
"value": { | ||
"borrowType": { | ||
"type": { | ||
"type": "", | ||
"kind": "Resource", | ||
"typeID": "A.befbaccb5032a457.ContractManager.Manager", | ||
"fields": [ | ||
{ "type": { "kind": "UInt64" }, "id": "uuid" }, | ||
{ | ||
"type": { | ||
"type": { | ||
"kind": "Account" | ||
}, | ||
"kind": "Reference", | ||
"authorization": { | ||
"kind": "EntitlementConjunctionSet", | ||
"entitlements": [ | ||
{ "kind": "Entitlement", "typeID": "Storage" }, | ||
{ "kind": "Entitlement", "typeID": "Contracts" }, | ||
{ "kind": "Entitlement", "typeID": "Keys" }, | ||
{ "kind": "Entitlement", "typeID": "Inbox" }, | ||
{ "kind": "Entitlement", "typeID": "Capabilities" } | ||
] | ||
} | ||
}, | ||
"kind": "Capability", | ||
"id": "acct" | ||
}, | ||
{ | ||
"type": { | ||
"type": { | ||
"type": "", | ||
"kind": "Resource", | ||
"typeID": "A.707c0b39a8d689cb.FungibleTokenRouter.Router", | ||
"fields": [ | ||
{ "type": { "kind": "UInt64" }, "id": "uuid" }, | ||
{ "type": { "kind": "Address" }, "id": "defaultAddress" }, | ||
{ | ||
"type": { | ||
"key": { "kind": "String" }, | ||
"value": { "kind": "Address" }, | ||
"kind": "Dictionary" | ||
}, | ||
"id": "addressOverrides" | ||
} | ||
] | ||
}, | ||
"kind": "Reference", | ||
"authorization": { | ||
"kind": "EntitlementConjunctionSet", | ||
"entitlements": [ | ||
{ | ||
"kind": "Entitlement", | ||
"typeID": "A.707c0b39a8d689cb.FungibleTokenRouter.Owner" | ||
} | ||
] | ||
} | ||
}, | ||
"kind": "Capability", | ||
"id": "routerCap" | ||
}, | ||
{ | ||
"type": { | ||
"key": { "kind": "String" }, | ||
"value": { "kind": "AnyStruct" }, | ||
"kind": "Dictionary" | ||
}, | ||
"id": "data" | ||
}, | ||
{ | ||
"type": { | ||
"key": { "kind": "String" }, | ||
"value": { "kind": "AnyResource" }, | ||
"kind": "Dictionary" | ||
}, | ||
"id": "resources" | ||
} | ||
] | ||
}, | ||
"kind": "Reference", | ||
"authorization": { | ||
"kind": "Unauthorized", | ||
"entitlements": null | ||
} | ||
}, | ||
"address": "0x0342200ce19810f6", | ||
"id": "148" | ||
}, | ||
"type": "Capability" | ||
} | ||
} | ||
] | ||
}, | ||
"type": "Event" | ||
} | ||
] |
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Added example which makes a mainnet call to the failing tx ID
ef6e6dcba87c5f853e0ec940dd382d609ffe11109c28ed239843d71618fa1d71
, will remove this before merging changes