stellar-base 0.0.20 → 0.1.0

data/xdr/Stellar-ledger.x

@@ -2,7 +2,7 @@
 // under the Apache License, Version 2.0. See the COPYING file at the root
 // of this distribution or at http://www.apache.org/licenses/LICENSE-2.0
 
-%#include "generated/Stellar-transaction.h"
+%#include "xdr/Stellar-transaction.h"
 
 namespace stellar
 {
@@ -102,13 +102,13 @@ case TRUSTLINE:
     struct
     {
         AccountID accountID;
-        Currency currency;
+        Asset asset;
     } trustLine;
 
 case OFFER:
     struct
     {
-        AccountID accountID;
+        AccountID sellerID;
         uint64 offerID;
     } offer;
 };
@@ -212,8 +212,20 @@ case LEDGER_ENTRY_REMOVED:
     LedgerKey removed;
 };
 
-struct TransactionMeta
+typedef LedgerEntryChange LedgerEntryChanges<>;
+
+struct OperationMeta
 {
-    LedgerEntryChange changes<>;
+    LedgerEntryChanges changes;
+};
+
+union TransactionMeta switch (int v)
+{
+case 0:
+    struct
+    {
+        LedgerEntryChanges changes;
+        OperationMeta operations<>;
+    } v0;
 };
 }

data/xdr/Stellar-overlay.x

@@ -2,7 +2,7 @@
 // under the Apache License, Version 2.0. See the COPYING file at the root
 // of this distribution or at http://www.apache.org/licenses/LICENSE-2.0
 
-%#include "generated/Stellar-ledger.h"
+%#include "xdr/Stellar-ledger.h"
 
 namespace stellar
 {

data/xdr/Stellar-transaction.x

@@ -2,7 +2,7 @@
 // under the Apache License, Version 2.0. See the COPYING file at the root
 // of this distribution or at http://www.apache.org/licenses/LICENSE-2.0
 
-%#include "generated/Stellar-ledger-entries.h"
+%#include "xdr/Stellar-ledger-entries.h"
 
 namespace stellar
 {
@@ -28,7 +28,7 @@ enum OperationType
 };
 
 /* CreateAccount
-Funds a new account with the specified starting balance
+Creates and funds a new account with the specified starting balance.
 
 Threshold: med
 
@@ -44,7 +44,7 @@ struct CreateAccountOp
 
 /* Payment
 
-    send an amount to a destination account.
+    Send an amount in specified asset to a destination account.
 
     Threshold: med
 
@@ -53,16 +53,16 @@ struct CreateAccountOp
 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
 };
 
 /* PathPayment
 
 send an amount to a destination account through a path.
-(up to sendMax, sendCurrency)
+(up to sendMax, sendAsset)
 (X0, Path[0]) .. (Xn, Path[n])
-(destAmount, destCurrency)
+(destAmount, destAsset)
 
 Threshold: med
 
@@ -70,16 +70,16 @@ Result: PathPaymentResult
 */
 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
 };
 
 /* Creates, updates or deletes an offer
@@ -91,10 +91,10 @@ Result: ManageOfferResult
 */
 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;
@@ -109,10 +109,10 @@ Result: CreatePassiveOfferResult
 */
 struct CreatePassiveOfferOp
 {
-    Currency takerGets;
-    Currency takerPays;
-    int64 amount; // amount taker gets. if set to 0, delete the offer
-    Price price;  // =takerPaysAmount/takerGetsAmount
+    Asset selling;  // A
+    Asset buying;   // B
+    int64 amount;   // amount taker gets. if set to 0, delete the offer
+    Price price;    // cost of A in terms of B
 };
 
 /* Set Account Options
@@ -154,14 +154,14 @@ struct SetOptionsOp
 */
 struct ChangeTrustOp
 {
-    Currency line;
+    Asset line;
 
     // if limit is set to 0, deletes the trust line
     int64 limit;
 };
 
 /* Updates the "authorized" flag of an existing trust line
-   this is called by the issuer of the related currency.
+   this is called by the issuer of the related asset.
 
    note that authorize can only be set (and not cleared) if
    the issuer account does not have the AUTH_REVOCABLE_FLAG set
@@ -172,15 +172,18 @@ struct ChangeTrustOp
 struct AllowTrustOp
 {
     AccountID trustor;
-    union switch (CurrencyType type)
+    union switch (AssetType type)
     {
-    // CURRENCY_TYPE_NATIVE is not allowed
-    case CURRENCY_TYPE_ALPHANUM:
-        opaque currencyCode[4];
+    // ASSET_TYPE_NATIVE is not allowed
+    case ASSET_TYPE_CREDIT_ALPHANUM4:
+        opaque assetCode4[4];
 
-        // add other currency types here in the future
+	case ASSET_TYPE_CREDIT_ALPHANUM12:
+        opaque assetCode12[12];
+
+        // add other asset types here in the future
     }
-    currency;
+    asset;
 
     bool authorize;
 };
@@ -316,12 +319,12 @@ struct ClaimOfferAtom
     AccountID offerOwner; // Account that owns the offer
     uint64 offerID;
 
-    // amount and currency taken from the owner
-    Currency currencyClaimed;
+    // amount and asset taken from the owner
+    Asset assetClaimed;
     int64 amountClaimed;
 
-    // amount and currencysent to the owner
-    Currency currencySend;
+    // amount and assetsent to the owner
+    Asset assetSend;
     int64 amountSend;
 };
 
@@ -361,8 +364,8 @@ enum PaymentResultCode
     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
 };
 
@@ -387,8 +390,8 @@ enum PathPaymentResultCode
     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
@@ -397,7 +400,7 @@ enum PathPaymentResultCode
 struct SimplePaymentResult
 {
     AccountID destination;
-    Currency currency;
+    Asset asset;
     int64 amount;
 };
 
@@ -521,7 +524,7 @@ enum AllowTrustResultCode
     // codes considered as "success" for the operation
     ALLOW_TRUST_SUCCESS = 0,
     // codes considered as "failure" for the operation
-    ALLOW_TRUST_MALFORMED = -1,     // currency is not CURRENCY_TYPE_ALPHANUM
+    ALLOW_TRUST_MALFORMED = -1,     // asset is not ASSET_TYPE_ALPHANUM
     ALLOW_TRUST_NO_TRUST_LINE = -2, // trustor does not have a trustline
                                     // source account does not require trust
     ALLOW_TRUST_TRUST_NOT_REQUIRED = -3,

data/xdr/Stellar-types.x

@@ -16,12 +16,12 @@ typedef hyper int64;
 
 enum CryptoKeyType
 {
-    KEY_TYPES_ED25519 = 0
+    KEY_TYPE_ED25519 = 0
 };
 
 union PublicKey switch (CryptoKeyType type)
 {
-case KEY_TYPES_ED25519:
+case KEY_TYPE_ED25519:
     uint256 ed25519;
 };
 
@@ -31,5 +31,4 @@ typedef opaque Signature<64>;
 typedef opaque SignatureHint[4];
 
 typedef PublicKey NodeID;
-
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stellar-base
 version: !ruby/object:Gem::Version
-  version: 0.0.20
+  version: 0.1.0
 platform: ruby
 authors:
 - Scott Fleckenstein
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-09 00:00:00.000000000 Z
+date: 2015-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xdr
@@ -24,6 +24,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.4
+- !ruby/object:Gem::Dependency
+  name: digest-crc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: base32
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rbnacl
   requirement: !ruby/object:Gem::Requirement
@@ -221,9 +249,13 @@ 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/currency.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_type.rb
 - generated/stellar/bucket_entry.rb
 - generated/stellar/bucket_entry_type.rb
 - generated/stellar/change_trust_op.rb
@@ -235,9 +267,6 @@ files:
 - generated/stellar/create_account_result_code.rb
 - generated/stellar/create_passive_offer_op.rb
 - generated/stellar/crypto_key_type.rb
-- generated/stellar/currency.rb
-- generated/stellar/currency/alpha_num.rb
-- generated/stellar/currency_type.rb
 - generated/stellar/decorated_signature.rb
 - generated/stellar/dont_have.rb
 - generated/stellar/envelope_type.rb
@@ -274,6 +303,7 @@ files:
 - generated/stellar/offer_entry_flags.rb
 - generated/stellar/operation.rb
 - generated/stellar/operation/body.rb
+- generated/stellar/operation_meta.rb
 - generated/stellar/operation_result.rb
 - generated/stellar/operation_result/tr.rb
 - generated/stellar/operation_result_code.rb
@@ -316,6 +346,7 @@ files:
 - generated/stellar/transaction_history_result_entry.rb
 - generated/stellar/transaction_history_result_entry/ext.rb
 - generated/stellar/transaction_meta.rb
+- generated/stellar/transaction_meta/v0.rb
 - generated/stellar/transaction_result.rb
 - generated/stellar/transaction_result/ext.rb
 - generated/stellar/transaction_result/result.rb
@@ -328,10 +359,10 @@ files:
 - generated/stellar/trust_line_flags.rb
 - lib/stellar-base.rb
 - lib/stellar/account_flags.rb
+- lib/stellar/asset.rb
 - lib/stellar/base.rb
 - lib/stellar/base/version.rb
 - lib/stellar/convert.rb
-- lib/stellar/currency.rb
 - lib/stellar/key_pair.rb
 - lib/stellar/operation.rb
 - lib/stellar/path_payment_result.rb
@@ -339,8 +370,8 @@ files:
 - lib/stellar/thresholds.rb
 - lib/stellar/transaction.rb
 - lib/stellar/transaction_envelope.rb
-- lib/stellar/util/base58.rb
 - lib/stellar/util/continued_fraction.rb
+- lib/stellar/util/strkey.rb
 - ruby-stellar-base.gemspec
 - spec/lib/stellar/account_flags_spec.rb
 - spec/lib/stellar/convert_spec.rb
@@ -350,9 +381,9 @@ files:
 - spec/lib/stellar/thresholds_spec.rb
 - spec/lib/stellar/transaction_envelope_spec.rb
 - spec/lib/stellar/transaction_spec.rb
-- spec/lib/stellar/util/base58_spec.rb
+- spec/lib/stellar/util/strkey_spec.rb
 - spec/spec_helper.rb
-- spec/support/matchers/be_base58_check.rb
+- spec/support/matchers/be_strkey.rb
 - spec/support/matchers/eq_bytes.rb
 - spec/support/matchers/have_length.rb
 - tasks/rspec.rake
@@ -364,7 +395,6 @@ files:
 - xdr/Stellar-overlay.x
 - xdr/Stellar-transaction.x
 - xdr/Stellar-types.x
-- xdr/StellarXDR.x
 homepage: https://github.com/stellar/ruby-stellar-base
 licenses:
 - Apache 2.0
@@ -399,9 +429,9 @@ test_files:
 - spec/lib/stellar/thresholds_spec.rb
 - spec/lib/stellar/transaction_envelope_spec.rb
 - spec/lib/stellar/transaction_spec.rb
-- spec/lib/stellar/util/base58_spec.rb
+- spec/lib/stellar/util/strkey_spec.rb
 - spec/spec_helper.rb
-- spec/support/matchers/be_base58_check.rb
+- spec/support/matchers/be_strkey.rb
 - spec/support/matchers/eq_bytes.rb
 - spec/support/matchers/have_length.rb
 has_rdoc: 

data/generated/stellar/allow_trust_op/currency.rb

@@ -1,28 +0,0 @@
-# This code was automatically generated using xdrgen
-# DO NOT EDIT or your changes may be overwritten
-
-require 'xdr'
-
-# === xdr source ============================================================
-#
-#   union switch (CurrencyType type)
-#       {
-#       // CURRENCY_TYPE_NATIVE is not allowed
-#       case CURRENCY_TYPE_ALPHANUM:
-#           opaque currencyCode[4];
-#   
-#           // add other currency types here in the future
-#       }
-#
-# ===========================================================================
-module Stellar
-  class AllowTrustOp
-    class Currency < XDR::Union
-      switch_on CurrencyType, :type
-
-      switch :currency_type_alphanum, :currency_code
-
-      attribute :currency_code, XDR::Opaque[4]
-    end
-  end
-end

data/generated/stellar/currency.rb

@@ -1,37 +0,0 @@
-# This code was automatically generated using xdrgen
-# DO NOT EDIT or your changes may be overwritten
-
-require 'xdr'
-
-# === xdr source ============================================================
-#
-#   union Currency switch (CurrencyType type)
-#   {
-#   case CURRENCY_TYPE_NATIVE:
-#       void;
-#   
-#   case CURRENCY_TYPE_ALPHANUM:
-#       struct
-#       {
-#           opaque currencyCode[4];
-#           AccountID issuer;
-#       } alphaNum;
-#   
-#       // add other currency types here in the future
-#   };
-#
-# ===========================================================================
-module Stellar
-  class Currency < XDR::Union
-    include XDR::Namespace
-
-    autoload :AlphaNum
-
-    switch_on CurrencyType, :type
-
-    switch :currency_type_native
-    switch :currency_type_alphanum, :alpha_num
-
-    attribute :alpha_num, AlphaNum
-  end
-end