rallet 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c83939720cfd00298725ba8fb26ec2552fb419a2
-  data.tar.gz: 511cfbf9475fa8fb4833528e4525bf2cfbeaa00e
+  metadata.gz: eef3e14a8c055f537ff2102351d966ca4d0eccb9
+  data.tar.gz: 4714b446bd39b5eb5c80f0c3af4bda344091a688
 SHA512:
-  metadata.gz: 59c62840231bbc502019bb47d5894706f108179235b86ae3818d058c6a863e0a502c81cbd325523530cd37c050c87c445cf917b0f5803d0049c0d5a7d38e939d
-  data.tar.gz: 0e6eacb9dec621bb39aa0c13399e7f121637b446e439168cd32ee127895afce61d6b07c11b00dfca593d7ace98c1d32c867ca1d619f612cbc8f502c5ba6eda32
+  metadata.gz: b482b50ef393506ac3c7e66574959bf8f4aec5c37b114a13f07423f1ce81a8e563524c0a6d5ac8b38db137e1a1ea89d963464deb6b5a1d31e7ac1c374ec450e7
+  data.tar.gz: b6f0a876a9c1887c5b6f9158a9ed4a658c62c3cf7c83e2a8faa697a0cd3adb676ca6ab554b7e48d26234cc56c9256a1a899429d527a1120a68e89430072307a7

data/lib/rallet/client.rb

@@ -1,32 +1,16 @@
-require 'rest_client'
+require 'rpcjson'
 
 module Rallet
   class Client
-    attr_reader :uri
+    attr_reader :client
 
-    def initialize(service_url)
-      @uri = service_url
+    def initialize(service_url, rpc_version = 1.1)
+      @client = RPC::JSON::Client.new(service_url, rpc_version)
     end
 
     # Call any method with any args from RPC service
     def request(name, *args)
-      if args && index = args.index(nil)
-        args = args[0...index]
-      end
-      request_body = { 'method' => name, 'params' => args, 'id' => 'jsonrpc' }.to_json
-      response = JSON.parse(make_request(request_body))
-      raise JSONRPCError, response['error'] if response['error']
-      response['result']
+      client.send(name, *args)
     end
-
-    private
-    # Make RPC call
-    def make_request(request_body)
-      RestClient.post(@uri, request_body, content_type: :json)
-    end
-
-    # Error handler
-    class JSONRPCError < RuntimeError; end
-
   end
 end

data/lib/rallet/version.rb

@@ -1,3 +1,3 @@
 module Rallet
-  VERSION = '0.1.4'
+  VERSION = '0.1.5'
 end

data/lib/rallet/wallets/common.rb

@@ -1,3 +1,5 @@
+require 'rpcjson'
+
 module Rallet
   module Wallets
     # Extracted from https://github.com/sinisterchipmunk/bitcoin-client/blob/master/lib/bitcoin-client/client.rb
@@ -6,150 +8,150 @@ module Rallet
       attr_reader :client
 
       # Sample http://user:pass@localhost:2082
-      def initialize(service_url)
-        @client = Rallet::Client.new(service_url)
+      def initialize(service_url, rpc_version = 1.1)
+        @client = RPC::JSON::Client.new(service_url, rpc_version)
       end
 
       # Safely copies wallet.dat to destination, which can be a directory or a path with filename.
       def backupwallet(destination)
-        @client.request 'backupwallet', destination
+        @client.send 'backupwallet', destination
       end
 
       # Creates a multi-signature address and returns a json object
       def createmultisig(nrequired, keys)
-          @client.request 'createmultisig', nrequired, keys
+          @client.send 'createmultisig', nrequired, keys
       end
 
       # nCreate a transaction spending given inputs
       # (array of objects containing transaction id and output number), sending to given address(es)
       def createrawtransaction(transactionid = nil, address_amount)
-          @client.request 'createrawtransaction', transactionid, address_amount
+          @client.send 'createrawtransaction', transactionid, address_amount
       end
 
       # Return a JSON object representing the serialized, hex-encoded transaction.
       def decoderawtransaction(hexstring)
