nits: integration changes (#308)

Signed-off-by: Sander Pick <[email protected]>

Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.14.1-buster
+FROM golang:1.14.2-buster
 MAINTAINER Textile <[email protected]>
 
 # This is (in large part) copied (with love) from

api/pb/api.proto

@@ -1,5 +1,5 @@
 syntax = "proto3";
-package api.pb;
+package threads.pb;
 
 option java_multiple_files = true;
 option java_package = "io.textile.threads_grpc";

net/api/pb/api.proto

@@ -1,5 +1,5 @@
 syntax = "proto3";
-package net.api.pb;
+package threads.net.pb;
 
 option java_multiple_files = true;
 option java_package = "io.textile.threads_net_grpc";

net/net.go

@@ -585,15 +585,16 @@ func (n *net) CreateRecord(ctx context.Context, id thread.ID, body format.Node,
 	for _, opt := range opts {
 		opt(args)
 	}
-	if _, err = thread.ValidateToken(n.getPrivKey(), args.Token); err != nil {
+	pk, err := thread.ValidateToken(n.getPrivKey(), args.Token)
+	if err != nil {
 		return
 	}
 
 	lg, err := n.getOrCreateOwnLog(id)
 	if err != nil {
 		return
 	}
-	rec, err := n.newRecord(ctx, id, lg, body)
+	rec, err := n.newRecord(ctx, id, lg, body, pk)
 	if err != nil {
 		return
 	}
@@ -829,7 +830,7 @@ func (n *net) putRecord(ctx context.Context, id thread.ID, lid peer.ID, rec core
 }
 
 // newRecord creates a new record with the given body as a new event body.
-func (n *net) newRecord(ctx context.Context, id thread.ID, lg thread.LogInfo, body format.Node) (core.Record, error) {
+func (n *net) newRecord(ctx context.Context, id thread.ID, lg thread.LogInfo, body format.Node, pk thread.PubKey) (core.Record, error) {
 	if lg.PrivKey == nil {
 		return nil, fmt.Errorf("a private-key is required to create records")
 	}
@@ -852,11 +853,14 @@ func (n *net) newRecord(ctx context.Context, id thread.ID, lg thread.LogInfo, bo
 		return nil, err
 	}
 
+	if pk == nil {
+		pk = thread.NewLibp2pPubKey(n.getPrivKey().GetPublic())
+	}
 	return cbor.CreateRecord(ctx, n, cbor.CreateRecordConfig{
 		Block:      event,
 		Prev:       lg.Head,
 		Key:        lg.PrivKey,
-		PubKey:     thread.NewLibp2pPubKey(n.getPrivKey().GetPublic()),
+		PubKey:     pk,
 		ServiceKey: sk,
 	})
 }