fixed some issues and removed leftover debug code

Author: cryptonaut420

crypto-gateway.php

@@ -7,6 +7,7 @@
 require_once('conf/config.php');
 include(FRAMEWORK_PATH.'/functions.php');
 
+
 if(!isset($argv[1])){
 	//load it up!
 	echo "Constructing gateway system\n";

lib/BitcoinRPC.php

@@ -199,7 +199,7 @@ public function sendfromaddress($address, $amount, $to, $fee = 0.00001)
 		}
 
 		if($totalFound < ($amount + $fee)){
-			throw new Exception('Insufficient funds at this address (need '.(($amount + fee) - $totalFound));
+			throw new Exception('Insufficient funds at this address (need '.(($amount + $fee) - $totalFound).')');
 		}
 
 		$rawInputs = array();

lib/Gateway.php

@@ -42,6 +42,7 @@ function __construct($source, $token, $accepted = array('BTC' => 1), $title = fa
 		$this->btc = new BitcoinRPC(BTC_CONNECT);
 		$this->xcp = new BitcoinRPC(XCP_CONNECT);
 
+		
 		//setup list of transactions to ignore
 		$getIgnore = $this->getAll('ignore_tx');
 		foreach($getIgnore as $row){
@@ -251,14 +252,25 @@ protected function getCounterpartySends($vend_token, $accepted = array(), $noFee
 						$fee = round(($groupQuantity * ($this->service_fee / 100)), 8);	
 					}
 				}
-				$finalQuantity = $groupQuantity - $fee;
+				$finalQuantity = round($groupQuantity - $fee, 8);
 				$send_amount = $finalQuantity * $rate;
-				
 				if($send_amount < $this->min_amount){
+					$sendThreshold = 0.02;
+					$sendDiff = $this->min_amount - $send_amount;
+					$sendPercent = $sendDiff / $this->min_amount;
+					if($sendPercent <= $sendThreshold){
+						$send_amount = $this->min_amount;
+					}
+					else{
 					//echo "[".$this->gateway_title."] Not enough ".$send['asset']." funds from ".$send['source'].", waiting (".$groupQuantity." = ".$send_amount.")\n";
-					continue;
+						continue;
+					}
 				}
 
+				
+			
+				
+
 				$item = array();
 				$item['income'] = $grouped[$send['source']][$send['asset']];
 				$item['fee'] = $fee;
@@ -299,7 +311,8 @@ protected function getBitcoinSends($vend_token, $rate, $noFee = false)
 		foreach($get_api['data']['txs'] as $tx){
 			if($tx['confirmations'] >= $this->min_confirms
 			AND $tx['amount'] > 0
-			AND $tx['amount_multisig'] == 0){
+			AND $tx['amount_multisig'] == 0
+			AND $tx['amount'] != 0.0000543){ //temp to filter out counterwallet transactions
 
 				//check if this transaction has been seen before
 				$checkTx = $this->getAll('transactions', array('type' => 'gateway_receive',
@@ -439,7 +452,7 @@ protected function vend($sends)
 					if($balance['asset'] == $vendAsset){
 						$found = true;
 						$divisible = true;
-						if(isset($this->accepted[$vendAsset])){
+						if(isset($this->accepted_info[$vendAsset])){
 							$divisible = $this->accepted_info[$vendAsset]['divisible'];
 						}
 						if($divisible){
@@ -468,7 +481,7 @@ protected function vend($sends)
 		//unlock wallet
 		try{
 			echo "Unlocking wallet\n";
-			$this->btc->walletpassphrase(XCP_WALLET, 300);
+			$this->btc->walletpassphrase(XCP_WALLET, 10000);
 		}
 		catch(Exception $e){
 			throw new Exception("Could not unlock wallet: ".$e->getMessage()." ".timestamp()."\n");
@@ -497,7 +510,18 @@ protected function vend($sends)
 					default:
 						echo "Sending XCP TX\n";
 						//send out counterparty tokens
-						$quantity = (int)round(round($send['amount'], 8) * SATOSHI_MOD);
+						$divisible = true;
+						if(isset($this->accepted_info[$vendAsset])){
+							$divisible = $this->accepted_info[$vendAsset]['divisible'];
+						}
+						if($divisible){
+							$quantity = (int)round(round($send['amount'], 8) * SATOSHI_MOD);
+						}
+						else{
+							$quantity = floor($send['amount']);
+						}
+						
+						
 						$sendData = array('source' => $this->source_address, 'destination' => $send['send_to'],
 										  'asset' => $send['vend_token'], 'quantity' => $quantity, 'allow_unconfirmed_inputs' => true,
 										  'pubkey' => $this->source_pubkey,
@@ -507,8 +531,8 @@ protected function vend($sends)
 										  );
 
 						$getRaw = $this->xcp->create_send($sendData);
-						$sign = $this->xcp->sign_tx(array('unsigned_tx_hex' => $getRaw));
-						$sendTX = $this->xcp->broadcast_tx(array('signed_tx_hex' => $sign));
+						$sign = $this->btc->signrawtransaction($getRaw);
+						$sendTX = $this->btc->sendrawtransaction($sign['hex']);
 						break;
 				}
 			}
@@ -634,7 +658,7 @@ protected function autoInflateToken($token, $needed = 0)
 		}
 
 		try{
-			$this->btc->walletpassphrase(XCP_WALLET, 300);
+			$this->btc->walletpassphrase(XCP_WALLET, 10000);
 		}
 		catch(Exception $e){
 			throw new Exception("Could not unlock wallet: ".$e->getMessage()."\n");
@@ -644,8 +668,8 @@ protected function autoInflateToken($token, $needed = 0)
 						   'asset' => $token, 'allow_unconfirmed_inputs' => true, 'description' => $this->accepted_info[$token]['description']);
 
 		$getRaw = $this->xcp->create_issuance($issueData);
-		$sign = $this->xcp->sign_tx(array('unsigned_tx_hex' => $getRaw));
-		$sendTX = $this->xcp->broadcast_tx(array('signed_tx_hex' => $sign));						   
+		$sign = $this->btc->signrawtransaction($getRaw);
+		$sendTX = $this->btc->sendrawtransaction($sign['hex']);					   
 
 		try{
 			$this->btc->walletlock();
@@ -838,8 +862,8 @@ public function refund($send)
 								  );
 
 				$getRaw = $this->xcp->create_send($sendData);
-				$sign = $this->xcp->sign_tx(array('unsigned_tx_hex' => $getRaw));
-				$sendTX = $this->xcp->broadcast_tx(array('signed_tx_hex' => $sign));
+				$sign = $this->btc->signrawtransaction($getRaw);
+				$sendTX = $this->btc->sendrawtransaction($sign['hex']);
 			}
 
 			if($sendTX){