poloapi 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d291e88252736677abeeac54fa97dc00d0274ba6
-  data.tar.gz: 4f589d42a2c5aae5592f8c4bc01c3d30855a1fd4
+  metadata.gz: 19662735efb5e40605a6dae34a14013eb1f8a4d3
+  data.tar.gz: cf5696a0be2032aef2205cca9ebe82018dba93ce
 SHA512:
-  metadata.gz: 57a1ffcfff25ccb2c02193c1649cbfcc2950c0cd6205db0a75f50f37620b629e9449ffc0e8958199f77dc335a7d241310228e09054489b9481022a88bde20a1f
-  data.tar.gz: ce49d5966ea01642df506a88d4685d76348e84535587509b710e432c873352e5b3c76d69538be0f5aacd2fe41c7a68a042400bd7abce56f6dfeb07100782250b
+  metadata.gz: 6d262cc00f8d9313973fac535cb343ce27f177b8db58b415cbabddb513f2592b646a5bacf7489233d9b3c625f744a0eba57c65414471379b42621ac0ce1f2445
+  data.tar.gz: dfb2b3c80b3894204a87acc7494881b96b7d3e23b181a86c661e52cab26ea060fd01fd6f69f840a281fea45e276ff0d7018bc2f85c79f2b535790199f6c5b173

data/examples/lending.rb

@@ -10,12 +10,15 @@ require 'bigdecimal'
 
 require 'pp'
 
+# require 'pry'
+
 
 $PRGNAME="lending"
 $options = {}
 $options['loglevel'] = 'WARN'
-# $options['loglevel'] = "INFO"
 $options['logname'] = nil
+$options['dryrun'] = false
+$options['singleloop'] = false
 
 # $options['maxordertime']=300
 $options['maxordertime']=1500
@@ -29,8 +32,10 @@ $options['loanmin'] = 0.0001 # global loan minimum rate
 $options['loanmincur']= {'BTC' => 0.0003000, 'ETH' => 0.0002 } # minimum rate per currency
 $options['loanmaxorderamount'] = '1.32' # in front of which max order to put
 $options['loanmaxorderamountcur'] = {'BTC' => 1.32, 'ETH' => 10.1 }
-$options['loanmaxordercount'] = '25' # when this number of orders reach, don't create new orders
-$options['loanmaxordercountcur'] = {'BTC' => 25, 'ETH' => 30 } # when this number of orders reach, don't create new orders
+$options['loanmaxordersum'] = '3'
+$options['loanmaxordersumcur'] = {'BTC' => 3.00, 'ETH' => 10.0 }
+
+$options['loanorderdeduct'] = '0.000001' # how much to deduct from wall order (to execute order before order wall)
 
 # helpful class for logger
 class MultiDelegator
@@ -87,6 +92,17 @@ OptionParser.new do |opts|
 		$log.level = Logger::INFO
 	end
 
+	opts.on("-1", "--[no-]singleloop", "Perform single loop") do |v|
+		$options['singleloop'] = v
+	end
+
+	opts.on("-r", "--[no-]report", "Report only in single loop") do |v|
+		$options['report'] = v
+		$options['singleloop'] = v
+		$options['dryrun'] = v
+		$log.level = Logger::INFO
+	end
+
 	opts.on("-d", "--[no-]debug", "Run in debug mode") do |v|
 		$options['debug'] = v
 		$log.level = Logger::DEBUG
@@ -147,11 +163,15 @@ def getBestPossibleLoanOrder(curid)
 		numloanoffers = loanorders["offers"].count
 		exorder = loanorders["offers"].first 
 		bestorder = loanorders["offers"].last
+		sumamount = BigDecimal.new('0.0')
+		maxsumamount = BigDecimal.new($options['loanmaxordersum'])
 		loanorders["offers"].each_with_index do |offer,offid|
-			if offer["amount"] > $options['loanmaxorderamount'] then
-				bestorder = offer
+			sumamount=sumamount+BigDecimal.new(offer['amount'])
+			if offer["amount"] > $options['loanmaxorderamount'] or (not $options['loanmaxordersum'].nil? and sumamount > maxsumamount) then
+				bestorder = offer.dup
 				# bestorder['rate'] = (bestorder['rate'].to_f - 0.00000001).to_s
-				bestorder['rate'] = (BigDecimal.new(bestorder['rate']) - BigDecimal.new('0.00000001')).to_s('F')
+				bestrate=(BigDecimal.new(bestorder['rate'])) - (BigDecimal.new($options['loanorderdeduct']))
+				bestorder['rate'] = bestrate.to_s('F')
 				$log.info("Looking best possible place, With #{numloanoffers} order(s), best possible order is (skipped #{offid}): #{bestorder['rate']}, higher is #{offer['rate']} with amount #{offer['amount']}")
 				break
 			else
@@ -175,10 +195,7 @@ def getMinLoanOrder(curid,options)
 	return minorder
 end
 
-while true
-$log.info("Starting loop")
-
-begin
+def mainLoop()
 myofferloans=JSON.parse(Poloapi.post('returnOpenLoanOffers'))
 unless myofferloans.nil?
 	myofferloans.each do |cur,items|
@@ -263,10 +280,13 @@ unless mybalances.nil? or mybalances.empty?
 					orderstate="Minimum reached: #{minorder}."
 					loanorder=minorder
 				end
-				# TODO if $options['loanmaxordercount']
-				$log.warn("#{orderstate} Creating lend offer for #{cur[0]} #{cur[1]} with rate #{loanorder}")
-				loanorders=JSON.parse(Poloapi.post('createLoanOffer', {:currency => cur[0], :amount => cur[1], :duration => $options['loanduration'], :autoRenew => $options['loanautorenew'], :lendingRate => loanorder}))
-				$log.info(loanorders.to_s)
+				if $options['dryrun'] then
+					$log.warn("Dry run - #{orderstate} Not creating lend offer for #{cur[0]} #{cur[1]} with rate #{loanorder}")
+				else
+					$log.warn("#{orderstate} Creating lend offer for #{cur[0]} #{cur[1]} with rate #{loanorder}")
+					loanorders=JSON.parse(Poloapi.post('createLoanOffer', {:currency => cur[0], :amount => cur[1], :duration => $options['loanduration'], :autoRenew => $options['loanautorenew'], :lendingRate => loanorder}))
+					$log.info(loanorders.to_s)
+				end
 			end
 		end
 	else
@@ -317,13 +337,19 @@ unless myactloans["provided"].nil?
 	end
 end
 
-rescue StandardError => e
-	$log.warn("Error #{$!}: #{e.backtrace}")
-end
+end # mainLoop()
 
-$log.info("Finishing up and sleeping for #{$options['sleeploop']}")
-sleep $options['sleeploop']
+if $options['singleloop'] then
+	mainLoop()
+else
+	while true
+		$log.info("Starting loop")
+		begin
+			mainLoop()
+		rescue StandardError => e
+			$log.warn("Error #{$!}: #{e.backtrace}")
+		end
+		$log.info("Finishing up and sleeping for #{$options['sleeploop']}")
+		sleep $options['sleeploop']
+	end
 end
-
-
-

data/lib/poloapi/version.rb

@@ -1,3 +1,3 @@
 module Poloapi
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: poloapi
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Vlatko Kosturjak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-19 00:00:00.000000000 Z
+date: 2017-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler