Proto cleanup (#770)

* Include wrapper.proto in the repo

* Remove auto-generated proto files from git

* fix

* another attempt to fix

* yet another attempt

* add readme

.gitlab-ci.yml

@@ -20,9 +20,7 @@ variables:
     wget -O /tmp/protoc.zip https://github.com/protocolbuffers/protobuf/releases/download/v3.6.1/protoc-3.6.1-linux-x86_64.zip &&
     sudo unzip /tmp/protoc.zip -d protoc &&
     sudo mv protoc/bin/* /usr/local/bin/ &&
-    sudo mv protoc/include/* /usr/local/include/ &&
-    sudo chmod 755 /usr/local/bin/protoc &&
-    sudo chmod 755 /usr/local/include/google
+    sudo chmod 755 /usr/local/bin/protoc
 
 .setup_python: &setup_python
     sudo apt-get install -y python-dev

Cargo.toml

@@ -13,9 +13,6 @@ path = "node/src/main.rs"
 [dependencies]
 alphanet = { path = "./node/alphanet" }
 
-[build-dependencies]
-protos-autogen = { path = "./protos/builder" }
-
 [workspace]
 members = [
     "core/chain",

README.md

@@ -85,7 +85,7 @@ or
 cargo run --package=devnet
 ```
 
- ### Testing
+### Testing
 
 In order to run tests currently, you must setup `pynear`:
 

core/protos/Cargo.toml

@@ -3,12 +3,16 @@ name = "near-protos"
 version = "0.1.0"
 authors = ["Near Inc <hello@nearprotocol.com>"]
 edition = "2018"
+build = "build.rs"
 
 [dependencies]
 base64 = { version = "0.10.0", optional = true }
 protobuf = { version = "2.2.4", features = ["with-bytes"] }
 serde = { version = "1.0", optional = true }
 serde_derive = { version = "1.0", optional = true }
 
+[build-dependencies]
+protos-autogen = { path = "../../protos/builder" }
+
 [features]
 with-serde = ["base64", "serde", "serde_derive"]

core/protos/README.md

@@ -0,0 +1,4 @@
+## Development
+`.proto` files are under the `protos` directory. To add/delete protos, one also needs to change the include macro at the beginning of `src/lib.rs`. 
+
+For example, if `example.proto` is added to `protos`, `include!(concat!(env!("OUT_DIR"), "/example.rs"))` needs to be added to `src/lib.rs`.

protos/protos/chain.proto → core/protos/protos/chain.proto

@@ -1,8 +1,8 @@
 syntax = "proto3";
 
-import "protos/types.proto";
-import "protos/receipt.proto";
-import "protos/signed_transaction.proto";
+import "types.proto";
+import "receipt.proto";
+import "signed_transaction.proto";
 
 message ChainState {
     bytes genesis_hash = 1;

protos/protos/network.proto → core/protos/protos/network.proto

@@ -1,10 +1,10 @@
 syntax = "proto3";
 
-import "protos/chain.proto";
-import "protos/signed_transaction.proto";
-import "protos/receipt.proto";
-import "protos/nightshade.proto";
-import "google/protobuf/wrappers.proto";
+import "chain.proto";
+import "signed_transaction.proto";
+import "receipt.proto";
+import "nightshade.proto";
+import "wrappers.proto";
 
 message PeerInfo {
     bytes id = 1;

protos/protos/nightshade.proto → core/protos/protos/nightshade.proto

@@ -1,6 +1,6 @@
 syntax = "proto3";
 
-import "protos/chain.proto";
+import "chain.proto";
 
 message BlockProposal {
     bytes hash = 1;

protos/protos/receipt.proto → core/protos/protos/receipt.proto

@@ -1,6 +1,6 @@
 syntax = "proto3";
 
-import "google/protobuf/wrappers.proto";
+import "wrappers.proto";
 
 message CallbackInfo {
     bytes id = 1;

core/protos/protos/wrappers.proto

@@ -0,0 +1,123 @@
+// Protocol Buffers - Google's data interchange format
+// Copyright 2008 Google Inc.  All rights reserved.
+// https://developers.google.com/protocol-buffers/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Wrappers for primitive (non-message) types. These types are useful
+// for embedding primitives in the `google.protobuf.Any` type and for places
+// where we need to distinguish between the absence of a primitive
+// typed field and its default value.
+//
+// These wrappers have no meaningful use within repeated fields as they lack
+// the ability to detect presence on individual elements.
+// These wrappers have no meaningful use within a map or a oneof since
+// individual entries of a map or fields of a oneof can already detect presence.
+
+syntax = "proto3";
+
+package google.protobuf;
+
+option csharp_namespace = "Google.Protobuf.WellKnownTypes";
+option cc_enable_arenas = true;
+option go_package = "github.com/golang/protobuf/ptypes/wrappers";
+option java_package = "com.google.protobuf";
+option java_outer_classname = "WrappersProto";
+option java_multiple_files = true;
+option objc_class_prefix = "GPB";
+
+// Wrapper message for `double`.
+//
+// The JSON representation for `DoubleValue` is JSON number.
+message DoubleValue {
+  // The double value.
+  double value = 1;
+}
+
+// Wrapper message for `float`.
+//
+// The JSON representation for `FloatValue` is JSON number.
+message FloatValue {
+  // The float value.
+  float value = 1;
+}
+
+// Wrapper message for `int64`.
+//
+// The JSON representation for `Int64Value` is JSON string.
+message Int64Value {
+  // The int64 value.
+  int64 value = 1;
+}
+
+// Wrapper message for `uint64`.
+//
+// The JSON representation for `UInt64Value` is JSON string.
+message UInt64Value {
+  // The uint64 value.
+  uint64 value = 1;
+}
+
+// Wrapper message for `int32`.
+//
+// The JSON representation for `Int32Value` is JSON number.
+message Int32Value {
+  // The int32 value.
+  int32 value = 1;
+}
+
+// Wrapper message for `uint32`.
+//
+// The JSON representation for `UInt32Value` is JSON number.
+message UInt32Value {
+  // The uint32 value.
+  uint32 value = 1;
+}
+
+// Wrapper message for `bool`.
+//
+// The JSON representation for `BoolValue` is JSON `true` and `false`.
+message BoolValue {
+  // The bool value.
+  bool value = 1;
+}
+
+// Wrapper message for `string`.
+//
+// The JSON representation for `StringValue` is JSON string.
+message StringValue {
+  // The string value.
+  string value = 1;
+}
+
+// Wrapper message for `bytes`.
+//
+// The JSON representation for `BytesValue` is JSON string.
+message BytesValue {
+  // The bytes value.
+  bytes value = 1;
+}