stellar_core_commander 0.0.11 → 0.0.12

data/lib/stellar_core_commander/transactor.rb

@@ -21,17 +21,27 @@ module StellarCoreCommander
       @operation_builder = OperationBuilder.new(self)
       @manual_close      = false
 
-      account :master, Stellar::KeyPair.from_raw_seed("allmylifemyhearthasbeensearching")
+      network_passphrase = @commander.process_options[:network_passphrase]
+      Stellar.on_network network_passphrase do
+        account :master, Stellar::KeyPair.master
+      end
     end
 
     def require_process_running
-      if @process == nil
+      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
+      @commander.require_processes_in_sync
+    end
+
+    def shutdown(*args)
+      @process.shutdown *args
     end
 
     Contract String => Any
@@ -42,7 +52,12 @@ module StellarCoreCommander
     #
     def run_recipe(recipe_path)
       recipe_content = IO.read(recipe_path)
-      instance_eval recipe_content
+      network_passphrase = @commander.process_options[:network_passphrase]
+      Stellar.on_network network_passphrase do
+        instance_eval recipe_content, recipe_path, 1
+      end
+    rescue => e
+      crash_recipe e
     end
 
 
@@ -58,114 +73,92 @@ module StellarCoreCommander
       add_named name, keypair
     end
 
+    Contract Symbol => Any
+    # recipe_step is a helper method to define
+    # a method that follows the common procedure of executing a recipe step:
+    #
+    # 1. ensure all processes are running
+    # 2. build the envelope by forwarding to the operation builder
+    # 3. submit the envelope to the process
+    #
+    # @param name [Symbol] the method to be defined and delegated to @operation_builder
+    def self.recipe_step(name)
+      define_method name do |*args|
+        require_process_running
+        envelope = @operation_builder.send(name, *args)
+        submit_transaction envelope
+      end
+    end
+
 
     #
     # @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
       end
     end
 
-    #
     # @see StellarCoreCommander::OperationBuilder#create_account
-    def create_account(*args)
-      require_process_running
-      envelope = @operation_builder.create_account(*args)
-      submit_transaction envelope
-    end
+    recipe_step :create_account
 
-    #
     # @see StellarCoreCommander::OperationBuilder#trust
-    def trust(*args)
-      require_process_running
-      envelope = @operation_builder.trust(*args)
-      submit_transaction envelope
-    end
+    recipe_step :trust
 
-    #
     # @see StellarCoreCommander::OperationBuilder#change_trust
-    def change_trust(*args)
-      require_process_running
-      envelope = @operation_builder.change_trust(*args)
-      submit_transaction envelope
-    end
+    recipe_step :change_trust
 
-    #
     # @see StellarCoreCommander::OperationBuilder#offer
-    def offer(*args)
-      require_process_running
-      envelope = @operation_builder.offer(*args)
-      submit_transaction envelope
-    end
+    recipe_step :offer
 
-    #
     # @see StellarCoreCommander::OperationBuilder#passive_offer
-    def passive_offer(*args)
-      require_process_running
-      envelope = @operation_builder.passive_offer(*args)
-      submit_transaction envelope
-    end
+    recipe_step :passive_offer
 
-    #
-    # @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
+    # @see StellarCoreCommander::OperationBuilder#set_options
+    recipe_step :set_options
 
-    #
     # @see StellarCoreCommander::OperationBuilder#set_flags
-    def set_flags(*args)
-      require_process_running
-      envelope = @operation_builder.set_flags(*args)
-      submit_transaction envelope
-    end
+    recipe_step :set_flags
+
+    # @see StellarCoreCommander::OperationBuilder#clear_flags
+    recipe_step :clear_flags
+
+    # @see StellarCoreCommander::OperationBuilder#require_trust_auth
+    recipe_step :require_trust_auth
 
-    #
     # @see StellarCoreCommander::OperationBuilder#add_signer
-    def add_signer(*args)
-      require_process_running
-      envelope = @operation_builder.add_signer(*args)
-      submit_transaction envelope
-    end
+    recipe_step :add_signer
+
+    # @see StellarCoreCommander::OperationBuilder#set_master_signer_weight
+    recipe_step :set_master_signer_weight
+
+    # @see StellarCoreCommander::OperationBuilder#remove_signer
+    recipe_step :remove_signer
 
-    #
     # @see StellarCoreCommander::OperationBuilder#set_thresholds
-    def set_thresholds(*args)
-      require_process_running
-      envelope = @operation_builder.set_thresholds(*args)
-      submit_transaction envelope
-    end
+    recipe_step :set_thresholds
 
-    #
-    # @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#set_inflation_dest
+    recipe_step :set_inflation_dest
 
+    # @see StellarCoreCommander::OperationBuilder#set_home_domain
+    recipe_step :set_home_domain
+
+    # @see StellarCoreCommander::OperationBuilder#allow_trust
+    recipe_step :allow_trust
 
-    #
     # @see StellarCoreCommander::OperationBuilder#revoke_trust
-    def revoke_trust(*args)
-      require_process_running
-      envelope = @operation_builder.revoke_trust(*args)
-      submit_transaction envelope
-    end
+    recipe_step :revoke_trust
 
-    #
     # @see StellarCoreCommander::OperationBuilder#merge_account
-    def merge_account(*args)
-      require_process_running
-      envelope = @operation_builder.merge_account(*args)
-      submit_transaction envelope
-    end
+    recipe_step :merge_account
+
+    # @see StellarCoreCommander::OperationBuilder#inflation
+    recipe_step :inflation
 
     Contract None => Any
     #
@@ -186,7 +179,7 @@ module StellarCoreCommander
           $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)}"
+          $stderr.puts "failed result: #{result.to_xdr(:base64)}"
           exit 1
         end
       end
@@ -194,6 +187,23 @@ module StellarCoreCommander
       @process.unverified.clear
     end
 
+    Contract None => Num
+    def ledger_num
+      require_process_running
+      @process.ledger_num
+    end
+
+    Contract Num, Symbol => Any
+    def catchup(ledger, mode=:minimal)
+      require_process_running
+      @process.catchup ledger, mode
+    end
+
+    Contract None => Any
+    def crash
+      @process.crash
+    end
+
     Contract Symbol => Stellar::KeyPair
     def get_account(name)
       require_process_running
@@ -213,15 +223,45 @@ module StellarCoreCommander
       end
     end
 
-    Contract Symbol, ArrayOf[Symbol], Num, Hash => Process
-    def process(name, quorum=[name], thresh=quorum.length, options={})
+    Contract Num, Num, Or[Symbol, Num] => Any
+    def start_load_generation(accounts=10000000, txs=10000000, txrate=500)
+      $stderr.puts "starting load generation: #{accounts} accounts, #{txs} txs, #{txrate} tx/s"
+      @process.start_load_generation accounts, txs, txrate
+    end
+
+    Contract None => Bool
+    def load_generation_complete
+      @process.load_generation_complete
+    end
 
-      if @manual_close
-        raise "Cannot use `process`, this recipe has previously declared  `use_manual_close`."
+    Contract Num, Num, Or[Symbol, Num] => Any
+    def generate_load_and_await_completion(accounts, txs, txrate)
+      runs = @process.load_generation_runs
+      start_load_generation accounts, txs, txrate
+      retry_until_true retries: accounts + txs do
+        txs = @process.transactions_applied
+        r = @process.load_generation_runs
+        tps = @process.transactions_per_second
+        ops = @process.operations_per_second
+        $stderr.puts "loadgen runs: #{r}, ledger: #{ledger_num}, txs: #{txs}, actual tx/s: #{tps} op/s: #{ops}"
+        r != runs
+      end
+    end
+
+    Contract None => Hash
+    def metrics
+      @process.metrics
+    end
+
+    Contract Symbol, ArrayOf[Symbol], Hash => Process
+    def process(name, quorum=[name], options={})
+
+      if @manual_close and quorum.size != 1
+        raise "Cannot use `process` with multi-node quorum, this recipe has previously declared  `use_manual_close`."
       end
 
       $stderr.puts "creating process #{name}"
-      p = @commander.make_process self, name, quorum, thresh, options
+      p = @commander.make_process self, name, quorum, options
       $stderr.puts "process #{name} is #{p.idname}"
       add_named name, p
     end
@@ -238,6 +278,21 @@ module StellarCoreCommander
       @process = tmp
     end
 
+    def retry_until_true(**opts, &block)
+      retries = opts[:retries] || 20
+      timeout = opts[:timeout] || 3
+      while retries > 0
+        b = begin yield block end
+        if b
+          return b
+        end
+        retries -= 1
+        $stderr.puts "sleeping #{timeout} secs, #{retries} retries left"
+        sleep timeout
+      end
+      raise "Ran out of retries while waiting for success"
+    end
+
     Contract Stellar::KeyPair => Num
     def next_sequence(account)
       require_process_running
