bitcoin-ruby 0.0.1 → 0.0.2

data/.gitignore

@@ -5,8 +5,11 @@ pkg/*
 *.swp
 .rvmrc
 *.DS_Store
-db/database.yml
 tmp/
 log/
 rdoc/
 coverage/
+*.yml
+*.conf
+*.db
+.rbx/

data/Gemfile

@@ -2,3 +2,24 @@ source "http://rubygems.org"
 
 # Specify your gem's dependencies in bitcoin-ruby.gemspec
 gemspec
+
+group :test do 
+  gem 'sqlite3', :platforms => :ruby
+
+  gem 'bacon', '>= 1.2.0'
+  gem 'simplecov', :require => false
+
+  gem 'rake', '>= 0.8.0'
+end
+
+group :development do
+  gem 'eventmachine'
+  gem 'ffi'
+  gem 'log4r'
+  gem 'sequel'
+
+  gem 'sqlite3', :platforms => :ruby, :require => false
+  gem 'pg', :platforms => :ruby, :require => false
+
+  gem "rake", ">= 0.8.0"
+end

data/README.rdoc

@@ -4,24 +4,31 @@ This is a ruby library for interacting with the bitcoin protocol/network.
 
 Some of the main features are:
 
-* bitcoin utility functions for base58, ECC, etc. (Bitcoin::Util)
-* parse/create (almost?) all protocol messages (Bitcoin::Protocol)
-* connect to peers and exchange messages (Bitcoin::Network::Node, NODE)
-* load the blockchain from the network and stay in sync (WITHOUT verification yet!)
-* store and the blockchain and query for txouts (Bitcoin::Storage)
-* script implementation, create/run scripts and verify signatures (Bitcoin::Script)
-* create transactions (and even blocks!) (Bitcoin::Protocol, Bitcoin::Builder)
-* manage keys (Bitcoin::Key) in a wallet (Bitcoin::Wallet, WALLET)
-* there is even a highly experimental(!) Bitcoin::Gui
+* Bitcoin::Util provides the basic bitcoin utility functions for base58, ECC, etc.
+* Bitcoin::Protocol can parse/create (almost?) all protocol messages
+* Bitcoin::Network::Node connects to peers, fetches the blockchain and keeps it up to date
+  (see NODE for usage)
+* Bitcoin::Validation validates block and transaction rules
+* Bitcoin::Storage stores the blockchain and can be queried for transaction data
+* Bitcoin::Script implementation, create/run scripts and verify signatures
+* Bitcoin::Key provides a high-level API for creating and handling keys/addresses
+* Bitcoin::Builder provides a high-level API for creating transactions (and blocks)
+* Bitcoin::Wallet is a draft implementation of a simple wallet
+* Bitcoin::Namecoin implements all the namecoin-specific differences (see NAMECOIN)
+
+== Compatible with...
+
+* ruby 1.9.3
+* ruby 2.0.0
 
 == Installation
 
-We assume you already have a ruby 1.9 compatible interpreter and rubygems environment.
+We assume you already have a ruby 1.9 or 2.0 compatible interpreter and rubygems environment.
 
  git clone https://github.com/lian/bitcoin-ruby.git; cd bitcoin-ruby
  ruby -Ilib bin/bitcoin_node
 
-if you want to install it system-wide, just build the gem and install it
+if you want to have it available system-wide, just build the gem and install it:
 
  gem build bitcoin-ruby.gemspec && gem install bitcoin-ruby-0.0.1.gem
 
@@ -40,22 +47,21 @@ intentionally kept to a minimum, so nobody has to install unneeded dependencies.
 
 == Client
 
-There is a NODE which connects to the network and downloads
-the blockchain into a database. see Bitcoin::Network::Node.
-
-It also opens an extra socket for clients to connect where they can call certain
-methods, ask for information or register callbacks for events.
-see Bitcoin::Network::CommandClient.
+There is a node which connects to the network and downloads
+the blockchain into a database. see NODE, Bitcoin::Network::Node.
 
+It also opens an extra socket where local clients can query statistics,
+monitor blockchain data, and relay there transactions to the network.
+see NODE, Bitcoin::Network::CommandHandler, Bitcoin::Network::CommandClient.
 
 There is a WALLET implementation to manage a set of keys, list balances and create
-transactions. see Bitcoin::Wallet
+transactions. see WALLET, Bitcoin::Wallet.
 
 
 == Library Usage
 
 There are different aspects to the library which can be used separately or in combination.
-Here are some Ideas of what you could do. There are also some scripts which you can run,
+Here are some ideas of what you could do. There are also some demo scripts in examples/,
 see EXAMPLES.
 
 
@@ -86,7 +92,7 @@ Parse a Bitcoin::Protocol::Block
  blk.tx.count #=> 1
  blk.to_hash #=> ...
  Bitcoin::Protocol::Block.from_json( blk.to_json )
- 
+
 Parse a Bitcoin::Protocol::Tx
 
  raw_tx = File.open('spec/bitcoin/fixtures/rawtx-01.bin', 'rb') {|f| f.read}
@@ -96,7 +102,7 @@ Parse a Bitcoin::Protocol::Tx
  tx.out.size #=> 2
  tx.to_hash #=> ...
  Bitcoin::Protocol::Tx.from_json( tx.to_json )
- 
+
  Bitcoin::Script.new(tx.out[0].pk_script).to_string
  #=> "OP_DUP OP_HASH160 b2e21c1db922e3bdc529de7b38b4c401399e9afd OP_EQUALVERIFY OP_CHECKSIG"
 
@@ -120,7 +126,7 @@ If you want to control the Bitcoin::Script yourself, you can do so
  txin = tx1.in.first
  txout = tx2.out[txin.prev_out_index]
  script = Bitcoin::Script.new(txin.script_sig + txout.pk_script)
- 
+
  result = script.run do |pubkey, sig, hash_type|
    hash = tx1.signature_hash_for_input(0, nil, txout.pk_script)
    Bitcoin.verify_signature(hash, sig, pubkey.unpack("H*")[0])
@@ -129,7 +135,56 @@ If you want to control the Bitcoin::Script yourself, you can do so
 
 === Create Transactions
 
-TODO
+You need to know the previous output you want to spend (tx hash and output index),
+as well as the private key for the address required to sign for it.
+
+ # use testnet so you don't acidentially your whole money!
+ Bitcoin.network = :testnet3
+ 
+ # make the DSL methods available in your scope
+ include Bitcoin::Builder
+ 
+ # the previous transaction that has an output to your address
+ prev_hash = "6c44b284c20fa22bd69c57a9dbff91fb71deddc8c54fb2f5aa41fc78c96c1ad1"
+ 
+ # the number of the output you want to use
+ prev_out_index = 0
+ 
+ # fetch the tx from whereever you like and parse it
+ prev_tx = Bitcoin::P::Tx.from_json(open("http://test.webbtc.com/tx/#{prev_hash}.json"))
+ 
+ # the key needed to sign an input that spends the previous output
+ key = Bitcoin::Key.from_base58("92ZRu28m2GHSKaaF2W7RswJ2iJYpTzVhBaN6ZLs7TENCs4b7ML8")
+ 
+ # create a new transaction (and sign the inputs)
+ new_tx = build_tx do |t|
+ 
+   # add the input you picked out earlier
+   t.input do |i|
+     i.prev_out prev_tx
+     i.prev_out_index prev_out_index
+     i.signature_key key
+   end
+ 
+   # add an output that sends some bitcoins to another address
+   t.output do |o|
+     o.value 50000000 # 0.5 BTC in satoshis
+     o.script {|s| s.recipient "mugwYJ1sKyr8EDDgXtoh8sdDQuNWKYNf88" }
+   end
+ 
+   # add another output spending the remaining amount back to yourself
+   # if you want to pay a tx fee, reduce the value of this output accordingly
+   # if you want to keep your financial history private, use a different address
+   t.output do |o|
+     o.value 49000000 # 0.49 BTC, leave 0.01 BTC as fee
+     o.script {|s| s.recipient key.addr }
+   end
+ 
+ end
+ 
+ # examine your transaction. you can relay it through http://webbtc.com/relay_tx
+ # that will also give you a hint on the error if something goes wrong
+ puts new_tx.to_json
 
 === Node / Network connections
 
@@ -148,7 +203,7 @@ lib/bitcoin/network/node.rb for examples.
 
 === Storage / Database backends
 
-There is support for multiple database backends, but currently the only stable one is 
+There is support for multiple database backends, but currently the only stable one is
 the Bitcoin::Storage::Backends::SequelStore backend. All backends implement the interface
 defined in Bitcoin::Storage::Backends::StoreBase and return Bitcoin::Storage::Models.
 
@@ -159,7 +214,7 @@ defined in Bitcoin::Storage::Backends::StoreBase and return Bitcoin::Storage::Mo
  txouts.first.type #=> :pubkey
  txouts.first.get_address #=> "15yN7NPEpu82sHhB6TzCW5z5aXoamiKeGy"
 
-See Bitcoin::Storage::Backends::StoreBase, Bitcoin::Storage::Backends::SequelStore 
+See Bitcoin::Storage::Backends::StoreBase, Bitcoin::Storage::Backends::SequelStore
 and Bitcoin::Storage::Models for details.
 
 == Documentation
@@ -186,4 +241,9 @@ If you make changes to the code or add functionality, please also add specs.
 
 == Development
 
+Any help or feedback is greatly appreciated! From getting knee-deep into elliptic-curve acrobatics,
+to cleaning up high-level naming conventions, there is something for everyone to do.
+Even if you are completely lost, just pointing out what is unclear helps a lot!
+
 If you are curious or like to participate in development, drop by \#bitcoin-ruby on irc.freenode.net!
+

data/Rakefile

@@ -8,6 +8,10 @@ PROJECT_SPECS = ( FileList['spec/bitcoin/bitcoin_spec.rb'] +
                   FileList['spec/bitcoin/protocol/*_spec.rb'] +
                   FileList['spec/bitcoin/script/*_spec.rb'] +
                   FileList['spec/bitcoin/wallet/*_spec.rb'] +
+                  ['spec/bitcoin/storage/storage_spec.rb',
+                   'spec/bitcoin/storage/reorg_spec.rb',
+                   'spec/bitcoin/storage/validation_spec.rb'] +
+                  FileList['spec/bitcoin/node/*_spec.rb'] +
                   FileList['spec/bitcoin/*_spec.rb'] ).uniq
 
 RUBY = 'ruby' unless defined?(RUBY)
@@ -88,10 +92,9 @@ end
 desc 'Generate RDoc documentation'
 task :rdoc do
   `rm -rf rdoc`
-  system("rdoc -o rdoc -m README.rdoc examples/ doc/ lib/ README.rdoc COPYING")
+  system("rdoc -a -A -H -t 'bitcoin-ruby RDoc' -W 'http://github.com/mhanne/bitcoin-ruby/tree/master/%s' -o rdoc -m README.rdoc examples/ doc/ lib/ README.rdoc COPYING")
 end
 
-
 desc 'Generate test coverage report'
 task :coverage do
   begin
@@ -100,5 +103,6 @@ task :coverage do
     puts "Simplecov not found. Run `gem install simplecov` to install it."
     exit
   end
-  system "bacon #{PROJECT_SPECS.join(' ')}"
+  sh "bacon", *PROJECT_SPECS
+  system('open coverage/index.html') if RUBY_PLATFORM.include? 'darwin'
 end

data/bin/bitcoin_node

@@ -3,38 +3,11 @@ $:.unshift( File.expand_path("../../lib", __FILE__) )
 
 require 'bitcoin'
 require 'optparse'
+require 'fileutils'
 Bitcoin.require_dependency :eventmachine
 Bitcoin.require_dependency :json
 
-defaults = {
-  :network => "bitcoin",
-  :command => "127.0.0.1:9999",
-  :listen => "0.0.0.0:8332",
-  :connect => "",
-  :storage => "sequel::sqlite://bitcoin.db",
-  :headers_only => false,
-  :dns => true,
-  :epoll => false,
-  :epoll_limit => 10000,
-  :epoll_user => nil,
-  :log => {
-    :network => :info,
-    :storage => :info,
-  },
-  :max => {
-    :connections => 32,
-    :addr => 1024,
-    :queue => 500,
-    :inv => 500,
-  },
-  :intervals => {
-    :queue => 5,
-    :inv_queue => 5,
-    :addrs => 15,
-    :connect => 30,
-  },
-  :daemon => false,
-}
+defaults = Bitcoin::Network::Node::DEFAULT_CONFIG
 
 options = Bitcoin::Config.load(defaults, :blockchain)
 
@@ -54,18 +27,20 @@ optparse = OptionParser.new do |opts|
   end
 
   opts.on("--command [HOST:PORT]",
-    "Command socket (default: #{options[:command]})") do |command|
-    options[:command] = command
+          "Command socket (default: #{options[:command].join(':')})") do |command|
+    options[:command] = command.split(":")
   end
 
   opts.on("-l", "--listen [HOST:PORT]",
-    "Listen address/port (default: #{options[:listen]})") do |listen|
-    options[:listen] = listen
+    "Listen address/port (default: #{options[:listen].join(':')})") do |listen|
+    options[:listen] = listen.split(":")
   end
 
-  opts.on("--connect [HOST:PORT[,HOST:PORT[...]]]",
-    "Hosts to connect to (default: #{options[:connect]})") do |connect|
-    options[:connect] = connect
+  opts.on("--connect [HOST:PORT]",
+    "Hosts to connect to (default: #{options[:connect].map{|c|c.join(':')}.join(',')})") do |connect|
+    connect.split(",").each do |host|
+      options[:connect] << host.split(":")
+    end
   end
 
   opts.on("-s", "--storage [BACKEND::CONFIG]",
@@ -73,6 +48,15 @@ optparse = OptionParser.new do |opts|
     options[:storage] = storage
   end
 
+  opts.on("--skip-validation", "Skip validation of blocks and transactions") do
+    options[:skip_validation] = true
+  end
+
+  opts.on("--check-blocks COUNT",
+          "Check consistency of COUNT latest blocks; -1 for all (default: 1000)") do |check|
+    options[:check_blocks] = check.to_i
+  end
+
   opts.on("--ho", "--headers-only",
     "Download only block headers") do
     options[:headers_only] = true
@@ -100,7 +84,15 @@ optparse = OptionParser.new do |opts|
     options[:epoll_user] = user
   end
 
-  [:connections, :addr, :queue, :inv].each do |name|
+  opts.on("--mco", "--max-connections-out COUNT", "Maximum number of outgoing connections (default: #{options[:max][:connections_out]})") do |count|
+    options[:max][:connections_out] = count.to_i
+  end
+
+  opts.on("--mci", "--max-connections-in COUNT", "Maximum number of incoming connections (default: #{options[:max][:connections_in]})") do |count|
+    options[:max][:connections_in] = count.to_i
+  end
+
+  [:addr, :queue, :inv, :unconfirmed].each do |name|
     opts.on("--m#{name.to_s[0]}", "--max-#{name} [COUNT]",
       "Max #{name} (default: #{options[:max][name]})") do |count|
       options[:max][name] = count.to_i
@@ -121,6 +113,10 @@ optparse = OptionParser.new do |opts|
     end
   end
 
+  opts.on("--import DIR", "Import blk*.dat files from DIR") do |dir|
+    options[:import] = dir
+  end
+
   opts.on("-v", "--verbose", "Set all loggers to debug") do
     options[:log].each_key {|k| options[:log][k] = :debug }
   end
@@ -137,9 +133,7 @@ end
 optparse.parse!
 
 Bitcoin.network = options[:network]
-options[:command] = options[:command] == "" ? nil : options[:command].split(':')
-options[:listen] = options[:listen] == "" ? nil : options[:listen].split(':')
-options[:connect] = options[:connect] == "" ? [] : options[:connect].split(',').map{|h| h.split(':')}
+FileUtils.mkdir_p File.join(ENV['HOME'], ".bitcoin-ruby/#{Bitcoin.network_name}")
 
 if ARGV.any?
   EM.run do
@@ -153,8 +147,11 @@ if ARGV.any?
       on_block do |block, depth|
         puts "block: #{block['hash']} (#{depth})"
       end
-      on_tx do |tx|
-        puts "tx: #{tx['hash']}"
+      on_tx do |tx, confirmations|
+        puts "tx(#{confirmations}): #{tx['hash']}"
+      end
+      on_output do |tx_hash, address, value, confirmations|
+        puts "output(#{confirmations}): tx #{tx_hash[0..8]}: #{address} received #{value.to_f / 1e8} BTC"
       end
       on_connection do |type, host|
         if type == "connected"

data/bin/bitcoin_shell

@@ -1,3 +1,4 @@
+#!/usr/bin/env ruby
 $:.unshift( File.expand_path("../../lib", __FILE__) )
 require 'bitcoin'
 

data/bin/bitcoin_wallet

@@ -8,8 +8,8 @@ require 'yaml'
 
 defaults = {
   :network => "testnet",
-  :storage => "dummy",
-  :keystore => "simple::file=#{ENV['HOME']}/.bitcoin-ruby/keys.json",
+  :storage => nil,
+  :keystore => nil,
   :command => "127.0.0.1:9999"
 }
 options = Bitcoin::Config.load(defaults, :wallet)
@@ -55,7 +55,13 @@ optparse = OptionParser.new do |opts|
     " send <addr>:<amount>[,<addr>:<amount>...] [<fee>] - send transaction\n" +
     " new - generate new key and add to keystore\n" +
     " import <base58> - import key in base58 format\n" +
-    " export <addr> - export key to base58 format\n"
+    " export <addr> - export key to base58 format\n" +
+    " name_list - list names in the wallet\n" +
+    " name_show <name> - display name information\n" +
+    " name_history <name> - display name history\n" +
+    " name_new <name> - reserve a name\n" +
+    " name_firstupdate <name> <rand> <value> - register a name\n" +
+    " name_update <name> <value> [<toaddress>] - update/transfer a name\n"
 
 end
 
@@ -67,6 +73,8 @@ unless cmd
 end
 
 Bitcoin.network = options[:network]
+
+options[:keystore] ||= "simple::file=~/.bitcoin-ruby/#{Bitcoin.network_name}/keys.json"
 backend, config = options[:keystore].split("::")
 config = Hash[config.split(",").map{|c| c.split("=")}]
 keystore = Bitcoin::Wallet.const_get("#{backend.capitalize}KeyStore").new(config)
@@ -74,13 +82,13 @@ if backend == "deterministic" && !config["nonce"]
   puts "nonce: #{keystore.generator.nonce}"
 end
 #puts *keystore.get_keys.map(&:addr)
+
+options[:storage] ||= "sequel::sqlite://~/.bitcoin-ruby/#{Bitcoin.network_name}/blocks.db"
 backend, config = options[:storage].split("::")
 storage = Bitcoin::Storage.send(backend, :db => config)
 
-
 wallet = Bitcoin::Wallet::Wallet.new(storage, keystore, Bitcoin::Wallet::SimpleCoinSelector)
 
-
 def str_val(val, pre='')
   ("#{pre}%.8f" % (val / 1e8)).rjust(15)
 end
@@ -89,6 +97,66 @@ def val_str(str)
   (str.to_f * 1e8).to_i
 end
 
+def send_transaction(storage, options, tx, ask = true)
+  # puts tx.to_json
+  if ask
+    total = 0
+    puts "Hash: #{tx.hash}"
+    puts "inputs:"
+    tx.in.each do |txin|
+      prev_out = storage.get_txout_for_txin(txin)
+      total += prev_out.value
+      puts " #{prev_out.get_address} - #{str_val prev_out.value}"
+    end
+
+    puts "outputs:"
+    tx.out.each do |txout|
+      total -= txout.value
+      script = Bitcoin::Script.new(txout.pk_script)
+      print "#{str_val txout.value} "
+      if script.is_pubkey?
+        puts "#{script.get_pubkey} (pubkey)"
+      elsif script.is_hash160?
+        puts "#{script.get_address} (address)"
+      elsif script.is_multisig?
+        puts "#{script.get_addresses.join(' ')} (multisig)"
+      elsif script.is_namecoin?
+        puts "#{script.get_address} (#{script.type})"
+        print " " * 16
+        if script.is_name_new?
+          puts "Name Hash: #{script.get_namecoin_hash}"
+        else
+          puts "#{script.get_namecoin_name}: #{script.get_namecoin_value}"
+        end
+      else
+        puts "#{str_val txout.value} (unknown type)"
+      end
+    end
+    puts "Fee: #{str_val total}"
+
+    $stdout.sync = true
+    print "Really send transaction? (y/N) " and $stdout.flush
+    unless $stdin.gets.chomp.downcase == 'y'
+      puts "Aborted."; exit
+    end
+  end
+  EM.run do
+    Bitcoin::Network::CommandClient.connect(*options[:command].split(":")) do
+      on_connected do
+        request(:relay_tx, tx.to_payload.hth)
+      end
+      on_relay_tx do |res|
+        if res["success"]
+          puts "Transaction #{tx.hash} relayed to approx. #{"%.2f" % res['propagation']['percent']}% of the network."
+        else
+          puts "Error relaying tx: #{res['error']}"
+        end
+        EM.stop
+      end
+    end
+  end
+end
+
 case cmd
 when "balance"
   if cmdopts && cmdopts.size == 1
@@ -135,15 +203,17 @@ when "key"
   puts "Privkey: #{key[:key].priv}"  if ARGV[1] == '-p'
   puts "Mine:    #{key[:mine]}"
 
-  
 when "import"
   if wallet.keystore.respond_to?(:import)
-    addr = wallet.keystore.import(cmdopts[0])
+    addr = wallet.import_key(cmdopts[0])
     puts "Key for #{addr} imported."
   else
     puts "Keystore doesn't support importing."
   end
 
+when "rescan"
+  wallet.rescan
+
 when "export"
   base58 = wallet.keystore.export(cmdopts[0])
   puts "Base58 encoded private key for #{cmdopts[0]}:"
@@ -176,7 +246,12 @@ when "list"
         puts "#{tx.hash} | #{str_val txout.value, '- '} | " +
           "#{str_val total} | #{blocks}"
         txin.get_tx.out.each do |out|
-          puts "  -> #{out.get_addresses.join(', ')}"
+          if Bitcoin.namecoin? && out.type.to_s =~ /^name_/
+            script = out.script
+            puts "  -> #{script.get_namecoin_name || script.get_namecoin_hash} (#{out.type})"
+          else
+            puts "  -> #{out.get_addresses.join(', ') rescue 'unknown'}"
+          end
         end
         puts
       end
@@ -193,6 +268,48 @@ when "list"
     puts "Total balance: #{str_val wallet.get_balance}"
   end
 
+when "name_list"
+  names = wallet.get_txouts.select {|o| [:name_firstupdate, :name_update].include?(o.type)}
+    .map(&:get_namecoin_name).group_by(&:name).map {|n, l| l.sort_by(&:expires_in).last }.map {|name|
+    { name: name.name, value: name.value, address: name.get_address, expires_in: name.expires_in } }
+  puts JSON.pretty_generate(names)
+
+when "name_show"
+  name = storage.name_show(cmdopts[0])
+  puts name.to_json
+
+when "name_history"
+  names = storage.name_history(cmdopts[0])
+  puts JSON.pretty_generate(names)
+
+when "name_new"
+  name = cmdopts[0]
+  address = wallet.keystore.keys.sample[:key].addr
+  @rand = nil
+  def self.set_rand rand
+    @rand = rand
+  end
+  tx = wallet.new_tx([[:name_new, self, name, address, 1000000]])
+  (puts "Error creating tx."; exit)  unless tx
+  send_transaction(storage, options, tx, true)
+  puts JSON.pretty_generate([tx.hash, @rand])
+
+when "name_firstupdate"
+  name, rand, value = *cmdopts
+  address = wallet.keystore.keys.sample[:key].addr
+  tx = wallet.new_tx([[:name_firstupdate, name, rand, value, address, 1000000]])
+  (puts "Error creating tx."; exit)  unless tx
+  send_transaction(storage, options, tx, true)
+  puts tx.hash
+
+when "name_update"
+  name, value, address = *cmdopts
+  address ||= wallet.keystore.keys.sample[:key].addr
+  tx = wallet.new_tx([[:name_update, name, value, address, 1000000]])
+  (puts "Error creating tx."; exit)  unless tx
+  send_transaction(storage, options, tx, true)
+  puts tx.hash
+
 when "send"
   to = cmdopts[0].split(',').map do |pair|
     type, *addrs, value = pair.split(":")
@@ -217,51 +334,10 @@ when "send"
     File.open(filename, "w") {|f| f.write(tx.serialize) }
     exit
   end
-  
-  unless tx
-    puts "Error creating tx."; exit
-  end
 
-  total = 0
-  puts "Hash: #{tx.hash}"
-  puts "inputs:"
-  tx.in.each do |txin|
-    prev_out = storage.get_txout_for_txin(txin)
-    total += prev_out.value
-    puts " #{prev_out.get_address} - #{str_val prev_out.value}"
-  end
-
-  puts "outputs:"
-  tx.out.each do |txout|
-    total -= txout.value
-    script = Bitcoin::Script.new(txout.pk_script)
-    if script.is_pubkey?
-      puts "#{str_val txout.value} #{script.get_pubkey} (pubkey)"
-    elsif script.is_hash160?
-      puts "#{str_val txout.value} #{script.get_address} (address)"
-    elsif script.is_multisig?
-      puts "#{str_val txout.value} #{script.get_addresses.join(' ')} (multisig)"
-    end
-  end
-  puts "Fee: #{str_val total}"
-
-  $stdout.sync = true
-  print "Really send transaction? (y/N) " and $stdout.flush
-  unless $stdin.gets.chomp.downcase == 'y'
-    puts "Aborted."; exit
-  end
+  (puts "Error creating tx."; exit)  unless tx
 
-  EM.run do
-    Bitcoin::Network::CommandClient.connect(*options[:command].split(":")) do
-      on_connected do
-        request(:relay_tx, tx)
-      end
-      on_relay_tx do
-        puts "Transaction #{tx.hash} relayed"
-        EM.stop
-      end
-    end
-  end
+  send_transaction(storage, options, tx)
 
 when "sign"
   txt = File.read(ARGV[0])
@@ -294,8 +370,8 @@ when "relay"
   end
   tx.in.each_with_index do |txin, i|
     p txdp.tx.map(&:hash)
-    prev_tx = storage.get_tx(txin.prev_out.reverse.unpack("H*")[0])
-    raise "prev tx #{txin.prev_out.reverse.unpack("H*")[0]} not found"  unless prev_tx
+    prev_tx = storage.get_tx(txin.prev_out.reverse_hth)
+    raise "prev tx #{txin.prev_out.reverse_hth} not found"  unless prev_tx
     raise "signature error"  unless tx.verify_input_signature(i, prev_tx)
   end