Merge pull request #5 from MysteriumNetwork/improvement/integration-f…

…eedback

Improvement/integration feedback

.travis.yml

@@ -7,13 +7,14 @@ before_install:
   - sudo apt-get -y install solc ethereum nodejs npm
   - curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh
   - npm install -g soljitsu
+  - go get golang.org/x/tools/cmd/goimports
 
 install:
   - scripts/deps.sh ensure
 
 script:
   - scripts/test.sh -v
-  - scripts/check_go_fmt.sh
+  - scripts/check_goimports.sh
 
 before_deploy:
   - scripts/release.sh

balances/balances.go

@@ -1,14 +1,14 @@
 package balances
 
 import (
+	"math/big"
+
 	"github.com/MysteriumNetwork/payments/balances/generated"
-	"github.com/MysteriumNetwork/payments/registry"
+	"github.com/MysteriumNetwork/payments/identity"
 	"github.com/ethereum/go-ethereum/accounts/abi"
 	"github.com/ethereum/go-ethereum/accounts/abi/bind"
 	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/crypto"
 	"github.com/ethereum/go-ethereum/event"
-	"math/big"
 )
 
 //go:generate abigen --sol ../contracts/IdentityBalances.sol --pkg generated --out generated/IdentityBalances.go
@@ -46,19 +46,19 @@ func (balances *IdentityBalances) BindForWithdrawEvents(sink chan<- *generated.I
 
 type WithdrawRequest struct {
 	Amount    *big.Int
-	Signature *registry.DecomposedSignature
+	Signature *identity.DecomposedSignature
 }
 
 const withDrawPrefix = "Withdraw request:"
 
-func NewWithdrawRequest(identity *registry.MystIdentity, amount int64) (*WithdrawRequest, error) {
+func NewWithdrawRequest(signer identity.Signer, amount int64) (*WithdrawRequest, error) {
 	bigAmount := big.NewInt(amount)
 	amountBytes := abi.U256(bigAmount)
-	signature, err := crypto.Sign(crypto.Keccak256([]byte(withDrawPrefix), amountBytes), identity.PrivateKey)
+	signature, err := signer.Sign([]byte(withDrawPrefix), amountBytes)
 	if err != nil {
 		return nil, err
 	}
-	decomposed, err := registry.DecomposeSignature(signature)
+	decomposed, err := identity.DecomposeSignature(signature)
 	if err != nil {
 		return nil, err
 	}

balances/balances_test.go

@@ -1,15 +1,15 @@
 package balances
 
 import (
+	"math/big"
+	"testing"
+	"time"
+
 	"github.com/MysteriumNetwork/payments/balances/generated"
 	"github.com/MysteriumNetwork/payments/mysttoken"
 	generated2 "github.com/MysteriumNetwork/payments/mysttoken/generated"
-	"github.com/MysteriumNetwork/payments/registry"
 	"github.com/MysteriumNetwork/payments/test_utils"
 	"github.com/stretchr/testify/assert"
-	"math/big"
-	"testing"
-	"time"
 )
 
 var abiMap = test_utils.AbiMap{
@@ -41,7 +41,7 @@ func TestTopUpActionAddsMystToBalanceAndEmitsToppedUpEvent(t *testing.T) {
 	assert.NoError(t, err)
 	simulator.Commit()
 
-	mystIdentity, err := registry.NewMystIdentity()
+	mystIdentity, err := test_utils.NewMystIdentity()
 	assert.NoError(t, err)
 
 	initialBalance, err := identityBalances.Balances(mystIdentity.Address)
@@ -93,7 +93,7 @@ func TestWithdrawActionRemovesMystFromBalanceAndEmitsWithdrawnEvent(t *testing.T
 	assert.NoError(t, err)
 	simulator.Commit()
 
-	mystIdentity, err := registry.NewMystIdentity()
+	mystIdentity, err := test_utils.NewMystIdentity()
 	assert.NoError(t, err)
 
 	withdrawChan := make(chan *generated.IdentityBalancesWithdrawn, 10)

cli/deployer/bin.go

@@ -1,12 +1,13 @@
 package main
 
 import (
+	"io/ioutil"
+	"strings"
+
 	"github.com/ethereum/go-ethereum/accounts/abi"
 	"github.com/ethereum/go-ethereum/accounts/abi/bind"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/core/types"
-	"io/ioutil"
-	"strings"
 )
 
 func DeploySmartContractFile(opts *bind.TransactOpts, path string, abiPath string, backend bind.ContractBackend, params ...interface{}) (common.Address, *types.Transaction, error) {

cli/deployer/main.go

@@ -5,19 +5,20 @@ import (
 	"errors"
 	"flag"
 	"fmt"
-	"github.com/MysteriumNetwork/payments/cli/helpers"
-	"github.com/ethereum/go-ethereum/common"
 	"math/big"
 	"os"
+
+	"github.com/MysteriumNetwork/payments/cli/helpers"
+	"github.com/ethereum/go-ethereum/common"
 )
 
 var cmd = flag.String("cmd", "help", "Command to execute")
 var contractName = flag.String("contract.name", "settlement", "Name of contract to deply (settlement or testerc20(testnet only!))")
 var tokenCount = flag.Int64("mysttoken.amount", 1000000, "Initial token amount to deploy - can always be minted later")
 var registrationFee = flag.Int64("payments.registrationFee", 100, "Registration fee for identity. Can be changed later")
 var erc20address = flag.String("payments.erc20address", "", "ERC20 token address for payments. In hex (0x...) format")
-var contractPath = flag.String("payments.contractPath", "", "Path to bin file of payments contract")
-var abiPath = flag.String("payments.abiPath", "", "Path to ABI file of payments contract")
+var contractPath = flag.String("contract.binPath", "", "Path to bin file of payments contract")
+var abiPath = flag.String("contract.abiPath", "", "Path to ABI file of payments contract")
 
 func main() {
 	flag.Parse()
@@ -89,7 +90,12 @@ func deployContract() (err error) {
 		}
 		return DeployPromises(transactor, client, common.HexToAddress(*erc20address), *registrationFee)
 	case "testerc20":
-		return DeployTestErc20(transactor, client, *tokenCount)
+		addr, _, err := DeploySmartContractFile(transactor, *contractPath, *abiPath, client)
+		if err != nil {
+			return err
+		}
+		fmt.Println("Address of deployed contract: ", addr.String())
+		return nil
 	case "payments2":
 		addr, _, err := DeploySmartContractFile(transactor, *contractPath, *abiPath, client, common.HexToAddress(*erc20address), big.NewInt(*registrationFee))
 		if err != nil {

cli/deployer/promises.go

@@ -2,6 +2,7 @@ package main
 
 import (
 	"fmt"
+
 	"github.com/MysteriumNetwork/payments/mysttoken/generated"
 	"github.com/MysteriumNetwork/payments/promises"
 	"github.com/ethereum/go-ethereum/accounts/abi/bind"

cli/deployer/testerc20.go

@@ -2,6 +2,7 @@ package main
 
 import (
 	"fmt"
+
 	"github.com/MysteriumNetwork/payments/mysttoken"
 	"github.com/ethereum/go-ethereum/accounts/abi/bind"
 )

cli/helpers/client.go

@@ -4,10 +4,11 @@ import (
 	"context"
 	"flag"
 	"fmt"
+	"time"
+
 	"github.com/cheggaaa/pb"
 	"github.com/ethereum/go-ethereum"
 	"github.com/ethereum/go-ethereum/ethclient"
-	"time"
 )
 
 var GethUrl = flag.String("geth.url", "", "URL value of started geth to connect")

cli/helpers/keystore.go

@@ -4,6 +4,7 @@ import (
 	"errors"
 	"flag"
 	"fmt"
+
 	"github.com/ethereum/go-ethereum/accounts"
 	"github.com/ethereum/go-ethereum/accounts/abi/bind"
 	"github.com/ethereum/go-ethereum/accounts/keystore"

cli/minter/main.go

@@ -4,11 +4,12 @@ import (
 	"context"
 	"flag"
 	"fmt"
+	"math/big"
+	"os"
+
 	"github.com/MysteriumNetwork/payments/cli/helpers"
 	"github.com/MysteriumNetwork/payments/mysttoken/generated"
 	"github.com/ethereum/go-ethereum/common"
-	"math/big"
-	"os"
 )
 
 var erc20contract = flag.String("erc20.address", "", "Address of ERC20 mintable token")

identity/keystore_signer.go

@@ -0,0 +1,27 @@
+package identity
+
+import (
+	"github.com/ethereum/go-ethereum/accounts"
+	"github.com/ethereum/go-ethereum/accounts/keystore"
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/crypto"
+)
+
+type KeystoreSigner struct {
+	keystore *keystore.KeyStore
+	account  accounts.Account
+}
+
+func NewKeystoreSigner(ks *keystore.KeyStore, identity common.Address) *KeystoreSigner {
+	return &KeystoreSigner{
+		keystore: ks,
+		account: accounts.Account{
+			Address: identity,
+		},
+	}
+}
+
+func (ki *KeystoreSigner) Sign(data ...[]byte) ([]byte, error) {
+	hash := crypto.Keccak256(data...)
+	return ki.keystore.SignHash(ki.account, hash)
+}

identity/keystore_signer_test.go

@@ -0,0 +1,38 @@
+package identity
+
+import (
+	"os"
+	"testing"
+
+	"github.com/ethereum/go-ethereum/accounts/keystore"
+	"github.com/ethereum/go-ethereum/crypto"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestKeyStoreSignerProvidesValidSignature(t *testing.T) {
+
+	assert.NoError(t, os.RemoveAll("testoutput"))
+
+	sampleKey, err := crypto.GenerateKey()
+	assert.NoError(t, err)
+
+	ks := keystore.NewKeyStore("testoutput", keystore.StandardScryptN, keystore.StandardScryptP)
+	acc, err := ks.ImportECDSA(sampleKey, "")
+	assert.NoError(t, err)
+
+	assert.NoError(t, ks.Unlock(acc, ""))
+	signer := NewKeystoreSigner(ks, acc.Address)
+
+	signData := []byte("Testing signature")
+
+	extractedSignature, err := signer.Sign(signData)
+	assert.NoError(t, err)
+
+	pubKeyBytes, err := crypto.Ecrecover(crypto.Keccak256(signData), extractedSignature)
+	assert.NoError(t, err)
+
+	recoveredIdentity := crypto.PubkeyToAddress(*crypto.ToECDSAPub(pubKeyBytes))
+
+	assert.Equal(t, acc.Address, recoveredIdentity)
+
+}

registry/signature.go → identity/signature.go

@@ -1,4 +1,4 @@
-package registry
+package identity
 
 import (
 	"errors"

registry/signature_test.go → identity/signature_test.go

@@ -1,9 +1,10 @@
-package registry
+package identity
 
 import (
+	"testing"
+
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/stretchr/testify/assert"
-	"testing"
 )
 
 var testSignature = common.FromHex(

identity/signer.go

@@ -0,0 +1,5 @@
+package identity
+
+type Signer interface {
+	Sign(data ...[]byte) ([]byte, error)
+}

mysttoken/mysttoken.go

@@ -1,10 +1,11 @@
 package mysttoken
 
 import (
+	"math/big"
+
 	"github.com/MysteriumNetwork/payments/mysttoken/generated"
 	"github.com/ethereum/go-ethereum/accounts/abi/bind"
 	"github.com/ethereum/go-ethereum/common"
-	"math/big"
 )
 
 //go:generate abigen --sol ../contracts/MystToken.sol --pkg generated --out generated/mysttoken.go

mysttoken/mysttoken_test.go

@@ -1,11 +1,12 @@
 package mysttoken
 
 import (
+	"math/big"
+	"testing"
+
 	"github.com/MysteriumNetwork/payments/mysttoken/generated"
 	"github.com/MysteriumNetwork/payments/test_utils"
 	"github.com/stretchr/testify/assert"
-	"math/big"
-	"testing"
 )
 
 var abiMap = test_utils.AbiMap{

promises/clearing.go

@@ -1,12 +1,14 @@
 package promises
 
 import (
+	"math/big"
+
+	"github.com/MysteriumNetwork/payments/identity"
 	"github.com/MysteriumNetwork/payments/promises/generated"
 	"github.com/MysteriumNetwork/payments/registry"
 	"github.com/ethereum/go-ethereum/accounts/abi/bind"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/event"
-	"math/big"
 )
 
 //go:generate abigen --sol ../contracts/IdentityPromises.sol --exc contract/registry.sol:IdentityRegistry --pkg generated --out generated/IdentityPromises.go
@@ -36,17 +38,17 @@ func NewPromiseClearer(transactOpts *bind.TransactOpts, contract *generated.Iden
 	}
 }
 
-func (pc *PromiseClearing) RegisterIdentities(identities ...registry.MystIdentity) error {
+func (pc *PromiseClearing) RegisterIdentities(identities ...registry.IdentityHolder) error {
 	for _, identity := range identities {
-		proof, err := registry.CreateProofOfIdentity(&identity)
+		registrationData, err := registry.CreateRegistrationData(identity)
 		if err != nil {
 			return err
 		}
-		sig := proof.Signature
+		sig := registrationData.Signature
 		var pubKeyPart1 [32]byte
 		var pubKeyPart2 [32]byte
-		copy(pubKeyPart1[:], proof.Data[0:32])
-		copy(pubKeyPart2[:], proof.Data[32:64])
+		copy(pubKeyPart1[:], registrationData.PublicKey.Part1)
+		copy(pubKeyPart2[:], registrationData.PublicKey.Part2)
 		_, err = pc.RegisterIdentity(pubKeyPart1, pubKeyPart2, sig.V, sig.R, sig.S)
 		if err != nil {
 			return err
@@ -56,11 +58,11 @@ func (pc *PromiseClearing) RegisterIdentities(identities ...registry.MystIdentit
 }
 
 func (pc *PromiseClearing) ClearReceivedPromise(promise *ReceivedPromise) error {
-	issuerSig, err := registry.DecomposeSignature(promise.IssuerSignature)
+	issuerSig, err := identity.DecomposeSignature(promise.IssuerSignature)
 	if err != nil {
 		return err
 	}
-	receiverSig, err := registry.DecomposeSignature(promise.ReceiverSignature)
+	receiverSig, err := identity.DecomposeSignature(promise.ReceiverSignature)
 	if err != nil {
 		return err
 	}