stellar-base 0.19.0 → 0.20.0

data/xdr/Stellar-ledger-entries.x

@@ -12,8 +12,15 @@ typedef opaque Thresholds[4];
 typedef string string32<32>;
 typedef string string64<64>;
 typedef int64 SequenceNumber;
+typedef uint64 TimePoint;
 typedef opaque DataValue<64>;
 
+// 1-4 alphanumeric characters right-padded with 0 bytes
+typedef opaque AssetCode4[4];
+
+// 5-12 alphanumeric characters right-padded with 0 bytes
+typedef opaque AssetCode12[12];
+
 enum AssetType
 {
     ASSET_TYPE_NATIVE = 0,
@@ -29,14 +36,14 @@ case ASSET_TYPE_NATIVE: // Not credit
 case ASSET_TYPE_CREDIT_ALPHANUM4:
     struct
     {
-        opaque assetCode[4]; // 1 to 4 characters
+        AssetCode4 assetCode;
         AccountID issuer;
     } alphaNum4;
 
 case ASSET_TYPE_CREDIT_ALPHANUM12:
     struct
     {
-        opaque assetCode[12]; // 5 to 12 characters
+        AssetCode12 assetCode;
         AccountID issuer;
     } alphaNum12;
 
@@ -77,7 +84,7 @@ enum LedgerEntryType
 struct Signer
 {
     SignerKey key;
-    uint32 weight; // really only need 1byte
+    uint32 weight; // really only need 1 byte
 };
 
 enum AccountFlags
@@ -105,7 +112,6 @@ const MASK_ACCOUNT_FLAGS = 0x7;
     Other ledger entries created require an account.
 
 */
-
 struct AccountEntry
 {
     AccountID accountID;      // master public key for this account
@@ -210,7 +216,7 @@ const MASK_OFFERENTRY_FLAGS = 1;
 struct OfferEntry
 {
     AccountID sellerID;
-    uint64 offerID;
+    int64 offerID;
     Asset selling; // A
     Asset buying;  // B
     int64 amount;  // amount of A
@@ -283,6 +289,7 @@ enum EnvelopeType
 {
     ENVELOPE_TYPE_SCP = 1,
     ENVELOPE_TYPE_TX = 2,
-    ENVELOPE_TYPE_AUTH = 3
+    ENVELOPE_TYPE_AUTH = 3,
+    ENVELOPE_TYPE_SCPVALUE = 4
 };
 }

data/xdr/Stellar-ledger.x

@@ -10,12 +10,24 @@ namespace stellar
 
 typedef opaque UpgradeType<128>;
 
+enum StellarValueType
+{
+    STELLAR_VALUE_BASIC = 0,
+    STELLAR_VALUE_SIGNED = 1
+};
+
+struct LedgerCloseValueSignature
+{
+    NodeID nodeID;       // which node introduced the value
+    Signature signature; // nodeID's signature
+};
+
 /* StellarValue is the value used by SCP to reach consensus on a given ledger
-*/
+ */
 struct StellarValue
 {
-    Hash txSetHash;   // transaction set to apply to previous ledger
-    uint64 closeTime; // network close time
+    Hash txSetHash;      // transaction set to apply to previous ledger
+    TimePoint closeTime; // network close time
 
     // upgrades to apply to the previous ledger (usually empty)
     // this is a vector of encoded 'LedgerUpgrade' so that nodes can drop
@@ -25,17 +37,19 @@ struct StellarValue
     UpgradeType upgrades<6>;
 
     // reserved for future use
-    union switch (int v)
+    union switch (StellarValueType v)
     {
-    case 0:
+    case STELLAR_VALUE_BASIC:
         void;
+    case STELLAR_VALUE_SIGNED:
+        LedgerCloseValueSignature lcValueSignature;
     }
     ext;
 };
 
 /* The LedgerHeader is the highest level structure representing the
  * state of a ledger, cryptographically linked to previous ledgers.
-*/
+ */
 struct LedgerHeader
 {
     uint32 ledgerVersion;    // the protocol version of the ledger
@@ -120,7 +134,7 @@ case OFFER:
     struct
     {
         AccountID sellerID;
-        uint64 offerID;
+        int64 offerID;
     } offer;
 
 case DATA:
@@ -133,17 +147,38 @@ case DATA:
 
 enum BucketEntryType
 {
-    LIVEENTRY = 0,
-    DEADENTRY = 1
+    METAENTRY =
+        -1, // At-and-after protocol 11: bucket metadata, should come first.
+    LIVEENTRY = 0, // Before protocol 11: created-or-updated;
+                   // At-and-after protocol 11: only updated.
+    DEADENTRY = 1,
+    INITENTRY = 2 // At-and-after protocol 11: only created.
+};
+
+struct BucketMetadata
+{
+    // Indicates the protocol version used to create / merge this bucket.
+    uint32 ledgerVersion;
+
+    // reserved for future use
+    union switch (int v)
+    {
+    case 0:
+        void;
+    }
+    ext;
 };
 
 union BucketEntry switch (BucketEntryType type)
 {
 case LIVEENTRY:
+case INITENTRY:
     LedgerEntry liveEntry;
 
 case DEADENTRY:
     LedgerKey deadEntry;
+case METAENTRY:
+    BucketMetadata metaEntry;
 };
 
 // Transaction sets are the unit used by SCP to decide on transitions
@@ -268,7 +303,7 @@ struct OperationMeta
 struct TransactionMetaV1
 {
     LedgerEntryChanges txChanges; // tx level changes if any
-    OperationMeta operations<>; // meta for each operation
+    OperationMeta operations<>;   // meta for each operation
 };
 
 // this is the meta produced when applying transactions

data/xdr/Stellar-transaction.x

@@ -18,15 +18,16 @@ enum OperationType
     CREATE_ACCOUNT = 0,
     PAYMENT = 1,
     PATH_PAYMENT = 2,
-    MANAGE_OFFER = 3,
-    CREATE_PASSIVE_OFFER = 4,
+    MANAGE_SELL_OFFER = 3,
+    CREATE_PASSIVE_SELL_OFFER = 4,
     SET_OPTIONS = 5,
     CHANGE_TRUST = 6,
     ALLOW_TRUST = 7,
     ACCOUNT_MERGE = 8,
     INFLATION = 9,
     MANAGE_DATA = 10,
-    BUMP_SEQUENCE = 11
+    BUMP_SEQUENCE = 11,
+    MANAGE_BUY_OFFER = 12
 };
 
 /* CreateAccount
@@ -37,7 +38,6 @@ Threshold: med
 Result: CreateAccountResult
 
 */
-
 struct CreateAccountOp
 {
     AccountID destination; // account to create
@@ -88,10 +88,10 @@ struct PathPaymentOp
 
 Threshold: med
 
-Result: ManageOfferResult
+Result: ManageSellOfferResult
 
 */
-struct ManageOfferOp
+struct ManageSellOfferOp
 {
     Asset selling;
     Asset buying;
@@ -99,17 +99,36 @@ struct ManageOfferOp
     Price price;  // price of thing being sold in terms of what you are buying
 
     // 0=create a new offer, otherwise edit an existing offer
-    uint64 offerID;
+    int64 offerID;
+};
+
+/* Creates, updates or deletes an offer with amount in terms of buying asset
+
+Threshold: med
+
+Result: ManageBuyOfferResult
+
+*/
+struct ManageBuyOfferOp
+{
+    Asset selling;
+    Asset buying;
+    int64 buyAmount; // amount being bought. if set to 0, delete the offer
+    Price price;     // price of thing being bought in terms of what you are
+                     // selling
+
+    // 0=create a new offer, otherwise edit an existing offer
+    int64 offerID;
 };
 
 /* Creates an offer that doesn't take offers of the same price
 
 Threshold: med
 
-Result: CreatePassiveOfferResult
+Result: CreatePassiveSellOfferResult
 
 */
-struct CreatePassiveOfferOp
+struct CreatePassiveSellOfferOp
 {
     Asset selling; // A
     Asset buying;  // B
@@ -126,7 +145,6 @@ struct CreatePassiveOfferOp
 
     Result: SetOptionsResult
 */
-
 struct SetOptionsOp
 {
     AccountID* inflationDest; // sets the inflation destination
@@ -178,10 +196,10 @@ struct AllowTrustOp
     {
     // ASSET_TYPE_NATIVE is not allowed
     case ASSET_TYPE_CREDIT_ALPHANUM4:
-        opaque assetCode4[4];
+        AssetCode4 assetCode4;
 
     case ASSET_TYPE_CREDIT_ALPHANUM12:
-        opaque assetCode12[12];
+        AssetCode12 assetCode12;
 
         // add other asset types here in the future
     }
@@ -215,7 +233,6 @@ Result: InflationResult
 
     Result: ManageDataResult
 */
-
 struct ManageDataOp
 {
     string64 dataName;
@@ -230,7 +247,6 @@ struct ManageDataOp
 
     Result: BumpSequenceResult
 */
-
 struct BumpSequenceOp
 {
     SequenceNumber bumpTo;
@@ -252,10 +268,10 @@ struct Operation
         PaymentOp paymentOp;
     case PATH_PAYMENT:
         PathPaymentOp pathPaymentOp;
-    case MANAGE_OFFER:
-        ManageOfferOp manageOfferOp;
-    case CREATE_PASSIVE_OFFER:
-        CreatePassiveOfferOp createPassiveOfferOp;
+    case MANAGE_SELL_OFFER:
+        ManageSellOfferOp manageSellOfferOp;
+    case CREATE_PASSIVE_SELL_OFFER:
+        CreatePassiveSellOfferOp createPassiveSellOfferOp;
     case SET_OPTIONS:
         SetOptionsOp setOptionsOp;
     case CHANGE_TRUST:
@@ -270,6 +286,8 @@ struct Operation
         ManageDataOp manageDataOp;
     case BUMP_SEQUENCE:
         BumpSequenceOp bumpSequenceOp;
+    case MANAGE_BUY_OFFER:
+        ManageBuyOfferOp manageBuyOfferOp;
     }
     body;
 };
@@ -299,10 +317,13 @@ case MEMO_RETURN:
 
 struct TimeBounds
 {
-    uint64 minTime;
-    uint64 maxTime; // 0 here means no maxTime
+    TimePoint minTime;
+    TimePoint maxTime; // 0 here means no maxTime
 };
 
+// maximum number of operations per transaction
+const MAX_OPS_PER_TX = 100;
+
 /* a transaction is a container for a set of operations
     - is executed by an account
     - fees are collected from the account
@@ -310,7 +331,6 @@ struct TimeBounds
           either all operations are applied or none are
           if any returns a failing code
 */
-
 struct Transaction
 {
     // account used to run the transaction
@@ -327,7 +347,7 @@ struct Transaction
 
     Memo memo;
 
-    Operation operations<100>;
+    Operation operations<MAX_OPS_PER_TX>;
 
     // reserved for future use
     union switch (int v)
@@ -366,7 +386,7 @@ struct ClaimOfferAtom
 {
     // emitted to identify the offer
     AccountID sellerID; // Account that owns the offer
-    uint64 offerID;
+    int64 offerID;
 
     // amount and asset taken from the owner
     Asset assetSold;
@@ -470,29 +490,29 @@ default:
     void;
 };
 
-/******* ManageOffer Result ********/
+/******* ManageSellOffer Result ********/
 
-enum ManageOfferResultCode
+enum ManageSellOfferResultCode
 {
     // codes considered as "success" for the operation
-    MANAGE_OFFER_SUCCESS = 0,
+    MANAGE_SELL_OFFER_SUCCESS = 0,
 
     // codes considered as "failure" for the operation
-    MANAGE_OFFER_MALFORMED = -1,     // generated offer would be invalid
-    MANAGE_OFFER_SELL_NO_TRUST = -2, // no trust line for what we're selling
-    MANAGE_OFFER_BUY_NO_TRUST = -3,  // no trust line for what we're buying
-    MANAGE_OFFER_SELL_NOT_AUTHORIZED = -4, // not authorized to sell
-    MANAGE_OFFER_BUY_NOT_AUTHORIZED = -5,  // not authorized to buy
-    MANAGE_OFFER_LINE_FULL = -6,      // can't receive more of what it's buying
-    MANAGE_OFFER_UNDERFUNDED = -7,    // doesn't hold what it's trying to sell
-    MANAGE_OFFER_CROSS_SELF = -8,     // would cross an offer from the same user
-    MANAGE_OFFER_SELL_NO_ISSUER = -9, // no issuer for what we're selling
-    MANAGE_OFFER_BUY_NO_ISSUER = -10, // no issuer for what we're buying
+    MANAGE_SELL_OFFER_MALFORMED = -1,     // generated offer would be invalid
+    MANAGE_SELL_OFFER_SELL_NO_TRUST = -2, // no trust line for what we're selling
+    MANAGE_SELL_OFFER_BUY_NO_TRUST = -3,  // no trust line for what we're buying
+    MANAGE_SELL_OFFER_SELL_NOT_AUTHORIZED = -4, // not authorized to sell
+    MANAGE_SELL_OFFER_BUY_NOT_AUTHORIZED = -5,  // not authorized to buy
+    MANAGE_SELL_OFFER_LINE_FULL = -6,      // can't receive more of what it's buying
+    MANAGE_SELL_OFFER_UNDERFUNDED = -7,    // doesn't hold what it's trying to sell
+    MANAGE_SELL_OFFER_CROSS_SELF = -8,     // would cross an offer from the same user
+    MANAGE_SELL_OFFER_SELL_NO_ISSUER = -9, // no issuer for what we're selling
+    MANAGE_SELL_OFFER_BUY_NO_ISSUER = -10, // no issuer for what we're buying
 
     // update errors
-    MANAGE_OFFER_NOT_FOUND = -11, // offerID does not match an existing offer
+    MANAGE_SELL_OFFER_NOT_FOUND = -11, // offerID does not match an existing offer
 
-    MANAGE_OFFER_LOW_RESERVE = -12 // not enough funds to create a new Offer
+    MANAGE_SELL_OFFER_LOW_RESERVE = -12 // not enough funds to create a new Offer
 };
 
 enum ManageOfferEffect
@@ -518,9 +538,42 @@ struct ManageOfferSuccessResult
     offer;
 };
 
-union ManageOfferResult switch (ManageOfferResultCode code)
+union ManageSellOfferResult switch (ManageSellOfferResultCode code)
+{
+case MANAGE_SELL_OFFER_SUCCESS:
+    ManageOfferSuccessResult success;
+default:
+    void;
+};
+
+/******* ManageBuyOffer Result ********/
+
+enum ManageBuyOfferResultCode
+{
+    // codes considered as "success" for the operation
+    MANAGE_BUY_OFFER_SUCCESS = 0,
+
+    // codes considered as "failure" for the operation
+    MANAGE_BUY_OFFER_MALFORMED = -1,     // generated offer would be invalid
+    MANAGE_BUY_OFFER_SELL_NO_TRUST = -2, // no trust line for what we're selling
+    MANAGE_BUY_OFFER_BUY_NO_TRUST = -3,  // no trust line for what we're buying
+    MANAGE_BUY_OFFER_SELL_NOT_AUTHORIZED = -4, // not authorized to sell
+    MANAGE_BUY_OFFER_BUY_NOT_AUTHORIZED = -5,  // not authorized to buy
+    MANAGE_BUY_OFFER_LINE_FULL = -6,      // can't receive more of what it's buying
+    MANAGE_BUY_OFFER_UNDERFUNDED = -7,    // doesn't hold what it's trying to sell
+    MANAGE_BUY_OFFER_CROSS_SELF = -8,     // would cross an offer from the same user
+    MANAGE_BUY_OFFER_SELL_NO_ISSUER = -9, // no issuer for what we're selling
+    MANAGE_BUY_OFFER_BUY_NO_ISSUER = -10, // no issuer for what we're buying
+
+    // update errors
+    MANAGE_BUY_OFFER_NOT_FOUND = -11, // offerID does not match an existing offer
+
+    MANAGE_BUY_OFFER_LOW_RESERVE = -12 // not enough funds to create a new Offer
+};
+
+union ManageBuyOfferResult switch (ManageBuyOfferResultCode code)
 {
-case MANAGE_OFFER_SUCCESS:
+case MANAGE_BUY_OFFER_SUCCESS:
     ManageOfferSuccessResult success;
 default:
     void;
@@ -565,7 +618,7 @@ enum ChangeTrustResultCode
                                      // cannot create with a limit of 0
     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
+    CHANGE_TRUST_SELF_NOT_ALLOWED = -5  // trusting self is not allowed
 };
 
 union ChangeTrustResult switch (ChangeTrustResultCode code)
@@ -695,7 +748,9 @@ enum OperationResultCode
 
     opBAD_AUTH = -1,     // too few valid signatures / wrong network
     opNO_ACCOUNT = -2,   // source account was not found
-    opNOT_SUPPORTED = -3 // operation not supported at this time
+    opNOT_SUPPORTED = -3, // operation not supported at this time
+    opTOO_MANY_SUBENTRIES = -4, // max number of subentries already reached
+    opEXCEEDED_WORK_LIMIT = -5  // operation did too much work
 };
 
 union OperationResult switch (OperationResultCode code)
@@ -709,10 +764,10 @@ case opINNER:
         PaymentResult paymentResult;
     case PATH_PAYMENT:
         PathPaymentResult pathPaymentResult;
-    case MANAGE_OFFER:
-        ManageOfferResult manageOfferResult;
-    case CREATE_PASSIVE_OFFER:
-        ManageOfferResult createPassiveOfferResult;
+    case MANAGE_SELL_OFFER:
+        ManageSellOfferResult manageSellOfferResult;
+    case CREATE_PASSIVE_SELL_OFFER:
+        ManageSellOfferResult createPassiveSellOfferResult;
     case SET_OPTIONS:
         SetOptionsResult setOptionsResult;
     case CHANGE_TRUST:
@@ -727,6 +782,8 @@ case opINNER:
         ManageDataResult manageDataResult;
     case BUMP_SEQUENCE:
         BumpSequenceResult bumpSeqResult;
+    case MANAGE_BUY_OFFER:
+	ManageBuyOfferResult manageBuyOfferResult;
     }
     tr;
 default: