update base

baseapi/base/v1/batchtx.proto

@@ -7,9 +7,13 @@ import "google/protobuf/any.proto";
 import "base/v1/resource.proto";
 import "base/v1/meta.proto";
 
+
 // BatchTx include one batchHash and all original tx contained in batch.
 // it will broadcast to nebula over p2p module, and then save in p2p module.
+// Amount metaprooftx make a batch tx, and generate a batch_hash,
 message BatchTx {
     Hash batch_hash = 1;
     repeated MetaProofTx txs = 2;
 }
+
+ 
\ No newline at end of file

baseapi/base/v1/eth_blocks.proto

@@ -8,10 +8,6 @@ import "base/v1/resource.proto";
 import "base/v1/eth_tx.proto";
 
 
-message EthBloom {
-    bytes data = 1;
-}
-
 message EthBlockHeader {
     Hash parent_hash = 1;
     Hash uncle_hash = 2;
@@ -21,7 +17,7 @@ message EthBlockHeader {
     Hash txs_root = 6;
     Hash receipts_root = 7;
     BigInt block_number = 8;
-    EthBloom block_bloom = 9;
+    Bloom block_bloom = 9;
     BigInt difficulty = 10;
     uint64 gas_limit = 11;
     uint64 gas_used = 12;

baseapi/base/v1/eth_tx.proto

@@ -6,15 +6,6 @@ import "google/protobuf/timestamp.proto";
 import "google/protobuf/any.proto";
 import "base/v1/resource.proto";
 
-message AccessTuple {
-    Address address = 1;
-    repeated Hash storage_keys = 2;
-}
-
-message AccessList {
-    repeated AccessTuple access_list = 1;
-}
-
 message EthTxParam {
     Address from = 1;
     Address to   = 2;

baseapi/base/v1/meta.proto

@@ -5,7 +5,6 @@ package base.v1;
 import "google/protobuf/timestamp.proto";
 import "google/protobuf/any.proto";
 import "base/v1/resource.proto";
-import "base/v1/eth_tx.proto";
 
 message MetaProof{
     bytes rset = 1;
@@ -15,19 +14,25 @@ message MetaProof{
 }
 
 message MetaTxBase {
-    BigInt chain_id = 1;
-    uint64 nonce = 2;
-    BigInt gas_price = 3;
-    uint64 gas = 4;
-    Address to = 5;
-    BigInt value = 6;
-    bytes data = 7;
-    AccessList access_list = 8;
-    BigInt v = 9;
-    BigInt r = 10;
-    BigInt s = 11;
-    Address from = 12;
-    google.protobuf.Timestamp receive_time = 13;
+    // tx_type 用于指示当前的交易类型.
+    uint32 tx_type = 1;
+
+    BigInt chain_id = 2;
+    uint64 nonce = 3;
+    BigInt gas_price = 4;
+    uint64 gas = 5;
+    Address to = 6;
+    BigInt value = 7;
+    bytes data = 8;
+    AccessList access_list = 9;
+    BigInt v = 10;
+    BigInt r = 11;
+    BigInt s = 12;
+    Address from = 13;
+    google.protobuf.Timestamp receive_time = 14;
+
+    // expire block 用于指定当区块超过此高度后，交易即使被打包也不执行.
+    BigInt expired_block = 15; 
 }
 
 message MetaProofTx {
@@ -35,8 +40,8 @@ message MetaProofTx {
     MetaProof proof = 2;
 }
 
-message MetaTx {
-
+message MetaTransaction {
+    google.protobuf.Any   tx = 1;
 }
 
 message MetaBlockHeader {
@@ -47,7 +52,7 @@ message MetaBlockHeader {
     Hash txs_root = 5;
     Hash receipts_root = 6;
     BigInt block_number = 7;
-    EthBloom block_bloom = 8;
+    Bloom block_bloom = 8;
     uint64 gas_limit = 9;
     uint64 gas_used = 10;
     uint64 timestamp = 11;
@@ -55,11 +60,11 @@ message MetaBlockHeader {
 }
 
 message MetaBlockBody {
-    repeated MetaTx txs = 1;
+    repeated MetaTransaction txs = 1;
 }
 
 message MetaBlock {
     MetaBlockHeader header = 1;
-    repeated MetaTx txs = 2;
+    repeated MetaTransaction txs = 2;
 }
 

baseapi/base/v1/resource.proto

@@ -36,3 +36,16 @@ message Account {
   bytes   balance = 3;
   Hash    state_root = 4;
 }
+
+message Bloom {
+  bytes data = 1;
+}
+
+message AccessTuple {
+  Address address = 1;
+  repeated Hash storage_keys = 2;
+}
+
+message AccessList {
+  repeated AccessTuple access_list = 1;
+}
\ No newline at end of file