Skip to content
This repository has been archived by the owner on Nov 6, 2020. It is now read-only.

Added missing methods #5542

Merged
merged 3 commits into from
May 4, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions js/src/api/rpc/parity/parity.js
Original file line number Diff line number Diff line change
Expand Up @@ -70,11 +70,21 @@ export default class Parity {
.execute('parity_checkRequest', inNumber16(requestId));
}

cidV0 (data) {
return this._transport
.execute('parity_cidV0', inData(data));
}

closeVault (vaultName) {
return this._transport
.execute('parity_closeVault', vaultName);
}

composeTransaction (options) {
return this._transport
.execute('parity_composeTransaction', inOptions(options));
}

consensusCapability () {
return this._transport
.execute('parity_consensusCapability');
Expand Down
95 changes: 82 additions & 13 deletions js/src/jsonrpc/interfaces/parity.js
Original file line number Diff line number Diff line change
Expand Up @@ -296,19 +296,6 @@ export default {
}
},

getBlockHeaderByNumber: {
section: SECTION_NET,
desc: 'Returns block header information by number (same as eth_getBlockByNumber without transactions and uncles)',
params: [
{
type: BlockNumber,
desc: 'integer of a block number, or the string `\'earliest\'`, `\'latest\'` or `\'pending\'`, as in the [default block parameter](#the-default-block-parameter).',
example: fromDecimal(436)
}
],
returns: 'See [eth_getBlockByHash](#eth_getblockbyhash) (without transactions and uncles)'
},

getVaultMeta: {
section: SECTION_VAULT,
desc: 'Returns the metadata for a specific vault',
Expand Down Expand Up @@ -1927,5 +1914,87 @@ export default {
desc: 'Message signature.',
example: '0x1d9e33a8cf8bfc089a172bca01da462f9e359c6cb1b0f29398bc884e4d18df4f78588aee4fb5cc067ca62d2abab995e0bba29527be6ac98105b0320020a2efaf00'
}
},

composeTransaction: {
desc: 'Given partial transaction request produces transaction with all fields filled in. Such transaction can be then signed externally.',
params: [
{
type: TransactionRequest,
desc: 'see [`eth_sendTransaction`](JSONRPC-eth-module#eth_sendtransaction).',
format: 'inputCallFormatter',
example: {
from: '0xb60e8dd61c5d32be8058bb8eb970870f07233155',
to: '0xd46e8dd67c5d32be8058bb8eb970870f07244567',
value: fromDecimal(2441406250)
}
}
],
returns: {
type: Object,
desc: 'Transaction object (same as the parameter) with missing optional fields filled in by defaults.',
example: {
condition: null,
data: '0x',
from: '0xb60e8dd61c5d32be8058bb8eb970870f07233155',
gas: '0xe57e0',
gasPrice: '0x4a817c800',
nonce: '0x0',
to: '0xd46e8dd67c5d32be8058bb8eb970870f07244567',
value: '0x9184e72a'
}
}
},

getBlockHeaderByNumber: {
desc: 'Get block header. Same as [`eth_getBlockByNumber`](JSONRPC-eth-module#eth_getblockbynumber) but without uncles and transactions.',
params: [
{
type: BlockNumber,
desc: 'integer of a block number, or the string `\'earliest\'`, `\'latest\'` or `\'pending\'`, as in the [default block parameter](#the-default-block-parameter).',
example: fromDecimal(436)
}
],
returns: {
type: Object,
desc: 'Block header',
example: {
author: '0xbb7b8287f3f0a933474a79eae42cbca977791171',
difficulty: '0x4ea3f27bc',
extraData: '0x476574682f4c5649562f76312e302e302f6c696e75782f676f312e342e32',
gasLimit: '0x1388',
gasUsed: '0x0',
hash: '0xdc0818cf78f21a8e70579cb46a43643f78291264dda342ae31049421c82d21ae',
logsBloom: '0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000',
miner: '0xbb7b8287f3f0a933474a79eae42cbca977791171',
mixHash: '0x4fffe9ae21f1c9e15207b1f472d5bbdd68c9595d461666602f2be20daf5e7843',
nonce: '0x689056015818adbe',
number: '0x1b4',
parentHash: '0xe99e022112df268087ea7eafaf4790497fd21dbeeb6bd7a1721df161a6657a54',
receiptsRoot: '0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421',
sealFields: ['0xa04fffe9ae21f1c9e15207b1f472d5bbdd68c9595d461666602f2be20daf5e7843', '0x88689056015818adbe'],
sha3Uncles: '0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347',
size: '0x21b',
stateRoot: '0xddc8b0234c2e0cad087c8b389aa7ef01f7d79b2570bccb77ce48648aa61c904d',
timestamp: '0x55ba467c',
transactionsRoot: '0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421'
}
}
},

cidV0: {
desc: 'Compute a v0 IPFS Content ID from protobuf encoded bytes.',
params: [
{
type: Data,
desc: 'to encode.',
example: '0x666f6f626172'
}
],
returns: {
type: String,
desc: 'Base58 encoded CID',
example: 'QmSbFjqjd6nFwNHqsBCC7SK8GShGcayLUEtysJjNGhZAnC'
}
}
};
2 changes: 1 addition & 1 deletion rpc/src/v1/traits/personal.rs
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ build_rpc_trait! {
#[rpc(meta, name = "personal_sendTransaction")]
fn send_transaction(&self, Self::Metadata, TransactionRequest, String) -> BoxFuture<H256, Error>;

/// Deprecated alias for `personal_sendTransaction`.
/// @deprecated alias for `personal_sendTransaction`.
#[rpc(meta, name = "personal_signAndSendTransaction")]
fn sign_and_send_transaction(&self, Self::Metadata, TransactionRequest, String) -> BoxFuture<H256, Error>;

Expand Down