Merge branch 'jonah/tm-change' into 'master'

Add new columns to db, info call to api

See merge request elixxir/mainnet-commitments!12

client/client.go

@@ -20,7 +20,7 @@ import (
 	utils2 "gitlab.com/xx_network/primitives/utils"
 )
 
-func SignAndTransmit(keyPath, idfPath, nominatorWallet, validatorWallet, serverAddress, serverCert, contract string) error {
+func SignAndTransmit(keyPath, idfPath, nominatorWallet, validatorWallet, serverAddress, serverCert, contract, email string, selectedStake int) error {
 	var key, idfBytes []byte
 	var err error
 	var ep string
@@ -51,11 +51,11 @@ func SignAndTransmit(keyPath, idfPath, nominatorWallet, validatorWallet, serverA
 		return errors.WithMessage(err, "Failed to write contract to hash")
 	}
 
-	return signAndTransmit(key, idfBytes, h.Sum(nil), nominatorWallet, validatorWallet, serverAddress, serverCert)
+	return signAndTransmit(key, idfBytes, h.Sum(nil), nominatorWallet, validatorWallet, serverAddress, serverCert, email, selectedStake)
 }
 
 // SignAndTransmit creates a Client object & transmits commitment info to the server
-func signAndTransmit(pk, idfBytes, contractBytes []byte, nominatorWallet, validatorWallet, serverAddress, serverCert string) error {
+func signAndTransmit(pk, idfBytes, contractBytes []byte, nominatorWallet, validatorWallet, serverAddress, serverCert, email string, selectedStake int) error {
 	// Create new resty client
 	cl := resty.New()
 	cl.SetRootCertificateFromString(serverCert)
@@ -82,6 +82,8 @@ func signAndTransmit(pk, idfBytes, contractBytes []byte, nominatorWallet, valida
 		NominatorWallet: nominatorWallet,
 		ValidatorWallet: validatorWallet,
 		Signature:       base64.URLEncoding.EncodeToString(sig),
+		Email:           email,
+		SelectedStake:   selectedStake,
 	}
 	resp, err := cl.R().
 		SetHeader("Content-Type", "application/json").
@@ -97,3 +99,18 @@ func signAndTransmit(pk, idfBytes, contractBytes []byte, nominatorWallet, valida
 
 	return nil
 }
+
+func GetInfo(nid, serverCert, serverAddress string) ([]byte, error) {
+	cl := resty.New()
+	cl.SetRootCertificateFromString(serverCert)
+	cl.SetTLSClientConfig(&tls.Config{InsecureSkipVerify: true})
+
+	resp, err := cl.R().SetQueryParam("id", nid).Get(serverAddress + "/info")
+	if err != nil {
+		return nil, errors.WithMessagef(err, "Failed to get commitment info, received response: %+v", resp)
+	} else if resp.IsError() {
+		return nil, errors.Errorf("Failed process request for commitment info, received response: %+v", resp)
+	}
+
+	return resp.Body(), nil
+}

client/client_test.go

@@ -28,11 +28,13 @@ import (
 )
 
 func TestSignAndTransmit(t *testing.T) {
-	pk, err := rsa.GenerateKey(csprng.NewSystemRNG(), 2048)
+	rng := csprng.NewSystemRNG()
+	rng.SetSeed([]byte("start"))
+	pk, err := rsa.GenerateKey(rng, 2048)
 	if err != nil {
 		t.Errorf("Failed to gen key: %+v", err)
 	}
-	nid := id.NewIdFromString("zezima", id.Node, t)
+	nid := id.NewIdFromString("jonah", id.Node, t)
 	idb := [33]byte{}
 	copy(idb[:], nid.Marshal())
 	idFile := idf.IdFile{
@@ -102,7 +104,7 @@ func TestSignAndTransmit(t *testing.T) {
 	}()
 	time.Sleep(time.Millisecond * 100)
 
-	err = SignAndTransmit(testKeyPath, testIDFPath, waddr, waddr2, "http://localhost:11420", "", "")
+	err = SignAndTransmit(testKeyPath, testIDFPath, waddr, waddr2, "http://localhost:11420", "", "", "", 0.0)
 	if err != nil {
 		t.Errorf("Failed to sign & transmit: %+v", err)
 	}
@@ -137,3 +139,11 @@ func makeCert(pk *gorsa.PrivateKey) ([]byte, error) {
 	}
 	return pem.EncodeToMemory(block), nil
 }
+
+//func TestGetInfo(t *testing.T) {
+//	ret, err := GetInfo("\\x616263313233", "", "http://0.0.0.0:11420")
+//	if err != nil {
+//		t.Errorf("Failed to get info: %+v", err)
+//	}
+//	t.Log(string(ret))
+//}

client/root.go

@@ -82,7 +82,7 @@ Mu7/deeXg4hfNzQoWdZnBhzgaB05MAbJI6E=
 			jww.FATAL.Fatalf("You must accept the contract to continue")
 		}
 
-		err = SignAndTransmit(keyPath, idfPath, nominatorWallet, validatorWallet, address, commitmentCert, utils.Contract)
+		err = SignAndTransmit(keyPath, idfPath, nominatorWallet, validatorWallet, address, commitmentCert, utils.Contract, "", 1)
 		if err != nil {
 			jww.FATAL.Fatalf("Failed to sign & transmit commitment: %+v", err)
 		}

messages/interfaces.go

@@ -6,6 +6,15 @@ type Commitment struct {
 	Contract        string `json:"contract"`
 	ValidatorWallet string `json:"validator-wallet"`
 	NominatorWallet string `json:"nominator-wallet"`
+	SelectedStake   int    `json:"selected-stake"`
 	Email           string `json:"email"`
 	Signature       string `json:"signature"`
 }
+
+type CommitmentInfo struct {
+	ValidatorWallet string `json:"validator-wallet"`
+	NominatorWallet string `json:"nominator-wallet"`
+	SelectedStake   int    `json:"selected-stake"`
+	MaxStake        int    `json:"max-stake"`
+	Email           string `json:"email"`
+}

server/serverImpl.go

@@ -75,6 +75,32 @@ func StartServer(params Params, s *storage.Storage) error {
 		}
 		c.JSON(http.StatusAccepted, newCommitment)
 	})
+	r.GET("/info", func(c *gin.Context) {
+		jww.DEBUG.Printf("Received info request %+v...", c.Request)
+		fmt.Println(c.Request.URL.Query())
+		nid := c.Request.URL.Query().Get("id")
+		if nid == "" {
+			jww.ERROR.Printf("No ID in received request")
+			wrappedErr := c.Error(errors.New("No ID in received request"))
+			c.JSON(http.StatusBadRequest, wrappedErr.JSON())
+			return
+		}
+		convertedID := "\\" + nid[1:]
+		commitment, err := impl.s.GetCommitment(convertedID)
+		if err != nil {
+			jww.ERROR.Printf("Failed to get commitment for nid %s: %+v", nid, err)
+			wrappedErr := c.Error(err)
+			c.JSON(http.StatusBadRequest, wrappedErr.JSON())
+			return
+		}
+		c.JSON(http.StatusOK, messages.CommitmentInfo{
+			ValidatorWallet: commitment.Wallet,
+			NominatorWallet: commitment.NominatorWallet,
+			SelectedStake:   commitment.SelectedStake,
+			MaxStake:        commitment.MaxStake,
+			Email:           commitment.Email,
+		})
+	})
 	impl.comms = r
 	// Run with TLS
 	if params.KeyPath == "" && params.CertPath == "" {
@@ -216,6 +242,12 @@ func (i *Impl) Verify(_ context.Context, msg messages.Commitment) error {
 		Wallet:    msg.ValidatorWallet,
 		Signature: sigBytes,
 	}
+	if msg.SelectedStake != 0 {
+		c.SelectedStake = msg.SelectedStake
+	}
+	if msg.Email != "" {
+		c.Email = msg.Email
+	}
 	if msg.NominatorWallet != "" {
 		c.NominatorWallet = msg.NominatorWallet
 	}

storage/database.go

@@ -22,6 +22,7 @@ type database interface {
 	InsertCommitment(Commitment) error
 
 	GetMember(hexID string) (*Member, error)
+	GetCommitment(id string) (*Commitment, error)
 }
 
 // DatabaseImpl struct implements the Database Interface with an underlying DB
@@ -41,6 +42,8 @@ type Commitment struct {
 	NominatorWallet string
 	Email           string
 	Signature       []byte `gorm:"not null"`
+	SelectedStake   int
+	MaxStake        int `gorm:"default:137068"`
 	CreatedAt       time.Time
 }
 
@@ -82,8 +85,8 @@ func newDatabase(username, password, dbName, address,
 		defer jww.INFO.Println("Map backend initialized successfully!")
 
 		mapImpl := &MapImpl{
-			members:     map[string]Member{},
-			commitments: map[string]Commitment{},
+			members:     map[string]*Member{},
+			commitments: map[string]*Commitment{},
 		}
 
 		return database(mapImpl), nil

storage/dbImpl.go

@@ -17,7 +17,7 @@ func (db *DatabaseImpl) InsertMembers(members []Member) error {
 }
 
 func (db *DatabaseImpl) InsertCommitment(commitment Commitment) error {
-	return db.db.Clauses(clause.OnConflict{UpdateAll: true}).Create(&commitment).Error
+	return db.db.Clauses(clause.OnConflict{Columns: []clause.Column{{Name: "id"}}, DoUpdates: clause.AssignmentColumns([]string{"wallet", "nominator_wallet", "email", "selected_stake"})}).Create(&commitment).Error
 }
 
 func (db *DatabaseImpl) GetMember(id string) (*Member, error) {
@@ -25,3 +25,9 @@ func (db *DatabaseImpl) GetMember(id string) (*Member, error) {
 	m := Member{}
 	return &m, db.db.First(&m, "id = ?", id).Error
 }
+
+func (db *DatabaseImpl) GetCommitment(id string) (*Commitment, error) {
+	jww.INFO.Printf("Getting member with id %+v", id)
+	c := Commitment{}
+	return &c, db.db.First(&c, "id = ?", id).Error
+}

storage/mapImpl.go

@@ -16,8 +16,8 @@ import (
 
 // MapImpl struct implements the database interface with an underlying Map
 type MapImpl struct {
-	members     map[string]Member
-	commitments map[string]Commitment
+	members     map[string]*Member
+	commitments map[string]*Commitment
 	sync.RWMutex
 }
 
@@ -25,7 +25,7 @@ func (db *MapImpl) InsertMembers(members []Member) error {
 	db.Lock()
 	defer db.Unlock()
 	for _, m := range members {
-		db.members[base64.StdEncoding.EncodeToString(m.Id)] = m
+		db.members[base64.StdEncoding.EncodeToString(m.Id)] = &m
 	}
 	return nil
 }
@@ -33,7 +33,14 @@ func (db *MapImpl) InsertMembers(members []Member) error {
 func (db *MapImpl) InsertCommitment(commitment Commitment) error {
 	db.Lock()
 	defer db.Unlock()
-	db.commitments[string(commitment.Id)] = commitment
+	if _, ok := db.commitments[string(commitment.Id)]; ok {
+		db.commitments[string(commitment.Id)].NominatorWallet = commitment.NominatorWallet
+		db.commitments[string(commitment.Id)].SelectedStake = commitment.SelectedStake
+		db.commitments[string(commitment.Id)].Email = commitment.Email
+		db.commitments[string(commitment.Id)].Wallet = commitment.Wallet
+	} else {
+		db.commitments[string(commitment.Id)] = &commitment
+	}
 	return nil
 }
 
@@ -51,5 +58,21 @@ func (db *MapImpl) GetMember(id string) (*Member, error) {
 	if !ok {
 		return nil, errors.Errorf("No member in MapImpl with id %+v", id)
 	}
-	return &m, nil
+	return m, nil
+}
+
+func (db *MapImpl) GetCommitment(id string) (*Commitment, error) {
+	db.RLock()
+	defer db.RUnlock()
+	var raw = make([]byte, 33)
+	_, err := hex.Decode(raw, []byte(id[2:]))
+	if err != nil {
+		return nil, err
+	}
+	raw[32] = byte(02)
+	c, ok := db.commitments[string(raw)]
+	if !ok {
+		return nil, errors.Errorf("No commitment in MapImpl with id %+v", id)
+	}
+	return c, nil
 }