Stellar-transaction.x in stellar-base-0.2.0

- old
+ new

@@ -51,11 +51,11 @@
     Result: PaymentResult
 */
 struct PaymentOp
 {
     AccountID destination; // recipient of the payment
-    Asset asset;     // what they end up with
+    Asset asset;           // what they end up with
     int64 amount;          // amount they end up with
 };
 
 /* PathPayment
 
@@ -69,16 +69,16 @@
 Result: PathPaymentResult
 */
 struct PathPaymentOp
 {
     Asset sendAsset; // asset we pay with
-    int64 sendMax;         // the maximum amount of sendAsset to
-                           // send (excluding fees).
-                           // The operation will fail if can't be met
+    int64 sendMax;   // the maximum amount of sendAsset to
+                     // send (excluding fees).
+                     // The operation will fail if can't be met
 
     AccountID destination; // recipient of the payment
-    Asset destAsset; // what they end up with
+    Asset destAsset;       // what they end up with
     int64 destAmount;      // amount they end up with
 
     Asset path<5>; // additional hops it must go through to get there
 };
 
@@ -107,14 +107,14 @@
 Result: CreatePassiveOfferResult
 
 */
 struct CreatePassiveOfferOp
 {
-    Asset selling;  // A
-    Asset buying;   // B
-    int64 amount;   // amount taker gets. if set to 0, delete the offer
-    Price price;    // cost of A in terms of B
+    Asset selling; // A
+    Asset buying;  // B
+    int64 amount;  // amount taker gets. if set to 0, delete the offer
+    Price price;   // cost of A in terms of B
 };
 
 /* Set Account Options
 
     updates "AccountEntry" fields.
@@ -176,11 +176,11 @@
     {
     // ASSET_TYPE_NATIVE is not allowed
     case ASSET_TYPE_CREDIT_ALPHANUM4:
         opaque assetCode4[4];
 
-	case ASSET_TYPE_CREDIT_ALPHANUM12:
+    case ASSET_TYPE_CREDIT_ALPHANUM12:
         opaque assetCode12[12];
 
         // add other asset types here in the future
     }
     asset;
@@ -314,20 +314,20 @@
 
 /* This result is used when offers are taken during an operation */
 struct ClaimOfferAtom
 {
     // emited to identify the offer
-    AccountID offerOwner; // Account that owns the offer
+    AccountID sellerID; // Account that owns the offer
     uint64 offerID;
 
     // amount and asset taken from the owner
-    Asset assetClaimed;
-    int64 amountClaimed;
+    Asset assetSold;
+    int64 amountSold;
 
-    // amount and assetsent to the owner
-    Asset assetSend;
-    int64 amountSend;
+    // amount and asset sent to the owner
+    Asset assetBought;
+    int64 amountBought;
 };
 
 /******* CreateAccount Result ********/
 
 enum CreateAccountResultCode
@@ -362,11 +362,11 @@
     PAYMENT_MALFORMED = -1,          // bad input
     PAYMENT_UNDERFUNDED = -2,        // not enough funds in source account
     PAYMENT_SRC_NO_TRUST = -3,       // no trust line on source account
     PAYMENT_SRC_NOT_AUTHORIZED = -4, // source not authorized to transfer
     PAYMENT_NO_DESTINATION = -5,     // destination account does not exist
-    PAYMENT_NO_TRUST = -6, // destination missing a trust line for asset
+    PAYMENT_NO_TRUST = -6,       // destination missing a trust line for asset
     PAYMENT_NOT_AUTHORIZED = -7, // destination not authorized to hold asset
     PAYMENT_LINE_FULL = -8       // destination would go above their limit
 };
 
 union PaymentResult switch (PaymentResultCode code)
@@ -388,15 +388,16 @@
     PATH_PAYMENT_MALFORMED = -1,          // bad input
     PATH_PAYMENT_UNDERFUNDED = -2,        // not enough funds in source account
     PATH_PAYMENT_SRC_NO_TRUST = -3,       // no trust line on source account
     PATH_PAYMENT_SRC_NOT_AUTHORIZED = -4, // source not authorized to transfer
     PATH_PAYMENT_NO_DESTINATION = -5,     // destination account does not exist
-    PATH_PAYMENT_NO_TRUST = -6,       // dest missing a trust line for asset
-    PATH_PAYMENT_NOT_AUTHORIZED = -7, // dest not authorized to hold asset
-    PATH_PAYMENT_LINE_FULL = -8,      // dest would go above their limit
-    PATH_PAYMENT_TOO_FEW_OFFERS = -9, // not enough offers to satisfy path
-    PATH_PAYMENT_OVER_SENDMAX = -10   // could not satisfy sendmax
+    PATH_PAYMENT_NO_TRUST = -6,           // dest missing a trust line for asset
+    PATH_PAYMENT_NOT_AUTHORIZED = -7,     // dest not authorized to hold asset
+    PATH_PAYMENT_LINE_FULL = -8,          // dest would go above their limit
+    PATH_PAYMENT_TOO_FEW_OFFERS = -9,     // not enough offers to satisfy path
+    PATH_PAYMENT_OFFER_CROSS_SELF = -10,  // would cross one of its own offers
+    PATH_PAYMENT_OVER_SENDMAX = -11       // could not satisfy sendmax
 };
 
 struct SimplePaymentResult
 {
     AccountID destination;
@@ -553,11 +554,11 @@
 };
 
 union AccountMergeResult switch (AccountMergeResultCode code)
 {
 case ACCOUNT_MERGE_SUCCESS:
-    void;
+    int64 sourceAccountBalance; // how much got transfered from source account
 default:
     void;
 };
 
 /******* Inflation Result ********/
@@ -627,10 +628,10 @@
 
 enum TransactionResultCode
 {
     txSUCCESS = 0, // all operations succeeded
 
-    txFAILED = -1, // one of the operations failed (but none were applied)
+    txFAILED = -1, // one of the operations failed (none were applied)
 
     txTOO_EARLY = -2,         // ledger closeTime before minTime
     txTOO_LATE = -3,          // ledger closeTime after maxTime
     txMISSING_OPERATION = -4, // no operation was specified
     txBAD_SEQ = -5,           // sequence number does not match source account