bc 0.1.1 → 0.1.2

data/lib/bc.rb

@@ -79,6 +79,14 @@ module Bitcoin
 		end
 	end
 
+	# EmptyKeypool is raised when the Bitcoin keypool is empty, but the wallet is
+	# locked. Call refill_key_pool() on the Bitcoin::Client instance to refill it.
+	class EmptyKeypool < Error
+		def initialize()
+			super('The Bitcoin key pool ran out.')
+		end
+	end
+
 	# This class represents a block in the Bitcoin block chain. (c.f.
 	# https://en.bitcoin.it/wiki/Block and
 	# https://en.bitcoin.it/wiki/Block_hashing_algorithm)
@@ -320,12 +328,28 @@ module Bitcoin
 		# Get an unused Address associated with this account, or create one if one
 		# doesn't already exist.
 		def unused_address
-			@bc.get_address(@bc.jr.getaccountaddress(@name))
+			begin
+				@bc.get_address(@bc.jr.getaccountaddress(@name))
+			rescue Jr::ServerError => ex
+				if ex.code == -12
+					raise EmptyKeypool
+				else
+					raise
+				end
+			end
 		end
 
 		# Get a new Address associated with this account.
 		def new_address
-			@bc.get_address(@bc.jr.getnewaddress(@name))
+			begin
+				@bc.get_address(@bc.jr.getnewaddress(@name))
+			rescue Jr::ServerError => ex
+				if ex.code == -12
+					raise EmptyKeypool
+				else
+					raise
+				end
+			end
 		end
 
 		# Send +amount+ Bitcoin to +dest+. +amount+ should be a positive real
@@ -584,16 +608,13 @@ module Bitcoin
 		# UnknownTransaction if we don't know about a Transaction with that ID.
 		# The result of this function is cached.
 		def get_transaction(transaction_id)
-			if transaction_id.is_a?(Fixnum)
-			end
-
 			@transactions[transaction_id] ||= Transaction.new(self, transaction_id)
 		end
 
 		# Call the (Ruby) block passed for every transaction that has occurred since
 		# +block+ (which may be a Block, a block ID, or a block height). We return
 		# the last Block processed.
-		def each_transactions_since(block)
+		def each_transaction_since(block)
 			unless block.is_a?(Block)
 				block = get_block(block)
 			end
@@ -614,7 +635,13 @@ module Bitcoin
 
 		# Get an Array of every Transaction involving one of our addresses.
 		def transactions
-			get_transactions_since(0)
+			transactions = Array.new
+
+			each_transaction_since(0) do |tx|
+				transactions << tx
+			end
+
+			transactions
 		end
 
 		# This is the latest Block we've processed.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bc
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -50,11 +50,11 @@ cert_chain:
   -----END CERTIFICATE-----
 
 '
-date: 2012-03-05 00:00:00.000000000 Z
+date: 2012-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jr
-  requirement: &80146860 !ruby/object:Gem::Requirement
+  requirement: &72538340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -62,7 +62,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *80146860
+  version_requirements: *72538340
 description: bc is a Ruby interface to bitcoind.
 email: the.magical.kat@gmail.com
 executables: []