Merge branch 'master' of https://code.wuban.net.cn/cmpchain/metaprotocol

README.md

@@ -16,3 +16,17 @@ cloudstd proto --package "cmp.xxx.v1" --resource "shelf,shelves"
 
 
 ## Modules
+
+                               /\  
+                              /  \
+                             /    \
+                 ring/gateway      contract                 
+                           /         \       
+                          /           \      
+                         /             \
+                         <--------------
+                             validator
+
+
+
+

meta/base/v1/request_response.proto → baseapi/base/v1/request_response.proto

 syntax = "proto3";
 
-package meta.base.v1;
+package base.v1;
 
-option go_package = "basev1";
+//option go_package = "basev1";
 
 import "google/protobuf/field_mask.proto";
 import "google/protobuf/timestamp.proto";
-import "meta/base/v1/resource.proto";
+import "base/v1/resource.proto";
 
 // The standard List request definition.
 message ListShelvesRequest {

meta/base/v1/resource.proto → baseapi/base/v1/resource.proto

 syntax = "proto3";
 
-package meta.base.v1;
-option go_package = "basev1";
+package base.v1;
+//option go_package = "basev1";
 
 import "google/protobuf/timestamp.proto";
 

meta/base/v1/service.proto → baseapi/base/v1/service.proto

 syntax = "proto3";
 
-package meta.base.v1;
-option go_package = "basev1";
+package base.v1;
+//option go_package = "basev1";
 
-import "meta/base/v1/request_response.proto";
+import "base/v1/request_response.proto";
 
 // ShelfService defines methods for managing shelves.
 service ShelfService {

buf.gen.yaml

@@ -2,16 +2,16 @@ version: v1
 managed:
   enabled: true
   go_package_prefix:
-    default: helloworld
+    default: github.com/cmpchain/metaprotocol/gen/proto/go
     except:
       - buf.build/googleapis/googleapis
 plugins:
   - name: go
-    out: gen
+    out: gen/proto/go
     opt: paths=source_relative
   - name: go-grpc
-    out: gen
+    out: gen/proto/go
     opt: paths=source_relative
   - name: grpc-gateway
-    out: gen
+    out: gen/proto/go
     opt: paths=source_relative

buf.work.yaml

+version: v1
+directories:
+  - baseapi
+  - crypterapi
+  - ethrpcapi
+  - nebulaapi
+  - p2papi
+  - ringapi
+  - sentryapi
+  - txcheckerapi
\ No newline at end of file

crypterapi/buf.yaml

+version: v1
+breaking:
+  use:
+    - FILE
+lint:
+  use:
+    - DEFAULT

meta/crypter/v1/request_response.proto → crypterapi/crypter/v1/request_response.proto

 syntax = "proto3";
 
-package meta.crypter.v1;
-option go_package = "crypterv1";
+package crypter.v1;
+//option go_package = "crypterv1";
 
 import "google/protobuf/field_mask.proto";
 import "google/protobuf/timestamp.proto";
-import "meta/crypter/v1/resource.proto";
+import "crypter/v1/resource.proto";
 
 
 

meta/crypter/v1/resource.proto → crypterapi/crypter/v1/resource.proto

 syntax = "proto3";
 
-package meta.crypter.v1;
-option go_package = "crypterv1";
+package crypter.v1;
+//option go_package = "crypterv1";
 
 import "google/protobuf/timestamp.proto";
 

meta/crypter/v1/service.proto → crypterapi/crypter/v1/service.proto

 syntax = "proto3";
 
-package meta.crypter.v1;
-option go_package = "crypterv1";
+package crypter.v1;
+//option go_package = "crypterv1";
 
-import "meta/crypter/v1/request_response.proto";
+import "crypter/v1/request_response.proto";
 
 service CrypterService {
   // rpc Sign(SignRequest) returns (SignResponse) {}

ethrpcapi/buf.yaml

+version: v1
+breaking:
+  use:
+    - FILE
+lint:
+  use:
+    - DEFAULT

meta/ethrpc/v1/eth.proto → ethrpcapi/ethrpc/v1/eth.proto

 syntax = "proto3";
 
-package protoeth;
-option go_package = "protoeth";
+package ethrpc.v1;
+//option go_package = "protoeth";
 import "google/protobuf/empty.proto";
 
 // GetAccounts only for ganache

go.mod

 module github.com/cmpchain/metaprotocol
 
-go 1.15
+go 1.19
 
 require (
-	github.com/gogo/protobuf v1.3.2
-	github.com/golang/protobuf v1.5.2
-	google.golang.org/genproto v0.0.0-20221013201013-33fc6f83cba4
-	google.golang.org/grpc v1.50.0
+	google.golang.org/grpc v1.50.1
+	google.golang.org/protobuf v1.28.1
+)
+
+require (
+	github.com/golang/protobuf v1.5.2 // indirect
+	golang.org/x/net v0.0.0-20201021035429-f5854403a974 // indirect
+	golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4 // indirect
+	golang.org/x/text v0.3.3 // indirect
+	google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013 // indirect
 )

main.go

@@ -3,18 +3,20 @@ package main
 import (
 	"context"
 	"fmt"
+	"net"
+
+	metabase "github.com/cmpchain/metaprotocol/gen/proto/go/base/v1"
+	metacrypter "github.com/cmpchain/metaprotocol/gen/proto/go/crypter/v1"
+	metanebula "github.com/cmpchain/metaprotocol/gen/proto/go/nebula/v1"
+	metap2p "github.com/cmpchain/metaprotocol/gen/proto/go/p2p/v1"
+	metaring "github.com/cmpchain/metaprotocol/gen/proto/go/ring/v1"
+	metasentry "github.com/cmpchain/metaprotocol/gen/proto/go/sentry/v1"
+	txchecker "github.com/cmpchain/metaprotocol/gen/proto/go/txchecker/v1"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
-	"net"
-	metacrypter "github.com/cmpchain/metaprotocol/meta/crypter/v1"
-	metaring "github.com/cmpchain/metaprotocol/meta/ring/v1"
-	metabase "github.com/cmpchain/metaprotocol/meta/base/v1"
-	metap2p "github.com/cmpchain/metaprotocol/meta/p2p/v1"
-	metanebula "github.com/cmpchain/metaprotocol/meta/nebula/v1"
-	metasentry "github.com/cmpchain/metaprotocol/meta/sentry/v1"
-	txchecker "github.com/cmpchain/metaprotocol/meta/txchecker/v1"
 )
+
 type P2PServer struct {
 	metap2p.UnimplementedP2PServiceServer
 }
@@ -24,7 +26,7 @@ type NebulaServer struct {
 }
 
 type SentryServer struct {
-	metasentry.UnimplementedShelfServiceServer
+	metasentry.UnimplementedSentryServiceServer
 }
 
 type TxCheckServer struct {
@@ -37,22 +39,24 @@ type BaseType struct {
 }
 
 type RingServer struct {
-	metaring.UnimplementedShelfServiceServer
+	metaring.UnimplementedEthRpcServiceServer
 }
 
 type server struct {
 	metacrypter.UnimplementedCrypterServiceServer
 }
 
-func (*server) Sign(ctx context.Context, req *metacrypter.SignRequest) (*metacrypter.SignResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method Sign not implemented")
-}
-func (*server) Verify(ctx context.Context, req *metacrypter.VerifyRequest) (*metacrypter.VerifyResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method Verify not implemented")
-}
-func (*server) Recover(ctx context.Context, req *metacrypter.RecoverRequest) (*metacrypter.RecoverResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method Recover not implemented")
-}
+//	func (*server) Sign(ctx context.Context, req *metacrypter.SignRequest) (*metacrypter.SignResponse, error) {
+//		return nil, status.Errorf(codes.Unimplemented, "method Sign not implemented")
+//	}
+//
+//	func (*server) Verify(ctx context.Context, req *metacrypter.VerifyRequest) (*metacrypter.VerifyResponse, error) {
+//		return nil, status.Errorf(codes.Unimplemented, "method Verify not implemented")
+//	}
+//
+//	func (*server) Recover(ctx context.Context, req *metacrypter.RecoverRequest) (*metacrypter.RecoverResponse, error) {
+//		return nil, status.Errorf(codes.Unimplemented, "method Recover not implemented")
+//	}
 func (*server) BatchSign(ctx context.Context, req *metacrypter.BatchSignRequest) (*metacrypter.BatchSignResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method BatchSign not implemented")
 }

nebulaapi/buf.yaml

+version: v1
+breaking:
+  use:
+    - FILE
+lint:
+  use:
+    - DEFAULT

meta/nebula/v1/request_response.proto → nebulaapi/nebula/v1/request_response.proto

 syntax = "proto3";
 
-package meta.nebula.v1;
-option go_package = "nebulav1";
+package nebula.v1;
+//option go_package = "nebulav1";
 
 import "google/protobuf/field_mask.proto";
 import "google/protobuf/timestamp.proto";
-import "meta/nebula/v1/resource.proto";
+import "nebula/v1/resource.proto";
 
 // The standard List request definition.
 message Example {

meta/nebula/v1/resource.proto → nebulaapi/nebula/v1/resource.proto

 syntax = "proto3";
 
-package meta.nebula.v1;
-option go_package = "nebulav1";
+package nebula.v1;
+//option go_package = "nebulav1";
 
 import "google/protobuf/timestamp.proto";
 

meta/nebula/v1/service.proto → nebulaapi/nebula/v1/service.proto

 syntax = "proto3";
 
-package meta.nebula.v1;
-option go_package = "nebulav1";
+package nebula.v1;
+//option go_package = "nebulav1";
 
-import "meta/nebula/v1/request_response.proto";
+import "nebula/v1/request_response.proto";
 
 // ShelfService defines methods for managing shelves.
 service ShelfService {

p2papi/buf.yaml

+version: v1
+breaking:
+  use:
+    - FILE
+lint:
+  use:
+    - DEFAULT

meta/p2p/v1/request_response.proto → p2papi/p2p/v1/request_response.proto

 syntax = "proto3";
 
-package meta.p2p.v1;
-option go_package = "p2pv1";
+package p2p.v1;
+//option go_package = "p2pv1";
 
 import "google/protobuf/field_mask.proto";
 import "google/protobuf/timestamp.proto";
-import "meta/p2p/v1/resource.proto";
+import "p2p/v1/resource.proto";
 
 message BroadCastRequest {
   MessageHeader header = 1;

meta/p2p/v1/resource.proto → p2papi/p2p/v1/resource.proto

 syntax = "proto3";
 
-package meta.p2p.v1;
-option go_package = "p2pv1";
+package p2p.v1;
+//option go_package = "p2pv1";
 import "google/protobuf/timestamp.proto";
 
 enum P2PMsgType {

meta/p2p/v1/service.proto → p2papi/p2p/v1/service.proto

 syntax = "proto3";
 
-package meta.p2p.v1;
-option go_package = "p2pv1";
-import "meta/p2p/v1/request_response.proto";
+package p2p.v1;
+//option go_package = "p2pv1";
+import "p2p/v1/request_response.proto";
 
 service P2PService {
   rpc BroadCastMsg(BroadCastRequest) returns (BroadCastResponse) {}

ringapi/buf.yaml

+version: v1
+breaking:
+  use:
+    - FILE
+lint:
+  use:
+    - DEFAULT

meta/ring/v1/request_response.proto → ringapi/ring/v1/request_response.proto

 syntax = "proto3";
 
-package meta.ring.v1;
+package ring.v1;
 
 
 message  SendRawTransactionRequest{

meta/ring/v1/resource.proto → ringapi/ring/v1/resource.proto

 
 syntax = "proto3";
 
-package meta.ring.v1;
+package ring.v1;
 

meta/ring/v1/service.proto → ringapi/ring/v1/service.proto

 syntax = "proto3";
 
-package meta.ring.v1;
+package ring.v1;
 
-import "meta/ring/v1/request_response.proto";
+import "ring/v1/request_response.proto";
 
 // ShelfService defines methods for managing shelves.
 //service ShelfService {

sentryapi/buf.yaml

+version: v1
+breaking:
+  use:
+    - FILE
+lint:
+  use:
+    - DEFAULT

meta/sentry/v1/request_response.proto → sentryapi/sentry/v1/request_response.proto

 syntax = "proto3";
 
-package meta.sentry.v1;
-option go_package = "sentryv1";
+package sentry.v1;
+//option go_package = "sentryv1";
 
 import "google/protobuf/field_mask.proto";
 import "google/protobuf/timestamp.proto";
-import "meta/sentry/v1/resource.proto";
+import "sentry/v1/resource.proto";
 
 // The standard List request definition.
 message ListShelvesRequest {

meta/sentry/v1/resource.proto → sentryapi/sentry/v1/resource.proto

 syntax = "proto3";
 
-package meta.sentry.v1;
-option go_package = "sentryv1";
+package sentry.v1;
+//option go_package = "sentryv1";
 import "google/protobuf/timestamp.proto";
 
 // The default Shelf resource representation.

meta/sentry/v1/service.proto → sentryapi/sentry/v1/service.proto

 syntax = "proto3";
 
-package meta.sentry.v1;
-option go_package = "sentryv1";
-import "meta/sentry/v1/request_response.proto";
+package sentry.v1;
+//option go_package = "sentryv1";
+import "sentry/v1/request_response.proto";
 import "google/protobuf/empty.proto";
 
 // SentryService methods for other module.

txcheckerapi/buf.yaml

+version: v1
+breaking:
+  use:
+    - FILE
+lint:
+  use:
+    - DEFAULT

meta/txchecker/v1/request_response.proto → txcheckerapi/txchecker/v1/request_response.proto

 syntax = "proto3";
 
-package meta.txchecker.v1;
-option go_package = "txcheckerv1";
+package txchecker.v1;
+//option go_package = "txcheckerv1";
 
 import "google/protobuf/field_mask.proto";
 import "google/protobuf/timestamp.proto";
-import "meta/txchecker/v1/resource.proto";
+import "txchecker/v1/resource.proto";
 
 // The standard BatchGet request definition.
 message BatchCheckTxRequest {

meta/txchecker/v1/resource.proto → txcheckerapi/txchecker/v1/resource.proto

 syntax = "proto3";
 
-package meta.txchecker.v1;
-option go_package = "txcheckerv1";
+package txchecker.v1;
+//option go_package = "txcheckerv1";
 import "google/protobuf/timestamp.proto";
 
 // // The default Shelf resource representation.

meta/txchecker/v1/service.proto → txcheckerapi/txchecker/v1/service.proto

 syntax = "proto3";
 
-package meta.txchecker.v1;
-option go_package = "txcheckerv1";
-import "meta/txchecker/v1/request_response.proto";
+package txchecker.v1;
+//option go_package = "txcheckerv1";
+import "txchecker/v1/request_response.proto";
 
 service ShelfService {