stellar-base 0.29.0 → 0.32.0

data/lib/stellar/price.rb

@@ -3,23 +3,29 @@ module Stellar
   class Price
     MAX_PRECISION = (2**31) - 1
 
-    def self.from_f(number)
-      best_r = number.to_r.rationalize(1.0e-7)
+    def self.from(number)
+      number = BigDecimal(number, 0) if number.is_a?(String)
+      number = number.to_r if number.respond_to?(:to_r)
+
+      raise ArgumentError, "Couldn't convert #{number.class} to rational number" unless number.is_a?(Rational)
+
+      best_r = number.rationalize(1.0e-7)
 
       if best_r.numerator > MAX_PRECISION || best_r.denominator > MAX_PRECISION
-        raise ArgumentError("Couldn't find price approximation")
+        raise ArgumentError, "Couldn't find valid price approximation for #{number}"
       end
 
-      new({
-        n: best_r.numerator,
-        d: best_r.denominator
-      })
+      new(n: best_r.numerator, d: best_r.denominator)
     end
 
     def invert
       self.class.new(n: d, d: n)
     end
 
+    def to_r
+      Rational(n, d)
+    end
+
     def to_d
       n.to_d / d
     end

data/lib/stellar/transaction.rb

@@ -15,7 +15,7 @@ module Stellar
         operations: operations,
         fee: fee,
         memo: memo,
-        time_bounds: time_bounds,
+        time_bounds: cond.v2&.time_bounds || cond.time_bounds,
         ext: ext
       )
     end

data/lib/stellar/transaction_builder.rb

@@ -2,7 +2,18 @@ module Stellar
   class TransactionBuilder
     include Stellar::DSL
 
-    attr_reader :source_account, :sequence_number, :base_fee, :time_bounds, :memo, :operations
+    attr_reader :source_account, :sequence_number, :base_fee,
+      :time_bounds, :memo, :operations, :ledger_bounds
+
+    # If you want to prepare a transaction which will be valid only while the
+    # account sequence number is
+    #
+    #     min_account_sequence <= source_account_sequence < tx.seq_num
+    #
+    # you can set min_account_sequence attribute
+    #
+    # Note that after execution the account's sequence number is always raised to `tx.seq_num`
+    attr_accessor :min_account_sequence
 
     class << self
       # This enable user to call shortcut methods, like
@@ -11,11 +22,14 @@ module Stellar
       # It reduces the boilerplate, when you just need to
       # shoot a single operation in transaction
       def method_missing(method_name, *args, **kwargs)
-        unless Stellar::Operation.respond_to?(method_name)
-          return super
-        end
+        return super unless Operation.respond_to?(method_name)
 
-        op = Stellar::Operation.send(method_name, **kwargs)
+        op = Operation.send(
+          method_name,
+          **kwargs.except(
+            :source_account, :sequence_number, :base_fee, :time_bounds, :memo
+          )
+        )
 
         new(**kwargs).add_operation(op).build
       end
@@ -30,8 +44,12 @@ module Stellar
       sequence_number:,
       base_fee: 100,
       time_bounds: nil,
+      ledger_bounds: nil,
       memo: nil,
-      enable_muxed_accounts: false,
+      min_account_sequence: nil,
+      min_account_sequence_age: nil,
+      min_account_sequence_ledger_gap: nil,
+      extra_signers: [],
       **_ # ignore any additional parameters without errors
     )
       raise ArgumentError, "Bad :sequence_number" unless sequence_number.is_a?(Integer) && sequence_number >= 0
@@ -42,7 +60,11 @@ module Stellar
       @sequence_number = sequence_number
       @base_fee = base_fee
       @time_bounds = time_bounds
-      @enable_muxed_accounts = enable_muxed_accounts
+      @ledger_bounds = ledger_bounds
+      @min_account_sequence = min_account_sequence
+      @min_account_sequence_age = min_account_sequence_age
+      @min_account_sequence_ledger_gap = min_account_sequence_ledger_gap
+      @extra_signers = extra_signers.clone
 
       set_timeout(0) if time_bounds.nil?
 
@@ -60,12 +82,12 @@ module Stellar
       end
 
       attrs = {
-        source_account: source_muxed_account,
+        source_account: @source_account.muxed_account,
         fee: @base_fee * @operations.length,
         seq_num: @sequence_number,
-        time_bounds: @time_bounds,
         memo: @memo,
         operations: @operations,
+        cond: build_preconditions,
         ext: Stellar::Transaction::Ext.new(0)
       }
 
@@ -91,7 +113,7 @@ module Stellar
       end
 
       Stellar::FeeBumpTransaction.new(
-        fee_source: source_muxed_account,
+        fee_source: @source_account.muxed_account,
         fee: @base_fee * (inner_ops.length + 1),
         inner_tx: Stellar::FeeBumpTransaction::InnerTx.new(:envelope_type_tx, inner_txe.v1!),
         ext: Stellar::FeeBumpTransaction::Ext.new(0)
@@ -135,6 +157,70 @@ module Stellar
       self
     end
 
+    # If you want to prepare a transaction which will only be valid within some
+    # range of ledgers, you can set a `ledger_bounds` precondition.
+    def set_ledger_bounds(min_ledger, max_ledger)
+      if min_ledger < 0
+        raise ArgumentError, "min_ledger cannot be negative"
+      end
+
+      if max_ledger < 0
+        raise ArgumentError, "max_ledger cannot be negative"
+      end
+
+      if max_ledger > 0 && min_ledger > max_ledger
+        raise ArgumentError, "min_ledger cannot be greater than max_ledger"
+      end
+
+      @ledger_bounds = Stellar::LedgerBounds.new(
+        min_ledger: min_ledger,
+        max_ledger: max_ledger
+      )
+
+      self
+    end
+
+    # For the transaction to be valid, the current ledger time must be at least
+    # `min_account_sequence_age` greater than source account's `sequence_time`
+    def min_account_sequence_age=(duration_in_seconds)
+      unless duration_in_seconds.is_a?(Integer)
+        raise ArgumentError, "min_account_sequence_age must be a number"
+      end
+
+      if duration_in_seconds < 0
+        raise ArgumentError, "min_account_sequence_age cannot be negative"
+      end
+
+      @min_account_sequence_age = duration_in_seconds
+    end
+
+    # For the transaction to be valid, the current ledger number must be at least
+    # `minAccountSequenceLedgerGap` greater than sourceAccount's ledger sequence.
+    def min_account_sequence_ledger_gap=(gap)
+      if gap < 0
+        raise ArgumentError, "min_account_sequence_ledger_gap cannot be negative"
+      end
+
+      @min_account_sequence_ledger_gap = gap
+    end
+
+    # For the transaction to be valid, there must be a signature corresponding to
+    # every Signer in this array, even if the signature is not otherwise required
+    # by the sourceAccount or operations
+    def set_extra_signers(extra_signers)
+      unless extra_signers.is_a?(Array)
+        raise ArgumentError, "extra_signers must be an array of strings"
+      end
+
+      if extra_signers.size > 2
+        raise ArgumentError, "extra_signers cannot be longer than 2 elements"
+      end
+
+      @extra_signers = extra_signers.clone
+
+      self
+    end
+
     def set_memo(memo)
       @memo = make_memo(memo)
       self
@@ -164,16 +250,32 @@ module Stellar
       end
     end
 
-    def source_muxed_account
-      if with_muxed_accounts?
-        @source_account.muxed_account
-      else
-        @source_account.base_account
-      end
+    private
+
+    def has_v2_preconditions?
+      !(
+        @ledger_bounds.nil? &&
+        @min_account_sequence.nil? &&
+        @min_account_sequence_age.nil? &&
+        @extra_signers.empty? &&
+        @min_account_sequence_ledger_gap.nil?
+      )
     end
 
-    def with_muxed_accounts?
-      @enable_muxed_accounts
+    def build_preconditions
+      return Stellar::Preconditions.new(:precond_time, @time_bounds) unless has_v2_preconditions?
+
+      Stellar::Preconditions.new(
+        :precond_v2,
+        Stellar::PreconditionsV2.new(
+          time_bounds: @time_bounds,
+          ledger_bounds: @ledger_bounds,
+          min_seq_num: @min_account_sequence,
+          min_seq_age: @min_account_sequence_age,
+          min_seq_ledger_gap: @min_account_sequence_ledger_gap,
+          extra_signers: @extra_signers.map { |signer| SignerKey(signer) }
+        )
+      )
     end
   end
 end

data/lib/stellar/transaction_v0.rb

@@ -3,7 +3,11 @@ module Stellar
     include Stellar::Concerns::Transaction
 
     def to_v1
-      Transaction.new(**attributes.except(:source_account_ed25519), source_account: source_account)
+      Transaction.new(
+        **attributes.except(:source_account_ed25519, :time_bounds),
+        cond: Stellar::Preconditions.new(:precond_time, time_bounds),
+        source_account: source_account
+      )
     end
 
     def to_envelope(*key_pairs)

data/lib/stellar/util/strkey.rb

@@ -9,7 +9,8 @@ module Stellar
         seed: [18 << 3].pack("C"), # Base32-encodes to 'S...'
         pre_auth_tx: [19 << 3].pack("C"), # Base32-encodes to 'T...'
         hash_x: [23 << 3].pack("C"), # Base32-encodes to 'X...'
-        muxed: [12 << 3].pack("C") # Base32-encodes to 'M...'
+        muxed: [12 << 3].pack("C"), # Base32-encodes to 'M...'
+        signed_payload: [15 << 3].pack("C") # Base32-encodes to 'P...'
       }
 
       def self.check_encode(version, byte_str)
@@ -50,6 +51,19 @@ module Stellar
         end
       end
 
+      # @param payload [Stellar::SignerKey::Ed25519SignedPayload]
+      # @return [String] "P.."-like address
+      def self.encode_signed_payload(payload)
+        check_encode(:signed_payload, payload.to_xdr)
+      end
+
+      # @param strkey [String] address string to decode
+      # @return [Stellar::SignerKey::Ed25519SignedPayload]
+      def self.decode_signed_payload(strkey)
+        raw = check_decode(:signed_payload, strkey)
+        Stellar::SignerKey::Ed25519SignedPayload.from_xdr(raw, :raw)
+      end
+
       def self.check_decode(expected_version, str)
         decoded = begin
           Base32.decode(str)

data/lib/stellar/version.rb

@@ -1,3 +1,3 @@
 module Stellar
-  VERSION = "0.29.0".freeze
+  VERSION = "0.32.0".freeze
 end

data/lib/stellar-base.rb

@@ -25,10 +25,12 @@ Stellar::Deprecation = ActiveSupport::Deprecation.new("next release", "stellar-b
 
 require_relative "./stellar/account"
 require_relative "./stellar/account_flags"
+require_relative "./stellar/amount"
 require_relative "./stellar/asset"
 require_relative "./stellar/claim_predicate"
 require_relative "./stellar/key_pair"
 require_relative "./stellar/ledger_key"
+require_relative "./stellar/liquidity_pool"
 require_relative "./stellar/networks"
 require_relative "./stellar/operation"
 require_relative "./stellar/path_payment_strict_receive_result"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stellar-base
 version: !ruby/object:Gem::Version
-  version: 0.29.0
+  version: 0.32.0
 platform: ruby
 authors:
 - Scott Fleckenstein
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-09-07 00:00:00.000000000 Z
+date: 2022-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -21,7 +21,7 @@ dependencies:
         version: 5.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '8.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -31,7 +31,7 @@ dependencies:
         version: 5.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '8.0'
 - !ruby/object:Gem::Dependency
   name: base32
   requirement: !ruby/object:Gem::Requirement
@@ -98,7 +98,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.2
+        version: 3.0.3
     - - "<"
       - !ruby/object:Gem::Version
         version: '4.0'
@@ -108,66 +108,10 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.2
+        version: 3.0.3
     - - "<"
       - !ruby/object:Gem::Version
         version: '4.0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.9'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.9'
-- !ruby/object:Gem::Dependency
-  name: rspec-its
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
 description: |
   The stellar-base library is the lowest-level stellar helper library. It consists of classes to read, write,
   hash, and sign the xdr structures that are used in stellar-core.
@@ -189,15 +133,16 @@ files:
 - generated/stellar/account_entry_extension_v1/ext.rb
 - generated/stellar/account_entry_extension_v2.rb
 - generated/stellar/account_entry_extension_v2/ext.rb
+- generated/stellar/account_entry_extension_v3.rb
 - generated/stellar/account_flags.rb
 - generated/stellar/account_merge_result.rb
 - generated/stellar/account_merge_result_code.rb
 - generated/stellar/allow_trust_op.rb
 - generated/stellar/allow_trust_result.rb
 - generated/stellar/allow_trust_result_code.rb
+- generated/stellar/alpha_num12.rb
+- generated/stellar/alpha_num4.rb
 - generated/stellar/asset.rb
-- generated/stellar/asset/alpha_num12.rb
-- generated/stellar/asset/alpha_num4.rb
 - generated/stellar/asset_code.rb
 - generated/stellar/asset_type.rb
 - generated/stellar/auth.rb
@@ -214,13 +159,18 @@ files:
 - generated/stellar/bump_sequence_op.rb
 - generated/stellar/bump_sequence_result.rb
 - generated/stellar/bump_sequence_result_code.rb
+- generated/stellar/change_trust_asset.rb
 - generated/stellar/change_trust_op.rb
 - generated/stellar/change_trust_result.rb
 - generated/stellar/change_trust_result_code.rb
+- generated/stellar/claim_atom.rb
+- generated/stellar/claim_atom_type.rb
 - generated/stellar/claim_claimable_balance_op.rb
 - generated/stellar/claim_claimable_balance_result.rb
 - generated/stellar/claim_claimable_balance_result_code.rb
+- generated/stellar/claim_liquidity_atom.rb
 - generated/stellar/claim_offer_atom.rb
+- generated/stellar/claim_offer_atom_v0.rb
 - generated/stellar/claim_predicate.rb
 - generated/stellar/claim_predicate_type.rb
 - generated/stellar/claimable_balance_entry.rb
@@ -258,10 +208,14 @@ files:
 - generated/stellar/envelope_type.rb
 - generated/stellar/error.rb
 - generated/stellar/error_code.rb
+- generated/stellar/extension_point.rb
 - generated/stellar/fee_bump_transaction.rb
 - generated/stellar/fee_bump_transaction/ext.rb
 - generated/stellar/fee_bump_transaction/inner_tx.rb
 - generated/stellar/fee_bump_transaction_envelope.rb
+- generated/stellar/hash_id_preimage.rb
+- generated/stellar/hash_id_preimage/operation_id.rb
+- generated/stellar/hash_id_preimage/revoke_id.rb
 - generated/stellar/hello.rb
 - generated/stellar/hmac_sha256_key.rb
 - generated/stellar/hmac_sha256_mac.rb
@@ -273,6 +227,7 @@ files:
 - generated/stellar/inner_transaction_result/result.rb
 - generated/stellar/inner_transaction_result_pair.rb
 - generated/stellar/ip_addr_type.rb
+- generated/stellar/ledger_bounds.rb
 - generated/stellar/ledger_close_meta.rb
 - generated/stellar/ledger_close_meta_v0.rb
 - generated/stellar/ledger_close_value_signature.rb
@@ -286,18 +241,34 @@ files:
 - generated/stellar/ledger_entry_type.rb
 - generated/stellar/ledger_header.rb
 - generated/stellar/ledger_header/ext.rb
+- generated/stellar/ledger_header_extension_v1.rb
+- generated/stellar/ledger_header_extension_v1/ext.rb
+- generated/stellar/ledger_header_flags.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/claimable_balance.rb
 - generated/stellar/ledger_key/data.rb
+- generated/stellar/ledger_key/liquidity_pool.rb
 - generated/stellar/ledger_key/offer.rb
 - generated/stellar/ledger_key/trust_line.rb
 - generated/stellar/ledger_scp_messages.rb
 - generated/stellar/ledger_upgrade.rb
 - generated/stellar/ledger_upgrade_type.rb
 - generated/stellar/liabilities.rb
+- generated/stellar/liquidity_pool_constant_product_parameters.rb
+- generated/stellar/liquidity_pool_deposit_op.rb
+- generated/stellar/liquidity_pool_deposit_result.rb
+- generated/stellar/liquidity_pool_deposit_result_code.rb
+- generated/stellar/liquidity_pool_entry.rb
+- generated/stellar/liquidity_pool_entry/body.rb
+- generated/stellar/liquidity_pool_entry/body/constant_product.rb
+- generated/stellar/liquidity_pool_parameters.rb
+- generated/stellar/liquidity_pool_type.rb
+- generated/stellar/liquidity_pool_withdraw_op.rb
+- generated/stellar/liquidity_pool_withdraw_result.rb
+- generated/stellar/liquidity_pool_withdraw_result_code.rb
 - generated/stellar/manage_buy_offer_op.rb
 - generated/stellar/manage_buy_offer_result.rb
 - generated/stellar/manage_buy_offer_result_code.rb
@@ -320,8 +291,6 @@ files:
 - generated/stellar/offer_entry_flags.rb
 - generated/stellar/operation.rb
 - generated/stellar/operation/body.rb
-- generated/stellar/operation_id.rb
-- generated/stellar/operation_id/id.rb
 - generated/stellar/operation_meta.rb
 - generated/stellar/operation_result.rb
 - generated/stellar/operation_result/tr.rb
@@ -341,6 +310,9 @@ files:
 - generated/stellar/peer_address.rb
 - generated/stellar/peer_address/ip.rb
 - generated/stellar/peer_stats.rb
+- generated/stellar/precondition_type.rb
+- generated/stellar/preconditions.rb
+- generated/stellar/preconditions_v2.rb
 - generated/stellar/price.rb
 - generated/stellar/public_key.rb
 - generated/stellar/public_key_type.rb
@@ -361,6 +333,7 @@ files:
 - generated/stellar/scp_statement/pledges/externalize.rb
 - generated/stellar/scp_statement/pledges/prepare.rb
 - generated/stellar/scp_statement_type.rb
+- generated/stellar/send_more.rb
 - generated/stellar/set_options_op.rb
 - generated/stellar/set_options_result.rb
 - generated/stellar/set_options_result_code.rb
@@ -371,6 +344,7 @@ files:
 - generated/stellar/signed_survey_response_message.rb
 - generated/stellar/signer.rb
 - generated/stellar/signer_key.rb
+- generated/stellar/signer_key/ed25519_signed_payload.rb
 - generated/stellar/signer_key_type.rb
 - generated/stellar/simple_payment_result.rb
 - generated/stellar/stellar_message.rb
@@ -408,15 +382,19 @@ files:
 - generated/stellar/transaction_v0/ext.rb
 - generated/stellar/transaction_v0_envelope.rb
 - generated/stellar/transaction_v1_envelope.rb
+- generated/stellar/trust_line_asset.rb
 - generated/stellar/trust_line_entry.rb
 - generated/stellar/trust_line_entry/ext.rb
 - generated/stellar/trust_line_entry/ext/v1.rb
 - generated/stellar/trust_line_entry/ext/v1/ext.rb
+- generated/stellar/trust_line_entry_extension_v2.rb
+- generated/stellar/trust_line_entry_extension_v2/ext.rb
 - generated/stellar/trust_line_flags.rb
 - generated/stellar/upgrade_entry_meta.rb
 - lib/stellar-base.rb
 - lib/stellar/account.rb
 - lib/stellar/account_flags.rb
+- lib/stellar/amount.rb
 - lib/stellar/asset.rb
 - lib/stellar/base.rb
 - lib/stellar/claim_predicate.rb
@@ -429,6 +407,9 @@ files:
 - lib/stellar/fee_bump_transaction.rb
 - lib/stellar/key_pair.rb
 - lib/stellar/ledger_key.rb
+- lib/stellar/liquidity_pool.rb
+- lib/stellar/liquidity_pool/base_pool.rb
+- lib/stellar/liquidity_pool/constant_product_pool.rb
 - lib/stellar/muxed_account.rb
 - lib/stellar/networks.rb
 - lib/stellar/operation.rb
@@ -448,11 +429,11 @@ licenses:
 - Apache-2.0
 metadata:
   bug_tracker_uri: https://github.com/astroband/ruby-stellar-sdk/issues
-  changelog_uri: https://github.com/astroband/ruby-stellar-sdk/blob/v0.29.0/base/CHANGELOG.md
-  documentation_uri: https://rubydoc.info/gems/stellar-base/0.29.0/
+  changelog_uri: https://github.com/astroband/ruby-stellar-sdk/blob/v0.32.0/base/CHANGELOG.md
+  documentation_uri: https://rubydoc.info/gems/stellar-base/0.32.0/
   github_repo: ssh://github.com/astroband/ruby-stellar-sdk
   homepage_uri: https://github.com/astroband/ruby-stellar-sdk/tree/main/base
-  source_code_uri: https://github.com/astroband/ruby-stellar-sdk/tree/v0.29.0/base
+  source_code_uri: https://github.com/astroband/ruby-stellar-sdk/tree/v0.32.0/base
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -469,7 +450,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: 'Stellar client library: XDR'