@@ -247,12 +302,81 @@ module StellarCoreCommander
       base_sequence + inflight_count + 1
     end
 
+    Contract Or[Symbol, Stellar::KeyPair] => Bool
+    def account_created(account)
+      require_process_running
+      if account.is_a?(Symbol)
+        account = get_account(account)
+      end
+      begin
+        @process.account_row(account)
+        return true
+      rescue
+        return false
+      end
+    end
+
+    Contract Or[Symbol, Stellar::KeyPair] => Num
+    def balance(account)
+      require_process_running
+      if account.is_a?(Symbol)
+        account = get_account(account)
+      end
+      raise "no process!" unless @process
+      @process.balance_for(account)
+    end
+
     Contract None => Any
     def use_manual_close()
       $stderr.puts "using manual_close mode"
       @manual_close = true
     end
 
+    Contract None => Bool
+    def check_no_error_metrics
+      @commander.check_no_process_error_metrics
+    end
+
+    Contract ArrayOf[Or[Symbol, Process]] => Bool
+    def check_equal_ledger_objects(processes)
+      raise "no process!" unless @process
+      for p in processes
+        if p.is_a?(Symbol)
+          p = get_process(p)
+        end
+        @process.check_equal_ledger_objects(p)
+      end
+      true
+    end
+
+    Contract Or[Symbol, Process] => Any
+    def check_ledger_sequence_is_prefix_of(other)
+      raise "no process!" unless @process
+      if other.is_a?(Symbol)
+        other = get_process(other)
+      end
+      @process.check_ledger_sequence_is_prefix_of(other)
+    end
+
+    Contract None => Bool
+    def check_database_against_ledger_buckets
+      runs = @process.checkdb_runs
+      @process.start_checkdb
+      retry_until_true do
+        r = @process.checkdb_runs
+        $stderr.puts "checkdb runs: #{r}, checked: #{@process.objects_checked}"
+        r != runs
+      end
+    end
+
+    Contract Or[Symbol, Process] => Any
+    def check_integrity_against(other)
+      check_no_error_metrics
+      check_database_against_ledger_buckets
+      check_equal_ledger_objects [other]
+      check_ledger_sequence_is_prefix_of other
+    end
+
     private
     Contract Symbol, Any => Any
     def add_named(name, object)
@@ -266,8 +390,8 @@ 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
+      b64    = envelope.to_xdr(:base64)
+      @process.submit_transaction b64
 
       # submit to process
       @process.unverified << [envelope, after_confirmation]
@@ -295,5 +419,18 @@ module StellarCoreCommander
       result
     end
 
+    Contract Exception => Any
+    def crash_recipe(e)
+      puts
+      puts "Error! (#{e.class.name}): #{e.message}"
+      puts
+      puts e.backtrace.
+        reject{|l| l =~ %r{gems/contracts-.+?/} }. # filter contract frames
+        join("\n")
+      puts
+
+      exit 1
+    end
+
   end
 end

data/lib/stellar_core_commander/version.rb

@@ -1,3 +1,3 @@
 module StellarCoreCommander
-  VERSION = "0.0.11"
+  VERSION = "0.0.12"
 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.13"
+  spec.add_dependency "stellar-base", ">= 0.6.1"
   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.11
+  version: 0.0.12
 platform: ruby
 authors:
 - Scott Fleckenstein
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-08 00:00:00.000000000 Z
+date: 2015-09-29 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.13
+        version: 0.6.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.13
+        version: 0.6.1
 - !ruby/object:Gem::Dependency
   name: slop
   requirement: !ruby/object:Gem::Requirement
@@ -173,6 +173,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- CONTRIBUTING.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -180,13 +181,20 @@ files:
 - bin/scc
 - examples/allow_trust.rb
 - examples/cross_host_simple_payment.rb
+- examples/history_generate_and_catchup.rb
+- examples/history_testnet_catchup.rb
+- examples/inflation.rb
+- examples/load_generation.rb
+- examples/load_generation_auto.rb
 - examples/merge_account.rb
 - examples/multi_host_simple_payment.rb
 - examples/non_native_payment.rb
 - examples/passive_offer.rb
 - examples/pathed_payment.rb
+- examples/set_options.rb
 - examples/simple_payment.rb
 - examples/trade.rb
+- examples/version_mix_consensus.rb
 - lib/stellar_core_commander.rb
 - lib/stellar_core_commander/commander.rb
 - lib/stellar_core_commander/convert.rb