stellar_core_commander 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 92445ff35302b2b1dd07d27a73691fd1350e9d1b
-  data.tar.gz: 00d2f4a74b10243d7ca7c0dbc35da9df143b488a
+  metadata.gz: 69125ec58eb849d896c5fc814cc969c81a1cb652
+  data.tar.gz: b60d9215848229eb69ead17594c59a84147bc8f6
 SHA512:
-  metadata.gz: 5685616a9700bb4fa092d391be34fdd0915a7ddc37950eb99083ac485545769ca5d53aba1f5f80975caafb8be6a9054d15f30b1694ad6fadcaf4cee254c46e81
-  data.tar.gz: b60e6f66d0904aedc4c725484e8dd32518e5a55f2fbc19521fdc70a1d888da4e15dd3e9303009cb7b26149f1e10a03c8a9f632c4bda56f7a96cd97591bf85405
+  metadata.gz: c14d87026ec3a2d740a92467f20825f748ac288b29d9c40c9f9b6d26f41c61991da9e46c92cd72e1772f4ba82baca6f644201dc98ce3bea1e7f88b52998f7c21
+  data.tar.gz: ff2c49f39722e4e717be0567aa29d2d01d6402942f7cb3b28dc039b702465658cf5878a204c70d88f34be30c5a6fa97b059b1fa8e0a57c0713cbab3afd4988bd

data/.gitignore

@@ -13,3 +13,4 @@
 *.a
 mkmf.log
 out.sql
+.DS_Store

data/examples/allow_trust.rb

@@ -0,0 +1,24 @@
+account :usd_gateway
+account :scott
+account :andrew
+
+payment :master, :usd_gateway, [:native, 1000_000000]
+payment :master, :scott, [:native, 1000_000000]
+payment :master, :andrew, [:native, 1000_000000]
+
+close_ledger
+
+require_trust_auth :usd_gateway
+
+close_ledger
+
+trust :scott,  :usd_gateway, "USD"
+trust :andrew, :usd_gateway, "USD"
+
+close_ledger
+
+allow_trust :usd_gateway, :scott, "USD"
+
+# close_ledger
+
+# payment :usd_gateway, :scott,  ["USD", :usd_gateway, 1000_000000]

data/examples/pathed_payment.rb

@@ -27,8 +27,8 @@ payment :eur_gateway, :bartek, ["EUR", :eur_gateway, 1000_000000]
 
 close_ledger
 
-offer :offer_1, :andrew, ["EUR", :eur_gateway], ["USD", :usd_gateway], 200_000000, 1.0
+offer :andrew, {buy:["USD", :usd_gateway], with:["EUR", :eur_gateway]}, 200_000000, 1.0
 
 close_ledger
 
-payment :scott, :bartek, ["EUR", :eur_gateway, 10], path: [["USD", :usd_gateway], ["EUR", :eur_gateway]]
+payment :scott, :bartek, ["EUR", :eur_gateway, 10], path: [["USD", :usd_gateway]]

data/examples/trade.rb

@@ -0,0 +1,31 @@
+account :usd_gateway
+account :eur_gateway
+account :scott
+account :bartek
+
+payment :master, :usd_gateway, [:native, 1000_000000]
+payment :master, :eur_gateway, [:native, 1000_000000]
+
+payment :master, :scott, [:native, 1000_000000]
+payment :master, :bartek, [:native, 1000_000000]
+
+close_ledger
+
+trust :scott,  :usd_gateway, "USD"
+trust :bartek, :usd_gateway, "USD"
+trust :scott,  :eur_gateway, "EUR"
+trust :bartek, :eur_gateway, "EUR"
+
+close_ledger
+
+payment :usd_gateway, :scott,  ["USD", :usd_gateway, 1000_000000]
+payment :eur_gateway, :bartek, ["EUR", :eur_gateway, 1000_000000]
+
+close_ledger
+
+offer :bartek, {buy:["USD", :usd_gateway], with:["EUR", :eur_gateway]}, 1000_000000, 1.0
+
+close_ledger
+
+offer :scott, {sell:["USD", :usd_gateway], for:["EUR", :eur_gateway]}, 500_000000, 1.0
+

data/lib/stellar_core_commander.rb

@@ -15,6 +15,7 @@ module StellarCoreCommander
   autoload :Commander
   autoload :Process
   autoload :Transactor
+  autoload :OperationBuilder
 
   autoload :Convert
 end

data/lib/stellar_core_commander/operation_builder.rb

@@ -0,0 +1,138 @@
+module StellarCoreCommander
+
+  class OperationBuilder
+    include Contracts
+
+    Currency = [String, Symbol]
+    Amount = Any #TODO
+
+    OfferCurrencies = Or[
+      {sell:Currency, for: Currency},
+      {buy:Currency, with: Currency},
+    ]
+
+    Contract Transactor => Any
+    def initialize(transactor)
+      @transactor = transactor
+    end
+
+    Contract Symbol, Symbol, Amount, Or[{}, {path: Any}] => Any
+    def payment(from, to, amount, options={})
+      from = get_account from
+      to   = get_account to
+
+      if amount.first != :native
+        amount    = [:iso4217] + amount
+        amount[2] = get_account(amount[2])
+        amount[1] = amount[1].ljust(4, "\x00")
+      end
+
+      attrs = {
+        account:     from,
+        destination: to,
+        sequence:    next_sequence(from),
+        amount:      amount,
+      }
+
+      if options[:path]
+        attrs[:path] = options[:path].map{|p| make_currency p}
+      end
+
+      Stellar::Transaction.payment(attrs).to_envelope(from)
+    end
+
+    Contract Symbol, Symbol, String => Any
+    def trust(account, issuer, code)
+      change_trust account, issuer, code, (2**63)-1
+    end    
+
+    Contract Symbol, Symbol, String, Num => Any
+    def change_trust(account, issuer, code, limit)
+      account = get_account account
+
+      Stellar::Transaction.change_trust({
+        account:  account,
+        sequence: next_sequence(account),
+        line:     make_currency([code, issuer]),
+        limit:    limit
+      }).to_envelope(account)
+    end  
+
+    Contract Symbol, Symbol, String, Num => Any
+    def allow_trust(account, trustor, code)
+      currency = make_currency([code, account])
+      account = get_account account
+      trustor = get_account trustor
+      
+
+      Stellar::Transaction.allow_trust({
+        account:  account,
+        sequence: next_sequence(account),
+        currency: currency,
+        trustor:  trustor,
+        authorize: true,
+      }).to_envelope(account)
+    end
+
+    Contract Symbol, OfferCurrencies, Num, Num => Any
+    def offer(account, currencies, amount, price)
+      account = get_account account
+
+      if currencies.has_key?(:sell)
+        taker_pays = make_currency currencies[:for]
+        taker_gets = make_currency currencies[:sell]
+      else
+        taker_pays = make_currency currencies[:buy]
+        taker_gets = make_currency currencies[:with]
+      end
+
+      Stellar::Transaction.create_offer({
+        account:  account,
+        sequence: next_sequence(account),
+        taker_gets: taker_gets,
+        taker_pays: taker_pays,
+        amount: amount,
+        price: price,
+      }).to_envelope(account)      
+    end
+
+
+    Contract Symbol => Any
+    def require_trust_auth(account)
+      set_flags account, [:auth_required_flag]
+    end 
+
+    Contract Symbol, ArrayOf[Symbol] => Any
+    def set_flags(account, flags)
+      account = get_account account
+
+      tx = Stellar::Transaction.set_options({
+        account:  account,
+        sequence: next_sequence(account),
+        set:      make_account_flags(flags),
+      })
+
+      tx.to_envelope(account)
+    end  
+
+    private
+
+    delegate :get_account, to: :@transactor
+    delegate :next_sequence, to: :@transactor
+
+    Contract Currency => [Symbol, String, Stellar::KeyPair]
+    def make_currency(input)
+      code, issuer = *input
+      code = code.ljust(4, "\x00")
+      issuer = get_account issuer
+
+      [:iso4217, code, issuer]
+    end
+
+    def make_account_flags(flags=nil)
+      flags ||= []
+      flags.map{|f| Stellar::AccountFlags.send(f)}
+    end
+
+  end
+end

data/lib/stellar_core_commander/process.rb

@@ -148,7 +148,7 @@ module StellarCoreCommander
       body = ActiveSupport::JSON.decode(response.body)
 
       unless body["wasReceived"] == true
-        raise "transaction failed: #{body["result"]}"
+        raise "transaction failed: #{body.inspect}"
       end
 
       hex_tr = body["result"]

data/lib/stellar_core_commander/transactor.rb

@@ -11,19 +11,16 @@ module StellarCoreCommander
 
     class FailedTransaction < StandardError ; end
 
-    Currency = [String, Symbol]
-    Amount = Any #TODO
-
     Contract Process => Any
     def initialize(process)
       @process    = process
       @named      = {}.with_indifferent_access
       @unverified = []
+      @operation_builder = OperationBuilder.new(self)
       account :master, Stellar::KeyPair.from_raw_seed("allmylifemyhearthasbeensearching")
     end
 
     Contract String => Any
-
     # 
     # Runs the provided recipe against the process identified by @process
     # 
@@ -53,85 +50,59 @@ module StellarCoreCommander
       add_named name, keypair
     end
 
-    Contract Symbol, Symbol, Amount, Or[{}, {path: Any}] => Any
-    def payment(from, to, amount, options={})
-      from = get_account from
-      to   = get_account to
-
-      if amount.first != :native
-        amount    = [:iso4217] + amount
-        amount[2] = get_account(amount[2])
-        amount[1] = amount[1].ljust(4, "\x00")
-      end
-
-      attrs = {
-        account:     from,
-        destination: to,
-        sequence:    next_sequence(from),
-        amount:      amount,
-      }
 
-      if options[:path]
-        attrs[:path] = options[:path].map{|p| make_currency p}
-      end
-      envelope = Stellar::Transaction.payment(attrs).to_envelope(from)
+    # 
+    # @see StellarCoreCommander::OperationBuilder#payment
+    def payment(*args)
+      envelope = @operation_builder.payment(*args)
 
       submit_transaction envelope do |result|
         payment_result = result.result.results!.first.tr!.payment_result!
-
         raise FailedTransaction unless payment_result.code.value >= 0
       end
     end
 
-    Contract Symbol, Symbol, String => Any
-    def trust(account, issuer, code)
-      change_trust account, issuer, code, (2**63)-1
-    end    
-
-    Contract Symbol, Symbol, String, Num => Any
-    def change_trust(account, issuer, code, limit)
-      account = get_account account
-
-      tx = Stellar::Transaction.change_trust({
-        account:  account,
-        sequence: next_sequence(account),
-        line:     make_currency([code, issuer]),
-        limit:    limit
-      })
-
-      envelope = tx.to_envelope(account)
+    # 
+    # @see StellarCoreCommander::OperationBuilder#trust
+    def trust(*args)
+      envelope = @operation_builder.trust(*args)
+      submit_transaction envelope
+    end  
 
+    # 
+    # @see StellarCoreCommander::OperationBuilder#change_trust
+    def change_trust(*args)
+      envelope = @operation_builder.change_trust(*args)
       submit_transaction envelope
     end
 
-    Contract Symbol, Symbol, Currency, Currency, Num, Num => Any
-    def offer(name, account, taker_gets, taker_pays, amount, price)
-      account    = get_account account
-      taker_gets = make_currency taker_gets
-      taker_pays = make_currency taker_pays
-
-      tx = Stellar::Transaction.create_offer({
-        account:  account,
-        sequence: next_sequence(account),
-        taker_gets: taker_gets,
-        taker_pays: taker_pays,
-        amount: amount,
-        price: price,
-      })
-
-      envelope = tx.to_envelope(account)
+    # 
+    # @see StellarCoreCommander::OperationBuilder#offer
+    def offer(*args)
+      envelope = @operation_builder.offer(*args)
+      submit_transaction envelope
+    end
 
-      submit_transaction envelope do |result|
-        offer = begin
-          co_result = result.result.results!.first.tr!.create_offer_result!
-          co_result.success!.offer.offer!
-        rescue
-          raise FailedTransaction, "Could not extract offer from result:#{result.to_xdr(:base64)}"
-        end
+    # 
+    # @see StellarCoreCommander::OperationBuilder#require_trust_auth
+    def require_trust_auth(*args)
+      envelope = @operation_builder.require_trust_auth(*args)
+      submit_transaction envelope
+    end 
 
-        add_named name, offer
-      end
+    # 
+    # @see StellarCoreCommander::OperationBuilder#set_flags
+    def set_flags(*args)
+      envelope = @operation_builder.set_flags(*args)
+      submit_transaction envelope
     end
+    
+    # 
+    # @see StellarCoreCommander::OperationBuilder#allow_trust
+    def allow_trust(*args)
+      envelope = @operation_builder.allow_trust(*args)
+      submit_transaction envelope
+    end 
 
     Contract None => Any
     # 
@@ -147,8 +118,8 @@ module StellarCoreCommander
           result = validate_transaction envelope
           after_confirmation.call(result) if after_confirmation
         rescue FailedTransaction
-          require 'pry'; binding.pry
           $stderr.puts "Failed to validate tx: #{Convert.to_hex envelope.tx.hash}"
+          $stderr.puts "failed result: #{result.to_xdr(:hex)}"
           exit 1
         end
       end
@@ -157,25 +128,6 @@ module StellarCoreCommander
       @unverified.clear
     end
 
-    private
-    Contract Symbol, Any => Any
-    def add_named(name, object)
-      if @named.has_key?(name)
-        raise ArgumentError, "#{name} is already registered"
-      end
-
-      @named[name] = object
-    end
-
-    Contract Stellar::TransactionEnvelope, Or[nil, Proc] => Any
-    def submit_transaction(envelope, &after_confirmation)
-      hex    = envelope.to_xdr(:hex)
-      @process.submit_transaction hex
-
-      # submit to process
-      @unverified << [envelope, after_confirmation]
-    end
-
     Contract Symbol => Stellar::KeyPair
     def get_account(name)
       @named[name].tap do |found|
@@ -193,13 +145,23 @@ module StellarCoreCommander
       base_sequence + inflight_count + 1
     end
 
-    Contract Currency => [Symbol, String, Stellar::KeyPair]
-    def make_currency(input)
-      code, issuer = *input
-      code = code.ljust(4, "\x00")
-      issuer = get_account issuer
+    private
+    Contract Symbol, Any => Any
+    def add_named(name, object)
+      if @named.has_key?(name)
+        raise ArgumentError, "#{name} is already registered"
+      end
+
+      @named[name] = object
+    end
+
+    Contract Stellar::TransactionEnvelope, Or[nil, Proc] => Any
+    def submit_transaction(envelope, &after_confirmation)
+      hex    = envelope.to_xdr(:hex)
+      @process.submit_transaction hex
 
-      [:iso4217, code, issuer]
+      # submit to process
+      @unverified << [envelope, after_confirmation]
     end
 
     Contract Stellar::TransactionEnvelope => Stellar::TransactionResult
@@ -209,12 +171,19 @@ module StellarCoreCommander
 
       base64_result = @process.transaction_result(hex_hash)
       
-      raise "couldn't fine result for #{hex_hash}" if base64_result.blank?
+      raise "couldn't find result for #{hex_hash}" if base64_result.blank?
       
       raw_result = Convert.from_base64(base64_result)
 
       pair = Stellar::TransactionResultPair.from_xdr(raw_result)
-      pair.result
+      result = pair.result
+
+      # ensure success for every operation
+      expected = Stellar::TransactionResultCode.tx_success
+      actual = result.result.code
+      raise "transaction failed" unless expected == actual
+
+      result
     end
 
   end

data/lib/stellar_core_commander/version.rb

@@ -1,3 +1,3 @@
 module StellarCoreCommander
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/stellar_core_commander.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "stellar-base", "~> 0.0.1"
+  spec.add_dependency "stellar-base", "= 0.0.5"
   spec.add_dependency "slop", "~> 3.6.0"
   spec.add_dependency "faraday", "~> 0.9.1"
   spec.add_dependency "faraday_middleware", "~> 0.9.1"

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: stellar_core_commander
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Scott Fleckenstein
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-27 00:00:00.000000000 Z
+date: 2015-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: stellar-base
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: 0.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: 0.0.5
 - !ruby/object:Gem::Dependency
   name: slop
   requirement: !ruby/object:Gem::Requirement
@@ -178,12 +178,15 @@ files:
 - README.md
 - Rakefile
 - bin/scc
+- examples/allow_trust.rb
 - examples/non_native_payment.rb
 - examples/pathed_payment.rb
 - examples/simple_payment.rb
+- examples/trade.rb
 - lib/stellar_core_commander.rb
 - lib/stellar_core_commander/commander.rb
 - lib/stellar_core_commander/convert.rb
+- lib/stellar_core_commander/operation_builder.rb
 - lib/stellar_core_commander/process.rb
 - lib/stellar_core_commander/transactor.rb
 - lib/stellar_core_commander/version.rb