Accept contract path from client

client/client.go

@@ -10,13 +10,13 @@ import (
 )
 
 // SignAndTransmit creates a Client object & transmits commitment info to the server
-func SignAndTransmit(pk, idfBytes []byte, wallet string, h *connect.Host, s Sender) error {
+func SignAndTransmit(pk, idfBytes, contractBytes []byte, wallet string, h *connect.Host, s Sender) error {
 	key, err := rsa.LoadPrivateKeyFromPem(pk)
 	if err != nil {
 		return errors.WithMessage(err, "Failed to load private key")
 	}
 
-	hashed, hash, err := utils.HashNodeInfo(wallet, idfBytes)
+	hashed, hash, err := utils.HashNodeInfo(wallet, idfBytes, contractBytes)
 	if err != nil {
 		return errors.WithMessage(err, "Failed to hash node info")
 	}
@@ -29,6 +29,7 @@ func SignAndTransmit(pk, idfBytes []byte, wallet string, h *connect.Host, s Send
 	err = s.TransmitSignature(h, &messages.Commitment{
 		PrivateKey: pk,
 		IDF:        idfBytes,
+		Contract:   contractBytes,
 		Wallet:     wallet,
 		Signature:  sig,
 	})

client/clientImpl.go

@@ -30,7 +30,7 @@ func StartClient(key, cert, salt []byte, id *id.ID) (*Client, error) {
 	}, nil
 }
 
-// SignAndTransmit func sends a Commitment message to the mainnet-commitments server
+// TransmitSignature func sends a Commitment message to the mainnet-commitments server
 func (c *Client) TransmitSignature(host *connect.Host, message *messages.Commitment) error {
 	f := func(conn *grpc.ClientConn) (*any.Any, error) {
 		// Set up the context

client/client_test.go

@@ -60,7 +60,8 @@ func TestSignAndTransmit(t *testing.T) {
 		t.Errorf("Failed to marshal IDF: %+v", err)
 	}
 
-	err = SignAndTransmit(rsa.CreatePrivateKeyPem(pk), idfBytes, "wallet", nil, &MockSender{t, nid.Bytes(), rsa.CreatePublicKeyPem(pk.GetPublic())})
+	contractBytes := []byte("I solemnly swear that I am up to no good")
+	err = SignAndTransmit(rsa.CreatePrivateKeyPem(pk), idfBytes, contractBytes, "wallet", nil, &MockSender{t, nid.Bytes(), rsa.CreatePublicKeyPem(pk.GetPublic())})
 	if err != nil {
 		t.Errorf("Failed to sign & transmit: %+v", err)
 	}

main.go

@@ -24,16 +24,17 @@ func main() {
 }
 
 // SignAndTransmit signs & transmits info to the commitments server
-// Accepts args nodeCertPath, nodeKeyPath, idfPath, wallet, commitmentsAddress, commitmentsCertPath
+// Accepts args nodeCertPath, nodeKeyPath, idfPath, contractPath, wallet, commitmentsAddress, commitmentsCertPath
 func SignAndTransmit(this js.Value, inputs []js.Value) interface{} {
 	certPath := inputs[0].String()
 	keyPath := inputs[1].String()
 	idfPath := inputs[2].String()
-	wallet := inputs[3].String()
-	address := inputs[4].String()
-	commitmentsCertPath := inputs[5].String()
+	contractPath := inputs[3].String()
+	wallet := inputs[4].String()
+	address := inputs[5].String()
+	commitmentsCertPath := inputs[6].String()
 
-	var cert, key, idfBytes, commitmentCert []byte
+	var cert, key, idfBytes, commitmentCert, contractBytes []byte
 	var err error
 	var ep string
 	// Read certificate file
@@ -66,6 +67,15 @@ func SignAndTransmit(this js.Value, inputs []js.Value) interface{} {
 		return map[string]interface{}{"Error": err.Error()}
 	}
 
+	if ep, err = utils.ExpandPath(contractPath); err == nil {
+		contractBytes, err = utils.ReadFile(ep)
+		if err != nil {
+			return map[string]interface{}{"Error": err.Error()}
+		}
+	} else {
+		return map[string]interface{}{"Error": err.Error()}
+	}
+
 	if ep, err = utils.ExpandPath(commitmentsCertPath); err == nil {
 		commitmentCert, err = utils.ReadFile(ep)
 		if err != nil {
@@ -97,7 +107,7 @@ func SignAndTransmit(this js.Value, inputs []js.Value) interface{} {
 	}
 
 	// Sign & transmit information
-	err = client.SignAndTransmit(key, idfBytes, wallet, h, cl)
+	err = client.SignAndTransmit(key, idfBytes, contractBytes, wallet, h, cl)
 	if err != nil {
 		return map[string]interface{}{"Error": err.Error()}
 	}

messages/commitment_messages.pb.go

@@ -66,8 +66,9 @@ func (m *CommitmentResponse) GetError() string {
 type Commitment struct {
 	PrivateKey           []byte   `protobuf:"bytes,1,opt,name=PrivateKey,proto3" json:"PrivateKey,omitempty"`
 	IDF                  []byte   `protobuf:"bytes,2,opt,name=IDF,proto3" json:"IDF,omitempty"`
-	Wallet               string   `protobuf:"bytes,3,opt,name=Wallet,proto3" json:"Wallet,omitempty"`
-	Signature            []byte   `protobuf:"bytes,4,opt,name=Signature,proto3" json:"Signature,omitempty"`
+	Contract             []byte   `protobuf:"bytes,3,opt,name=Contract,proto3" json:"Contract,omitempty"`
+	Wallet               string   `protobuf:"bytes,4,opt,name=Wallet,proto3" json:"Wallet,omitempty"`
+	Signature            []byte   `protobuf:"bytes,5,opt,name=Signature,proto3" json:"Signature,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -112,6 +113,13 @@ func (m *Commitment) GetIDF() []byte {
 	return nil
 }
 
+func (m *Commitment) GetContract() []byte {
+	if m != nil {
+		return m.Contract
+	}
+	return nil
+}
+
 func (m *Commitment) GetWallet() string {
 	if m != nil {
 		return m.Wallet
@@ -136,22 +144,23 @@ func init() {
 }
 
 var fileDescriptor_02948687e8213eef = []byte{
-	// 228 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x4c, 0xce, 0xcf, 0xcd,
-	0xcd, 0x2c, 0xc9, 0x4d, 0xcd, 0x2b, 0x89, 0xcf, 0x4d, 0x2d, 0x2e, 0x4e, 0x4c, 0x4f, 0x2d, 0xd6,
-	0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0xe2, 0x80, 0xf1, 0x95, 0xb4, 0xb8, 0x84, 0x9c, 0xe1, 0xca,
-	0x82, 0x52, 0x8b, 0x0b, 0xf2, 0xf3, 0x8a, 0x53, 0x85, 0x44, 0xb8, 0x58, 0x5d, 0x8b, 0x8a, 0xf2,
-	0x8b, 0x24, 0x18, 0x15, 0x18, 0x35, 0x38, 0x83, 0x20, 0x1c, 0xa5, 0x12, 0x2e, 0x2e, 0x84, 0x5a,
-	0x21, 0x39, 0x2e, 0xae, 0x80, 0xa2, 0xcc, 0xb2, 0xc4, 0x92, 0x54, 0xef, 0xd4, 0x4a, 0xb0, 0x42,
-	0x9e, 0x20, 0x24, 0x11, 0x21, 0x01, 0x2e, 0x66, 0x4f, 0x17, 0x37, 0x09, 0x26, 0xb0, 0x04, 0x88,
-	0x29, 0x24, 0xc6, 0xc5, 0x16, 0x9e, 0x98, 0x93, 0x93, 0x5a, 0x22, 0xc1, 0x0c, 0x36, 0x16, 0xca,
-	0x13, 0x92, 0xe1, 0xe2, 0x0c, 0xce, 0x4c, 0xcf, 0x4b, 0x2c, 0x29, 0x2d, 0x4a, 0x95, 0x60, 0x01,
-	0xab, 0x47, 0x08, 0x18, 0xf9, 0x72, 0x71, 0x23, 0x6c, 0x2d, 0x16, 0xb2, 0xe3, 0x62, 0x0b, 0x4b,
-	0x2d, 0xca, 0x4c, 0xab, 0x14, 0x12, 0xd1, 0x83, 0xfb, 0x0a, 0xa1, 0x40, 0x4a, 0x06, 0x9b, 0x28,
-	0xcc, 0x63, 0x4a, 0x0c, 0x4e, 0x8a, 0x51, 0xf2, 0xe9, 0x99, 0x25, 0x7a, 0x15, 0x15, 0x7a, 0x79,
-	0xa9, 0x25, 0xe5, 0xf9, 0x45, 0xd9, 0xfa, 0xa9, 0x39, 0x99, 0x15, 0x15, 0x99, 0x45, 0xfa, 0x30,
-	0x7d, 0x49, 0x6c, 0xe0, 0x40, 0x32, 0x06, 0x04, 0x00, 0x00, 0xff, 0xff, 0x9f, 0x40, 0xc2, 0x83,
-	0x41, 0x01, 0x00, 0x00,
+	// 245 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x90, 0x4d, 0x4b, 0x03, 0x31,
+	0x10, 0x86, 0x5d, 0x6b, 0x97, 0x76, 0xf4, 0x20, 0x43, 0x91, 0x58, 0x8a, 0x1f, 0x7b, 0x12, 0x0f,
+	0x5b, 0xd0, 0xbb, 0x07, 0xab, 0x82, 0x88, 0x20, 0x2b, 0x28, 0x78, 0x91, 0x58, 0xc6, 0x25, 0xb8,
+	0x9b, 0x94, 0xc9, 0xa8, 0xdb, 0x7f, 0xe1, 0x4f, 0x16, 0xa3, 0xbb, 0xf1, 0xd0, 0x5b, 0xde, 0x27,
+	0xcf, 0x90, 0xbc, 0x03, 0xbb, 0x73, 0x57, 0xd7, 0x46, 0x6a, 0xb2, 0xf2, 0x5c, 0x93, 0xf7, 0xba,
+	0x24, 0x9f, 0x2f, 0xd8, 0x89, 0xc3, 0x41, 0x9b, 0xb3, 0x63, 0xc0, 0x59, 0xa7, 0x15, 0xe4, 0x17,
+	0xce, 0x7a, 0xc2, 0x11, 0xf4, 0x2f, 0x99, 0x1d, 0xab, 0xe4, 0x20, 0x39, 0x1a, 0x16, 0xbf, 0x21,
+	0xfb, 0x4a, 0x00, 0xa2, 0x8c, 0x7b, 0x00, 0x77, 0x6c, 0x3e, 0xb4, 0xd0, 0x0d, 0x2d, 0x83, 0xb9,
+	0x55, 0xfc, 0x23, 0xb8, 0x0d, 0xbd, 0xeb, 0x8b, 0x2b, 0xb5, 0x1e, 0x2e, 0x7e, 0x8e, 0x38, 0x86,
+	0xc1, 0xcc, 0x59, 0x61, 0x3d, 0x17, 0xd5, 0x0b, 0xb8, 0xcb, 0xb8, 0x03, 0xe9, 0xa3, 0xae, 0x2a,
+	0x12, 0xb5, 0x11, 0xde, 0xfc, 0x4b, 0x38, 0x81, 0xe1, 0xbd, 0x29, 0xad, 0x96, 0x77, 0x26, 0xd5,
+	0x0f, 0x43, 0x11, 0x9c, 0xdc, 0xc2, 0x66, 0xfc, 0x91, 0xc7, 0x33, 0x48, 0x1f, 0x88, 0xcd, 0xeb,
+	0x12, 0x47, 0x79, 0x57, 0x39, 0x0a, 0xe3, 0xc9, 0x2a, 0xda, 0xb6, 0xce, 0xd6, 0xce, 0x0f, 0x9f,
+	0xf6, 0x4b, 0x23, 0x79, 0xd3, 0xe4, 0x96, 0xe4, 0xd3, 0xf1, 0xdb, 0x94, 0x2a, 0xd3, 0x34, 0x86,
+	0xa7, 0xed, 0xdc, 0x4b, 0x1a, 0x36, 0x78, 0xfa, 0x1d, 0x00, 0x00, 0xff, 0xff, 0x95, 0xa7, 0xd1,
+	0xa9, 0x5e, 0x01, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.

messages/commitment_messages.proto

@@ -21,6 +21,7 @@ message CommitmentResponse {
 message Commitment {
     bytes PrivateKey = 1;
     bytes IDF = 2;
-    string Wallet = 3;
-    bytes Signature = 4;
+    bytes Contract = 3;
+    string Wallet = 4;
+    bytes Signature = 5;
 }

server/serverImpl.go

@@ -57,7 +57,7 @@ func (i *Impl) Verify(_ context.Context, msg *messages.Commitment) (*messages.Co
 	}
 
 	// Hash node info from message
-	hashed, hash, err := utils.HashNodeInfo(msg.Wallet, msg.IDF)
+	hashed, hash, err := utils.HashNodeInfo(msg.Wallet, msg.IDF, msg.Contract)
 	if err != nil {
 		return nil, errors.WithMessage(err, "Failed to hash node info")
 	}
@@ -83,6 +83,7 @@ func (i *Impl) Verify(_ context.Context, msg *messages.Commitment) (*messages.Co
 	// Insert commitment info to the database once verified
 	err = i.s.InsertCommitment(storage.Commitment{
 		Id:        m.Id,
+		Contract:  msg.Contract,
 		Wallet:    msg.Wallet,
 		Signature: msg.Signature,
 	})

storage/database.go

@@ -31,6 +31,7 @@ type Member struct {
 
 type Commitment struct {
 	Id        []byte `gorm:"primary_key"`
+	Contract  []byte `gorm:"not null"`
 	Wallet    string `gorm:"not null"`
 	Signature []byte `gorm:"not null"`
 	CreatedAt time.Time

utils/helpers.go

@@ -5,13 +5,17 @@ import (
 	"github.com/pkg/errors"
 )
 
-func HashNodeInfo(wallet string, idfBytes []byte) ([]byte, crypto.Hash, error) {
+func HashNodeInfo(wallet string, idfBytes, contractBytes []byte) ([]byte, crypto.Hash, error) {
 	h := crypto.BLAKE2b_512 // Define & return this here so we aren't defining hash type in 3 places for sign/verify calls
 	hasher := h.New()
 	_, err := hasher.Write(idfBytes)
 	if err != nil {
 		return nil, h, errors.WithMessage(err, "Failed to write IDF to hash")
 	}
+	_, err = hasher.Write(contractBytes)
+	if err != nil {
+		return nil, h, errors.WithMessage(err, "Failed to write contract to hash")
+	}
 	_, err = hasher.Write([]byte(wallet))
 	if err != nil {
 		return nil, h, errors.WithMessage(err, "Failed to write wallet to hash")