diff options
| -rw-r--r-- | src/auditor/auditor-basedb.sql | 9 | ||||
| -rw-r--r-- | src/auditor/revoke-basedb.sql | 7 | ||||
| -rw-r--r-- | src/benchmark/benchmark.conf | 41 | ||||
| -rw-r--r-- | src/benchmark/taler-aggregator-benchmark.c | 2 | ||||
| -rw-r--r-- | src/exchange/taler-exchange-aggregator.c | 8 | ||||
| -rw-r--r-- | src/exchangedb/exchange-0003.sql | 2 | ||||
| -rw-r--r-- | src/include/taler_exchangedb_plugin.h | 4 |
7 files changed, 34 insertions, 39 deletions
diff --git a/src/auditor/auditor-basedb.sql b/src/auditor/auditor-basedb.sql index 5c776606b..e5bd88ff3 100644 --- a/src/auditor/auditor-basedb.sql +++ b/src/auditor/auditor-basedb.sql @@ -1424,7 +1424,7 @@ COMMENT ON COLUMN public.deposits.done IS 'Set to TRUE once we have included thi -- Name: COLUMN deposits.shard; Type: COMMENT; Schema: public; Owner: grothoff -- -COMMENT ON COLUMN public.deposits.shard IS 'Used for load sharding. Should be set based on h_wire, merchant_pub and a service salt. Default of 0 onlyapplies for colums migrated from a previous version without sharding support. 64-bit value because we need an *unsigned* 32-bit value.'; +COMMENT ON COLUMN public.deposits.shard IS 'Used for load sharding. Should be set based on h_wire, merchant_pub and a service salt. Default of 0 onlyapplies for columns migrated from a previous version without sharding support. 64-bit value because we need an *unsigned* 32-bit value.'; -- @@ -5527,9 +5527,9 @@ COPY public.merchant_accounts (account_serial, merchant_serial, h_wire, salt, pa -- COPY public.merchant_contract_terms (order_serial, merchant_serial, order_id, contract_terms, h_contract_terms, creation_time, pay_deadline, refund_deadline, paid, wired, fulfillment_url, session_id) FROM stdin; -1 1 2021.011-AKS8401AF50G0 \\x7b22616d6f756e74223a22544553544b55444f533a34222c2273756d6d617279223a2268656c6c6f20776f726c64222c2266756c66696c6c6d656e745f75726c223a2274616c65723a2f2f66756c66696c6c6d656e742d737563636573732f746878222c22726566756e645f646561646c696e65223a7b22745f6d73223a313631303335353937363030307d2c22776972655f7472616e736665725f646561646c696e65223a7b22745f6d73223a313631303335353937363030307d2c2270726f6475637473223a5b5d2c22685f77697265223a225946544d4e4b385632574a5642564431325932344e3947373736365a5753353833564d37384a5a50594b485a4e3445355a54475443484d4844513835563239344d3532595348374d5650385a4e46544a335630374a424a434e454d4e4b423641585a4848423230222c22776972655f6d6574686f64223a22782d74616c65722d62616e6b222c226f726465725f6964223a22323032312e3031312d414b5338343031414635304730222c2274696d657374616d70223a7b22745f6d73223a313631303335353037363030307d2c227061795f646561646c696e65223a7b22745f6d73223a313631303335383637363030307d2c226d61785f776972655f666565223a22544553544b55444f533a31222c226d61785f666565223a22544553544b55444f533a31222c22776972655f6665655f616d6f7274697a6174696f6e223a312c226d65726368616e745f626173655f75726c223a22687474703a2f2f6c6f63616c686f73743a393936362f222c226d65726368616e74223a7b226e616d65223a2264656661756c74222c22696e7374616e6365223a2264656661756c74222c2261646472657373223a7b7d2c226a7572697364696374696f6e223a7b7d7d2c2265786368616e676573223a5b7b2275726c223a22687474703a2f2f6c6f63616c686f73743a383038312f222c226d61737465725f707562223a22304e5a45354e4735354a50444a4b53334b4e524b545a3344504d4639304a344a484839474335304a35545454514b564a43355447227d5d2c2261756469746f7273223a5b5d2c226d65726368616e745f707562223a2237564e39305837514e5648323448464a4d584a4450474e5a4e50364741334645533034445836514a34463458534d454d42515347222c226e6f6e6365223a2258333044355736355044474b414b3251355659304b394535374b434d38533044455130303452585952334e39365a343551575747227d \\x0ddb75312662ab63ecc16003666a47e6a56d971e6609bf006b3e95507f77ec8818b8b9464eed754be5ccfaa779c43b2d00105489457517ddb4937eb593a15011 1610355076000000 1610358676000000 1610355976000000 t f taler://fulfillment-success/thx -2 1 2021.011-01G89XA95V1FM \\x7b22616d6f756e74223a22544553544b55444f533a37222c2273756d6d617279223a226f7264657220746861742077696c6c20626520726566756e646564222c2266756c66696c6c6d656e745f75726c223a2274616c65723a2f2f66756c66696c6c6d656e742d737563636573732f746878222c22726566756e645f646561646c696e65223a7b22745f6d73223a313631303335353938333030307d2c22776972655f7472616e736665725f646561646c696e65223a7b22745f6d73223a313631303335353938333030307d2c2270726f6475637473223a5b5d2c22685f77697265223a225946544d4e4b385632574a5642564431325932344e3947373736365a5753353833564d37384a5a50594b485a4e3445355a54475443484d4844513835563239344d3532595348374d5650385a4e46544a335630374a424a434e454d4e4b423641585a4848423230222c22776972655f6d6574686f64223a22782d74616c65722d62616e6b222c226f726465725f6964223a22323032312e3031312d3031473839584139355631464d222c2274696d657374616d70223a7b22745f6d73223a313631303335353038333030307d2c227061795f646561646c696e65223a7b22745f6d73223a313631303335383638333030307d2c226d61785f776972655f666565223a22544553544b55444f533a31222c226d61785f666565223a22544553544b55444f533a31222c22776972655f6665655f616d6f7274697a6174696f6e223a312c226d65726368616e745f626173655f75726c223a22687474703a2f2f6c6f63616c686f73743a393936362f222c226d65726368616e74223a7b226e616d65223a2264656661756c74222c22696e7374616e6365223a2264656661756c74222c2261646472657373223a7b7d2c226a7572697364696374696f6e223a7b7d7d2c2265786368616e676573223a5b7b2275726c223a22687474703a2f2f6c6f63616c686f73743a383038312f222c226d61737465725f707562223a22304e5a45354e4735354a50444a4b53334b4e524b545a3344504d4639304a344a484839474335304a35545454514b564a43355447227d5d2c2261756469746f7273223a5b5d2c226d65726368616e745f707562223a2237564e39305837514e5648323448464a4d584a4450474e5a4e50364741334645533034445836514a34463458534d454d42515347222c226e6f6e6365223a224654454b32585345524751323442394d4434544a365145584842384b475145565654304550535236374a483456374759414b5330227d \\x21a27562bc99c3f9ad0645b80c06091025170fd8165e5c7709a51fc7f1737fe8da22b00e54295c4ca72e3486771388c816608b2e4821c59f5a56bb853244307b 1610355083000000 1610358683000000 1610355983000000 t f taler://fulfillment-success/thx -3 1 2021.011-0049H0MV0D6C2 \\x7b22616d6f756e74223a22544553544b55444f533a33222c2273756d6d617279223a227061796d656e7420616674657220726566756e64222c2266756c66696c6c6d656e745f75726c223a2274616c65723a2f2f66756c66696c6c6d656e742d737563636573732f746878222c22726566756e645f646561646c696e65223a7b22745f6d73223a313631303335353938353030307d2c22776972655f7472616e736665725f646561646c696e65223a7b22745f6d73223a313631303335353938353030307d2c2270726f6475637473223a5b5d2c22685f77697265223a225946544d4e4b385632574a5642564431325932344e3947373736365a5753353833564d37384a5a50594b485a4e3445355a54475443484d4844513835563239344d3532595348374d5650385a4e46544a335630374a424a434e454d4e4b423641585a4848423230222c22776972655f6d6574686f64223a22782d74616c65722d62616e6b222c226f726465725f6964223a22323032312e3031312d3030343948304d563044364332222c2274696d657374616d70223a7b22745f6d73223a313631303335353038353030307d2c227061795f646561646c696e65223a7b22745f6d73223a313631303335383638353030307d2c226d61785f776972655f666565223a22544553544b55444f533a31222c226d61785f666565223a22544553544b55444f533a31222c22776972655f6665655f616d6f7274697a6174696f6e223a312c226d65726368616e745f626173655f75726c223a22687474703a2f2f6c6f63616c686f73743a393936362f222c226d65726368616e74223a7b226e616d65223a2264656661756c74222c22696e7374616e6365223a2264656661756c74222c2261646472657373223a7b7d2c226a7572697364696374696f6e223a7b7d7d2c2265786368616e676573223a5b7b2275726c223a22687474703a2f2f6c6f63616c686f73743a383038312f222c226d61737465725f707562223a22304e5a45354e4735354a50444a4b53334b4e524b545a3344504d4639304a344a484839474335304a35545454514b564a43355447227d5d2c2261756469746f7273223a5b5d2c226d65726368616e745f707562223a2237564e39305837514e5648323448464a4d584a4450474e5a4e50364741334645533034445836514a34463458534d454d42515347222c226e6f6e6365223a2247533350534156344358365956453544413831384a423736314431375644315346565248373239355a474b4b4d5947354d444230227d \\x58029ce22a69b90e90ca40f9d144f1c606d60ba7f824fdf685222b91a5fa94848e6d085cdc604e67236c800884fa3b3d5203eb32a5fadfca3c73a6e41e9e690f 1610355085000000 1610358685000000 1610355985000000 t f taler://fulfillment-success/thx +1 1 2021.011-AKS8401AF50G0 \\x7b22616d6f756e74223a22544553544b55444f533a34222c2273756d6d617279223a2268656c6c6f20776f726c64222c2266756c66696c6c6d656e745f75726c223a2274616c65723a2f2f66756c66696c6c6d656e742d737563636573732f746878222c22726566756e645f646561646c696e65223a7b22745f6d73223a313631303335353937363030307d2c22776972655f7472616e736665725f646561646c696e65223a7b22745f6d73223a313631303335353937363030307d2c2270726f6475637473223a5b5d2c22685f77697265223a225946544d4e4b385632574a5642564431325932344e3947373736365a5753353833564d37384a5a50594b485a4e3445355a54475443484d4844513835563239344d3532595348374d5650385a4e46544a335630374a424a434e454d4e4b423641585a4848423230222c22776972655f6d6574686f64223a22782d74616c65722d62616e6b222c226f726465725f6964223a22323032312e3031312d414b5338343031414635304730222c2274696d657374616d70223a7b22745f6d73223a313631303335353037363030307d2c227061795f646561646c696e65223a7b22745f6d73223a313631303335383637363030307d2c226d61785f776972655f666565223a22544553544b55444f533a31222c226d61785f666565223a22544553544b55444f533a31222c22776972655f6665655f616d6f7274697a6174696f6e223a312c226d65726368616e745f626173655f75726c223a22687474703a2f2f6c6f63616c686f73743a393936362f222c226d65726368616e74223a7b226e616d65223a2264656661756c74222c22696e7374616e6365223a2264656661756c74222c2261646472657373223a7b7d2c226a7572697364696374696f6e223a7b7d7d2c2265786368616e676573223a5b7b2275726c223a22687474703a2f2f6c6f63616c686f73743a383038312f222c226d61737465725f707562223a22304e5a45354e4735354a50444a4b53334b4e524b545a3344504d4639304a344a484839474335304a35545454514b564a43355447227d5d2c2261756469746f7273223a5b5d2c226d65726368616e745f707562223a2237564e39305837514e5648323448464a4d584a4450474e5a4e50364741334645533034445836514a34463458534d454d42515347222c226e6f6e6365223a2258333044355736355044474b414b3251355659304b394535374b434d38533044455130303452585952334e39365a343551575747227d \\x0ddb75312662ab63ecc16003666a47e6a56d971e6609bf006b3e95507f77ec8818b8b9464eed754be5ccfaa779c43b2d00105489457517ddb4937eb593a15011 1610355076000000 1610358676000000 1610355976000000 t f taler://fulfillment-success/thx +2 1 2021.011-01G89XA95V1FM \\x7b22616d6f756e74223a22544553544b55444f533a37222c2273756d6d617279223a226f7264657220746861742077696c6c20626520726566756e646564222c2266756c66696c6c6d656e745f75726c223a2274616c65723a2f2f66756c66696c6c6d656e742d737563636573732f746878222c22726566756e645f646561646c696e65223a7b22745f6d73223a313631303335353938333030307d2c22776972655f7472616e736665725f646561646c696e65223a7b22745f6d73223a313631303335353938333030307d2c2270726f6475637473223a5b5d2c22685f77697265223a225946544d4e4b385632574a5642564431325932344e3947373736365a5753353833564d37384a5a50594b485a4e3445355a54475443484d4844513835563239344d3532595348374d5650385a4e46544a335630374a424a434e454d4e4b423641585a4848423230222c22776972655f6d6574686f64223a22782d74616c65722d62616e6b222c226f726465725f6964223a22323032312e3031312d3031473839584139355631464d222c2274696d657374616d70223a7b22745f6d73223a313631303335353038333030307d2c227061795f646561646c696e65223a7b22745f6d73223a313631303335383638333030307d2c226d61785f776972655f666565223a22544553544b55444f533a31222c226d61785f666565223a22544553544b55444f533a31222c22776972655f6665655f616d6f7274697a6174696f6e223a312c226d65726368616e745f626173655f75726c223a22687474703a2f2f6c6f63616c686f73743a393936362f222c226d65726368616e74223a7b226e616d65223a2264656661756c74222c22696e7374616e6365223a2264656661756c74222c2261646472657373223a7b7d2c226a7572697364696374696f6e223a7b7d7d2c2265786368616e676573223a5b7b2275726c223a22687474703a2f2f6c6f63616c686f73743a383038312f222c226d61737465725f707562223a22304e5a45354e4735354a50444a4b53334b4e524b545a3344504d4639304a344a484839474335304a35545454514b564a43355447227d5d2c2261756469746f7273223a5b5d2c226d65726368616e745f707562223a2237564e39305837514e5648323448464a4d584a4450474e5a4e50364741334645533034445836514a34463458534d454d42515347222c226e6f6e6365223a224654454b32585345524751323442394d4434544a365145584842384b475145565654304550535236374a483456374759414b5330227d \\x21a27562bc99c3f9ad0645b80c06091025170fd8165e5c7709a51fc7f1737fe8da22b00e54295c4ca72e3486771388c816608b2e4821c59f5a56bb853244307b 1610355083000000 1610358683000000 1610355983000000 t f taler://fulfillment-success/thx +3 1 2021.011-0049H0MV0D6C2 \\x7b22616d6f756e74223a22544553544b55444f533a33222c2273756d6d617279223a227061796d656e7420616674657220726566756e64222c2266756c66696c6c6d656e745f75726c223a2274616c65723a2f2f66756c66696c6c6d656e742d737563636573732f746878222c22726566756e645f646561646c696e65223a7b22745f6d73223a313631303335353938353030307d2c22776972655f7472616e736665725f646561646c696e65223a7b22745f6d73223a313631303335353938353030307d2c2270726f6475637473223a5b5d2c22685f77697265223a225946544d4e4b385632574a5642564431325932344e3947373736365a5753353833564d37384a5a50594b485a4e3445355a54475443484d4844513835563239344d3532595348374d5650385a4e46544a335630374a424a434e454d4e4b423641585a4848423230222c22776972655f6d6574686f64223a22782d74616c65722d62616e6b222c226f726465725f6964223a22323032312e3031312d3030343948304d563044364332222c2274696d657374616d70223a7b22745f6d73223a313631303335353038353030307d2c227061795f646561646c696e65223a7b22745f6d73223a313631303335383638353030307d2c226d61785f776972655f666565223a22544553544b55444f533a31222c226d61785f666565223a22544553544b55444f533a31222c22776972655f6665655f616d6f7274697a6174696f6e223a312c226d65726368616e745f626173655f75726c223a22687474703a2f2f6c6f63616c686f73743a393936362f222c226d65726368616e74223a7b226e616d65223a2264656661756c74222c22696e7374616e6365223a2264656661756c74222c2261646472657373223a7b7d2c226a7572697364696374696f6e223a7b7d7d2c2265786368616e676573223a5b7b2275726c223a22687474703a2f2f6c6f63616c686f73743a383038312f222c226d61737465725f707562223a22304e5a45354e4735354a50444a4b53334b4e524b545a3344504d4639304a344a484839474335304a35545454514b564a43355447227d5d2c2261756469746f7273223a5b5d2c226d65726368616e745f707562223a2237564e39305837514e5648323448464a4d584a4450474e5a4e50364741334645533034445836514a34463458534d454d42515347222c226e6f6e6365223a2247533350534156344358365956453544413831384a423736314431375644315346565248373239355a474b4b4d5947354d444230227d \\x58029ce22a69b90e90ca40f9d144f1c606d60ba7f824fdf685222b91a5fa94848e6d085cdc604e67236c800884fa3b3d5203eb32a5fadfca3c73a6e41e9e690f 1610355085000000 1610358685000000 1610355985000000 t f taler://fulfillment-success/thx \. @@ -8176,4 +8176,3 @@ ALTER TABLE ONLY public.aggregation_tracking -- -- PostgreSQL database dump complete -- - diff --git a/src/auditor/revoke-basedb.sql b/src/auditor/revoke-basedb.sql index 9c0d7ea8f..37de4e562 100644 --- a/src/auditor/revoke-basedb.sql +++ b/src/auditor/revoke-basedb.sql @@ -1424,7 +1424,7 @@ COMMENT ON COLUMN public.deposits.done IS 'Set to TRUE once we have included thi -- Name: COLUMN deposits.shard; Type: COMMENT; Schema: public; Owner: grothoff -- -COMMENT ON COLUMN public.deposits.shard IS 'Used for load sharding. Should be set based on h_wire, merchant_pub and a service salt. Default of 0 onlyapplies for colums migrated from a previous version without sharding support. 64-bit value because we need an *unsigned* 32-bit value.'; +COMMENT ON COLUMN public.deposits.shard IS 'Used for load sharding. Should be set based on h_wire, merchant_pub and a service salt. Default of 0 onlyapplies for columns migrated from a previous version without sharding support. 64-bit value because we need an *unsigned* 32-bit value.'; -- @@ -5528,8 +5528,8 @@ COPY public.merchant_accounts (account_serial, merchant_serial, h_wire, salt, pa -- COPY public.merchant_contract_terms (order_serial, merchant_serial, order_id, contract_terms, h_contract_terms, creation_time, pay_deadline, refund_deadline, paid, wired, fulfillment_url, session_id) FROM stdin; -1 1 2021.011-01KETW7CP9V3G \\x7b22616d6f756e74223a22544553544b55444f533a31222c2273756d6d617279223a22666f6f222c2266756c66696c6c6d656e745f75726c223a2274616c65723a2f2f66756c66696c6c6d656e742d737563636573732f7468616e6b2b796f75222c22726566756e645f646561646c696e65223a7b22745f6d73223a313631303335363134373030307d2c22776972655f7472616e736665725f646561646c696e65223a7b22745f6d73223a313631303335363134373030307d2c2270726f6475637473223a5b5d2c22685f77697265223a22444631393444424b5a33504133303544313431303837324833434553534253465638474a5839584d32514d4853594550364e4558575359384245394e4653384e423041425231515251393954543550364e4a46434b4239585647304b564e5635394d3535414b30222c22776972655f6d6574686f64223a22782d74616c65722d62616e6b222c226f726465725f6964223a22323032312e3031312d30314b45545737435039563347222c2274696d657374616d70223a7b22745f6d73223a313631303335353234373030307d2c227061795f646561646c696e65223a7b22745f6d73223a313631303335383834373030307d2c226d61785f776972655f666565223a22544553544b55444f533a31222c226d61785f666565223a22544553544b55444f533a31222c22776972655f6665655f616d6f7274697a6174696f6e223a312c226d65726368616e745f626173655f75726c223a22687474703a2f2f6c6f63616c686f73743a393936362f222c226d65726368616e74223a7b226e616d65223a2264656661756c74222c22696e7374616e6365223a2264656661756c74222c2261646472657373223a7b7d2c226a7572697364696374696f6e223a7b7d7d2c2265786368616e676573223a5b7b2275726c223a22687474703a2f2f6c6f63616c686f73743a383038312f222c226d61737465725f707562223a22595259343041435046374e5352544b4b53355637485a485758375347354a5136504a3830353344383033484d3450514e31384130227d5d2c2261756469746f7273223a5b5d2c226d65726368616e745f707562223a224e4d304b4435534d5a35475345454a304d514e305957533734474a4442394e564134584353433959393438435945443131353130222c226e6f6e6365223a224454514e4a59525230525935414e523939473036314e53353938523139484e48393835364434375052525933434e363433415647227d \\x437becca6923b054068edafc1d492e4559beabe044150d618e98ada2d5625b7a411703f0b0080f776f630cd97f10cca868ff0f605f92a0ea656437eba3c4b6c7 1610355247000000 1610358847000000 1610356147000000 t f taler://fulfillment-success/thank+you -2 1 2021.011-03ECCKDCDQHJC \\x7b22616d6f756e74223a22544553544b55444f533a302e3032222c2273756d6d617279223a22626172222c2266756c66696c6c6d656e745f75726c223a2274616c65723a2f2f66756c66696c6c6d656e742d737563636573732f7468616e6b2b796f75222c22726566756e645f646561646c696e65223a7b22745f6d73223a313631303335363136333030307d2c22776972655f7472616e736665725f646561646c696e65223a7b22745f6d73223a313631303335363136333030307d2c2270726f6475637473223a5b5d2c22685f77697265223a22444631393444424b5a33504133303544313431303837324833434553534253465638474a5839584d32514d4853594550364e4558575359384245394e4653384e423041425231515251393954543550364e4a46434b4239585647304b564e5635394d3535414b30222c22776972655f6d6574686f64223a22782d74616c65722d62616e6b222c226f726465725f6964223a22323032312e3031312d30334543434b44434451484a43222c2274696d657374616d70223a7b22745f6d73223a313631303335353236333030307d2c227061795f646561646c696e65223a7b22745f6d73223a313631303335383836333030307d2c226d61785f776972655f666565223a22544553544b55444f533a31222c226d61785f666565223a22544553544b55444f533a31222c22776972655f6665655f616d6f7274697a6174696f6e223a312c226d65726368616e745f626173655f75726c223a22687474703a2f2f6c6f63616c686f73743a393936362f222c226d65726368616e74223a7b226e616d65223a2264656661756c74222c22696e7374616e6365223a2264656661756c74222c2261646472657373223a7b7d2c226a7572697364696374696f6e223a7b7d7d2c2265786368616e676573223a5b7b2275726c223a22687474703a2f2f6c6f63616c686f73743a383038312f222c226d61737465725f707562223a22595259343041435046374e5352544b4b53355637485a485758375347354a5136504a3830353344383033484d3450514e31384130227d5d2c2261756469746f7273223a5b5d2c226d65726368616e745f707562223a224e4d304b4435534d5a35475345454a304d514e305957533734474a4442394e564134584353433959393438435945443131353130222c226e6f6e6365223a225637594a57385a3042484152504453574a4d59334d44375447474736444b5331364333484630485937575238544e434e56573930227d \\x8e200743b1f149e4c721696b999cdca799da98b6de07e47f198d734869d0f7987c0338dd68b6b83d62f7487774f06f0cdb2f788ee29bb4af150ff16688f29ba8 1610355263000000 1610358863000000 1610356163000000 f f taler://fulfillment-success/thank+you +1 1 2021.011-01KETW7CP9V3G \\x7b22616d6f756e74223a22544553544b55444f533a31222c2273756d6d617279223a22666f6f222c2266756c66696c6c6d656e745f75726c223a2274616c65723a2f2f66756c66696c6c6d656e742d737563636573732f7468616e6b2b796f75222c22726566756e645f646561646c696e65223a7b22745f6d73223a313631303335363134373030307d2c22776972655f7472616e736665725f646561646c696e65223a7b22745f6d73223a313631303335363134373030307d2c2270726f6475637473223a5b5d2c22685f77697265223a22444631393444424b5a33504133303544313431303837324833434553534253465638474a5839584d32514d4853594550364e4558575359384245394e4653384e423041425231515251393954543550364e4a46434b4239585647304b564e5635394d3535414b30222c22776972655f6d6574686f64223a22782d74616c65722d62616e6b222c226f726465725f6964223a22323032312e3031312d30314b45545737435039563347222c2274696d657374616d70223a7b22745f6d73223a313631303335353234373030307d2c227061795f646561646c696e65223a7b22745f6d73223a313631303335383834373030307d2c226d61785f776972655f666565223a22544553544b55444f533a31222c226d61785f666565223a22544553544b55444f533a31222c22776972655f6665655f616d6f7274697a6174696f6e223a312c226d65726368616e745f626173655f75726c223a22687474703a2f2f6c6f63616c686f73743a393936362f222c226d65726368616e74223a7b226e616d65223a2264656661756c74222c22696e7374616e6365223a2264656661756c74222c2261646472657373223a7b7d2c226a7572697364696374696f6e223a7b7d7d2c2265786368616e676573223a5b7b2275726c223a22687474703a2f2f6c6f63616c686f73743a383038312f222c226d61737465725f707562223a22595259343041435046374e5352544b4b53355637485a485758375347354a5136504a3830353344383033484d3450514e31384130227d5d2c2261756469746f7273223a5b5d2c226d65726368616e745f707562223a224e4d304b4435534d5a35475345454a304d514e305957533734474a4442394e564134584353433959393438435945443131353130222c226e6f6e6365223a224454514e4a59525230525935414e523939473036314e53353938523139484e48393835364434375052525933434e363433415647227d \\x437becca6923b054068edafc1d492e4559beabe044150d618e98ada2d5625b7a411703f0b0080f776f630cd97f10cca868ff0f605f92a0ea656437eba3c4b6c7 1610355247000000 1610358847000000 1610356147000000 t f taler://fulfillment-success/thank+you +2 1 2021.011-03ECCKDCDQHJC \\x7b22616d6f756e74223a22544553544b55444f533a302e3032222c2273756d6d617279223a22626172222c2266756c66696c6c6d656e745f75726c223a2274616c65723a2f2f66756c66696c6c6d656e742d737563636573732f7468616e6b2b796f75222c22726566756e645f646561646c696e65223a7b22745f6d73223a313631303335363136333030307d2c22776972655f7472616e736665725f646561646c696e65223a7b22745f6d73223a313631303335363136333030307d2c2270726f6475637473223a5b5d2c22685f77697265223a22444631393444424b5a33504133303544313431303837324833434553534253465638474a5839584d32514d4853594550364e4558575359384245394e4653384e423041425231515251393954543550364e4a46434b4239585647304b564e5635394d3535414b30222c22776972655f6d6574686f64223a22782d74616c65722d62616e6b222c226f726465725f6964223a22323032312e3031312d30334543434b44434451484a43222c2274696d657374616d70223a7b22745f6d73223a313631303335353236333030307d2c227061795f646561646c696e65223a7b22745f6d73223a313631303335383836333030307d2c226d61785f776972655f666565223a22544553544b55444f533a31222c226d61785f666565223a22544553544b55444f533a31222c22776972655f6665655f616d6f7274697a6174696f6e223a312c226d65726368616e745f626173655f75726c223a22687474703a2f2f6c6f63616c686f73743a393936362f222c226d65726368616e74223a7b226e616d65223a2264656661756c74222c22696e7374616e6365223a2264656661756c74222c2261646472657373223a7b7d2c226a7572697364696374696f6e223a7b7d7d2c2265786368616e676573223a5b7b2275726c223a22687474703a2f2f6c6f63616c686f73743a383038312f222c226d61737465725f707562223a22595259343041435046374e5352544b4b53355637485a485758375347354a5136504a3830353344383033484d3450514e31384130227d5d2c2261756469746f7273223a5b5d2c226d65726368616e745f707562223a224e4d304b4435534d5a35475345454a304d514e305957533734474a4442394e564134584353433959393438435945443131353130222c226e6f6e6365223a225637594a57385a3042484152504453574a4d59334d44375447474736444b5331364333484630485937575238544e434e56573930227d \\x8e200743b1f149e4c721696b999cdca799da98b6de07e47f198d734869d0f7987c0338dd68b6b83d62f7487774f06f0cdb2f788ee29bb4af150ff16688f29ba8 1610355263000000 1610358863000000 1610356163000000 f f taler://fulfillment-success/thank+you \. @@ -8179,4 +8179,3 @@ ALTER TABLE ONLY public.aggregation_tracking -- -- PostgreSQL database dump complete -- - diff --git a/src/benchmark/benchmark.conf b/src/benchmark/benchmark.conf index 5716770c3..844106cf5 100644 --- a/src/benchmark/benchmark.conf +++ b/src/benchmark/benchmark.conf @@ -3,30 +3,31 @@ [paths] # Persistent data storage for the testcase # This value is a default for `taler_config_home' -taler_test_home = exchange_benchmark_home/ +TALER_TEST_HOME = exchange_benchmark_home/ [taler] # Currency supported by the exchange (can only be one) -currency = EUR +CURRENCY = EUR CURRENCY_ROUND_UNIT = EUR:0.01 [exchange] -# how long is one signkey valid? -signkey_duration = 4 weeks -signkey_legal_duration = 2 years -# how long do we provide to clients denomination and signing keys -# ahead of time? -# Keep it short so the test runs fast. -lookahead_sign = 12h + +SIGNKEY_LEGAL_DURATION = 2 years + # HTTP port the exchange listens to -port = 8081 +PORT = 8081 # Master public key used to sign the exchange's various keys -master_public_key = 98NJW3CQHZQGQXTY3K85K531XKPAPAVV4Q5V8PYYRR00NJGZWNVG +MASTER_PUBLIC_KEY = 98NJW3CQHZQGQXTY3K85K531XKPAPAVV4Q5V8PYYRR00NJGZWNVG # How to access our database DB = postgres # Base URL of the exchange. Must be set to a URL where the # exchange (or the twister) is actually listening. -base_url = "http://localhost:8081/" +BASE_URL = "http://localhost:8081/" + +AGGREGATOR_SHARD_SIZE = 268435456 +#AGGREGATOR_SHARD_SIZE = 2147483648 + + WIREWATCH_IDLE_SLEEP_INTERVAL = 5 ms @@ -37,12 +38,12 @@ MASTER_PRIV_FILE = ${TALER_DATA_HOME}/exchange/offline-keys/master.priv BASE_URL = "http://localhost:8083/" [exchangedb-postgres] -config = "postgres:///talercheck" +CONFIG = "postgres:///talercheck" [benchmark-remote-exchange] -host = localhost +HOST = localhost # Adjust $HOME to match remote target! -dir = $HOME/repos/taler/exchange/src/benchmark +DIR = $HOME/repos/taler/exchange/src/benchmark [bank] HTTP_PORT = 8082 @@ -56,22 +57,22 @@ USER_PAYTO_URI = payto://x-taler-bank/localhost:8082/42 [exchange-account-2] # What is the payto://-URL of the exchange (to generate wire response) PAYTO_URI = "payto://x-taler-bank/localhost:8082/Exchange" -enable_debit = YES -enable_credit = YES +ENABLE_DEBIT = YES +ENABLE_CREDIT = YES [exchange-accountcredentials-2] # What is the bank account (with the "Taler Bank" demo system)? Must end with "/". WIRE_GATEWAY_URL = http://localhost:8082/taler-wire-gateway/Exchange/ # Authentication information for basic authentication WIRE_GATEWAY_AUTH_METHOD = "basic" -username = Exchange -password = x +USERNAME = Exchange +PASSWORD = x [exchange-account-aggregator] # What is the payto://-URL of the exchange (to generate wire response) PAYTO_URI = "payto://aggregator-benchmark/exchangeacc" -enable_debit = YES +ENABLE_DEBIT = YES diff --git a/src/benchmark/taler-aggregator-benchmark.c b/src/benchmark/taler-aggregator-benchmark.c index 03375d4e3..283ee23ba 100644 --- a/src/benchmark/taler-aggregator-benchmark.c +++ b/src/benchmark/taler-aggregator-benchmark.c @@ -435,7 +435,7 @@ work (void *cls) * @param cls unused * @param args remaining command-line arguments * @param cfgfile name of the configuration file used (for saving, can be NULL!) - * @param cfg configuration + * @param c configuration */ static void run (void *cls, diff --git a/src/exchange/taler-exchange-aggregator.c b/src/exchange/taler-exchange-aggregator.c index f3d65db24..893fa79f9 100644 --- a/src/exchange/taler-exchange-aggregator.c +++ b/src/exchange/taler-exchange-aggregator.c @@ -353,8 +353,7 @@ refund_by_coin_cb (void *cls, * @param amount_with_fee amount that was deposited including fee * @param deposit_fee amount the exchange gets to keep as transaction fees * @param h_contract_terms hash of the proposal data known to merchant and customer - * @param wire_deadline by which the merchant advised that he would like the - * wire transfer to be executed + * @param wire target account for the wire transfer * @return transaction status code, #GNUNET_DB_STATUS_SUCCESS_ONE_RESULT to continue to iterate */ static enum GNUNET_DB_QueryStatus @@ -761,9 +760,10 @@ run_aggregation (void *cls) GNUNET_YES), (unsigned long long) counter); release_shard (s); - if (GNUNET_YES == test_mode) + if ( (GNUNET_YES == test_mode) && + (0 == counter) ) { - /* in test mode, shutdown after a shard is done */ + /* in test mode, shutdown after a shard is done with 0 work */ GNUNET_SCHEDULER_shutdown (); return; } diff --git a/src/exchangedb/exchange-0003.sql b/src/exchangedb/exchange-0003.sql index e1c9273fb..5a33e0fcc 100644 --- a/src/exchangedb/exchange-0003.sql +++ b/src/exchangedb/exchange-0003.sql @@ -25,7 +25,7 @@ SELECT _v.register_patch('exchange-0003', NULL, NULL); ALTER TABLE deposits ADD COLUMN shard INT4 NOT NULL DEFAULT 0; COMMENT ON COLUMN deposits.shard - IS 'Used for load sharding. Should be set based on h_wire, merchant_pub and a service salt. Default of 0 onlyapplies for colums migrated from a previous version without sharding support. 64-bit value because we need an *unsigned* 32-bit value.'; + IS 'Used for load sharding. Should be set based on h_wire, merchant_pub and a service salt. Default of 0 onlyapplies for columns migrated from a previous version without sharding support. 64-bit value because we need an *unsigned* 32-bit value.'; DROP INDEX deposits_get_ready_index; CREATE INDEX deposits_get_ready_index diff --git a/src/include/taler_exchangedb_plugin.h b/src/include/taler_exchangedb_plugin.h index 7d6508fc5..163b886cc 100644 --- a/src/include/taler_exchangedb_plugin.h +++ b/src/include/taler_exchangedb_plugin.h @@ -1472,15 +1472,11 @@ typedef enum GNUNET_DB_QueryStatus * @param cls closure * @param rowid unique ID for the deposit in our DB, used for marking * it as 'tiny' or 'done' - * @param exchange_timestamp when did the exchange receive the deposit - * @param wallet_timestamp when did the wallet sign the contract * @param merchant_pub public key of the merchant * @param coin_pub public key of the coin * @param amount_with_fee amount that was deposited including fee * @param deposit_fee amount the exchange gets to keep as transaction fees * @param h_contract_terms hash of the proposal data known to merchant and customer - * @param wire_deadline by which the merchant advised that he would like the - * wire transfer to be executed * @param receiver_wire_account wire details for the merchant, includes * 'url' in payto://-format; * @return transaction status code, #GNUNET_DB_STATUS_SUCCESS_ONE_RESULT to continue to iterate |