Merge pull request #21 from Bit-Nation/develop

update master with latest development

Readme.md

@@ -1,24 +1,63 @@
-# Panthalassa
-> Bitnation's backend - contains the mesh and some utils
+# panthalassa
 
+[![standard-readme compliant](https://img.shields.io/badge/standard--readme-OK-green.svg?style=flat-square)](https://github.com/RichardLitt/standard-readme)
 [![Build Status](https://semaphoreci.com/api/v1/florianlenz/panthalassa/branches/develop/badge.svg)](https://semaphoreci.com/florianlenz/panthalassa) (Develop)
 [![Build Status](https://semaphoreci.com/api/v1/florianlenz/panthalassa/branches/master/badge.svg)](https://semaphoreci.com/florianlenz/panthalassa) (Master)
 
+> Backend for Pangea
 
-## Development
+TODO: Fill out this long description.
 
-1. Clone the project into `$GOPATH/src/github.com/Bit-Nation/panthalassa`
-2. Run `make` to see all available commands
+## Table of Contents
 
-### Install
-1. Run `make deps` to get the needed dependencies
-2. Run `make install` to install the gx dependencies
-3. Run `make deps_hack` to rewrite the import paths
+- [Security](#security)
+- [Background](#background)
+- [Install](#install)
+- [Usage](#usage)
+- [API](#api)
+- [Maintainers](#maintainers)
+- [Contribute](#contribute)
+- [License](#license)
 
-### Build for ios
-- Follow the install section first
-- Run `make ios` to build for ios
+## Security
+If you find a bug / vulnerability please DO NOT open an issue. Write to `[email protected]` PLEASE use [this](security-bitnation.co.key.pub) PGP key to encrypt your report / email.
 
-### Build for android
-- Follow the install section first
-- Run `make android` to build for android
+## Background
+[Pangea](https://github.com/Bit-Nation/BITNATION-Pangea-mobile) is the mobile interface to our blockchain jurisdiction. While smart contract's are "onchain" (on a blockchain like Ethereum) communication happens offchain.
+Since current chat systems like WhatsApp and Telegram are hevaly centralized, we are using a p2p system to send messages between peers so that bitnaiton doesn't become a central point of failure.
+We are using [libp2p](https://github.com/libp2p) for the p2p network, which is a great project.
+
+## Install
+
+First clone the project. You can run the commands from the `Usage` section.
+
+## Usage
+We are using GX as the dependency manager since libp2p (and almost all go projects from [Protocol Labs](https://protocol.ai/)) use it as the dependecny manager.
+However, you don't need to pay attention to it, since you just have to use the make file. The following commands are available:
+- `make list` (or just `make`) will list all commands from the Makefile.
+- `make deps` will fetch tools that you need in order to work with the project.
+- `make install` will install all dependencies needed in order to work with the project.
+- `make deps_hack` will "hack" your dependencies. GX rewrites your import paths `github.com/libp2p/go-libp2p` e.g. becomes `gx/ipfs/QmNh1kGFFdsPu79KNSaL4NUKUPb4Eiz4KHdMtFY6664RDp/go-libp2p`. You need this in order to work with the package versions specified in the package.json.
+- `make deps_hack_revert` will undo `make deps_hack`. We never want to commit the GX import paths.
+- `make deps_mobile` will install some tools needed to build panthalassa for mobile. You need to run this before you can build for ios and android.
+- `make ios` will build panthalassa for ios and place it in the `build` folder.
+- `make android` will build panthalassa for android and place it in the build folder.
+- `make test` will format the code and run all tests.
+- `make test_coverage` will test the code and open the coverage report.
+
+## API
+> TODO - add link to godoc.org
+
+## Maintainers
+
+[@florianlenz](https://github.com/florianlenz)
+
+## Contribute
+
+Pull requests are accepted.
+
+Small note: If editing the README, please conform to the [standard-readme](https://github.com/RichardLitt/standard-readme) specifications.
+
+## License
+
+MIT © 2018 [email protected]

keyManager/keyManager.go

@@ -1,13 +1,17 @@
 package keyManager
 
 import (
+	"encoding/hex"
 	"encoding/json"
 	"errors"
 
 	scrypt "github.com/Bit-Nation/panthalassa/crypto/scrypt"
 	ks "github.com/Bit-Nation/panthalassa/keyStore"
 	ethereumMigration "github.com/Bit-Nation/panthalassa/keyStore/migration/ethereum"
+	identity "github.com/Bit-Nation/panthalassa/keyStore/migration/identity"
+	"github.com/Bit-Nation/panthalassa/mnemonic"
 	ethCrypto "github.com/ethereum/go-ethereum/crypto"
+	lp2pCrypto "github.com/libp2p/go-libp2p-crypto"
 )
 
 type KeyManager struct {
@@ -126,6 +130,45 @@ func (km KeyManager) GetEthereumAddress() (string, error) {
 	return ethCrypto.PubkeyToAddress(priv.PublicKey).String(), nil
 }
 
+func (km KeyManager) IdentityPrivateKey() (string, error) {
+	return km.keyStore.GetKey(identity.Ed25519PrivateKey)
+}
+
+func (km KeyManager) IdentityPublicKey() (string, error) {
+	return km.keyStore.GetKey(identity.Ed25519PublicKey)
+}
+
+func (km KeyManager) GetMnemonic() mnemonic.Mnemonic {
+	return km.keyStore.GetMnemonic()
+}
+
+//Get the Mesh network private key (which is the identity ed25519 private key)
+func (km KeyManager) MeshPrivateKey() (lp2pCrypto.PrivKey, error) {
+
+	//Fetch private key
+	priv, err := km.IdentityPrivateKey()
+	if err != nil {
+		return nil, err
+	}
+	privBytes, err := hex.DecodeString(priv)
+	if err != nil {
+		return nil, err
+	}
+
+	//Fetch public key
+	pub, err := km.IdentityPublicKey()
+	if err != nil {
+		return nil, err
+	}
+	pubBytes, err := hex.DecodeString(pub)
+	if err != nil {
+		return nil, err
+	}
+
+	return lp2pCrypto.UnmarshalEd25519PrivateKey(append(privBytes, pubBytes...))
+
+}
+
 //Did the keystore change (happen after migration)
 func (km KeyManager) WasMigrated() bool {
 	return km.keyStore.WasMigrated()

keyManager/keyManager_test.go

@@ -1,10 +1,13 @@
 package keyManager
 
 import (
-	keyStore "github.com/Bit-Nation/panthalassa/keyStore"
-	"github.com/Bit-Nation/panthalassa/mnemonic"
-	"github.com/stretchr/testify/require"
+	"encoding/hex"
 	"testing"
+
+	keyStore "github.com/Bit-Nation/panthalassa/keyStore"
+	identity "github.com/Bit-Nation/panthalassa/keyStore/migration/identity"
+	mnemonic "github.com/Bit-Nation/panthalassa/mnemonic"
+	require "github.com/stretchr/testify/require"
 )
 
 //Test the Create from function
@@ -26,7 +29,7 @@ func TestCreateFromKeyStore(t *testing.T) {
 func TestExportFunction(t *testing.T) {
 
 	//create key storage
-	jsonKeyStore := `{"mnemonic":"differ destroy head candy imitate barely wine ranch roof barrel sheriff blame umbrella visit sell green dress embark ramp cement rotate crawl session broom","keys":{"ethereum_private_key":"eba47c97d7a6688d03e41b145d26090216c4468231bb46677553141f75222d5c"},"version":1}`
+	jsonKeyStore := `{"mnemonic":"differ destroy head candy imitate barely wine ranch roof barrel sheriff blame umbrella visit sell green dress embark ramp cement rotate crawl session broom","keys":{"ed_25519_private_key":"9d426d0eb4170529672df197454bc77cc36cb341c872bcee0bece79ac893b34a8c5de2e7d099b881ed6214f8add6cbba2a84f57546b7f0a6d39197c904529f3f","ed_25519_public_key":"8c5de2e7d099b881ed6214f8add6cbba2a84f57546b7f0a6d39197c904529f3f","ethereum_private_key":"eba47c97d7a6688d03e41b145d26090216c4468231bb46677553141f75222d5c"},"version":1}`
 	ks, err := keyStore.UnmarshalStore(jsonKeyStore)
 	require.Nil(t, err)
 
@@ -51,7 +54,7 @@ func TestExportFunction(t *testing.T) {
 func TestOpenWithMnemonic(t *testing.T) {
 
 	//create key storage
-	jsonKeyStore := `{"mnemonic":"differ destroy head candy imitate barely wine ranch roof barrel sheriff blame umbrella visit sell green dress embark ramp cement rotate crawl session broom","keys":{"ethereum_private_key":"eba47c97d7a6688d03e41b145d26090216c4468231bb46677553141f75222d5c"},"version":1}`
+	jsonKeyStore := `{"mnemonic":"differ destroy head candy imitate barely wine ranch roof barrel sheriff blame umbrella visit sell green dress embark ramp cement rotate crawl session broom","keys":{"ed_25519_private_key":"9d426d0eb4170529672df197454bc77cc36cb341c872bcee0bece79ac893b34a8c5de2e7d099b881ed6214f8add6cbba2a84f57546b7f0a6d39197c904529f3f","ed_25519_public_key":"8c5de2e7d099b881ed6214f8add6cbba2a84f57546b7f0a6d39197c904529f3f","ethereum_private_key":"eba47c97d7a6688d03e41b145d26090216c4468231bb46677553141f75222d5c"},"version":1}`
 	ks, err := keyStore.UnmarshalStore(jsonKeyStore)
 	require.Nil(t, err)
 
@@ -74,6 +77,22 @@ func TestOpenWithMnemonic(t *testing.T) {
 
 }
 
+func TestGetMnemonic(t *testing.T) {
+
+	//create key storage
+	jsonKeyStore := `{"mnemonic":"differ destroy head candy imitate barely wine ranch roof barrel sheriff blame umbrella visit sell green dress embark ramp cement rotate crawl session broom","keys":{"ethereum_private_key":"eba47c97d7a6688d03e41b145d26090216c4468231bb46677553141f75222d5c"},"version":1}`
+	ks, err := keyStore.UnmarshalStore(jsonKeyStore)
+	require.Nil(t, err)
+
+	//key manager
+	km := CreateFromKeyStore(ks)
+
+	//Get address
+	mne := km.GetMnemonic()
+	require.Equal(t, "differ destroy head candy imitate barely wine ranch roof barrel sheriff blame umbrella visit sell green dress embark ramp cement rotate crawl session broom", mne.String())
+
+}
+
 func TestGetAddressFromPrivateKey(t *testing.T) {
 
 	//create key storage
@@ -90,3 +109,35 @@ func TestGetAddressFromPrivateKey(t *testing.T) {
 	require.Equal(t, "0x748A6536dE0a8b1902f808233DD75ec4451cdFC6", addr)
 
 }
+
+func TestGetLibP2PPrivateKey(t *testing.T) {
+
+	//create key storage
+	jsonKeyStore := `{"mnemonic":"differ destroy head candy imitate barely wine ranch roof barrel sheriff blame umbrella visit sell green dress embark ramp cement rotate crawl session broom","keys":{"ethereum_private_key":"eba47c97d7a6688d03e41b145d26090216c4468231bb46677553141f75222d5c"},"version":1}`
+	ks, err := keyStore.UnmarshalStore(jsonKeyStore)
+	require.Nil(t, err)
+
+	//key manager
+	km := CreateFromKeyStore(ks)
+
+	meshPriv, err := km.MeshPrivateKey()
+	require.Nil(t, err)
+
+	edPriv, err := ks.GetKey(identity.Ed25519PrivateKey)
+	require.Nil(t, err)
+	edPrivBytes, err := hex.DecodeString(edPriv)
+	require.Nil(t, err)
+
+	edPub, err := ks.GetKey(identity.Ed25519PublicKey)
+	require.Nil(t, err)
+	edPubBytes, err := hex.DecodeString(edPub)
+	require.Nil(t, err)
+
+	//Check if private key does match
+	meshPrivBytes, err := meshPriv.Bytes()
+	require.Nil(t, err)
+	combinedKey := append(edPrivBytes, edPubBytes...)
+	preFix, err := hex.DecodeString("08011260")
+	require.Nil(t, err)
+	require.Equal(t, hex.EncodeToString(append(preFix, combinedKey...)), hex.EncodeToString(meshPrivBytes))
+}

keyStore/main.go

@@ -7,12 +7,14 @@ import (
 
 	migration "github.com/Bit-Nation/panthalassa/keyStore/migration"
 	ethereumMigration "github.com/Bit-Nation/panthalassa/keyStore/migration/ethereum"
+	ed25519Migration "github.com/Bit-Nation/panthalassa/keyStore/migration/identity/ed25519"
 	mnemonic "github.com/Bit-Nation/panthalassa/mnemonic"
 )
 
 //Migrations to run
 var migrations = []migration.Migration{
 	ethereumMigration.Migration{},
+	ed25519Migration.Migration{},
 }
 
 type Store struct {

mesh/mesh.go

@@ -1,5 +1,37 @@
 package mesh
 
+import (
+	"context"
+	lp2p "github.com/libp2p/go-libp2p"
+	lp2pCrypto "github.com/libp2p/go-libp2p-crypto"
+	host "github.com/libp2p/go-libp2p-host"
+)
+
+func New(meshPk *lp2pCrypto.Ed25519PrivateKey) (*Network, error) {
+
+	//Create host
+	h, err := lp2p.New(context.Background(), func(cfg *lp2p.Config) error {
+
+		cfg.PeerKey = meshPk
+		cfg.DisableSecio = false
+
+		return lp2p.Defaults(cfg)
+
+	})
+	if err != nil {
+		return nil, err
+	}
+
+	return &Network{
+		host: h,
+	}, nil
+
+}
+
+type Network struct {
+	host host.Host
+}
+
 /*
 @todo there is an problem with the bootstrapping bundle. Since we don't need the mesh network now we will comment it
 import (

mobile/interface.go

@@ -99,6 +99,18 @@ func ExportAccountStore(pw, pwConfirm string) (string, error) {
 
 }
 
+// get mnemonic
+func GetMnemonic() (string, error) {
+
+	// exit if not started
+	if panthalassaInstance == nil {
+		return "", errors.New("you have to start panthalassa in order to stop it")
+	}
+
+	return panthalassaInstance.km.GetMnemonic().String(), nil
+
+}
+
 //Stop panthalassa
 func Stop() error {
 

package.json

@@ -54,6 +54,12 @@
       "hash": "Qmdu32Lzvuof9HXogmHQZ8JJuhaWyADBwrRSmpXjGFX8HM",
       "name": "go-libp2p-bootstrap",
       "version": "3.0.2"
+    },
+    {
+      "author": "whyrusleeping",
+      "hash": "QmaPbCnUMBohSGo3KnxEa2bHqyJVVeEEcwtqJAYxerieBo",
+      "name": "go-libp2p-crypto",
+      "version": "1.5.0"
     }
   ],
   "gxVersion": "0.12.1",

security-bitnation.co.key.pub

@@ -0,0 +1,52 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+icU8wxhf
+=+yeJ
+-----END PGP PUBLIC KEY BLOCK-----