-          @client.request 'decoderawtransaction', hexstring
+          @client.send 'decoderawtransaction', hexstring
       end
 
       # Returns the account associated with the given address.
       def getaccount(bitcoinaddress)
-        @client.request 'getaccount', bitcoinaddress
+        @client.send 'getaccount', bitcoinaddress
       end
 
       # Returns the current bitcoin address for receiving payments to this account.
       def getaccountaddress(account)
-        @client.request 'getaccountaddress', account
+        @client.send 'getaccountaddress', account
       end
 
       #	Returns the list of addresses for the given account.
       def getaddressesbyaccount(account)
-        @client.request 'getaddressesbyaccount', account
+        @client.send 'getaddressesbyaccount', account
       end
 
       # If +account+ is not specified, returns the server's total available balance.
       # If +account+ is specified, returns the balance in the account.
       def getbalance(account = nil, minconf = 1)
-        @client.request 'getbalance', account, minconf
+        @client.send 'getbalance', account, minconf
       end
 
       def getbestblockhash
-        @client.request 'getbestblockhash'
+        @client.send 'getbestblockhash'
       end
 
       # Dumps the block existing at specified height.
       # Note: this is not available in the official release
       def getblockbycount(height)
-        @client.request 'getblockbycount', height
+        @client.send 'getblockbycount', height
       end
 
       # Dumps the block existing with specified hash.
       def getblock(hash)
-        block = @client.request 'getblock', hash
+        block = @client.send 'getblock', hash
         block["time"] = Time.at(block["time"]).utc
         block
       end
 
       # Returns the number of blocks in the longest block chain.
       def getblockcount
-        @client.request 'getblockcount'
+        @client.send 'getblockcount'
       end
 
       # Returns the block number of the latest block in the longest block chain.
       def getblocknumber
-        @client.request 'getblocknumber'
+        @client.send 'getblocknumber'
       end
 
       # Returns hash of block in best-block-chain at <index>; index 0 is the genesis block
       def getblockhash(index)
-        @client.request 'getblockhash', index
+        @client.send 'getblockhash', index
       end
 
       # Returns the number of connections to other nodes.
       def getconnectioncount
-        @client.request 'getconnectioncount'
+        @client.send 'getconnectioncount'
       end
 
       # Returns the proof-of-work difficulty as a multiple of the minimum difficulty.
       def getdifficulty
-        @client.request 'getdifficulty'
+        @client.send 'getdifficulty'
       end
 
       # Returns true or false whether bitcoind is currently generating hashes
       def getgenerate
-        @client.request 'getgenerate'
+        @client.send 'getgenerate'
       end
 
       # Returns a recent hashes per second performance measurement while generating.
       def gethashespersec
-        @client.request 'gethashespersec'
+        @client.send 'gethashespersec'
       end
 
       # Returns an object containing various state info.
       def getinfo
-        @client.request 'getinfo'
+        @client.send 'getinfo'
       end
 
       # Returns data about each connected network node.
       def getpeerinfo
-        @client.request 'getpeerinfo'
+        @client.send 'getpeerinfo'
       end
 
       # Returns an object containing mining info.
       def getmininginfo
-        @client.request 'getmininginfo'
+        @client.send 'getmininginfo'
       end
 
       # Returns a new bitcoin address for receiving payments. If +account+ is specified (recommended),
       # it is added to the address book so payments received with the address will be credited to +account+.
       def getnewaddress(account = nil)
-        @client.request 'getnewaddress', account
+        @client.send 'getnewaddress', account
       end
 
       # Returns the total amount received by addresses with +account+ in transactions
       # with at least +minconf+ confirmations.
       def getreceivedbyaccount(account, minconf = 1)
-        @client.request 'getreceivedbyaccount', account, minconf
+        @client.send 'getreceivedbyaccount', account, minconf
       end
 
       # Returns the total amount received by +bitcoinaddress+ in transactions with at least +minconf+ confirmations.
       def getreceivedbyaddress(bitcoinaddress, minconf = 1)
