stellar-base 0.22.0 → 0.23.0.pre1

data/generated/stellar/transaction_result/result.rb

@@ -7,6 +7,9 @@ require 'xdr'
 #
 #   union switch (TransactionResultCode code)
 #       {
+#       case txFEE_BUMP_INNER_SUCCESS:
+#       case txFEE_BUMP_INNER_FAILED:
+#           InnerTransactionResultPair innerResultPair;
 #       case txSUCCESS:
 #       case txFAILED:
 #           OperationResult results<>;
@@ -20,11 +23,14 @@ module Stellar
     class Result < XDR::Union
       switch_on TransactionResultCode, :code
 
-      switch :tx_success, :results
-      switch :tx_failed,  :results
+      switch :tx_fee_bump_inner_success, :inner_result_pair
+      switch :tx_fee_bump_inner_failed,  :inner_result_pair
+      switch :tx_success,                :results
+      switch :tx_failed,                 :results
       switch :default
 
-      attribute :results, XDR::VarArray[OperationResult]
+      attribute :inner_result_pair, InnerTransactionResultPair
+      attribute :results,           XDR::VarArray[OperationResult]
     end
   end
 end

data/generated/stellar/transaction_result_code.rb

@@ -7,7 +7,8 @@ require 'xdr'
 #
 #   enum TransactionResultCode
 #   {
-#       txSUCCESS = 0, // all operations succeeded
+#       txFEE_BUMP_INNER_SUCCESS = 1, // fee bump inner transaction succeeded
+#       txSUCCESS = 0,                // all operations succeeded
 #   
 #       txFAILED = -1, // one of the operations failed (none were applied)
 #   
@@ -21,24 +22,30 @@ require 'xdr'
 #       txNO_ACCOUNT = -8,           // source account not found
 #       txINSUFFICIENT_FEE = -9,     // fee is too small
 #       txBAD_AUTH_EXTRA = -10,      // unused signatures attached to transaction
-#       txINTERNAL_ERROR = -11       // an unknown error occured
+#       txINTERNAL_ERROR = -11,      // an unknown error occured
+#   
+#       txNOT_SUPPORTED = -12,        // transaction type not supported
+#       txFEE_BUMP_INNER_FAILED = -13 // fee bump inner transaction failed
 #   };
 #
 # ===========================================================================
 module Stellar
   class TransactionResultCode < XDR::Enum
-    member :tx_success,              0
-    member :tx_failed,               -1
-    member :tx_too_early,            -2
-    member :tx_too_late,             -3
-    member :tx_missing_operation,    -4
-    member :tx_bad_seq,              -5
-    member :tx_bad_auth,             -6
-    member :tx_insufficient_balance, -7
-    member :tx_no_account,           -8
-    member :tx_insufficient_fee,     -9
-    member :tx_bad_auth_extra,       -10
-    member :tx_internal_error,       -11
+    member :tx_fee_bump_inner_success, 1
+    member :tx_success,                0
+    member :tx_failed,                 -1
+    member :tx_too_early,              -2
+    member :tx_too_late,               -3
+    member :tx_missing_operation,      -4
+    member :tx_bad_seq,                -5
+    member :tx_bad_auth,               -6
+    member :tx_insufficient_balance,   -7
+    member :tx_no_account,             -8
+    member :tx_insufficient_fee,       -9
+    member :tx_bad_auth_extra,         -10
+    member :tx_internal_error,         -11
+    member :tx_not_supported,          -12
+    member :tx_fee_bump_inner_failed,  -13
 
     seal
   end

data/generated/stellar/transaction_signature_payload.rb

@@ -10,9 +10,11 @@ require 'xdr'
 #       Hash networkId;
 #       union switch (EnvelopeType type)
 #       {
+#       // Backwards Compatibility: Use ENVELOPE_TYPE_TX to sign ENVELOPE_TYPE_TX_V0
 #       case ENVELOPE_TYPE_TX:
 #           Transaction tx;
-#           /* All other values of type are invalid */
+#       case ENVELOPE_TYPE_TX_FEE_BUMP:
+#           FeeBumpTransaction feeBump;
 #       }
 #       taggedTransaction;
 #   };

data/generated/stellar/transaction_signature_payload/tagged_transaction.rb

@@ -7,9 +7,11 @@ require 'xdr'
 #
 #   union switch (EnvelopeType type)
 #       {
+#       // Backwards Compatibility: Use ENVELOPE_TYPE_TX to sign ENVELOPE_TYPE_TX_V0
 #       case ENVELOPE_TYPE_TX:
 #           Transaction tx;
-#           /* All other values of type are invalid */
+#       case ENVELOPE_TYPE_TX_FEE_BUMP:
+#           FeeBumpTransaction feeBump;
 #       }
 #
 # ===========================================================================
@@ -18,9 +20,11 @@ module Stellar
     class TaggedTransaction < XDR::Union
       switch_on EnvelopeType, :type
 
-      switch :envelope_type_tx, :tx
+      switch :envelope_type_tx,          :tx
+      switch :envelope_type_tx_fee_bump, :fee_bump
 
-      attribute :tx, Transaction
+      attribute :tx,       Transaction
+      attribute :fee_bump, FeeBumpTransaction
     end
   end
 end

data/generated/stellar/transaction_v0.rb

@@ -0,0 +1,39 @@
+# This code was automatically generated using xdrgen
+# DO NOT EDIT or your changes may be overwritten
+
+require 'xdr'
+
+# === xdr source ============================================================
+#
+#   struct TransactionV0
+#   {
+#       uint256 sourceAccountEd25519;
+#       uint32 fee;
+#       SequenceNumber seqNum;
+#       TimeBounds* timeBounds;
+#       Memo memo;
+#       Operation operations<MAX_OPS_PER_TX>;
+#       union switch (int v)
+#       {
+#       case 0:
+#           void;
+#       }
+#       ext;
+#   };
+#
+# ===========================================================================
+module Stellar
+  class TransactionV0 < XDR::Struct
+    include XDR::Namespace
+
+    autoload :Ext
+
+    attribute :source_account_ed25519, Uint256
+    attribute :fee,                    Uint32
+    attribute :seq_num,                SequenceNumber
+    attribute :time_bounds,            XDR::Option[TimeBounds]
+    attribute :memo,                   Memo
+    attribute :operations,             XDR::VarArray[Operation, MAX_OPS_PER_TX]
+    attribute :ext,                    Ext
+  end
+end

data/generated/stellar/transaction_v0/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 TransactionV0
+    class Ext < XDR::Union
+      switch_on XDR::Int, :v
+
+      switch 0
+
+    end
+  end
+end

data/generated/stellar/transaction_v0_envelope.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 ============================================================
+#
+#   struct TransactionV0Envelope
+#   {
+#       TransactionV0 tx;
+#       /* Each decorated signature is a signature over the SHA256 hash of
+#        * a TransactionSignaturePayload */
+#       DecoratedSignature signatures<20>;
+#   };
+#
+# ===========================================================================
+module Stellar
+  class TransactionV0Envelope < XDR::Struct
+    attribute :tx,         TransactionV0
+    attribute :signatures, XDR::VarArray[DecoratedSignature, 20]
+  end
+end

data/generated/stellar/transaction_v1_envelope.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 ============================================================
+#
+#   struct TransactionV1Envelope
+#   {
+#       Transaction tx;
+#       /* Each decorated signature is a signature over the SHA256 hash of
+#        * a TransactionSignaturePayload */
+#       DecoratedSignature signatures<20>;
+#   };
+#
+# ===========================================================================
+module Stellar
+  class TransactionV1Envelope < XDR::Struct
+    attribute :tx,         Transaction
+    attribute :signatures, XDR::VarArray[DecoratedSignature, 20]
+  end
+end

data/generated/stellar/trust_line_flags.rb

@@ -8,13 +8,17 @@ require 'xdr'
 #   enum TrustLineFlags
 #   {
 #       // issuer has authorized account to perform transactions with its credit
-#       AUTHORIZED_FLAG = 1
+#       AUTHORIZED_FLAG = 1,
+#       // issuer has authorized account to maintain and reduce liabilities for its
+#       // credit
+#       AUTHORIZED_TO_MAINTAIN_LIABILITIES_FLAG = 2
 #   };
 #
 # ===========================================================================
 module Stellar
   class TrustLineFlags < XDR::Enum
-    member :authorized_flag, 1
+    member :authorized_flag,                         1
+    member :authorized_to_maintain_liabilities_flag, 2
 
     seal
   end

data/lib/stellar-base.rb

@@ -1,36 +1,38 @@
-require 'xdr'
-require 'rbnacl'
-require 'digest/sha2'
-require 'active_support/core_ext/object/blank'
-require 'active_support/core_ext/enumerable'
-require 'active_support/core_ext/kernel/reporting'
+require "xdr"
+require "rbnacl"
+require "digest/sha2"
+require "active_support/core_ext/object/blank"
+require "active_support/core_ext/enumerable"
+require "active_support/core_ext/kernel/reporting"
 
 # See ../generated for code-gen'ed files
 silence_warnings do
-  require 'stellar-base-generated'
+  require "stellar-base-generated"
 end
 Stellar.load_all!
 
 Stellar::ONE = 1_0000000
 
-
 # extensions onto the generated files must be loaded manually, below
 
-require_relative './stellar/account_flags'
-require_relative './stellar/asset'
-require_relative './stellar/key_pair'
-require_relative './stellar/operation'
-require_relative './stellar/path_payment_strict_receive_result'
-require_relative './stellar/price'
-require_relative './stellar/signer_key'
-require_relative './stellar/thresholds'
-require_relative './stellar/transaction'
-require_relative './stellar/transaction_builder'
-require_relative './stellar/transaction_envelope'
-require_relative './stellar/util/strkey'
-require_relative './stellar/util/continued_fraction'
-require_relative './stellar/convert'
-require_relative './stellar/networks'
-require_relative './stellar/base/version'
+require_relative "./stellar/account_flags"
+require_relative "./stellar/asset"
+require_relative "./stellar/key_pair"
+require_relative "./stellar/operation"
+require_relative "./stellar/path_payment_strict_receive_result"
+require_relative "./stellar/price"
+require_relative "./stellar/signer_key"
+require_relative "./stellar/thresholds"
+require_relative "./stellar/concerns/transaction"
+require_relative "./stellar/transaction"
+require_relative "./stellar/transaction_v0"
+require_relative "./stellar/fee_bump_transaction"
+require_relative "./stellar/transaction_builder"
+require_relative "./stellar/transaction_envelope"
+require_relative "./stellar/util/strkey"
+require_relative "./stellar/util/continued_fraction"
+require_relative "./stellar/convert"
+require_relative "./stellar/networks"
+require_relative "./stellar/version"
 
-require_relative './stellar/base/compat'
+require_relative "./stellar/compat"

data/lib/stellar/account_flags.rb

@@ -1,7 +1,5 @@
 module Stellar
   class AccountFlags
-
-
     #
     # Converts an array of Stellar::AccountFlags members into
     # an Integer suitable for use in a SetOptionsOp.
@@ -9,7 +7,7 @@ module Stellar
     # @param flags=nil [Array<Stellar::AccountFlags>] the flags to combine
     #
     # @return [Fixnum] the combined result
-    def self.make_mask(flags=nil)
+    def self.make_mask(flags = nil)
       flags ||= []
 
       flags.map(&:value).inject(&:|) || 0
@@ -22,7 +20,7 @@ module Stellar
     #  @param combined [Fixnum]
     #  @return [Array<Stellar::AccountFlags>]
     def self.parse_mask(combined)
-      members.values.select{|m| (m.value & combined) != 0}
+      members.values.select { |m| (m.value & combined) != 0 }
     end
   end
 end

data/lib/stellar/asset.rb

@@ -1,6 +1,6 @@
 module Stellar
   class Asset
-    TYPES = %i(native alphanum4 alphanum12)
+    TYPES = %i[native alphanum4 alphanum12]
 
     def self.native
       new(:asset_type_native)
@@ -9,14 +9,14 @@ module Stellar
     def self.alphanum4(code, issuer)
       raise ArgumentError, "Bad :issuer" unless issuer.is_a?(KeyPair)
       code = normalize_code(code, 4)
-      an = AlphaNum4.new({asset_code:code, issuer:issuer.account_id})
+      an = AlphaNum4.new({asset_code: code, issuer: issuer.account_id})
       new(:asset_type_credit_alphanum4, an)
     end
 
     def self.alphanum12(code, issuer)
       raise ArgumentError, "Bad :issuer" unless issuer.is_a?(KeyPair)
       code = normalize_code(code, 12)
-      an = AlphaNum12.new({asset_code:code, issuer:issuer.account_id})
+      an = AlphaNum12.new({asset_code: code, issuer: issuer.account_id})
       new(:asset_type_credit_alphanum12, an)
     end
 
@@ -36,8 +36,8 @@ module Stellar
     end
 
     def inspect
-      label = switch.to_s
-      "#<Stellar::Asset #{to_s}>"
+      # label = switch.to_s
+      "#<Stellar::Asset #{self}>"
     end
 
     def code
@@ -50,7 +50,7 @@ module Stellar
         raise "#{switch} assets do not have a code"
       end
     end
-    
+
     def issuer
       case switch
       when AssetType.asset_type_credit_alphanum4

data/lib/stellar/base.rb

@@ -1 +1 @@
-require "stellar-base"
+require "stellar-base"

data/lib/stellar/{base/compat.rb → compat.rb}

@@ -1,10 +1,10 @@
-require 'active_support/deprecation'
+require "active_support/deprecation"
 
-Stellar::Deprecation ||= ActiveSupport::Deprecation.new('next release', 'stellar-base')
+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
+  alias manage_offer manage_sell_offer
+  alias create_passive_offer create_passive_sell_offer
 
   deprecate deprecator: Stellar::Deprecation,
             manage_offer: :manage_sell_offer,
@@ -12,11 +12,10 @@ class << Stellar::Operation
 end
 
 class << Stellar::Transaction
-  alias_method :manage_offer, :manage_sell_offer
-  alias_method :create_passive_offer, :create_passive_sell_offer
+  alias manage_offer manage_sell_offer
+  alias 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/concerns/transaction.rb

@@ -0,0 +1,49 @@
+module Stellar::Concerns
+  module Transaction
+    # Returns the string of bytes that, when hashed, provide the value which
+    # should be signed to create a valid stellar transaction signature
+    def signature_base
+      signature_base_prefix + to_xdr
+    end
+
+    def sign(key_pair)
+      key_pair.sign(hash)
+    end
+
+    def sign_decorated(key_pair)
+      key_pair.sign_decorated(hash)
+    end
+
+    def hash
+      Digest::SHA256.digest(signature_base)
+    end
+
+    def merge(other)
+      cloned = Marshal.load Marshal.dump(self)
+      cloned.operations += other.to_operations
+      cloned
+    end
+
+    #
+    # Extracts the operations from this single transaction,
+    # setting the source account on the extracted operations.
+    #
+    # Useful for merging transactions.
+    #
+    # @return [Array<Operation>] the operations
+    def to_operations
+      # FIXME: what was the purpose of this?
+      # cloned = Marshal.load Marshal.dump(operations)
+      operations.each do |op|
+        op.source_account ||= source_account
+      end
+    end
+
+    def apply_defaults
+      self.operations ||= []
+      self.fee ||= 100
+      self.memo ||= Stellar::Memo.new(:memo_none)
+      self.ext ||= Stellar::Transaction::Ext.new 0
+    end
+  end
+end