mirror of
https://github.com/ElementsProject/elements.git
synced 2026-08-18 13:17:55 +02:00
Merge 263f53e2d0 into merged_master (Bitcoin PR #18098)
This commit is contained in:
Andrew Poelstra
commit
e81fccc9a5
8 changed files with 345 additions and 345 deletions
|
|
@ -108,7 +108,7 @@ static UniValue getrawtransaction(const JSONRPCRequest& request)
|
|||
},
|
||||
RPCResult{"if verbose is set to true",
|
||||
"{\n"
|
||||
" \"in_active_chain\": b, (bool) Whether specified block is in the active chain or not (only present with explicit \"blockhash\" argument)\n"
|
||||
" \"in_active_chain\" : b, (boolean) Whether specified block is in the active chain or not (only present with explicit \"blockhash\" argument)\n"
|
||||
" \"hex\" : \"data\", (string) The serialized, hex-encoded data for 'txid'\n"
|
||||
" \"txid\" : \"id\", (string) The transaction id (same as provided)\n"
|
||||
" \"hash\" : \"id\", (string) The transaction hash (differs from txid for witness transactions)\n"
|
||||
|
|
@ -119,14 +119,14 @@ static UniValue getrawtransaction(const JSONRPCRequest& request)
|
|||
" \"locktime\" : ttt, (numeric) The lock time\n"
|
||||
" \"vin\" : [ (array of json objects)\n"
|
||||
" {\n"
|
||||
" \"txid\": \"id\", (string) The transaction id\n"
|
||||
" \"vout\": n, (numeric) \n"
|
||||
" \"scriptSig\": { (json object) The script\n"
|
||||
" \"asm\": \"asm\", (string) asm\n"
|
||||
" \"hex\": \"hex\" (string) hex\n"
|
||||
" \"txid\" : \"id\", (string) The transaction id\n"
|
||||
" \"vout\" : n, (numeric) \n"
|
||||
" \"scriptSig\" : { (json object) The script\n"
|
||||
" \"asm\" : \"asm\", (string) asm\n"
|
||||
" \"hex\" : \"hex\" (string) hex\n"
|
||||
" },\n"
|
||||
" \"sequence\": n (numeric) The script sequence number\n"
|
||||
" \"txinwitness\": [\"hex\", ...] (array of string) hex-encoded witness data (if any)\n"
|
||||
" \"sequence\" : n (numeric) The script sequence number\n"
|
||||
" \"txinwitness\" : [\"hex\", ...] (array of string) hex-encoded witness data (if any)\n"
|
||||
" }\n"
|
||||
" ,...\n"
|
||||
" ],\n"
|
||||
|
|
@ -483,14 +483,14 @@ static UniValue decoderawtransaction(const JSONRPCRequest& request)
|
|||
" \"locktime\" : ttt, (numeric) The lock time\n"
|
||||
" \"vin\" : [ (array of json objects)\n"
|
||||
" {\n"
|
||||
" \"txid\": \"id\", (string) The transaction id\n"
|
||||
" \"vout\": n, (numeric) The output number\n"
|
||||
" \"scriptSig\": { (json object) The script\n"
|
||||
" \"asm\": \"asm\", (string) asm\n"
|
||||
" \"hex\": \"hex\" (string) hex\n"
|
||||
" \"txid\" : \"id\", (string) The transaction id\n"
|
||||
" \"vout\" : n, (numeric) The output number\n"
|
||||
" \"scriptSig\" : { (json object) The script\n"
|
||||
" \"asm\" : \"asm\", (string) asm\n"
|
||||
" \"hex\" : \"hex\" (string) hex\n"
|
||||
" },\n"
|
||||
" \"txinwitness\": [\"hex\", ...] (array of string) hex-encoded witness data (if any)\n"
|
||||
" \"sequence\": n (numeric) The script sequence number\n"
|
||||
" \"txinwitness\" : [\"hex\", ...] (array of string) hex-encoded witness data (if any)\n"
|
||||
" \"sequence\" : n (numeric) The script sequence number\n"
|
||||
" }\n"
|
||||
" ,...\n"
|
||||
" ],\n"
|
||||
|
|
@ -555,20 +555,20 @@ static UniValue decodescript(const JSONRPCRequest& request)
|
|||
},
|
||||
RPCResult{
|
||||
"{\n"
|
||||
" \"asm\":\"asm\", (string) Script public key\n"
|
||||
" \"type\":\"type\", (string) The output type (e.g. "+GetAllOutputTypes()+")\n"
|
||||
" \"reqSigs\": n, (numeric) The required signatures\n"
|
||||
" \"addresses\": [ (json array of string)\n"
|
||||
" \"asm\" : \"asm\", (string) Script public key\n"
|
||||
" \"type\" : \"type\", (string) The output type (e.g. "+GetAllOutputTypes()+")\n"
|
||||
" \"reqSigs\" : n, (numeric) The required signatures\n"
|
||||
" \"addresses\" : [ (json array of string)\n"
|
||||
" \"address\" (string) bitcoin address\n"
|
||||
" ,...\n"
|
||||
" ],\n"
|
||||
" \"p2sh\":\"str\" (string) address of P2SH script wrapping this redeem script (not returned if the script is already a P2SH).\n"
|
||||
" \"segwit\": { (json object) Result of a witness script public key wrapping this redeem script (not returned if the script is a P2SH or witness).\n"
|
||||
" \"asm\":\"str\", (string) String representation of the script public key\n"
|
||||
" \"hex\":\"hexstr\", (string) Hex string of the script public key\n"
|
||||
" \"type\":\"str\", (string) The type of the script public key (e.g. witness_v0_keyhash or witness_v0_scripthash)\n"
|
||||
" \"reqSigs\": n, (numeric) The required signatures (always 1)\n"
|
||||
" \"addresses\": [ (json array of string) (always length 1)\n"
|
||||
" \"segwit\" : { (json object) Result of a witness script public key wrapping this redeem script (not returned if the script is a P2SH or witness).\n"
|
||||
" \"asm\" : \"str\", (string) String representation of the script public key\n"
|
||||
" \"hex\" : \"hexstr\", (string) Hex string of the script public key\n"
|
||||
" \"type\" : \"str\", (string) The type of the script public key (e.g. witness_v0_keyhash or witness_v0_scripthash)\n"
|
||||
" \"reqSigs\" : n, (numeric) The required signatures (always 1)\n"
|
||||
" \"addresses\" : [ (json array of string) (always length 1)\n"
|
||||
" \"address\" (string) segwit address\n"
|
||||
" ,...\n"
|
||||
" ],\n"
|
||||
|
|
@ -896,7 +896,7 @@ static UniValue testmempoolaccept(const JSONRPCRequest& request)
|
|||
{"maxfeerate", RPCArg::Type::AMOUNT, /* default */ FormatMoney(DEFAULT_MAX_RAW_TX_FEE_RATE.GetFeePerK()), "Reject transactions whose fee rate is higher than the specified value, expressed in " + CURRENCY_UNIT + "/kB\n"},
|
||||
},
|
||||
RPCResult{
|
||||
"[ (array) The result of the mempool acceptance test for each raw transaction in the input array.\n"
|
||||
"[ (json array) The result of the mempool acceptance test for each raw transaction in the input array.\n"
|
||||
" Length is exactly one for now.\n"
|
||||
" {\n"
|
||||
" \"txid\" (string) The transaction hash in hex\n"
|
||||
|
|
@ -1174,15 +1174,15 @@ UniValue decodepsbt(const JSONRPCRequest& request)
|
|||
" \"asm\" : \"asm\", (string) The asm\n"
|
||||
" \"hex\" : \"hex\", (string) The hex\n"
|
||||
" },\n"
|
||||
" \"final_scriptwitness\": [\"hex\", ...], (array of string) hex-encoded witness data (if any)\n"
|
||||
" \"value\": x.xxx, (numeric) The (unblinded) value of the input in " + CURRENCY_UNIT + "\n"
|
||||
" \"value_blinding_factor\": \"hex\" , (string) The value blinding factor from the output being spent\n"
|
||||
" \"asset\": \"hex\" , (string) The (unblinded) asset id of the input\n"
|
||||
" \"asset_blinding_factor\": \"hex\" , (string) The asset blinding factor from the output being spent\n"
|
||||
" \"pegin_bitcoin_tx\": \"hex\", (string) The tx providing the peg-in in the format of the getrawtransaction RPC.\n"
|
||||
" \"pegin_claim_script\": \"hex\", (string) The claim script for the peg-in input\n"
|
||||
" \"pegin_txout_proof\": \"hex\", (string) The tx providing the peg-in input\n"
|
||||
" \"pegin_genesis_hash\": \"hex\", (string) The hash of the genesis block for this peg-in\n"
|
||||
" \"final_scriptwitness\" : [\"hex\", ...], (array of string) hex-encoded witness data (if any)\n"
|
||||
" \"value\" : x.xxx, (numeric) The (unblinded) value of the input in " + CURRENCY_UNIT + "\n"
|
||||
" \"value_blinding_factor\" : \"hex\" , (string) The value blinding factor from the output being spent\n"
|
||||
" \"asset\"k: \"hex\" , (string) The (unblinded) asset id of the input\n"
|
||||
" \"asset_blinding_factor\" : \"hex\" , (string) The asset blinding factor from the output being spent\n"
|
||||
" \"pegin_bitcoin_tx\" : \"hex\", (string) The tx providing the peg-in in the format of the getrawtransaction RPC.\n"
|
||||
" \"pegin_claim_script\" : \"hex\", (string) The claim script for the peg-in input\n"
|
||||
" \"pegin_txout_proof\" : \"hex\", (string) The tx providing the peg-in input\n"
|
||||
" \"pegin_genesis_hash\" : \"hex\", (string) The hash of the genesis block for this peg-in\n"
|
||||
" \"unknown\" : { (json object) The unknown input fields\n"
|
||||
" \"key\" : \"value\" (key-value pair) An unknown key-value pair\n"
|
||||
" ...\n"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue