Stellar-transaction.x in stellar-base-0.12.0

- old
+ new

@@ -281,11 +281,11 @@
 };
 
 struct TimeBounds
 {
     uint64 minTime;
-    uint64 maxTime;
+    uint64 maxTime; // 0 here means no maxTime
 };
 
 /* a transaction is a container for a set of operations
     - is executed by an account
     - fees are collected from the account
@@ -319,15 +319,28 @@
         void;
     }
     ext;
 };
 
+struct TransactionSignaturePayload {
+    Hash networkId;
+    union switch (EnvelopeType type)
+    {
+    case ENVELOPE_TYPE_TX:
+          Transaction tx;
+    /* All other values of type are invalid */
+    } taggedTransaction;
+};
+
 /* A TransactionEnvelope wraps a transaction with signatures. */
 struct TransactionEnvelope
 {
     Transaction tx;
-    DecoratedSignature signatures<20>;
+    /* Each decorated signature is a signature over the SHA256 hash of
+     * a TransactionSignaturePayload */
+    DecoratedSignature
+    signatures<20>;
 };
 
 /* Operation Results section */
 
 /* This result is used when offers are taken during an operation */
@@ -530,11 +543,12 @@
     // codes considered as "failure" for the operation
     CHANGE_TRUST_MALFORMED = -1,     // bad input
     CHANGE_TRUST_NO_ISSUER = -2,     // could not find issuer
     CHANGE_TRUST_INVALID_LIMIT = -3, // cannot drop limit below balance
                                      // cannot create with a limit of 0
-    CHANGE_TRUST_LOW_RESERVE = -4 // not enough funds to create a new trust line
+    CHANGE_TRUST_LOW_RESERVE = -4, // not enough funds to create a new trust line,
+    CHANGE_TRUST_SELF_NOT_ALLOWED = -5 // trusting self is not allowed
 };
 
 union ChangeTrustResult switch (ChangeTrustResultCode code)
 {
 case CHANGE_TRUST_SUCCESS:
@@ -552,10 +566,11 @@
     // codes considered as "failure" for the operation
     ALLOW_TRUST_MALFORMED = -1,     // asset is not ASSET_TYPE_ALPHANUM
     ALLOW_TRUST_NO_TRUST_LINE = -2, // trustor does not have a trustline
                                     // source account does not require trust
     ALLOW_TRUST_TRUST_NOT_REQUIRED = -3,
-    ALLOW_TRUST_CANT_REVOKE = -4 // source account can't revoke trust
+    ALLOW_TRUST_CANT_REVOKE = -4, // source account can't revoke trust,
+    ALLOW_TRUST_SELF_NOT_ALLOWED = -5 // trusting self is not allowed
 };
 
 union AllowTrustResult switch (AllowTrustResultCode code)
 {
 case ALLOW_TRUST_SUCCESS: