blocksdk 0.0.5 → 0.1.3

data/lib/blocksdk_ruby/bitcoincash.rb

@@ -1,17 +1,15 @@
 require_relative 'base'
 
 class BitcoinCash < Base
-
-	def getBlockChain(request = {})		
-		return request("GET","/bch/block")
+	def getBlockChain(request = {})
+		return request("GET","/bch/info")
 	end
-
 	def getBlock(request = {})
 		request["rawtx"].to_s.empty? ? request['rawtx'] = false : request['rawtx']
 		request["offset"].to_s.empty? ? request['offset'] = 0 : request["offset"]
 		request["limit"].to_s.empty? ? request['limit'] = 10 : request["limit"]
 		
-		return request("GET","/bch/block/" + (request['block']).to_s + "",{
+		return request("GET","/bch/blocks/"+ (request['block']).to_s, {
 			"rawtx" => request['rawtx'],
 			"offset" => request['offset'],
 			"limit" => request['limit']
@@ -29,15 +27,15 @@ class BitcoinCash < Base
 			"limit" => request['limit']
 		})
 	end
-
+	
 	def getAddressInfo(request = {})
 
-		request["reverse"].to_s.empty? ? request['reverse'] = true : request['reverse']
-		request["rawtx"].to_s.empty? ? request['rawtx'] = nil : request['rawtx']
+		request["reverse"].to_s.empty? ? request['reverse'] = true : request["reverse"]
+		request["rawtx"].to_s.empty? ? request['rawtx'] = false : request['rawtx']
 		request["offset"].to_s.empty? ? request['offset'] = 0 : request["offset"]
 		request["limit"].to_s.empty? ? request['limit'] = 10 : request["limit"]
 		
-		return request("GET","/bch/address/" +    (request['address']).to_s + "",{
+		return request("GET","/bch/addresses/" + (request['address']).to_s,{
 			"reverse" => request['reverse'],
 			"rawtx" => request['rawtx'],
 			"offset" => request['offset'],
@@ -46,113 +44,127 @@ class BitcoinCash < Base
 	end
 	
 	def getAddressBalance(request = {})
-		return request("GET","/bch/address/" +    (request['address']).to_s + "/balance")
+		return request("GET","/bch/addresses/" + (request['address']).to_s + "/balance")
 	end
 
-	def listWallet(request = {})
+	def getWallets(request = {})
 		request["offset"].to_s.empty? ? request['offset'] = 0 : request["offset"]
 		request["limit"].to_s.empty? ? request['limit'] = 10 : request["limit"]
-		return request("GET","/bch/wallet",{
+		
+		return request("GET","/bch/wallets",{
 			"offset" => request['offset'],
 			"limit" => request['limit']
 		})
 	end
 	
-	def createWallet(request = {})
-		request["name"].to_s.empty? ? request['name'] = 0 : request["name"]		
-		return request("POST","/bch/wallet",{
+	def getWallet(request = {})
+		return request("GET","/bch/wallets/"+     (request['wallet_id']).to_s + "")
+	end
+	
+	def createHdWallet(request = {})
+		request["limit"].to_s.empty? ? request['limit'] = nil : request["limit"]
+		return request("POST","/bch/wallets/hd",{
 			"name" => request['name']
 		})
 	end
-	
+
 	def loadWallet(request = {})
-		return request("POST","/bch/wallet/" +    (request['wallet_id']).to_s + "/load",{
-			"seed_wif" => request['seed_wif'],
+		return request("POST","/bch/wallets/"+ (request['wallet_id']).to_s + "/load",{
+			"wif" => request['wif'],
 			"password" => request['password']
 		})
 	end
-	
-	def unLoadWallet(request = {})
-		return request("POST","/bch/wallet/" +    (request['wallet_id']).to_s + "/unload")
+
+	def unloadWallet(request = {})
+		return request("POST","/bch/wallets/"+(request['wallet_id']).to_s + "/unload")
 	end
-	
-	def listWalletAddress(request = {})
 
-		request["hdkeypath"].to_s.empty? ? request['hdkeypath'] = nil : request["hdkeypath"]
+	def getWalletAddress(request = {})
 		request["address"].to_s.empty? ? request['address'] = nil : request["address"]
+		request["hdkeypath"].to_s.empty? ? request['hdkeypath'] = nil : request["hdkeypath"]
 		request["offset"].to_s.empty? ? request['offset'] = 0 : request["offset"]
 		request["limit"].to_s.empty? ? request['limit'] = 10 : request["limit"]
 		
-		return request("GET","/bch/wallet/" + (request['wallet_id']).to_s + "/address",{
+		return request("GET","/bch/wallets/"+(request['wallet_id']).to_s + "/addresses",{
 			"address" => request['address'],
 			"hdkeypath" => request['hdkeypath'],
 			"offset" => request['offset'],
 			"limit" => request['limit']
 		})
 	end
-	
+
 	def createWalletAddress(request = {})
-		request["seed_wif"].to_s.empty? ? request['seed_wif'] = nil : request["seed_wif"]
+
+		request["wif"].to_s.empty? ? request['wif'] = nil : request["wif"]
 		request["password"].to_s.empty? ? request['password'] = nil : request["password"]
 		
-		return request("POST","/bch/wallet/" + (request['wallet_id']).to_s + "/address",{
-			"seed_wif" => request['seed_wif'],
+		return request("POST","/bch/wallets/"+(request['wallet_id']).to_s + "/addresses",{
+			"wif" => request['wif'],
 			"password" => request['password']
 		})
-	end	
-	
-	def getWalletBalance(request = {})
-		return request("GET","/bch/wallet/" + (request['wallet_id']).to_s + "/balance")
 	end
 
-	def getWalletTransaction(request = {})
+	def getWalletBalance(request = {})	
+		return request("GET","/bch/wallets/"+(request['wallet_id']).to_s + "/balance")		
+	end
+
+	def getWalletTransactions(request = {})
 
-		request["category"].to_s.empty? ? request['category'] = 'all' : request["category"]
 		request["order"].to_s.empty? ? request['order'] = 'desc' : request["order"]
+		request["type"].to_s.empty? ? request['type'] = 'all' : request["type"]
 		request["offset"].to_s.empty? ? request['offset'] = 0 : request["offset"]
 		request["limit"].to_s.empty? ? request['limit'] = 10 : request["limit"]
-		
-		return request("GET","/bch/wallet/" + (request['wallet_id']).to_s + "/transaction",{
-			"category" => request['category'],
+
+		return request("GET","/bch/wallets/"+(request['wallet_id']).to_s + "/transaction",{
+			"type" => request['type'],
 			"order" => request['order'],
 			"offset" => request['offset'],
 			"limit" => request['limit']
 		})
 	end
-	
+
 	def sendToAddress(request = {})
-		
+
 		if request["kbfee"].to_s.empty?
 			blockChain = getBlockChain()
 			request['kbfee'] = blockChain['medium_fee_per_kb']
 		end
-
-		request["seed_wif"].to_s.empty? ? request['seed_wif'] = nil : request["seed_wif"]
+		
+		request["wif"].to_s.empty? ? request['wif'] = nil : request["wif"]
 		request["password"].to_s.empty? ? request['password'] = nil : request["password"]
+		request["subtractfeefromamount"].to_s.empty? ? request['subtractfeefromamount'] = false : request['subtractfeefromamount']
 		
-		return request("POST","/bch/wallet/" + (request['wallet_id']).to_s + "/sendtoaddress",{
+		return request("POST","/bch/wallets/"+     (request['wallet_id']).to_s + "/sendtoaddress",{
 			"address" => request['address'],
 			"amount" => request['amount'],
-			"seed_wif" => request['seed_wif'],
+			"wif" => request['wif'],
 			"password" => request['password'],
-			"kbfee" => request['kbfee']
+			"kbfee" => request['kbfee'],
+			"subtractfeefromamount" => request['subtractfeefromamount']
 		})
 	end
-	
+
 	def sendMany(request = {})
 		
-		request["seed_wif"].to_s.empty? ? request['seed_wif'] = nil : request["seed_wif"]
+		request["wif"].to_s.empty? ? request['wif'] = nil : request["wif"]
 		request["password"].to_s.empty? ? request['password'] = nil : request["password"]
-
-		return request("POST","/bch/wallet/" + (request['wallet_id']).to_s + "/sendmany",{
+		request["subtractfeefromamount"].to_s.empty? ? request['subtractfeefromamount'] = false : request['subtractfeefromamount']
+		
+		return request("POST","/bch/wallets/"+     (request['wallet_id']).to_s + "/sendmany",{
 			"to" => request['to'],
-			"seed_wif" => request['seed_wif'],
-			"password" => request['password']
+			"wif" => request['wif'],
+			"password" => request['password'],
+			"subtractfeefromamount" => request['subtractfeefromamount']
 		})
 	end
 
-	def getTransaction(request = {})
-		return request("GET","/bch/transaction/" + (request['hash']).to_s + "")
+	def sendTransaction(request = {})
+		return request("POST","/bch/transactions/send",{
+			"hex" => request['hex']
+		})
 	end
 
-end
+	def getTransaction(request = {})
+		return request("GET","/bch/transactions/"+     (request['hash']).to_s + "")
+	end
+end

data/lib/blocksdk_ruby/blocksdk.rb

@@ -6,7 +6,9 @@ require_relative 'bitcoincash'
 require_relative 'monero'
 require_relative 'webhook'
 require_relative 'litecoin'
-require_relative 'price'
+require_relative 'market'
+require_relative 'token'
+require_relative 'tool'
 
 class BlockSDK < Base
 	attr_accessor :api_token
@@ -31,10 +33,6 @@ class BlockSDK < Base
 		return Monero.new(@api_token)
 	end
 
-	def createPrice()
-		return Price.new(@api_token)
-	end
-
 	def createWebHook()
 		return WebHook.new(@api_token)
 	end
@@ -46,4 +44,16 @@ class BlockSDK < Base
 	def createBitcoinCash()
 		return BitcoinCash.new(@api_token)
 	end
-end
+	
+	def createMarket()
+		return Market.new(@api_token)
+	end
+	
+	def createToken()
+		return Token.new(@api_token)
+	end
+	
+	def createTool()
+		return Tool.new(@api_token)
+	end
+end

data/lib/blocksdk_ruby/dash.rb

@@ -1,75 +1,89 @@
 require_relative 'base'
 
 class Dash < Base
-	
 	def getBlockChain(request = {})
-		return request("GET","/dash/block")
+		return request("GET","/dash/info")
 	end
-
 	def getBlock(request = {})
 		request["rawtx"].to_s.empty? ? request['rawtx'] = false : request['rawtx']
 		request["offset"].to_s.empty? ? request['offset'] = 0 : request["offset"]
 		request["limit"].to_s.empty? ? request['limit'] = 10 : request["limit"]
-       
-		return request("GET","/dash/block/" + (request['block']).to_s, {"rawtx" => request['rawtx'],"offset" => request['offset'],"limit" => request['limit']})
+		
+		return request("GET","/dash/blocks/"+ (request['block']).to_s, {
+			"rawtx" => request['rawtx'],
+			"offset" => request['offset'],
+			"limit" => request['limit']
+		})
 	end
-
+	
 	def getMemPool(request = {})
 		request["rawtx"].to_s.empty? ? request['rawtx'] = false : request['rawtx']
 		request["offset"].to_s.empty? ? request['offset'] = 0 : request["offset"]
 		request["limit"].to_s.empty? ? request['limit'] = 10 : request["limit"]
-		return request("GET","/dash/mempool",{"rawtx" => request['rawtx'],"offset" => request['offset'],"limit" => request['limit']})
+		
+		return request("GET","/dash/mempool",{
+			"rawtx" => request['rawtx'],
+			"offset" => request['offset'],
+			"limit" => request['limit']
+		})
 	end
 	
 	def getAddressInfo(request = {})
-
-		request["rawtx"].to_s.empty? ? request['rawtx'] = nil : request['rawtx']
+		request["rawtx"].to_s.empty? ? request['rawtx'] = false : request['rawtx']
 		request["offset"].to_s.empty? ? request['offset'] = 0 : request["offset"]
 		request["limit"].to_s.empty? ? request['limit'] = 10 : request["limit"]
 		
-		return request("GET","/dash/address/" + (request['address']).to_s, {"rawtx" => request['rawtx'],"offset" => request['offset'],"limit" => request['limit']})
+		return request("GET","/dash/addresses/" + (request['address']).to_s,{
+			"reverse" => request['reverse'],
+			"rawtx" => request['rawtx'],
+			"offset" => request['offset'],
+			"limit" => request['limit']
+		})
 	end
-
 	
 	def getAddressBalance(request = {})
-		return request("GET","/dash/address/" + (request['address']).to_s + "/balance")
+		return request("GET","/dash/addresses/" + (request['address']).to_s + "/balance")
 	end
 
-
-	def listWallet(request = {})
+	def getWallets(request = {})
 		request["offset"].to_s.empty? ? request['offset'] = 0 : request["offset"]
 		request["limit"].to_s.empty? ? request['limit'] = 10 : request["limit"]
 		
-		return request("GET","/dash/wallet",{
+		return request("GET","/dash/wallets",{
 			"offset" => request['offset'],
 			"limit" => request['limit']
 		})
 	end
-
-	def createWallet(request = {})
-
+	
+	def getWallet(request = {})
+		return request("GET","/dash/wallets/"+     (request['wallet_id']).to_s + "")
+	end
+	
+	def createHdWallet(request = {})
 		request["limit"].to_s.empty? ? request['limit'] = nil : request["limit"]
-		
-		return request("POST","/dash/wallet",{
+		return request("POST","/dash/wallets/hd",{
 			"name" => request['name']
 		})
 	end
 
 	def loadWallet(request = {})
-		return request("POST","/dash/wallet/" + (request['wallet_id']).to_s + "/load",{"seed_wif" => request['seed_wif'],"password" => request['password']})
+		return request("POST","/dash/wallets/"+ (request['wallet_id']).to_s + "/load",{
+			"wif" => request['wif'],
+			"password" => request['password']
+		})
 	end
 
-	def unLoadWallet(request = {})
-		return request("POST","/dash/wallet/" + (request['wallet_id']).to_s + "/unload")
+	def unloadWallet(request = {})
+		return request("POST","/dash/wallets/"+(request['wallet_id']).to_s + "/unload")
 	end
 
-	def listWalletAddress(request = {})
-		request["address"].to_s.empty? ? request['address'] = nil : request['address']
+	def getWalletAddress(request = {})
+		request["address"].to_s.empty? ? request['address'] = nil : request["address"]
+		request["hdkeypath"].to_s.empty? ? request['hdkeypath'] = nil : request["hdkeypath"]
 		request["offset"].to_s.empty? ? request['offset'] = 0 : request["offset"]
 		request["limit"].to_s.empty? ? request['limit'] = 10 : request["limit"]
-		request["hdkeypath"].to_s.empty? ? request['hdkeypath'] = nil : request["hdkeypath"]
 		
-		return request("GET","/dash/wallet/" + (request['wallet_id']).to_s + "/address",{
+		return request("GET","/dash/wallets/"+(request['wallet_id']).to_s + "/addresses",{
 			"address" => request['address'],
 			"hdkeypath" => request['hdkeypath'],
 			"offset" => request['offset'],
@@ -79,27 +93,28 @@ class Dash < Base
 
 	def createWalletAddress(request = {})
 
-		request["seed_wif"].to_s.empty? ? request['seed_wif'] = nil : request["seed_wif"]
+		request["wif"].to_s.empty? ? request['wif'] = nil : request["wif"]
 		request["password"].to_s.empty? ? request['password'] = nil : request["password"]
 		
-		return request("POST","/dash/wallet/" + (request['wallet_id']).to_s + "/address",{
-			"seed_wif" => request['seed_wif'],
+		return request("POST","/dash/wallets/"+(request['wallet_id']).to_s + "/addresses",{
+			"wif" => request['wif'],
 			"password" => request['password']
-		})		
+		})
 	end
 
-	def getWalletBalance(request = {})
-		return request("GET","/dash/wallet/" + (request['wallet_id']).to_s + "/balance")
-	end	
-	
-	def getWalletTransaction(request = {})
-		request["category"].to_s.empty? ? request['category'] = 'all' : request["category"]
+	def getWalletBalance(request = {})	
+		return request("GET","/dash/wallets/"+(request['wallet_id']).to_s + "/balance")		
+	end
+
+	def getWalletTransactions(request = {})
+
 		request["order"].to_s.empty? ? request['order'] = 'desc' : request["order"]
+		request["type"].to_s.empty? ? request['type'] = 'all' : request["type"]
 		request["offset"].to_s.empty? ? request['offset'] = 0 : request["offset"]
 		request["limit"].to_s.empty? ? request['limit'] = 10 : request["limit"]
-		
-		return request("GET","/dash/wallet/" + (request['wallet_id']).to_s + "/transaction",{
-			"category" => request['category'],
+
+		return request("GET","/dash/wallets/"+(request['wallet_id']).to_s + "/transaction",{
+			"type" => request['type'],
 			"order" => request['order'],
 			"offset" => request['offset'],
 			"limit" => request['limit']
@@ -107,30 +122,47 @@ class Dash < Base
 	end
 
 	def sendToAddress(request = {})
+
 		if request["kbfee"].to_s.empty?
 			blockChain = getBlockChain()
 			request['kbfee'] = blockChain['medium_fee_per_kb']
 		end
-
-		request["seed_wif"].to_s.empty? ? request['seed_wif'] = nil : request["seed_wif"]
+		
+		request["wif"].to_s.empty? ? request['wif'] = nil : request["wif"]
 		request["password"].to_s.empty? ? request['password'] = nil : request["password"]
+		request["subtractfeefromamount"].to_s.empty? ? request['subtractfeefromamount'] = false : request['subtractfeefromamount']
 		
-		return request("POST","/dash/wallet/" + (request['wallet_id']).to_s + "/sendtoaddress",{"address" => request['address'],"amount" => request['amount'],"seed_wif" => request['seed_wif'],"password" => request['password'],"kbfee" => request['kbfee']})
+		return request("POST","/dash/wallets/"+     (request['wallet_id']).to_s + "/sendtoaddress",{
+			"address" => request['address'],
+			"amount" => request['amount'],
+			"wif" => request['wif'],
+			"password" => request['password'],
+			"kbfee" => request['kbfee'],
+			"subtractfeefromamount" => request['subtractfeefromamount']
+		})
 	end
 
 	def sendMany(request = {})
 		
-		request["seed_wif"].to_s.empty? ? request['seed_wif'] = nil : request["seed_wif"]
+		request["wif"].to_s.empty? ? request['wif'] = nil : request["wif"]
 		request["password"].to_s.empty? ? request['password'] = nil : request["password"]
+		request["subtractfeefromamount"].to_s.empty? ? request['subtractfeefromamount'] = false : request['subtractfeefromamount']
 		
-		return request("POST","/dash/wallet/" + (request['wallet_id']).to_s + "/sendmany",{"to" => request['to'],"seed_wif" => request['seed_wif'],"password" => request['password']})	
+		return request("POST","/dash/wallets/"+     (request['wallet_id']).to_s + "/sendmany",{
+			"to" => request['to'],
+			"wif" => request['wif'],
+			"password" => request['password'],
+			"subtractfeefromamount" => request['subtractfeefromamount']
+		})
 	end
-	
+
 	def sendTransaction(request = {})
-		return request("POST","/dash/transaction",{"sign_hex" => request['sign_hex']})
+		return request("POST","/dash/transactions/send",{
+			"hex" => request['hex']
+		})
 	end
 
 	def getTransaction(request = {})
-		return request("GET","/dash/transaction/" + (request['hash']).to_s)
-	end		
-end
+		return request("GET","/dash/transactions/"+     (request['hash']).to_s + "")
+	end
+end