stellar-base 0.1.4 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 59ccf30d51104989ef078751dd5f6ce3bf2facf1
-  data.tar.gz: 7a9aaffc482a6a95101a1bbf361dc9f239651d4d
+  metadata.gz: d1f8db8c0eef99ea37838371a5718d8ab6df3e0d
+  data.tar.gz: 3170f3c49015a46b0d8337769ea1672194d4f584
 SHA512:
-  metadata.gz: 3c59e6fa06c50718053befe0e7b3785243a4590b66fec841aa9e94577a31dac4891210b35fc182cb3e20973ca4efc2ce3242f19d95aac5ce2e64e3e9a97c9b62
-  data.tar.gz: dee133d72af36e8616c3e5afd7b0e9d8dfe19c3c90dc98089b428e851d47d1ea1e5e5f788ecf05f298648b7b87b72c13ff22fa95e4e8d2bef46eab0e426c93fb
+  metadata.gz: c4ce937a9b9ac9c8b14c1cd8b8557182e1d24c3e6c3d432801c8109fb5df8f3b0b7bb909352368d01cbd67d4d75b46a67495a5e93be274d95aafbbd3a5c76cff
+  data.tar.gz: 632997ffa01f3bf3d380aabb2b56553cbfba65cd74b92af20bd896f054c54f59ec070238d3aca36739a4937106b9fa1c6cc13e31b36e74f0fe5b386d40fc723d

data/.travis.yml

@@ -4,7 +4,7 @@ rvm:
 - 2.1.5
 - 2.0.0
 - 1.9.3
-- jruby-1.7.9
+- jruby-1.7.20
 - jruby-head
 script: bundle exec rake travis
 notifications:

data/README.md

@@ -24,6 +24,14 @@ Or install it yourself as:
 
 Also requires libsodium. Installable via `brew install libsodium` on OS X.
 
+## Supported Ruby Versions
+
+Please see [travis.yml](.travis.yml) for what versions of ruby are currently tested by our continuous integration system.  Any ruby in that list is officially supported.
+
+### JRuby
+
+It seems as though jruby is particularly slow when it comes to BigDecimal math; the source behind this slowness has not been investigated, but it is something to be aware of.
+
 ## Usage
 
 [Examples are here](examples)

data/generated/stellar/account_entry.rb

@@ -12,7 +12,7 @@ require 'xdr'
 #       SequenceNumber seqNum;    // last sequence number used for this account
 #       uint32 numSubEntries;     // number of sub-entries this account has
 #                                 // drives the reserve
-#       AccountID* inflationDest; // Account to vote during inflation
+#       AccountID* inflationDest; // Account to vote for during inflation
 #       uint32 flags;             // see AccountFlags
 #   
 #       string32 homeDomain; // can be used for reverse federation and memo lookup

data/generated/stellar/account_merge_result.rb

@@ -8,7 +8,7 @@ require 'xdr'
 #   union AccountMergeResult switch (AccountMergeResultCode code)
 #   {
 #   case ACCOUNT_MERGE_SUCCESS:
-#       void;
+#       int64 sourceAccountBalance; // how much got transfered from source account
 #   default:
 #       void;
 #   };
@@ -18,8 +18,9 @@ module Stellar
   class AccountMergeResult < XDR::Union
     switch_on AccountMergeResultCode, :code
 
-    switch :account_merge_success
+    switch :account_merge_success, :source_account_balance
     switch :default
 
+    attribute :source_account_balance, Int64
   end
 end

data/generated/stellar/allow_trust_op.rb

@@ -14,7 +14,7 @@ require 'xdr'
 #       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

data/generated/stellar/allow_trust_op/asset.rb

@@ -11,7 +11,7 @@ require 'xdr'
 #       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

data/generated/stellar/claim_offer_atom.rb

@@ -8,26 +8,26 @@ require 'xdr'
 #   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;
 #   };
 #
 # ===========================================================================
 module Stellar
   class ClaimOfferAtom < XDR::Struct
-    attribute :offer_owner,    AccountID
-    attribute :offer_id,       Uint64
-    attribute :asset_claimed,  Asset
-    attribute :amount_claimed, Int64
-    attribute :asset_send,     Asset
-    attribute :amount_send,    Int64
+    attribute :seller_id,     AccountID
+    attribute :offer_id,      Uint64
+    attribute :asset_sold,    Asset
+    attribute :amount_sold,   Int64
+    attribute :asset_bought,  Asset
+    attribute :amount_bought, Int64
   end
 end

