fix: RPC add valid_since field

zhangsoledad · Apr 11, 2019 · 04d7dde · 04d7dde
1 parent 2925b97
commit 04d7dde
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/rpc/README.md b/rpc/README.md
@@ -351,14 +351,15 @@ Creates new transaction.
 transaction - The transaction object.
 
     version - Transaction version.
+    valid_since - Transaction valid_since.
     deps - Dependent cells.
     inputs - Transaction inputs.
     outputs - Transaction outputs.
 
 ## Examples
 
 ```shell
-curl -d '{"id": 2, "jsonrpc": "2.0", "method":"send_transaction","params": [{"version":2, "deps":[], "inputs":[], "outputs":[]}]}' -H 'content-type:application/json' 'http://localhost:8114'
+curl -d '{"id": 2, "jsonrpc": "2.0", "method":"send_transaction","params": [{"version":0, "deps":[], "inputs":[{"previous_output": {"hash": "<hash>", "index": 0}, "args": ["<unlock sign>"]}], "outputs":[{"capacity": 200, "data": "0x", "lock": {"version": 0, "args": [], "binary_hash": "0x0000000000000000000000000000000000000000000000000000000000000000"}, "type": null }]}]}' -H 'content-type:application/json' 'http://localhost:8114'
 ```
 
 ```json

diff --git a/util/jsonrpc-types/src/blockchain.rs b/util/jsonrpc-types/src/blockchain.rs
@@ -166,6 +166,7 @@ impl TryFrom<Witness> for CoreWitness {
 #[derive(Clone, Default, Serialize, Deserialize, PartialEq, Eq, Hash, Debug)]
 pub struct Transaction {
     pub version: u32,
+    pub valid_since: u64,
     pub deps: Vec<OutPoint>,
     pub inputs: Vec<CellInput>,
     pub outputs: Vec<CellOutput>,
@@ -180,6 +181,7 @@ impl<'a> From<&'a CoreTransaction> for Transaction {
 
         Transaction {
             version: core.version(),
+            valid_since: core.valid_since(),
             deps: core.deps().iter().cloned().map(Into::into).collect(),
             inputs: core.inputs().iter().cloned().map(Into::into).collect(),
             outputs: core.outputs().iter().cloned().map(Into::into).collect(),
@@ -195,6 +197,7 @@ impl TryFrom<Transaction> for CoreTransaction {
     fn try_from(json: Transaction) -> Result<Self, Self::Error> {
         let Transaction {
             version,
+            valid_since,
             deps,
             inputs,
             outputs,
@@ -204,6 +207,7 @@ impl TryFrom<Transaction> for CoreTransaction {
 
         Ok(TransactionBuilder::default()
             .version(version)
+            .valid_since(valid_since)
             .deps(
                 deps.into_iter()
                     .map(TryInto::try_into)