stellar-base 0.0.20 → 0.1.0

data/generated/stellar/ledger_key.rb

@@ -17,13 +17,13 @@ require 'xdr'
 #       struct
 #       {
 #           AccountID accountID;
-#           Currency currency;
+#           Asset asset;
 #       } trustLine;
 #   
 #   case OFFER:
 #       struct
 #       {
-#           AccountID accountID;
+#           AccountID sellerID;
 #           uint64 offerID;
 #       } offer;
 #   };

data/generated/stellar/ledger_key/offer.rb

@@ -7,7 +7,7 @@ require 'xdr'
 #
 #   struct
 #       {
-#           AccountID accountID;
+#           AccountID sellerID;
 #           uint64 offerID;
 #       }
 #
@@ -15,8 +15,8 @@ require 'xdr'
 module Stellar
   class LedgerKey
     class Offer < XDR::Struct
-      attribute :account_id, AccountID
-      attribute :offer_id,   Uint64
+      attribute :seller_id, AccountID
+      attribute :offer_id,  Uint64
     end
   end
 end

data/generated/stellar/ledger_key/trust_line.rb

@@ -8,7 +8,7 @@ require 'xdr'
 #   struct
 #       {
 #           AccountID accountID;
-#           Currency currency;
+#           Asset asset;
 #       }
 #
 # ===========================================================================
@@ -16,7 +16,7 @@ module Stellar
   class LedgerKey
     class TrustLine < XDR::Struct
       attribute :account_id, AccountID
-      attribute :currency,   Currency
+      attribute :asset,      Asset
     end
   end
 end

data/generated/stellar/manage_offer_op.rb

@@ -7,10 +7,10 @@ require 'xdr'
 #
 #   struct ManageOfferOp
 #   {
-#       Currency takerGets;
-#       Currency takerPays;
-#       int64 amount; // amount taker gets. if set to 0, delete the offer
-#       Price price;  // =takerPaysAmount/takerGetsAmount
+#       Asset selling;
+#       Asset buying;
+#       int64 amount; // amount being sold. if set to 0, delete the offer
+#       Price price;  // price of thing being sold in terms of what you are buying
 #   
 #       // 0=create a new offer, otherwise edit an existing offer
 #       uint64 offerID;
@@ -19,10 +19,10 @@ require 'xdr'
 # ===========================================================================
 module Stellar
   class ManageOfferOp < XDR::Struct
-    attribute :taker_gets, Currency
-    attribute :taker_pays, Currency
-    attribute :amount,     Int64
-    attribute :price,      Price
-    attribute :offer_id,   Uint64
+    attribute :selling,  Asset
+    attribute :buying,   Asset
+    attribute :amount,   Int64
+    attribute :price,    Price
+    attribute :offer_id, Uint64
   end
 end

data/generated/stellar/offer_entry.rb

@@ -7,10 +7,10 @@ require 'xdr'
 #
 #   struct OfferEntry
 #   {
-#       AccountID accountID;
+#       AccountID sellerID;
 #       uint64 offerID;
-#       Currency takerGets; // A
-#       Currency takerPays; // B
+#       Asset selling; // A
+#       Asset buying; // B
 #       int64 amount;       // amount of A
 #   
 #       /* price for this offer:
@@ -37,13 +37,13 @@ module Stellar
 
     autoload :Ext
 
-    attribute :account_id, AccountID
-    attribute :offer_id,   Uint64
-    attribute :taker_gets, Currency
-    attribute :taker_pays, Currency
-    attribute :amount,     Int64
-    attribute :price,      Price
-    attribute :flags,      Uint32
-    attribute :ext,        Ext
+    attribute :seller_id, AccountID
+    attribute :offer_id,  Uint64
+    attribute :selling,   Asset
+    attribute :buying,    Asset
+    attribute :amount,    Int64
+    attribute :price,     Price
+    attribute :flags,     Uint32
+    attribute :ext,       Ext
   end
 end

data/generated/stellar/{currency_type.rb → operation_meta.rb}

@@ -5,18 +5,14 @@ require 'xdr'
 
 # === xdr source ============================================================
 #
-#   enum CurrencyType
+#   struct OperationMeta
 #   {
-#       CURRENCY_TYPE_NATIVE = 0,
-#       CURRENCY_TYPE_ALPHANUM = 1
+#       LedgerEntryChanges changes;
 #   };
 #
 # ===========================================================================
 module Stellar
-  class CurrencyType < XDR::Enum
-    member :currency_type_native,   0
-    member :currency_type_alphanum, 1
-
-    seal
+  class OperationMeta < XDR::Struct
+    attribute :changes, LedgerEntryChanges
   end
 end

data/generated/stellar/path_payment_op.rb

@@ -7,26 +7,26 @@ require 'xdr'
 #
 #   struct PathPaymentOp
 #   {
-#       Currency sendCurrency; // currency we pay with
-#       int64 sendMax;         // the maximum amount of sendCurrency to
+#       Asset sendAsset; // asset we pay with
+#       int64 sendMax;         // the maximum amount of sendAsset to
 #                              // send (excluding fees).
 #                              // The operation will fail if can't be met
 #   
 #       AccountID destination; // recipient of the payment
-#       Currency destCurrency; // what they end up with
+#       Asset destAsset; // what they end up with
 #       int64 destAmount;      // amount they end up with
 #   
-#       Currency path<5>; // additional hops it must go through to get there
+#       Asset path<5>; // additional hops it must go through to get there
 #   };
 #
 # ===========================================================================
 module Stellar
   class PathPaymentOp < XDR::Struct
-    attribute :send_currency, Currency
-    attribute :send_max,      Int64
-    attribute :destination,   AccountID
-    attribute :dest_currency, Currency
-    attribute :dest_amount,   Int64
-    attribute :path,          XDR::VarArray[Currency, 5]
+    attribute :send_asset,  Asset
+    attribute :send_max,    Int64
+    attribute :destination, AccountID
+    attribute :dest_asset,  Asset
+    attribute :dest_amount, Int64
+    attribute :path,        XDR::VarArray[Asset, 5]
   end
 end

data/generated/stellar/path_payment_result_code.rb

@@ -16,8 +16,8 @@ require 'xdr'
 #       PATH_PAYMENT_SRC_NO_TRUST = -3,       // no trust line on source account
 #       PATH_PAYMENT_SRC_NOT_AUTHORIZED = -4, // source not authorized to transfer
 #       PATH_PAYMENT_NO_DESTINATION = -5,     // destination account does not exist
-#       PATH_PAYMENT_NO_TRUST = -6,       // dest missing a trust line for currency
-#       PATH_PAYMENT_NOT_AUTHORIZED = -7, // dest not authorized to hold currency
+#       PATH_PAYMENT_NO_TRUST = -6,       // dest missing a trust line for asset
+#       PATH_PAYMENT_NOT_AUTHORIZED = -7, // dest not authorized to hold asset
 #       PATH_PAYMENT_LINE_FULL = -8,      // dest would go above their limit
 #       PATH_PAYMENT_TOO_FEW_OFFERS = -9, // not enough offers to satisfy path
 #       PATH_PAYMENT_OVER_SENDMAX = -10   // could not satisfy sendmax

data/generated/stellar/payment_op.rb

@@ -8,7 +8,7 @@ require 'xdr'
 #   struct PaymentOp
 #   {
 #       AccountID destination; // recipient of the payment
-#       Currency currency;     // what they end up with
+#       Asset asset;     // what they end up with
 #       int64 amount;          // amount they end up with
 #   };
 #
@@ -16,7 +16,7 @@ require 'xdr'
 module Stellar
   class PaymentOp < XDR::Struct
     attribute :destination, AccountID
-    attribute :currency,    Currency
+    attribute :asset,       Asset
     attribute :amount,      Int64
   end
 end

data/generated/stellar/payment_result_code.rb

@@ -16,8 +16,8 @@ require 'xdr'
 #       PAYMENT_SRC_NO_TRUST = -3,       // no trust line on source account
 #       PAYMENT_SRC_NOT_AUTHORIZED = -4, // source not authorized to transfer
 #       PAYMENT_NO_DESTINATION = -5,     // destination account does not exist
