stellar-base 0.0.18 → 0.0.19

data/xdr/Stellar-overlay.x

@@ -7,20 +7,6 @@
 namespace stellar
 {
 
-struct StellarBallotValue
-{
-    Hash txSetHash;
-    uint64 closeTime;
-    uint32 baseFee;
-};
-
-struct StellarBallot
-{
-    uint256 nodeID;
-    Signature signature;
-    StellarBallotValue value;
-};
-
 struct Error
 {
     int code;
@@ -29,10 +15,11 @@ struct Error
 
 struct Hello
 {
-    int protocolVersion;
+    uint32 ledgerVersion;
+    uint32 overlayVersion;
     string versionStr<100>;
     int listeningPort;
-    opaque peerID[32];
+    NodeID peerID;
 };
 
 struct PeerAddress

data/xdr/Stellar-transaction.x

@@ -9,8 +9,8 @@ namespace stellar
 
 struct DecoratedSignature
 {
-    opaque hint[4];    // first 4 bytes of the public key, used as a hint
-    uint512 signature; // actual signature
+    SignatureHint hint;  // first 4 bytes of the public key, used as a hint
+    Signature signature; // actual signature
 };
 
 enum OperationType
@@ -132,7 +132,11 @@ struct SetOptionsOp
     uint32* clearFlags; // which flags to clear
     uint32* setFlags;   // which flags to set
 
-    Thresholds* thresholds; // update the thresholds for the account
+    // account threshold manipulation
+    uint32* masterWeight; // weight of the master account
+    uint32* lowThreshold;
+    uint32* medThreshold;
+    uint32* highThreshold;
 
     string32* homeDomain; // sets the home domain
 
@@ -202,7 +206,7 @@ Result: InflationResult
 struct Operation
 {
     // sourceAccount is the account used to run the operation
-    // if not set, the runtime defaults to "account" specified at
+    // if not set, the runtime defaults to "sourceAccount" specified at
     // the transaction level
     AccountID* sourceAccount;
 
@@ -225,7 +229,7 @@ struct Operation
     case ALLOW_TRUST:
         AllowTrustOp allowTrustOp;
     case ACCOUNT_MERGE:
-        uint256 destination;
+        AccountID destination;
     case INFLATION:
         void;
     }
@@ -275,7 +279,7 @@ struct Transaction
     AccountID sourceAccount;
 
     // the fee the sourceAccount will pay
-    int32 fee;
+    uint32 fee;
 
     // sequence number to consume in the account
     SequenceNumber seqNum;
@@ -286,6 +290,14 @@ struct Transaction
     Memo memo;
 
     Operation operations<100>;
+
+    // reserved for future use
+    union switch (int v)
+    {
+    case 0:
+        void;
+    }
+    ext;
 };
 
 /* A TransactionEnvelope wraps a transaction with signatures. */
@@ -321,11 +333,11 @@ enum CreateAccountResultCode
     CREATE_ACCOUNT_SUCCESS = 0, // account was created
 
     // codes considered as "failure" for the operation
-    CREATE_ACCOUNT_MALFORMED = 1,   // invalid destination
-    CREATE_ACCOUNT_UNDERFUNDED = 2, // not enough funds in source account
+    CREATE_ACCOUNT_MALFORMED = -1,   // invalid destination
+    CREATE_ACCOUNT_UNDERFUNDED = -2, // not enough funds in source account
     CREATE_ACCOUNT_LOW_RESERVE =
-        3, // would create an account below the min reserve
-    CREATE_ACCOUNT_ALREADY_EXIST = 4 // account already exists
+        -3, // would create an account below the min reserve
+    CREATE_ACCOUNT_ALREADY_EXIST = -4 // account already exists
 };
 
 union CreateAccountResult switch (CreateAccountResultCode code)
@@ -344,12 +356,14 @@ enum PaymentResultCode
     PAYMENT_SUCCESS = 0, // payment successfuly completed
 
     // codes considered as "failure" for the operation
-    PAYMENT_MALFORMED = -1,      // bad input
-    PAYMENT_UNDERFUNDED = -2,    // not enough funds in source account
-    PAYMENT_NO_DESTINATION = -3, // destination account does not exist
-    PAYMENT_NO_TRUST = -4, // destination missing a trust line for currency
-    PAYMENT_NOT_AUTHORIZED = -5, // destination not authorized to hold currency
-    PAYMENT_LINE_FULL = -6       // destination would go above their limit
+    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 currency
+    PAYMENT_NOT_AUTHORIZED = -7, // destination not authorized to hold currency
+    PAYMENT_LINE_FULL = -8       // destination would go above their limit
 };
 
 union PaymentResult switch (PaymentResultCode code)
