Fixes to the balance db building process.

	modified:   src/ctrl_mods/btk_balance.c
	modified:   src/mods/txoa.c
	modified:   src/mods/txoa.h

Author: bartobri

src/ctrl_mods/btk_balance.c

@@ -434,10 +434,12 @@ int btk_balance_process(thread_args args)
 		{
 			uint32_t j;
 			char address[BUFSIZ];
+			uint64_t amount;
 			uint64_t prev_balance;
 
 			for (j = 0; j < block->transactions[i]->input_count; j++)
 			{
+				amount = 0;
 				memset(address, 0, BUFSIZ);
 
 				// Skip coinbase inputs. No deduction for them.
@@ -446,22 +448,41 @@ int btk_balance_process(thread_args args)
 					continue;
 				}
 
-				r = txoa_get(address, block->transactions[i]->inputs[j]->tx_hash, block->transactions[i]->inputs[j]->index);
+				r = txoa_get(address, &amount, block->transactions[i]->inputs[j]->tx_hash, block->transactions[i]->inputs[j]->index);
 				ERROR_CHECK_NEG(r, "Could not get address from txoa database.");
 
 				if (*address)
 				{
-					// Every input is spent 100% (recouped via change address).
-					// Set all inputs to zero balance.
+					prev_balance = 0;
 
-					r = balance_batch_delete(address);
-					ERROR_CHECK_NEG(r, "Could not update address balance.");
+					// Every input is spent 100% (recouped via change address).
 
 					r = txoa_batch_delete(block->transactions[i]->inputs[j]->tx_hash, block->transactions[i]->inputs[j]->index);
 					ERROR_CHECK_NEG(r, "Could not delete txao entry after spending.");
+
+					// Get previous balance (if any)
+					r = balance_get(&prev_balance, address);
+					ERROR_CHECK_NEG(r, "Could not query balance database.");
+
+					if (prev_balance > amount)
+					{
+						r = balance_batch_put(address, prev_balance - amount);
+						ERROR_CHECK_NEG(r, "Could not add entry to balance database.");
+					}
+					else
+					{
+						r = balance_batch_delete(address);
+						ERROR_CHECK_NEG(r, "Could not update address balance.");
+					}
 				}
 			}
 
+			r = txoa_batch_write();
+			ERROR_CHECK_NEG(r, "Could not batch write txao records.");
+
+			r = balance_batch_write();
+			ERROR_CHECK_NEG(r, "Could not batch write balance records.");
+
 			for (j = 0; j < block->transactions[i]->output_count; j++)
 			{
 				memset(address, 0, BUFSIZ);
@@ -472,20 +493,22 @@ int btk_balance_process(thread_args args)
 							block->transactions[i]->version);
 				ERROR_CHECK_NEG(r, "Could not get address from output script.");
 
-				if (*address)
+				amount = block->transactions[i]->outputs[j]->amount;
+
+				if (*address && amount > 0)
 				{
 					prev_balance = 0;
 
+					// TXOA Database
+					r = txoa_batch_put(block->transactions[i]->txid, j, address, amount);
+					ERROR_CHECK_NEG(r, "Could not put entry in the txoa database.");
+
 					// Get previous balance (if any)
 					r = balance_get(&prev_balance, address);
 					ERROR_CHECK_NEG(r, "Could not query balance database.");
 
-					// TXOA Database
-					r = txoa_batch_put(block->transactions[i]->txid, j, address);
-					ERROR_CHECK_NEG(r, "Could not put entry in the txoa database.");
-
 					// Balance Database
-					r = balance_batch_put(address, block->transactions[i]->outputs[j]->amount + prev_balance);
+					r = balance_batch_put(address, amount + prev_balance);
 					ERROR_CHECK_NEG(r, "Could not add entry to balance database.");
 				}
 			}

src/mods/txoa.c

@@ -63,7 +63,7 @@ void txoa_close(void)
 	dbref = NULL;
 }
 
-int txoa_get(char *address, unsigned char *tx_hash, uint32_t index)
+int txoa_get(char *address, uint64_t *amount, unsigned char *tx_hash, uint32_t index)
 {
 	int r;
 	size_t len;
@@ -79,7 +79,11 @@ int txoa_get(char *address, unsigned char *tx_hash, uint32_t index)
 	r = database_get(&tmp, &len, dbref, key, TXOA_KEY_LEN);
 	ERROR_CHECK_NEG(r, "Could not get address from txoa database.");
 
-	memcpy(address, tmp, len);
+	if (len > sizeof(uint64_t))
+	{
+		memcpy(address, tmp, len - sizeof(uint64_t));
+		deserialize_uint64(amount, tmp + (len - sizeof(uint64_t)), SERIALIZE_ENDIAN_LIT);
+	}
 
 	free(tmp);
 
@@ -159,20 +163,25 @@ int txoa_get_last_block(int *block_num)
 	return 1;
 }
 
-int txoa_batch_put(unsigned char *tx_hash, uint32_t index, char *address)
+int txoa_batch_put(unsigned char *tx_hash, uint32_t index, char *address, uint64_t amount)
 {
 	int r;
 	unsigned char key[TXOA_KEY_LEN];
+	unsigned char value[BUFSIZ];
 
 	assert(tx_hash);
 	assert(address);
 
 	memset(key, 0, TXOA_KEY_LEN);
+	memset(value, 0, BUFSIZ);
 
 	serialize_uchar(key, tx_hash, TRANSACTION_ID_LEN);
 	serialize_uint32(key + TRANSACTION_ID_LEN, index, SERIALIZE_ENDIAN_LIT);
 
-	r = database_batch_put(dbref, key, TXOA_KEY_LEN, (unsigned char *)address, strlen(address));
+	memcpy(value, address, strlen(address));
+	serialize_uint64(value + strlen(address), amount, SERIALIZE_ENDIAN_LIT);
+
+	r = database_batch_put(dbref, key, TXOA_KEY_LEN, value, strlen(address) + sizeof(uint64_t));
 	ERROR_CHECK_NEG(r, "Could not add entry to txoa database.");
 
 	return 1;

src/mods/txoa.h

@@ -13,14 +13,14 @@
 
 int txoa_open(char *, bool);
 void txoa_close(void);
-int txoa_get(char *, unsigned char *, uint32_t);
+int txoa_get(char *, uint64_t *, unsigned char *, uint32_t);
 int txoa_put(unsigned char *, uint32_t, char *);
 int txoa_delete(unsigned char *, uint32_t);
 int txoa_set_last_block(int);
 int txoa_get_last_block(int *);
 int txoa_get_record_count(size_t *);
 
-int txoa_batch_put(unsigned char *, uint32_t, char *);
+int txoa_batch_put(unsigned char *, uint32_t, char *, uint64_t);
 int txoa_batch_delete(unsigned char *, uint32_t);
 int txoa_batch_write(void);