-        @client.request 'getreceivedbyaddress', bitcoinaddress, minconf
+        @client.send 'getreceivedbyaddress', bitcoinaddress, minconf
       end
 
       # Get detailed information about +txid+
       def gettransaction(txid)
-        @client.request 'gettransaction', txid
+        @client.send 'gettransaction', txid
       end
 
       # Get raw transaction bout +txid+. It outputs the whole transaction chain by default in HEX. If you want JSON, set verbose to 1.
       # When in the bitcoind config is set txindex=1, after reindexing, you can ask about any transaction (not included in your wallet), with this command.
       def getrawtransaction(txid, verbose = 0)
-        @client.request 'getrawtransaction', txid, verbose
+        @client.send 'getrawtransaction', txid, verbose
       end
 
       # Gets all mempool txs (pedning/waiting to be added in a block)
       def getrawmempool
-         @client.request 'getrawmempool'
+         @client.send 'getrawmempool'
       end
       # If +data+ is not specified, returns formatted hash data to work on:
       #
@@ -160,22 +162,22 @@ module Rallet
       #
       # If +data+ is specified, tries to solve the block and returns true if it was successful.
       def getwork(data = nil)
-        @client.request 'getwork', data
+        @client.send 'getwork', data
       end
 
       # List commands, or get help for a command.
       def help(command = nil)
-        @client.request 'help', command
+        @client.send 'help', command
       end
 
       # Adds a private key (as returned by dumpprivkey) to your wallet.
       def importprivkey(bitcoinprivkey, label = nil, rescan = true)
-        @client.request 'importprivkey', bitcoinprivkey, label, rescan
+        @client.send 'importprivkey', bitcoinprivkey, label, rescan
       end
 
       # Returns Object that has account names as keys, account balances as values.
       def listaccounts(minconf = 1)
-        @client.request 'listaccounts', minconf
+        @client.send 'listaccounts', minconf
       end
 
       # Returns an array of objects containing:
@@ -185,7 +187,7 @@ module Rallet
       #   :confirmations => number of confirmations of the most recent transaction included
       #
       def listreceivedbyaccount(minconf = 1, includeempty = false)
-        @client.request 'listreceivedbyaccount', minconf, includeempty
+        @client.send 'listreceivedbyaccount', minconf, includeempty
       end
 
       # Returns an array of objects containing:
@@ -197,87 +199,87 @@ module Rallet
       #
       # To get a list of accounts on the system, execute bitcoind listreceivedbyaddress 0 true
       def listreceivedbyaddress(minconf = 1, includeempty = false)
-        @client.request 'listreceivedbyaddress', minconf, includeempty
+        @client.send 'listreceivedbyaddress', minconf, includeempty
       end
 
       # Returns up to +count+ most recent transactions for account +account+.
       def listtransactions(account = '' , count = 10, from = 0)
-        @client.request 'listtransactions', account, count, from
+        @client.send 'listtransactions', account, count, from
       end
 
       # Returns transactions since <hash> block
       def listsinceblock(hash)
-        @client.request 'listsinceblock', hash
+        @client.send 'listsinceblock', hash
       end
 
 
       # Move from one account in your wallet to another.
       def move(fromaccount, toaccount, amount, minconf = 1, comment = nil)
-        @client.request 'move', fromaccount, toaccount, amount, minconf, comment
+        @client.send 'move', fromaccount, toaccount, amount, minconf, comment
       end
 
       # Return count transactions with <address> present in their scriptSig, skipping skip at the beginning. The ordering is oldest transaction first; if skip is negative the order returned is newest transaction first and skip+1 transactions are skipped. If verbose=0 only txids are returned rather than the full transactions.
       def searchrawtransactions(bitcoinaddress, verbose=1)
-        @client.request 'searchrawtransactions', bitcoinaddress, verbose
+        @client.send 'searchrawtransactions', bitcoinaddress, verbose
       end
 
       # +amount+ is a real and is rounded to 8 decimal places. Returns the transaction ID if successful.
       def sendfrom(fromaccount, tobitcoinaddress, amount, minconf = 1, comment = nil, comment_to = nil)
-        @client.request 'sendfrom', fromaccount, tobitcoinaddress, amount, minconf, comment, comment_to
+        @client.send 'sendfrom', fromaccount, tobitcoinaddress, amount, minconf, comment, comment_to
       end
 
       # Submits raw transaction (serialized, hex-encoded) to local node and network.
       def sendrawtransaction(hexstring)
-        @client.request 'sendrawtransaction', hexstring
+        @client.send 'sendrawtransaction', hexstring
       end
       # +amount+ is a real and is rounded to 8 decimal places
       def sendtoaddress(bitcoinaddress, amount, comment = nil, comment_to = nil)
-        @client.request 'sendtoaddress', bitcoinaddress, amount, comment, comment_to
+        @client.send 'sendtoaddress', bitcoinaddress, amount, comment, comment_to
       end
 
       def sendmany(fromaccount, addresses_amounts, minconf = 1, comment = nil)
-        @client.request 'sendmany', fromaccount, addresses_amounts, minconf, comment
+        @client.send 'sendmany', fromaccount, addresses_amounts, minconf, comment
       end
 
       # Sets the account associated with the given address.
       def setaccount(bitcoinaddress, account)
-        @client.request 'setaccount', bitcoinaddress, account
+        @client.send 'setaccount', bitcoinaddress, account
       end
 
       # +generate+ is true or false to turn generation on or off.
       # Generation is limited to +genproclimit+ processors, -1 is unlimited.
       def setgenerate(generate, genproclimit = -1)
-        @client.request 'setgenerate', generate, genproclimit
+        @client.send 'setgenerate', generate, genproclimit
       end
 
       # Sign inputs for raw transaction (serialized, hex-encoded).
       def signrawtransaction(hexstring, transaction = nil, privatekey =nil, sighashtype = "ALL")
-        @client.request 'signrawtransaction', hexstring, transaction, privatekey, sighashtype
+        @client.send 'signrawtransaction', hexstring, transaction, privatekey, sighashtype
       end
 
       # Stop bitcoin server.
       def stop
-        @client.request 'stop'
+        @client.send 'stop'
       end
 
       # Return information about +bitcoinaddress+.
       def validateaddress(bitcoinaddress)
-        @client.request 'validateaddress', bitcoinaddress
+        @client.send 'validateaddress', bitcoinaddress
       end
 
       # Sign a message using +bitcoinaddress+.
       def signmessage(bitcoinaddress, message)
-        @client.request 'signmessage', bitcoinaddress, message
+        @client.send 'signmessage', bitcoinaddress, message
       end
 
       # Verify signature made by +bitcoinaddress+.
       def verifymessage(bitcoinaddress, signature, message)
-        @client.request 'verifymessage', bitcoinaddress, signature, message
+        @client.send 'verifymessage', bitcoinaddress, signature, message
       end
 
       # Stores the wallet decryption key in memory for +timeout+ seconds.
       def walletpassphrase(passphrase, timeout)
-        @client.request 'walletpassphrase', passphrase, timeout
+        @client.send 'walletpassphrase', passphrase, timeout
       end
 
       # Removes the wallet encryption key from memory, locking the wallet.
@@ -285,7 +287,7 @@ module Rallet
       # before being able to call any methods which require the wallet to be
       # unlocked.
       def walletlock
-        @client.request 'walletlock'
+        @client.send 'walletlock'
       end
 
       alias account getaccount

data/rallet.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency 'rest-client', '~> 1.7', '>= 1.7.2'
+  spec.add_runtime_dependency 'rpcjson'
   spec.add_development_dependency 'bundler', '~> 1.3'
   spec.add_development_dependency 'rake', '~> 10.1'
 end

metadata

@@ -1,35 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: rallet
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Mustafa Turan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-07 00:00:00.000000000 Z
+date: 2015-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rest-client
+  name: rpcjson
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.2
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.2
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement