stellar_core_commander 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6ec23f9e827ebf793af1412a68847a9f37ff9278
-  data.tar.gz: 9e2d0a36edb3093e4384067225d95c03341cca8f
+  metadata.gz: fd2f67696affdaab450d32a5f0af66983a30c4bf
+  data.tar.gz: a1c96602fc57defdc5bc288ee2e1d3edcbb05ca2
 SHA512:
-  metadata.gz: 2cd2365fb8291e0307c29b5283eb0537950e6bab08ed69999cb4fc9c5f66c14b17d0758aabf37b5467eef99778afb3b8915e0bb6bcef533e6611ca376cdf78ab
-  data.tar.gz: f1c4810b80c622b188c7f936a45dc2db4ecd98e2a1e71103f6cd525293720144481ef49198bda1c0ebe42a3f6f5152d6784960c0a22558d1a5d11b4015ccd0c4
+  metadata.gz: 754f6d203d4d406fc446ff8975ef964c2cfc14cea19824f4d8773d92a468dc1a01f5930f1ba091556187f0ffa2f8d35f038c50edb2bc661b1365c20453bb5b8b
+  data.tar.gz: 78f2b8bf586722d6fa1f882c638b627c1b0ba9569a8a1dca823b22ab8b716e5bc4a1fc701a9894e61d1c5f9bf7d9a929d6675c1beb6f83cd24629a6416ef481b

data/Gemfile

@@ -2,4 +2,4 @@ source 'https://rubygems.org'
 gemspec
 
 # gem 'stellar-base', path: "~/src/stellar/ruby-stellar-base"
-# gem 'xdr', path: "~/src/stellar/ruby-xdr"# 
+# gem 'xdr', path: "~/src/stellar/ruby-xdr"#

data/bin/scc

@@ -4,13 +4,23 @@ require 'stellar_core_commander'
 require 'slop'
 
 def run
-  $opts = Slop.parse do
+  $opts = Slop.parse(ARGV, :help => true) do
     banner 'Usage: scc -r RECIPE'
 
-    on 'stellar-core-bin', 'a path to a stellar-core executable (defaults to `which stellar-core`)', argument: true
-
-    on 'r', 'recipe', 'a recipe file', argument: true #, required: true
-    on 'p', 'process', 'method for running stellar-core', argument: true, default: 'local'
+    on 'stellar-core-bin',
+      'a path to a stellar-core executable (defaults to `which stellar-core`)',
+      argument: true
+    on 'r', 'recipe',
+      'a recipe file',
+      argument: true
+    on 'p', 'process',
+      'method for running stellar-core',
+      argument: true,
+      default: 'local'
+    on 'w', 'wait',
+      'wait for TERM signal before shutting down and cleaning up',
+       argument: false,
+       default: false
   end
 
   recipe    = load_recipe
@@ -23,7 +33,13 @@ def run
   transactor.run_recipe recipe
   transactor.close_ledger
 
-  output_results(transactor.get_process(:process))
+  output_results(commander.get_root_process transactor)
+
+  if $opts[:wait]
+    puts "Waiting for INT signal..."
+    Signal.trap("INT"){ exit }
+    sleep
+  end
 end
 
 

data/examples/allow_trust.rb

@@ -2,9 +2,9 @@ account :usd_gateway
 account :scott
 account :andrew
 
-payment :master, :usd_gateway, [:native, 1000 * Stellar::ONE]
-payment :master, :scott, [:native, 1000 * Stellar::ONE]
-payment :master, :andrew, [:native, 1000 * Stellar::ONE]
+create_account :usd_gateway
+create_account :scott
+create_account :andrew
 
 close_ledger
 

data/examples/cross_host_simple_payment.rb

@@ -0,0 +1,19 @@
+process :node1, [:node1, :node2, :node3], 2, host: '192.168.99.105'
+process :node2, [:node1, :node2, :node3], 2, host: '192.168.99.104'
+process :node3, [:node1, :node2, :node3], 2, host: '192.168.99.103'
+
+account :alice
+account :bob
+
+puts "Running txs on node1"
+
+on :node1 do
+  create_account :alice, :master
+  create_account :bob, :master
+  close_ledger
+  payment :master, :bob, [:native, 1000_000000]
+  close_ledger
+end
+
+payment :master, :alice, [:native, 1000_000000]
+

