From 7a8407350e8da69c4ebaf4e5619c7ecd3a916eaa Mon Sep 17 00:00:00 2001 From: zhaohong Date: Mon, 2 Apr 2018 10:58:15 +0800 Subject: [PATCH 1/4] add comments about ParticipateAssetIssueContract. --- core/Contract.proto | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/Contract.proto b/core/Contract.proto index 9d0870973c6..b334f7709b0 100644 --- a/core/Contract.proto +++ b/core/Contract.proto @@ -29,7 +29,7 @@ message AccountCreateContract { } // update account name if the account has no name. -message AccountUpdateContract{ +message AccountUpdateContract { bytes account_name = 1; bytes owner_address = 2; } @@ -92,8 +92,8 @@ message AssetIssueContract { message ParticipateAssetIssueContract { bytes owner_address = 1; bytes to_address = 2; - bytes asset_name = 3; - int64 amount = 4; + bytes asset_name = 3; // the name of target asset + int64 amount = 4; // the amount of drops } message DeployContract { From 7d658559329ce13ab4f4bb38ce99511976be6623 Mon Sep 17 00:00:00 2001 From: zhaohong Date: Mon, 2 Apr 2018 19:59:04 +0800 Subject: [PATCH 2/4] feat: remove utxo support from protocol. --- core/Tron.proto | 2 -- 1 file changed, 2 deletions(-) diff --git a/core/Tron.proto b/core/Tron.proto index 481fdf60f34..f4d46dc8e53 100644 --- a/core/Tron.proto +++ b/core/Tron.proto @@ -98,8 +98,6 @@ message Transaction { message raw { TransactionType type = 2; - repeated TXInput vin = 5; - repeated TXOutput vout = 7; int64 expiration = 8; bytes data = 10; repeated Contract contract = 11; From 4289a0cd47fa40c317c05fc0f45a65581252eefd Mon Sep 17 00:00:00 2001 From: sasaxie Date: Tue, 10 Apr 2018 16:29:35 +0800 Subject: [PATCH 3/4] add go package setting --- api/api.proto | 1 + core/Contract.proto | 1 + core/Discover.proto | 1 + core/Tron.proto | 1 + core/TronInventoryItems.proto | 1 + 5 files changed, 5 insertions(+) diff --git a/api/api.proto b/api/api.proto index d01979ee993..70de6adbb94 100644 --- a/api/api.proto +++ b/api/api.proto @@ -6,6 +6,7 @@ import "core/Contract.proto"; option java_package = "org.tron.api"; //Specify the name of the package that generated the Java file option java_outer_classname = "GrpcAPI"; //Specify the class name of the generated Java file +option go_package = "go-client-api/api"; service Wallet { diff --git a/core/Contract.proto b/core/Contract.proto index b334f7709b0..18445bb437e 100644 --- a/core/Contract.proto +++ b/core/Contract.proto @@ -19,6 +19,7 @@ package protocol; option java_package = "org.tron.protos"; //Specify the name of the package that generated the Java file option java_outer_classname = "Contract"; //Specify the class name of the generated Java file +option go_package = "go-client-api/core"; import "core/Tron.proto"; diff --git a/core/Discover.proto b/core/Discover.proto index 2a9668ba75c..e85174bbb1a 100644 --- a/core/Discover.proto +++ b/core/Discover.proto @@ -5,6 +5,7 @@ package protocol; option java_package = "org.tron.protos"; //Specify the name of the package that generated the Java file option java_outer_classname = "Discover"; //Specify the class name of the generated Java file +option go_package = "go-client-api/core"; message Endpoint { bytes address = 1; diff --git a/core/Tron.proto b/core/Tron.proto index f4d46dc8e53..5a9d9c4d0d5 100644 --- a/core/Tron.proto +++ b/core/Tron.proto @@ -8,6 +8,7 @@ package protocol; option java_package = "org.tron.protos"; //Specify the name of the package that generated the Java file option java_outer_classname = "Protocol"; //Specify the class name of the generated Java file +option go_package = "go-client-api/core"; enum AccountType { diff --git a/core/TronInventoryItems.proto b/core/TronInventoryItems.proto index fb16f1d5431..c13676921bc 100644 --- a/core/TronInventoryItems.proto +++ b/core/TronInventoryItems.proto @@ -4,6 +4,7 @@ package protocol; option java_package = "org.tron.protos"; //Specify the name of the package that generated the Java file option java_outer_classname = "TronInventoryItems"; //Specify the class name of the generated Java file +option go_package = "go-client-api/core"; message InventoryItems { int32 type = 1; From ce268588b6a7ac17ff3d050ea8e66ecb9e83553a Mon Sep 17 00:00:00 2001 From: sasaxie Date: Tue, 10 Apr 2018 16:41:16 +0800 Subject: [PATCH 4/4] add go package setting --- api/api.proto | 2 +- core/Contract.proto | 2 +- core/Discover.proto | 2 +- core/Tron.proto | 2 +- core/TronInventoryItems.proto | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/api/api.proto b/api/api.proto index 70de6adbb94..03419d235d5 100644 --- a/api/api.proto +++ b/api/api.proto @@ -6,7 +6,7 @@ import "core/Contract.proto"; option java_package = "org.tron.api"; //Specify the name of the package that generated the Java file option java_outer_classname = "GrpcAPI"; //Specify the class name of the generated Java file -option go_package = "go-client-api/api"; +option go_package = "github.com/tronprotocol/go-client-api/api"; service Wallet { diff --git a/core/Contract.proto b/core/Contract.proto index 18445bb437e..a00c82eec58 100644 --- a/core/Contract.proto +++ b/core/Contract.proto @@ -19,7 +19,7 @@ package protocol; option java_package = "org.tron.protos"; //Specify the name of the package that generated the Java file option java_outer_classname = "Contract"; //Specify the class name of the generated Java file -option go_package = "go-client-api/core"; +option go_package = "github.com/tronprotocol/go-client-api/core"; import "core/Tron.proto"; diff --git a/core/Discover.proto b/core/Discover.proto index e85174bbb1a..ac45a30364a 100644 --- a/core/Discover.proto +++ b/core/Discover.proto @@ -5,7 +5,7 @@ package protocol; option java_package = "org.tron.protos"; //Specify the name of the package that generated the Java file option java_outer_classname = "Discover"; //Specify the class name of the generated Java file -option go_package = "go-client-api/core"; +option go_package = "github.com/tronprotocol/go-client-api/core"; message Endpoint { bytes address = 1; diff --git a/core/Tron.proto b/core/Tron.proto index 5a9d9c4d0d5..0fe1fc97b95 100644 --- a/core/Tron.proto +++ b/core/Tron.proto @@ -8,7 +8,7 @@ package protocol; option java_package = "org.tron.protos"; //Specify the name of the package that generated the Java file option java_outer_classname = "Protocol"; //Specify the class name of the generated Java file -option go_package = "go-client-api/core"; +option go_package = "github.com/tronprotocol/go-client-api/core"; enum AccountType { diff --git a/core/TronInventoryItems.proto b/core/TronInventoryItems.proto index c13676921bc..f630ffad598 100644 --- a/core/TronInventoryItems.proto +++ b/core/TronInventoryItems.proto @@ -4,7 +4,7 @@ package protocol; option java_package = "org.tron.protos"; //Specify the name of the package that generated the Java file option java_outer_classname = "TronInventoryItems"; //Specify the class name of the generated Java file -option go_package = "go-client-api/core"; +option go_package = "github.com/tronprotocol/go-client-api/core"; message InventoryItems { int32 type = 1;