OSDN Git Service
(root)
/
bytom
/
vapor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Edit (#275)
[bytom/vapor.git]
/
protocol
/
bc
/
bc.proto
diff --git
a/protocol/bc/bc.proto
b/protocol/bc/bc.proto
index
d333667
..
59190d4
100644
(file)
--- a/
protocol/bc/bc.proto
+++ b/
protocol/bc/bc.proto
@@
-48,11
+48,6
@@
message ValueDestination {
uint64 position = 3;
}
uint64 position = 3;
}
-message Proof {
- bytes sign = 1;
- bytes controlProgram = 2;
-}
-
message BlockHeader {
uint64 version = 1;
uint64 height = 2;
message BlockHeader {
uint64 version = 1;
uint64 height = 2;
@@
-60,10
+55,8
@@
message BlockHeader {
uint64 timestamp = 4;
Hash transactions_root = 5;
Hash transaction_status_hash = 6;
uint64 timestamp = 4;
Hash transactions_root = 5;
Hash transaction_status_hash = 6;
- uint64 nonce = 7;
- uint64 bits = 8;
- TransactionStatus transaction_status = 9;
- Proof Proof = 10;
+ TransactionStatus transaction_status = 7;
+ repeated bytes witness_arguments = 8;
}
message TxHeader {
}
message TxHeader {
@@
-94,37
+87,49
@@
message Coinbase {
bytes arbitrary = 2;
}
bytes arbitrary = 2;
}
-message Output {
+message
IntraChain
Output {
ValueSource source = 1;
Program control_program = 2;
uint64 ordinal = 3;
}
ValueSource source = 1;
Program control_program = 2;
uint64 ordinal = 3;
}
-message Retirement {
- ValueSource source = 1;
- uint64 ordinal = 2;
+message CrossChainOutput {
+ ValueSource source = 1;
+ Program control_program = 2;
+ uint64 ordinal = 3;
}
}
-message Issuance {
- Hash nonce_hash = 1;
- AssetAmount value = 2;
- ValueDestination witness_destination = 3;
- AssetDefinition witness_asset_definition = 4;
- repeated bytes witness_arguments = 5;
- uint64 ordinal = 6;
+message VoteOutput {
+ ValueSource source = 1;
+ Program control_program = 2;
+ uint64 ordinal = 3;
+ bytes vote = 4;
}
}
-message
Spend
{
+message
VetoInput
{
Hash spent_output_id = 1;
ValueDestination witness_destination = 2;
repeated bytes witness_arguments = 3;
uint64 ordinal = 4;
}
Hash spent_output_id = 1;
ValueDestination witness_destination = 2;
repeated bytes witness_arguments = 3;
uint64 ordinal = 4;
}
-message Claim {
+message Retirement {
+ ValueSource source = 1;
+ uint64 ordinal = 2;
+}
+
+message Spend {
Hash spent_output_id = 1;
ValueDestination witness_destination = 2;
repeated bytes witness_arguments = 3;
uint64 ordinal = 4;
Hash spent_output_id = 1;
ValueDestination witness_destination = 2;
repeated bytes witness_arguments = 3;
uint64 ordinal = 4;
- repeated bytes Peginwitness = 5;
-}
\ No newline at end of file
+}
+
+message CrossChainInput {
+ Hash mainchain_output_id = 1;
+ ValueDestination witness_destination = 2;
+ Program control_program = 3;
+ AssetDefinition asset_definition = 4;
+ repeated bytes witness_arguments = 5;
+ uint64 ordinal = 6;
+}