From a58bf8eaec25d18afd4ce29c18aee270e02c1b29 Mon Sep 17 00:00:00 2001
From: sasaxie <xiexiaodong917@163.com>
Date: Wed, 14 Mar 2018 18:42:59 +0800
Subject: [PATCH] Merge branch 'develop' into junit/config

---
 core/Tron.proto | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/core/Tron.proto b/core/Tron.proto
index 4b5d5446c7e..a5b3698489c 100644
--- a/core/Tron.proto
+++ b/core/Tron.proto
@@ -83,6 +83,16 @@ message Transaction {
     ContractType type = 1;
     google.protobuf.Any parameter = 2;
   }
+
+  message Result {
+    enum code {
+      SUCESS = 0;
+      FAILED = 1;
+    }
+    int64 fee = 1;
+    code ret = 2;
+  }
+
   message raw {
     TransactionType type = 2;
     repeated TXInput vin = 5;
@@ -92,8 +102,10 @@ message Transaction {
     repeated Contract contract = 11;
     bytes scripts = 16;
   }
+
   raw raw_data = 1;
-  repeated bytes signature = 5;
+  repeated bytes signature = 2;
+  repeated Result ret = 5;
 }
 
 message BlockHeader {