data/generated/stellar/create_passive_offer_op.rb

@@ -7,10 +7,10 @@ require 'xdr'
 #
 #   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
 #   };
 #
 # ===========================================================================

data/generated/stellar/ledger_entry.rb

@@ -5,27 +5,40 @@ require 'xdr'
 
 # === xdr source ============================================================
 #
-#   union LedgerEntry switch (LedgerEntryType type)
+#   struct LedgerEntry
 #   {
-#   case ACCOUNT:
-#       AccountEntry account;
-#   case TRUSTLINE:
-#       TrustLineEntry trustLine;
-#   case OFFER:
-#       OfferEntry offer;
+#       uint32 lastModifiedLedgerSeq; // ledger the LedgerEntry was last changed
+#   
+#       union switch (LedgerEntryType type)
+#       {
+#       case ACCOUNT:
+#           AccountEntry account;
+#       case TRUSTLINE:
+#           TrustLineEntry trustLine;
+#       case OFFER:
+#           OfferEntry offer;
+#       }
+#       data;
+#   
+#       // reserved for future use
+#       union switch (int v)
+#       {
+#       case 0:
+#           void;
+#       }
+#       ext;
 #   };
 #
 # ===========================================================================
 module Stellar
-  class LedgerEntry < XDR::Union
-    switch_on LedgerEntryType, :type
+  class LedgerEntry < XDR::Struct
+    include XDR::Namespace
 
-    switch :account,   :account
-    switch :trustline, :trust_line
-    switch :offer,     :offer
+    autoload :Data
+    autoload :Ext
 
-    attribute :account,    AccountEntry
-    attribute :trust_line, TrustLineEntry
-    attribute :offer,      OfferEntry
+    attribute :last_modified_ledger_seq, Uint32
+    attribute :data,                     Data
+    attribute :ext,                      Ext
   end
 end

data/generated/stellar/ledger_entry/data.rb

@@ -0,0 +1,33 @@
+# This code was automatically generated using xdrgen
+# DO NOT EDIT or your changes may be overwritten
+
+require 'xdr'
+
+# === xdr source ============================================================
+#
+#   union switch (LedgerEntryType type)
+#       {
+#       case ACCOUNT:
+#           AccountEntry account;
+#       case TRUSTLINE:
+#           TrustLineEntry trustLine;
+#       case OFFER:
+#           OfferEntry offer;
+#       }
+#
+# ===========================================================================
+module Stellar
+  class LedgerEntry
+    class Data < XDR::Union
+      switch_on LedgerEntryType, :type
+
+      switch :account,   :account
+      switch :trustline, :trust_line
+      switch :offer,     :offer
+
+      attribute :account,    AccountEntry
+      attribute :trust_line, TrustLineEntry
+      attribute :offer,      OfferEntry
+    end
+  end
+end

data/generated/stellar/ledger_entry/ext.rb

@@ -0,0 +1,24 @@
+# This code was automatically generated using xdrgen
+# DO NOT EDIT or your changes may be overwritten
+
+require 'xdr'
+
+# === xdr source ============================================================
+#
+#   union switch (int v)
+#       {
+#       case 0:
+#           void;
+#       }
+#
+# ===========================================================================
+module Stellar
+  class LedgerEntry
+    class Ext < XDR::Union
+      switch_on XDR::Int, :v
+
+      switch 0
+
+    end
+  end
+end

data/generated/stellar/offer_entry.rb

@@ -10,8 +10,8 @@ require 'xdr'
 #       AccountID sellerID;
 #       uint64 offerID;
 #       Asset selling; // A
-#       Asset buying; // B
-#       int64 amount;       // amount of A
+#       Asset buying;  // B
+#       int64 amount;  // amount of A
 #   
 #       /* price for this offer:
 #           price of A in terms of B

data/generated/stellar/path_payment_op.rb

@@ -8,12 +8,12 @@ require 'xdr'
 #   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

data/generated/stellar/path_payment_result_code.rb

@@ -16,11 +16,12 @@ require 'xdr'
 #       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
 #   };
 #
 # ===========================================================================
@@ -36,7 +37,8 @@ module Stellar
     member :path_payment_not_authorized,     -7
     member :path_payment_line_full,          -8
     member :path_payment_too_few_offers,     -9
-    member :path_payment_over_sendmax,       -10
+    member :path_payment_offer_cross_self,   -10
+    member :path_payment_over_sendmax,       -11
 
     seal
   end

data/generated/stellar/payment_op.rb

@@ -8,7 +8,7 @@ require 'xdr'
 #   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
 #   };
 #

data/generated/stellar/payment_result_code.rb

@@ -16,7 +16,7 @@ require 'xdr'
 #       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
 #   };

data/generated/stellar/transaction_result_code.rb

@@ -9,7 +9,7 @@ require 'xdr'
 #   {
 #       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

data/generated/stellar/trust_line_entry.rb

@@ -8,7 +8,7 @@ require 'xdr'
 #   struct TrustLineEntry
 #   {
 #       AccountID accountID; // account this trustline belongs to
-#       Asset asset;   // type of asset (with issuer)
+#       Asset asset;         // type of asset (with issuer)
 #       int64 balance;       // how much of this asset the user has.
 #                            // Asset defines the unit for this;
 #   

data/lib/stellar/base/version.rb

@@ -1,5 +1,5 @@
 module Stellar
   module Base
-    VERSION = "0.1.4"
+    VERSION = "0.2.0"
   end
 end

data/lib/stellar/operation.rb

@@ -1,3 +1,5 @@
+require 'bigdecimal'
+
 module Stellar
   class Operation
 
@@ -135,7 +137,7 @@ module Stellar
       selling    = Asset.send(*attributes[:selling])
       amount     = attributes[:amount]
       offer_id   = attributes[:offer_id] || 0
