stellar-base 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9698e9734a6385fd6a52e3d8a4c9208c8f7c702b
-  data.tar.gz: 2355dd45c7a31c97f29b775f6ee58f25872faada
+  metadata.gz: 32763151cf45342771f5f3412ae9ff0967e5d0d5
+  data.tar.gz: 2f78674303fa257d37365a9df00dd42b3e1fbf9b
 SHA512:
-  metadata.gz: 8d455190a25adb9e2c31982b60e0fd663c6ee3b724b832c8104a9c0de9127ac1ddb3e88e6a5b9676750b95c34dff8fad35477e3b58162fe749f2b8ef6bb0556c
-  data.tar.gz: 18608bceb72184220f144e928b4fd2b7a6febfa79ddb07f9cdbc8473d7ffe9a988685d10d1b4fc362241a70b882c69ec5ad1122d4d880ef6be03063757d5c98d
+  metadata.gz: 8cc19aa393dbb3be1b735dd08013d62e2eab150844fe85284207a58cae317e8d5a069632217714aee444d013819fa64660aa884bb6f1a2d70bf261184ba40155
+  data.tar.gz: 1bd52247f06363990f6752ef1aea8fd6a09418afae67c1e36fcb31323ac1859b566c8008508cb0af2f84179e01ed9772804c5859476a8ba6f0ff3d0cd548088e

data/examples/low_level_transaction_post.rb

@@ -16,7 +16,7 @@ destination = RbNaCl::SigningKey.new("allmylifemyhearthasbeensearching")
 
 tx            = Stellar::Transaction.new
 tx.account    = master.verify_key.to_bytes
-tx.max_fee    = 1000
+tx.fee        = 1000
 tx.seq_num    = 1
 tx.max_ledger = 1000
 tx.min_ledger = 0

data/generated/stellar/payment_op.rb

@@ -1,4 +1,4 @@
-# Automatically generated on 2015-05-12T09:08:23-07:00
+# Automatically generated on 2015-05-12T13:13:19-07:00
 # DO NOT EDIT or your changes may be overwritten
         
 require 'xdr'
@@ -11,9 +11,6 @@ require 'xdr'
 #       Currency currency;     // what they end up with
 #       int64 amount;          // amount they end up with
 #   
-#       opaque memo<32>;
-#       opaque sourceMemo<32>; // used to return a payment
-#   
 #       // payment over path
 #       Currency path<5>; // what hops it must go through to get there
 #       int64 sendMax; // the maximum amount of the source currency (==path[0]) to
@@ -27,8 +24,6 @@ module Stellar
     attribute :destination, AccountID
     attribute :currency,    Currency
     attribute :amount,      Int64
-    attribute :memo,        XDR::VarOpaque[32]
-    attribute :source_memo, XDR::VarOpaque[32]
     attribute :path,        XDR::VarArray[Currency, 5]
     attribute :send_max,    Int64
   end

data/generated/stellar/transaction.rb

@@ -1,4 +1,4 @@
-# Automatically generated on 2015-05-12T09:08:23-07:00
+# Automatically generated on 2015-05-12T13:13:19-07:00
 # DO NOT EDIT or your changes may be overwritten
         
 require 'xdr'
@@ -10,9 +10,8 @@ require 'xdr'
 #       // account used to run the transaction
 #       AccountID sourceAccount;
 #   
-#       // maximum fee this transaction can collect
-#       // the transaction is aborted if the fee is higher
-#       int32 maxFee;
+#       // the fee the sourceAccount will pay 
+#       int32 fee;
 #   
 #       // sequence number to consume in the account
 #       SequenceNumber seqNum;
@@ -30,7 +29,7 @@ require 'xdr'
 module Stellar
   class Transaction < XDR::Struct
     attribute :source_account, AccountID
-    attribute :max_fee,        Int32
+    attribute :fee,            Int32
     attribute :seq_num,        SequenceNumber
     attribute :min_ledger,     Uint32
     attribute :max_ledger,     Uint32

data/lib/stellar/base/version.rb

@@ -1,5 +1,5 @@
 module Stellar
   module Base
-    VERSION = "0.0.6"
+    VERSION = "0.0.7"
   end
 end

data/lib/stellar/payment_op.rb

@@ -25,8 +25,6 @@ module Stellar
     end
 
     def apply_defaults
-      self.source_memo ||= ""
-      self.memo ||= ""
     end
 
   end

data/lib/stellar/transaction.rb

@@ -74,16 +74,16 @@ module Stellar
     def self.for_account(attributes={})
       account  = attributes[:account]
       sequence = attributes[:sequence]
-      max_fee  = attributes[:max_fee]
+      fee      = attributes[:fee]
       
       raise ArgumentError, "Bad :account" unless account.is_a?(KeyPair) && account.sign?
       raise ArgumentError, "Bad :sequence #{sequence}" unless sequence.is_a?(Integer)
-      raise ArgumentError, "Bad :max_fee #{sequence}" if max_fee.present? && !max_fee.is_a?(Integer)
+      raise ArgumentError, "Bad :fee #{sequence}" if fee.present? && !fee.is_a?(Integer)
 
       new.tap do |result|
-        result.seq_num  = sequence
-        result.max_fee  = max_fee
-        result.source_account  = account.public_key
+        result.seq_num        = sequence
+        result.fee            = fee
+        result.source_account = account.public_key
         result.apply_defaults
       end
     end
@@ -132,7 +132,7 @@ module Stellar
 
     def apply_defaults
       self.operations ||= []
-      self.max_fee    ||= 10
+      self.fee        ||= 10
       self.min_ledger ||= 0
       self.max_ledger ||= 2**32 - 1
       self.memo       ||= Memo.new(:memo_type_none)

data/spec/lib/stellar/transaction_spec.rb

@@ -4,7 +4,7 @@ describe Stellar::Transaction do
   subject do
     Stellar::Transaction.new({
       source_account: "\x00" * 32,
-      max_fee:        10,
+      fee:            10,
       seq_num:        1,
       max_ledger:     10,
       min_ledger:     0,

data/xdr/Stellar-transaction.x

@@ -39,9 +39,6 @@ struct PaymentOp
     Currency currency;     // what they end up with
     int64 amount;          // amount they end up with
 
-    opaque memo<32>;
-    opaque sourceMemo<32>; // used to return a payment
-
     // payment over path
     Currency path<5>; // what hops it must go through to get there
     int64 sendMax; // the maximum amount of the source currency (==path[0]) to
@@ -212,9 +209,8 @@ struct Transaction
     // account used to run the transaction
     AccountID sourceAccount;
 
-    // maximum fee this transaction can collect
-    // the transaction is aborted if the fee is higher
-    int32 maxFee;
+    // the fee the sourceAccount will pay 
+    int32 fee;
 
     // sequence number to consume in the account
     SequenceNumber seqNum;

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stellar-base
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Scott Fleckenstein