summary refs log tree commit diff
path: root/synapse/federation/federation_client.py (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Don't assume that an event has an origin fieldErik Johnston2020-09-161-3/+4
| | | | This fixes #8319.
* Convert federation client to async/await. (#7975)Patrick Cloke2020-07-301-4/+4
|
* Convert synapse.app to async/await. (#7868)Patrick Cloke2020-07-171-21/+19
|
* Fix some spelling mistakes / typos. (#7811)Patrick Cloke2020-07-091-2/+2
|
* Add `HomeServer.signing_key` property (#7805)Richard van der Hoff2020-07-081-1/+1
| | | ... instead of duplicating `config.signing_key[0]` everywhere
* async/await is_server_admin (#7363)Andrew Morgan2020-05-011-3/+2
|
* Further improvements to requesting the public rooms list on a homeserver ↵Andrew Morgan2020-05-011-9/+28
| | | | which has it set to private (#7368)
* Fix a bug in the federation API which could cause occasional "Failed to get ↵Patrick Cloke2020-03-191-11/+8
| | | | PDU" errors (#7089).
* Remove unused federation endpoint (`query_auth`) (#7026)Patrick Cloke2020-03-171-1/+79
|
* Add some type annotations to the federation base & client classes (#6995)Patrick Cloke2020-02-281-5/+5
|
* Pass room_version into `event_from_pdu_json`Richard van der Hoff2020-02-061-19/+16
| | | | It's called from all over the shop, so this one's a bit messy.
* pass room version into FederationClient.send_join (#6854)Richard van der Hoff2020-02-061-28/+32
| | | | ... which allows us to sanity-check the create event.
* Simplify `room_version` handling in `FederationClient.send_invite`Richard van der Hoff2020-02-051-10/+6
|
* Pass room version object into `FederationClient.get_pdu`Richard van der Hoff2020-02-051-3/+5
|
* make FederationClient._do_send_invite asyncRichard van der Hoff2020-02-051-10/+7
|
* Apply suggestions from code reviewRichard van der Hoff2020-02-051-2/+4
| | | Co-Authored-By: Erik Johnston <erik@matrix.org>
* make FederationClient.send_invite asyncRichard van der Hoff2020-02-031-6/+5
|
* make FederationClient.get_missing_events asyncRichard van der Hoff2020-02-031-20/+20
|
* make FederationClient._do_send_leave asyncRichard van der Hoff2020-02-031-4/+3
|
* make FederationClient.send_leave.send_request asyncRichard van der Hoff2020-02-031-5/+2
|
* make FederationClient._do_send_join asyncRichard van der Hoff2020-02-031-4/+3
|
* make FederationClient.send_join.send_request asyncRichard van der Hoff2020-02-031-4/+3
|
* make FederationClient.make_membership_event.send_request asyncRichard van der Hoff2020-02-031-4/+3
|
* make FederationClient._try_destination_list asyncRichard van der Hoff2020-02-031-10/+26
|
* make FederationClient.send_leave asyncRichard van der Hoff2020-02-031-10/+9
|
* make FederationClient.send_join asyncRichard van der Hoff2020-02-031-11/+13
|
* make FederationClient.make_membership_event asyncRichard van der Hoff2020-02-031-10/+11
|
* make FederationClient.get_event_auth asyncRichard van der Hoff2020-02-031-6/+4
|
* make FederationClient.get_room_state_ids asyncRichard van der Hoff2020-02-031-4/+5
|
* make FederationClient.get_pdu asyncRichard van der Hoff2020-02-031-15/+17
|
* make FederationClient.backfill asyncRichard van der Hoff2020-02-031-15/+11
|
* Merge pull request #6806 from matrix-org/rav/redact_changes/3Richard van der Hoff2020-01-311-3/+1
|\ | | | | Pass room_version into add_hashes_and_signatures
| * Pass room_version into create_local_event_from_event_dictRichard van der Hoff2020-01-301-3/+1
| |
* | s/get_room_version/get_room_version_id/Richard van der Hoff2020-01-311-5/+5
|/ | | | | ... to make way for a forthcoming get_room_version which returns a RoomVersion object.
* Add `rooms.room_version` column (#6729)Erik Johnston2020-01-271-17/+33
| | | This is so that we don't have to rely on pulling it out from `current_state_events` table.
* Merge pull request #6349 from matrix-org/babolivier/msc1802Brendan Abolivier2019-12-111-12/+76
|\ | | | | Implement v2 APIs for send_join and send_leave
| * Merge branch 'develop' into babolivier/msc1802Brendan Abolivier2019-12-051-3/+3
| |\
| * | LintBrendan Abolivier2019-11-111-3/+2
| | |
| * | Implement v2 API for send_leaveBrendan Abolivier2019-11-111-4/+37
| | |
| * | Add missing yieldBrendan Abolivier2019-11-111-1/+1
| | |
| * | Implement v2 API for send_joinBrendan Abolivier2019-11-111-7/+39
| | |
* | | Move get_state methods into FederationHandler (#6503)Richard van der Hoff2019-12-101-80/+11
| | | | | | | | | | | | | | | This is a non-functional refactor as a precursor to some other work.
* | | Refactor get_events_from_store_or_dest to return a dict (#6501)Richard van der Hoff2019-12-101-29/+15
| | | | | | | | | | | | | | | There was a bunch of unnecessary conversion back and forth between dict and list going on here. We can simplify a bunch of the code.
* | | Remove fallback for missing /federation/v1/state_ids API (#6488)Richard van der Hoff2019-12-091-72/+17
| |/ |/| | | | | This API was added way back in 0.17.0; the code here is annoying to maintain and entirely redundant.
* | Replace instance variations of homeserver with correct case/spacingAndrew Morgan2019-11-121-3/+3
|/
* Depublish a room from the public rooms list when it is upgraded (#6232)Andrew Morgan2019-11-011-1/+1
|
* Remove usage of deprecated logger.warn method from codebase (#6271)Andrew Morgan2019-10-311-3/+5
| | | Replace every instance of `logger.warn` with `logger.warning` as the former is deprecated.
* use %r to __repr__ objectsMichael Kaye2019-10-241-1/+1
| | | | This avoids calculating __repr__ unless we are going to log.
* rip out some unreachable codeRichard van der Hoff2019-10-171-38/+0
| | | | The only possible rejection reason is AUTH_ERROR, so all of this is unreachable.
* Remove unnecessary parentheses around return statements (#5931)Andrew Morgan2019-08-301-4/+4
| | | | | Python will return a tuple whether there are parentheses around the returned values or not. I'm just sick of my editor complaining about this all over the place :)
* Return 502 not 500 when failing to reach any remote server.Erik Johnston2019-08-011-4/+3
|
* Room Complexity Client Implementation (#5783)Amber Brown2019-07-301-0/+36
|
* Replace returnValue with return (#5736)Amber Brown2019-07-231-24/+22
|
* Move logging utilities out of the side drawer of util/ and into logging/ (#5606)Amber Brown2019-07-041-4/+4
|
* Run Black. (#5482)Amber Brown2019-06-201-109/+108
|
* Clean up debug logging (#5347)Richard van der Hoff2019-06-051-3/+13
| | | Remove some spurious stuff, clarify some other stuff
* Fix failure to fetch batches of PDUs (#5342)Richard van der Hoff2019-06-041-0/+1
| | | | | FederationClient.get_pdu is called in a loop to fetch a batch of PDUs. A failure to fetch one should not result in a failure of the whole batch. Add the missing `continue`.
* Rename get_events->get_events_from_store_or_dest (#5344)Richard van der Hoff2019-06-041-20/+13
| | | | | We have too many things called get_event, and it's hard to figure out what we mean. Also remove some unused params from the signature, and add some logging.
* Collect room-version variations into one place (#4969)Richard van der Hoff2019-04-011-14/+15
| | | | Collect all the things that make room-versions different to one another into one place, so that it's easier to define new room versions.
* MSC 1866 - Use M_UNSUPPORTED_ROOM_VERSION for invite APIErik Johnston2019-02-231-1/+17
|
* Only check event ID domain for signatures for V1 eventsErik Johnston2019-01-291-3/+3
| | | | | In future version events won't have an event ID, so we won't be able to do this check.
* Merge pull request #4481 from matrix-org/erikj/event_builderErik Johnston2019-01-291-14/+6
|\ | | | | Refactor event building into EventBuilder
| * Refactor event building into EventBuilderErik Johnston2019-01-291-14/+6
| | | | | | | | | | This is so that everything is done in one place, making it easier to change the event format based on room version
* | Implement fallback for V2 invite APIErik Johnston2019-01-281-12/+52
|/ | | | | If the room version is either 1 or 2 then a server should retry failed `/v2/invite` requests with the v1 API
* Require event format version to parse or create eventsErik Johnston2019-01-251-23/+37
|
* Merge branch 'develop' of github.com:matrix-org/synapse into erikj/msc_1813Erik Johnston2019-01-251-9/+53
|\
| * Merge pull request #4448 from matrix-org/erikj/get_pdu_versionsErik Johnston2019-01-241-7/+40
| |\ | | | | | | Add room_version param to get_pdu
| | * Review commentsErik Johnston2019-01-241-1/+2
| | |
| | * Add room_version param to get_pduErik Johnston2019-01-231-7/+39
| | | | | | | | | | | | | | | When we add new event format we'll need to know the event format or room version when parsing events.
| * | Update make_membership_event docsErik Johnston2019-01-241-2/+5
| | |
| * | Remove unnecessary '_sign_event'Erik Johnston2019-01-231-1/+8
| | |
| * | Store rejected remote invite events as outliersErik Johnston2019-01-231-2/+8
| |/ | | | | | | | | | | | | | | | | | | | | Currently they're stored as non-outliers even though the server isn't in the room, which can be problematic in places where the code assumes it has the state for all non outlier events. In particular, there is an edge case where persisting the leave event triggers a state resolution, which requires looking up the room version from state. Since the server doesn't have the state, this causes an exception to be thrown.
* | Review commentsErik Johnston2019-01-241-1/+2
| |
* | Implement MSC 1813 - Add room version to make APIsErik Johnston2019-01-231-5/+16
|/ | | | | We also implement `make_membership_event` converting the returned room version to an event format version.
* more commentsRichard van der Hoff2018-09-271-2/+0
|
* fix docstring for FederationClient.get_state_for_roomRichard van der Hoff2018-09-261-4/+4
| | | | trivial fixes for docstring
* Fix some instances of ExpiringCache not expiring cache itemsErik Johnston2018-09-211-16/+12
| | | | | | | | ExpiringCache required that `start()` be called before it would actually start expiring entries. A number of places didn't do that. This PR removes `start` from ExpiringCache, and automatically starts backround reaping process on creation instead.
* Port federation/ to py3 (#3847)Amber Brown2018-09-121-4/+4
|
* Check m.room.create for sane room_versionsRichard van der Hoff2018-08-061-3/+23
|
* include known room versions in outgoing make_joinsRichard van der Hoff2018-08-061-3/+5
|
* sanity check response from make_joinRichard van der Hoff2018-08-031-1/+3
|
* Refactor code for turning HttpResponseException into SynapseErrorRichard van der Hoff2018-08-011-2/+2
| | | | | | | | This commit replaces SynapseError.from_http_response_exception with HttpResponseException.to_synapse_error. The new method actually returns a ProxiedRequestError, which allows us to pass through additional metadata from the API call.
* Be more careful which errors we send back over the C-S APIRichard van der Hoff2018-08-011-12/+17
| | | | | | | | | | | | We really shouldn't be sending all CodeMessageExceptions back over the C-S API; it will include things like 401s which we shouldn't proxy. That means that we need to explicitly turn a few HttpResponseExceptions into SynapseErrors in the federation layer. The effect of the latter is that the matrix errcode will get passed through correctly to calling clients, which might help with some of the random M_UNKNOWN errors when trying to join rooms.
* Factor out exception handling in federation_clientRichard van der Hoff2018-08-011-129/+148
| | | | | Factor out the error handling from make_membership_event, send_join, and send_leave, so that it can be shared.
* run isortAmber Brown2018-07-091-7/+7
|
* Consistently use six's iteritems and wrap lazy keys/values in list() if ↵Amber Brown2018-05-311-2/+2
| | | | they're not meant to be lazy (#3307)
* replacing portionsAmber Brown2018-05-211-10/+7
|
* Merge branch 'develop' into py3-xrange-1Richard van der Hoff2018-04-301-2/+3
|\
| * Use run_in_background in preference to preserve_fnRichard van der Hoff2018-04-271-2/+3
| | | | | | | | | | | | While I was going through uses of preserve_fn for other PRs, I converted places which only use the wrapped function once to use run_in_background, to avoid creating the function object.
* | Move more xrange to sixAdrian Tschira2018-04-281-1/+3
|/ | | | | | plus a bonus next() Signed-off-by: Adrian Tschira <nota@notafile.com>
* Refactor store.have_eventsRichard van der Hoff2018-04-201-1/+1
| | | | | | It turns out that most of the time we were calling have_events, we were only using half of the result. Replace have_events with have_seen_events and get_rejection_reasons, so that we can see what's going on a bit more clearly.
* Move property setting from ReplicationLayer to FederationBaseErik Johnston2018-03-131-0/+1
|
* Add federation_domain_whitelist option (#2820)Matthew Hodgson2018-01-221-1/+4
| | | | | | Add federation_domain_whitelist gives a way to restrict which domains your HS is allowed to federate with. useful mainly for gracefully preventing a private but internet-connected HS from trying to federate to the wider public Matrix network
* Factor out `event_from_pdu_json`Richard van der Hoff2017-12-301-21/+15
| | | | | turns out we have two copies of this, and neither needs to be an instance method
* federation_client: clean up importsRichard van der Hoff2017-12-301-13/+10
|
* Remove preserve_context_over_{fn, deferred}Richard van der Hoff2017-11-141-2/+2
| | | | | Both of these functions ae known to leak logcontexts. Replace the remaining calls to them and kill them off.
* Fix logcontexts in _check_sigs_and_hashesRichard van der Hoff2017-09-201-4/+4
|
* Fix some lies, and other clarifications, in docstringsRichard van der Hoff2017-04-211-2/+48
| | | | | The documentation on get_json has been wrong ever since the very first commit to synapse...
* Ignore backoff history for invites, aliases, and roomdirsRichard van der Hoff2017-03-231-2/+5
| | | | | Add a param to the federation client which lets us ignore historical backoff data for federation queries, and set it for a handful of operations.
* push federation retry limiter down to matrixfederationclientRichard van der Hoff2017-03-231-20/+13
| | | | | rather than having to instrument everywhere we make a federation call, make the MatrixFederationHttpClient manage the retry limiter.
* Fix docstringRichard van der Hoff2017-03-091-2/+1
|
* Implement device key caching over federationErik Johnston2017-01-261-0/+10
|
* Fix couple of federation state bugsErik Johnston2017-01-171-2/+4
|
* limit total timeout for get_missing_events to 10sMatthew Hodgson2016-12-311-1/+3
|
* Remove fallback from get_missing_events.Mark Haines2016-12-301-69/+0
| | | | | | | get_missing_events used to fallback to fetching the missing events individually requesting from every server in the room, one by one.e This could be unacceptably slow, possibly causing #1732
* Add new API appservice specific public room listErik Johnston2016-12-061-2/+5
|
* Use new federation_sender DIErik Johnston2016-11-161-49/+0
|
* Add transaction queue and transport layer to DIErik Johnston2016-11-161-1/+0
|
* Move logic into transaction_queueErik Johnston2016-11-161-14/+2
|
* Rename transaction queue functions to send_*Erik Johnston2016-11-161-7/+7
|
* Time out typing over federationErik Johnston2016-09-231-2/+0
|
* Support filtering remote room listsErik Johnston2016-09-161-2/+5
|
* Pass since/from parameters over federationErik Johnston2016-09-151-18/+4
|
* Merge pull request #1110 from matrix-org/markjh/e2e_timeoutMark Haines2016-09-131-4/+8
|\ | | | | Add a timeout parameter for end2end key queries.
| * Add a timeout parameter for end2end key queries.Mark Haines2016-09-121-4/+8
| | | | | | | | | | | | | | | | | | | | Add a timeout parameter for controlling how long synapse will wait for responses from remote servers. For servers that fail include how they failed to make it easier to debug. Fetch keys from different servers in parallel rather than in series. Set the default timeout to 10s.
* | Fix backfill when cannot find an event.Erik Johnston2016-09-121-1/+1
|/ | | | `get_pdu` can succeed but return None.
* Clobber EDUs in send queueErik Johnston2016-09-091-2/+6
|
* Add a new method to enqueue the device messages rather than sending a dummy EDUMark Haines2016-09-071-0/+6
|
* Merge branch 'erikj/pdu_check' of github.com:matrix-org/synapse into developErik Johnston2016-09-011-5/+5
|\
| * Ensure we only return a validated pdu in get_pduErik Johnston2016-09-011-5/+5
| |
* | Use state handler instead of get_users_in_room/get_joined_hostsErik Johnston2016-08-261-1/+4
|/
* Preserve some logcontextsErik Johnston2016-08-241-6/+11
|
* Don't stop on 4xx series errorsErik Johnston2016-08-101-11/+1
|
* Also pull out rejected eventsErik Johnston2016-08-101-1/+1
|
* Store if we fail to fetch an event from a destinationErik Johnston2016-08-101-1/+36
|
* Fix a couple of python bugsErik Johnston2016-08-051-6/+8
|
* Retry joining via other servers if first one failedErik Johnston2016-08-051-5/+16
|
* Fix typoErik Johnston2016-08-051-1/+1
|
* Check if we already have the events returned by /state/Erik Johnston2016-08-051-2/+16
|
* Fallback to /state/ on both 400 and 404Erik Johnston2016-08-051-1/+1
|
* Tweak integrity error recovery to work as intendedBenjamin Saunders2016-08-041-1/+1
|
* Fix typos.Erik Johnston2016-08-041-3/+3
|
* Tidy up get_eventsErik Johnston2016-08-041-12/+10
|
* Rename fields to _idsErik Johnston2016-08-031-2/+2
|
* Fix copy + paste failsErik Johnston2016-08-031-5/+10
|
* Actually call get_room_stateErik Johnston2016-08-031-0/+4
|
* Fix syntax errorErik Johnston2016-08-031-1/+8
|
* CommentErik Johnston2016-08-031-0/+14
|
* Add /state_ids federation APIErik Johnston2016-08-031-3/+70
| | | | | The new API only returns the event_ids for the state, as most requesters will already have the vast majority of the events already.
* Linearize fetching of gaps on incoming eventsErik Johnston2016-06-151-0/+2
| | | | | This potentially stops the server from doing multiple requests for the same data.
* Apparently I am not permitted to have two blank lines hereDavid Baker2016-05-311-1/+0
|
* Basic, un-cached support for secondary_directory_serversDavid Baker2016-05-311-0/+21
|
* Intern all the thingsErik Johnston2016-03-231-0/+1
|
* Add profile information to invitesErik Johnston2016-03-041-1/+1
|
* Fix flake8 warnings for new flake8Daniel Wagner-Hall2016-02-021-1/+1
|
* copyrightsMatthew Hodgson2016-01-071-1/+1
|
* Don't complain if /make_join response lacks 'prev_state' list (SYN-517)Paul "LeoNerd" Evans2015-11-131-0/+6
|
* Fix missing profile data in federation joinsErik Johnston2015-11-121-1/+4
| | | | | There was a regression where we stopped including profile data in initial joins for rooms joined over federation.
* Exchange 3pid invites for m.room.member invitesDaniel Wagner-Hall2015-11-051-8/+25
|
* Allow rejecting invitesDaniel Wagner-Hall2015-10-201-6/+61
| | | | | This is done by using the same /leave flow as you would use if you had already accepted the invite and wanted to leave.
* Look for keys on the right objectsDaniel Wagner-Hall2015-10-151-1/+3
|
* Remove unnecessary class-wrappingDaniel Wagner-Hall2015-10-131-3/+3
|
* Move event contents into third_party_layout fieldDaniel Wagner-Hall2015-10-131-2/+2
|
* Fix lint errorsDaniel Wagner-Hall2015-10-061-1/+0
|
* Implement third party identifier invitesDaniel Wagner-Hall2015-10-011-2/+7
|
* Merge pull request #208 from matrix-org/markjh/end-to-end-key-federationMark Haines2015-08-181-0/+30
|\ | | | | Federation for end-to-end key requests.
| * Get the end-to-end key federation workingMark Haines2015-07-241-8/+4
| |
| * Add federation support for end-to-end key requestsMark Haines2015-07-231-0/+34
| |
* | Move all the caches into their own package, synapse.util.cachesErik Johnston2015-08-111-1/+1
|/
* Implement bulk verify_signed_json APIErik Johnston2015-06-261-14/+43
|
* Remove redundant for loopErik Johnston2015-05-221-3/+0
|
* Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2015-05-221-0/+2
|\ | | | | | | erikj/backfill_fixes
| * Add doc stringsErik Johnston2015-05-221-0/+2
| |
* | Merge branch 'erikj/join_perf' of github.com:matrix-org/synapse into ↵Erik Johnston2015-05-211-3/+3
|\| | | | | | | erikj/backfill_fixes
| * Merge branch 'develop' of github.com:matrix-org/synapse into erikj/join_perfErik Johnston2015-05-211-3/+3
| |\
| | * Remove pointless newlineErik Johnston2015-05-181-1/+0
| | |
| | * Remove debug loggingErik Johnston2015-05-181-8/+0
| | |
| | * Fix daedlockErik Johnston2015-05-151-3/+12
| | |
* | | Actually fetch state for new backwards extremeties when backfilling.Erik Johnston2015-05-201-1/+5
|/ /
* | Add None checkErik Johnston2015-05-191-1/+1
| |
* | Add a timeout param to get_eventErik Johnston2015-05-191-9/+14
|/
* Missed events are not outliersErik Johnston2015-05-051-1/+1
|
* Replace the @metrics.counted annotations in federation with ↵Paul "LeoNerd" Evans2015-03-121-12/+15
| | | | specifically-written counters and distributions
* Initial attempt at sprinkling some @metrics.counted decorations around the ↵Paul "LeoNerd" Evans2015-03-121-0/+14
| | | | federation code
* Delete pointless (and unreachable) __init__ method from FederationClientPaul "LeoNerd" Evans2015-03-121-2/+0
|
* Remove unecessary checkErik Johnston2015-03-051-6/+0
|
* Respect min_depth argumentErik Johnston2015-03-051-4/+6
|
* Docs.Erik Johnston2015-03-051-0/+16
|
* Handle if get_missing_pdu returns 400 or not all events.Erik Johnston2015-03-051-13/+96
|
* Implement and use new batched get missing pduErik Johnston2015-02-231-0/+19
|
* Merge branch 'keyclient_retry_scheme' of github.com:matrix-org/synapse into ↵Erik Johnston2015-02-181-12/+25
|\ | | | | | | develop
| * Add per server retry limiting.Erik Johnston2015-02-171-12/+24
| | | | | | | | | | Factor out the pre destination retry logic from TransactionQueue so it can be reused in both get_pdu and crypto.keyring
* | Rename _fail_fetch_pdu_cache to _get_pdu_cacheErik Johnston2015-02-181-8/+8
| |
* | Cache results of get_pdu.Erik Johnston2015-02-161-3/+39
|/
* Connection errors in twisted aren't RuntimeErrorsErik Johnston2015-02-051-2/+2
|
* Pass through list of room hosts from room alias query to federation so that ↵Erik Johnston2015-02-051-1/+4
| | | | it can retry against different room hosts
* Apply sanity to the transport client interface. Convert 'make_join' and ↵Erik Johnston2015-02-041-31/+51
| | | | 'send_join' to accept iterables of destinations
* Retry make_joinErik Johnston2015-02-041-7/+12
|
* Keep around the old (buggy) version of the prune_event function so that we ↵Erik Johnston2015-02-031-94/+2
| | | | can use it to check signatures for events on old servers
* PEP8Erik Johnston2015-02-031-1/+0
|
* Don't bother requesting PDUs with bad signatures from the same serverErik Johnston2015-02-021-16/+17
|
* Don't fail an entire request if one of the returned events fails a signature ↵Erik Johnston2015-02-021-26/+81
| | | | check. If an event does fail a signature check, look in the local database and request it from the originator.
* Fix bug where we superfluously asked for current state. Change API of ↵Erik Johnston2015-01-301-6/+1
| | | | /query_auth/ so that we don't duplicate events in the response.
* Initial implementation of auth conflict resolutionErik Johnston2015-01-291-1/+1
|
* Start implementing auth conflict resErik Johnston2015-01-281-0/+39
|
* Make it the responsibility of the replication layer to check signature and ↵Erik Johnston2015-01-261-13/+95
| | | | hashes.
* Split up replication_layer module into client, server and transaction queueErik Johnston2015-01-261-0/+293