data/examples/merge_account.rb

@@ -0,0 +1,7 @@
+account :scott
+
+create_account :scott, :master
+
+close_ledger
+
+merge_account :scott, :master

data/examples/multi_host_simple_payment.rb

@@ -0,0 +1,19 @@
+process :node1, [:node1, :node2, :node3], 2
+process :node2, [:node1, :node2, :node3], 2
+process :node3, [:node1, :node2, :node3], 2
+
+account :alice
+account :bob
+
+puts "Running txs on node1"
+
+on :node1 do
+  create_account :alice, :master
+  create_account :bob, :master
+  close_ledger
+  payment :master, :bob, [:native, 1000_000000]
+  close_ledger
+end
+
+payment :master, :alice, [:native, 1000_000000]
+

data/examples/trade.rb

@@ -1,3 +1,5 @@
+use_manual_close #use_manual_close causes scc to run a process with MANUAL_CLOSE=true
+
 account :usd_gateway
 account :eur_gateway
 account :scott

data/lib/stellar_core_commander/commander.rb

@@ -18,15 +18,23 @@ module StellarCoreCommander
       @processes = []
     end
 
-    Contract None => Process
+    Contract Transactor, Symbol, ArrayOf[Symbol], Num, Hash => Process
     #
     # make_process returns a new, unlaunched Process object, bound to a new
-    # tmpdir and 
-    def make_process
+    # tmpdir
+    def make_process(transactor, name, quorum, thresh, options={})
       tmpdir = Dir.mktmpdir("scc")
 
-      identity      = Stellar::KeyPair.random
-      base_port     = 39132 + @processes.map(&:required_ports).sum
+      process_options = @process_options.merge({
+        transactor:   transactor,
+        working_dir:  tmpdir,
+        name:         name,
+        base_port:    39132 + @processes.map(&:required_ports).sum,
+        identity:     Stellar::KeyPair.random,
+        quorum:       quorum,
+        threshold:    thresh,
+        manual_close: false
+      }).merge(options)
 
       process_class = case @process_type
                         when 'local'
@@ -37,12 +45,30 @@ module StellarCoreCommander
                           raise "Unknown process type: #{@process_type}"
                       end
 
-      process_class.new(tmpdir, base_port, identity, @process_options).tap do |p|
-        p.setup
+      process_class.new(process_options).tap do |p|
         @processes << p
       end
     end
 
+    Contract Transactor => Process
+    def get_root_process(transactor)
+      if @processes.size == 0
+        make_process transactor, :node0, [:node0], 1, { manual_close: transactor.manual_close }
+      end
+      @processes[0]
+    end
+
+    Contract None => ArrayOf[Process]
+    def start_all_processes
+      @processes.each do |p|
+        if not p.running?
+          $stderr.puts "running #{p.idname} (dir:#{p.working_dir})"
+          p.run
+          p.wait_for_ready
+        end
+      end
+    end
+
     def cleanup
       @processes.each(&:cleanup)
     end

data/lib/stellar_core_commander/docker_process.rb

@@ -13,45 +13,52 @@ module StellarCoreCommander
 
     Contract None => Any
     def launch_state_container
