This commit is contained in:
Christian Grothoff 2020-01-17 23:50:41 +01:00
parent d95f2a9e43
commit 788fd67984
No known key found for this signature in database
GPG Key ID: 939E6BE1E29FC3CC
9 changed files with 24 additions and 18 deletions

View File

@ -1609,6 +1609,7 @@ process_credits (void *cls);
* transactions). * transactions).
* *
* @param cls `struct WireAccount` we are processing * @param cls `struct WireAccount` we are processing
* @param http_status HTTP status returned by the bank
* @param ec error code in case something went wrong * @param ec error code in case something went wrong
* @param row_off identification of the position at which we are querying * @param row_off identification of the position at which we are querying
* @param details details about the wire transfer * @param details details about the wire transfer

View File

@ -702,12 +702,13 @@ function test_11() {
echo "===========11: spurious outgoing transfer ===========" echo "===========11: spurious outgoing transfer ==========="
OLD_ID=`echo "SELECT id FROM app_banktransaction WHERE amount='TESTKUDOS:10' ORDER BY id LIMIT 1;" | psql $DB -Aqt` OLD_ID=`echo "SELECT id FROM app_banktransaction WHERE amount='TESTKUDOS:10' ORDER BY id LIMIT 1;" | psql $DB -Aqt`
OLD_ACC=`echo "SELECT debit_account_id FROM app_banktransaction WHERE id=$OLD_ID;" | psql $DB -Aqt` OLD_ACC=`echo "SELECT debit_account_id FROM app_banktransaction WHERE id=$OLD_ID;" | psql $DB -Aqt`
OLD_SUBJECT=`echo "SELECT subject FROM app_banktransaction WHERE id=$OLD_ID;" | psql $DB -Aqt`
# Change wire transfer to be FROM the exchange (#2) to elsewhere! # Change wire transfer to be FROM the exchange (#2) to elsewhere!
# (Note: this change also causes a missing incoming wire transfer, but # (Note: this change also causes a missing incoming wire transfer, but
# this test is only concerned about the outgoing wire transfer # this test is only concerned about the outgoing wire transfer
# being detected as such, and we simply ignore the other # being detected as such, and we simply ignore the other
# errors being reported.) # errors being reported.)
echo "UPDATE app_banktransaction SET debit_account_id=2,credit_account_id=1 WHERE id=$OLD_ID;" | psql -Aqt $DB echo -e "UPDATE app_banktransaction SET debit_account_id=2,credit_account_id=1,subject='CK9QBFY972KR32FVA1MW958JWACEB6XCMHHKVFMCH1A780Q12SVG http://exchange.example.com/' WHERE id=$OLD_ID;" | psql -Aqt $DB
run_audit run_audit
@ -740,7 +741,7 @@ fi
echo PASS echo PASS
# Undo database modification (exchange always has account #2) # Undo database modification (exchange always has account #2)
echo "UPDATE app_banktransaction SET debit_account_id=$OLD_ACC,credit_account_id=2 WHERE id=$OLD_ID;" | psql -Aqt $DB echo "UPDATE app_banktransaction SET debit_account_id=$OLD_ACC,credit_account_id=2,subject=$OLD_SUBJECT WHERE id=$OLD_ID;" | psql -Aqt $DB
} }

View File

@ -1906,6 +1906,9 @@ postgres_get_auditor_progress_coin (void *cls,
* @param session connection to use * @param session connection to use
* @param master_pub master key of the exchange * @param master_pub master key of the exchange
* @param account_name name of the wire account we are auditing * @param account_name name of the wire account we are auditing
* @param pp how far are we in the auditor's tables
* @param in_wire_off how far are we in the incoming wire transfers
* @param out_wire_off how far are we in the outgoing wire transfers
* @return transaction status code * @return transaction status code
*/ */
static enum GNUNET_DB_QueryStatus static enum GNUNET_DB_QueryStatus

View File

@ -73,8 +73,8 @@ GNUNET_NETWORK_STRUCT_END
* @param exchange_base_url base URL of this exchange (included in subject * @param exchange_base_url base URL of this exchange (included in subject
* to facilitate use of tracking API by merchant backend) * to facilitate use of tracking API by merchant backend)
* @param wtid wire transfer identifier to use * @param wtid wire transfer identifier to use
* @param buf[out] set to transfer data to persist, NULL on error * @param[out] buf set to transfer data to persist, NULL on error
* @param buf_size[out] set to number of bytes in @a buf, 0 on error * @param[out] buf_size set to number of bytes in @a buf, 0 on error
*/ */
void void
TALER_BANK_prepare_wire_transfer (const char *destination_account_url, TALER_BANK_prepare_wire_transfer (const char *destination_account_url,

View File

@ -131,8 +131,8 @@ enum TEH_KS_DenominationKeyUse
* @param key_state state to look in * @param key_state state to look in
* @param denom_pub_hash hash of denomination public key * @param denom_pub_hash hash of denomination public key
* @param use purpose for which the key is being located * @param use purpose for which the key is being located
* @param ec[out] set to the error code, in case the operation failed * @param[out] ec set to the error code, in case the operation failed
* @param hc[out] set to the HTTP status code to use * @param[out] hc set to the HTTP status code to use
* @return the denomination key issue, * @return the denomination key issue,
* or NULL if denom_pub could not be found (or is not valid at this time for the given @a use) * or NULL if denom_pub could not be found (or is not valid at this time for the given @a use)
*/ */

View File

@ -366,7 +366,7 @@ refresh_melt_transaction (void *cls,
* happened. We now need to validate the coins being melted and the * happened. We now need to validate the coins being melted and the
* session signature and then hand things of to execute the melt * session signature and then hand things of to execute the melt
* operation. This function parses the JSON arrays and then passes * operation. This function parses the JSON arrays and then passes
* processing on to #handle_refresh_melt_binary(). * processing on to #refresh_melt_transaction().
* *
* @param connection the MHD connection to handle * @param connection the MHD connection to handle
* @param[in,out] rmc details about the melt request * @param[in,out] rmc details about the melt request
@ -578,9 +578,9 @@ check_for_denomination_key (struct MHD_Connection *connection,
/** /**
* Handle a "/refresh/melt" request. Parses the request into the JSON * Handle a "/refresh/melt" request. Parses the request into the JSON
* components and then hands things of to #handle_refresh_melt_json() * components and then hands things of to #check_for_denomination_key()
* to validate the melted coins, the signature and execute the melt * to validate the melted coins, the signature and execute the melt
* using TEH_DB_execute_refresh_melt(). * using handle_refresh_melt().
* *
* @param rh context of the handler * @param rh context of the handler
* @param connection the MHD connection to handle * @param connection the MHD connection to handle

View File

@ -887,13 +887,13 @@ handle_refresh_reveal_json (struct MHD_Connection *connection,
/** /**
* Handle a "/refresh/reveal" request. This time, the client reveals * Handle a "/refresh/reveal" request. This time, the client reveals the
* the private transfer keys except for the cut-and-choose value * private transfer keys except for the cut-and-choose value returned from
* returned from "/refresh/melt". This function parses the revealed * "/refresh/melt". This function parses the revealed keys and secrets and
* keys and secrets and ultimately passes everything to * ultimately passes everything to #resolve_refresh_reveal_denominations()
* #TEH_DB_execute_refresh_reveal() which will verify that the * which will verify that the revealed information is valid then runs the
* revealed information is valid then returns the signed refreshed * transaction in #refresh_reveal_transaction() and finally returns the signed
* coins. * refreshed coins.
* *
* @param rh context of the handler * @param rh context of the handler
* @param connection the MHD connection to handle * @param connection the MHD connection to handle

View File

@ -253,12 +253,13 @@ struct WtidTransactionContext
* transaction data for the given wire transfer identifier. * transaction data for the given wire transfer identifier.
* *
* @param cls our context for transmission * @param cls our context for transmission
* @param rowid which row in the DB is the information from (for diagnostics) * @param rowid which row in the DB is the information from (for diagnostics), ignored
* @param merchant_pub public key of the merchant (should be same for all callbacks with the same @e cls) * @param merchant_pub public key of the merchant (should be same for all callbacks with the same @e cls)
* @param h_wire hash of wire transfer details of the merchant (should be same for all callbacks with the same @e cls) * @param h_wire hash of wire transfer details of the merchant (should be same for all callbacks with the same @e cls)
* @param wire where the funds were sent * @param wire where the funds were sent
* @param exec_time execution time of the wire transfer (should be same for all callbacks with the same @e cls) * @param exec_time execution time of the wire transfer (should be same for all callbacks with the same @e cls)
* @param h_contract_terms which proposal was this payment about * @param h_contract_terms which proposal was this payment about
* @param denom_pub denomination public key of the @a coin_pub (ignored)
* @param coin_pub which public key was this payment about * @param coin_pub which public key was this payment about
* @param deposit_value amount contributed by this coin in total * @param deposit_value amount contributed by this coin in total
* @param deposit_fee deposit fee charged by exchange for this coin * @param deposit_fee deposit fee charged by exchange for this coin

View File

@ -66,7 +66,7 @@ load_fee (const char *method)
/** /**
* Initialize account; checks if @ai has /wire information, and if so, * Initialize account; checks if @a ai has /wire information, and if so,
* adds the /wire information (if included) to our responses. Also, if * adds the /wire information (if included) to our responses. Also, if
* the account is debitable, we try to load the plugin. * the account is debitable, we try to load the plugin.
* *