stellar-base 0.19.0 → 0.20.0

data/generated/stellar/operation_result_code.rb

@@ -11,16 +11,20 @@ require 'xdr'
 #   
 #       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
 #   };
 #
 # ===========================================================================
 module Stellar
   class OperationResultCode < XDR::Enum
-    member :op_inner,         0
-    member :op_bad_auth,      -1
-    member :op_no_account,    -2
-    member :op_not_supported, -3
+    member :op_inner,               0
+    member :op_bad_auth,            -1
+    member :op_no_account,          -2
+    member :op_not_supported,       -3
+    member :op_too_many_subentries, -4
+    member :op_exceeded_work_limit, -5
 
     seal
   end

data/generated/stellar/operation_type.rb

@@ -10,32 +10,34 @@ require 'xdr'
 #       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
 #   };
 #
 # ===========================================================================
 module Stellar
   class OperationType < XDR::Enum
-    member :create_account,       0
-    member :payment,              1
-    member :path_payment,         2
-    member :manage_offer,         3
-    member :create_passive_offer, 4
-    member :set_options,          5
-    member :change_trust,         6
-    member :allow_trust,          7
-    member :account_merge,        8
-    member :inflation,            9
-    member :manage_data,          10
-    member :bump_sequence,        11
+    member :create_account,            0
+    member :payment,                   1
+    member :path_payment,              2
+    member :manage_sell_offer,         3
+    member :create_passive_sell_offer, 4
+    member :set_options,               5
+    member :change_trust,              6
+    member :allow_trust,               7
+    member :account_merge,             8
+    member :inflation,                 9
+    member :manage_data,               10
+    member :bump_sequence,             11
+    member :manage_buy_offer,          12
 
     seal
   end

data/generated/stellar/signer.rb

@@ -8,7 +8,7 @@ require 'xdr'
 #   struct Signer
 #   {
 #       SignerKey key;
-#       uint32 weight; // really only need 1byte
+#       uint32 weight; // really only need 1 byte
 #   };
 #
 # ===========================================================================

data/generated/stellar/stellar_value.rb

@@ -7,8 +7,8 @@ require 'xdr'
 #
 #   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
@@ -18,10 +18,12 @@ require 'xdr'
 #       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;
 #   };
@@ -34,7 +36,7 @@ module Stellar
     autoload :Ext
 
     attribute :tx_set_hash, Hash
-    attribute :close_time,  Uint64
+    attribute :close_time,  TimePoint
     attribute :upgrades,    XDR::VarArray[UpgradeType, 6]
     attribute :ext,         Ext
   end

data/generated/stellar/stellar_value/ext.rb

@@ -5,20 +5,24 @@ require 'xdr'
 
 # === xdr source ============================================================
 #
-#   union switch (int v)
+#   union switch (StellarValueType v)
 #       {
-#       case 0:
+#       case STELLAR_VALUE_BASIC:
 #           void;
+#       case STELLAR_VALUE_SIGNED:
+#           LedgerCloseValueSignature lcValueSignature;
 #       }
 #
 # ===========================================================================
 module Stellar
   class StellarValue
     class Ext < XDR::Union
-      switch_on XDR::Int, :v
+      switch_on StellarValueType, :v
 
-      switch 0
+      switch :stellar_value_basic
+      switch :stellar_value_signed, :lc_value_signature
 
+      attribute :lc_value_signature, LedgerCloseValueSignature
     end
   end
 end

data/generated/stellar/stellar_value_type.rb

@@ -0,0 +1,22 @@
+# This code was automatically generated using xdrgen
+# DO NOT EDIT or your changes may be overwritten
+
+require 'xdr'
+
+# === xdr source ============================================================
+#
+#   enum StellarValueType
+#   {
+#       STELLAR_VALUE_BASIC = 0,
+#       STELLAR_VALUE_SIGNED = 1
+#   };
+#
+# ===========================================================================
+module Stellar
+  class StellarValueType < XDR::Enum
+    member :stellar_value_basic,  0
+    member :stellar_value_signed, 1
+
+    seal
+  end
+end

data/generated/stellar/time_bounds.rb

@@ -7,14 +7,14 @@ require 'xdr'
 #
 #   struct TimeBounds
 #   {
-#       uint64 minTime;
-#       uint64 maxTime; // 0 here means no maxTime
+#       TimePoint minTime;
+#       TimePoint maxTime; // 0 here means no maxTime
 #   };
 #
 # ===========================================================================
 module Stellar
   class TimeBounds < XDR::Struct
-    attribute :min_time, Uint64
-    attribute :max_time, Uint64
+    attribute :min_time, TimePoint
+    attribute :max_time, TimePoint
   end
 end

data/generated/stellar/transaction.rb

@@ -21,7 +21,7 @@ require 'xdr'
 #   
 #       Memo memo;
 #   
-#       Operation operations<100>;
+#       Operation operations<MAX_OPS_PER_TX>;
 #   
 #       // reserved for future use
 #       union switch (int v)
@@ -44,7 +44,7 @@ module Stellar
     attribute :seq_num,        SequenceNumber
     attribute :time_bounds,    XDR::Option[TimeBounds]
     attribute :memo,           Memo
-    attribute :operations,     XDR::VarArray[Operation, 100]
+    attribute :operations,     XDR::VarArray[Operation, MAX_OPS_PER_TX]
     attribute :ext,            Ext
   end
 end

data/generated/stellar/transaction_meta_v1.rb

@@ -8,7 +8,7 @@ require 'xdr'
 #   struct TransactionMetaV1
 #   {
 #       LedgerEntryChanges txChanges; // tx level changes if any
-#       OperationMeta operations<>; // meta for each operation
+#       OperationMeta operations<>;   // meta for each operation
 #   };
 #
 # ===========================================================================

data/lib/stellar-base.rb

@@ -31,3 +31,5 @@ require_relative './stellar/util/continued_fraction'
 require_relative './stellar/convert'
 require_relative './stellar/networks'
 require_relative './stellar/base/version'
+
+require_relative './stellar/base/compat'

data/lib/stellar/base/compat.rb

@@ -0,0 +1,22 @@
+require 'active_support/deprecation'
+
+Stellar::Deprecation ||= ActiveSupport::Deprecation.new('next release', 'stellar-base')
+
+class << Stellar::Operation
+  alias_method :manage_offer, :manage_sell_offer
+  alias_method :create_passive_offer, :create_passive_sell_offer
+
+  deprecate deprecator: Stellar::Deprecation,
+            manage_offer: :manage_sell_offer,
+            create_passive_offer: :create_passive_sell_offer
+end
+
+class << Stellar::Transaction
+  alias_method :manage_offer, :manage_sell_offer
+  alias_method :create_passive_offer, :create_passive_sell_offer
+
+  deprecate deprecator: Stellar::Deprecation,
+            manage_offer: :manage_sell_offer,
+            create_passive_offer: :create_passive_sell_offer
+end
+

data/lib/stellar/base/version.rb

@@ -1,5 +1,5 @@
 module Stellar
   module Base
-    VERSION = "0.19.0"
+    VERSION = "0.20.0"
   end
 end

data/lib/stellar/operation.rb

@@ -141,14 +141,14 @@ module Stellar
       }))
     end
 
-    def self.manage_offer(attributes={})
+    def self.manage_sell_offer(attributes={})
       buying     = Asset.send(*attributes[:buying])
       selling    = Asset.send(*attributes[:selling])
       amount     = interpret_amount(attributes[:amount])
       offer_id   = attributes[:offer_id] || 0
       price      = interpret_price(attributes[:price])
 
-      op = ManageOfferOp.new({
+      op = ManageSellOfferOp.new({
         buying:     buying,
         selling:    selling,
         amount:     amount,
@@ -157,17 +157,37 @@ module Stellar
       })
 
       return make(attributes.merge({
-        body:[:manage_offer, op]
+        body:[:manage_sell_offer, op]
       }))
     end
 
-    def self.create_passive_offer(attributes={})
+    def self.manage_buy_offer(attributes={})
+      buying     = Asset.send(*attributes[:buying])
+      selling    = Asset.send(*attributes[:selling])
+      amount     = interpret_amount(attributes[:amount])
+      offer_id   = attributes[:offer_id] || 0
+      price      = interpret_price(attributes[:price])
+
+      op = ManageBuyOfferOp.new({
+        buying:     buying,
+        selling:    selling,
+        amount:     amount,
+        price:      price,
+        offer_id:   offer_id
+      })
+
+      return make(attributes.merge({
+        body:[:manage_buy_offer, op]
+      }))
+    end
+
+    def self.create_passive_sell_offer(attributes={})
       buying     = Asset.send(*attributes[:buying])
       selling    = Asset.send(*attributes[:selling])
       amount     = interpret_amount(attributes[:amount])
       price      = interpret_price(attributes[:price])
 
-      op = CreatePassiveOfferOp.new({
+      op = CreatePassiveSellOfferOp.new({
         buying:     buying,
         selling:    selling,
         amount:     amount,
@@ -175,7 +195,7 @@ module Stellar
       })
 
       return make(attributes.merge({
-        body:[:create_passive_offer, op]
+        body:[:create_passive_sell_offer, op]
       }))
     end
 
@@ -340,7 +360,7 @@ module Stellar
     def self.interpret_amount(amount)
       case amount
       when String
-        (BigDecimal.new(amount) * Stellar::ONE).floor
+        (BigDecimal(amount) * Stellar::ONE).floor
       when Integer
         amount * Stellar::ONE
       when Numeric

data/lib/stellar/transaction.rb

@@ -26,15 +26,21 @@ module Stellar
     end
 
     #
-    # @see  Stellar::Operation.create_offer
-    def self.manage_offer(attributes={})
-      make :manage_offer, attributes
+    # @see  Stellar::Operation.manage_sell_offer
+    def self.manage_sell_offer(attributes={})
+      make :manage_sell_offer, attributes
     end
 
     #
-    # @see  Stellar::Operation.create_passive_offer
-    def self.create_passive_offer(attributes={})
-      make :create_passive_offer, attributes
+    # @see  Stellar::Operation.manage_buy_offer
+    def self.manage_buy_offer(attributes={})
+      make :manage_buy_offer, attributes
+    end
+
+    #
+    # @see  Stellar::Operation.create_passive_sell_offer
+    def self.create_passive_sell_offer(attributes={})
+      make :create_passive_sell_offer, attributes
     end
 
     #

data/spec/lib/stellar/price_spec.rb

@@ -22,11 +22,11 @@ describe Stellar::Price, "#from_f" do
       whole      = random.rand(1_000_000)
       fractional = random.rand(10_000_000) # seven significant digits available for fractional
       
-      expected = BigDecimal.new("#{whole}.#{fractional}")
+      expected = BigDecimal("#{whole}.#{fractional}")
       actual_p = subject.from_f(expected)
-      actual = BigDecimal.new(actual_p.n) / BigDecimal.new(actual_p.d) 
+      actual = BigDecimal(actual_p.n) / BigDecimal(actual_p.d)
 
-      expect(actual).to be_within(BigDecimal.new("0.000000001")).of(actual)
+      expect(actual).to be_within(BigDecimal("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

data/tasks/xdr.rake

@@ -1,50 +1,45 @@
 namespace :xdr do
-
-  # As Hayashi adds more .x files, we'll need to update this array
-  # Prior to launch, we should be separating our .x files into a separate
-  # repo, and should be able to improve this integration.
-  HAYASHI_XDR = [
-                 "src/xdr/Stellar-types.x",
-                 "src/xdr/Stellar-ledger-entries.x",
-                 "src/xdr/Stellar-transaction.x",
-                 "src/xdr/Stellar-ledger.x",
-                 "src/xdr/Stellar-overlay.x",
-                 "src/xdr/Stellar-SCP.x",
-                ]
-
-  LOCAL_XDR_PATHS = HAYASHI_XDR.map{ |src| "xdr/" + File.basename(src) }
-
-  task :update => [:download, :generate]
-
-  task :download do
-    require 'octokit'
-    require 'base64'
-    FileUtils.rm_rf "xdr/"
-    FileUtils.mkdir_p "xdr"
-
-    client = Octokit::Client.new(:netrc => true)
-
-    HAYASHI_XDR.each do |src|
-      local_path = "xdr/" + File.basename(src)
-      encoded    = client.contents("stellar/stellar-core", path: src).content
-      decoded    = Base64.decode64 encoded
-
-      IO.write(local_path, decoded)
-    end
-  end
-
-  task :generate do
-    require "pathname"
+  xdr_defs = FileList[
+    'xdr/Stellar-types.x',
+    'xdr/Stellar-ledger-entries.x',
+    'xdr/Stellar-transaction.x',
+    'xdr/Stellar-ledger.x',
+    'xdr/Stellar-overlay.x',
+    'xdr/Stellar-SCP.x',
+  ]
+
+  task :update, [:ref] => [:clean, :generate]
+  task :generate => 'generated/stellar-base-generated.rb'
+
+  directory 'xdr'
+  directory 'generated'
+
+  file 'generated/stellar-base-generated.rb' => xdr_defs do |t|
     require "xdrgen"
-    require 'fileutils'
-    FileUtils.rm_rf "generated"
 
     compilation = Xdrgen::Compilation.new(
-      LOCAL_XDR_PATHS,
+      t.sources,
       output_dir: "generated",
       namespace:  "stellar-base-generated",
       language:   :ruby
     )
     compilation.compile
   end
+
+  rule '.x', [:ref] => ['xdr'] do |t, args|
+    args.with_defaults(ref: :master)
+    core_file = github_client.contents("stellar/stellar-core", path: "src/#{t.name}", ref: args.ref)
+    IO.write(t.name, core_file.rels[:download].get.data)
+  end
+  
+  task :clean do
+    rm_rf 'xdr'
+    rm_rf 'generated'
+  end
+
+  def github_client
+    return @github_client if defined?(@github_client)
+    require 'octokit'
+    @github_client = Octokit::Client.new(netrc: true)
+  end
 end