summary refs log tree commit diff
path: root/synapse/federation/units.py
diff options
context:
space:
mode:
authorMark Haines <mjark@negativecurvature.net>2014-10-14 10:06:04 +0100
committerMark Haines <mjark@negativecurvature.net>2014-10-14 10:06:04 +0100
commit636a0dbde7082a485c0d4ac58137ecb75f7f23fe (patch)
tree780ad4589dbde7e0fab416496faee5f3c351d169 /synapse/federation/units.py
parentReplace on_send_callback with something a bit clearer so that we can sign mes... (diff)
parenttypoe (diff)
downloadsynapse-636a0dbde7082a485c0d4ac58137ecb75f7f23fe.tar.xz
Merge pull request #8 from matrix-org/server2server_signing
Server2server signing
Diffstat (limited to 'synapse/federation/units.py')
-rw-r--r--synapse/federation/units.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/synapse/federation/units.py b/synapse/federation/units.py
index 622fe66a8f..ecca35ac43 100644
--- a/synapse/federation/units.py
+++ b/synapse/federation/units.py
@@ -186,6 +186,8 @@ class Transaction(JsonEncodedObject):
         "previous_ids",
         "pdus",
         "edus",
+        "transaction_id",
+        "destination",
     ]
 
     internal_keys = [