fix crash when checking account

Author: rmnblm

REST/EPAccount.go

@@ -1,9 +1,8 @@
 package REST
 
 import (
+	"fmt"
 	"github.com/bazo-blockchain/bazo-client/client"
-	"github.com/bazo-blockchain/bazo-client/network"
-	"github.com/bazo-blockchain/bazo-miner/protocol"
 	"github.com/gorilla/mux"
 	"math/big"
 	"net/http"
@@ -16,22 +15,13 @@ func GetAccountEndpoint(w http.ResponseWriter, req *http.Request) {
 	logger.Printf("Incoming acc request for id: %v", param)
 
 	var address [64]byte
-	var addressHash [32]byte
 
 	pubKeyInt, _ := new(big.Int).SetString(param, 16)
 
-	if len(param) == 64 {
-		copy(addressHash[:], pubKeyInt.Bytes())
-
-		network.AccReq(false, addressHash)
-
-		accI, _ := network.Fetch(network.AccChan)
-		acc := accI.(*protocol.Account)
-
-		address = acc.Address
-	} else if len(param) == 128 {
+	if len(param) == 128 {
 		copy(address[:], pubKeyInt.Bytes())
-		addressHash = protocol.SerializeHashContent(address)
+	} else {
+		logger.Fatal(fmt.Sprintf("provided invalid address %x\n", param))
 	}
 
 	acc, lastTenTx, err := client.GetAccount(address)

client/account.go

@@ -31,13 +31,13 @@ func GetAccount(address [64]byte) (*Account, []*FundsTxJson, error) {
 	//Set default params
 	activeParameters = miner.NewDefaultParameters()
 
-	network.AccReq(false, protocol.SerializeHashContent(account.Address))
+	network.AccReq(false, account.Address)
 	if accI, _ := network.Fetch(network.AccChan); accI != nil {
 		if acc := accI.(*protocol.Account); acc != nil {
 			account.IsCreated = true
 			account.IsStaking = acc.IsStaking
 
-			network.AccReq(true, protocol.SerializeHashContent(account.Address))
+			network.AccReq(true, account.Address)
 			if rootAccI, _ := network.Fetch(network.AccChan); rootAccI != nil {
 				if rootAcc := rootAccI.(*protocol.Account); rootAcc != nil {
 					account.IsRoot = true

network/requests.go

@@ -43,17 +43,17 @@ func TxReq(txType uint8, txHash [32]byte) error {
 	return nil
 }
 
-func AccReq(root bool, addressHash [32]byte) error {
+func AccReq(root bool, address [64]byte) error {
 	p := peers.getRandomPeer()
 	if p == nil {
 		return errors.New("Couldn't get a connection, request not transmitted.")
 	}
 
 	var packet []byte
 	if root {
-		packet = p2p.BuildPacket(p2p.ROOTACC_REQ, addressHash[:])
+		packet = p2p.BuildPacket(p2p.ROOTACC_REQ, address[:])
 	} else {
-		packet = p2p.BuildPacket(p2p.ACC_REQ, addressHash[:])
+		packet = p2p.BuildPacket(p2p.ACC_REQ, address[:])
 	}
 
 	sendData(p, packet)

network/responses.go

@@ -64,7 +64,10 @@ func txRes(p *peer, payload []byte, txType uint8) {
 
 func accRes(p *peer, payload []byte) {
 	var acc *protocol.Account
-	acc = acc.Decode(payload)
+	acc, err := acc.Decode(payload)
+	if err != nil {
+		logger.Fatal(err)
+	}
 
 	AccChan <- acc
 }