counterparty_ruby 0.9.0 → 1.1.0

data/Gemfile.lock

@@ -1,24 +1,31 @@
 PATH
   remote: .
   specs:
-    counterparty_ruby (0.9.0)
+    counterparty_ruby (1.1.0)
       bitcoin-ruby
       ffi
-      rest_client
+      rest-client
 
 GEM
   remote: https://rubygems.org/
   specs:
     bitcoin-ruby (0.0.6)
     diff-lcs (1.2.5)
-    ffi (1.9.6)
+    domain_name (0.5.23)
+      unf (>= 0.0.5, < 1.0.0)
+    ffi (1.9.8)
+    http-cookie (1.0.2)
+      domain_name (~> 0.5)
     json (1.8.1)
-    netrc (0.7.9)
+    mime-types (2.4.3)
+    netrc (0.10.3)
     rake (10.3.2)
     rdoc (4.2.0)
       json (~> 1.4)
-    rest_client (1.8.2)
-      netrc (~> 0.7.7)
+    rest-client (1.8.0)
+      http-cookie (>= 1.0.2, < 2.0)
+      mime-types (>= 1.16, < 3.0)
+      netrc (~> 0.7)
     rspec (3.1.0)
       rspec-core (~> 3.1.0)
       rspec-expectations (~> 3.1.0)
@@ -34,6 +41,9 @@ GEM
     rspec-mocks (3.1.3)
       rspec-support (~> 3.1.0)
     rspec-support (3.1.2)
+    unf (0.1.4)
+      unf_ext
+    unf_ext (0.0.6)
 
 PLATFORMS
   ruby

data/README.md

@@ -1,4 +1,4 @@
-counterparty_ruby
+counterparty_ruby [![Gem Version](https://badge.fury.io/rb/counterparty_ruby.svg)](http://badge.fury.io/rb/counterparty_ruby)
 =================
 A ruby gem for communicating with a Counterparty (Bitcoin / XCP) API server.
 
@@ -25,10 +25,22 @@ setting everything up.
 
 ![Party On Wayne](http://data.whicdn.com/images/24796384/tumblr_m0ng6rBeWT1qhd0xso1_500_large.jpg)
 
+## Changelog
+_Version 1.1_
+  * Minor Updates to support changes in counterpartyd 1.1
+  * Removed support for relaying transactions through counterparty
+  * Implemented bitcoin-ruby based transaction signing
+  * Added a blockr.io library for relaying signed transactions via http
+  * save() syntax now requires that a private key be provided to persist transactions
+  * Default test and production counterparty servers were changed to the vennd.io public servers
+
+_Version 0.9_
+  * First release! 
+
 ## Examples
 Documentation on the objects is available via:
   * [counterparty_ruby's rubydoc](http://www.rubydoc.info/github/brighton36/counterparty_ruby/master), 
-  * [The Counterparty official API guide](https://github.com/CounterpartyXCP/counterpartyd/blob/master/docs/API.rst#read-api-function-reference).
+  * [The Counterparty official API guide](http://counterparty.io/docs/api/).
 
 #### Find the first burn
 Here we retrieve burns from the blockchain using ActiveRecord style method calls.
@@ -78,7 +90,7 @@ Here we create an asset and persist that asset intothe blockchain using ActiveRe
     divisible: false,
     quantity: 100 )
 
-  transaction_id = first_asset.save!                                          
+  transaction_id = first_asset.save!('private-key-here')
 
   puts "Transaction %s has been entered into the mempool" % transaction_id
   ```
@@ -125,7 +137,64 @@ an outcome to the network.
 
   puts "Gold was broadcast down in transaction  %s" % tx_id
   ```
+#### Broadcast a Feed, Place Bets, Resolve the Bet
+In this example, we declare a bet that open, and have two people bet each other
+on the outcome. The bet is then resolved.
+
+
+  ```ruby
+  require 'counterparty_ruby'
+  require 'active_support/time'
+  require "active_support/core_ext/numeric/time"
+
+  TEAM_BLUE_WINS = 1
+  TEAM_RED_WINS = 2
+
+  ALICE_ADDRESS = 'n4m2u8GwmFB8VDE1szCTkX5ikEEQLiR2Kj'
+  JOHN_ADDRESS = 'mu23MfDNhYmQkJF36aJZ783dLDMrqUi9Fa'
+
+  ORACLE_ADDRESS = 'msCXwsPVbv1Q1pc5AjXd5TdVwy3a1fSYB2'
+
+  Counterparty.test!
+
+  broadcast_text = "Winner of game, %s. %s=red %s=blue" % [
+    Time.now.strftime("%I%p %Z %b%-d"), TEAM_RED_WINS, TEAM_BLUE_WINS]
+
+  # Announce the availability of a Bet:
+  # NOTE: All times are in UTC
+  tx_init = Counterparty::Broadcast.new( source: ORACLE_ADDRESS, 
+    value: Counterparty::Broadcast::OPEN_BROADCAST, timestamp: Time.now.to_i,
+    text: broadcast_text, fee_fraction: 0.00, allow_unconfirmed_inputs: true ).save!('private-key-here')
+
+  # Alice Bets on Blue:
+  tx_bet_on_blue = Counterparty::Bet.new(source: ALICE_ADDRESS, 
+    feed_address: ORACLE_ADDRESS, bet_type: Counterparty::Bet::EQUAL, 
+    deadline: 10.minutes.from_now.to_i, wager_quantity: 5, 
+    counterwager_quantity: 1, expiration: 5, 
+    target_value: TEAM_BLUE_WINS, leverage: Counterparty::Bet::LEVERAGE_BASIS,
+    allow_unconfirmed_inputs: true ).save!('private-key-here')
+
+  puts "Alice on Blue: %s" % tx_bet_on_blue
 
+  # John Bets on Red:
+  tx_bet_on_red = Counterparty::Bet.new(source: JOHN_ADDRESS, 
+    feed_address: ORACLE_ADDRESS, bet_type: Counterparty::Bet::EQUAL, 
+    deadline: 10.minutes.from_now.to_i, wager_quantity: 5, 
+    counterwager_quantity: 1, expiration: 5,
+    target_value: TEAM_RED_WINS, leverage: Counterparty::Bet::LEVERAGE_BASIS,
+    allow_unconfirmed_inputs: true ).save!('private-key-here')
+
+  puts "John on Red: %s" % tx_bet_on_red
+
+  # Close the broadcast : Team Blue wins!
+  tx_outcome = Counterparty::Broadcast.new( source: ORACLE_ADDRESS, 
+    value: TEAM_BLUE_WINS, timestamp: 20.minutes.from_now.to_i, 
+    fee_fraction: 0.00,
+    text: broadcast_text, allow_unconfirmed_inputs: true ).save!('private-key-here')
+
+  puts "Oracle says: %s" % tx_outcome
+
+  ```
 #### Compile, Publish and Execute a Serpent Contract
 This is still beta behavior, and only supported on testnet, but here's a quick
 example of how Smart Contracts are published and executed. Note that we require
@@ -171,19 +240,19 @@ the serpent CLI executable is installed on the running system
 
   contract_id = Counterparty::Publish.new( source: SOURCE_ADDRESS, 
     code_hex: compiled_script, gasprice: 1, startgas: 1000000, endowment: 0, 
-    allow_unconfirmed_inputs: true ).save!
+    allow_unconfirmed_inputs: true ).save!('private-key-here')
 
   datalist = serpent.encode_datalist '53'
 
   execute_id = Counterparty::Execute.new( source: SOURCE_ADDRESS, 
     contract_id: contract_id, payload_hex: datalist, gasprice: 5, 
-    startgas: 160000, value: 10, allow_unconfirmed_inputs: true ).save!
+    startgas: 160000, value: 10, allow_unconfirmed_inputs: true ).save!('private-key-here')
 
   puts "Executed Transaction ID: %s" % execute_id
   ```
 
 ## Have questions?
-The _best_ place to start is the [Counterparty API reference](https://github.com/CounterpartyXCP/counterpartyd/blob/master/docs/API.rst#read-api-function-reference).
+The _best_ place to start is the [Counterparty API reference](http://counterparty.io/docs/api/).
 You'll soon find that this gem is merely a wrapper around the official 
 counterpartyd json API.
 

data/counterparty_ruby.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |gem|
   gem.required_ruby_version = '>= 1.9'
   gem.license       = 'LGPL'
 
-  ['rest_client', 'bitcoin-ruby', 'ffi'].each do |dependency|
+  ['rest-client', 'bitcoin-ruby', 'ffi'].each do |dependency|
     gem.add_runtime_dependency dependency
   end
   ['rspec', 'rspec-its', 'rake', 'rdoc'].each do |dependency|

data/lib/blockr_io.rb

@@ -0,0 +1,42 @@
+# This is a 'driver' meant to emulate bitcoin-client calls, by way of the blockr.io
+# API
+class BlockrIo
+  class ResponseError < StandardError; end
+
+  def initialize(is_testing = false)
+    @is_testing = is_testing
+  end
+
+  def api_url
+    'http://%s.blockr.io/api/v1' % (is_testing? ? 'tbtc' : 'btc')
+  end
+
+  def getrawtransaction(tx_id)
+    json_get('tx', 'raw', tx_id.to_s)['data']['tx']['hex']
+  end
+
+  def sendrawtransaction(raw_tx)
+    request('tx', 'push'){|req| req.post( {hex: raw_tx}.to_json, 
+      accept: 'json', content_type: 'json' ) }['data']
+  end
+
+  def is_testing?
+    @is_testing
+  end
+
+  private
+
+  def request(*path, &block)
+    json = JSON.parse(block.call(client(*path)))
+    raise ResponseError unless json['status'] == 'success' && json['code'] == 200
+    json
+  end
+
+  def client(*path_parts)
+     RestClient::Resource.new( ([api_url]+path_parts).join('/') )
+  end
+
+  def json_get(*path)
+    request(*path){ |req| req.get content_type: 'json' }
+  end
+end

data/lib/counterparty/connection.rb

@@ -13,7 +13,7 @@ module Counterparty
     # which means the library will wait indefinitely before timing out
     attr_writer :timeout
 
-    def initialize(port=14000, username='rpc', password='1234', host='localhost')
+    def initialize(port=4000, username='counterparty', password='1234', host='xcp-dev.vennd.io')
       @host,@port,@username,@password=host.to_s,port.to_i,username.to_s,password.to_s
       @timeout = DEFAULT_TIMEOUT
     end
@@ -28,17 +28,12 @@ module Counterparty
       request 'sign_tx', unsigned_tx_hex: raw_tx, privkey: private_key
     end
 
-    # Broadcasts a signed transaction onto the bitcoin blockchain
-    def broadcast_tx(signed_tx)
-      request 'broadcast_tx', signed_tx_hex: signed_tx
-    end
-
     # Issue a request to the counterpartyd server for the given method, with the 
     # given params.
     def request(method, params)
       client = RestClient::Resource.new api_url, :timeout => @timeout
-      response = JSON.parse client.post({ method: method, 
-        params: params, jsonrpc: '2.0', id: '0' }.to_json,
+      request = { method: method, params: params, jsonrpc: '2.0', id: '0' }.to_json
+      response = JSON.parse client.post(request,
         user: @username, password: @password, accept: 'json', 
         content_type: 'json' )
 
@@ -53,136 +48,9 @@ module Counterparty
     # as to be future-proof here going forward
     def self.resource_request(klass) # :nodoc:
       define_method(klass.to_get_request){ |params| klass.find params }
-      define_method(klass.to_do_request){ |params| klass.create(params).save! }
       define_method(klass.to_create_request){ |params| klass.create(params).to_raw_tx }
     end
 
-    # :method: do_balance
-    # # Sends a do_balance call to the counterpartyd server, given the provided params
-
-    # :method: create_balance
-    # # Sends a create_balance call to the counterpartyd server, given the provided params
-
-    # :method: do_bet
-    # # Sends a do_bet call to the counterpartyd server, given the provided params
-
-    # :method: create_bet
-    # # Sends a create_bet call to the counterpartyd server, given the provided params
-
-    # :method: do_betmatch
-    # # Sends a do_betmatch call to the counterpartyd server, given the provided params
-
-    # :method: create_betmatch
-    # # Sends a create_betmatch call to the counterpartyd server, given the provided params
-
-    # :method: do_broadcast
-    # # Sends a do_broadcast call to the counterpartyd server, given the provided params
-
-    # :method: create_broadcast
-    # # Sends a create_broadcast call to the counterpartyd server, given the provided params
-
-    # :method: do_btcpays
-    # # Sends a do_btcpays call to the counterpartyd server, given the provided params
-
-    # :method: create_btcpay
-    # # Sends a create_btcpay call to the counterpartyd server, given the provided params
-
-    # :method: do_burn
-    # # Sends a do_burn call to the counterpartyd server, given the provided params
-
-    # :method: create_burn
-    # # Sends a create_burn call to the counterpartyd server, given the provided params
-
-    # :method: do_callback
-    # # Sends a do_callback call to the counterpartyd server, given the provided params
-
-    # :method: create_callback
-    # # Sends a create_callback call to the counterpartyd server, given the provided params
-
-    # :method: do_cancel
-    # # Sends a do_cancel call to the counterpartyd server, given the provided params
-
-    # :method: create_cancel
-    # # Sends a create_cancel call to the counterpartyd server, given the provided params
-
-    # :method: do_credit
-    # # Sends a do_credit call to the counterpartyd server, given the provided params
-
-    # :method: create_credit
-    # # Sends a create_credit call to the counterpartyd server, given the provided params
-
-    # :method: do_debit
-    # # Sends a do_debit call to the counterpartyd server, given the provided params
-
-    # :method: create_debit
-    # # Sends a create_debit call to the counterpartyd server, given the provided params
-
-    # :method: do_dividend
-    # # Sends a do_dividend call to the counterpartyd server, given the provided params
-
-    # :method: create_dividend
-    # # Sends a create_dividend call to the counterpartyd server, given the provided params
-
-    # :method: do_issuance
-    # # Sends a do_issuance call to the counterpartyd server, given the provided params
-
-    # :method: create_issuance
-    # # Sends a create_issuance call to the counterpartyd server, given the provided params
-
-    # :method: do_order
-    # # Sends a do_order call to the counterpartyd server, given the provided params
-
-    # :method: create_order
-    # # Sends a create_order call to the counterpartyd server, given the provided params
-
-    # :method: do_ordermatch
-    # # Sends a do_ordermatch call to the counterpartyd server, given the provided params
-
-    # :method: create_ordermatch
-    # # Sends a create_ordermatch call to the counterpartyd server, given the provided params
-
-    # :method: do_send
-    # # Sends a do_send call to the counterpartyd server, given the provided params
-
-    # :method: create_send
-    # # Sends a create_send call to the counterpartyd server, given the provided params
-
-    # :method: do_message
-    # # Sends a do_message call to the counterpartyd server, given the provided params
-
-    # :method: create_message
-    # # Sends a create_message call to the counterpartyd server, given the provided params
-
-    # :method: do_callback
-    # # Sends a do_callback call to the counterpartyd server, given the provided params
-
-    # :method: create_callback
-    # # Sends a create_callback call to the counterpartyd server, given the provided params
-
-    # :method: do_betexpiration
-    # # Sends a do_betexpiration call to the counterpartyd server, given the provided params
-
-    # :method: create_betexpiration
-    # # Sends a create_betexpiration call to the counterpartyd server, given the provided params
-
-    # :method: do_orderexpiration
-    # # Sends a do_orderexpiration call to the counterpartyd server, given the provided params
-
-    # :method: create_orderexpiration
-    # # Sends a create_orderexpiration call to the counterpartyd server, given the provided params
-
-    # :method: do_betmatchexpiration
-    # # Sends a do_betmatchexpiration call to the counterpartyd server, given the provided params
-
-    # :method: create_betmatchexpiration
-    # # Sends a create_betmatchexpiration call to the counterpartyd server, given the provided params
-
-    # :method: do_ordermatchexpiration
-    # # Sends a do_ordermatchexpiration call to the counterpartyd server, given the provided params
-
-    # :method: create_ordermatchexpiration
-    # # Sends a create_ordermatchexpiration call to the counterpartyd server, given the provided params
-
     # Go ahead and setup the defined resources, and throw them into the native-style
     # api methods:
     Counterparty.constants.each do |c| 

data/lib/counterparty/raw_tx.rb

@@ -65,7 +65,7 @@ class RawTx
   # Convert an array of 8 bit numbers into an unsigned int,
   # Remember that for each input byte, the most significant nibble comes last.
   def self.bytes_to_ui(bytes)
-    nibbles = bytes.collect{|b| [b & 0x0f, b >> 4]}.flatten
+    nibbles = bytes.collect{|b| [b & 0x0f, (b & 0xf0) >> 4]}.flatten
     nibbles.each_with_index.inject(0){|sum,(b,i)| sum += b * 16**i}
   end
 

data/lib/counterparty/resource.rb

@@ -47,9 +47,6 @@ module Counterparty
 
     # Given the provided private key, this method returns a signed transaction
     # suitable for broadcasting on the network. 
-    #
-    # NOTE: This method communicates your private key to the counterpartyd
-    # server, which might not be what you want!
     def to_signed_tx(private_key)
       sign_tx to_raw_tx, private_key
     end
@@ -57,12 +54,8 @@ module Counterparty
     # Commit this object to the blockchain. If a private key is passed, the 
     # transaction is signed using this key via a create_ call and a subsequent
     # sign_tx call. 
-    # NOTE: This method communicates your private key to the counterpartyd
-    # server, which might not be what you want!
-    def save!(private_key = nil)
-      (private_key) ? 
-        connection.broadcast_tx( to_signed_tx(private_key) ) :
-        connection.request(self.class.to_do_request, to_params)
+    def save!(private_key)
+      bitcoin.sendrawtransaction to_signed_tx(private_key)
     end
 
     private
@@ -71,59 +64,36 @@ module Counterparty
     # is a stub for when we decide in the future to Use the bitcoin-client gem
     # to perform signatures
     def sign_tx(raw_tx, pkey_wif)
-      key = ::Bitcoin.open_key pkey_wif
-      raw_tx_hash = RawTx.new(raw_tx).to_hash
-
-      prev_hash = raw_tx_hash['vin'][0]['txid']
-      prior_tx_json = open("http://test.webbtc.com/tx/#{prev_hash}.json").read
-      puts prior_tx_json.inspect
-      prev_tx = Bitcoin::P::Tx.from_json(prior_tx_json.to_s)
-
-      
-      puts "HERE" 
-      signed_tx = Bitcoin::Protocol::Tx.new
-      signed_tx.ver = raw_tx_hash['ver']
-      signed_tx.lock = raw_tx_hash['lock_time']
-      
-      tx_in= TxInBuilder.new
-      tx_in.prev_out prev_tx
-      tx_in.prev_out_index 0
-      tx_in.signature_key key
-
-      signed_tx.add_in tx_in.tx
-
-        # Here's how we put them in the raw
-        # @block.tx << tx
-
-
-      # We need to compare against
-      # Primarily: http://www.righto.com/2014/02/bitcoins-hard-way-using-raw-bitcoin.html
-      # With Some of this: https://bitcoin.org/en/developer-reference#signrawtransaction
-=begin
-def sign(tx, i, priv, hashcode=SIGHASH_ALL):                                    
-    i = int(i)                                                                  
-    if not re.match('^[0-9a-fA-F]*$', tx):                                      
-        return binascii.unhexlify(sign(binascii.hexlify(tx), i, priv))          
-    if len(priv) <= 33:                                                         
-        priv = binascii.hexlify(priv)                                           
-    pub = privkey_to_pubkey(priv)                                               
-    address = pubkey_to_address(pub)                                            
-    signing_tx = signature_form(tx, i, mk_pubkey_script(address), hashcode)     
-    sig = ecdsa_tx_sign(signing_tx, priv, hashcode)                             
-    txobj = deserialize(tx)                                                     
-    txobj["ins"][i]["script"] = serialize_script([sig, pub])                    
-    return serialize(txobj)                                                     
-=end
-
-      
-      scriptSig = Bitcoin.sign_data(key, 
-        raw_tx_hash["in"][0]["scriptSig"] ).unpack('h*').first
-      # TODO: We may have to iterate over each input
-      raw_tx_hash["in"][0]["scriptSig"] = scriptSig
-
-      ret = Bitcoin::Protocol::Tx.from_hash(raw_tx_hash).to_payload.unpack('h*').first
-
-      ret
+      # Seems like this is your quintessential reference: 
+      # http://www.righto.com/2014/02/bitcoins-hard-way-using-raw-bitcoin.html
+
+      # I think this is the right way to do it...
+      Bitcoin.network = (bitcoin.is_testing?) ? :testnet3 : :bitcoin
+
+      # This parses the binary-encoded raw transaction:
+      tx = Bitcoin::P::Tx.new [raw_tx].pack('H*')
+
+      # This is the input transaction, which we'll need for signining:
+      prev_hash = tx.in[0].prev_out.reverse_hth
+
+      # let's parse the keys:
+      key = Bitcoin::Key.from_base58 pkey_wif
+
+      pubkey = [key.pub].pack('H*')
+
+      # And parse the input transaction:
+      prev_tx = Bitcoin::P::Tx.new [bitcoin.getrawtransaction(prev_hash)].pack('H*')
+
+      # And, now we're ready to sign: 
+      subscript = tx.signature_hash_for_input 0, prev_tx
+      sig = Bitcoin.sign_data Bitcoin.open_key(key.priv), subscript
+      tx.in[0].script_sig = Bitcoin::Script.to_signature_pubkey_script sig, pubkey 
+
+      tx.to_payload.unpack('H*')[0]
+    end
+
+    def bitcoin
+      self.class.bitcoin
     end
 
     def connection
@@ -153,9 +123,10 @@ def sign(tx, i, priv, hashcode=SIGHASH_ALL):
         @connection || Counterparty.connection
       end
 
-      # Returns the method name of a do_* request for this resource
-      def to_do_request
-        'do_%s' % api_name
+      # Returns the currently assigned connection object, or if one hasn't
+      # been set, the default specified in the Counterparty module
+      def bitcoin
+        @bitcoin || Counterparty.bitcoin
       end
 
       # Returns the method name of a create_* request for this resource

data/lib/counterparty/resources.rb

@@ -14,6 +14,22 @@ module Counterparty
 
   # An object that describes a specific bet.
   class Bet < CounterResource
+    # Bet Type: Bullish CFD 
+    BULLISH_CFD = 0
+
+    # Bet Type: Bearish CFD
+    BEARISH_CFD = 1
+
+    # Bet Type: Equal
+    EQUAL = 2
+
+    # Bet Type: Not Equal
+    NOT_EQUAL = 3
+
+    # Denominator by which the leverage integer is divided by. It's effectively
+    # a 'magic' number that allows us to keep the leverage parameter an integer
+    LEVERAGE_BASIS = 5040
+
     # (integer): The transaction index
     attr_accessor :tx_index 
 
@@ -67,11 +83,11 @@ module Counterparty
     attr_accessor :validity 
 
     # (integer): The quantity of XCP to wager. (Only used in Create)
-    attr_accessor :wager
+    attr_accessor :wager_quantity
 
     # (integer): The minimum quantity of XCP to be 
     # wagered against, for the bets to match. (Only used in Create)
-    attr_accessor :counterwager 
+    attr_accessor :counterwager_quantity 
   end
 
   # An object that describes a specific occurance of two bets being matched 
@@ -147,6 +163,9 @@ module Counterparty
   # An object that describes a specific occurance of a broadcast event 
   # (i.e. creating/extending a feed)
   class Broadcast < CounterResource
+    # Value: Open Broadcast
+    OPEN_BROADCAST = -1.0
+    
     # (integer): The transaction index
     attr_accessor :tx_index 
 

data/lib/counterparty/version.rb

@@ -1,4 +1,4 @@
 module Counterparty
   # The library version string
-  VERSION = "0.9.0"
+  VERSION = "1.1.0"
 end

data/lib/counterparty_ruby.rb

@@ -3,6 +3,7 @@ require 'rest_client'
 require 'open-uri'
 require 'bitcoin'
 
+require 'blockr_io'
 require 'counterparty/raw_tx'
 require 'counterparty/version'
 require 'counterparty/resource'
@@ -46,6 +47,9 @@ module Counterparty
   end
   
   class << self
+    # Sets/Gets the default bitcoin (connection) object
+    attr_writer :bitcoin
+
     # Sets/Gets the default connection object
     attr_writer :connection
 
@@ -55,16 +59,24 @@ module Counterparty
       @connection || Connection.new
     end
 
+    # Returns the current default bitcoin object, or creates a new test-mode
+    # connection, if none has been defined
+    def bitcoin
+      @bitcoin || BlockrIo.new
+    end
+
     # Establishes the default connection for new objects as being the default 
     # counterparty production mode port/user/ip
     def production!
-      @connection = Connection.new 4000
+      @connection = Connection.new 
+      @bitcoin = BlockrIo.new
     end
 
     # Establishes the default connection for new objects as being the default 
     # counterparty test mode port/user/ip
     def test!
-      @connection = Connection.new
+      @connection = Connection.new 14000
+      @bitcoin = BlockrIo.new true
     end
   end
 end

data/spec/blockr_io_spec.rb

@@ -0,0 +1,68 @@
+require 'spec_helper'
+
+# This is a fairly stand-alone test, and doesn't require much from the 
+# helpers. 
+describe BlockrIo do
+  include_context 'globals'
+
+  let(:blockr_main) { BlockrIo.new }
+  let(:blockr_test) { BlockrIo.new true }
+
+  describe "#new" do
+    # It should default to the test network parameters
+    subject{BlockrIo.new}
+
+    its(:is_testing?){ should eq(false) }
+  end
+
+  context "testnet" do
+    describe "#getrawtransaction" do
+      it "should get raw testnet transactions" do
+        tx_hash = '686c2e3c9d4b681b3589aa4ce2ba9ecb99c6d7dcbc1c754441ee0762f463f47a'
+
+        expect(blockr_test.getrawtransaction(tx_hash)).to eq(
+          '01000000017a2bf2ea931670ecb165f1f3a2586d9d2d338a50066d1096a3fc8e'+
+          'b52e9667f8020000006a47304402201e92eebc6d9737472d085fc46f6ab45e8e'+
+          'c6696ad3efb79261e5559ab0c517ac02200a905c54ebb9ac28e8402e6651ddf8'+
+          'e067fa1305cd8c8685a40cb432bb7ef5f601210286b1e4f15de57fd34bde19cf'+
+          '64ad9302e454c4c377677581a951579a124b86e7ffffffff03781e0000000000'+
+          '0069512102a12853504fc4e79fea5e996f87e00e3e8e1d6a79c1e85c367e4ed4'+
+          '4d4120f14521032247831fc423ee7c96a44fa088e64231b5f00cbc9fc755bf3b'+
+          'dd41f64b80cbf9210286b1e4f15de57fd34bde19cf64ad9302e454c4c3776775'+
+          '81a951579a124b86e753ae781e00000000000069512103852853504fc4e79fea'+
+          '6fa406f7d61deeae390f1aee8b33580d3a98060111a18c2102502ee07ae44c88'+
+          '5cf1cb23c4a4c67303f4bd2ce9cb8475f25aaf229e7aaeebb2210286b1e4f15d'+
+          'e57fd34bde19cf64ad9302e454c4c377677581a951579a124b86e753aea0be00'+
+          '00000000001976a9148025b288cb325d88bcd7ef5d1ab1f8827778d5ee88ac00'+
+          '000000' )
+      end
+    end
+  end
+
+  context "mainnet" do
+    describe "#getrawtransaction" do
+      it "should retrieve the first burn" do
+        tx_hash = '685623401c3f5e9d2eaaf0657a50454e56a270ee7630d409e98d3bc257560098'
+
+        expect(blockr_main.getrawtransaction(tx_hash)).to eq(
+          '010000000150326ab8ff04aa5bfd83f3dfc78b45716fd46864c872e2bd424fef'+
+          'd580d5cf3e010000006b483045022100bf49d487f78345aa450c6f5fcb67a732'+
+          '53d23cce1ae557f3edc6ed58a383f16a022032a4a4736b15bcf0d4c208cd8c5c'+
+          'e43ced848ccc2b91acb82f4c87d95eb67a960121035bceeb417f25beaa28d133'+
+          'ee7b28faa1e4f5c2f76b8daf12c3fab18261718790ffffffff0350c300000000'+
+          '00001976a914818895f3dc2c178629d3d2d8fa3ec4a3f817982188ac00000000'+
+          '00000000196a17434e5452505254590000003c50726f6f664f664275726e2030'+
+          '0500000000001976a914f8195d523aa0c10d9d20eca785041815257f3ec888ac'+
+          '00000000' )
+      end
+
+      it "should fail on bad transaction" do
+        expect{blockr_main.getrawtransaction('bad_tx')}.to raise_error(RestClient::ResourceNotFound)
+      end
+    end
+      
+    describe "#sendrawtransaction"  do
+      # I think the way to test this is simply to do so in the resource_create
+    end
+  end
+end

data/spec/connection_spec.rb

@@ -5,10 +5,10 @@ describe Counterparty::Connection do
     # It should default to the test network parameters
     subject{Counterparty::Connection.new}
 
-    its(:host){ should eq('localhost') }
-    its(:port){ should eq(14000) }
-    its(:username){ should eq('rpc') }
+    its(:host){ should eq('xcp-dev.vennd.io') }
+    its(:port){ should eq(4000) }
+    its(:username){ should eq('counterparty') }
     its(:password){ should eq('1234') }
-    its(:api_url){ should eq('http://rpc:1234@localhost:14000/api/') }
+    its(:api_url){ should eq('http://counterparty:1234@xcp-dev.vennd.io:4000/api/') }
   end
 end

data/spec/exceptions_spec.rb

@@ -3,6 +3,11 @@ require 'spec_helper'
 describe Counterparty::ResponseError do
   include_context 'globals'
 
+  before(:all) do
+    Counterparty.test!
+    Counterparty.connection = local_counterpartyd :test if use_local_counterpartyd?
+  end
+
   let(:bad_issuance) do
     Counterparty::Issuance.new source: source_address,
       asset: 'THISASSETNAMEISFARTOOLONGANDINVALID', 
@@ -15,12 +20,12 @@ describe Counterparty::ResponseError do
   end
 
   it "should fail on save!" do
-    expect{ bad_issuance.save! }.to raise_error Counterparty::ResponseError
+    expect{ bad_issuance.save!(source_privkey) }.to raise_error Counterparty::ResponseError
   end
 
   subject do
     begin
-      bad_issuance.save!
+      bad_issuance.save!(source_privkey)
     rescue => error
       error
     end

data/spec/rawtx_decode_spec.rb

@@ -11,8 +11,6 @@ describe RawTx do
       '2E0EA1F61DEB649F6BC3F4CEF38C4F35504E51EC112DE5C384DF7BA0B8D578A4C70'+
       '2B6BF11D5FAC00000000'
     genesis_double_sha = '4A5E1E4BAAB89F3A32518A88C31BC87F618F76673E2CC77AB2127B7AFDEDA33B'
-
-    pending
   end
 
   describe ".nibbles_to_ui" do
@@ -114,8 +112,6 @@ describe RawTx do
       "ecd13e658bbecc0b2b4c87306f637828917838c02a5d95d0e1bdff9b040000000000" +
       "0000002f73733331312f00906b570400000000e4050000ffffffff01bf2087950000" +
       "00001976a9145399c3093d31e4b0af4be1215d59b857b861ad5d88ac00000000").to_hash }
-
-    pending
   end 
 
 end

data/spec/resource_create_spec.rb

@@ -7,12 +7,10 @@ require 'spec_helper'
 describe Counterparty do
   include_context 'globals'
 
-  before(:all) { Counterparty.test! }
-
-  # TODO: deprecate?
-  #it "Ensure test account has BTC" do
-    #expect(bitcoin.getreceivedbyaddress(source_address)).to be > 0
-  #end
+  before(:all) do
+    Counterparty.test!
+    Counterparty.connection = local_counterpartyd :test if use_local_counterpartyd?
+  end
 
   describe "Ensure test account has XCP" do
     subject do
@@ -35,7 +33,10 @@ describe Counterparty do
     end
 
     its(:to_raw_tx) { should_not be_empty }
-    its(:save!) { should_not be_empty }
+
+    it "should persist asset send" do
+      expect(subject.save!(source_privkey)).to_not be_empty
+    end
   end
 
   describe "#do_issuance" do
@@ -46,7 +47,10 @@ describe Counterparty do
     end
 
     its(:to_raw_tx) { should_not be_empty }
-    its(:save!) { should_not be_empty }
+
+    it "should persist issuance" do
+      expect(subject.save!(source_privkey)).to_not be_empty
+    end
   end
 
   describe "signed #create_broadcast" do
@@ -54,14 +58,13 @@ describe Counterparty do
       # We want the save(private_key) syntax here
       Counterparty::Broadcast.new source: source_address, fee_fraction: 0.05,
         text: "Price of gold, 12AM UTC March1. 1=inc 2=dec/const", value: 2.0,
-        timestamp: 1418926641, 
+        timestamp: Time.now.to_i, 
         allow_unconfirmed_inputs: true
     end
 
     its(:to_raw_tx) { should_not be_empty }
 
-    it "should persist using a provided key" do
-      # TODO: Make this work
+    it "should persist broadcast" do
       expect(subject.save!(source_privkey)).to_not be_empty
     end
   end

data/spec/resource_read_spec.rb

@@ -5,7 +5,10 @@ require 'spec_helper'
 describe Counterparty do
   include_context 'globals'
 
-  before(:all) { Counterparty.production! }
+  before(:all) do
+    Counterparty.production!
+    Counterparty.connection = local_counterpartyd :main if use_local_counterpartyd?
+  end
  
   # Get all burns between blocks 280537 and 280539 where greater than .2 BTC was 
   # burned, sorting by tx_hash (ascending order) With this (and the rest of the 

data/spec/spec_helper.rb

@@ -4,10 +4,22 @@ require 'yaml'
 require 'rspec/its'
 require 'counterparty_ruby'
 
+def config_yaml(file = 'config.yml') 
+  YAML.load File.open([File.dirname(__FILE__),file].join('/')).read
+end
+
+def local_counterpartyd(network)
+  config = config_yaml('config.local.yml')
+  args = %w(port username password host).collect{ |a| config[network.to_s][a] }
+  Counterparty::Connection.new *args
+end
+
+def use_local_counterpartyd?
+  File.exists? [File.dirname(__FILE__),'config.local.yml'].join('/')
+end
+
 shared_context 'globals' do
-  let(:config) do
-    YAML.load File.open([File.dirname(__FILE__),'config.yml'].join('/')).read
-  end
+  let(:config){ config_yaml }
 
   let(:source_address) { config['source_address'] }
   let(:source_privkey) { config['source_privkey'] }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: counterparty_ruby
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,10 +9,10 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-07 00:00:00.000000000 Z
+date: 2015-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rest_client
+  name: rest-client
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -137,12 +137,14 @@ files:
 - README.md
 - Rakefile
 - counterparty_ruby.gemspec
+- lib/blockr_io.rb
 - lib/counterparty/connection.rb
 - lib/counterparty/raw_tx.rb
 - lib/counterparty/resource.rb
 - lib/counterparty/resources.rb
 - lib/counterparty/version.rb
 - lib/counterparty_ruby.rb
+- spec/blockr_io_spec.rb
 - spec/config.yml
 - spec/connection_spec.rb
 - spec/exceptions_spec.rb
@@ -176,6 +178,7 @@ signing_key:
 specification_version: 3
 summary: An ActiveRecord-esque abstraction of the Counterparty API
 test_files:
+- spec/blockr_io_spec.rb
 - spec/config.yml
 - spec/connection_spec.rb
 - spec/exceptions_spec.rb