@@ -368,15 +382,16 @@ enum PathPaymentResultCode
     PATH_PAYMENT_SUCCESS = 0, // success
 
     // codes considered as "failure" for the operation
-    PATH_PAYMENT_MALFORMED = -1,      // bad input
-    PATH_PAYMENT_UNDERFUNDED = -2,    // not enough funds in source account
-    PATH_PAYMENT_NO_DESTINATION = -3, // destination account does not exist
-    PATH_PAYMENT_NO_TRUST = -4, // destination missing a trust line for currency
-    PATH_PAYMENT_NOT_AUTHORIZED =
-        -5,                      // destination not authorized to hold currency
-    PATH_PAYMENT_LINE_FULL = -6, // destination would go above their limit
-    PATH_PAYMENT_TOO_FEW_OFFERS = -7, // not enough offers to satisfy path
-    PATH_PAYMENT_OVER_SENDMAX = -8    // could not satisfy sendmax
+    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 currency
+    PATH_PAYMENT_NOT_AUTHORIZED = -7, // dest not authorized to hold currency
+    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
 };
 
 struct SimplePaymentResult
@@ -406,18 +421,20 @@ enum ManageOfferResultCode
     MANAGE_OFFER_SUCCESS = 0,
 
     // codes considered as "failure" for the operation
-    MANAGE_OFFER_MALFORMED = -1,      // generated offer would be invalid
-    MANAGE_OFFER_NO_TRUST = -2,       // can't hold what it's buying
-    MANAGE_OFFER_NOT_AUTHORIZED = -3, // not authorized to sell or buy
-    MANAGE_OFFER_LINE_FULL = -4,      // can't receive more of what it's buying
-    MANAGE_OFFER_UNDERFUNDED = -5,    // doesn't hold what it's trying to sell
-    MANAGE_OFFER_CROSS_SELF = -6,     // would cross an offer from the same user
+    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
 
     // update errors
-    MANAGE_OFFER_NOT_FOUND = -7, // offerID does not match an existing offer
-    MANAGE_OFFER_MISMATCH = -8,  // currencies don't match offer
+    MANAGE_OFFER_NOT_FOUND = -9, // offerID does not match an existing offer
+    MANAGE_OFFER_MISMATCH = -10, // currencies don't match offer
 
-    MANAGE_OFFER_LOW_RESERVE = -9 // not enough funds to create a new Offer
+    MANAGE_OFFER_LOW_RESERVE = -11 // not enough funds to create a new Offer
 };
 
 enum ManageOfferEffect
@@ -461,9 +478,11 @@ enum SetOptionsResultCode
     SET_OPTIONS_LOW_RESERVE = -1,      // not enough funds to add a signer
     SET_OPTIONS_TOO_MANY_SIGNERS = -2, // max number of signers already reached
     SET_OPTIONS_BAD_FLAGS = -3,        // invalid combination of clear/set flags
-    SET_OPTIONS_INVALID_INFLATION = -4, // inflation account does not exist
-    SET_OPTIONS_CANT_CHANGE = -5,       // can no longer change this option
-    SET_OPTIONS_UNKNOWN_FLAG = -6       // can't set an unknown flag
+    SET_OPTIONS_INVALID_INFLATION = -4,      // inflation account does not exist
+    SET_OPTIONS_CANT_CHANGE = -5,            // can no longer change this option
+    SET_OPTIONS_UNKNOWN_FLAG = -6,           // can't set an unknown flag
+    SET_OPTIONS_THRESHOLD_OUT_OF_RANGE = -7, // bad value for weight/threshold
+    SET_OPTIONS_BAD_SIGNER = -8              // signer cannot be masterkey
 };
 
 union SetOptionsResult switch (SetOptionsResultCode code)
@@ -548,7 +567,7 @@ enum InflationResultCode
     INFLATION_NOT_TIME = -1
 };
 