-      price      = Price.from_f(attributes[:price])
+      price      = interpret_price(attributes[:price])
 
       op = ManageOfferOp.new({
         buying:     buying,
@@ -154,7 +156,7 @@ module Stellar
       buying     = Asset.send(*attributes[:buying])
       selling    = Asset.send(*attributes[:selling])
       amount     = attributes[:amount]
-      price      = Price.from_f(attributes[:price])
+      price      = interpret_price(attributes[:price])
 
       op = CreatePassiveOfferOp.new({
         buying:     buying,
@@ -283,5 +285,20 @@ module Stellar
 
       return asset, amount
     end
+
+
+    def self.interpret_price(price)
+      case price
+      when String
+        bd = BigDecimal.new(price)
+        Price.from_f(bd)
+      when Numeric
+        Price.from_f(price)
+      when Stellar::Price
+        price
+      else
+        raise ArgumentError, "Invalid price type: #{price.class}. Must be String, Numeric, or Stellar::Price"
+      end
+    end
   end
 end

data/lib/stellar/path_payment_result.rb

@@ -7,10 +7,10 @@ module Stellar
       s = success!
       return s.last.amount if s.offers.blank?
 
-      source_asset = s.offers.first.asset_send
-      source_offers = s.offers.take_while{|o| o.asset_send == source_asset}
+      source_asset = s.offers.first.asset_bought
+      source_offers = s.offers.take_while{|o| o.asset_bought == source_asset}
 
-      source_offers.map(&:amount_send).sum
+      source_offers.map(&:amount_bought).sum
     end
 
   end

data/spec/lib/stellar/asset_spec.rb

@@ -40,6 +40,6 @@ describe Stellar::Asset, "#code" do
   end
 
   it "raises an error when called on a native asset" do
-    expect{ Stellar::Asset.native.code }.to raise_error
+    expect{ Stellar::Asset.native.code }.to raise_error(RuntimeError)
   end
 end

data/spec/lib/stellar/path_payment_result_spec.rb

@@ -26,7 +26,7 @@ describe Stellar::PathPaymentResult, "#send_amount" do
   context "with simple 1-hop result" do
     let(:simple_success){ Stellar::SimplePaymentResult.new(amount: 100) }
     let(:offers) do
-      [Stellar::ClaimOfferAtom.new(asset_send: Stellar::Asset.native, amount_send: 200)]
+      [Stellar::ClaimOfferAtom.new(asset_bought: Stellar::Asset.native, amount_bought: 200)]
     end
 
     let(:path_success) do
@@ -47,8 +47,8 @@ describe Stellar::PathPaymentResult, "#send_amount" do
     let(:simple_success){ Stellar::SimplePaymentResult.new(amount: 100) }
     let(:offers) do
       [
-        Stellar::ClaimOfferAtom.new(asset_send: Stellar::Asset.native, amount_send: 200),
-        Stellar::ClaimOfferAtom.new(asset_send: Stellar::Asset.native, amount_send: 200),
+        Stellar::ClaimOfferAtom.new(asset_bought: Stellar::Asset.native, amount_bought: 200),
+        Stellar::ClaimOfferAtom.new(asset_bought: Stellar::Asset.native, amount_bought: 200),
       ]
     end
 
@@ -72,9 +72,9 @@ describe Stellar::PathPaymentResult, "#send_amount" do
     let(:otherAsset){ Stellar::Asset.alphanum4("USD", Stellar::KeyPair.random) }
     let(:offers) do
       [
-        Stellar::ClaimOfferAtom.new(asset_send: Stellar::Asset.native, amount_send: 200),
-        Stellar::ClaimOfferAtom.new(asset_send: Stellar::Asset.native, amount_send: 200),
-        Stellar::ClaimOfferAtom.new(asset_send: otherAsset, amount_send: 200),
+        Stellar::ClaimOfferAtom.new(asset_bought: Stellar::Asset.native, amount_bought: 200),
+        Stellar::ClaimOfferAtom.new(asset_bought: Stellar::Asset.native, amount_bought: 200),
+        Stellar::ClaimOfferAtom.new(asset_bought: otherAsset, amount_bought: 200),
       ]
     end
 

data/spec/lib/stellar/price_spec.rb

@@ -18,4 +18,17 @@ describe Stellar::Price, "#from_f" do
     end
   end
 
+  it "works with bigdecimal" do
+      whole      = random.rand(1_000_000)
+      fractional = random.rand(10_000_000) # seven significant digits available for fractional
+      
+      expected = BigDecimal.new("#{whole}.#{fractional}")
+      actual_p = subject.from_f(expected)
+      actual = BigDecimal.new(actual_p.n) / BigDecimal.new(actual_p.d) 
+
+      expect(actual).to be_within(BigDecimal.new("0.000000001")).of(actual)
+      expect(actual_p.n).to be <= Stellar::Price::MAX_PRECISION
+      expect(actual_p.d).to be <= Stellar::Price::MAX_PRECISION
+  end
+
 end

data/spec/lib/stellar/thresholds_spec.rb

@@ -31,28 +31,28 @@ describe Stellar::Thresholds, ".make" do
   end
 
   it "errors unless all components are provided" do
-    expect{ subject.make(good.except(:master_weight)) }.to raise_error
-    expect{ subject.make(good.except(:low)) }.to raise_error
-    expect{ subject.make(good.except(:medium)) }.to raise_error
-    expect{ subject.make(good.except(:high)) }.to raise_error
+    expect{ subject.make(good.except(:master_weight)) }.to raise_error(ArgumentError)
+    expect{ subject.make(good.except(:low)) }.to raise_error(ArgumentError)
+    expect{ subject.make(good.except(:medium)) }.to raise_error(ArgumentError)
+    expect{ subject.make(good.except(:high)) }.to raise_error(ArgumentError)
   end
 
   it "errors unless all components are numbers" do
-    expect{ subject.make(good.merge(master_weight: "hello")) }.to raise_error
-    expect{ subject.make(good.merge(low: "hello")) }.to raise_error
-    expect{ subject.make(good.merge(medium: "hello")) }.to raise_error
-    expect{ subject.make(good.merge(high: "hello")) }.to raise_error
+    expect{ subject.make(good.merge(master_weight: "hello")) }.to raise_error(ArgumentError)
+    expect{ subject.make(good.merge(low: "hello")) }.to raise_error(ArgumentError)
+    expect{ subject.make(good.merge(medium: "hello")) }.to raise_error(ArgumentError)
+    expect{ subject.make(good.merge(high: "hello")) }.to raise_error(ArgumentError)
   end
 
   it "errors unless all components are in (0..255)" do
-    expect{ subject.make(good.merge(master_weight: -1)) }.to raise_error
-    expect{ subject.make(good.merge(master_weight: 256)) }.to raise_error
-    expect{ subject.make(good.merge(low: -1)) }.to raise_error
-    expect{ subject.make(good.merge(low: 256)) }.to raise_error
-    expect{ subject.make(good.merge(medium: -1)) }.to raise_error
-    expect{ subject.make(good.merge(medium: 256)) }.to raise_error
-    expect{ subject.make(good.merge(high: -1)) }.to raise_error
-    expect{ subject.make(good.merge(high: 256)) }.to raise_error
+    expect{ subject.make(good.merge(master_weight: -1)) }.to raise_error(ArgumentError)
+    expect{ subject.make(good.merge(master_weight: 256)) }.to raise_error(ArgumentError)
+    expect{ subject.make(good.merge(low: -1)) }.to raise_error(ArgumentError)
+    expect{ subject.make(good.merge(low: 256)) }.to raise_error(ArgumentError)
+    expect{ subject.make(good.merge(medium: -1)) }.to raise_error(ArgumentError)
+    expect{ subject.make(good.merge(medium: 256)) }.to raise_error(ArgumentError)
+    expect{ subject.make(good.merge(high: -1)) }.to raise_error(ArgumentError)
+    expect{ subject.make(good.merge(high: 256)) }.to raise_error(ArgumentError)
   end
 
   it "ignores additional keys" do

data/xdr/Stellar-ledger-entries.x

@@ -98,7 +98,7 @@ struct AccountEntry
     SequenceNumber seqNum;    // last sequence number used for this account
     uint32 numSubEntries;     // number of sub-entries this account has
                               // drives the reserve
-    AccountID* inflationDest; // Account to vote during inflation
+    AccountID* inflationDest; // Account to vote for during inflation
     uint32 flags;             // see AccountFlags
 
     string32 homeDomain; // can be used for reverse federation and memo lookup
@@ -133,7 +133,7 @@ enum TrustLineFlags
 struct TrustLineEntry
 {
     AccountID accountID; // account this trustline belongs to
-    Asset asset;   // type of asset (with issuer)
+    Asset asset;         // type of asset (with issuer)
     int64 balance;       // how much of this asset the user has.
                          // Asset defines the unit for this;
 
@@ -167,8 +167,8 @@ struct OfferEntry
     AccountID sellerID;
     uint64 offerID;
     Asset selling; // A
-    Asset buying; // B
-    int64 amount;       // amount of A
+    Asset buying;  // B
+    int64 amount;  // amount of A
 
     /* price for this offer:
         price of A in terms of B
@@ -187,14 +187,28 @@ struct OfferEntry
     ext;
 };
 
-union LedgerEntry switch (LedgerEntryType type)
+struct LedgerEntry
 {
-case ACCOUNT:
-    AccountEntry account;
-case TRUSTLINE:
-    TrustLineEntry trustLine;
-case OFFER:
-    OfferEntry offer;
+    uint32 lastModifiedLedgerSeq; // ledger the LedgerEntry was last changed
+
+    union switch (LedgerEntryType type)
+    {
+    case ACCOUNT:
+        AccountEntry account;
+    case TRUSTLINE:
+        TrustLineEntry trustLine;
+    case OFFER:
+        OfferEntry offer;
+    }
+    data;
+
+    // reserved for future use
+    union switch (int v)
+    {
+    case 0:
+        void;
+    }
+    ext;
 };
 
 // list of all envelope types used in the application
@@ -205,5 +219,4 @@ enum EnvelopeType
     ENVELOPE_TYPE_SCP = 1,
     ENVELOPE_TYPE_TX = 2
 };
-
 }

data/xdr/Stellar-transaction.x

@@ -53,7 +53,7 @@ struct CreateAccountOp
 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
 };
 
@@ -71,12 +71,12 @@ 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
@@ -109,10 +109,10 @@ 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
@@ -178,7 +178,7 @@ struct AllowTrustOp
     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
@@ -316,16 +316,16 @@ struct TransactionEnvelope
 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 ********/
@@ -364,7 +364,7 @@ enum PaymentResultCode
     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
 };
@@ -390,11 +390,12 @@ enum PathPaymentResultCode
     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
@@ -555,7 +556,7 @@ enum AccountMergeResultCode
 union AccountMergeResult switch (AccountMergeResultCode code)
 {
 case ACCOUNT_MERGE_SUCCESS:
-    void;
+    int64 sourceAccountBalance; // how much got transfered from source account
 default:
     void;
 };
@@ -629,7 +630,7 @@ 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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stellar-base
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
 platform: ruby
 authors:
 - Scott Fleckenstein
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-24 00:00:00.000000000 Z
+date: 2015-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xdr
@@ -276,6 +276,8 @@ files:
 - generated/stellar/inflation_result.rb
 - generated/stellar/inflation_result_code.rb
 - generated/stellar/ledger_entry.rb
+- generated/stellar/ledger_entry/data.rb
+- generated/stellar/ledger_entry/ext.rb
 - generated/stellar/ledger_entry_change.rb
 - generated/stellar/ledger_entry_change_type.rb
 - generated/stellar/ledger_entry_type.rb