Merge c9cea3e into 0c6862b

Makefile

@@ -10,11 +10,14 @@ cumulus:
 test:
 	go test $(PACKAGES) --cover
 
+run-console:
+	make clean && make cumulus && ./cumulus run -c
+
 deps:
 	glide install
 
 clean:
-	rm cumulus
+	rm cumulus || true
 
 install-glide:
 	sh scripts/install_glide.sh

app/app.go

@@ -80,7 +80,7 @@ func Run(cfg conf.Config) {
 		if err != nil {
 			log.WithError(err).Fatal("Failed to redirect logs to log file")
 		}
-		log.Warn("Redirecting logs to logfile")
+		log.Info("Redirecting logs to logfile")
 		log.SetOutput(logFile)
 		go RunConsole()
 	}

app/console.go

@@ -7,6 +7,7 @@ import (
 	"github.com/ubclaunchpad/cumulus/blockchain"
 	"github.com/ubclaunchpad/cumulus/conn"
 	"github.com/ubclaunchpad/cumulus/peer"
+	"gopkg.in/kyokomi/emoji.v1"
 )
 
 var shell *ishell.Shell
@@ -42,7 +43,7 @@ func RunConsole() {
 	})
 
 	shell.Start()
-	shell.Println("Cumulus Console")
+	emoji.Println(":cloud: Welcome to the :sunny: Cumulus console :cloud:")
 }
 
 func create(ctx *ishell.Context) {
@@ -51,7 +52,7 @@ func create(ctx *ishell.Context) {
 		"Transaction",
 	}, "What would you like to create?")
 	if choice == 0 {
-		ctx.Println("New Wallet:", blockchain.NewWallet().Public())
+		createHotWallet(ctx)
 	} else {
 		shell.Print("Sender wallet ID: ")
 		senderID := shell.ReadLine()
@@ -109,3 +110,13 @@ func connect(ctx *ishell.Context) {
 		shell.Println("Connected to", addr)
 	}
 }
+
+func createHotWallet(ctx *ishell.Context) {
+	shell.Print("Enter wallet name: ")
+	walletName := shell.ReadLine()
+	wallet := HotWallet{walletName, blockchain.NewWallet()}
+	currentUser.HotWallet = wallet
+	emoji.Println(":credit_card: New hot wallet created!")
+	emoji.Println(":raising_hand: Name: " + wallet.Name)
+	emoji.Println(":mailbox: Address: " + wallet.Wallet.Public().Repr())
+}

app/user.go

@@ -4,13 +4,19 @@ import "github.com/ubclaunchpad/cumulus/blockchain"
 
 // User holds basic user information.
 type User struct {
-	// Wallet holds the users wallets (currently just support 1).
-	Wallet blockchain.Wallet
+	// Account holds the users wallet(s).
+	HotWallet
 	// UserBlockSize is the maximum size of a block in bytes when marshaled
 	// as specified by the user.
 	BlockSize uint32
 }
 
+// HotWallet is a representation of the users wallet.
+type HotWallet struct {
+	Name string
+	blockchain.Wallet
+}
+
 var currentUser *User
 
 const defaultBlockSize = 1 << 18
@@ -23,7 +29,10 @@ func init() {
 // NewUser creates a new user
 func NewUser() *User {
 	return &User{
-		Wallet:    blockchain.NewWallet(),
+		HotWallet: HotWallet{
+			Wallet: blockchain.NewWallet(),
+			Name:   "default",
+		},
 		BlockSize: defaultBlockSize,
 	}
 }

blockchain/blockchain_test.go

@@ -6,6 +6,7 @@ import (
 	"testing"
 
 	log "github.com/Sirupsen/logrus"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestMain(t *testing.T) {
@@ -38,3 +39,8 @@ func TestCopyBlock(t *testing.T) {
 		t.FailNow()
 	}
 }
+
+func TestWalletRepr(t *testing.T) {
+	w := NewWallet()
+	assert.Equal(t, len(w.Public().Repr()), 40)
+}

blockchain/wallet.go

@@ -4,6 +4,8 @@ import (
 	"crypto/ecdsa"
 	"crypto/elliptic"
 	crand "crypto/rand"
+	"crypto/sha256"
+	"encoding/hex"
 	"io"
 	"math/big"
 
@@ -17,6 +19,8 @@ const (
 	AddrLen = 2 * CoordLen
 	// SigLen is the length in bytes of signatures.
 	SigLen = AddrLen
+	// AddressVersion is the version of the address shortening protocol.
+	AddressVersion = 0
 )
 
 var (
@@ -33,6 +37,28 @@ type Address struct {
 	X, Y *big.Int
 }
 
+// Repr returns a string representation of the address. We follow
+// ethereums protocol, replacing Keccak hash with SHA256.
+// Where pr is the private key.
+//    	A(pr) = SHA256(ECDSAPUBLICKEY(pr))[96:255],
+// Resources:
+// http://gavwood.com/paper.pdf (fig 213)
+func (a Address) Repr() string {
+	// 1. Concatenate X and Y and version the result.
+	concat := a.Marshal()
+	prefix := append([]byte{AddressVersion}, concat...)
+
+	// 2. Perform SHA-256 on result.
+	hash := sha256.Sum256(prefix) // 256 bit
+
+	return hex.EncodeToString(hash[96/8 : 256/8])
+}
+
+// Emoji returns the users address as a string of emojis (TODO).
+func (a Address) Emoji() string {
+	return a.Repr()
+}
+
 // Marshal converts an Address to a byte slice.
 func (a Address) Marshal() []byte {
 	buf := make([]byte, 0, AddrLen)

glide.yaml

@@ -17,3 +17,5 @@ import:
   subpackages:
   - assert
 - package: github.com/abiosoft/ishell
+- package: gopkg.in/kyokomi/emoji.v1
+  version: ^1.5.0