Merge pull request #9 from MysteriumNetwork/go-ethereum-update

Updated go-ethereum to 1.8.14

Gopkg.toml

@@ -31,7 +31,7 @@
 
 [[constraint]]
   name = "github.com/ethereum/go-ethereum"
-  version = "1.8.8"
+  version = "=1.8.14"
 
 [[constraint]]
   name = "github.com/stretchr/testify"

identity/keystore_signer_test.go

@@ -31,7 +31,10 @@ func TestKeyStoreSignerProvidesValidSignature(t *testing.T) {
 	pubKeyBytes, err := crypto.Ecrecover(crypto.Keccak256(signData), extractedSignature)
 	assert.NoError(t, err)
 
-	recoveredIdentity := crypto.PubkeyToAddress(*crypto.ToECDSAPub(pubKeyBytes))
+	key, err := crypto.UnmarshalPubkey(pubKeyBytes)
+	assert.NoError(t, err)
+
+	recoveredIdentity := crypto.PubkeyToAddress(*key)
 
 	assert.Equal(t, acc.Address, recoveredIdentity)
 

promises/promise.go

@@ -66,7 +66,10 @@ func SignByReceiver(promise *IssuedPromise, receiver identity.Signer) (*Received
 	if err != nil {
 		return nil, err
 	}
-	pubKey := crypto.ToECDSAPub(publicKey)
+	pubKey, err := crypto.UnmarshalPubkey(publicKey)
+	if err != nil {
+		return nil, err
+	}
 	payerAddr := crypto.PubkeyToAddress(*pubKey)
 	sig, err := receiver.Sign([]byte(receiverPrefix), crypto.Keccak256(promise.Bytes()), payerAddr.Bytes())
 	return &ReceivedPromise{

registry/keystore_identity_holder.go

@@ -26,7 +26,8 @@ func (ki *keystoreIdentityHolder) GetPublicKey() (ecdsa.PublicKey, error) {
 	if err != nil {
 		return ecdsa.PublicKey{}, err
 	}
-	return *crypto.ToECDSAPub(pubKeyBytes), nil
+	key, err := crypto.UnmarshalPubkey(pubKeyBytes)
+	return *key, err
 }
 
 func FromKeystore(keystore *keystore.KeyStore, address common.Address) IdentityHolder {

registry/registry.go

@@ -2,7 +2,6 @@ package registry
 
 import (
 	"crypto/ecdsa"
-	"errors"
 	"math/big"
 
 	"github.com/MysteriumNetwork/payments/registry/generated"
@@ -53,9 +52,5 @@ func (registry *Registry) LookupPublicKey(address common.Address) (*ecdsa.Public
 
 	prefix := []byte{4}
 	fullKey := append(prefix, append(part1[:], part2[:]...)...)
-	pubKey := crypto.ToECDSAPub(fullKey)
-	if pubKey == nil {
-		return nil, errors.New("unable to deserialize public key")
-	}
-	return pubKey, nil
+	return crypto.UnmarshalPubkey(fullKey)
 }

test_utils/backend.go

@@ -24,7 +24,7 @@ type TransactionalBackend interface {
 func NewSimulatedBackend(genesisAddress common.Address, initialAmmount int64) TransactionalBackend {
 	sb := backends.NewSimulatedBackend(core.GenesisAlloc{
 		genesisAddress: {Balance: big.NewInt(initialAmmount)},
-	})
+	}, 10000000)
 	return sb
 }