[vm] Temporarily brought back otto as a VM

Gopkg.toml

@@ -34,7 +34,7 @@
 
 [[constraint]]
   name = "github.com/ethereum/go-ethereum"
-  version = "1.8.11"
+  version = "1.8.15"
 
 [[constraint]]
   branch = "master"
@@ -138,4 +138,4 @@
 
 [[constraint]]
   name = "github.com/Bit-Nation/protobuffers"
-  version = "1.1.0"
+  revision = "b104bab4e16e94443febee60f003a2e5bacd6e03"

api/dapp.go

@@ -73,9 +73,9 @@ func (a *DAppApi) SendEthereumTransaction(value, to, data string) (string, error
 		"v":        ethTx.V,
 		"r":        ethTx.R,
 		"s":        ethTx.S,
-		"chainId":  ethTx.ChainID,
 		"from":     ethTx.From,
 		"hash":     ethTx.Hash,
+		"chainId":  ethTx.ChainID,
 	}
 
 	raw, err := json.Marshal(objTx)

chat.go

@@ -5,28 +5,90 @@ import (
 	"encoding/json"
 	"errors"
 	"strconv"
+
+	ed25519 "golang.org/x/crypto/ed25519"
 )
 
-func SendMessage(partner, message string) error {
+func SendMessage(chatID int, message string) error {
 
 	// make sure panthalassa has been started
 	if panthalassaInstance == nil {
 		return errors.New("you have to start panthalassa first")
 	}
 
-	// partner public key
-	partnerPub, err := hex.DecodeString(partner)
-	if err != nil {
+	// persist message
+	return panthalassaInstance.chat.SaveMessage(chatID, []byte(message))
+
+}
+
+func AddUsersToGroupChat(users string, chatID int) error {
+
+	// make sure panthalassa has been started
+	if panthalassaInstance == nil {
+		return errors.New("you have to start panthalassa first")
+	}
+
+	// json unmarshal partners
+	rawPartners := []string{}
+	if err := json.Unmarshal([]byte(users), &rawPartners); err != nil {
 		return err
 	}
 
-	// make sure public key has the right length
-	if len(partnerPub) != 32 {
-		return errors.New("partner must have a length of 32 bytes")
+	// unmarshal hex partners
+	partners := []ed25519.PublicKey{}
+	for _, hexPartner := range rawPartners {
+		rawPartner, err := hex.DecodeString(hexPartner)
+		if err != nil {
+			return err
+		}
+		partners = append(partners, rawPartner)
 	}
 
-	// persist private message
-	return panthalassaInstance.chat.SavePrivateMessage(partnerPub, []byte(message))
+	return panthalassaInstance.chat.AddUserToGroupChat(partners, chatID)
+
+}
+
+func CreatePrivateChat(partnerStr string) (int, error) {
+
+	// make sure panthalassa has been started
+	if panthalassaInstance == nil {
+		return 0, errors.New("you have to start panthalassa first")
+	}
+
+	partner, err := hex.DecodeString(partnerStr)
+	if err != nil {
+		return 0, err
+	}
+
+	return panthalassaInstance.chatDB.CreateChat(partner)
+
+}
+
+// return chatID
+func CreateGroupChat(users string, name string) (int, error) {
+
+	// make sure panthalassa has been started
+	if panthalassaInstance == nil {
+		return 0, errors.New("you have to start panthalassa first")
+	}
+
+	// json unmarshal partners
+	rawPartners := []string{}
+	if err := json.Unmarshal([]byte(users), &rawPartners); err != nil {
+		return 0, err
+	}
+
+	// unmarshal hex partners
+	partners := []ed25519.PublicKey{}
+	for _, hexPartner := range rawPartners {
+		rawPartner, err := hex.DecodeString(hexPartner)
+		if err != nil {
+			return 0, err
+		}
+		partners = append(partners, rawPartner)
+	}
+
+	return panthalassaInstance.chat.CreateGroupChat(partners, name)
 
 }
 
@@ -45,8 +107,11 @@ func AllChats() (string, error) {
 	chatsRep := []map[string]interface{}{}
 	for _, chat := range chats {
 		chatsRep = append(chatsRep, map[string]interface{}{
-			"chat":            chat.Partner,
+			"chat_id":         chat.ID,
+			"chat_partner":    chat.Partner,
 			"unread_messages": chat.UnreadMessages,
+			"group_chat_name": chat.GroupChatName,
+			"partners":        chat.Partners,
 		})
 	}
 
@@ -58,7 +123,7 @@ func AllChats() (string, error) {
 	return string(chatList), nil
 }
 
-func Messages(partner string, startStr string, amount int) (string, error) {
+func Messages(chatID int, startStr string, amount int) (string, error) {
 
 	// unmarshal start
 	start, err := strconv.ParseInt(startStr, 10, 64)
@@ -71,19 +136,18 @@ func Messages(partner string, startStr string, amount int) (string, error) {
 		return "", errors.New("you have to start panthalassa first")
 	}
 
-	// partner public key
-	partnerPub, err := hex.DecodeString(partner)
+	// fetch chat
+	chat, err := panthalassaInstance.chatDB.GetChat(chatID)
 	if err != nil {
 		return "", err
 	}
 
-	// make sure public key has the right length
-	if len(partnerPub) != 32 {
-		return "", errors.New("partner must have a length of 32 bytes")
+	if chat == nil {
+		return "", errors.New("chat doesn't exit")
 	}
 
 	// database messages
-	databaseMessages, err := panthalassaInstance.chat.Messages(partnerPub, int64(start), uint(amount))
+	databaseMessages, err := chat.Messages(start, uint(amount))
 	if err != nil {
 		return "", err
 	}
@@ -108,6 +172,7 @@ func Messages(partner string, startStr string, amount int) (string, error) {
 			"created_at": msg.CreatedAt,
 			"received":   msg.Received,
 			"dapp":       dapp,
+			"sender":     msg.Sender,
 		})
 	}
 
@@ -121,21 +186,13 @@ func Messages(partner string, startStr string, amount int) (string, error) {
 
 }
 
-func MarkMessagesAsRead(partner string) error {
+func MarkMessagesAsRead(chatID int) error {
 
 	// make sure panthalassa has been started
 	if panthalassaInstance == nil {
 		return errors.New("you have to start panthalassa first")
 	}
 
-	partnerByte, err := hex.DecodeString(partner)
-	if err != nil {
-		return err
-	}
-	if len(partnerByte) != 32 {
-		return errors.New("partner must have length of 32 bytes")
-	}
-
-	return panthalassaInstance.chat.MarkMessagesAsRead(partnerByte)
+	return panthalassaInstance.chat.MarkMessagesAsRead(chatID)
 
 }

chat/chat.go

@@ -46,7 +46,7 @@ func (c *Chat) AllChats() ([]db.Chat, error) {
 }
 
 func (c *Chat) Messages(partner ed25519.PublicKey, start int64, amount uint) ([]*db.Message, error) {
-	chat, err := c.chatStorage.GetChat(partner)
+	chat, err := c.chatStorage.GetChatByPartner(partner)
 	if err != nil {
 		return nil, err
 	}

chat/group_chat.go

@@ -0,0 +1,145 @@
+package chat
+
+import (
+	"encoding/hex"
+	"errors"
+	"time"
+
+	db "github.com/Bit-Nation/panthalassa/db"
+	uid "github.com/satori/go.uuid"
+	ed25519 "golang.org/x/crypto/ed25519"
+)
+
+func (c *Chat) AddUserToGroupChat(partners []ed25519.PublicKey, chatID int) error {
+
+	chat, err := c.chatStorage.GetChat(chatID)
+	if err != nil {
+		return err
+	}
+
+	if chat == nil {
+		return errors.New("couldn't find chat")
+	}
+
+	if !chat.IsGroupChat() {
+		return errors.New("chat must be a group chat")
+	}
+
+	// update chat partners
+	if err := chat.AddChatPartners(partners); err != nil {
+		return err
+	}
+
+	// fetch chat
+	for _, partner := range partners {
+
+		// fetch chat
+		partnerChat, err := c.chatStorage.GetChatByPartner(partner)
+		if err != nil {
+			return err
+		}
+		if partnerChat == nil {
+			_, err = c.chatStorage.CreateChat(partner)
+			if err != nil {
+				return err
+			}
+		}
+		partnerChat, err = c.chatStorage.GetChatByPartner(partner)
+		if err != nil {
+			return err
+		}
+		if partnerChat == nil {
+			return errors.New("chat with partner should exist at this point in time")
+		}
+
+		// persist message
+		msg := db.Message{
+			AddUserToChat: &db.AddUserToChat{
+				Users:  partners,
+				ChatID: chat.GroupChatRemoteID,
+			},
+		}
+		if err := partnerChat.PersistMessage(msg); err != nil {
+			return err
+		}
+
+	}
+
+	return nil
+
+}
+
+func (c *Chat) CreateGroupChat(partners []ed25519.PublicKey, name string) (int, error) {
+
+	// create chat
+	chatID, err := c.chatStorage.CreateGroupChat(partners, name)
+	if err != nil {
+		return 0, err
+	}
+
+	// fetch group chat
+	groupChat, err := c.chatStorage.GetChat(chatID)
+	if err != nil {
+		return 0, err
+	}
+
+	// sender
+	idKeyStr, err := c.km.IdentityPublicKey()
+	if err != nil {
+		return 0, err
+	}
+
+	idKey, err := hex.DecodeString(idKeyStr)
+	if err != nil {
+		return 0, err
+	}
+
+	// send message to our group chat partners
+	for _, partner := range partners {
+
+		// fetch chat
+		partnerChat, err := c.chatStorage.GetChatByPartner(partner)
+		if err != nil {
+			return 0, err
+		}
+		if partnerChat == nil {
+			_, err = c.chatStorage.CreateChat(partner)
+			if err != nil {
+				return 0, err
+			}
+		}
+		partnerChat, err = c.chatStorage.GetChatByPartner(partner)
+		if err != nil {
+			return 0, err
+		}
+		if partnerChat == nil {
+			return 0, errors.New("chat with partner should exist at this point in time")
+		}
+
+		msgID, err := uid.NewV4()
+		if err != nil {
+			return 0, err
+		}
+
+		// persist message
+		msg := db.Message{
+			AddUserToChat: &db.AddUserToChat{
+				Users:  partners,
+				ChatID: groupChat.GroupChatRemoteID,
+			},
+			Version:     1,
+			CreatedAt:   time.Now().UnixNano(),
+			Status:      db.StatusPersisted,
+			Sender:      idKey,
+			GroupChatID: groupChat.GroupChatRemoteID,
+			ID:          msgID.String(),
+		}
+		if err := partnerChat.PersistMessage(msg); err != nil {
+			return 0, err
+		}
+
+	}
+
+	return chatID, nil
+
+}