-struct inflationPayout // or use PaymentResultAtom to limit types?
+struct InflationPayout // or use PaymentResultAtom to limit types?
 {
     AccountID destination;
     int64 amount;
@@ -557,7 +576,7 @@ struct inflationPayout // or use PaymentResultAtom to limit types?
 union InflationResult switch (InflationResultCode code)
 {
 case INFLATION_SUCCESS:
-    inflationPayout payouts<>;
+    InflationPayout payouts<>;
 default:
     void;
 };
@@ -635,5 +654,13 @@ struct TransactionResult
         void;
     }
     result;
+
+    // reserved for future use
+    union switch (int v)
+    {
+    case 0:
+        void;
+    }
+    ext;
 };
 }

data/xdr/Stellar-types.x

@@ -2,46 +2,34 @@
 // under the Apache License, Version 2.0. See the COPYING file at the root
 // of this distribution or at http://www.apache.org/licenses/LICENSE-2.0
 
-%#include "generated/SCPXDR.h"
-
 namespace stellar
 {
 
-// messages
-typedef opaque uint512[64];
-typedef hyper int64;
+typedef opaque Hash[32];
+typedef opaque uint256[32];
+
+typedef unsigned int uint32;
 typedef int int32;
-typedef opaque AccountID[32];
-typedef opaque Thresholds[4];
-typedef string string32<32>;
 
-typedef uint64 SequenceNumber;
+typedef unsigned hyper uint64;
+typedef hyper int64;
 
-enum CurrencyType
+enum CryptoKeyType
 {
-    CURRENCY_TYPE_NATIVE = 0,
-    CURRENCY_TYPE_ALPHANUM = 1
+    KEY_TYPES_ED25519 = 0
 };
 
-union Currency switch (CurrencyType type)
+union PublicKey switch (CryptoKeyType type)
 {
-case CURRENCY_TYPE_NATIVE:
-    void;
+case KEY_TYPES_ED25519:
+    uint256 ed25519;
+};
 
-case CURRENCY_TYPE_ALPHANUM:
-    struct
-    {
-        opaque currencyCode[4];
-        AccountID issuer;
-    } alphaNum;
+// variable size as the size depends on the signature scheme used
+typedef opaque Signature<64>;
 
-    // add other currency types here in the future
-};
+typedef opaque SignatureHint[4];
+
+typedef PublicKey NodeID;
 
-// price in fractional representation
-struct Price
-{
-    int32 n; // numerator
-    int32 d; // denominator
-};
 }

data/xdr/StellarXDR.x

@@ -1,4 +1,4 @@
-
+%#include "generated/Stellar-SCP.h"
 %#include "generated/Stellar-types.h"
 %#include "generated/Stellar-ledger-entries.h"
 %#include "generated/Stellar-transaction.h"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stellar-base
 version: !ruby/object:Gem::Version
-  version: 0.0.18
+  version: 0.0.19
 platform: ruby
 authors:
 - Scott Fleckenstein
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-02 00:00:00.000000000 Z
+date: 2015-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xdr
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 0.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 0.0.4
 - !ruby/object:Gem::Dependency
   name: rbnacl
   requirement: !ruby/object:Gem::Requirement
@@ -216,6 +216,7 @@ files:
 - examples/transaction_merge.rb
 - generated/stellar-base-generated.rb
 - generated/stellar/account_entry.rb
+- generated/stellar/account_entry/ext.rb
 - generated/stellar/account_flags.rb
 - generated/stellar/account_merge_result.rb
 - generated/stellar/account_merge_result_code.rb
@@ -233,11 +234,13 @@ files:
 - generated/stellar/create_account_result.rb
 - generated/stellar/create_account_result_code.rb
 - generated/stellar/create_passive_offer_op.rb
+- generated/stellar/crypto_key_type.rb
 - generated/stellar/currency.rb
 - generated/stellar/currency/alpha_num.rb
 - generated/stellar/currency_type.rb
 - generated/stellar/decorated_signature.rb
 - generated/stellar/dont_have.rb
+- generated/stellar/envelope_type.rb
 - generated/stellar/error.rb
 - generated/stellar/hello.rb
 - generated/stellar/inflation_payout.rb
@@ -248,11 +251,15 @@ files:
 - generated/stellar/ledger_entry_change_type.rb
 - generated/stellar/ledger_entry_type.rb
 - generated/stellar/ledger_header.rb
