diff options
| author | Riccardo Spagni <ric@spagni.net> | 2015-06-14 13:08:21 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2015-06-14 13:08:25 +0200 |
| commit | 7c2c3be49bf725ec6609b4ab1d673767cc242e7f (patch) | |
| tree | e7da5c0cc9f6e4faf479085bc1c17280236d9526 /src/wallet/wallet_rpc_server.h | |
| parent | Merge pull request #312 (diff) | |
| parent | Add RPC commands to manipulate integrated addresses (diff) | |
| download | monero-7c2c3be49bf725ec6609b4ab1d673767cc242e7f.tar.xz | |
Merge pull request #317
6f8a6dc Add RPC commands to manipulate integrated addresses (moneromooo-monero)
67be2e4 simplewallet: allow integrated_address to generate a random payment id (moneromooo-monero)
7bd6efe account: add a couple consts (moneromooo-monero)
63741d8 Integrated addresses (standard address plus payment id) (moneromooo-monero)
Diffstat (limited to 'src/wallet/wallet_rpc_server.h')
| -rw-r--r-- | src/wallet/wallet_rpc_server.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/wallet/wallet_rpc_server.h b/src/wallet/wallet_rpc_server.h index 8538eed2b..73411a98d 100644 --- a/src/wallet/wallet_rpc_server.h +++ b/src/wallet/wallet_rpc_server.h @@ -71,6 +71,8 @@ namespace tools MAP_JON_RPC_WE("get_bulk_payments", on_get_bulk_payments, wallet_rpc::COMMAND_RPC_GET_BULK_PAYMENTS) MAP_JON_RPC_WE("incoming_transfers", on_incoming_transfers, wallet_rpc::COMMAND_RPC_INCOMING_TRANSFERS) MAP_JON_RPC_WE("query_key", on_query_key, wallet_rpc::COMMAND_RPC_QUERY_KEY) + MAP_JON_RPC_WE("make_integrated_address", on_make_integrated_address, wallet_rpc::COMMAND_RPC_MAKE_INTEGRATED_ADDRESS) + MAP_JON_RPC_WE("split_integrated_address", on_split_integrated_address, wallet_rpc::COMMAND_RPC_SPLIT_INTEGRATED_ADDRESS) END_JSON_RPC_MAP() END_URI_MAP2() @@ -81,6 +83,8 @@ namespace tools bool on_transfer(const wallet_rpc::COMMAND_RPC_TRANSFER::request& req, wallet_rpc::COMMAND_RPC_TRANSFER::response& res, epee::json_rpc::error& er); bool on_transfer_split(const wallet_rpc::COMMAND_RPC_TRANSFER_SPLIT::request& req, wallet_rpc::COMMAND_RPC_TRANSFER_SPLIT::response& res, epee::json_rpc::error& er); bool on_sweep_dust(const wallet_rpc::COMMAND_RPC_SWEEP_DUST::request& req, wallet_rpc::COMMAND_RPC_SWEEP_DUST::response& res, epee::json_rpc::error& er); + bool on_make_integrated_address(const wallet_rpc::COMMAND_RPC_MAKE_INTEGRATED_ADDRESS::request& req, wallet_rpc::COMMAND_RPC_MAKE_INTEGRATED_ADDRESS::response& res, epee::json_rpc::error& er); + bool on_split_integrated_address(const wallet_rpc::COMMAND_RPC_SPLIT_INTEGRATED_ADDRESS::request& req, wallet_rpc::COMMAND_RPC_SPLIT_INTEGRATED_ADDRESS::response& res, epee::json_rpc::error& er); bool on_store(const wallet_rpc::COMMAND_RPC_STORE::request& req, wallet_rpc::COMMAND_RPC_STORE::response& res, epee::json_rpc::error& er); bool on_get_payments(const wallet_rpc::COMMAND_RPC_GET_PAYMENTS::request& req, wallet_rpc::COMMAND_RPC_GET_PAYMENTS::response& res, epee::json_rpc::error& er); bool on_get_bulk_payments(const wallet_rpc::COMMAND_RPC_GET_BULK_PAYMENTS::request& req, wallet_rpc::COMMAND_RPC_GET_BULK_PAYMENTS::response& res, epee::json_rpc::error& er); |