-      run_cmd "docker", %W(run --name #{state_container_name} -p #{postgres_port}:5432 --env-file stellar-core.env -d stellar/stellar-core-state)
+      $stderr.puts "launching state container #{state_container_name}"
+      docker %W(run --name #{state_container_name} -p #{postgres_port}:5432 --env-file stellar-core.env -d stellar/stellar-core-state)
       raise "Could not create state container" unless $?.success?
     end
 
     Contract None => Any
     def shutdown_state_container
-      run_cmd "docker", %W(rm -f -v #{state_container_name})
+      return true unless state_container_running?
+      docker %W(rm -f -v #{state_container_name})
       raise "Could not drop db: #{database_name}" unless $?.success?
     end
 
     Contract None => Any
     def write_config
-      IO.write("#{working_dir}/.pgpass", "#{docker_host}:#{postgres_port}:*:#{database_user}:#{database_password}")
-      FileUtils.chmod(0600, "#{working_dir}/.pgpass")
       IO.write("#{working_dir}/stellar-core.env", config)
     end
 
     Contract None => Any
     def setup
       write_config
-      launch_state_container
     end
 
     Contract None => nil
     def run
       raise "already running!" if running?
+      setup
+      launch_state_container
       launch_stellar_core
     end
 
     Contract None => Bool
     def running?
-      run_cmd "docker", %W(inspect #{container_name})
+      docker %W(inspect #{container_name})
+      $?.success?
+    end
+
+    Contract None => Bool
+    def state_container_running?
+      docker %W(inspect #{state_container_name})
       $?.success?
     end
 
     Contract None => Any
     def shutdown
       return true unless running?
-      run_cmd "docker", %W(rm -f #{container_name})
+      docker %W(rm -f #{container_name})
     end
 
     Contract None => Any
@@ -65,7 +72,8 @@ module StellarCoreCommander
     Contract None => Any
     def dump_database
       Dir.chdir(working_dir) do
-        `docker exec #{state_container_name} pg_dump -U #{database_user} --clean --no-owner #{database_name}`
+        host_args = "-H tcp://#{docker_host}:#{docker_port}" if host
+        `docker #{host_args} exec #{state_container_name} pg_dump -U #{database_user} --clean --no-owner #{database_name}`
       end
     end
 
@@ -96,32 +104,30 @@ module StellarCoreCommander
 
     Contract None => String
     def container_name
-      "c#{base_port}"
+      "scc-#{idname}"
     end
 
     Contract None => String
     def state_container_name
-      "db#{container_name}"
+      "scc-state-#{idname}"
     end
 
     Contract None => String
     def docker_host
-      docker_uri = URI.parse(ENV['DOCKER_HOST'])
-      if docker_uri.scheme == "tcp"
-        docker_uri.host
-      else
-        "127.0.0.1"
-      end
+      return host if host
+      return URI.parse(ENV['DOCKER_HOST']).host if ENV['DOCKER_HOST']
+      DEFAULT_HOST
     end
 
     Contract None => String
-    def http_host
+    def hostname
       docker_host
     end
 
     private
     def launch_stellar_core
-      run_cmd "docker", %W(run
+      $stderr.puts "launching stellar-core container #{container_name}"
+      docker %W(run
                            --name #{container_name}
                            --net host
                            --volumes-from #{state_container_name}
@@ -143,12 +149,12 @@ module StellarCoreCommander
         main_PEER_SEED=#{identity.seed}
         main_VALIDATION_SEED=#{identity.seed}
 
-        MANUAL_CLOSE=true
+        #{"MANUAL_CLOSE=true" if manual_close?}
 
-        QUORUM_THRESHOLD=1
+        QUORUM_THRESHOLD=#{threshold}
 
-        PREFERRED_PEERS=["127.0.0.1:#{peer_port}"]
-        QUORUM_SET=["#{identity.address}"]
+        PREFERRED_PEERS=#{peers}
+        QUORUM_SET=#{quorum}
 
         HISTORY_PEERS=["main"]
 
@@ -157,5 +163,25 @@ module StellarCoreCommander
         HISTORY_MKDIR=mkdir -p history/%s/{0}
       EOS
     end
+
+    def docker_port
+      if ENV['DOCKER_HOST']
+        URI.parse(ENV['DOCKER_HOST']).port
+      else
+        2376
+      end
+    end
+
+    def docker_args
+      if host
+        ["-H", "tcp://#{docker_host}:#{docker_port}"]
+      else
+        []
+      end
+    end
+
+    def docker(args)
+      run_cmd "docker", docker_args + args
+    end
   end
 end

data/lib/stellar_core_commander/local_process.rb

@@ -6,21 +6,11 @@ module StellarCoreCommander
     attr_reader :pid
     attr_reader :wait
 
-    def initialize(working_dir, base_port, identity, opts)
-      stellar_core_bin = opts[:stellar_core_bin]
-      if stellar_core_bin.blank?
-        search = `which stellar-core`.strip
-
-        if $?.success?
-          stellar_core_bin = search
-        else
-          $stderr.puts "Could not find a `stellar-core` binary, please use --stellar-core-bin to specify"
-          exit 1
-        end
-      end
-
-      FileUtils.cp(stellar_core_bin, "#{working_dir}/stellar-core")
+    def initialize(params)
       super
+      @stellar_core_bin = params[:stellar_core_bin]
+      raise "`host` param is unsupported on LocalProcess, please use `-p docker` for this recipe." if params[:host]
+      setup_working_dir
     end
 
     Contract None => Any
@@ -69,7 +59,7 @@ module StellarCoreCommander
     Contract None => Num
     def run
       raise "already running!" if running?
-
+      setup
       forcescp
       launch_stellar_core
     end
@@ -120,7 +110,7 @@ module StellarCoreCommander
 
     Contract None => String
     def database_name
-      "stellar_core_tmp_#{basename}"
+      "stellar_core_tmp_#{idname}"
     end
 
     Contract None => String
@@ -145,7 +135,6 @@ module StellarCoreCommander
     Contract None => String
     def config
       <<-EOS.strip_heredoc
-        MANUAL_CLOSE=true
         PEER_PORT=#{peer_port}
         RUN_STANDALONE=false
         HTTP_PORT=#{http_port}
@@ -154,10 +143,13 @@ module StellarCoreCommander
         VALIDATION_SEED="#{@identity.seed}"
 
         DATABASE="#{dsn}"
+        PREFERRED_PEERS=#{peers}
+
+        #{"MANUAL_CLOSE=true" if manual_close?}
 
         [QUORUM_SET]
-        THRESHOLD=1
-        VALIDATORS=["#{@identity.address}"]
+        THRESHOLD=#{threshold}
+        VALIDATORS=#{quorum}
 
         [HISTORY.main]
         get="cp history/main/{0} {1}"
@@ -166,5 +158,20 @@ module StellarCoreCommander
       EOS
     end
 
+    def setup_working_dir
+      if @stellar_core_bin.blank?
+        search = `which stellar-core`.strip
+
+        if $?.success?
+          @stellar_core_bin = search
+        else
+          $stderr.puts "Could not find a `stellar-core` binary, please use --stellar-core-bin to specify"
+          exit 1
+        end
+      end
+
+      FileUtils.cp(@stellar_core_bin, "#{working_dir}/stellar-core")
+    end
+
   end
-end
+end

data/lib/stellar_core_commander/operation_builder.rb

@@ -17,6 +17,15 @@ module StellarCoreCommander
       {buy:Currency, with: Currency},
     ]
 
+    ThresholdByte = And[Num, lambda{|n| (0..255).include? n}]
+
+    Thresholds = {
+      low:           ThresholdByte,
+      medium:        ThresholdByte,
+      high:          ThresholdByte,
+      master_weight: ThresholdByte
+    }
+
     Contract Transactor => Any
     def initialize(transactor)
       @transactor = transactor
@@ -75,8 +84,8 @@ module StellarCoreCommander
       }).to_envelope(account)
     end
 
-    Contract Symbol, Symbol, String, Num => Any
-    def allow_trust(account, trustor, code)
+    Contract Symbol, Symbol, String, Num, Bool => Any
+    def allow_trust(account, trustor, code, authorize=true)
       currency = make_currency([code, account])
       account = get_account account
       trustor = get_account trustor
@@ -87,10 +96,15 @@ module StellarCoreCommander
         sequence: next_sequence(account),
         currency: currency,
         trustor:  trustor,
-        authorize: true,
+        authorize: authorize,
       }).to_envelope(account)
     end
 
+    Contract Symbol, Symbol, String, Num => Any
+    def revoke_trust(account, trustor, code)
+      allow_trust(account, trustor, code, false)
+    end
+
     Contract Symbol, OfferCurrencies, Num, Num => Any
     def offer(account, currencies, amount, price)
       account = get_account account
@@ -134,6 +148,50 @@ module StellarCoreCommander
       tx.to_envelope(account)
     end
 
+
+    Contract Symbol, Stellar::KeyPair, Num => Any
+    def add_signer(account, key, weight)
+      account = get_account account
+
+      tx = Stellar::Transaction.set_options({
+        account:  account,
+        sequence: next_sequence(account),
+        signer:   Stellar::Signer.new({
+          pub_key: key.public_key,
+          weight: weight
+        }),
+      })
+
+      tx.to_envelope(account)
+    end
+
+    Contract(Symbol, Thresholds => Any)
+    def set_thresholds(account, thresholds)
+      account = get_account account
+
+      tx = Stellar::Transaction.set_options({
+        account:    account,
+        sequence:   next_sequence(account),
+        thresholds: make_thresholds_word(thresholds),
+      })
+
+      tx.to_envelope(account)
+    end
+
+    Contract Symbol, Symbol => Any
+    def merge_account(account, into)
+      account = get_account account
+      into    = get_account into
+
+      tx = Stellar::Transaction.account_merge({
+        account:     account,
+        sequence:    next_sequence(account),
+        destination: into,
+      })
+
+      tx.to_envelope(account)
+    end
+
     private
 
     delegate :get_account, to: :@transactor
@@ -156,6 +214,11 @@ module StellarCoreCommander
       flags.map{|f| Stellar::AccountFlags.send(f)}
     end
 
+    Contract Thresholds => String
+    def make_thresholds_word(thresholds)
+      thresholds.values_at(:master_weight, :low, :medium, :high).pack("C*")
+    end
+
     Contract Amount => Any
     def normalize_amount(amount)
       return amount if amount.first == :native

data/lib/stellar_core_commander/process.rb

@@ -3,22 +3,70 @@ module StellarCoreCommander
   class Process
     include Contracts
 
+    attr_reader :transactor
     attr_reader :working_dir
+    attr_reader :name
     attr_reader :base_port
     attr_reader :identity
     attr_reader :server
+    attr_accessor :unverified
+    attr_reader :threshold
+    attr_reader :host
+
+    DEFAULT_HOST = '127.0.0.1'
+
+    Contract({
+      transactor:   Transactor,
+      working_dir:  String,
+      name:         Symbol,
+      base_port:    Num,
+      identity:     Stellar::KeyPair,
+      quorum:       ArrayOf[Symbol],
+      threshold:    Num,
+      manual_close: Or[Bool, nil],
+      host:         Or[String, nil]
+    } => Any)
+    def initialize(params)
+      #config
+      @transactor   = params[:transactor]
+      @working_dir  = params[:working_dir]
+      @name         = params[:name]
+      @base_port    = params[:base_port]
+      @identity     = params[:identity]
+      @quorum       = params[:quorum]
+      @threshold    = params[:threshold]
+      @manual_close = params[:manual_close] || false
+      @host         = params[:host]
+
+      # state
+      @unverified   = []
+
+
+      if not @quorum.include? @name
+        @quorum << @name
+      end
 
-    def initialize(working_dir, base_port, identity, opts)
-      @working_dir = working_dir
-      @base_port   = base_port
-      @identity    = identity
-
-      @server = Faraday.new(url: "http://#{http_host}:#{http_port}") do |conn|
+      @server = Faraday.new(url: "http://#{hostname}:#{http_port}") do |conn|
         conn.request :url_encoded
         conn.adapter Faraday.default_adapter
       end
     end
 
+    Contract None => ArrayOf[String]
+    def quorum
+      @quorum.map do |q|
+        @transactor.get_process(q).identity.address
+      end
+    end
+
+    Contract None => ArrayOf[String]
+    def peers
+      @quorum.map do |q|
+        p = @transactor.get_process(q)
+        "#{p.hostname}:#{p.peer_port}"
+      end
+    end
+
     Contract None => Num
     def required_ports
       2
@@ -29,6 +77,11 @@ module StellarCoreCommander
       FileUtils.rm_rf working_dir
     end
 
+    Contract None => String
+    def idname
+      "#{@name}-#{@base_port}-#{@identity.address[0..5]}"
+    end
+
     Contract None => Any
     def wait_for_ready
       loop do
@@ -38,22 +91,30 @@ module StellarCoreCommander
         if response
           body = ActiveSupport::JSON.decode(response.body)
 
-          break if body["info"]["state"] == "Synced!"
+          state = body["info"]["state"]
+          $stderr.puts "state: #{state}"
+          break if state == "Synced!"
         end
 
-        $stderr.puts "waiting until stellar-core is synced"
+        $stderr.puts "waiting until stellar-core #{idname} is synced"
         sleep 1
       end
     end
 
+    Contract None => Bool
+    def manual_close?
+      @manual_close
+    end
+
     Contract None => Bool
     def close_ledger
       prev_ledger = latest_ledger
       next_ledger = prev_ledger + 1
 
-      server.get("manualclose")
-
       Timeout.timeout(close_timeout) do
+
+        server.get("manualclose") if manual_close?
+
         loop do
           current_ledger = latest_ledger
 
@@ -61,17 +122,34 @@ module StellarCoreCommander
           when current_ledger == next_ledger
             break
           when current_ledger > next_ledger
-            raise "whoa! we jumped two ledgers, from #{prev_ledger} to #{current_ledger}"
+            raise "#{idname} jumped two ledgers, from #{prev_ledger} to #{current_ledger}"
           else
-            $stderr.puts "waiting for ledger #{next_ledger}"
+            $stderr.puts "#{idname} waiting for ledger #{next_ledger} (current: #{current_ledger}, ballots prepared: #{scp_ballots_prepared})"
             sleep 0.5
           end
         end
       end
+      $stderr.puts "#{idname} closed #{latest_ledger}"
 
       true
     end
 
+    Contract None => Hash
+    def metrics
+      response = server.get("/metrics")
+      body = ActiveSupport::JSON.decode(response.body)
+      body["metrics"]
+    rescue
+      {}
+    end
+
+    Contract None => Num
+    def scp_ballots_prepared
+      metrics["scp.ballot.prepare"]["count"]
+    rescue
+      0
+    end
+
     Contract None => Num
     def http_port
       base_port
@@ -88,7 +166,7 @@ module StellarCoreCommander
       body = ActiveSupport::JSON.decode(response.body)
 
       if body["status"] == "ERROR"
-        raise "transaction failed: #{body.inspect}"
+        raise "transaction on #{idname} failed: #{body.inspect}"
       end
 
     end
@@ -104,26 +182,21 @@ module StellarCoreCommander
       database[:ledgerheaders].max(:ledgerseq)
     end
 
-    Contract String => String
+    Contract String => Maybe[String]
     def transaction_result(hex_hash)
       row = database[:txhistory].where(txid:hex_hash).first
+      return if row.blank?
       row[:txresult]
     end
 
     Contract None => String
-    def http_host
-      "127.0.0.1"
+    def hostname
+      host || DEFAULT_HOST
     end
 
     Contract None => Num
     def close_timeout
-      5.0
-    end
-
-    private
-    Contract None => String
-    def basename
-      File.basename(working_dir)
+      15.0
     end
 
     Contract String, ArrayOf[String] => Maybe[Bool]
@@ -139,4 +212,4 @@ module StellarCoreCommander
     end
 
   end
-end
+end

data/lib/stellar_core_commander/transactor.rb

@@ -10,17 +10,30 @@ module StellarCoreCommander
     include Contracts
 
     class FailedTransaction < StandardError ; end
+    class MissingTransaction < StandardError ; end
+
+    attr_reader :manual_close
 
     Contract Commander => Any
     def initialize(commander)
       @commander         = commander
       @named             = {}.with_indifferent_access
-      @unverified        = []
       @operation_builder = OperationBuilder.new(self)
+      @manual_close      = false
 
       account :master, Stellar::KeyPair.from_raw_seed("allmylifemyhearthasbeensearching")
     end
 
+    def require_process_running
+      if @process == nil
+        @process = @commander.get_root_process self
+        if not @named.has_key? @process.name
+          add_named @process.name, @process
+        end
+      end
+      @commander.start_all_processes
+    end
+
     Contract String => Any
     #
     # Runs the provided recipe against the process identified by @process
@@ -28,12 +41,6 @@ module StellarCoreCommander
     # @param recipe_path [String] path to the recipe file
     #
     def run_recipe(recipe_path)
-      @process = @commander.make_process
-      @process.run
-      @process.wait_for_ready
-
-      add_named :process, @process
-
       recipe_content = IO.read(recipe_path)
       instance_eval recipe_content
     end
@@ -48,10 +55,6 @@ module StellarCoreCommander
     # @param keypair=Stellar::KeyPair.random [Stellar::KeyPair] the keypair to use for this account
     #
     def account(name, keypair=Stellar::KeyPair.random)
-      unless keypair.is_a?(Stellar::KeyPair)
-        raise ArgumentError, "`#{keypair.class.name}` is not `Stellar::KeyPair`"
-      end
-
       add_named name, keypair
     end
 
@@ -59,8 +62,8 @@ module StellarCoreCommander
     #
     # @see StellarCoreCommander::OperationBuilder#payment
     def payment(*args)
+      require_process_running
       envelope = @operation_builder.payment(*args)
-
       submit_transaction envelope do |result|
         payment_result = result.result.results!.first.tr!.value
         raise FailedTransaction unless payment_result.code.value >= 0
@@ -70,6 +73,7 @@ module StellarCoreCommander
     #
     # @see StellarCoreCommander::OperationBuilder#create_account
     def create_account(*args)
+      require_process_running
       envelope = @operation_builder.create_account(*args)
       submit_transaction envelope
     end
@@ -77,6 +81,7 @@ module StellarCoreCommander
     #
     # @see StellarCoreCommander::OperationBuilder#trust
     def trust(*args)
+      require_process_running
       envelope = @operation_builder.trust(*args)
       submit_transaction envelope
     end
@@ -84,6 +89,7 @@ module StellarCoreCommander
     #
     # @see StellarCoreCommander::OperationBuilder#change_trust
     def change_trust(*args)
+      require_process_running
       envelope = @operation_builder.change_trust(*args)
       submit_transaction envelope
     end
@@ -91,6 +97,7 @@ module StellarCoreCommander
     #
     # @see StellarCoreCommander::OperationBuilder#offer
     def offer(*args)
+      require_process_running
       envelope = @operation_builder.offer(*args)
       submit_transaction envelope
     end
@@ -98,6 +105,7 @@ module StellarCoreCommander
     #
     # @see StellarCoreCommander::OperationBuilder#require_trust_auth
     def require_trust_auth(*args)
+      require_process_running
       envelope = @operation_builder.require_trust_auth(*args)
       submit_transaction envelope
     end
@@ -105,30 +113,61 @@ module StellarCoreCommander
     #
     # @see StellarCoreCommander::OperationBuilder#set_flags
     def set_flags(*args)
+      require_process_running
       envelope = @operation_builder.set_flags(*args)
       submit_transaction envelope
     end
 
+    #
+    # @see StellarCoreCommander::OperationBuilder#add_signer
+    def add_signer(*args)
+      require_process_running
+      envelope = @operation_builder.add_signer(*args)
+      submit_transaction envelope
+    end
+
+    #
+    # @see StellarCoreCommander::OperationBuilder#set_thresholds
+    def set_thresholds(*args)
+      require_process_running
+      envelope = @operation_builder.set_thresholds(*args)
+      submit_transaction envelope
+    end
+
     #
     # @see StellarCoreCommander::OperationBuilder#allow_trust
     def allow_trust(*args)
+      require_process_running
       envelope = @operation_builder.allow_trust(*args)
       submit_transaction envelope
     end
 
+
+    #
+    # @see StellarCoreCommander::OperationBuilder#merge_account
+    def merge_account(*args)
+      require_process_running
+      envelope = @operation_builder.merge_account(*args)
+      submit_transaction envelope
+    end
+
     Contract None => Any
     #
     # Triggers a ledger close.  Any unvalidated transaction will
     # be validated, which will trigger an error if any fail to be validated
     #
     def close_ledger
+      require_process_running
       @process.close_ledger
 
-      @unverified.each do |eb|
+      @process.unverified.each do |eb|
         begin
           envelope, after_confirmation = *eb
           result = validate_transaction envelope
           after_confirmation.call(result) if after_confirmation
+        rescue MissingTransaction
+          $stderr.puts "Failed to validate tx: #{Convert.to_hex envelope.tx.hash}"
+          $stderr.puts "could not be found in txhistory table on process #{@process.name}"
         rescue FailedTransaction
           $stderr.puts "Failed to validate tx: #{Convert.to_hex envelope.tx.hash}"
           $stderr.puts "failed result: #{result.to_xdr(:hex)}"
@@ -136,11 +175,12 @@ module StellarCoreCommander
         end
       end
 
-      @unverified.clear
+      @process.unverified.clear
     end
 
     Contract Symbol => Stellar::KeyPair
     def get_account(name)
+      require_process_running
       @named[name].tap do |found|
         unless found.is_a?(Stellar::KeyPair)
           raise ArgumentError, "#{name.inspect} is not account"
@@ -157,14 +197,46 @@ module StellarCoreCommander
       end
     end
 
+    Contract Symbol, ArrayOf[Symbol], Num, Hash => Process
+    def process(name, quorum=[name], thresh=quorum.length, options={})
+
+      if @manual_close
+        raise "Cannot use `process`, this recipe has previously declared  `use_manual_close`."
+      end
+
+      $stderr.puts "creating process #{name}"
+      p = @commander.make_process self, name, quorum, thresh, options
+      $stderr.puts "process #{name} is #{p.idname}"
+      add_named name, p
+    end
+
+    Contract Symbol, Proc => Any
+    def on(process_name)
+      require_process_running
+      tmp = @process
+      p = get_process process_name
+      $stderr.puts "executing steps on #{p.idname}"
+      @process = p
+      yield
+    ensure
+      @process = tmp
+    end
+
     Contract Stellar::KeyPair => Num
     def next_sequence(account)
+      require_process_running
       base_sequence  = @process.sequence_for(account)
-      inflight_count = @unverified.select{|e| e.first.tx.source_account == account.public_key}.length
+      inflight_count = @process.unverified.select{|e| e.first.tx.source_account == account.public_key}.length
 
       base_sequence + inflight_count + 1
     end
 
+    Contract None => Any
+    def use_manual_close()
+      $stderr.puts "using manual_close mode"
+      @manual_close = true
+    end
+
     private
     Contract Symbol, Any => Any
     def add_named(name, object)
@@ -177,11 +249,12 @@ module StellarCoreCommander
 
     Contract Stellar::TransactionEnvelope, Or[nil, Proc] => Any
     def submit_transaction(envelope, &after_confirmation)
+      require_process_running
       hex    = envelope.to_xdr(:hex)
       @process.submit_transaction hex
 
       # submit to process
-      @unverified << [envelope, after_confirmation]
+      @process.unverified << [envelope, after_confirmation]
     end
 
     Contract Stellar::TransactionEnvelope => Stellar::TransactionResult
@@ -191,7 +264,7 @@ module StellarCoreCommander
 
       base64_result = @process.transaction_result(hex_hash)
 
-      raise "couldn't find result for #{hex_hash}" if base64_result.blank?
+      raise MissingTransaction if base64_result.blank?
 
       raw_result = Convert.from_base64(base64_result)
 

data/lib/stellar_core_commander/version.rb

@@ -1,3 +1,3 @@
 module StellarCoreCommander
-  VERSION = "0.0.9"
+  VERSION = "0.0.10"
 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.10"
+  spec.add_dependency "stellar-base", "= 0.0.12"
   spec.add_dependency "slop", "~> 3.6.0"
   spec.add_dependency "faraday", "~> 0.9.1"
   spec.add_dependency "faraday_middleware", "~> 0.9.1"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stellar_core_commander
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Scott Fleckenstein
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-01 00:00:00.000000000 Z
+date: 2015-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: stellar-base
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.10
+        version: 0.0.12
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.10
+        version: 0.0.12
 - !ruby/object:Gem::Dependency
   name: slop
   requirement: !ruby/object:Gem::Requirement
@@ -179,6 +179,9 @@ files:
 - Rakefile
 - bin/scc
 - examples/allow_trust.rb
+- examples/cross_host_simple_payment.rb
+- examples/merge_account.rb
+- examples/multi_host_simple_payment.rb
 - examples/non_native_payment.rb
 - examples/pathed_payment.rb
 - examples/simple_payment.rb