Skip to content

Commit

Permalink
feat: update display info related doc
Browse files Browse the repository at this point in the history
  • Loading branch information
@shaojunda
shaojunda committed Oct 8, 2019
1 parent 83818bc commit 1b44271
Show file tree
Hide file tree
Showing 2 changed files with 166 additions and 50 deletions.
119 changes: 95 additions & 24 deletions doc/api.raml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,26 @@ types:
required: false
},
"generated_tx_hash": {
type: "string",
type: "string",
},
"cell_type": {
type: "string"
},
"started_block_number": {
type: integer,
required: false
},
"ended_block_number": {
type: integer,
required: false
},
"subsidy": {
type: integer,
required: false
},
"dao_type_hash": {
type: "string"
required: false
}
}
}
Expand Down Expand Up @@ -218,6 +237,13 @@ types:
"status": {
type: "string",
enum: ["live", "dead"]
}，
"cell_type": {
type: "string"
},
"dao_type_hash": {
type: "string"
required: false
}
}
}
Expand Down Expand Up @@ -802,34 +828,59 @@ types:
"address_hash": "0x3abd21e6e51674bb961bb4c5f3cee9faa5da30e64be10628dc1cef292cbae324",
"capacity": 100,
"target_block_number": 759，
"generated_tx_hash": "0x3abd21e6e51674bb961bb4c5f3cee9faa5da30e64be10628dc1cef292cbae323"
"generated_tx_hash": "0x3abd21e6e51674bb961bb4c5f3cee9faa5da30e64be10628dc1cef292cbae323",
"cell_type": "normal"
},
{
"from_cellbase": false,
"input_id": 102,
"address_hash": "0xddbd21e6e51674bb961bb4c5f3cee9faa5da30e64be10628dc1cef292cbae323",
"capacity": 100,
"generated_tx_hash": "0x3abd21e6e51674bb961bb4c5f3cee9faa5da30e64be10628dc1cef292cbae321"
"generated_tx_hash": "0x3abd21e6e51674bb961bb4c5f3cee9faa5da30e64be10628dc1cef292cbae321"，
"cell_type": "normal"
},
{
"from_cellbase": false,
"input_id": 103,
"address_hash": "0xddbd21e6e51674bb961bb4c5f3cee9faa5da30e64be10628dc1cef292cbae323",
"capacity": 100,
"generated_tx_hash": "0x3abd21e6e51674bb961bb4c5f3cee9faa5da30e64be10628dc1cef292cbae321",
"started_block_number": 10,
"ended_block_number": 15,
"subsidy": 100000,
"cell_type": "dao",
"dao_type_hash": "0xa20df8e80518e9b2eabc1a0efb0ebe1de83f8df9c867edf99d0c5895654fcde1",
}
],
"display_outputs": [
{
"output_id": 103,
"address_hash": "0x3abd21e6e51674bb961bb4c5f3cee9faa5da30e64be10628dc1cef292cbae324",
"capacity": 100,
"base_reward": 125000000000,
"commit_reward": 0,
"proposal_reward": 0,
"secondary_reward": 476623447,
"consumed_by_tx_hash": null,
"status": "live"
"base_reward": 125000000000,
"commit_reward": 0,
"proposal_reward": 0,
"secondary_reward": 476623447,
"consumed_by_tx_hash": null,
"status": "live",
"cell_type": "normal"
},
{
"output_id": 104,
"address_hash": "0xddbd21e6e51674bb961bb4c5f3cee9faa5da30e64be10628dc1cef292cbae323",
"capacity": 100,
"consumed_by_tx_hash": null,
"status": "live"
"status": "live",
"cell_type": "normal"
},
{
"output_id": 105,
"address_hash": "0xddbd21e6e51674bb961bb4c5f3cee9faa5da30e64be10628dc1cef292cbae323",
"capacity": 100,
"consumed_by_tx_hash": null,
"status": "live",
"cell_type": "dao",
"dao_type_hash": "0xa20df8e80518e9b2eabc1a0efb0ebe1de83f8df9c867edf99d0c5895654fcde1"
}
]
}
Expand Down Expand Up @@ -902,13 +953,15 @@ types:
"capacity": 100,
"target_block_number": 759,
"generated_tx_hash": "0x3abd21e6e51674bb961bb4c5f3cee9faa5da30e64be10628dc1cef292cbae323",
"cell_type": "normal"
},
{
"from_cellbase": false,
"input_id": 102,
"address_hash": "0xddbd21e6e51674bb961bb4c5f3cee9faa5da30e64be10628dc1cef292cbae323",
"capacity": 100,
"generated_tx_hash": "0x3abd21e6e51674bb961bb4c5f3cee9faa5da30e64be10628dc1cef292cbae321",
"cell_type": "normal"
}
],
"display_outputs": [
Expand All @@ -921,14 +974,16 @@ types:
"proposal_reward": 0,
"secondary_reward": 476623447,
"consumed_by_tx_hash": null,
"status": "live"
"status": "live",
"cell_type": "normal"
},
{
"output_id": 104,
"address_hash": "0xddbd21e6e51674bb961bb4c5f3cee9faa5da30e64be10628dc1cef292cbae323",
"capacity": 100,
"consumed_by_tx_hash": null,
"status": "live"
"status": "live",
"cell_type": "normal"
}
]
}
Expand All @@ -951,14 +1006,16 @@ types:
"address_hash": "0x3abd21e6e51674bb961bb4c5f3cee9faa5da30e64be10628dc1cef292cbae324",
"capacity": 100,
"target_block_number": 759,
"generated_tx_hash": "0x3abd21e6e51674bb961bb4c5f3cee9faa5da30e64be10628dc1cef292cbae323"
"generated_tx_hash": "0x3abd21e6e51674bb961bb4c5f3cee9faa5da30e64be10628dc1cef292cbae323",
"cell_type": "normal"
},
{
"from_cellbase": false,
"input_id": 102,
"address_hash": "0xddbd21e6e51674bb961bb4c5f3cee9faa5da30e64be10628dc1cef292cbae323",
"capacity": 100,
"generated_tx_hash": "0x3abd21e6e51674bb961bb4c5f3cee9faa5da30e64be10628dc1cef292cbae321"
"generated_tx_hash": "0x3abd21e6e51674bb961bb4c5f3cee9faa5da30e64be10628dc1cef292cbae321",
"cell_type": "normal"
}
],
"display_outputs": [
Expand All @@ -971,14 +1028,16 @@ types:
"proposal_reward": 0,
"secondary_reward": 476623447,
"consumed_by_tx_hash": null,
"status": "live"
"status": "live",
"cell_type": "normal"
},
{
"output_id": 104,
"address_hash": "0xddbd21e6e51674bb961bb4c5f3cee9faa5da30e64be10628dc1cef292cbae323",
"capacity": 100,
"consumed_by_tx_hash": null,
"status": "live"
"status": "live",
"cell_type": "normal"
}
]
}
Expand Down Expand Up @@ -1057,13 +1116,15 @@ types:
"capacity": 100,
"target_block_number": 759,
"generated_tx_hash": "0x3abd21e6e51674bb961bb4c5f3cee9faa5da30e64be10628dc1cef292cbae323",
"cell_type": "normal"
},
{
"from_cellbase": false,
"input_id": 102,
"address_hash": "0xddbd21e6e51674bb961bb4c5f3cee9faa5da30e64be10628dc1cef292cbae323",
"capacity": 100,
"generated_tx_hash": "0x3abd21e6e51674bb961bb4c5f3cee9faa5da30e64be10628dc1cef292cbae321",
"cell_type": "normal"
}
],
"display_outputs": [
Expand All @@ -1076,14 +1137,16 @@ types:
"proposal_reward": 0,
"secondary_reward": 476623447,
"consumed_by_tx_hash": null,
"status": "live"
"status": "live",
"cell_type": "normal"
},
{
"output_id": 104,
"address_hash": "0xddbd21e6e51674bb961bb4c5f3cee9faa5da30e64be10628dc1cef292cbae323",
"capacity": 100,
"consumed_by_tx_hash": null,
"status": "live"
"status": "live",
"cell_type": "normal"
}
]
}
Expand All @@ -1105,13 +1168,15 @@ types:
"capacity": 100,
"target_block_number": 759,
"generated_tx_hash": "0x3abd21e6e51674bb961bb4c5f3cee9faa5da30e64be10628dc1cef292cbae323",
"cell_type": "normal"
},
{
"from_cellbase": true,
"input_id": 102,
"address_hash": "0xddbd21e6e51674bb961bb4c5f3cee9faa5da30e64be10628dc1cef292cbae323",
"capacity": 100,
"generated_tx_hash": "0x3abd21e6e51674bb961bb4c5f3cee9faa5da30e64be10628dc1cef292cbae321",
"cell_type": "normal"
}
],
"display_outputs": [
Expand All @@ -1124,14 +1189,16 @@ types:
"proposal_reward": 0,
"secondary_reward": 476623447,
"consumed_by_tx_hash": "0x2bbd21e6e51674bb961bb4c5f3cee9faa5da30e64be10628dc1cef292cbae324",
"status": "dead"
"status": "dead",
"cell_type": "normal"
},
{
"output_id": 104,
"address_hash": "0xddbd21e6e51674bb961bb4c5f3cee9faa5da30e64be10628dc1cef292cbae323",
"capacity": 100,
"consumed_by_tx_hash": "0x3abd21e6e51674bb961bb4c5f3cee9faa5da30e64be10628dc1cef292cbae324",
"status": "dead"
"status": "dead",
"cell_type": "normal"
}
]
}
Expand Down Expand Up @@ -1774,14 +1841,16 @@ types:
"address_hash": "0x3abd21e6e51674bb961bb4c5f3cee9faa5da30e64be10628dc1cef292cbae324",
"capacity": 100,
"target_block_number": 100,
"generated_tx_hash": "0x3abd21e6e51674bb961bb4c5f3cee9faa5da30e64be10628dc1cef292cbae323"
"generated_tx_hash": "0x3abd21e6e51674bb961bb4c5f3cee9faa5da30e64be10628dc1cef292cbae323",
"cell_type": "normal"
},
{
"from_cellbase": false,
"input_id": 102,
"address_hash": "0xddbd21e6e51674bb961bb4c5f3cee9faa5da30e64be10628dc1cef292cbae323",
"capacity": 100,
"generated_tx_hash": "0x3abd21e6e51674bb961bb4c5f3cee9faa5da30e64be10628dc1cef292cbae321"
"generated_tx_hash": "0x3abd21e6e51674bb961bb4c5f3cee9faa5da30e64be10628dc1cef292cbae321",
"cell_type": "normal"
}
],
"display_outputs": [
Expand All @@ -1795,14 +1864,16 @@ types:
"proposal_reward": 0,
"secondary_reward": 476623447,
"consumed_by_tx_hash": null,
"status": "live"
"status": "live",
"cell_type": "normal"
},
{
"output_id": 104,
"address_hash": "0xddbd21e6e51674bb961bb4c5f3cee9faa5da30e64be10628dc1cef292cbae323",
"capacity": 100,
"consumed_by_tx_hash": null,
"status": "live"
"status": "live",
"cell_type": "normal"
}
]
}
Expand Down
Loading

0 comments on commit 1b44271

Please sign in to comment.