bitbank 0.1.1 → 0.1.2

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+### 0.1.2 / 2011-07-12
+
+* Added address validation mechanism to client
+* Guard against sending payments to invalid addresses
+* Added ability to retrieve accounts by address
+
 ### 0.1.1 / 2011-07-11
 
 * Added direct account lookup

data/README.md

@@ -20,6 +20,11 @@ Configure the username and password to match the ones in your bitcoind config. I
 
 You can have a number of different Bitcoin accounts and addresses.
 
+    account = client.new_account('named-account')
+
+    account = client.account('named-account') # or account_by_address
+    puts "#{account.name} has bitcoin address #{account.address}"
+
     client.accounts.each do |account|
       puts "#{account.name}: #{account.balance}"
     end
@@ -37,6 +42,10 @@ Each account also has a list of transactions (both sent and received).
       puts "[#{transaction.category}] #{transaction.address} #{transaction.amount}"
     end
 
+You can move money between your accounts:
+
+    account.move('another-account', 0.5)
+
 And of course you can send payments using the library too:
 
     account.pay('1DSwyVqyhKKQwrdFw3jpAEqnrXEjTcTKMB', 1.0)

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/bitbank.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bitbank}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Nick Plante"]
@@ -41,8 +41,12 @@ Gem::Specification.new do |s|
     "spec/fixtures/vcr_cassettes/account/move.yml",
     "spec/fixtures/vcr_cassettes/account/new_address.yml",
     "spec/fixtures/vcr_cassettes/account/pay.yml",
+    "spec/fixtures/vcr_cassettes/account/pay_invalid.yml",
+    "spec/fixtures/vcr_cassettes/account/pay_local.yml",
     "spec/fixtures/vcr_cassettes/account/transactions.yml",
     "spec/fixtures/vcr_cassettes/client/accounts.yml",
+    "spec/fixtures/vcr_cassettes/client/address_by_account.yml",
+    "spec/fixtures/vcr_cassettes/client/address_by_account_not_found.yml",
     "spec/fixtures/vcr_cassettes/client/balance.yml",
     "spec/fixtures/vcr_cassettes/client/balance_account.yml",
     "spec/fixtures/vcr_cassettes/client/block_count.yml",
@@ -56,6 +60,9 @@ Gem::Specification.new do |s|
     "spec/fixtures/vcr_cassettes/client/new_address.yml",
     "spec/fixtures/vcr_cassettes/client/transactions.yml",
     "spec/fixtures/vcr_cassettes/client/transactions_account.yml",
+    "spec/fixtures/vcr_cassettes/client/validate_address_invalid.yml",
+    "spec/fixtures/vcr_cassettes/client/validate_address_nolocal.yml",
+    "spec/fixtures/vcr_cassettes/client/validate_address_valid.yml",
     "spec/fixtures/vcr_cassettes/transaction/details.yml",
     "spec/spec_helper.rb",
     "spec/support/focused.rb",

data/lib/bitbank/account.rb

@@ -47,8 +47,12 @@ module Bitbank
     # Note that +amount+ is a real and is rounded to 8 decimal places.
     # Returns the transaction if successful.
     def pay(address, amount)
-      txid = @client.request('sendfrom', name, address, amount)
-      Transaction.new(@client, txid)
+      if @client.validate_address(address, true)
+        txid = @client.request('sendfrom', name, address, amount)
+        Transaction.new(@client, txid)
+      else
+        false
+      end
     end
 
     # Returns a list of the most recent transactions for this account.

data/lib/bitbank/client.rb

@@ -7,8 +7,19 @@ module Bitbank
     end
 
     # Retrieve a particular named account.
-    def account(name)
-      Bitbank::Account.new(self, name, nil, true)
+    def account(account_name)
+      Bitbank::Account.new(self, account_name, nil, true)
+    end
+
+    # Rerieve the account that the given Bitcoin address belongs to.
+    # Returns nil if the account
+    def account_by_address(address)
+      account_name = request('getaccount', address)
+      if account_name.present?
+        account(account_name)
+      else
+        nil
+      end
     end
 
     # Returns a list of local accounts.
@@ -84,6 +95,18 @@ module Bitbank
       end
     end
 
+    # Determine if the given address is valid.
+    def validate_address(address, locals_invalid=false)
+      status = request('validateaddress', address)
+
+      if locals_invalid && status['ismine']
+        warn "WARNING: Bitcoin address '#{address}' belongs to local account '#{status['account']}'."
+        return false
+      end
+
+      status['isvalid']
+    end
+
     def request(method, *args)
       body = { 'id' => 'jsonrpc', 'method' => method }
       body['params'] = args unless args.empty? || args.first.nil?

data/spec/account_spec.rb

@@ -14,7 +14,7 @@ describe "Bitbank::Account" do
     use_vcr_cassette 'account/address'
 
     it 'should retrieve the address for this account' do
-      @account.address.should == '1NqwGDRi9Gs4xm1BmPnGeMwgz1CowP6CeQ'
+      @account.address.should == '16FEfkbJHEXnEhZbuNGyFaoCYgVyUtqX6j'
     end
 
     it 'should be validated on account creation if a check was requested (default)' do
@@ -58,12 +58,31 @@ describe "Bitbank::Account" do
   end
 
   describe 'pay' do
-    use_vcr_cassette 'account/pay'
+    context 'when the recipient address is valid' do
+      use_vcr_cassette 'account/pay'
+
+      it 'should return a new transaction' do
+        transaction = @account.pay('15VjRaDX9zpbA8LVnbrCAFzrVzN7ixHNsC', 0.02)
+        transaction.amount.should == -0.02
+        transaction.account.should == @account
+      end
+    end
+
+    context 'when the recipient address is invalid' do
+      use_vcr_cassette 'account/pay_invalid'
+
+      it 'should return false' do
+        @account.pay('invalidaddress', 0.01).should be_false
+      end
+    end
+
+    context 'when the recipient address is a local address' do
+      use_vcr_cassette 'account/pay_local'
 
-    it 'should return a new transaction' do
-      transaction = @account.pay('destinationaddress', 0.01)
-      transaction.amount.should == 0.01
-      transaction.account.should == @account
+      it 'should warn the user and return false' do
+        @client.expects(:warn)
+        @account.pay('1DSwyVqyhKKQwrdFw3jpAEqnrXEjTcTKMB', 0.01).should be_false
+      end
     end
   end
 

data/spec/client_spec.rb

@@ -29,6 +29,29 @@ describe "Bitbank::Client" do
     end
   end
 
+  describe 'account_by_address' do
+    before(:each) do
+      Bitbank::Account.any_instance.stubs(:address).returns(true) # check
+    end
+
+    context 'when the address exists locally' do
+      use_vcr_cassette 'client/address_by_account'
+
+      it 'should retrieve the appropriate account' do
+        account = @client.account_by_address('16FEfkbJHEXnEhZbuNGyFaoCYgVyUtqX6j')
+        account.should == Bitbank::Account.new(@client, 'adent')
+      end
+    end
+
+    context 'when the address does not exist locally' do
+      use_vcr_cassette 'client/address_by_account_not_found'
+
+      it 'should return false' do
+        @client.account_by_address('badaddress').should be_nil
+      end
+    end
+  end
+
   describe 'accounts' do
     use_vcr_cassette 'client/accounts'
 
@@ -176,4 +199,30 @@ describe "Bitbank::Client" do
       end
     end
   end
+
+  describe 'validate_address' do
+    context 'with an invalid address' do
+      use_vcr_cassette 'client/validate_address_invalid'
+
+      it 'should be false' do
+        @client.validate_address('heartofgold').should be_false
+      end
+    end
+
+    context 'with a valid address' do
+      use_vcr_cassette 'client/validate_address_valid'
+
+      it 'should be true' do
+        @client.validate_address('1DSwyVqyhKKQwrdFw3jpAEqnrXEjTcTKMB').should be_true
+      end
+    end
+
+    context 'when local address are not desired' do
+      use_vcr_cassette 'client/validate_address_nolocal'
+
+      it 'should be false and generate a warning' do
+        @client.validate_address('1DSwyVqyhKKQwrdFw3jpAEqnrXEjTcTKMB', true).should be_false
+      end
+    end
+  end
 end

data/spec/fixtures/vcr_cassettes/account/address.yml

@@ -24,7 +24,7 @@
       - application/json
       server:
       - bitcoin-json-rpc/0.3.21-beta
-    body: ! '{"result":"1NqwGDRi9Gs4xm1BmPnGeMwgz1CowP6CeQ","error":null,"id":"jsonrpc"}
+    body: ! '{"result":"16FEfkbJHEXnEhZbuNGyFaoCYgVyUtqX6j","error":null,"id":"jsonrpc"}
 
 '
     http_version: '1.1'

