stellar-base 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dd816d7bbac1d2b4938046e55db9545824e94d00
-  data.tar.gz: af0d72500eed2bd454006f77148714ca228bfccf
+  metadata.gz: 6bac71a17429d471bf8a252b4555a83cf79f32c4
+  data.tar.gz: 12011ffc9af15865d2f60c79b7783f9d3534842f
 SHA512:
-  metadata.gz: f571ed6a5bb220ec0eb34f056e0642a6441a02e889f113217ba5c08e66848ad281f15d99fc9812fe7b89094287e3df04c132367af08acfabcae9d644eb58ef84
-  data.tar.gz: da9dd38df4f482aca38610469e73ab5d5f3f60d2992b9454abc86ce0dcbdf33fc3b3eb87ca9195aab1865612937a65db61dbf9ae94442204bbbdf64560dc0531
+  metadata.gz: 4f390f799a717fab8ce23eba8b924d242fdf501b3eaf11e24239570b1710c4557305aacdd12095f8f79812c681daa164b633f153161db51a13f200ce5b0c30ed
+  data.tar.gz: 9324b9f53c10f45770585e76caf0c537c90a071c1ad10ae238a05703c4b97235d2ae1aad23f394d06fa8304e2dee908ad866b4d3e107420c4a9372f95ba31402

data/CHANGELOG.md

@@ -0,0 +1,14 @@
+# Changelog All notable changes to this project will be documented in this
+file.  This project adheres to [Semantic Versioning](http://semver.org/).
+
+As this project is pre 1.0, breaking changes may happen for minor version
+bumps.  A breaking change will get clearly notified in this log.
+
+## [0.4.0](https://github.com/stellar/ruby-stellar-base/compare/v0.3.0...v0.4.0)
+
+### Changed
+- BREAKING CHANGE: "Amounts", that is, input parameters that represent a
+  certain amount of a given asset, such as the `:starting_balance` option for
+  `Operation.create_account` are now interpreted using the convention of 7
+  fixed-decimal places.  For example, specifying a payment where the amount is
+  `50` will result in a transaction with an amount set to `500000000`.

data/examples/create_account.rb

@@ -17,10 +17,10 @@ tx = Stellar::Transaction.create_account({
   account:     master,
   destination: destination,
   sequence:    1,
-  starting_balance:  50 * Stellar::ONE
+  starting_balance:  50
 })
 
 b64    = tx.to_envelope(master).to_xdr(:base64)
-
+p b64
 result = $server.get('tx', blob: b64)
 p result.body

data/examples/mid_level_transaction_post.rb

@@ -24,7 +24,7 @@ tx = Stellar::Transaction.payment({
   account:     master,
   destination: destination,
   sequence:    1,
-  amount:      [:native, 20 * Stellar::ONE]
+  amount:      [:native, 20]
 })
 
 b64    = tx.to_envelope(master).to_xdr(:base64)

data/examples/non_native_payment.rb

@@ -28,14 +28,14 @@ def submit(key, tx)
   p response.body
 end
 
-master      = Stellar::KeyPair.from_raw_seed("allmylifemyhearthasbeensearching")
-destination = Stellar::KeyPair.from_raw_seed("allmylifemyhearthasbeensearching")
+master      = Stellar::KeyPair.master
+destination = Stellar::KeyPair.master
 
 submit master, Stellar::Transaction.payment({
   account:     master,
   destination: destination,
   sequence:    1,
-  amount:      [:native, 2000 * Stellar::ONE]
+  amount:      [:native, 2000]
 })
 
 # NOTE: after this step, you need to get the sequence number for destination

data/examples/offer.rb

@@ -27,14 +27,14 @@ def submit(key, tx)
   p response.body
 end
 
-master      = Stellar::KeyPair.from_raw_seed("allmylifemyhearthasbeensearching")
-destination = Stellar::KeyPair.from_raw_seed("allmylifemyhearthasbeensearching")
+master      = Stellar::KeyPair.master
+destination = Stellar::KeyPair.master
 
 submit master, Stellar::Transaction.payment({
   account:     master,
   destination: destination,
   sequence:    1,
-  amount:      [:native, 2000 * Stellar::ONE]
+  amount:      [:native, 2000]
 })
 
 # NOTE: after this step, you need to get the sequence number for destination

data/examples/transaction_merge.rb

@@ -2,21 +2,21 @@
 
 require 'stellar-base'
 
-master      = Stellar::KeyPair.from_raw_seed("allmylifemyhearthasbeensearching")
-destination = Stellar::KeyPair.from_raw_seed("allmylifemyhearthasbeensearching")
+master      = Stellar::KeyPair.master
+destination = Stellar::KeyPair.master
 
 tx1 = Stellar::Transaction.payment({
   account:     master,
   destination: destination,
   sequence:    1,
-  amount:      [:native, 20 * Stellar::ONE]
+  amount:      [:native, 20]
 })
 
 tx2 = Stellar::Transaction.payment({
   account:     master,
   destination: destination,
   sequence:    2,
-  amount:      [:native, 20 * Stellar::ONE]
+  amount:      [:native, 20]
 })
 
 hex = tx1.merge(tx2).to_envelope(master).to_xdr(:base64)

data/lib/stellar/base/version.rb

@@ -1,5 +1,5 @@
 module Stellar
   module Base
-    VERSION = "0.3.0"
+    VERSION = "0.4.0"
   end
 end

data/lib/stellar/operation.rb

@@ -95,7 +95,7 @@ module Stellar
 
     def self.create_account(attributes={})
       destination      = attributes[:destination]
-      starting_balance = attributes[:starting_balance]
+      starting_balance = interpret_amount(attributes[:starting_balance])
 
       raise ArgumentError unless destination.is_a?(KeyPair)
 
@@ -121,7 +121,7 @@ module Stellar
     #                              Stellar::ChangeTrustOp body
     def self.change_trust(attributes={})
       line  = Asset.send(*attributes[:line])
-      limit = attributes[:limit]
+      limit =interpret_amount(attributes[:limit]) 
 
       raise ArgumentError, "Bad :limit #{limit}" unless limit.is_a?(Integer)
 
@@ -135,7 +135,7 @@ module Stellar
     def self.manage_offer(attributes={})
       buying     = Asset.send(*attributes[:buying])
       selling    = Asset.send(*attributes[:selling])
-      amount     = attributes[:amount]
+      amount     = interpret_amount(attributes[:amount])
       offer_id   = attributes[:offer_id] || 0
       price      = interpret_price(attributes[:price])
 
@@ -155,7 +155,7 @@ module Stellar
     def self.create_passive_offer(attributes={})
       buying     = Asset.send(*attributes[:buying])
       selling    = Asset.send(*attributes[:selling])
-      amount     = attributes[:amount]
+      amount     = interpret_amount(attributes[:amount])
       price      = interpret_price(attributes[:price])
 
       op = CreatePassiveOfferOp.new({
@@ -280,12 +280,25 @@ module Stellar
 
     private
     def self.extract_amount(a)
-      amount   = a.last
+      amount   = interpret_amount(a.last)
       asset    = Stellar::Asset.send(*a[0...-1])
 
       return asset, amount
     end
 
+    def self.interpret_amount(amount)
+      case amount
+      when String
+        (BigDecimal.new(amount) * Stellar::ONE).floor
+      when Integer
+        amount * Stellar::ONE
+      when Numeric
+        (amount * Stellar::ONE).floor
+      else
+        raise ArgumentError, "Invalid amount type: #{amount.class}. Must be String or Numeric"
+      end
+    end
+
 
     def self.interpret_price(price)
       case price

data/spec/lib/stellar/operation_spec.rb

@@ -0,0 +1,13 @@
+require 'spec_helper'
+
+describe Stellar::Operation, ".payment" do
+
+
+  it "correctly translates the provided amount to the native representation" do
+    op = Stellar::Operation.payment(destination: Stellar::KeyPair.random, amount: [:native, 20])
+    expect(op.body.value.amount).to eql(20_0000000) 
+    op = Stellar::Operation.payment(destination: Stellar::KeyPair.random, amount: [:native, "20"])
+    expect(op.body.value.amount).to eql(20_0000000) 
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stellar-base
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Scott Fleckenstein
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-04 00:00:00.000000000 Z
+date: 2015-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xdr
@@ -230,6 +230,7 @@ files:
 - ".gitignore"
 - ".travis.yml"
 - ".yardopts"
+- CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
 - Guardfile
@@ -381,6 +382,7 @@ files:
 - spec/lib/stellar/convert_spec.rb
 - spec/lib/stellar/key_pair_spec.rb
 - spec/lib/stellar/networks_spec.rb
+- spec/lib/stellar/operation_spec.rb
 - spec/lib/stellar/path_payment_result_spec.rb
 - spec/lib/stellar/price_spec.rb
 - spec/lib/stellar/thresholds_spec.rb
@@ -431,6 +433,7 @@ test_files:
 - spec/lib/stellar/convert_spec.rb
 - spec/lib/stellar/key_pair_spec.rb
 - spec/lib/stellar/networks_spec.rb
+- spec/lib/stellar/operation_spec.rb
 - spec/lib/stellar/path_payment_result_spec.rb
 - spec/lib/stellar/price_spec.rb
 - spec/lib/stellar/thresholds_spec.rb