Merge pull request #46 from whotooktwarden/master

Taylor Warden · Taylor Warden · commit 0fcc81f3e2dd · 2016-03-04T11:30:23.000-05:00
Update Release: Pre-release Version 1.0.8, Roast-Coins Front-End API Endpoints Updated
diff --git a/completed.php b/completed.php
@@ -7,7 +7,7 @@
 //Use a while loop to print each line by ID then append with the newline character
 //assign SQL to a variable for query execution
 
-$sql = "SELECT id, crypto_symbol, crypto_address, external_address, direction,  timestamp, finished FROM coin_index WHERE finished = true;";
+$sql = "SELECT id, crypto_symbol, crypto_address, external_address, is_inbound,  rc_timestamp, finished, bc_blockhash, bc_amount, bc_txid FROM blockchain_transactions WHERE finished = 1 AND bc_txid IS NOT NULL;";
 
 //connect to the database, execute the $sql, store the returned array within $result
 //script exits gracefully if connection cannot be established
@@ -21,7 +21,7 @@
     while($row = $result->fetch_assoc()) {
         echo "id: " . $row["id"]. " - Crypto Symbol: " . $row["crypto_symbol"]. " - Cryptocurrency Address: " . $row["crypto_address"].
 " - External Address: " . $row["external_address"].
- " - Time-stamp: " . $row["timestamp"]. " - Direction: " . $row["direction"]. " - Finished: " . $row["finished"]. "<br />";
+ " - Time-stamp: " . $row["rc_timestamp"]. " - Is Inbound: " . $row["is_inbound"]. " - Finished: " . $row["finished"]. " - Blockhash: ". $row["bc_blockhash"]. " Amount: " . $row["bc_txid"]. " TxID: " . $row["bc_txid"].  "<br />";
     }
 } else {
           //else there were no results, notify RC operator
diff --git a/full_index.php b/full_index.php
@@ -10,18 +10,17 @@
 //Use a while loop to print each line by ID then append with the newline character
 
 //assign SQL to a variable for query execution
-$sql = "SELECT id, crypto_symbol, crypto_address, external_address, direction,  timestamp, finished FROM coin_index;";
+$sql = "SELECT id, crypto_symbol, crypto_address, external_address, is_inbound,  rc_timestamp, finished, bc_blockhash, bc_amount, bc_txid FROM blockchain_transactions;";
 //connect to the database, execute the $sql, store the returned array within $result
 //script exits gracefully if connection cannot be established
 $result = $conn->query($sql);
-
 //if the returned array has data
 if ($result->num_rows > 0) {
     // output data of each row
     while($row = $result->fetch_assoc()) {
         echo "id: " . $row["id"]. " - Crypto Symbol: " . $row["crypto_symbol"]. " - Cryptocurrency Address: " . $row["crypto_address"].
 " - External Address: " . $row["external_address"].
- " - Time-stamp: " . $row["timestamp"]. " - Direction: " . $row["direction"]. " - Finished: " . $row["finished"]. "<br />";
+ " - Time-stamp: " . $row["rc_timestamp"]. " - Is Inbound: " . $row["is_inbound"]. " - Finished: " . $row["finished"]. " - Blockhash: ". $row["bc_blockhash"]. " Amount: " . $row["bc_txid"]. " TxID: " . $row["bc_txid"].  "<br />";
     }
 } else {
           //else there were no results, notify RC operator
diff --git a/get_crypto_symbol_by_external_address.php b/get_crypto_symbol_by_external_address.php
@@ -34,19 +34,18 @@
     died($error_message);
   }
   
-$sql = "SELECT id, crypto_symbol, crypto_address, external_address, direction,  timestamp, finished FROM coin_index WHERE crypto_symbol = ". $cryptocode . " AND WHERE external_address = ". $external .";";
+//assign SQL to a variable for query execution
+$sql = "SELECT id, crypto_symbol, crypto_address, external_address, is_inbound,  rc_timestamp, finished, bc_blockhash, bc_amount, bc_txid FROM blockchain_transactions WHERE crypto_symbol = ". $cryptocode . " AND WHERE external_address = ". $external .";";
 //connect to the database, execute the $sql, store the returned array within $result
 //script exits gracefully if connection cannot be established
-
 $result = $conn->query($sql);
-
 //if the returned array has data
 if ($result->num_rows > 0) {
     // output data of each row
     while($row = $result->fetch_assoc()) {
         echo "id: " . $row["id"]. " - Crypto Symbol: " . $row["crypto_symbol"]. " - Cryptocurrency Address: " . $row["crypto_address"].
 " - External Address: " . $row["external_address"].
- " - Time-stamp: " . $row["timestamp"]. " - Direction: " . $row["direction"]. " - Finished: " . $row["finished"]. "<br />";
+ " - Time-stamp: " . $row["rc_timestamp"]. " - Is Inbound: " . $row["is_inbound"]. " - Finished: " . $row["finished"]. " - Blockhash: ". $row["bc_blockhash"]. " Amount: " . $row["bc_txid"]. " TxID: " . $row["bc_txid"].  "<br />";
     }
 } else {
           //else there were no results, notify RC operator
diff --git a/get_external_address_by_timestamp.php b/get_external_address_by_timestamp.php
@@ -36,20 +36,17 @@
     died($error_message);
   }
   
-$sql = "SELECT id, crypto_symbol, crypto_address, external_address, direction,  timestamp, finished FROM coin_index WHERE timestamp = ". $timestamp . " AND WHERE external_address = ". $external .";";
+$sql = "SELECT id, crypto_symbol, crypto_address, external_address, is_inbound,  rc_timestamp, finished, bc_blockhash, bc_amount, bc_txid FROM blockchain_transactions WHERE rc_timestamp = ". $timestamp . " AND WHERE external_address = ". $external .";";
 //connect to the database, execute the $sql, store the returned array within $result
 //script exits gracefully if connection cannot be established
-
 $result = $conn->query($sql);
-
 //if the returned array has data
-
 if ($result->num_rows > 0) {
     // output data of each row
     while($row = $result->fetch_assoc()) {
         echo "id: " . $row["id"]. " - Crypto Symbol: " . $row["crypto_symbol"]. " - Cryptocurrency Address: " . $row["crypto_address"].
 " - External Address: " . $row["external_address"].
- " - Time-stamp: " . $row["timestamp"]. " - Direction: " . $row["direction"]. " - Finished: " . $row["finished"]. "<br />";
+ " - Time-stamp: " . $row["rc_timestamp"]. " - Is Inbound: " . $row["is_inbound"]. " - Finished: " . $row["finished"]. " - Blockhash: ". $row["bc_blockhash"]. " Amount: " . $row["bc_txid"]. " TxID: " . $row["bc_txid"].  "<br />";
     }
 } else {
           //else there were no results, notify RC operator
diff --git a/get_transactions_by_blockhash.php b/get_transactions_by_blockhash.php
@@ -0,0 +1,30 @@
+<?php
+//Usage: domain.tld/get_transactions_by_blockhash.php?blockhash=blockchain_blockhash
+//Provides an audit of all transactions for any specified blockhash
+require_once 'config.php';
+$conn = mysql_connect($db_host,$db_user,$db_pass)
+or die ('Error connecting to mysql!  Please check config.php and your database for any inconsistencies.');
+//SQL query executed returning an array
+//Use a while loop to print each line by ID then append with the newline character
+//assign SQL to a variable for query execution
+//GET blockhash
+$blockhash = htmlspecialchars($_GET["blockhash"])
+
+$sql = "SELECT id, crypto_symbol, crypto_address, external_address, is_inbound,  rc_timestamp, finished, bc_blockhash, bc_amount, bc_txid FROM blockchain_transactions WHERE bc_blockhash = ". $blockhash .";";
+//connect to the database, execute the $sql, store the returned array within $result
+//script exits gracefully if connection cannot be established
+$result = $conn->query($sql);
+//if the returned array has data
+if ($result->num_rows > 0) {
+    // output data of each row
+    while($row = $result->fetch_assoc()) {
+        echo "id: " . $row["id"]. " - Crypto Symbol: " . $row["crypto_symbol"]. " - Cryptocurrency Address: " . $row["crypto_address"].
+" - External Address: " . $row["external_address"].
+ " - Time-stamp: " . $row["rc_timestamp"]. " - Is Inbound: " . $row["is_inbound"]. " - Finished: " . $row["finished"]. " - Blockhash: ". $row["bc_blockhash"]. " Amount: " . $row["bc_txid"]. " TxID: " . $row["bc_txid"].  "<br />";
+    }
+} else {
+          //else there were no results, notify RC operator
+    echo "0 results";
+}
+$conn->close();
+?>
diff --git a/get_transactions_by_external_address.php b/get_transactions_by_external_address.php
@@ -31,19 +31,17 @@
     died($error_message);
   }
   
-$sql = "SELECT id, crypto_symbol, crypto_address, external_address, direction,  timestamp, finished FROM coin_index WHERE external_address = ". $external .";";
+$sql = "SELECT id, crypto_symbol, crypto_address, external_address, is_inbound,  rc_timestamp, finished, bc_blockhash, bc_amount, bc_txid FROM blockchain_transactions WHERE external_address = ". $external .";";
 //connect to the database, execute the $sql, store the returned array within $result
 //script exits gracefully if connection cannot be established
-
 $result = $conn->query($sql);
-
 //if the returned array has data
 if ($result->num_rows > 0) {
     // output data of each row
     while($row = $result->fetch_assoc()) {
         echo "id: " . $row["id"]. " - Crypto Symbol: " . $row["crypto_symbol"]. " - Cryptocurrency Address: " . $row["crypto_address"].
 " - External Address: " . $row["external_address"].
- " - Time-stamp: " . $row["timestamp"]. " - Direction: " . $row["direction"]. " - Finished: " . $row["finished"]. "<br />";
+ " - Time-stamp: " . $row["rc_timestamp"]. " - Is Inbound: " . $row["is_inbound"]. " - Finished: " . $row["finished"]. " - Blockhash: ". $row["bc_blockhash"]. " Amount: " . $row["bc_txid"]. " TxID: " . $row["bc_txid"].  "<br />";
     }
 } else {
           //else there were no results, notify RC operator
diff --git a/get_transactions_by_txid.php b/get_transactions_by_txid.php
@@ -0,0 +1,31 @@
+<?php
+//Usage: domain.tld/get_transactions_by_txid.php?txid=blockchain_transactionID
+//Provides an audit of all transactions for any specified transaction ID.
+
+require_once 'config.php';
+$conn = mysql_connect($db_host,$db_user,$db_pass)
+or die ('Error connecting to mysql!  Please check config.php and your database for any inconsistencies.');
+//SQL query executed returning an array
+//Use a while loop to print each line by ID then append with the newline character
+//assign SQL to a variable for query execution
+//GET txid
+$txid = htmlspecialchars($_GET["txid"])
+
+$sql = "SELECT id, crypto_symbol, crypto_address, external_address, is_inbound,  rc_timestamp, finished, bc_blockhash, bc_amount, bc_txid FROM blockchain_transactions WHERE bc_txid = ". $txid .";";
+//connect to the database, execute the $sql, store the returned array within $result
+//script exits gracefully if connection cannot be established
+$result = $conn->query($sql);
+//if the returned array has data
+if ($result->num_rows > 0) {
+    // output data of each row
+    while($row = $result->fetch_assoc()) {
+        echo "id: " . $row["id"]. " - Crypto Symbol: " . $row["crypto_symbol"]. " - Cryptocurrency Address: " . $row["crypto_address"].
+" - External Address: " . $row["external_address"].
+ " - Time-stamp: " . $row["rc_timestamp"]. " - Is Inbound: " . $row["is_inbound"]. " - Finished: " . $row["finished"]. " - Blockhash: ". $row["bc_blockhash"]. " Amount: " . $row["bc_txid"]. " TxID: " . $row["bc_txid"].  "<br />";
+    }
+} else {
+          //else there were no results, notify RC operator
+    echo "0 results";
+}
+$conn->close();
+?>
diff --git a/include.php b/include.php
@@ -30,7 +30,7 @@
 
 //Declare and instantiate the gatewayName variable, store default as Read the README.md file to Change This:
 
-$gatewayName = "QGK V1.0.7 Demo"; // string value
+$gatewayName = "QGK V1.0.8 Demo"; // string value
 
 //Declare and instantiate asset array with default BTC:
 
diff --git a/pending.php b/pending.php
@@ -10,21 +10,17 @@
 //Use a while loop to print each line by ID then append with the newline character
 //assign SQL to a variable for query execution
 
-$sql = "SELECT id, crypto_symbol, crypto_address, external_address, direction,  timestamp, finished FROM coin_index WHERE finished = false;";
-
+$sql = "SELECT id, crypto_symbol, crypto_address, external_address, is_inbound,  rc_timestamp, finished, bc_blockhash, bc_amount, bc_txid FROM blockchain_transactions WHERE finished = 0;";
 //connect to the database, execute the $sql, store the returned array within $result
 //script exits gracefully if connection cannot be established
-
 $result = $conn->query($sql);
-
 //if the returned array has data
-
 if ($result->num_rows > 0) {
     // output data of each row
     while($row = $result->fetch_assoc()) {
         echo "id: " . $row["id"]. " - Crypto Symbol: " . $row["crypto_symbol"]. " - Cryptocurrency Address: " . $row["crypto_address"].
 " - External Address: " . $row["external_address"].
- " - Time-stamp: " . $row["timestamp"]. " - Direction: " . $row["direction"]. " - Finished: " . $row["finished"]. "<br />";
+ " - Time-stamp: " . $row["rc_timestamp"]. " - Is Inbound: " . $row["is_inbound"]. " - Finished: " . $row["finished"]. " - Blockhash: ". $row["bc_blockhash"]. " Amount: " . $row["bc_txid"]. " TxID: " . $row["bc_txid"].  "<br />";
     }
 } else {
           //else there were no results, notify RC operator
diff --git a/rcindex.php b/rcindex.php
@@ -5,6 +5,8 @@
 echo "<li><a href="pending.php">Pending Transactions</a></li>";
 echo "<li><a href="completed.php">Completed Transactions</a></li>";
 echo "<li>Get Transactions by External Address:<br /><li>get_transactions_by_external_address.php?external=EXTERNAL_ADDRESS</li></li>";
+echo "<li>Get Transactions by Transaction ID:<br /><li>get_transactions_by_txid.php?txid=BLOCKCHAIN_TRANSACTION_ID</li></li>";
+echo "<li>Get Transactions by Blockhash:<br /><li>get_transactions_by_blockhash.php?blockhash=BLOCKCHAIN_BLOCKHASH</li></li>";
 echo "<li>Get Transactions by Crypto Code and External Address:<br /><li>get_crypto_symbol_by_external_address.php?cryptocode=XYZ?external=EXTERNAL_ADDRESS</li></li>";
 echo "<li>Get Transactions by Timestamp and External Address:<br /><li>get_external_address_by_timestamp.php?timestamp=UNIX_TIMESTAMP?external=EXTERNAL_ADDRESS</li></li>";
 echo "</ul><br />";
