diff --git a/html/partials/account-overview.html b/html/partials/account-overview.html
index 142db39..46e5a87 100755
--- a/html/partials/account-overview.html
+++ b/html/partials/account-overview.html
@@ -51,7 +51,7 @@
-
+
diff --git a/html/partials/account-transactions.html b/html/partials/account-transactions.html
index 16d6dbe..0d81330 100755
--- a/html/partials/account-transactions.html
+++ b/html/partials/account-transactions.html
@@ -61,10 +61,8 @@
<< Previous 10
Next 10 >>
-
diff --git a/sql/openmonero.sql b/sql/openmonero.sql
index c728d4c..eb8ff6e 100755
--- a/sql/openmonero.sql
+++ b/sql/openmonero.sql
@@ -72,6 +72,7 @@ CREATE TABLE `Outputs` (
`rct_outpk` varchar(64) NOT NULL DEFAULT '',
`rct_mask` varchar(64) NOT NULL DEFAULT '',
`rct_amount` varchar(64) NOT NULL DEFAULT '',
+ `tx_pub_key` varchar(64) NOT NULL DEFAULT '',
`amount` bigint(20) UNSIGNED NOT NULL DEFAULT '0',
`global_index` bigint(20) UNSIGNED NOT NULL,
`out_index` bigint(20) UNSIGNED NOT NULL DEFAULT '0',
diff --git a/src/MySqlAccounts.cpp b/src/MySqlAccounts.cpp
index 4cfc9ee..f537c2d 100755
--- a/src/MySqlAccounts.cpp
+++ b/src/MySqlAccounts.cpp
@@ -304,6 +304,7 @@ MysqlOutpus::insert(const XmrOutput& out_data)
SimpleResult sr = query.execute(out_data.account_id,
out_data.tx_id,
out_data.out_pub_key,
+ out_data.tx_pub_key,
out_data.rct_outpk,
out_data.rct_mask,
out_data.rct_amount,
diff --git a/src/TxSearch.cpp b/src/TxSearch.cpp
index 4361b4a..0c86358 100755
--- a/src/TxSearch.cpp
+++ b/src/TxSearch.cpp
@@ -280,6 +280,7 @@ TxSearch::search()
out_data.account_id = acc->id;
out_data.tx_id = tx_mysql_id;
out_data.out_pub_key = out_info.pub_key;
+ out_data.tx_pub_key = oi_identification.tx_pub_key_str;
out_data.amount = out_info.amount;
out_data.out_index = out_info.idx_in_tx;
out_data.rct_outpk = out_info.rtc_outpk;
diff --git a/src/YourMoneroRequests.cpp b/src/YourMoneroRequests.cpp
index 6e68a20..cb6cf08 100755
--- a/src/YourMoneroRequests.cpp
+++ b/src/YourMoneroRequests.cpp
@@ -224,7 +224,7 @@ YourMoneroRequests::get_address_txs(const shared_ptr< Session > session, const B
j_spent_outputs.push_back({
{"amount" , input.amount},
{"key_image" , input.key_image},
- {"tx_pub_key" , tx.tx_pub_key},
+ {"tx_pub_key" , out.tx_pub_key},
{"out_index" , out.out_index},
{"mixin" , out.mixin}});
}
@@ -408,7 +408,7 @@ YourMoneroRequests::get_address_info(const shared_ptr< Session > session, const
j_spent_outputs.push_back({
{"amount" , in.amount},
{"key_image" , in.key_image},
- {"tx_pub_key" , tx.tx_pub_key},
+ {"tx_pub_key" , out.tx_pub_key},
{"out_index" , out.out_index},
{"mixin" , out.mixin},
});
diff --git a/src/ssqlses.cpp b/src/ssqlses.cpp
index da81485..5438d7d 100755
--- a/src/ssqlses.cpp
+++ b/src/ssqlses.cpp
@@ -73,6 +73,7 @@ XmrOutput::to_json() const
{"account_id" , account_id},
{"tx_id" , tx_id},
{"out_pub_key" , out_pub_key},
+ {"tx_pub_key" , tx_pub_key},
{"amount" , amount},
{"global_index" , global_index},
{"out_index" , out_index},
diff --git a/src/ssqlses.h b/src/ssqlses.h
index 0d2dec8..2910970 100755
--- a/src/ssqlses.h
+++ b/src/ssqlses.h
@@ -153,7 +153,7 @@ struct XmrTransaction : public Transactions, Table
};
-sql_create_12(Outputs, 1, 3,
+sql_create_13(Outputs, 1, 3,
sql_bigint_unsigned, id,
sql_bigint_unsigned, account_id,
sql_bigint_unsigned, tx_id,
@@ -161,6 +161,7 @@ sql_create_12(Outputs, 1, 3,
sql_varchar , rct_outpk,
sql_varchar , rct_mask,
sql_varchar , rct_amount,
+ sql_varchar , tx_pub_key,
sql_bigint_unsigned, amount,
sql_bigint_unsigned, global_index,
sql_bigint_unsigned, out_index,
@@ -188,6 +189,7 @@ struct XmrOutput : public Outputs, Table
static constexpr const char* INSERT_STMT = R"(
INSERT IGNORE INTO `Outputs` (`account_id`, `tx_id`, `out_pub_key`,
+ `tx_pub_key`,
`rct_outpk`, `rct_mask`, `rct_amount`,
`amount`, `global_index`,
`out_index`, `mixin`, `timestamp`)
@@ -195,7 +197,7 @@ struct XmrOutput : public Outputs, Table
%3q,
%4q, %5q, %6q,
%7q, %8q,
- %9q, %10q);
+ %9q, %10q, %11q);
)";