diff options
| author | Gavin Andresen <[email protected]> | 2012-10-29 15:49:46 -0400 |
|---|---|---|
| committer | Gavin Andresen <[email protected]> | 2012-10-29 15:49:46 -0400 |
| commit | ae8fc197885270278eab89c0493b2c616d500483 (patch) | |
| tree | 24698e6536fc2833d5b9524d052ba999f10a043f /src/bitcoinrpc.cpp | |
| parent | Merge pull request #1966 from TheBlueMatt/leveldbmakefile (diff) | |
| parent | New createmultisig rpc command (diff) | |
| download | discoin-ae8fc197885270278eab89c0493b2c616d500483.tar.xz discoin-ae8fc197885270278eab89c0493b2c616d500483.zip | |
Merge branch 'rawtx_p2sh'
Diffstat (limited to 'src/bitcoinrpc.cpp')
| -rw-r--r-- | src/bitcoinrpc.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/bitcoinrpc.cpp b/src/bitcoinrpc.cpp index 725037add..21e37c75e 100644 --- a/src/bitcoinrpc.cpp +++ b/src/bitcoinrpc.cpp @@ -234,6 +234,7 @@ static const CRPCCommand vRPCCommands[] = { "sendfrom", &sendfrom, false, false }, { "sendmany", &sendmany, false, false }, { "addmultisigaddress", &addmultisigaddress, false, false }, + { "createmultisig", &createmultisig, true, true }, { "getrawmempool", &getrawmempool, true, false }, { "getblock", &getblock, false, false }, { "getblockhash", &getblockhash, false, false }, @@ -1160,6 +1161,8 @@ Array RPCConvertValues(const std::string &strMethod, const std::vector<std::stri if (strMethod == "sendmany" && n > 2) ConvertTo<boost::int64_t>(params[2]); if (strMethod == "addmultisigaddress" && n > 0) ConvertTo<boost::int64_t>(params[0]); if (strMethod == "addmultisigaddress" && n > 1) ConvertTo<Array>(params[1]); + if (strMethod == "createmultisig" && n > 0) ConvertTo<boost::int64_t>(params[0]); + if (strMethod == "createmultisig" && n > 1) ConvertTo<Array>(params[1]); if (strMethod == "listunspent" && n > 0) ConvertTo<boost::int64_t>(params[0]); if (strMethod == "listunspent" && n > 1) ConvertTo<boost::int64_t>(params[1]); if (strMethod == "listunspent" && n > 2) ConvertTo<Array>(params[2]); |