bitsharesws 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ffb09945dec4ea9a6dd1eabdd6a0662ec78a65bb
-  data.tar.gz: a0d483783cbb4684639b97bd8154ee27372fceab
+  metadata.gz: 7374bf44acc25661affc59bbd6676466e8bff951
+  data.tar.gz: 1ff5e2a204e88b253c2382c290c9b6fee050651c
 SHA512:
-  metadata.gz: 38dacfaddff43e177c58d2c1b266aa477009013a0214255792231d8bbd3488c237972c9cd51dbbcaaa6dea8a5b1bf5614fa9905e1f7885b7f015ad7e06c84880
-  data.tar.gz: a79875860e1a4ab9a7b829d8425acfe533134a343f3703b4c5027dd0e355600cbebc328e6540f6a44e5a20390bd8cc14e588ea971557785a7756a560188c952f
+  metadata.gz: ea17326e699b71ee702a82181f7363a2f12f99c7f552323dcde94fbe0a7328ce47b3f9eeff2f8f95cbb222b22f0e04c4bf7d7bb9f4e5dc2c8127877b86e50455
+  data.tar.gz: 619f64a211bfa852fb2a9adca9f77f32138332aa36fbdce8b9309930f05208899a4ac6574d14d433154285edad6a2f4d8706803fa68669ad2754eab4efa7e17c

data/bitsharesws.gemspec

@@ -5,7 +5,7 @@ require "bitshares/version"
 
 Gem::Specification.new do |spec|
   spec.name          = "bitsharesws"
-  spec.version       = Bitshares::VERSION
+  spec.version       = BitShares::VERSION
   spec.authors       = ["scientistnik"]
   spec.email         = ["nozdrin.plotnitsky@gmail.com"]
 

data/lib/bitshares.rb

@@ -2,13 +2,14 @@ require 'bitshares/version'
 
 module BitShares
 	autoload :WSocket,	'bitshares/wsocket'
+	autoload :RPC,			'bitshares/rpc'
+	autoload :API,			'bitshares/api'
 	autoload :Wallet,		'bitshares/wallet'
 	autoload :Asset,		'bitshares/asset'
 	autoload :Account,	'bitshares/account'
 
-	class << self
 
-		attr_accessor :login, :pass
+	class << self
 
 		def config autoconnect=true, &block
 			@node = 'wss://node.testnet.bitshares.eu'
@@ -18,50 +19,39 @@ module BitShares
 			start if autoconnect
 		end
 
-		def node n=nil
-			n ||= @node
-			@node = n
-		end
+		def node(n=nil)		n ||= @node; @node = n;		end
+		def login(n=nil)	n ||= @login; @login = n; end
+		def pass(n=nil)		n ||= @pass; @pass = n;		end
 
 		def start
 			WSocket.start
-			WSocket.send id: 2, method: 'call', params: [1,'login',[@login,@pass]]
+			RPC.new(1,'login',[@login,@pass]).send
 		end
 
 		def stop() WSocket.stop end
 
-		def database_id
-			@database_id ||= WSocket.send(id: 2, method: 'call', params: [1,'database',[]])['result']
-		end
-
 		def account name
-			answer = WSocket.send id: 2, method: "call", params: [database_id,"get_account_by_name",[name]]
-			raise 'Bad request...' if answer.key? 'error'
-			Account.new answer['result']
+			Account[name]
 		end
 
 		def balance name,*ids
-			answer = WSocket.send id: 2, method: "call", params: [database_id,"get_named_account_balances",[name,ids]]
-			raise 'Bad request...' if answer.key? 'error'
-			answer['result'].inject([]) { |m,w| m << Wallet.new(w) } 
+			Wallet[name,*ids]
 		end
 
 		def assets *ids
-			answer = WSocket.send id: 2, method: 'call', params: [database_id,'get_assets',[ids]]
-			raise 'Bad request...' if answer.key? 'error'
-			answer['result'].inject([]) {|m,a| m << Asset.new(a) }
+			Asset[*ids]
 		end
 
-		def list_assets name, limit=10
-			answer = WSocket.send id: 2, method: 'call', params: [database_id,'list_assets',[name,limit]]
-			raise "Bad request...#{answer}" if answer.key? 'error'
-			answer['result'].inject([]) {|m,a| m << Asset.new(a) }
+		def list_assets name, limit=1
+			Asset.search name, limit
 		end
 
 		def subscribe_callback id, clear_filter=true
-			answer = WSocket.send id: 2, method: 'call', params: [database_id,'set_subscribe_callback',[id,clear_filter]]
-			raise "Bad request...#{answer}" if answer.key? 'error'
-			answer['result']
+			RPC.new('set_subscribe_callback', [id, clear_filter]).send
+		end
+
+		def transfer that, amount, from, to
+			RPC.new 'transfer',[]
 		end
 
 	end

data/lib/bitshares/account.rb

@@ -9,5 +9,15 @@ module BitShares
 		end
 
 		def to_s() @name end
+
+		def balance *ids
+			Wallet[@name,*ids]
+		end
+
+		class << self
+			def [] name
+				new RPC.new('get_account_by_name',[name]).send
+			end
+		end
 	end
 end

data/lib/bitshares/api.rb

@@ -0,0 +1,143 @@
+module BitShares
+	class Api < Array
+		attr_reader :name
+
+		def initialize name, arr
+			@name = name
+			self.concat arr
+		end
+
+		def id
+			@id ||= RPC.new(1, @name, [[]]).send
+		end
+
+		def rpc method, params
+			RPC.new id, method, params
+		end
+
+		class << self
+
+			def init
+				return @apis unless @apis.nil?
+
+				@apis = []
+				@apis << API.new('database',
+				%w(
+					get_objects
+					set_subscribe_callback
+					set_pending_transaction_callback
+					set_block_applied_callback
+					cancel_all_subscriptions
+					get_block_header
+					get_block
+					get_transaction
+					get_recent_transaction_by_id
+					get_chain_properties
+					get_global_properties
+					get_config
+					get_chain_id
+					get_dynamic_global_properties
+					get_key_references
+					get_accounts
+					get_full_accounts
+					get_account_by_name
+					get_account_references
+					lookup_account_names
+					lookup_accounts
+					get_account_count
+					get_account_balances
+					get_named_account_balances
+					get_balance_objects
+					get_vested_balances
+					get_vesting_balances
+					get_assets
+					list_assets
+					lookup_asset_symbols
+					get_order_book
+					get_limit_orders
+					get_call_orders
+					get_settle_orders
+					get_margin_positions
+					subscribe_to_market
+					unsubscribe_from_market
+					get_ticker
+					get_24_volume
+					get_trade_history
+					get_witnesses
+					get_witness_by_account
+					lookup_witness_accounts
+					get_witness_count
+					get_committee_members
+					get_committee_member_by_account
+					lookup_committee_member_accounts
+					get_workers_by_account
+					lookup_vote_ids
+					get_transaction_hex
+					get_required_signatures
+					get_potential_signatures
+					get_potential_address_signatures
+					verify_authority
+					verify_account_authority
+					validate_transaction
+					get_required_fees
+					get_proposed_transactions
+					get_blinded_balances
+				))
+
+				@apis << API.new('history',
+				%w(
+					get_account_history
+					get_fill_order_history
+					get_market_history
+					get_market_history_buckets
+				))
+
+				@apis << API.new('network_broadcast',
+				%w(
+					broadcast_transaction
+					broadcast_transaction_with_callback
+					broadcast_block
+				))
+
+				@apis << API.new('crypto',
+				%w(
+					blind_sign
+					unblind_signature
+					blind
+					blind_sum
+					range_get_info
+					range_proof_sign
+					verify_sum
+					verify_range
+					verify_range_proof_rewind
+				))
+				@apis
+			end
+
+			def get_id_by_name name
+				@apis ||= init
+				@apis.each do |api|
+					return(api.id) if api.include? name
+				end
+				nil
+			end
+
+			def rpc method, params
+				@apis ||= init
+				RPC.new get_id_by_name(method), method, params
+			end
+
+			def [] name
+				@apis ||= init
+				@apis.each do |api|
+					return api if api.name == name
+				end
+				nil
+			end
+
+		end
+	end
+
+	API = Api
+
+end

data/lib/bitshares/asset.rb

@@ -14,17 +14,28 @@ module BitShares
 		end
 
 		class << self
-			def [] id
+			def [] *ids
+				id = ids.first
 				if /^\d\.\d*\.\d*/.match(id)
-					BitShares.assets id unless hash.key? id
-					hash[id] 
+					unless hash.key? id
+						arr = RPC.new('get_assets',[[id]]).send.inject([]) {|m,a| m << Asset.new(a) }
+					end
+					(ids.size == 1) ? (hash[ida]) : (arr) 
 				else
+					arr = []
 					hash.each_pair do |k,v|
-						return v if v.name == id
+						if ids.include? v.name
+							(ids.size == 1) ? (return v) : (arr << v)
+						end
 					end
+					arr
 				end
 			end
 
+			def search name, limit=1
+				Rpc.new('list_assets',[name,limit]).send.inject([]) {|m,a| m << Asset.new(a) }
+			end
+
 			def add h
 				hash[h.id] = h unless hash.key? h.id
 			end

data/lib/bitshares/rpc.rb

@@ -0,0 +1,24 @@
+module BitShares
+	class Rpc < Hash
+
+		def initialize *args, name, params
+			id, api_id = *args
+			if api_id.nil?
+				api_id = id
+				id = 1
+			end
+			self[:method] = 'call'
+			self[:id] = id
+			self[:jsonrpc] = '2.0'
+			self[:params] = [api_id || API.get_id_by_name(name), name, params]
+		end
+
+		def send
+			WSocket.send self
+		end
+
+	end
+
+	RPC = Rpc
+
+end

data/lib/bitshares/version.rb

@@ -1,3 +1,3 @@
-module Bitshares
-  VERSION = "0.0.3"
+module BitShares
+  VERSION = "0.0.4"
 end

data/lib/bitshares/wallet.rb

@@ -5,5 +5,11 @@ module BitShares
 			@amount = hash['amount']
 			@asset = BitShares::Asset[hash['asset_id']]
 		end
+
+		class << self
+			def [] name, *ids
+				RPC.new('get_named_account_balances',[name,ids]).send.inject([]) {|m,a| m << Wallet.new(a) }
+			end
+		end
 	end
 end

data/lib/bitshares/wsocket.rb

@@ -23,6 +23,7 @@ module BitShares
 			end
 
 			def thread() @thread end
+			def msgs() @msgs ||= {} end
 
 			def stop
 				EventMachine.stop
@@ -31,12 +32,18 @@ module BitShares
 			def send hash
 				id = hash[:id]
 				count = 0
-				while @msgs[id] != nil do
+				while msgs[id] != nil do
 					sleep 0.1
 					count += 1
 					raise "TimeoutError..." if count > 100
 				end
-				@thread[:ws].send hash.to_json if @status == :connected
+
+				if @status == :connected
+					@thread[:ws].send hash.to_json
+				else
+					return nil
+				end
+
 				count = 0
 				while @msgs[id].nil? and @status == :connected do
 					sleep 0.1
@@ -48,13 +55,14 @@ module BitShares
 				lock.synchronize do
 					@msgs[id] = nil
 				end
-				result
+				raise("Bad request...#{result}") if result.nil? || result.key?('error')
+				result['result']
 			end
 
 			def lock() @lock ||= Mutex.new end
 
 			def get_notice
-				if @msgs.key?('notice') && !@msgs['notice'].nil?
+				if msgs.key?('notice') && !@msgs['notice'].nil?
 					msg = @msgs['notice']
 					lock.synchronize do
 						@msgs['notice'] = nil

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bitsharesws
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - scientistnik
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-09-15 00:00:00.000000000 Z
+date: 2017-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -99,7 +99,9 @@ files:
 - bitsharesws.gemspec
 - lib/bitshares.rb
 - lib/bitshares/account.rb
+- lib/bitshares/api.rb
 - lib/bitshares/asset.rb
+- lib/bitshares/rpc.rb
 - lib/bitshares/version.rb
 - lib/bitshares/wallet.rb
 - lib/bitshares/wsocket.rb