-#       PAYMENT_NO_TRUST = -6, // destination missing a trust line for currency
-#       PAYMENT_NOT_AUTHORIZED = -7, // destination not authorized to hold currency
+#       PAYMENT_NO_TRUST = -6, // destination missing a trust line for asset
+#       PAYMENT_NOT_AUTHORIZED = -7, // destination not authorized to hold asset
 #       PAYMENT_LINE_FULL = -8       // destination would go above their limit
 #   };
 #

data/generated/stellar/public_key.rb

@@ -7,7 +7,7 @@ require 'xdr'
 #
 #   union PublicKey switch (CryptoKeyType type)
 #   {
-#   case KEY_TYPES_ED25519:
+#   case KEY_TYPE_ED25519:
 #       uint256 ed25519;
 #   };
 #
@@ -16,7 +16,7 @@ module Stellar
   class PublicKey < XDR::Union
     switch_on CryptoKeyType, :type
 
-    switch :key_types_ed25519, :ed25519
+    switch :key_type_ed25519, :ed25519
 
     attribute :ed25519, Uint256
   end

data/generated/stellar/simple_payment_result.rb

@@ -8,7 +8,7 @@ require 'xdr'
 #   struct SimplePaymentResult
 #   {
 #       AccountID destination;
-#       Currency currency;
+#       Asset asset;
 #       int64 amount;
 #   };
 #
@@ -16,7 +16,7 @@ require 'xdr'
 module Stellar
   class SimplePaymentResult < XDR::Struct
     attribute :destination, AccountID
-    attribute :currency,    Currency
+    attribute :asset,       Asset
     attribute :amount,      Int64
   end
 end

data/generated/stellar/transaction_meta.rb

@@ -5,14 +5,27 @@ require 'xdr'
 
 # === xdr source ============================================================
 #
-#   struct TransactionMeta
+#   union TransactionMeta switch (int v)
 #   {
-#       LedgerEntryChange changes<>;
+#   case 0:
+#       struct
+#       {
+#           LedgerEntryChanges changes;
+#           OperationMeta operations<>;
+#       } v0;
 #   };
 #
 # ===========================================================================
 module Stellar
-  class TransactionMeta < XDR::Struct
-    attribute :changes, XDR::VarArray[LedgerEntryChange]
+  class TransactionMeta < XDR::Union
+    include XDR::Namespace
+
+    autoload :V0
+
+    switch_on XDR::Int, :v
+
+    switch 0, :v0
+
+    attribute :v0, V0
   end
 end

data/generated/stellar/transaction_meta/v0.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
+#       {
+#           LedgerEntryChanges changes;
+#           OperationMeta operations<>;
+#       }
+#
+# ===========================================================================
+module Stellar
+  class TransactionMeta
+    class V0 < XDR::Struct
+      attribute :changes,    LedgerEntryChanges
+      attribute :operations, XDR::VarArray[OperationMeta]
+    end
+  end
+end

data/generated/stellar/trust_line_entry.rb

@@ -8,9 +8,9 @@ require 'xdr'
 #   struct TrustLineEntry
 #   {
 #       AccountID accountID; // account this trustline belongs to
-#       Currency currency;   // currency (with issuer)
-#       int64 balance;       // how much of this currency the user has.
-#                            // Currency defines the unit for this;
+#       Asset asset;   // type of asset (with issuer)
+#       int64 balance;       // how much of this asset the user has.
+#                            // Asset defines the unit for this;
 #   
 #       int64 limit;  // balance cannot be above this
 #       uint32 flags; // see TrustLineFlags
@@ -32,7 +32,7 @@ module Stellar
     autoload :Ext
 
     attribute :account_id, AccountID
-    attribute :currency,   Currency
+    attribute :asset,      Asset
     attribute :balance,    Int64
     attribute :limit,      Int64
     attribute :flags,      Uint32

data/lib/stellar-base.rb

@@ -18,7 +18,7 @@ Stellar::ONE = 1_0000000
 # extensions onto the generated files must be loaded manually, below
 
 require_relative './stellar/account_flags'
-require_relative './stellar/currency'
+require_relative './stellar/asset'
 require_relative './stellar/key_pair'
 require_relative './stellar/operation'
 require_relative './stellar/path_payment_result'
@@ -26,6 +26,6 @@ require_relative './stellar/price'
 require_relative './stellar/thresholds'
 require_relative './stellar/transaction'
 require_relative './stellar/transaction_envelope'
-require_relative './stellar/util/base58'
+require_relative './stellar/util/strkey'
 require_relative './stellar/util/continued_fraction'
 require_relative './stellar/convert'

data/lib/stellar/asset.rb

@@ -0,0 +1,38 @@
+module Stellar
+  class Asset
+    def self.native
+      new(:asset_type_native)
+    end
+
+    def self.alphanum4(code, issuer)
+      raise ArgumentError, "Bad :issuer" unless issuer.is_a?(KeyPair)
+      code = normalize_code(code)
+      an = AlphaNum4.new({asset_code:code, issuer:issuer.account_id})
+      new(:asset_type_credit_alphanum4, an)
+    end
+
+    def to_s
+      if switch == AssetType.asset_type_native
+        "native"
+      else
+        issuer_address = Stellar::Util::StrKey.check_encode(:account_id,alpha_num.issuer)
+        "#{alpha_num.asset_code}/#{issuer_address}"
+      end
+    end
+
+    def inspect
+      label = switch.to_s
+      "#<Stellar::Asset #{to_s}>"
+    end
+
+    def code
+      self.alpha_num!.asset_code
+    end
+
+    def self.normalize_code(code)
+      raise ArgumentError, "Invalid asset code: #{code}, must be <= 4 bytes" if code.length > 4
+
+      code.ljust(4, "\x00")
+    end
+  end
+end

data/lib/stellar/base/version.rb

@@ -1,5 +1,5 @@
 module Stellar
   module Base
-    VERSION = "0.0.20"
+    VERSION = "0.1.0"
   end
 end

data/lib/stellar/convert.rb

@@ -21,12 +21,8 @@ module Stellar
       Base64.strict_decode64(base64_string)
     end
 
-    def base58
-      Stellar::Util::Base58.stellar
-    end
-
     def pk_to_address(pk)
-      base58.check_encode(:account_id, pk)
+      Stellar::util::StrKey.check_encode(:account_id, pk)
     end
 
     extend self

data/lib/stellar/key_pair.rb

@@ -1,7 +1,7 @@
 module Stellar
   class KeyPair
     def self.from_seed(seed)
-      seed_bytes = Util::Base58.stellar.check_decode(:seed, seed)
+      seed_bytes = Util::StrKey.check_decode(:seed, seed)
       from_raw_seed seed_bytes
     end
 
@@ -17,7 +17,7 @@ module Stellar
     end
 
     def self.from_address(address)
-      pk_bytes = Util::Base58.stellar.check_decode(:account_id, address)
+      pk_bytes = Util::StrKey.check_decode(:account_id, address)
       from_public_key(pk_bytes)
     end
 
@@ -33,11 +33,11 @@ module Stellar
     end
 
     def account_id
-      Stellar::AccountID.new :key_types_ed25519, raw_public_key
+      Stellar::AccountID.new :key_type_ed25519, raw_public_key
     end
 
     def public_key
-      Stellar::PublicKey.new :key_types_ed25519, raw_public_key
+      Stellar::PublicKey.new :key_type_ed25519, raw_public_key
     end
 
     def raw_public_key
@@ -63,14 +63,14 @@ module Stellar
 
     def address
       pk_bytes = raw_public_key
-      Util::Base58.stellar.check_encode(:account_id, pk_bytes)
+      Util::StrKey.check_encode(:account_id, pk_bytes)
     end
 
     def seed
       raise "no private key" if @secret_key.nil?
       #TODO: improve the error class above
       seed_bytes = raw_seed
-      encoder = Util::Base58.stellar.check_encode(:seed, seed_bytes)
+      encoder = Util::StrKey.check_encode(:seed, seed_bytes)
     end
 
     def sign?