stellar-base 0.25.0 → 0.29.0

data/lib/stellar/trust_line_flags.rb

@@ -0,0 +1,53 @@
+module Stellar
+  class TrustLineFlags
+    # Converts an array of Stellar::TrustLineFlags members into
+    # an integers suitable for use in in a SetTrustLineFlagsOp.
+    #
+    # @param flags [Array<Stellar::TrustLineFlags>] the flags to combine
+    #
+    # @return [Fixnum] the combined result
+    def self.make_mask(flags)
+      normalize(flags).map(&:value).inject(&:|) || 0
+    end
+
+    # Converts an integer used in SetTrustLineFlagsOp on the set/clear flag options
+    # into an array of Stellar::TrustLineFlags members
+    #
+    #  @param combined [Fixnum]
+    #  @return [Array<Stellar::AccountFlags>]
+    def self.parse_mask(combined)
+      members.values.select { |m| (m.value & combined) != 0 }
+    end
+
+    # Converts each element of the input array to Stellar::TrustLineFlags instance.
+    #
+    # @param [Array<Stellar::TrustLineFlags,Symbol,#to_s>] input
+    # @return [Array<Stellar::TrustLineFlags>]
+    # @raise [TypeError] if any element of the input cannot be converted
+    def self.normalize(input)
+      input.map do |val|
+        case val
+        when Stellar::TrustLineFlags
+          val
+        when ->(_) { members.key?(val.to_s) }
+          from_name(val.to_s)
+        when ->(_) { members.key?("#{val}_flag") }
+          from_name("#{val}_flag")
+        else
+          raise TypeError, "unknown trustline flag: #{val}"
+        end
+      end
+    end
+
+    def self.set_clear_masks(flags)
+      set_flags = []
+      clear_flags = []
+
+      Hash(flags).each do |flag, value|
+        value.present? ? set_flags.push(flag) : clear_flags.push(flag)
+      end
+
+      {set_flags: make_mask(set_flags), clear_flags: make_mask(clear_flags)}
+    end
+  end
+end

data/lib/stellar/util/strkey.rb

@@ -8,7 +8,8 @@ module Stellar
         account_id: [6 << 3].pack("C"), # Base32-encodes to 'G...'
         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...'
+        hash_x: [23 << 3].pack("C"), # Base32-encodes to 'X...'
+        muxed: [12 << 3].pack("C") # Base32-encodes to 'M...'
       }
 
       def self.check_encode(version, byte_str)
@@ -25,13 +26,11 @@ module Stellar
       # @param muxed_account [Stellar::MuxedAccount] account
       # @return [String] "G.."-like address
       def self.encode_muxed_account(muxed_account)
-        ed25519 = if muxed_account.switch == Stellar::CryptoKeyType.key_type_ed25519
-          muxed_account.ed25519!
+        if muxed_account.ed25519
+          check_encode(:account_id, muxed_account.ed25519)
         else
-          muxed_account.med25519!.ed25519
+          check_encode(:muxed, muxed_account.med25519!.ed25519 + [muxed_account.med25519!.id].pack("Q>"))
         end
-
-        check_encode(:account_id, ed25519)
       end
 
       # Returns a Stellar::MuxedAccount, forcing the ed25519 discriminant
@@ -39,7 +38,16 @@ module Stellar
       # @param strkey [String] address string to decode
       # @return [Stellar::MuxedAccount] MuxedAccount with ed25519 discriminant
       def self.decode_muxed_account(strkey)
-        Stellar::MuxedAccount.new(:key_type_ed25519, check_decode(:account_id, strkey))
+        case strkey
+        when /^G[0-9A-Z]{55}$/
+          ed25519 = check_decode(:account_id, strkey)
+          Stellar::MuxedAccount.ed25519(ed25519)
+        when /^M[0-9A-Z]{68}$/
+          payload = check_decode(:muxed, strkey)
+          Stellar::MuxedAccount.med25519(ed25519: payload[0, 32], id: payload[32, 8].unpack1("Q>"))
+        else
+          raise "cannot decode MuxedAccount from #{strkey}"
+        end
       end
 
       def self.check_decode(expected_version, str)

data/lib/stellar/version.rb

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

data/lib/stellar-base.rb

@@ -16,14 +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"
@@ -35,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"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stellar-base
 version: !ruby/object:Gem::Version
-  version: 0.25.0
+  version: 0.29.0
 platform: ruby
 authors:
 - Scott Fleckenstein
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-10-30 00:00:00.000000000 Z
+date: 2021-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -168,9 +168,9 @@ dependencies:
     - - "~>"
       - !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, \nhash, and sign the xdr structures that
-  are used in stellar-core.\n"
+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.
 email:
 executables: []
 extensions: []
@@ -193,12 +193,12 @@ files:
 - generated/stellar/account_merge_result.rb
 - generated/stellar/account_merge_result_code.rb
 - generated/stellar/allow_trust_op.rb
-- generated/stellar/allow_trust_op/asset.rb
 - generated/stellar/allow_trust_result.rb
 - generated/stellar/allow_trust_result_code.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
 - generated/stellar/auth_cert.rb
@@ -225,11 +225,20 @@ files:
 - generated/stellar/claim_predicate_type.rb
 - generated/stellar/claimable_balance_entry.rb
 - generated/stellar/claimable_balance_entry/ext.rb
+- generated/stellar/claimable_balance_entry_extension_v1.rb
+- generated/stellar/claimable_balance_entry_extension_v1/ext.rb
+- generated/stellar/claimable_balance_flags.rb
 - generated/stellar/claimable_balance_id.rb
 - generated/stellar/claimable_balance_id_type.rb
 - generated/stellar/claimant.rb
 - generated/stellar/claimant/v0.rb
 - generated/stellar/claimant_type.rb
+- generated/stellar/clawback_claimable_balance_op.rb
+- generated/stellar/clawback_claimable_balance_result.rb
+- generated/stellar/clawback_claimable_balance_result_code.rb
+- generated/stellar/clawback_op.rb
+- generated/stellar/clawback_result.rb
+- generated/stellar/clawback_result_code.rb
 - generated/stellar/create_account_op.rb
 - generated/stellar/create_account_result.rb
 - generated/stellar/create_account_result_code.rb
@@ -355,6 +364,9 @@ files:
 - generated/stellar/set_options_op.rb
 - generated/stellar/set_options_result.rb
 - generated/stellar/set_options_result_code.rb
+- generated/stellar/set_trust_line_flags_op.rb
+- generated/stellar/set_trust_line_flags_result.rb
+- generated/stellar/set_trust_line_flags_result_code.rb
 - generated/stellar/signed_survey_request_message.rb
 - generated/stellar/signed_survey_response_message.rb
 - generated/stellar/signer.rb
@@ -403,10 +415,10 @@ files:
 - 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/asset.rb
 - lib/stellar/base.rb
-- lib/stellar/base/version.rb
 - lib/stellar/claim_predicate.rb
 - lib/stellar/compat.rb
 - lib/stellar/concerns/transaction.rb
@@ -428,15 +440,19 @@ files:
 - lib/stellar/transaction_builder.rb
 - lib/stellar/transaction_envelope.rb
 - lib/stellar/transaction_v0.rb
+- lib/stellar/trust_line_flags.rb
 - lib/stellar/util/strkey.rb
-homepage: https://github.com/astroband/ruby-stellar-sdk/tree/master/base
+- lib/stellar/version.rb
+homepage: https://github.com/astroband/ruby-stellar-sdk
 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/
   github_repo: ssh://github.com/astroband/ruby-stellar-sdk
-  documentation_uri: https://rubydoc.info/gems/stellar-base/0.25.0/
-  changelog_uri: https://github.com/astroband/ruby-stellar-sdk/blob/v0.25.0/base/CHANGELOG.md
-  source_code_uri: https://github.com/astroband/ruby-stellar-sdk/tree/v0.25.0/base
+  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
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -453,7 +469,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.0.rc.2
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: 'Stellar client library: XDR'

data/generated/stellar/allow_trust_op/asset.rb

@@ -1,33 +0,0 @@
-# This code was automatically generated using xdrgen
-# DO NOT EDIT or your changes may be overwritten
-
-require 'xdr'
-
-# === xdr source ============================================================
-#
-#   union switch (AssetType type)
-#       {
-#       // ASSET_TYPE_NATIVE is not allowed
-#       case ASSET_TYPE_CREDIT_ALPHANUM4:
-#           AssetCode4 assetCode4;
-#   
-#       case ASSET_TYPE_CREDIT_ALPHANUM12:
-#           AssetCode12 assetCode12;
-#   
-#           // add other asset types here in the future
-#       }
-#
-# ===========================================================================
-module Stellar
-  class AllowTrustOp
-    class Asset < XDR::Union
-      switch_on AssetType, :type
-
-      switch :asset_type_credit_alphanum4,  :asset_code4
-      switch :asset_type_credit_alphanum12, :asset_code12
-
-      attribute :asset_code4,  AssetCode4
-      attribute :asset_code12, AssetCode12
-    end
-  end
-end

data/lib/stellar/base/version.rb

@@ -1,5 +0,0 @@
-module Stellar
-  module Base
-    VERSION = "0.25.0"
-  end
-end