+- generated/stellar/ledger_header/ext.rb
 - generated/stellar/ledger_header_history_entry.rb
+- generated/stellar/ledger_header_history_entry/ext.rb
 - generated/stellar/ledger_key.rb
 - generated/stellar/ledger_key/account.rb
 - generated/stellar/ledger_key/offer.rb
 - generated/stellar/ledger_key/trust_line.rb
+- generated/stellar/ledger_upgrade.rb
+- generated/stellar/ledger_upgrade_type.rb
 - generated/stellar/manage_offer_effect.rb
 - generated/stellar/manage_offer_op.rb
 - generated/stellar/manage_offer_result.rb
@@ -263,6 +270,7 @@ files:
 - generated/stellar/memo_type.rb
 - generated/stellar/message_type.rb
 - generated/stellar/offer_entry.rb
+- generated/stellar/offer_entry/ext.rb
 - generated/stellar/offer_entry_flags.rb
 - generated/stellar/operation.rb
 - generated/stellar/operation/body.rb
@@ -279,11 +287,15 @@ files:
 - generated/stellar/payment_result_code.rb
 - generated/stellar/peer_address.rb
 - generated/stellar/price.rb
+- generated/stellar/public_key.rb
 - generated/stellar/scp_ballot.rb
 - generated/stellar/scp_envelope.rb
+- generated/stellar/scp_nomination.rb
 - generated/stellar/scp_quorum_set.rb
 - generated/stellar/scp_statement.rb
 - generated/stellar/scp_statement/pledges.rb
+- generated/stellar/scp_statement/pledges/confirm.rb
+- generated/stellar/scp_statement/pledges/externalize.rb
 - generated/stellar/scp_statement/pledges/prepare.rb
 - generated/stellar/scp_statement_type.rb
 - generated/stellar/set_options_op.rb
@@ -291,22 +303,28 @@ files:
 - generated/stellar/set_options_result_code.rb
 - generated/stellar/signer.rb
 - generated/stellar/simple_payment_result.rb
-- generated/stellar/stellar_ballot.rb
-- generated/stellar/stellar_ballot_value.rb
 - generated/stellar/stellar_message.rb
+- generated/stellar/stellar_value.rb
+- generated/stellar/stellar_value/ext.rb
+- generated/stellar/threshold_indexes.rb
 - generated/stellar/time_bounds.rb
 - generated/stellar/transaction.rb
+- generated/stellar/transaction/ext.rb
 - generated/stellar/transaction_envelope.rb
 - generated/stellar/transaction_history_entry.rb
+- generated/stellar/transaction_history_entry/ext.rb
 - generated/stellar/transaction_history_result_entry.rb
+- generated/stellar/transaction_history_result_entry/ext.rb
 - generated/stellar/transaction_meta.rb
 - generated/stellar/transaction_result.rb
+- generated/stellar/transaction_result/ext.rb
 - generated/stellar/transaction_result/result.rb
 - generated/stellar/transaction_result_code.rb
 - generated/stellar/transaction_result_pair.rb
 - generated/stellar/transaction_result_set.rb
 - generated/stellar/transaction_set.rb
 - generated/stellar/trust_line_entry.rb
+- generated/stellar/trust_line_entry/ext.rb
 - generated/stellar/trust_line_flags.rb
 - lib/stellar-base.rb
 - lib/stellar/account_flags.rb
@@ -340,7 +358,7 @@ files:
 - tasks/rspec.rake
 - tasks/travis.rake
 - tasks/xdr.rake
-- xdr/SCPXDR.x
+- xdr/Stellar-SCP.x
 - xdr/Stellar-ledger-entries.x
 - xdr/Stellar-ledger.x
 - xdr/Stellar-overlay.x

data/generated/stellar/stellar_ballot.rb

@@ -1,22 +0,0 @@
-# Automatically generated on 2015-05-13T15:00:04-07:00
-# DO NOT EDIT or your changes may be overwritten
-        
-require 'xdr'
-
-# === xdr source ============================================================
-#
-#   struct StellarBallot
-#   {
-#       uint256 nodeID;
-#       Signature signature;
-#       StellarBallotValue value;
-#   };
-#
-# ===========================================================================
-module Stellar
-  class StellarBallot < XDR::Struct
-    attribute :node_id,   Uint256
-    attribute :signature, Signature
-    attribute :value,     StellarBallotValue
-  end
-end