diff options
Diffstat (limited to 'src/include/taler_exchangedb_plugin.h')
-rw-r--r-- | src/include/taler_exchangedb_plugin.h | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/src/include/taler_exchangedb_plugin.h b/src/include/taler_exchangedb_plugin.h index 4fd580724..9fb932362 100644 --- a/src/include/taler_exchangedb_plugin.h +++ b/src/include/taler_exchangedb_plugin.h | |||
@@ -975,6 +975,8 @@ struct TALER_EXCHANGEDB_Session; | |||
975 | * @param cls closure | 975 | * @param cls closure |
976 | * @param rowid unique ID for the deposit in our DB, used for marking | 976 | * @param rowid unique ID for the deposit in our DB, used for marking |
977 | * it as 'tiny' or 'done' | 977 | * it as 'tiny' or 'done' |
978 | * @param exchange_timestamp when did the exchange receive the deposit | ||
979 | * @param wallet_timestamp when did the wallet sign the contract | ||
978 | * @param merchant_pub public key of the merchant | 980 | * @param merchant_pub public key of the merchant |
979 | * @param coin_pub public key of the coin | 981 | * @param coin_pub public key of the coin |
980 | * @param amount_with_fee amount that was deposited including fee | 982 | * @param amount_with_fee amount that was deposited including fee |
@@ -990,6 +992,8 @@ typedef enum GNUNET_DB_QueryStatus | |||
990 | (*TALER_EXCHANGEDB_DepositIterator)( | 992 | (*TALER_EXCHANGEDB_DepositIterator)( |
991 | void *cls, | 993 | void *cls, |
992 | uint64_t rowid, | 994 | uint64_t rowid, |
995 | struct GNUNET_TIME_Absolute exchange_timestamp, | ||
996 | struct GNUNET_TIME_Absolute wallet_timestamp, | ||
993 | const struct TALER_MerchantPublicKeyP *merchant_pub, | 997 | const struct TALER_MerchantPublicKeyP *merchant_pub, |
994 | const struct TALER_CoinSpendPublicKeyP *coin_pub, | 998 | const struct TALER_CoinSpendPublicKeyP *coin_pub, |
995 | const struct TALER_Amount *amount_with_fee, | 999 | const struct TALER_Amount *amount_with_fee, |
@@ -1022,7 +1026,8 @@ typedef void | |||
1022 | * | 1026 | * |
1023 | * @param cls closure | 1027 | * @param cls closure |
1024 | * @param rowid unique serial ID for the deposit in our DB | 1028 | * @param rowid unique serial ID for the deposit in our DB |
1025 | * @param timestamp when did the deposit happen | 1029 | * @param exchange_timestamp when did the deposit happen |
1030 | * @param wallet_timestamp when did the contract happen | ||
1026 | * @param merchant_pub public key of the merchant | 1031 | * @param merchant_pub public key of the merchant |
1027 | * @param denom_pub denomination public key of @a coin_pub | 1032 | * @param denom_pub denomination public key of @a coin_pub |
1028 | * @param coin_pub public key of the coin | 1033 | * @param coin_pub public key of the coin |
@@ -1042,7 +1047,8 @@ typedef int | |||
1042 | (*TALER_EXCHANGEDB_DepositCallback)( | 1047 | (*TALER_EXCHANGEDB_DepositCallback)( |
1043 | void *cls, | 1048 | void *cls, |
1044 | uint64_t rowid, | 1049 | uint64_t rowid, |
1045 | struct GNUNET_TIME_Absolute timestamp, | 1050 | struct GNUNET_TIME_Absolute exchange_timestamp, |
1051 | struct GNUNET_TIME_Absolute wallet_timestamp, | ||
1046 | const struct TALER_MerchantPublicKeyP *merchant_pub, | 1052 | const struct TALER_MerchantPublicKeyP *merchant_pub, |
1047 | const struct TALER_DenominationPublicKey *denom_pub, | 1053 | const struct TALER_DenominationPublicKey *denom_pub, |
1048 | const struct TALER_CoinSpendPublicKeyP *coin_pub, | 1054 | const struct TALER_CoinSpendPublicKeyP *coin_pub, |
@@ -1841,6 +1847,8 @@ struct TALER_EXCHANGEDB_Plugin | |||
1841 | * @param session database connection | 1847 | * @param session database connection |
1842 | * @param deposit deposit to search for | 1848 | * @param deposit deposit to search for |
1843 | * @param check_extras whether to check extra fields or not | 1849 | * @param check_extras whether to check extra fields or not |
1850 | * @param[out] deposit_fee set to the deposit fee the exchange charged | ||
1851 | * @param[out] exchange_timestamp set to the time when the exchange received the deposit | ||
1844 | * @return 1 if we know this operation, | 1852 | * @return 1 if we know this operation, |
1845 | * 0 if this exact deposit is unknown to us, | 1853 | * 0 if this exact deposit is unknown to us, |
1846 | * otherwise transaction error status | 1854 | * otherwise transaction error status |
@@ -1849,7 +1857,9 @@ struct TALER_EXCHANGEDB_Plugin | |||
1849 | (*have_deposit)(void *cls, | 1857 | (*have_deposit)(void *cls, |
1850 | struct TALER_EXCHANGEDB_Session *session, | 1858 | struct TALER_EXCHANGEDB_Session *session, |
1851 | const struct TALER_EXCHANGEDB_Deposit *deposit, | 1859 | const struct TALER_EXCHANGEDB_Deposit *deposit, |
1852 | int check_extras); | 1860 | int check_extras, |
1861 | struct TALER_Amount *deposit_fee, | ||
1862 | struct GNUNET_TIME_Absolute *exchange_timestamp); | ||
1853 | 1863 | ||
1854 | 1864 | ||
1855 | /** | 1865 | /** |
@@ -1857,12 +1867,14 @@ struct TALER_EXCHANGEDB_Plugin | |||
1857 | * | 1867 | * |
1858 | * @param cls the @e cls of this struct with the plugin-specific state | 1868 | * @param cls the @e cls of this struct with the plugin-specific state |
1859 | * @param session connection to the database | 1869 | * @param session connection to the database |
1870 | * @param exchange_timestamp time the exchange received the deposit request | ||
1860 | * @param deposit deposit information to store | 1871 | * @param deposit deposit information to store |
1861 | * @return query result status | 1872 | * @return query result status |
1862 | */ | 1873 | */ |
1863 | enum GNUNET_DB_QueryStatus | 1874 | enum GNUNET_DB_QueryStatus |
1864 | (*insert_deposit)(void *cls, | 1875 | (*insert_deposit)(void *cls, |
1865 | struct TALER_EXCHANGEDB_Session *session, | 1876 | struct TALER_EXCHANGEDB_Session *session, |
1877 | struct GNUNET_TIME_Absolute exchange_timestamp, | ||
1866 | const struct TALER_EXCHANGEDB_Deposit *deposit); | 1878 | const struct TALER_EXCHANGEDB_Deposit *deposit); |
1867 | 1879 | ||
1868 | 1880 | ||