stellar-base 0.24.0 → 0.28.0

data/generated/stellar/operation_result.rb

@@ -48,6 +48,12 @@ require 'xdr'
 #           EndSponsoringFutureReservesResult endSponsoringFutureReservesResult;
 #       case REVOKE_SPONSORSHIP:
 #           RevokeSponsorshipResult revokeSponsorshipResult;
+#       case CLAWBACK:
+#           ClawbackResult clawbackResult;
+#       case CLAWBACK_CLAIMABLE_BALANCE:
+#           ClawbackClaimableBalanceResult clawbackClaimableBalanceResult;
+#       case SET_TRUST_LINE_FLAGS:
+#           SetTrustLineFlagsResult setTrustLineFlagsResult;
 #       }
 #       tr;
 #   default:

data/generated/stellar/operation_result/tr.rb

@@ -45,6 +45,12 @@ require 'xdr'
 #           EndSponsoringFutureReservesResult endSponsoringFutureReservesResult;
 #       case REVOKE_SPONSORSHIP:
 #           RevokeSponsorshipResult revokeSponsorshipResult;
+#       case CLAWBACK:
+#           ClawbackResult clawbackResult;
+#       case CLAWBACK_CLAIMABLE_BALANCE:
+#           ClawbackClaimableBalanceResult clawbackClaimableBalanceResult;
+#       case SET_TRUST_LINE_FLAGS:
+#           SetTrustLineFlagsResult setTrustLineFlagsResult;
 #       }
 #
 # ===========================================================================
@@ -72,6 +78,9 @@ module Stellar
       switch :begin_sponsoring_future_reserves, :begin_sponsoring_future_reserves_result
       switch :end_sponsoring_future_reserves,   :end_sponsoring_future_reserves_result
       switch :revoke_sponsorship,               :revoke_sponsorship_result
+      switch :clawback,                         :clawback_result
+      switch :clawback_claimable_balance,       :clawback_claimable_balance_result
+      switch :set_trust_line_flags,             :set_trust_line_flags_result
 
       attribute :create_account_result,                   CreateAccountResult
       attribute :payment_result,                          PaymentResult
@@ -92,6 +101,9 @@ module Stellar
       attribute :begin_sponsoring_future_reserves_result, BeginSponsoringFutureReservesResult
       attribute :end_sponsoring_future_reserves_result,   EndSponsoringFutureReservesResult
       attribute :revoke_sponsorship_result,               RevokeSponsorshipResult
+      attribute :clawback_result,                         ClawbackResult
+      attribute :clawback_claimable_balance_result,       ClawbackClaimableBalanceResult
+      attribute :set_trust_line_flags_result,             SetTrustLineFlagsResult
     end
   end
 end

data/generated/stellar/operation_type.rb

@@ -25,7 +25,10 @@ require 'xdr'
 #       CLAIM_CLAIMABLE_BALANCE = 15,
 #       BEGIN_SPONSORING_FUTURE_RESERVES = 16,
 #       END_SPONSORING_FUTURE_RESERVES = 17,
-#       REVOKE_SPONSORSHIP = 18
+#       REVOKE_SPONSORSHIP = 18,
+#       CLAWBACK = 19,
+#       CLAWBACK_CLAIMABLE_BALANCE = 20,
+#       SET_TRUST_LINE_FLAGS = 21
 #   };
 #
 # ===========================================================================
@@ -50,6 +53,9 @@ module Stellar
     member :begin_sponsoring_future_reserves, 16
     member :end_sponsoring_future_reserves,   17
     member :revoke_sponsorship,               18
+    member :clawback,                         19
+    member :clawback_claimable_balance,       20
+    member :set_trust_line_flags,             21
 
     seal
   end

data/generated/stellar/payment_result_code.rb

@@ -8,7 +8,7 @@ require 'xdr'
 #   enum PaymentResultCode
 #   {
 #       // codes considered as "success" for the operation
-#       PAYMENT_SUCCESS = 0, // payment successfuly completed
+#       PAYMENT_SUCCESS = 0, // payment successfully completed
 #   
 #       // codes considered as "failure" for the operation
 #       PAYMENT_MALFORMED = -1,          // bad input

data/generated/stellar/revoke_sponsorship_op.rb

@@ -14,8 +14,7 @@ require 'xdr'
 #       {
 #           AccountID accountID;
 #           SignerKey signerKey;
-#       }
-#       signer;
+#       } signer;
 #   };
 #
 # ===========================================================================

data/generated/stellar/set_options_result_code.rb

@@ -18,22 +18,25 @@ require 'xdr'
 #       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
-#       SET_OPTIONS_INVALID_HOME_DOMAIN = -9     // malformed home domain
+#       SET_OPTIONS_INVALID_HOME_DOMAIN = -9,    // malformed home domain
+#       SET_OPTIONS_AUTH_REVOCABLE_REQUIRED =
+#           -10 // auth revocable is required for clawback
 #   };
 #
 # ===========================================================================
 module Stellar
   class SetOptionsResultCode < XDR::Enum
-    member :set_options_success,                0
-    member :set_options_low_reserve,            -1
-    member :set_options_too_many_signers,       -2
-    member :set_options_bad_flags,              -3
-    member :set_options_invalid_inflation,      -4
-    member :set_options_cant_change,            -5
-    member :set_options_unknown_flag,           -6
-    member :set_options_threshold_out_of_range, -7
-    member :set_options_bad_signer,             -8
-    member :set_options_invalid_home_domain,    -9
+    member :set_options_success,                 0
+    member :set_options_low_reserve,             -1
+    member :set_options_too_many_signers,        -2
+    member :set_options_bad_flags,               -3
+    member :set_options_invalid_inflation,       -4
+    member :set_options_cant_change,             -5
+    member :set_options_unknown_flag,            -6
+    member :set_options_threshold_out_of_range,  -7
+    member :set_options_bad_signer,              -8
+    member :set_options_invalid_home_domain,     -9
+    member :set_options_auth_revocable_required, -10
 
     seal
   end

data/generated/stellar/set_trust_line_flags_op.rb

@@ -0,0 +1,25 @@
+# This code was automatically generated using xdrgen
+# DO NOT EDIT or your changes may be overwritten
+
+require 'xdr'
+
+# === xdr source ============================================================
+#
+#   struct SetTrustLineFlagsOp
+#   {
+#       AccountID trustor;
+#       Asset asset;
+#   
+#       uint32 clearFlags; // which flags to clear
+#       uint32 setFlags;   // which flags to set
+#   };
+#
+# ===========================================================================
+module Stellar
+  class SetTrustLineFlagsOp < XDR::Struct
+    attribute :trustor,     AccountID
+    attribute :asset,       Asset
+    attribute :clear_flags, Uint32
+    attribute :set_flags,   Uint32
+  end
+end

data/generated/stellar/set_trust_line_flags_result.rb

@@ -0,0 +1,25 @@
+# This code was automatically generated using xdrgen
+# DO NOT EDIT or your changes may be overwritten
+
+require 'xdr'
+
+# === xdr source ============================================================
+#
+#   union SetTrustLineFlagsResult switch (SetTrustLineFlagsResultCode code)
+#   {
+#   case SET_TRUST_LINE_FLAGS_SUCCESS:
+#       void;
+#   default:
+#       void;
+#   };
+#
+# ===========================================================================
+module Stellar
+  class SetTrustLineFlagsResult < XDR::Union
+    switch_on SetTrustLineFlagsResultCode, :code
+
+    switch :set_trust_line_flags_success
+    switch :default
+
+  end
+end

data/generated/stellar/set_trust_line_flags_result_code.rb

@@ -0,0 +1,31 @@
+# This code was automatically generated using xdrgen
+# DO NOT EDIT or your changes may be overwritten
+
+require 'xdr'
+
+# === xdr source ============================================================
+#
+#   enum SetTrustLineFlagsResultCode
+#   {
+#       // codes considered as "success" for the operation
+#       SET_TRUST_LINE_FLAGS_SUCCESS = 0,
+#   
+#       // codes considered as "failure" for the operation
+#       SET_TRUST_LINE_FLAGS_MALFORMED = -1,
+#       SET_TRUST_LINE_FLAGS_NO_TRUST_LINE = -2,
+#       SET_TRUST_LINE_FLAGS_CANT_REVOKE = -3,
+#       SET_TRUST_LINE_FLAGS_INVALID_STATE = -4
+#   };
+#
+# ===========================================================================
+module Stellar
+  class SetTrustLineFlagsResultCode < XDR::Enum
+    member :set_trust_line_flags_success,       0
+    member :set_trust_line_flags_malformed,     -1
+    member :set_trust_line_flags_no_trust_line, -2
+    member :set_trust_line_flags_cant_revoke,   -3
+    member :set_trust_line_flags_invalid_state, -4
+
+    seal
+  end
+end

data/generated/stellar/transaction_result_code.rb

@@ -22,7 +22,7 @@ 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 occurred
 #   
 #       txNOT_SUPPORTED = -12,         // transaction type not supported
 #       txFEE_BUMP_INNER_FAILED = -13, // fee bump inner transaction failed

data/generated/stellar/trust_line_flags.rb

@@ -11,7 +11,10 @@ require 'xdr'
 #       AUTHORIZED_FLAG = 1,
 #       // issuer has authorized account to maintain and reduce liabilities for its
 #       // credit
-#       AUTHORIZED_TO_MAINTAIN_LIABILITIES_FLAG = 2
+#       AUTHORIZED_TO_MAINTAIN_LIABILITIES_FLAG = 2,
+#       // issuer has specified that it may clawback its credit, and that claimable
+#       // balances created with its credit may also be clawed back
+#       TRUSTLINE_CLAWBACK_ENABLED_FLAG = 4
 #   };
 #
 # ===========================================================================
@@ -19,6 +22,7 @@ module Stellar
   class TrustLineFlags < XDR::Enum
     member :authorized_flag,                         1
     member :authorized_to_maintain_liabilities_flag, 2
+    member :trustline_clawback_enabled_flag,         4
 
     seal
   end

data/lib/stellar-base.rb

@@ -5,6 +5,8 @@ require "active_support/core_ext/object/blank"
 require "active_support/core_ext/enumerable"
 require "active_support/core_ext/kernel/reporting"
 require "active_support/core_ext/module/attribute_accessors_per_thread"
+require "active_support/core_ext/module/delegation"
+require "active_support/deprecation"
 
 require_relative "stellar/ext/xdr"
 
@@ -14,13 +16,14 @@ silence_warnings do
 end
 Stellar.load_all!
 
-require_relative "stellar/base/version"
-Stellar::VERSION = Stellar::Base::VERSION
+require_relative "stellar/version"
 
 Stellar::ONE = 1_0000000
+Stellar::Deprecation = ActiveSupport::Deprecation.new("next release", "stellar-base")
 
 # extensions onto the generated files must be loaded manually, below
 
+require_relative "./stellar/account"
 require_relative "./stellar/account_flags"
 require_relative "./stellar/asset"
 require_relative "./stellar/claim_predicate"
@@ -32,6 +35,7 @@ require_relative "./stellar/path_payment_strict_receive_result"
 require_relative "./stellar/price"
 require_relative "./stellar/signer_key"
 require_relative "./stellar/thresholds"
+require_relative "./stellar/trust_line_flags"
 
 require_relative "./stellar/concerns/transaction"
 require_relative "./stellar/fee_bump_transaction"

data/lib/stellar/account.rb

@@ -0,0 +1,59 @@
+module Stellar
+  class Account
+    delegate :address, to: :keypair
+
+    def self.random
+      keypair = Stellar::KeyPair.random
+      new(keypair)
+    end
+
+    def self.from_seed(seed)
+      keypair = Stellar::KeyPair.from_seed(seed)
+      new(keypair)
+    end
+
+    def self.from_address(address)
+      muxed_xdr = Util::StrKey.decode_muxed_account(address)
+
+      if muxed_xdr.ed25519
+        new(KeyPair.from_public_key(muxed_xdr.ed25519))
+      else
+        muxed_xdr = muxed_xdr.med25519!
+        new(KeyPair.from_public_key(muxed_xdr.ed25519), muxed_xdr.id)
+      end
+    end
+
+    def self.master
+      keypair = Stellar::KeyPair.from_raw_seed("allmylifemyhearthasbeensearching")
+      new(keypair)
+    end
+
+    attr_reader :keypair, :id
+
+    # @param [Stellar::KeyPair] keypair
+    # @param [Integer] id
+    def initialize(keypair, id = nil)
+      @keypair = keypair
+      @id = id
+    end
+
+    def base_account
+      Stellar::MuxedAccount.ed25519(keypair.raw_public_key)
+    end
+
+    def muxed_account
+      return base_account unless id
+      Stellar::MuxedAccount.med25519(ed25519: keypair.raw_public_key, id: id)
+    end
+
+    def address(force_account_id: true)
+      return keypair.address if force_account_id
+
+      Util::StrKey.check_encode(:muxed, keypair.raw_public_key + [id].pack("Q>"))
+    end
+
+    def to_keypair
+      keypair
+    end
+  end
+end

data/lib/stellar/asset.rb

@@ -6,14 +6,24 @@ module Stellar
       new(:asset_type_native)
     end
 
+    # @param code   [String] asset code
+    # @param issuer [#to_keypair] asset issuer
+    #
+    # @return [Stellar::Asset::AlphaNum4] asset4 representation
     def self.alphanum4(code, issuer)
+      issuer = issuer.to_keypair if issuer.respond_to?(:to_keypair)
       raise ArgumentError, "Bad :issuer" unless issuer.is_a?(KeyPair)
       code = normalize_code(code, 4)
       an = AlphaNum4.new({asset_code: code, issuer: issuer.account_id})
       new(:asset_type_credit_alphanum4, an)
     end
 
+    # @param code   [String] asset code
+    # @param issuer [#to_keypair] asset issuer
+    #
+    # @return [Stellar::Asset::AlphaNum4] asset4 representation
     def self.alphanum12(code, issuer)
+      issuer = issuer.to_keypair if issuer.respond_to?(:to_keypair)
       raise ArgumentError, "Bad :issuer" unless issuer.is_a?(KeyPair)
       code = normalize_code(code, 12)
       an = AlphaNum12.new({asset_code: code, issuer: issuer.account_id})

data/lib/stellar/compat.rb

@@ -1,12 +1,11 @@
-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
+  deprecate(
+    deprecator: Stellar::Deprecation,
+    manage_offer: :manage_sell_offer,
+    create_passive_offer: :create_passive_sell_offer,
+    allow_trust: :set_trust_line_flags
+  )
 end

data/lib/stellar/concerns/transaction.rb

@@ -19,7 +19,7 @@ module Stellar::Concerns
     end
 
     def merge(other)
-      cloned = Marshal.load Marshal.dump(self)
+      cloned = from_xdr(to_xdr)
       cloned.operations += other.to_operations
       cloned
     end
@@ -32,9 +32,10 @@ module Stellar::Concerns
     #
     # @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|
+      codec = XDR::VarArray[Stellar::Operation]
+      ops = respond_to?(:operations) ? operations : inner_tx.value.tx.operations
+      cloned = codec.from_xdr(codec.to_xdr(ops))
+      cloned.each do |op|
         op.source_account ||= source_account
       end
     end

data/lib/stellar/dsl.rb

@@ -1,5 +1,7 @@
 module Stellar
   module DSL
+    module_function
+
     # Constructs a new ClaimPredicate using DSL
     #
     # @example fulfilled during [T+5min, T+60min] period, where T refers to claimable balance entry creation time
@@ -25,6 +27,28 @@ module Stellar
       )
     end
 
+    def Account(subject = nil)
+      case subject
+      when Account
+        subject
+      when /^M[A-Z0-9]{68}$/
+        Account.from_address(subject.to_str)
+      when nil
+        Account.random
+      else
+        begin
+          keypair = KeyPair(subject)
+
+          Account.new(keypair)
+        rescue TypeError
+          raise TypeError, "Cannot convert #{subject.inspect} to Stellar::Account"
+        end
+      end
+    end
+
+    # @param [Asset, String, nil] subject
+    # @return [Stellar::Asset] instance of the Stellar::Asset
+    # @raise [TypeError] if subject cannot be converted to Stellar::Asset
     def Asset(subject = nil)
       case subject
       when Asset
@@ -43,18 +67,21 @@ module Stellar
     # Generates Stellar::Keypair from subject, use Stellar::Client.to_keypair as shortcut.
     # @param subject [String|Stellar::Account|Stellar::PublicKey|Stellar::SignerKey|Stellar::Keypair] subject.
     # @return [Stellar::Keypair] Stellar::Keypair instance.
+    # @raise [TypeError] if subject cannot be converted to Stellar::KeyPair
     def KeyPair(subject = nil)
       case subject
       when ->(subj) { subj.respond_to?(:to_keypair) }
         subject.to_keypair
-      when /G[A-Z0-9]{55}/
-        KeyPair.from_address(subject)
-      when /S[A-Z0-9]{55}/
-        KeyPair.from_seed(subject)
       when PublicKey
         KeyPair.from_public_key(subject.value)
       when SignerKey
         KeyPair.from_raw_seed(subject.value)
+      when /^G[A-Z0-9]{55}$/
+        KeyPair.from_address(subject.to_str)
+      when /^S[A-Z0-9]{55}$/
+        KeyPair.from_seed(subject.to_str)
+      when /^.{32}$/
+        KeyPair.from_raw_seed(subject.to_str)
       when nil
         KeyPair.random
       else
@@ -81,5 +108,5 @@ module Stellar
     end
   end
 
-  extend DSL
+  include DSL
 end