data/spec/fixtures/vcr_cassettes/account/pay.yml

@@ -3,37 +3,65 @@
   request: !ruby/struct:VCR::Request
     method: :post
     uri: http://testuser:testpass@localhost:8332/
-    body: ! '{"id":"jsonrpc","method":"sendfrom","params":["adent","destinationaddress",0.1]}'
+    body: ! '{"id":"jsonrpc","method":"validateaddress","params":["15VjRaDX9zpbA8LVnbrCAFzrVzN7ixHNsC"]}'
     headers:
       accept:
       - ! '*/*; q=0.5, application/xml'
       accept-encoding:
       - gzip, deflate
       content-length:
-      - '107'
+      - '91'
   response: !ruby/struct:VCR::Response
     status: !ruby/struct:VCR::ResponseStatus
       code: 200
       message: OK
     headers:
       date:
-      - Sun, 12 Jun 2011 03:59:59 +0000
+      - Mon, 11 Jul 2011 16:36:13 +0000
       content-length:
-      - '106'
+      - '118'
       content-type:
       - application/json
       server:
       - bitcoin-json-rpc/0.3.21-beta
-    body: ! '{"result":"newtxid","error":null,"id":"jsonrpc"}
+    body: ! '{"result":{"isvalid":true,"address":"15VjRaDX9zpbA8LVnbrCAFzrVzN7ixHNsC","ismine":false},"error":null,"id":"jsonrpc"}
 
 '
     http_version: '1.1'
+- !ruby/struct:VCR::HTTPInteraction
+  request: !ruby/struct:VCR::Request
+    method: :post
+    uri: http://testuser:testpass@localhost:8332/
+    body: ! '{"id":"jsonrpc","method":"sendfrom","params":["adent","15VjRaDX9zpbA8LVnbrCAFzrVzN7ixHNsC",0.02]}'
+    headers:
+      accept:
+      - ! '*/*; q=0.5, application/xml'
+      accept-encoding:
+      - gzip, deflate
+      content-length:
+      - '97'
+  response: !ruby/struct:VCR::Response
+    status: !ruby/struct:VCR::ResponseStatus
+      code: 200
+      message: OK
+    headers:
+      date:
+      - Mon, 11 Jul 2011 16:36:15 +0000
+      content-length:
+      - '106'
+      content-type:
+      - application/json
+      server:
+      - bitcoin-json-rpc/0.3.21-beta
+    body: ! '{"result":"2c3bb4819349df9c5236496c5182e7bdaff7db8092e98b52b7e387b491054b35","error":null,"id":"jsonrpc"}
 
+'
+    http_version: '1.1'
 - !ruby/struct:VCR::HTTPInteraction
   request: !ruby/struct:VCR::Request
     method: :post
     uri: http://testuser:testpass@localhost:8332/
-    body: ! '{"id":"jsonrpc","method":"gettransaction","params":["newtxid"]}'
+    body: ! '{"id":"jsonrpc","method":"gettransaction","params":["2c3bb4819349df9c5236496c5182e7bdaff7db8092e98b52b7e387b491054b35"]}'
     headers:
       accept:
       - ! '*/*; q=0.5, application/xml'
@@ -47,14 +75,14 @@
       message: OK
     headers:
       date:
-      - Mon, 13 Jun 2011 04:00:01 +0000
+      - Mon, 11 Jul 2011 16:36:15 +0000
       content-length:
-      - '289'
+      - '326'
       content-type:
       - application/json
       server:
       - bitcoin-json-rpc/0.3.21-beta
-    body: ! '{"result":{"amount":0.01,"confirmations":1,"txid":"newtxid","time":1307851201,"details":[{"account":"adent","address":"addr1","category":"send","amount":0.1}]},"error":null,"id":"jsonrpc"}
+    body: ! '{"result":{"amount":-0.02000000,"fee":-0.01000000,"confirmations":0,"txid":"2c3bb4819349df9c5236496c5182e7bdaff7db8092e98b52b7e387b491054b35","time":1310402164,"details":[{"account":"adent","address":"15VjRaDX9zpbA8LVnbrCAFzrVzN7ixHNsC","category":"send","amount":-0.02000000,"fee":-0.01000000}]},"error":null,"id":"jsonrpc"}
 
 '
     http_version: '1.1'

data/spec/fixtures/vcr_cassettes/account/pay_invalid.yml

@@ -0,0 +1,30 @@
+---
+- !ruby/struct:VCR::HTTPInteraction
+  request: !ruby/struct:VCR::Request
+    method: :post
+    uri: http://testuser:testpass@localhost:8332/
+    body: ! '{"id":"jsonrpc","method":"validateaddress","params":["invalidaddress"]}'
+    headers:
+      accept:
+      - ! '*/*; q=0.5, application/xml'
+      accept-encoding:
+      - gzip, deflate
+      content-length:
+      - '71'
+  response: !ruby/struct:VCR::Response
+    status: !ruby/struct:VCR::ResponseStatus
+      code: 200
+      message: OK
+    headers:
+      date:
+      - Mon, 11 Jul 2011 16:03:22 +0000
+      content-length:
+      - '57'
+      content-type:
+      - application/json
+      server:
+      - bitcoin-json-rpc/0.3.21-beta
+    body: ! '{"result":{"isvalid":false},"error":null,"id":"jsonrpc"}
+
+'
+    http_version: '1.1'

data/spec/fixtures/vcr_cassettes/account/pay_local.yml

@@ -0,0 +1,30 @@
+---
+- !ruby/struct:VCR::HTTPInteraction
+  request: !ruby/struct:VCR::Request
+    method: :post
+    uri: http://testuser:testpass@localhost:8332/
+    body: ! '{"id":"jsonrpc","method":"validateaddress","params":["1DSwyVqyhKKQwrdFw3jpAEqnrXEjTcTKMB"]}'
+    headers:
+      accept:
+      - ! '*/*; q=0.5, application/xml'
+      accept-encoding:
+      - gzip, deflate
+      content-length:
+      - '91'
+  response: !ruby/struct:VCR::Response
+    status: !ruby/struct:VCR::ResponseStatus
+      code: 200
+      message: OK
+    headers:
+      date:
+      - Mon, 11 Jul 2011 16:03:22 +0000
+      content-length:
+      - '145'
+      content-type:
+      - application/json
+      server:
+      - bitcoin-json-rpc/0.3.21-beta
+    body: ! '{"result":{"isvalid":true,"address":"1DSwyVqyhKKQwrdFw3jpAEqnrXEjTcTKMB","ismine":true,"account":"nap@zerosum.org"},"error":null,"id":"jsonrpc"}
+
+'
+    http_version: '1.1'

data/spec/fixtures/vcr_cassettes/client/address_by_account.yml

@@ -0,0 +1,30 @@
+---
+- !ruby/struct:VCR::HTTPInteraction
+  request: !ruby/struct:VCR::Request
+    method: :post
+    uri: http://testuser:testpass@localhost:8332/
+    body: ! '{"id":"jsonrpc","method":"getaccount","params":["16FEfkbJHEXnEhZbuNGyFaoCYgVyUtqX6j"]}'
+    headers:
+      accept:
+      - ! '*/*; q=0.5, application/xml'
+      accept-encoding:
+      - gzip, deflate
+      content-length:
+      - '86'
+  response: !ruby/struct:VCR::Response
+    status: !ruby/struct:VCR::ResponseStatus
+      code: 200
+      message: OK
+    headers:
+      date:
+      - Mon, 11 Jul 2011 17:11:33 +0000
+      content-length:
+      - '47'
+      content-type:
+      - application/json
+      server:
+      - bitcoin-json-rpc/0.3.21-beta
+    body: ! '{"result":"adent","error":null,"id":"jsonrpc"}
+
+'
+    http_version: '1.1'

data/spec/fixtures/vcr_cassettes/client/address_by_account_not_found.yml

@@ -0,0 +1,30 @@
+---
+- !ruby/struct:VCR::HTTPInteraction
+  request: !ruby/struct:VCR::Request
+    method: :post
+    uri: http://testuser:testpass@localhost:8332/
+    body: ! '{"id":"jsonrpc","method":"getaccount","params":["badaddress"]}'
+    headers:
+      accept:
+      - ! '*/*; q=0.5, application/xml'
+      accept-encoding:
+      - gzip, deflate
+      content-length:
+      - '62'
+  response: !ruby/struct:VCR::Response
+    status: !ruby/struct:VCR::ResponseStatus
+      code: 200
+      message: OK
+    headers:
+      date:
+      - Mon, 11 Jul 2011 17:11:33 +0000
+      content-length:
+      - '42'
+      content-type:
+      - application/json
+      server:
+      - bitcoin-json-rpc/0.3.21-beta
+    body: ! '{"result":"","error":null,"id":"jsonrpc"}
+
+'
+    http_version: '1.1'

data/spec/fixtures/vcr_cassettes/client/validate_address_invalid.yml

@@ -0,0 +1,30 @@
+---
+- !ruby/struct:VCR::HTTPInteraction
+  request: !ruby/struct:VCR::Request
+    method: :post
+    uri: http://testuser:testpass@localhost:8332/
+    body: ! '{"id":"jsonrpc","method":"validateaddress","params":["heartofgold"]}'
+    headers:
+      accept:
+      - ! '*/*; q=0.5, application/xml'
+      accept-encoding:
+      - gzip, deflate
+      content-length:
+      - '68'
+  response: !ruby/struct:VCR::Response
+    status: !ruby/struct:VCR::ResponseStatus
+      code: 200
+      message: OK
+    headers:
+      date:
+      - Mon, 11 Jul 2011 15:54:58 +0000
+      content-length:
+      - '57'
+      content-type:
+      - application/json
+      server:
+      - bitcoin-json-rpc/0.3.21-beta
+    body: ! '{"result":{"isvalid":false},"error":null,"id":"jsonrpc"}
+
+'
+    http_version: '1.1'

data/spec/fixtures/vcr_cassettes/client/validate_address_nolocal.yml

@@ -0,0 +1,30 @@
+---
+- !ruby/struct:VCR::HTTPInteraction
+  request: !ruby/struct:VCR::Request
+    method: :post
+    uri: http://testuser:testpass@localhost:8332/
+    body: ! '{"id":"jsonrpc","method":"validateaddress","params":["1DSwyVqyhKKQwrdFw3jpAEqnrXEjTcTKMB"]}'
+    headers:
+      accept:
+      - ! '*/*; q=0.5, application/xml'
+      accept-encoding:
+      - gzip, deflate
+      content-length:
+      - '91'
+  response: !ruby/struct:VCR::Response
+    status: !ruby/struct:VCR::ResponseStatus
+      code: 200
+      message: OK
+    headers:
+      date:
+      - Mon, 11 Jul 2011 15:54:58 +0000
+      content-length:
+      - '145'
+      content-type:
+      - application/json
+      server:
+      - bitcoin-json-rpc/0.3.21-beta
+    body: ! '{"result":{"isvalid":true,"address":"1DSwyVqyhKKQwrdFw3jpAEqnrXEjTcTKMB","ismine":true,"account":"nap@zerosum.org"},"error":null,"id":"jsonrpc"}
+
+'
+    http_version: '1.1'

data/spec/fixtures/vcr_cassettes/client/validate_address_valid.yml

@@ -0,0 +1,30 @@
+---
+- !ruby/struct:VCR::HTTPInteraction
+  request: !ruby/struct:VCR::Request
+    method: :post
+    uri: http://testuser:testpass@localhost:8332/
+    body: ! '{"id":"jsonrpc","method":"validateaddress","params":["1DSwyVqyhKKQwrdFw3jpAEqnrXEjTcTKMB"]}'
+    headers:
+      accept:
+      - ! '*/*; q=0.5, application/xml'
+      accept-encoding:
+      - gzip, deflate
+      content-length:
+      - '91'
+  response: !ruby/struct:VCR::Response
+    status: !ruby/struct:VCR::ResponseStatus
+      code: 200
+      message: OK
+    headers:
+      date:
+      - Mon, 11 Jul 2011 15:57:06 +0000
+      content-length:
+      - '145'
+      content-type:
+      - application/json
+      server:
+      - bitcoin-json-rpc/0.3.21-beta
+    body: ! '{"result":{"isvalid":true,"address":"1DSwyVqyhKKQwrdFw3jpAEqnrXEjTcTKMB","ismine":true,"account":"nap@zerosum.org"},"error":null,"id":"jsonrpc"}
+
+'
+    http_version: '1.1'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bitbank
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &2156535100 !ruby/object:Gem::Requirement
+  requirement: &2156403060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 1.6.3
   type: :runtime
   prerelease: false
-  version_requirements: *2156535100
+  version_requirements: *2156403060
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2156533820 !ruby/object:Gem::Requirement
+  requirement: &2156402080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: 3.0.7
   type: :runtime
   prerelease: false
-  version_requirements: *2156533820
+  version_requirements: *2156402080
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &2156532820 !ruby/object:Gem::Requirement
+  requirement: &2156401040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: 0.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *2156532820
+  version_requirements: *2156401040
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2156531960 !ruby/object:Gem::Requirement
+  requirement: &2156399840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *2156531960
+  version_requirements: *2156399840
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2156530920 !ruby/object:Gem::Requirement
+  requirement: &2156399120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: 0.6.0
   type: :development
   prerelease: false
-  version_requirements: *2156530920
+  version_requirements: *2156399120
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2156529420 !ruby/object:Gem::Requirement
+  requirement: &2156398360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,10 +77,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2156529420
+  version_requirements: *2156398360
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2156527580 !ruby/object:Gem::Requirement
+  requirement: &2156397580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -88,10 +88,10 @@ dependencies:
         version: 1.6.2
   type: :development
   prerelease: false
-  version_requirements: *2156527580
+  version_requirements: *2156397580
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &2156526680 !ruby/object:Gem::Requirement
+  requirement: &2156396820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -99,10 +99,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *2156526680
+  version_requirements: *2156396820
 - !ruby/object:Gem::Dependency
   name: vcr
-  requirement: &2156525400 !ruby/object:Gem::Requirement
+  requirement: &2156396180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +110,10 @@ dependencies:
         version: 1.10.0
   type: :development
   prerelease: false
-  version_requirements: *2156525400
+  version_requirements: *2156396180
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &2156524120 !ruby/object:Gem::Requirement
+  requirement: &2156395380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,10 +121,10 @@ dependencies:
         version: 0.9.12
   type: :development
   prerelease: false
-  version_requirements: *2156524120
+  version_requirements: *2156395380
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &2156522940 !ruby/object:Gem::Requirement
+  requirement: &2156394680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -132,10 +132,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156522940
+  version_requirements: *2156394680
 - !ruby/object:Gem::Dependency
   name: fuubar
-  requirement: &2156521480 !ruby/object:Gem::Requirement
+  requirement: &2156394040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -143,10 +143,10 @@ dependencies:
         version: 0.0.5
   type: :development
   prerelease: false
-  version_requirements: *2156521480
+  version_requirements: *2156394040
 - !ruby/object:Gem::Dependency
   name: autotest
-  requirement: &2156520680 !ruby/object:Gem::Requirement
+  requirement: &2156393360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -154,7 +154,7 @@ dependencies:
         version: 4.4.6
   type: :development
   prerelease: false
-  version_requirements: *2156520680
+  version_requirements: *2156393360
 description: Easy to use Ruby interface to the Bitcoind JSON-RPC API
 email: nap@zerosum.org
 executables: []
@@ -187,8 +187,12 @@ files:
 - spec/fixtures/vcr_cassettes/account/move.yml
 - spec/fixtures/vcr_cassettes/account/new_address.yml
 - spec/fixtures/vcr_cassettes/account/pay.yml
+- spec/fixtures/vcr_cassettes/account/pay_invalid.yml
+- spec/fixtures/vcr_cassettes/account/pay_local.yml
 - spec/fixtures/vcr_cassettes/account/transactions.yml
 - spec/fixtures/vcr_cassettes/client/accounts.yml
+- spec/fixtures/vcr_cassettes/client/address_by_account.yml
+- spec/fixtures/vcr_cassettes/client/address_by_account_not_found.yml
 - spec/fixtures/vcr_cassettes/client/balance.yml
 - spec/fixtures/vcr_cassettes/client/balance_account.yml
 - spec/fixtures/vcr_cassettes/client/block_count.yml
@@ -202,6 +206,9 @@ files:
 - spec/fixtures/vcr_cassettes/client/new_address.yml
 - spec/fixtures/vcr_cassettes/client/transactions.yml
 - spec/fixtures/vcr_cassettes/client/transactions_account.yml
+- spec/fixtures/vcr_cassettes/client/validate_address_invalid.yml
+- spec/fixtures/vcr_cassettes/client/validate_address_nolocal.yml
+- spec/fixtures/vcr_cassettes/client/validate_address_valid.yml
 - spec/fixtures/vcr_cassettes/transaction/details.yml
 - spec/spec_helper.rb
 - spec/support/focused.rb
@@ -222,7 +229,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -404184776927923942
+      hash: -3155454592692986753
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: